From a946438f6d69f976c94935f53dd7f326947aba0f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 23 一月 2024 15:17:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 insertions(+), 1 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
index 4846864..dd31f43 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
@@ -12,6 +12,7 @@
import com.doumee.dao.business.SettleClaimsMapper;
import com.doumee.dao.business.dto.SCSupplementDTO;
import com.doumee.dao.business.join.SettleClaimsJoinMapper;
+import com.doumee.dao.business.join.SettleClaimsLogJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.SettleClaimsLogService;
import com.doumee.service.business.SettleClaimsService;
@@ -28,6 +29,7 @@
import java.util.Date;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 鐞嗚禂鐢宠琛⊿ervice瀹炵幇
@@ -48,6 +50,9 @@
@Autowired
private SettleClaimsJoinMapper settleClaimsJoinMapper;
+
+ @Autowired
+ private SettleClaimsLogJoinMapper settleClaimsLogJoinMapper;
@Override
public Integer create(SettleClaims settleClaims) {
@@ -109,16 +114,51 @@
}
+ @Override
public SettleClaims getSettleClaimsDetail(Integer id){
SettleClaims settleClaims = settleClaimsJoinMapper.selectJoinOne(SettleClaims.class,new MPJLambdaWrapper<SettleClaims>()
.selectAll(SettleClaims.class)
.leftJoin(Member.class,Member::getId,SettleClaims::getMemberId)
.leftJoin(InsuranceApply.class,InsuranceApply::getId,SettleClaims::getInsuranceApplyId)
.leftJoin(DispatchUnit.class,DispatchUnit::getId,SettleClaims::getDuId)
-
+ .leftJoin(Worktype.class,Worktype::getId,SettleClaims::getWorktypeId)
+ .eq(SettleClaims::getId,id)
+ .last(" limit 1 ")
);
+ List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>()
+ .lambda().eq(Multifile::getObjId,id)
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .orderByAsc(Multifile::getCreateDate)
+ );
+ if(CollectionUtils.isNotEmpty(multifileList)){
+ settleClaims.setReportFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_SGXC_FILE.getKey())).collect(Collectors.toList()));
+ settleClaims.setRelationFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_YGGX_FILE.getKey())).collect(Collectors.toList()));
+
+ settleClaims.setOutpatientFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_MZCL_FILE.getKey())).collect(Collectors.toList()));
+
+ settleClaims.setHospitalFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_ZYCL_FILE.getKey())).collect(Collectors.toList()));
+
+ settleClaims.setDisabilityFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_SCZL_FILE.getKey())).collect(Collectors.toList()));
+
+ settleClaims.setCompensationFileList(multifileList.stream().filter(m->m.getObjType().equals(Constants.MultiFile.LP_JACL_FILE.getKey())).collect(Collectors.toList()));
+
+ }
+
+ //鏌ヨ鎿嶄綔璁板綍
+ List<SettleClaimsLog> settleClaimsLogList = settleClaimsLogJoinMapper.selectJoinList(SettleClaimsLog.class,
+ new MPJLambdaWrapper<SettleClaimsLog>()
+ .selectAll(SettleClaimsLog.class)
+ .selectAs(Member::getName,SettleClaimsLog::getCreatorName)
+ .selectAs(Company::getName,SettleClaimsLog::getCompanyName)
+ .leftJoin(Member.class,Member::getId,SettleClaimsLog::getCreator)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .eq(SettleClaimsLog::getSettleClainmsId,settleClaims.getId())
+ .orderByAsc(SettleClaimsLog::getCreateDate)
+ );
+
+ settleClaims.setSettleClaimsLogList(settleClaimsLogList);
return settleClaims;
}
--
Gitblit v1.9.3