修改字段

doc/018.20210824诊断依据导出/med2021_init.sql

@@ -11,11 +11,11 @@ CREATE TABLE `kl_diagnose_record` (
       `code` varchar(255) NOT NULL DEFAULT '' COMMENT '序号',
       `rule` varchar(1024) NOT NULL DEFAULT '' COMMENT '规则',
       `desc` varchar(255) NOT NULL DEFAULT '' COMMENT '描述',
-      `eq` varchar(255) NOT NULL DEFAULT '' COMMENT '等于',
-      `max` varchar(255) NOT NULL DEFAULT '' COMMENT '最大值',
-      `max_symbol` varchar(255) NOT NULL DEFAULT '' COMMENT '最大值符号',
-      `min` varchar(255) NOT NULL DEFAULT '' COMMENT '最小值',
-      `min_symbol` varchar(255) NOT NULL DEFAULT '' COMMENT '最小值符号',
+      `eq_value` varchar(255) NOT NULL DEFAULT '' COMMENT '等于',
+      `max_value` varchar(255) NOT NULL DEFAULT '' COMMENT '最大值',
+      `max_operator` varchar(255) NOT NULL DEFAULT '' COMMENT '最大值符号',
+      `min_value` varchar(255) NOT NULL DEFAULT '' COMMENT '最小值',
+      `min_operator` varchar(255) NOT NULL DEFAULT '' COMMENT '最小值符号',
       `unit` varchar(255) NOT NULL DEFAULT '' COMMENT '单位',
       `order_no` int(11) NOT NULL DEFAULT '0' COMMENT '排序号',
       `remark` varchar(300) NOT NULL DEFAULT '' COMMENT '备注',

src/main/java/com/diagbot/config/CacheDeleteInit.java

@@ -60,11 +60,11 @@ public class CacheDeleteInit implements CommandLineRunner {
         conceptInfoFacade.loadCustomDictionary();
         log.info("CDSS-CORE服务启动加载NLP分词字典成功！");
 
-        cacheFacade.loadAllBaseDiagnoseCache();
-        log.info("CDSS-CORE服务启动加载诊断依据缓存成功！");
-
-        cacheFacade.loadAllRuleCache();
-        log.info("CDSS-CORE服务启动加载医学知识库中的所有规则缓存成功！");
+        // cacheFacade.loadAllBaseDiagnoseCache();
+        // log.info("CDSS-CORE服务启动加载诊断依据缓存成功！");
+        //
+        // cacheFacade.loadAllRuleCache();
+        // log.info("CDSS-CORE服务启动加载医学知识库中的所有规则缓存成功！");
 
         log.info("CDSS-CORE初始化完成！");
     }

src/main/java/com/diagbot/dto/KlDiagnoseRecordDTO.java

@@ -47,27 +47,27 @@ public class KlDiagnoseRecordDTO implements Serializable {
     /**
      * 等于
      */
-    private String eq;
+    private String eqValue;
 
     /**
      * 最大值
      */
-    private String max;
+    private String maxValue;
 
     /**
      * 最大值符号
      */
-    private String maxSymbol;
+    private String maxOperator;
 
     /**
      * 最小值
      */
-    private String min;
+    private String minValue;
 
     /**
      * 最小值符号
      */
-    private String minSymbol;
+    private String minOperator;
 
     /**
      * 单位

src/main/java/com/diagbot/entity/KlDiagnoseRecord.java

@@ -13,7 +13,7 @@ import java.util.Date;
  * </p>
  *
  * @author zhoutg
- * @since 2021-08-24
+ * @since 2021-08-26
  */
 @Data
 public class KlDiagnoseRecord implements Serializable {
@@ -79,27 +79,27 @@ public class KlDiagnoseRecord implements Serializable {
     /**
      * 等于
      */
-    private String eq;
+    private String eqValue;
 
     /**
      * 最大值
      */
-    private String max;
+    private String maxValue;
 
     /**
      * 最大值符号
      */
-    private String maxSymbol;
+    private String maxOperator;
 
     /**
      * 最小值
      */
-    private String min;
+    private String minValue;
 
     /**
      * 最小值符号
      */
-    private String minSymbol;
+    private String minOperator;
 
     /**
      * 单位

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

@@ -317,9 +317,9 @@ public class KlDiagnoseImportFacade {
                 String type = imd.getType();
                 String rule = imd.getRule();
                 String orderNo = imd.getOrderNo();
-                String eq = imd.getEq();
-                String maxSymbol = imd.getMaxSymbol();
-                String minSymbol = imd.getMinSymbol();
+                String eq = imd.getEqValue();
+                String maxSymbol = imd.getMaxOperator();
+                String minSymbol = imd.getMinOperator();
                 String parentRule = imd.getParentRule();
                 if (StringUtil.isBlank(type) && StringUtil.isBlank(orderNo)) {
                     continue;
@@ -364,7 +364,7 @@ public class KlDiagnoseImportFacade {
                 }
                 if ((LexiconExtEnum.Vital.getName().equals(type) || LexiconExtEnum.Age.getName().equals(type))
                         && StringUtils.isNotBlank(rule)
-                        && StringUtils.isBlank(imd.getMin()) && StringUtils.isBlank(imd.getMax())) {
+                        && StringUtils.isBlank(imd.getMinValue()) && StringUtils.isBlank(imd.getMaxValue())) {
                     currentErrMsg.add(String.format("第%d行%s【最大值】和【最小值】至少有一个不能为空", rowNum, rule));
                 }
                 if (StringUtils.isBlank(type)) {
@@ -593,29 +593,29 @@ public class KlDiagnoseImportFacade {
                     case Vital: // 体格检查项目
                     case Age: // 年龄
                         klDiagnoseDetailVO.setBasConceptId(current.getConceptId());
-                        if (StringUtil.isNotBlank(current.getMin())) {
-                            klDiagnoseDetailVO.setMinVal(current.getMin());
+                        if (StringUtil.isNotBlank(current.getMinValue())) {
+                            klDiagnoseDetailVO.setMinVal(current.getMinValue());
                         }
-                        if (StringUtil.isNotBlank(current.getMinSymbol())) {
-                            klDiagnoseDetailVO.setMinOperator(current.getMinSymbol());
+                        if (StringUtil.isNotBlank(current.getMinOperator())) {
+                            klDiagnoseDetailVO.setMinOperator(current.getMinOperator());
                         }
                         if (StringUtil.isNotBlank(current.getUnit())) {
                             klDiagnoseDetailVO.setMinUnit(current.getUnit());
                             klDiagnoseDetailVO.setMaxUnit(current.getUnit());
                         }
-                        if (StringUtil.isNotBlank(current.getMax())) {
-                            klDiagnoseDetailVO.setMaxVal(current.getMax());
+                        if (StringUtil.isNotBlank(current.getMaxValue())) {
+                            klDiagnoseDetailVO.setMaxVal(current.getMaxValue());
                         }
-                        if (StringUtil.isNotBlank(current.getMaxSymbol())) {
-                            klDiagnoseDetailVO.setMaxOperator(String.valueOf(current.getMaxSymbol()));
+                        if (StringUtil.isNotBlank(current.getMaxOperator())) {
+                            klDiagnoseDetailVO.setMaxOperator(String.valueOf(current.getMaxOperator()));
                         }
                         klDiagnoseDetailVO.setBasDescription(current.getRule());
                         klDiagnoseDetailVO.setBasType(2);
                         break;
                     case LisSubName: // 实验室检查子项目
                         klDiagnoseDetailVO.setBasConceptId(current.getConceptId());
-                        klDiagnoseDetailVO.setEqValue(current.getEq());
-                        klDiagnoseDetailVO.setBasDescription(current.getRule() + current.getEq());
+                        klDiagnoseDetailVO.setEqValue(current.getEqValue());
+                        klDiagnoseDetailVO.setBasDescription(current.getRule() + current.getEqValue());
                         klDiagnoseDetailVO.setBasType(2);
                         break;
                 }

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

@@ -27,17 +27,17 @@ public class ImportDiagnoseVO implements Serializable, IExcelDataModel {
     @Excel(name = "规则")
     private String rule = "";
     @Excel(name = "等于")
-    private String eq;
+    private String eqValue;
     @Excel(name = "最大值")
-    private String max;
+    private String maxValue;
     @Excel(name = "最大值符号")
-    private String maxSymbol;
+    private String maxOperator;
     @Excel(name = "单位")
     private String unit;
     @Excel(name = "最小值")
-    private String min;
+    private String minValue;
     @Excel(name = "最小值符号")
-    private String minSymbol;
+    private String minOperator;
     // @Excel(name="单位")
     // private String minUnit;
 

src/main/resources/mapper/KlDiagnoseRecordMapper.xml

@@ -15,11 +15,11 @@
         <result column="code" property="code" />
         <result column="rule" property="rule" />
         <result column="desc" property="desc" />
-        <result column="eq" property="eq" />
-        <result column="max" property="max" />
-        <result column="max_symbol" property="maxSymbol" />
-        <result column="min" property="min" />
-        <result column="min_symbol" property="minSymbol" />
+        <result column="eq_operator" property="eqValue" />
+        <result column="max_value" property="maxValue" />
+        <result column="max_operator" property="maxOperator" />
+        <result column="min_value" property="minValue" />
+        <result column="min_operator" property="minOperator" />
         <result column="unit" property="unit" />
         <result column="order_no" property="orderNo" />
         <result column="remark" property="remark" />