添加中医疾病、症候

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

@@ -49,4 +49,10 @@ public class KlConceptAllDTO {
 
     //体征结果扩展信息
     private KlVitalResultDTO klVitalResultDTO;
+
+    // 中医疾病扩展信息
+    private KlTcmDiseaseDTO klTcmDiseaseDTO;
+
+    // 中医证候扩展信息
+    private KlTcmSyndromeDTO klTcmSyndromeDTO;
 }

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

@@ -0,0 +1,26 @@
+package com.diagbot.dto;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 药品通用名导出
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-05-11
+ */
+@Data
+public class KlDrugExportDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 注册名称
+     */
+    @Excel(name = "药品通用名", orderNum = "1")
+    private String name;
+}

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

@@ -19,11 +19,6 @@ public class KlSymptomDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 术语概念id
-     */
-    private Long conceptId;
-
     /**
      * 阳性症状（0：否，1：是）
      */

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

@@ -0,0 +1,32 @@
+package com.diagbot.dto;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+;
+
+/**
+ * <p>
+ * 中医疾病
+ * </p>
+ *
+ * @author kwz
+ * @since 2021-05-11
+ */
+@Data
+public class KlTcmDiseaseDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

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

@@ -0,0 +1,28 @@
+package com.diagbot.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+/**
+ * <p>
+ * 中医证候
+ * </p>
+ *
+ * @author kwz
+ * @since 2021-05-11
+ */
+@Data
+public class KlTcmSyndromeDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

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

@@ -0,0 +1,69 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 中医疾病表
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-05-28
+ */
+@Data
+public class KlTcmDisease implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 术语概念id
+     */
+    private Long conceptId;
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

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

@@ -0,0 +1,68 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 中医证候表
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-05-28
+ */
+@Data
+public class KlTcmSyndrome implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 术语概念id
+     */
+    private Long conceptId;
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

cdssman-service/src/main/java/com/diagbot/enums/LexiconEnum.java

@@ -36,6 +36,10 @@ public enum LexiconEnum implements KeyedNamed {
     Nurse(123,"护理"),
     Scale(124,"量表"),
     Unit(125,"单位"),
+    Nature(126,"性质"),
+    Tcmdisease(127, "中医疾病"),
+    Tcmsyndrome(128, "中医证候"),
+    Inducement(129, "诱因"),
     ICD10Class(300,"ICD10疾病类别"),
     MedChemClass(301,"药品化学物质类别"),
     MedZhiLiaoClass(302,"药品治疗学类别"),
@@ -43,6 +47,7 @@ public enum LexiconEnum implements KeyedNamed {
     MedJiePouClass(304,"药品解剖学类别"),
     SymptomClass(305,"症状类别"),
     OperationClass(306,"手术和操作类别"),
+    DisSysType(307,"疾病系统分类"),
     ICD10ClassNode(400,"ICD10疾病类别根节点"),
     DeptDiseaseNode(401,"科室疾病类别根节点"),
     MedChemClassNode(402,"药品化学物质类别根节点"),
@@ -53,9 +58,7 @@ public enum LexiconEnum implements KeyedNamed {
     OperationClassNode(407,"手术和操作类别根节点"),
     LisClassNode(408,"实验室检查类别根节点"),
     PacsClassNode(409,"辅助检查类别根节点"),
-    Age(410,"年龄"),
-    DisSysType(307,"疾病系统分类"),
-    Nature(126,"性质");
+    Age(410,"年龄");
 
 
     @Setter

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

@@ -100,6 +100,10 @@ public class KlConceptFacade extends KlConceptServiceImpl {
     KlVitalResFacade klVitalResFacade;
     @Autowired
     KlDrugMappingFacade klDrugMappingFacade;
+    @Autowired
+    KlTcmDiseaseFacade klTcmDiseaseFacade;
+    @Autowired
+    KlTcmSyndromeFacade klTcmSyndromeFacade;
 
 
     /**
@@ -207,6 +211,12 @@ public class KlConceptFacade extends KlConceptServiceImpl {
                 case VitalResult: //体征结果扩展 kl_vital_result, kl_relation，kl_relation_order
                     klVitalResFacade.getKlVitalResult(conceptId, klConceptAll);
                     break;
+                case Tcmdisease: // 中医疾病
+                    klTcmDiseaseFacade.getKlTcmDisease(conceptId, klConceptAll);
+                    break;
+                case Tcmsyndrome: // 中医证候
+                    klTcmSyndromeFacade.getKlTcmSyndrome(conceptId, klConceptAll);
+                    break;
             }
         }
         return klConceptAll;
@@ -343,20 +353,26 @@ public class KlConceptFacade extends KlConceptServiceImpl {
                 case Medicine: //  药品通用名扩展 kl_drug
                     klDrugFacade.saveKlDrug(commonParam, klConceptSaveVO.getKlDrugVO());
                     break;
-                case LisName:
-                case LisSubName:
+                case LisName: // 实验室检查套餐
+                case LisSubName: // 实验室检查子项目
                     klLisFacade.saveAll(commonParam,klConceptSaveVO.getKlLisVO());
                     break;
-                case PacsSubName:
-                case PacsName:
+                case PacsSubName: // 辅助检查子项目
+                case PacsName: // 辅助检查项目
                     klPacsFacade.saveAll(commonParam,klConceptSaveVO.getKlPacsVO());
                     break;
-                case Operation:
+                case Operation: // 手术和操作
                     klOperationFacade.saveAll(commonParam,klConceptSaveVO.getKlOperationVO());
                     break;
-                case VitalResult:
+                case VitalResult: // 体征结果
                     klRelationFacade.saveKlVitalRes(commonParam, klConceptSaveVO.getKlVitalResultVO());
                     break;
+                case Tcmdisease: // 中医疾病
+                    klTcmDiseaseFacade.saveAll(commonParam, klConceptSaveVO.getKlTcmDiseaseVO());
+                    break;
+                case Tcmsyndrome: // 中医证候
+                    klTcmSyndromeFacade.saveAll(commonParam, klConceptSaveVO.getKlTcmSyndromeVO());
+                    break;
             }
         }
         return res;

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

@@ -238,6 +238,13 @@ public class KlDrugRegisterFacade extends KlDrugRegisterServiceImpl {
                 for (String s : errMsg) {
                     System.out.println(s);
                 }
+                // List<KlDrugExportDTO> klDrugExportDTOList = Lists.newLinkedList();
+                // for (String s : errMsg) {
+                //     KlDrugExportDTO klDrugExportDTO = new KlDrugExportDTO();
+                //     klDrugExportDTO.setName(s);
+                //     klDrugExportDTOList.add(klDrugExportDTO);
+                // }
+                // ExcelUtils.exportExcel(klDrugExportDTOList, null, "title");
                 res.put("错误", StringUtils.join(errMsg, "；"));
                 return res;
             }

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

@@ -0,0 +1,57 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.KlConceptAllDTO;
+import com.diagbot.dto.KlTcmDiseaseDTO;
+import com.diagbot.entity.CommonParam;
+import com.diagbot.entity.KlTcmDisease;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.impl.KlTcmDiseaseServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.vo.KlTcmDiseaseVO;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author zhoutg
+ * @Description:
+ * @date 2021-03-18 16:38
+ */
+@Component
+public class KlTcmDiseaseFacade extends KlTcmDiseaseServiceImpl {
+
+    /**
+     * 保存中医疾病扩展表
+     *
+     * @param commonParam
+     * @param klTcmDiseaseVO
+     * @return
+     */
+    public boolean saveAll(CommonParam commonParam, KlTcmDiseaseVO klTcmDiseaseVO) {
+        if (klTcmDiseaseVO == null) {
+            return false;
+        }
+        // 先删除扩展表
+        this.remove(new QueryWrapper<KlTcmDisease>().eq("concept_id", commonParam.getConceptId()));
+        // 重新插入扩展表
+        KlTcmDisease klTcmDisease = new KlTcmDisease();
+        BeanUtil.copyProperties(klTcmDiseaseVO, klTcmDisease);
+        klTcmDisease.setConceptId(commonParam.getConceptId());
+        klTcmDisease.setGmtModified(commonParam.getNow());
+        klTcmDisease.setGmtCreate(commonParam.getNow());
+        klTcmDisease.setCreator(commonParam.getPerson());
+        klTcmDisease.setModifier(commonParam.getPerson());
+        return this.save(klTcmDisease);
+    }
+
+    public void getKlTcmDisease(Long conceptId, KlConceptAllDTO klConceptAll) {
+        KlTcmDisease klTcmDisease = this.getOne(new QueryWrapper<KlTcmDisease>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("concept_id", conceptId), false);
+        if (klTcmDisease == null) {
+            return;
+        }
+        KlTcmDiseaseDTO klTcmDiseaseDTO = new KlTcmDiseaseDTO();
+        BeanUtil.copyProperties(klTcmDisease, klTcmDiseaseDTO);
+        klConceptAll.setKlTcmDiseaseDTO(klTcmDiseaseDTO);
+    }
+}

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

@@ -0,0 +1,57 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.KlConceptAllDTO;
+import com.diagbot.dto.KlTcmSyndromeDTO;
+import com.diagbot.entity.CommonParam;
+import com.diagbot.entity.KlTcmSyndrome;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.impl.KlTcmSyndromeServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.vo.KlTcmSyndromeVO;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author zhoutg
+ * @Description:
+ * @date 2021-03-18 16:38
+ */
+@Component
+public class KlTcmSyndromeFacade extends KlTcmSyndromeServiceImpl {
+
+    /**
+     * 保存中医症候扩展表
+     *
+     * @param commonParam
+     * @param klTcmSyndromeVO
+     * @return
+     */
+    public boolean saveAll(CommonParam commonParam, KlTcmSyndromeVO klTcmSyndromeVO) {
+        if (klTcmSyndromeVO == null) {
+            return false;
+        }
+        // 先删除扩展表
+        this.remove(new QueryWrapper<KlTcmSyndrome>().eq("concept_id", commonParam.getConceptId()));
+        // 重新插入扩展表
+        KlTcmSyndrome klTcmSyndrome = new KlTcmSyndrome();
+        BeanUtil.copyProperties(klTcmSyndromeVO, klTcmSyndrome);
+        klTcmSyndrome.setConceptId(commonParam.getConceptId());
+        klTcmSyndrome.setGmtModified(commonParam.getNow());
+        klTcmSyndrome.setGmtCreate(commonParam.getNow());
+        klTcmSyndrome.setCreator(commonParam.getPerson());
+        klTcmSyndrome.setModifier(commonParam.getPerson());
+        return this.save(klTcmSyndrome);
+    }
+
+    public void getKlTcmSyndrome(Long conceptId, KlConceptAllDTO klConceptAll) {
+        KlTcmSyndrome KlTcmSyndrome = this.getOne(new QueryWrapper<KlTcmSyndrome>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("concept_id", conceptId), false);
+        if (KlTcmSyndrome == null) {
+            return;
+        }
+        KlTcmSyndromeDTO klTcmSyndromeDTO = new KlTcmSyndromeDTO();
+        BeanUtil.copyProperties(KlTcmSyndrome, klTcmSyndromeDTO);
+        klConceptAll.setKlTcmSyndromeDTO(klTcmSyndromeDTO);
+    }
+}

cdssman-service/src/main/java/com/diagbot/mapper/KlTcmDiseaseMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.KlTcmDisease;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 中医疾病表 Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-05-28
+ */
+public interface KlTcmDiseaseMapper extends BaseMapper<KlTcmDisease> {
+
+}

cdssman-service/src/main/java/com/diagbot/mapper/KlTcmSyndromeMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.KlTcmSyndrome;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 中医证候表 Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-05-28
+ */
+public interface KlTcmSyndromeMapper extends BaseMapper<KlTcmSyndrome> {
+
+}

cdssman-service/src/main/java/com/diagbot/service/KlTcmDiseaseService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.KlTcmDisease;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 中医疾病表 服务类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-05-28
+ */
+public interface KlTcmDiseaseService extends IService<KlTcmDisease> {
+
+}

cdssman-service/src/main/java/com/diagbot/service/KlTcmSyndromeService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.KlTcmSyndrome;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 中医证候表 服务类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-05-28
+ */
+public interface KlTcmSyndromeService extends IService<KlTcmSyndrome> {
+
+}

cdssman-service/src/main/java/com/diagbot/service/impl/KlTcmDiseaseServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.KlTcmDisease;
+import com.diagbot.mapper.KlTcmDiseaseMapper;
+import com.diagbot.service.KlTcmDiseaseService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 中医疾病表 服务实现类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-05-28
+ */
+@Service
+public class KlTcmDiseaseServiceImpl extends ServiceImpl<KlTcmDiseaseMapper, KlTcmDisease> implements KlTcmDiseaseService {
+
+}

cdssman-service/src/main/java/com/diagbot/service/impl/KlTcmSyndromeServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.KlTcmSyndrome;
+import com.diagbot.mapper.KlTcmSyndromeMapper;
+import com.diagbot.service.KlTcmSyndromeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 中医证候表 服务实现类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-05-28
+ */
+@Service
+public class KlTcmSyndromeServiceImpl extends ServiceImpl<KlTcmSyndromeMapper, KlTcmSyndrome> implements KlTcmSyndromeService {
+
+}

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

@@ -67,4 +67,10 @@ public class KlConceptSaveVO {
     // 体征结果扩展信息
     private KlVitalResultVO klVitalResultVO;
 
+    // 中医疾病表
+    private KlTcmDiseaseVO klTcmDiseaseVO;
+
+    // 中医证候表
+    private KlTcmSyndromeVO klTcmSyndromeVO;
+
 }

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

@@ -0,0 +1,23 @@
+package com.diagbot.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 中医疾病表
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-05-28
+ */
+@Data
+public class KlTcmDiseaseVO implements Serializable {
+
+    /**
+     * 编码
+     */
+    private String code;
+
+}

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

@@ -0,0 +1,22 @@
+package com.diagbot.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 中医证候表
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-05-28
+ */
+@Data
+public class KlTcmSyndromeVO implements Serializable {
+
+    /**
+     * 编码
+     */
+    private String code;
+}

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.KlTcmDiseaseMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.KlTcmDisease">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="concept_id" property="conceptId" />
+        <result column="code" property="code" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.KlTcmSyndromeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.KlTcmSyndrome">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="concept_id" property="conceptId" />
+        <result column="code" property="code" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

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

@@ -56,7 +56,7 @@ public class CodeGeneration {
         StrategyConfig strategy = new StrategyConfig();
         //strategy.setTablePrefix(new String[] { "test" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "kl_lis","kl_operation","kl_pacs","kl_vital_result"}); // 需要生成的表
+        strategy.setInclude(new String[] { "kl_tcm_disease","kl_tcm_syndrome"}); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);