附件信息修改

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

@@ -18,7 +18,7 @@ public class KlRuleByIdDTO {
     private Long parConceptId;//提示概念id
     private String parlibName;
     private Integer parHasSub;//是否有子条件（0：无，1：有）
-    private String parMsg;//附加信息
+    //private String parMsg;//附加信息
     private Integer parStatus;//启用状态（0：禁用，1：启用）
     private String parLenName;
     private String parLenCode;
@@ -39,4 +39,5 @@ public class KlRuleByIdDTO {
     private String subEqOperator;//等于域比较符
     private String subEqValue;//等于域值
     private String subEqUnit;//等于域单位
+    private String subMsg;//附加信息
 }

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

@@ -28,4 +28,5 @@ public class KlRuleByIdSubDTO {
     private String subEqOperator;//等于域比较符
     private String subEqValue;//等于域值
     private String subEqUnit;//等于域单位
+    private String subMsg;//附加信息
 }

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

@@ -65,7 +65,7 @@ public class KlRuleFacade extends KlRuleServiceImpl {
             klRuleByIdPar.setParConceptId(byIdRuleInfo.get(0).getParConceptId());
             klRuleByIdPar.setParlibName(byIdRuleInfo.get(0).getParlibName());
             klRuleByIdPar.setParHasSub(byIdRuleInfo.get(0).getParHasSub());//是否有子条件（0：无，1：有）
-            klRuleByIdPar.setParMsg(byIdRuleInfo.get(0).getParMsg());//附加信息
+            //klRuleByIdPar.setParMsg(byIdRuleInfo.get(0).getParMsg());//附加信息
             klRuleByIdPar.setParStatus(byIdRuleInfo.get(0).getParStatus());//启用状态（0：禁用，1：启用）
             klRuleByIdPar.setParLenName(byIdRuleInfo.get(0).getParLenName());
             klRuleByIdPar.setParLenCode(byIdRuleInfo.get(0).getParLenCode());
@@ -107,7 +107,7 @@ public class KlRuleFacade extends KlRuleServiceImpl {
                     .set(StringUtil.isNotBlank(klRuleInfoSaveVO.getParRuleType().toString()), "rule_type", klRuleInfoSaveVO.getParRuleType())
                     .set(StringUtil.isNotBlank(klRuleInfoSaveVO.getParHasSub().toString()), "has_sub_cond", klRuleInfoSaveVO.getParHasSub())
                     .set(StringUtil.isNotBlank(klRuleInfoSaveVO.getParStatus().toString()), "status", klRuleInfoSaveVO.getParStatus())
-                    .set(StringUtil.isNotBlank(klRuleInfoSaveVO.getParMsg()), "msg", klRuleInfoSaveVO.getParMsg())
+                    //.set(StringUtil.isNotBlank(klRuleInfoSaveVO.getParMsg()), "msg", klRuleInfoSaveVO.getParMsg())
                     .set("modifier", klRuleInfoSaveVO.getModifier())
                     .set("gmt_modified", now);
             res = this.update(klRuleUpdate);
@@ -127,7 +127,7 @@ public class KlRuleFacade extends KlRuleServiceImpl {
             klRule.setDescription(klRuleInfoSaveVO.getParDescription());
             klRule.setHasSubCond(klRuleInfoSaveVO.getParHasSub());
             klRule.setRuleType(klRuleInfoSaveVO.getParRuleType());
-            klRule.setMsg(klRuleInfoSaveVO.getParMsg());
+            //klRule.setMsg(klRuleInfoSaveVO.getParMsg());
             klRule.setStatus(klRuleInfoSaveVO.getParStatus());
             klRule.setGmtCreate(now);
             klRule.setGmtModified(now);
@@ -213,6 +213,7 @@ public class KlRuleFacade extends KlRuleServiceImpl {
                     klRuleCondition.setGroupType(list.getGroupType());
                     klRuleCondition.setRuleBaseId(klRuleBase.getId());
                     klRuleCondition.setRuleId(klRuleInfoSaveVO.getParId());
+                    klRuleCondition.setMsg(list.getSubMsg());
                     res = klRuleConditionFacade.save(klRuleCondition);
                 }
 

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

@@ -27,4 +27,5 @@ public class KlRuleInfoSaveSubVO {
     private String subEqOperator;//等于域比较符
     private String subEqValue;//等于域值
     private String subEqUnit;//等于域单位
+    private String subMsg;//附加信息
 }

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

@@ -26,7 +26,6 @@ public class KlRuleInfoSaveVO {
     private Long parConceptId;//提示概念id
     @NotNull(message = "请输入概念id")
     private Integer parHasSub;//是否有子条件（0：无，1：有）
-    private String parMsg;//附加信息
     @ApiModelProperty(hidden = true)
     private Integer parStatus = 1;//启用状态（0：禁用，1：启用）
 /*    private String parlibName;

src/main/resources/mapper/KlRuleMapper.xml

@@ -170,6 +170,7 @@
         ELSE ruco.rule_id
         END AS ruleId,
         sub.*,
+        ruco.msg AS subMsg,
         ruco.group_type AS groupType
         FROM
         (SELECT
@@ -179,7 +180,6 @@
         a.concept_id AS parconceptId,
         b.lib_name AS parlibName,
         a.has_sub_cond AS parHasSub,
-        a.msg AS parMsg,
         a.status AS parStatus,
         c.name AS parLenName,
         c.code AS parLenCode