诊断依据导入

src/main/java/com/diagbot/entity/KlDiagnoseBaseRelation.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-06-30
+ */
+@Data
+public class KlDiagnoseBaseRelation 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;
+
+    /**
+     * diagnose_base_id
+     */
+    private Long diagnoseBaseId;
+
+    /**
+     * concept_id
+     */
+    private Long conceptId;
+
+    /**
+     * 排序号
+     */
+    private Integer orderNo;
+}

src/main/java/com/diagbot/facade/KlDiagnoseBaseRelationFacade.java

@@ -0,0 +1,14 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.KlDiagnoseBaseRelationServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: zhoutg
+ * @time: 2021/3/15 10:58
+ */
+@Component
+public class KlDiagnoseBaseRelationFacade extends KlDiagnoseBaseRelationServiceImpl {
+
+}

src/main/java/com/diagbot/facade/KlDiagnoseFacade.java

@@ -10,6 +10,7 @@ import com.diagbot.dto.KlDiagnoseInfoDTO;
 import com.diagbot.dto.KlDiagnoseTypeDTO;
 import com.diagbot.entity.KlDiagnose;
 import com.diagbot.entity.KlDiagnoseBase;
+import com.diagbot.entity.KlDiagnoseBaseRelation;
 import com.diagbot.entity.KlDiagnoseCondition;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
@@ -49,6 +50,8 @@ public class KlDiagnoseFacade extends KlDiagnoseServiceImpl {
     KlDiagnoseBaseFacade klDiagnoseBaseFacade;
     @Autowired
     KlDictionaryInfoFacade klDictionaryInfoFacade;
+    @Autowired
+    KlDiagnoseBaseRelationFacade klDiagnoseBaseRelationFacade;
 
 
     public IPage<KlDiagnoseInfoDTO> getKlDiagnoseInfoPage(KlDiagnoseInfoVO klDiagnoseInfoVO) {
@@ -137,6 +140,7 @@ public class KlDiagnoseFacade extends KlDiagnoseServiceImpl {
 
     public Boolean saveDiagnoseAll(KlDiagnoseSaveVO klDiagnoseSaveVO) {
         Date now = DateUtil.now();
+        klDiagnoseSaveVO.setNow(now);
         boolean res = false;
         // 校验名称是否相同
         int count = this.count(new QueryWrapper<KlDiagnose>()
@@ -211,6 +215,9 @@ public class KlDiagnoseFacade extends KlDiagnoseServiceImpl {
             //删除kl_rule_base表数据
             res = klDiagnoseBaseFacade.remove(klDiagnoseBaseQuery);
 
+            // 删除kl_diagnose_base_relation
+            klDiagnoseBaseRelationFacade.remove(new QueryWrapper<KlDiagnoseBaseRelation>()
+                    .in("diagnose_base_id", baseId));
         }
         //删除kl_rule_condition表的数据
         res = klDiagnoseConditionFacade.remove(klDiagnoseQuery);
@@ -218,7 +225,7 @@ public class KlDiagnoseFacade extends KlDiagnoseServiceImpl {
     }
 
     public Boolean saveCommon(KlDiagnoseSaveVO klDiagnoseSaveVO) {
-        Date now = DateUtil.now();
+        Date now = klDiagnoseSaveVO.getNow();
         boolean res = false;
         int sum = 99;
         int baseGroup = 9;
@@ -235,6 +242,8 @@ public class KlDiagnoseFacade extends KlDiagnoseServiceImpl {
                     klDiagnoseCondition.setDiagnoseId(klDiagnoseSaveVO.getId());
                     klDiagnoseCondition.setBaseGroup(baseGroup);//
                     klDiagnoseCondition.setFitNo(data2.getFitNo());
+                    klDiagnoseCondition.setGmtCreate(now);
+                    klDiagnoseCondition.setGmtModified(now);
                     klDiagnoseConditionFacade.save(klDiagnoseCondition);
                     //明细
                     List<KlDiagnoseDetailVO> klDiagnoseDetail = data2.getKlDiagnoseDetail();
@@ -242,9 +251,6 @@ public class KlDiagnoseFacade extends KlDiagnoseServiceImpl {
                         for (KlDiagnoseDetailVO detailVO : klDiagnoseDetail) {
                             if (null != detailVO) {
                                 KlDiagnoseBase klDiagnoseBase = new KlDiagnoseBase();
-                                klDiagnoseBase.setGmtModified(now);
-                                // TODO
-                                // klDiagnoseBase.setConceptId(detailVO.getBasConceptId());
                                 klDiagnoseBase.setType(detailVO.getBasType());
                                 klDiagnoseBase.setDescription(detailVO.getBasDescription());
                                 klDiagnoseBase.setMaxOperator(detailVO.getMaxOperator());
@@ -257,21 +263,35 @@ public class KlDiagnoseFacade extends KlDiagnoseServiceImpl {
                                 klDiagnoseBase.setEqValue(detailVO.getEqValue());
                                 klDiagnoseBase.setEqOperator(detailVO.getEqOperator());
                                 klDiagnoseBase.setEqUnit(detailVO.getEqUnit());
+                                klDiagnoseBase.setGmtCreate(now);
+                                klDiagnoseBase.setGmtModified(now);
                                 res = klDiagnoseBaseFacade.save(klDiagnoseBase);
+
+                                if (ListUtil.isNotEmpty(detailVO.getBasConceptId())) {
+                                    List<KlDiagnoseBaseRelation> klDiagnoseBaseRelationList = new ArrayList<>();
+                                    for (Long conceptId : detailVO.getBasConceptId()) {
+                                        KlDiagnoseBaseRelation baseRelation = new KlDiagnoseBaseRelation();
+                                        baseRelation.setConceptId(conceptId);
+                                        baseRelation.setDiagnoseBaseId(klDiagnoseBase.getId());
+                                        baseRelation.setGmtCreate(now);
+                                        baseRelation.setGmtModified(now);
+                                        klDiagnoseBaseRelationList.add(baseRelation);
+                                    }
+                                }
                                 if (res) {
                                     KlDiagnoseCondition klDiagnoseConditionBase = new KlDiagnoseCondition();
                                     klDiagnoseConditionBase.setDiagnoseBaseId(klDiagnoseBase.getId());
                                     klDiagnoseConditionBase.setBaseGroup(baseGroup);
                                     klDiagnoseConditionBase.setConditionType(1);
                                     klDiagnoseConditionBase.setDiagnoseId(klDiagnoseSaveVO.getId());
+                                    klDiagnoseCondition.setGmtCreate(now);
+                                    klDiagnoseCondition.setGmtModified(now);
                                     res = klDiagnoseConditionFacade.save(klDiagnoseConditionBase);
                                 }
                             }
                         }
                     }
-
                 }
-
             }
         }
         return res;

src/main/java/com/diagbot/mapper/KlDiagnoseBaseRelationMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.KlDiagnoseBaseRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 基础规则关联表 Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-06-30
+ */
+public interface KlDiagnoseBaseRelationMapper extends BaseMapper<KlDiagnoseBaseRelation> {
+
+}

src/main/java/com/diagbot/service/KlDiagnoseBaseRelationService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.KlDiagnoseBaseRelation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 基础规则关联表 服务类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-06-30
+ */
+public interface KlDiagnoseBaseRelationService extends IService<KlDiagnoseBaseRelation> {
+
+}

src/main/java/com/diagbot/service/impl/KlDiagnoseBaseRelationServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.KlDiagnoseBaseRelation;
+import com.diagbot.mapper.KlDiagnoseBaseRelationMapper;
+import com.diagbot.service.KlDiagnoseBaseRelationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 基础规则关联表 服务实现类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-06-30
+ */
+@Service
+public class KlDiagnoseBaseRelationServiceImpl extends ServiceImpl<KlDiagnoseBaseRelationMapper, KlDiagnoseBaseRelation> implements KlDiagnoseBaseRelationService {
+
+}

src/main/java/com/diagbot/vo/KlDiagnoseSaveVO.java

@@ -3,6 +3,7 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -27,5 +28,5 @@ public class KlDiagnoseSaveVO {
 
     List<KlDiagnoseTypeVO> klDiagnoseTypeVO;
 
-
+    Date now;
 }

src/main/resources/mapper/KlDiagnoseBaseRelationMapper.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.KlDiagnoseBaseRelationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.KlDiagnoseBaseRelation">
+        <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="diagnose_base_id" property="diagnoseBaseId" />
+        <result column="concept_id" property="conceptId" />
+        <result column="order_no" property="orderNo" />
+    </resultMap>
+
+</mapper>

src/test/java/com/diagbot/CodeGeneration.java

@@ -33,7 +33,7 @@ public class CodeGeneration {
         gc.setEnableCache(false);// XML 二级缓存
         gc.setBaseResultMap(true);// XML ResultMap
         gc.setBaseColumnList(false);// XML columList
-        gc.setAuthor("gaodm");// 作者
+        gc.setAuthor("zhoutg");// 作者
 
         // 自定义文件命名，注意 %s 会自动填充表实体属性！
         gc.setControllerName("%sController");