增加科室

cdssman-service/src/main/java/com/diagbot/dto/KlConceptAllDTO.java

@@ -35,5 +35,7 @@ public class KlConceptAllDTO {
     private String  icdCode;
     private String remark;
     private Integer drug;
+    private Long deptId;
+    private String deptName;
     private List<KlConceptAllSubDTO> klConceptSub;
 }

cdssman-service/src/main/java/com/diagbot/entity/KlDisease.java

@@ -54,6 +54,7 @@ public class KlDisease implements Serializable {
      */
     private Long conceptId;
 
+    private Long deptId;
     /**
      * ICD10编号
      */
@@ -64,6 +65,14 @@ public class KlDisease implements Serializable {
      */
     private String remark;
 
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
     public Long getId() {
         return id;
     }

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

@@ -20,6 +20,7 @@ import com.diagbot.entity.KlRelation;
 import com.diagbot.entity.KlRule;
 import com.diagbot.entity.KlRuleBase;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.LexiconEnum;
 import com.diagbot.enums.StatusEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -46,6 +47,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
@@ -144,12 +146,21 @@ public class KlConceptFacade extends KlConceptServiceImpl {
      * @return
      */
     public KlConceptAllDTO getConceptAlls(KlConceptAllVO klConceptAllVO) {
+        //获取科室；
+        QueryWrapper<KlConcept> klConceptQuer = new QueryWrapper<>();
+        klConceptQuer.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("lib_type", LexiconEnum.Dept.getKey());
+        List<KlConcept> klConceptsDept = list(klConceptQuer);
+        Map<Long, String> deptMap = klConceptsDept.stream().collect(HashMap::new,
+                (m, v) -> m.put(v.getId(), v.getLibName()), HashMap::putAll);
         List<KlConceptAllDTO> conceptAll = getConceptAll(klConceptAllVO);
         KlConceptAllDTO klConceptAll = new KlConceptAllDTO();
         List<KlConceptAllSubDTO> klConceptSub = new ArrayList<>();
         if (ListUtil.isNotEmpty(conceptAll)) {
             for (KlConceptAllDTO data : conceptAll) {
                 if (data.getIsConcept().equals(1)) {
+                    if (null != data.getDeptId()) {
+                        data.setDeptName(deptMap.get(data.getDeptId()));
+                    }
                     BeanUtil.copyProperties(data, klConceptAll);
                 } else {
                     KlConceptAllSubDTO klConceptAllSubDTO = new KlConceptAllSubDTO();

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

@@ -187,12 +187,14 @@ public class KlDiseaseFacade extends KlDiseaseServiceImpl {
                         .eq("concept_id", klConceptSaveVO.getConceptId())
                         .set("gmt_modified", now)
                         .set("modifier", UserUtils.getCurrentPrincipleID())
+                        .set("dept_id", klConceptSaveVO.getDeptId())
                         .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.setDeptId(klConceptSaveVO.getDeptId());
                 kllDiseaseSub.setModifier(UserUtils.getCurrentPrincipleID());
                 kllDiseaseSub.setIcd10Code(klConceptSaveVO.getIcdCode());
                 res = this.save(kllDiseaseSub);
@@ -202,6 +204,7 @@ public class KlDiseaseFacade extends KlDiseaseServiceImpl {
             KlDisease kllDiseaseSub = new KlDisease();
             kllDiseaseSub.setConceptId(klConceptSaveVO.getConceptId());
             kllDiseaseSub.setGmtModified(now);
+            kllDiseaseSub.setDeptId(klConceptSaveVO.getDeptId());
             kllDiseaseSub.setModifier(UserUtils.getCurrentPrincipleID());
             kllDiseaseSub.setIcd10Code(klConceptSaveVO.getIcdCode());
             res = this.save(kllDiseaseSub);
@@ -214,6 +217,7 @@ public class KlDiseaseFacade extends KlDiseaseServiceImpl {
         KlDisease kllDiseaseSub = new KlDisease();
         kllDiseaseSub.setConceptId(klConceptPare.getId());
         kllDiseaseSub.setGmtModified(now);
+        kllDiseaseSub.setDeptId(klConceptSaveVO.getDeptId());
         kllDiseaseSub.setIcd10Code(klConceptSaveVO.getIcdCode());
         kllDiseaseSub.setCreator(UserUtils.getCurrentPrincipleID());
         kllDiseaseSub.setModifier(UserUtils.getCurrentPrincipleID());

cdssman-service/src/main/java/com/diagbot/vo/KlConceptSaveVO.java

@@ -40,5 +40,6 @@ public class KlConceptSaveVO {
     private String icdCode;
     private String remark;
     private Integer drug;
+    private Long deptId;
     private List<KlConceptSaveSubVO> klConceptSub;
 }

cdssman-service/src/main/resources/mapper/KlConceptMapper.xml

@@ -74,6 +74,7 @@
         g.max_value AS maxVal,
         g.unit AS unit,
         g.type AS scopeType,
+        h.dept_id AS deptId,
         h.icd10_code AS icdCode,
         dr.drug ,
         a.remark

cdssman-service/src/main/resources/mapper/KlDiseaseMapper.xml

@@ -11,6 +11,7 @@
         <result column="creator" property="creator"/>
         <result column="modifier" property="modifier"/>
         <result column="concept_id" property="conceptId"/>
+        <result column="dept_id" property="deptId"/>
         <result column="icd10_code" property="icd10Code"/>
         <result column="remark" property="remark"/>
     </resultMap>