Merge branch 'dev/formula_20220301' into debug

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

@@ -13,7 +13,7 @@ import java.util.Date;
  * </p>
  *
  * @author zhoutg
- * @since 2021-05-11
+ * @since 2022-03-03
  */
 @Data
 public class KlDisease implements Serializable {
@@ -66,6 +66,21 @@ public class KlDisease implements Serializable {
      */
     private String icd10Code;
 
+    /**
+     * 国临名称
+     */
+    private String guoname;
+
+    /**
+     * 国临编码
+     */
+    private String guocode;
+
+    /**
+     * 国临拼音
+     */
+    private String guospell;
+
     /**
      * 病程
      */
@@ -167,14 +182,14 @@ public class KlDisease implements Serializable {
     private String enName;
 
     /**
-     * 肿瘤细胞类型
+     * 形态学分类代码
      */
-    private String tumorCellType;
+    private String morphology;
 
     /**
-     * 形态学分类代码
+     * 肿瘤细胞类型
      */
-    private String morphology;
+    private String tumorCellType;
 
     /**
      * 备注

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

@@ -7,6 +7,7 @@ import com.diagbot.dto.ExportConceptAllDTO;
 import com.diagbot.dto.ExportConceptModeDTO;
 import com.diagbot.entity.KlConcept;
 import com.diagbot.entity.KlConceptCommon;
+import com.diagbot.entity.KlDisease;
 import com.diagbot.entity.KlLexicon;
 import com.diagbot.entity.KlLibraryInfo;
 import com.diagbot.enums.IsDeleteEnum;
@@ -298,6 +299,7 @@ public class TermImportFacade {
             }
         }
         res = klLibraryInfoService.saveBatch(libraryInfosSub);
+        List<Long> conceptIds = new ArrayList<>();
         //年龄
         List<KlConceptCommon> conceptCommonList = new ArrayList<>();
         for (Map.Entry<String, ImportConceptAllVO> entry : conceptListMap.entrySet()) {
@@ -315,14 +317,41 @@ public class TermImportFacade {
                     conceptCommon.setGmtCreate(now);
                     conceptCommon.setGmtModified(now);
                     conceptCommonList.add(conceptCommon);
+                    conceptIds.add(klConcept.getId());
                 }
             }
 
 
         }
         res = klConceptCommonService.saveBatch(conceptCommonList);
+        //疾病表
+        if (ListUtil.isNotEmpty(conceptIds)) {
+            QueryWrapper<KlDisease> klDisease = new QueryWrapper<>();
+            klDisease.lambda().eq(KlDisease::getIsDeleted, IsDeleteEnum.N.getKey())
+                    .in(KlDisease::getConceptId, conceptIds);
+            List<KlDisease> list = klDiseaseFacade.list(klDisease);
+            List<Long> diseaseConceptId = list.stream().map(ac -> ac.getConceptId()).collect(Collectors.toList());
+            if (ListUtil.isNotEmpty(diseaseConceptId)) {
+                conceptIds.retainAll(diseaseConceptId);
+            }
+            List<KlDisease> klDiseaseData = new ArrayList<>();
+            for (Long id : conceptIds) {
+                KlDisease data = new KlDisease();
+                data.setConceptId(id);
+                data.setCreator(UserUtils.getCurrentPrincipleID());
+                data.setModifier(UserUtils.getCurrentPrincipleID());
+                data.setGmtCreate(now);
+                data.setGmtModified(now);
+                klDiseaseData.add(data);
+            }
+
+            res = klDiseaseService.saveBatch(klDiseaseData);
+        }
+
+
     }
 
+
     public void exportTemplateAll(HttpServletResponse response) {
         //类型数据
         QueryWrapper<KlLexicon> klLexiconQuer = new QueryWrapper<>();

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

@@ -25,6 +25,21 @@ public class KlDiseaseVO implements Serializable {
      */
     private String icd10Code;
 
+    /**
+     * 国临名称
+     */
+    private String guoname;
+
+    /**
+     * 国临编码
+     */
+    private String guocode;
+
+    /**
+     * 国临拼音
+     */
+    private String guospell;
+
     /**
      * 病程
      */

cdssman-service/src/main/java/com/diagbot/web/KlConceptController.java

@@ -72,6 +72,9 @@ public class KlConceptController {
                     "<br>" +
                     "【klDiseaseVO：疾病扩展信息】\n" +
                     "icd10Code：ICD10编号\n" +
+                    "guoname：国临名称\n" +
+                    "guocode：国临编码\n" +
+                    "guospell：国临拼音\n" +
                     "course：病程\n" +
                     "inducement：诱因\n" +
                     "foodProhibition：饮食禁忌\n" +

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

@@ -13,6 +13,9 @@
         <result column="concept_id" property="conceptId" />
         <result column="dept_id" property="deptId" />
         <result column="icd10_code" property="icd10Code" />
+        <result column="guoname" property="guoname" />
+        <result column="guocode" property="guocode" />
+        <result column="guospell" property="guospell" />
         <result column="course" property="course" />
         <result column="inducement" property="inducement" />
         <result column="food_prohibition" property="foodProhibition" />

cdssman-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -49,14 +49,14 @@ public class CodeGeneration {
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("lantone");
-        dsc.setUrl("jdbc:mysql://192.168.2.236:3306/cdss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8");
+        dsc.setUrl("jdbc:mysql://192.168.2.236:3306/med_2021?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8");
         mpg.setDataSource(dsc);
 
         // 策略配置
         StrategyConfig strategy = new StrategyConfig();
         //strategy.setTablePrefix(new String[] { "test" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "tran_hospital_relation"}); // 需要生成的表
+        strategy.setInclude(new String[] { "kl_disease"}); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);