浙江医院质控整改初始化

knowledgeman-service/src/main/java/com/diagbot/dto/RuleAppDTO.java

@@ -1,9 +1,10 @@
 package com.diagbot.dto;
 
-import com.diagbot.entity.RuleApp;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 /**
  * @Description:
  * @author: gaodm
@@ -11,7 +12,51 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class RuleAppDTO extends RuleApp {
+public class RuleAppDTO {
+    /**
+     * 索引号
+     */
+    private Integer id;
+
+//    /**
+//     * 是否删除,N:未删除，Y:删除
+//     */
+//    private String isDeleted;
+//
+//    /**
+//     * 记录创建时间
+//     */
+//    private Date gmtCreate;
+//
+//    /**
+//     * 记录修改时间,如果时间是1970年则表示纪录未修改
+//     */
+//    private Date gmtModified;
+//
+//    /**
+//     * 创建人，0表示无创建人值
+//     */
+//    private String creator;
+//
+//    /**
+//     * 修改人,如果为0则表示纪录未修改
+//     */
+//    private String modifier;
+
+    /**
+     * 指标名称
+     */
+    private String ruleId;
+
+    /**
+     * 1：危急值提醒  2：开单合理性  3：管理评估  4：不良反应  5：药物推荐  6：病情提示
+     */
+    private String typeId;
+
+    /**
+     * 套餐名称是否必须参与匹配
+     */
+    private String remind;
     /**
      * 1：危急值提醒  2：开单合理性  3：管理评估  4：不良反应  5：药物推荐  6：病情提示
      */

knowledgeman-service/src/main/java/com/diagbot/dto/RulePubDTO.java

@@ -1,6 +1,5 @@
 package com.diagbot.dto;
 
-import com.diagbot.entity.RulePub;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -11,5 +10,47 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class RulePubDTO extends RulePub {
+public class RulePubDTO {
+    /**
+     * 索引号
+     */
+    private Integer id;
+
+    private String pubName;
+
+    private String ruleType;
+
+    /**
+     * 比较符
+     */
+    private String minOperator;
+
+    /**
+     * 索引值
+     */
+    private String minValue;
+
+    private String minUnit;
+
+    private String maxOperator;
+
+    private String maxValue;
+
+    /**
+     * 数值单位
+     */
+    private String maxUnit;
+
+    private String eqOperator;
+
+    private String eqValue;
+
+    private String eqUnit;
+
+    /**
+     * 推送的量表名称
+     */
+    private String remind;
+
+    private String suffixInfo;
 }

knowledgeman-service/src/main/java/com/diagbot/facade/RulePubFacade.java

@@ -55,6 +55,6 @@ public class RulePubFacade extends RulePubServiceImpl {
     public Boolean saveRulePub(@Valid @RequestBody RulePubSaveVO rulePubSaveVO) {
         RulePub rulePub = new RulePub();
         BeanUtil.copyProperties(rulePubSaveVO, rulePub);
-        return this.save(rulePub);
+        return this.saveOrUpdate(rulePub);
     }
 }

knowledgeman-service/src/main/java/com/diagbot/vo/RuleAppSaveVO.java

@@ -18,30 +18,30 @@ public class RuleAppSaveVO {
      */
     private Integer id;
 
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
+//    /**
+//     * 是否删除,N:未删除，Y:删除
+//     */
+//    private String isDeleted;
+//
+//    /**
+//     * 记录创建时间
+//     */
+//    private Date gmtCreate;
+//
+//    /**
+//     * 记录修改时间,如果时间是1970年则表示纪录未修改
+//     */
+//    private Date gmtModified;
+//
+//    /**
+//     * 创建人，0表示无创建人值
+//     */
+//    private String creator;
+//
+//    /**
+//     * 修改人,如果为0则表示纪录未修改
+//     */
+//    private String modifier;
 
     /**
      * 指标名称

knowledgeman-service/src/main/java/com/diagbot/web/RuleAppController.java

@@ -41,7 +41,7 @@ public class RuleAppController {
     @ApiOperation(value = "规则应用ruleApp列表[by:gaodm]")
     @PostMapping("/pageRuleApp")
     @SysLogger("pageRuleApp")
-    public RespDTO<IPage<RuleAppDTO>> pageRuleApp(RuleAppPageVO ruleAppPageVO) {
+    public RespDTO<IPage<RuleAppDTO>> pageRuleApp(@RequestBody RuleAppPageVO ruleAppPageVO) {
         return RespDTO.onSuc(ruleAppFacade.pageRuleApp(ruleAppPageVO));
     }
 
@@ -64,7 +64,7 @@ public class RuleAppController {
     @PostMapping("/saveRuleApp")
     @SysLogger("saveRuleApp")
     @Transactional
-    public RespDTO<Boolean> saveRuleApp(@Valid @RequestBody RuleAppSaveVO ruleAppSaveVO) {
+    public RespDTO<Boolean> saveRuleApp(@RequestBody RuleAppSaveVO ruleAppSaveVO) {
         return RespDTO.onSuc(ruleAppFacade.saveRuleApp(ruleAppSaveVO));
     }
 }

knowledgeman-service/src/main/java/com/diagbot/web/RulePubController.java

@@ -31,7 +31,7 @@ import javax.validation.Valid;
 @RestController
 @Api(value = "规则维护rulePub API", tags = { "规则维护rulePub API" })
 @SuppressWarnings("unchecked")
-@RequestMapping("/gaodm")
+@RequestMapping("/rulePub")
 public class RulePubController {
     @Autowired
     private RulePubFacade rulePubFacade;
@@ -39,7 +39,7 @@ public class RulePubController {
     @ApiOperation(value = "规则维护rulePub列表[by:gaodm]")
     @PostMapping("/pageRulePub")
     @SysLogger("pageRulePub")
-    public RespDTO<IPage<RulePubDTO>> pageRulePub(RulePubPageVO rulePubPageVO) {
+    public RespDTO<IPage<RulePubDTO>> pageRulePub(@RequestBody RulePubPageVO rulePubPageVO) {
         return RespDTO.onSuc(rulePubFacade.pageRulePub(rulePubPageVO));
     }
 
@@ -62,7 +62,7 @@ public class RulePubController {
     @PostMapping("/saveRulePub")
     @SysLogger("saveRulePub")
     @Transactional
-    public RespDTO<Boolean> saveRulePub(@Valid @RequestBody RulePubSaveVO rulePubSaveVO) {
+    public RespDTO<Boolean> saveRulePub(@RequestBody RulePubSaveVO rulePubSaveVO) {
         return RespDTO.onSuc(rulePubFacade.saveRulePub(rulePubSaveVO));
     }