修改代码

cdssman-service/src/main/java/com/diagbot/facade/KlConceptCommonFacade.java

@@ -0,0 +1,53 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.entity.KlConceptCommon;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.KlConceptCommonService;
+import com.diagbot.service.impl.KlConceptCommonServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.UserUtils;
+import com.diagbot.vo.KlConceptSaveVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2021-03-18 16:30
+ */
+@Component
+public class KlConceptCommonFacade extends KlConceptCommonServiceImpl {
+    @Autowired
+    KlConceptCommonService KlConceptCommonService;
+
+
+    public boolean saveOrUpdateAll(KlConceptSaveVO klConceptSaveVO) {
+        Date now = DateUtil.now();
+        boolean res = false;
+        if (null != klConceptSaveVO.getConceptId()) {
+            UpdateWrapper<KlConceptCommon> klConceptCommonQuerySub = new UpdateWrapper<>();
+            klConceptCommonQuerySub.eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("concept_id", klConceptSaveVO.getConceptId())
+                    .set("gmt_modified", now)
+                    .set("modifier", UserUtils.getCurrentPrincipleID())
+                    .set("sex_type", klConceptSaveVO.getSexType())
+                    .set("min_age", klConceptSaveVO.getMinAge())
+                    .set("max_age", klConceptSaveVO.getMaxAge());
+            res = this.update(klConceptCommonQuerySub);
+        } else {
+            KlConceptCommon klConceptCommonSub = new KlConceptCommon();
+            klConceptCommonSub.setConceptId(klConceptSaveVO.getConceptId());
+            klConceptCommonSub.setMaxAge(klConceptSaveVO.getMaxAge());
+            klConceptCommonSub.setMinAge(klConceptSaveVO.getMinAge());
+            klConceptCommonSub.setGmtModified(now);
+            klConceptCommonSub.setModifier(UserUtils.getCurrentPrincipleID());
+            res = this.save(klConceptCommonSub);
+        }
+
+        return res;
+
+    }
+}

cdssman-service/src/main/java/com/diagbot/facade/KlConceptFacade.java

@@ -17,8 +17,6 @@ import com.diagbot.entity.KlLis;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
-import com.diagbot.service.KlConceptCommonService;
-import com.diagbot.service.KlLisService;
 import com.diagbot.service.impl.KlConceptServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
@@ -39,8 +37,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -60,9 +56,9 @@ public class KlConceptFacade extends KlConceptServiceImpl {
     @Autowired
     private KlLibraryInfoFacade klLibraryInfoFacade;
     @Autowired
-    private KlConceptCommonService klConceptCommonService;
+    private KlConceptCommonFacade klConceptCommonFacade;
     @Autowired
-    KlLisService klLisService;
+    KlLisFacade klLisFacade;
     @Autowired
     KlDiseaseFacade klDiseaseFacade;
 
@@ -140,7 +136,7 @@ public class KlConceptFacade extends KlConceptServiceImpl {
                         //校验
                         klLibraryInfoFacade.checkLibraryInfoData(subVO);
                         //保存LibraryInfo
-                        res = klLibraryInfoFacade.savekLibraryInfoData(klConceptSaveVO.getConceptId(),subVO);
+                        res = klLibraryInfoFacade.savekLibraryInfoData(klConceptSaveVO.getConceptId(), subVO);
                     } else {
                         UpdateWrapper<KlLibraryInfo> klLibraryInfoQuerySub = new UpdateWrapper<>();
                         klLibraryInfoQuerySub.eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -205,29 +201,34 @@ public class KlConceptFacade extends KlConceptServiceImpl {
                 conceptCommon.setModifier(UserUtils.getCurrentPrincipleID());
                 conceptCommon.setGmtCreate(now);
                 conceptCommon.setGmtModified(now);
-                klConceptCommonService.save(conceptCommon);
+                klConceptCommonFacade.save(conceptCommon);
             }
             //更新kl_disease
-            KlDisease kllDiseaseSub = new KlDisease();
-            kllDiseaseSub.setConceptId(klConceptPare.getId());
-            kllDiseaseSub.setGmtModified(now);
-            kllDiseaseSub.setIcd10Code(klConceptSaveVO.getIcdCode());
-            kllDiseaseSub.setCreator(UserUtils.getCurrentPrincipleID());
-            kllDiseaseSub.setModifier(UserUtils.getCurrentPrincipleID());
-            kllDiseaseSub.setGmtCreate(now);
-            kllDiseaseSub.setGmtModified(now);
-            res = klDiseaseFacade.saveOrUpdate(kllDiseaseSub);
+            if (null != klConceptSaveVO.getIcdCode()) {
+                KlDisease kllDiseaseSub = new KlDisease();
+                kllDiseaseSub.setConceptId(klConceptPare.getId());
+                kllDiseaseSub.setGmtModified(now);
+                kllDiseaseSub.setIcd10Code(klConceptSaveVO.getIcdCode());
+                kllDiseaseSub.setCreator(UserUtils.getCurrentPrincipleID());
+                kllDiseaseSub.setModifier(UserUtils.getCurrentPrincipleID());
+                kllDiseaseSub.setGmtCreate(now);
+                kllDiseaseSub.setGmtModified(now);
+                res = klDiseaseFacade.save(kllDiseaseSub);
+            }
+
             //更新kl_lis
-            KlLis klLisSub = new KlLis();
-            klLisSub.setConceptId(klConceptPare.getId());
-            klLisSub.setMinValue(klConceptSaveVO.getMinVal());
-            klLisSub.setMaxValue(klConceptSaveVO.getMaxVal());
-            klLisSub.setType(klConceptSaveVO.getScopeType());
-            klLisSub.setCreator(UserUtils.getCurrentPrincipleID());
-            klLisSub.setModifier(UserUtils.getCurrentPrincipleID());
-            klLisSub.setGmtCreate(now);
-            klLisSub.setGmtModified(now);
-            res = klLisService.saveOrUpdate(klLisSub);
+            if (null != klConceptSaveVO.getScopeType()) {
+                KlLis klLisSub = new KlLis();
+                klLisSub.setConceptId(klConceptPare.getId());
+                klLisSub.setMinValue(klConceptSaveVO.getMinVal());
+                klLisSub.setMaxValue(klConceptSaveVO.getMaxVal());
+                klLisSub.setType(klConceptSaveVO.getScopeType());
+                klLisSub.setCreator(UserUtils.getCurrentPrincipleID());
+                klLisSub.setModifier(UserUtils.getCurrentPrincipleID());
+                klLisSub.setGmtCreate(now);
+                klLisSub.setGmtModified(now);
+                res = klLisFacade.save(klLisSub);
+            }
             //增加同义词
             List<KlConceptSaveSubVO> klConceptSub = klConceptSaveVO.getKlConceptSub();
             if (ListUtil.isNotEmpty(klConceptSub)) {
@@ -236,7 +237,7 @@ public class KlConceptFacade extends KlConceptServiceImpl {
 
                         klLibraryInfoFacade.checkLibraryInfoData(subVO);
 
-                        res = klLibraryInfoFacade.savekLibraryInfoData(klConceptPare.getId(),subVO);
+                        res = klLibraryInfoFacade.savekLibraryInfoData(klConceptPare.getId(), subVO);
                     }
                 }
             }
@@ -269,41 +270,17 @@ public class KlConceptFacade extends KlConceptServiceImpl {
         res = klLibraryInfoFacade.update(new KlLibraryInfo(), klLibraryInfoQuerySub);
         //更新kl_concept_common表
         if (null != klConceptSaveVO.getIsHasCommon() && klConceptSaveVO.getIsHasCommon().equals(1)) {
-            UpdateWrapper<KlConceptCommon> klConceptCommonQuerySub = new UpdateWrapper<>();
-            klConceptCommonQuerySub.eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .eq("concept_id", klConceptSaveVO.getConceptId())
-                    .set("gmt_modified", now)
-                    .set("modifier", UserUtils.getCurrentPrincipleID())
-                    .set("sex_type", klConceptSaveVO.getLibName())
-                    .set("min_age", klConceptSaveVO.getLibName())
-                    .set("max_age", klConceptSaveVO.getLibName());
-            KlConceptCommon klConceptCommonSub = new KlConceptCommon();
-            klConceptCommonSub.setConceptId(klConceptSaveVO.getConceptId());
-            klConceptCommonSub.setMaxAge(klConceptSaveVO.getMaxAge());
-            klConceptCommonSub.setMinAge(klConceptSaveVO.getMinAge());
-            klConceptCommonSub.setGmtModified(now);
-            klConceptCommonSub.setModifier(UserUtils.getCurrentPrincipleID());
-            res = klConceptCommonService.saveOrUpdate(klConceptCommonSub);
+            //当是疾病的时候才保存性别和年龄大小的数据
+            res = klConceptCommonFacade.saveOrUpdateAll(klConceptSaveVO);
         }
         //更新kl_disease
         if (null != klConceptSaveVO.getIcdCode()) {
-            KlDisease kllDiseaseSub = new KlDisease();
-            kllDiseaseSub.setConceptId(klConceptSaveVO.getConceptId());
-            kllDiseaseSub.setGmtModified(now);
-            kllDiseaseSub.setModifier(UserUtils.getCurrentPrincipleID());
-            kllDiseaseSub.setIcd10Code(klConceptSaveVO.getIcdCode());
-            res = klDiseaseFacade.saveOrUpdate(kllDiseaseSub);
+            //当icd10编码不为空
+            res = klDiseaseFacade.saveOrUpdateAll(klConceptSaveVO);
         }
         //更新kl_lis
         if (null != klConceptSaveVO.getScopeType()) {
-            KlLis klLisSub = new KlLis();
-            klLisSub.setConceptId(klConceptSaveVO.getConceptId());
-            klLisSub.setGmtModified(now);
-            klLisSub.setModifier(UserUtils.getCurrentPrincipleID());
-            klLisSub.setMinValue(klConceptSaveVO.getMinVal());
-            klLisSub.setMaxValue(klConceptSaveVO.getMaxVal());
-            klLisSub.setType(klConceptSaveVO.getScopeType());
-            res = klLisService.saveOrUpdate(klLisSub);
+            res = klLisFacade.saveOrUpdateAll(klConceptSaveVO);
         }
         return res;
     }

cdssman-service/src/main/java/com/diagbot/facade/KlDiseaseFacade.java

@@ -1,31 +1,43 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.UserServiceClient;
-import com.diagbot.dto.*;
+import com.diagbot.dto.DiseaseAllDetailDTO;
+import com.diagbot.dto.DiseaseDetailDTO;
+import com.diagbot.dto.DiseasePageDTO;
+import com.diagbot.dto.DiseaseSubDetailDTO;
+import com.diagbot.dto.DiseaseTreeDetailDTO;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.KlConcept;
+import com.diagbot.entity.KlDisease;
 import com.diagbot.entity.KlLexiconRelationship;
 import com.diagbot.enums.DiseaseRelationTypeEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.RelationLibTypeEnum;
-import com.diagbot.service.KlDiseaseService;
-import com.diagbot.service.KlLexiconRelationshipService;
 import com.diagbot.service.impl.KlDiseaseServiceImpl;
+import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.StringUtil;
+import com.diagbot.util.UserUtils;
 import com.diagbot.vo.DiseaseDeleteVO;
 import com.diagbot.vo.DiseasePageVO;
 import com.diagbot.vo.GetDiseaseDetailVO;
+import com.diagbot.vo.KlConceptSaveVO;
 import com.google.common.collect.Maps;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -91,11 +103,11 @@ public class KlDiseaseFacade extends KlDiseaseServiceImpl {
      * @return
      */
     public DiseaseTreeDetailDTO getDetail(GetDiseaseDetailVO getDiseaseDetailVO) {
-        List<Integer> relations = Arrays.asList(501,502,503,504,505,506,507,508);
+        List<Integer> relations = Arrays.asList(501, 502, 503, 504, 505, 506, 507, 508);
         List<KlLexiconRelationship> klLexiconRelationships = klLexiconRelationshipFacade.list(new QueryWrapper<KlLexiconRelationship>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .in("code", relations)
-        .orderByAsc("code"));
+                .orderByAsc("code"));
         Map<Integer, String> relation_name = klLexiconRelationships.stream().collect(Collectors.toMap(KlLexiconRelationship::getCode, KlLexiconRelationship::getName, (key1, key2) -> key2));
         DiseaseTreeDetailDTO diseaseTreeDetailDTO = new DiseaseTreeDetailDTO();
 
@@ -138,15 +150,15 @@ public class KlDiseaseFacade extends KlDiseaseServiceImpl {
         }
         List<DiseaseSubDetailDTO> datas = Lists.newArrayList();
         List<List<String>> types = Lists.newArrayList();
-        relation_name.forEach((x,y)->{
+        relation_name.forEach((x, y) -> {
             List<String> split = Arrays.asList(DiseaseRelationTypeEnum.getName(x).split("&"));
             List<Integer> collect = Arrays.stream(RelationLibTypeEnum.getName(x).split("&")).map(z -> Integer.parseInt(z)).collect(Collectors.toList());
             types.add(split);
-            if(disSubDetailMap.containsKey(x)){
+            if (disSubDetailMap.containsKey(x)) {
                 DiseaseSubDetailDTO diseaseSubDetailDTO = disSubDetailMap.get(x);
                 diseaseSubDetailDTO.setLibType(collect);
                 datas.add(diseaseSubDetailDTO);
-            }else {
+            } else {
                 DiseaseSubDetailDTO diseaseSubDetailDTO = new DiseaseSubDetailDTO();
                 diseaseSubDetailDTO.setLibType(collect);
                 diseaseSubDetailDTO.setRname(relation_name.get(x));
@@ -161,5 +173,26 @@ public class KlDiseaseFacade extends KlDiseaseServiceImpl {
     }
 
 
+    public boolean saveOrUpdateAll(KlConceptSaveVO klConceptSaveVO) {
+        Date now = DateUtil.now();
+        boolean res = false;
+        if (null != klConceptSaveVO.getConceptId()) {
+            UpdateWrapper<KlDisease> klDiseaseQuerySub = new UpdateWrapper<>();
+            klDiseaseQuerySub.eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("concept_id", klConceptSaveVO.getConceptId())
+                    .set("gmt_modified", now)
+                    .set("modifier", UserUtils.getCurrentPrincipleID())
+                    .set(StringUtil.isNotBlank(klConceptSaveVO.getIcdCode()),"icd10_code", klConceptSaveVO.getIcdCode());
+            res = this.update(new KlDisease(),klDiseaseQuerySub);
+        } else {
+            KlDisease kllDiseaseSub = new KlDisease();
+            kllDiseaseSub.setConceptId(klConceptSaveVO.getConceptId());
+            kllDiseaseSub.setGmtModified(now);
+            kllDiseaseSub.setModifier(UserUtils.getCurrentPrincipleID());
+            kllDiseaseSub.setIcd10Code(klConceptSaveVO.getIcdCode());
+            res = this.save(kllDiseaseSub);
+        }
+        return res;
+    }
 }
 

cdssman-service/src/main/java/com/diagbot/facade/KlLisFacade.java

@@ -0,0 +1,50 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.entity.KlDisease;
+import com.diagbot.entity.KlLis;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.KlLisService;
+import com.diagbot.service.impl.KlLisServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.UserUtils;
+import com.diagbot.vo.KlConceptSaveVO;
+import org.checkerframework.checker.units.qual.C;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2021-03-18 16:38
+ */
+@Component
+public class KlLisFacade extends KlLisServiceImpl {
+
+    public boolean saveOrUpdateAll(KlConceptSaveVO klConceptSaveVO) {
+        Date now = DateUtil.now();
+        boolean res = false;
+        if (null != klConceptSaveVO.getConceptId()) {
+            UpdateWrapper<KlLis> klDiseaseQuerySub = new UpdateWrapper<>();
+            klDiseaseQuerySub.eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("concept_id", klConceptSaveVO.getConceptId())
+                    .set("gmt_modified", now)
+                    .set("modifier", UserUtils.getCurrentPrincipleID())
+                    .set("min_value", klConceptSaveVO.getMinVal())
+                    .set("max_value", klConceptSaveVO.getMaxVal())
+                    .set("type", klConceptSaveVO.getScopeType());
+            res = this.update(new KlLis(),klDiseaseQuerySub);
+        } else {
+            KlLis klLisSub = new KlLis();
+            klLisSub.setConceptId(klConceptSaveVO.getConceptId());
+            klLisSub.setGmtModified(now);
+            klLisSub.setModifier(UserUtils.getCurrentPrincipleID());
+            klLisSub.setMinValue(klConceptSaveVO.getMinVal());
+            klLisSub.setMaxValue(klConceptSaveVO.getMaxVal());
+            klLisSub.setType(klConceptSaveVO.getScopeType());
+            res = this.save(klLisSub);
+        }
+        return res;
+    }
+}