浙江医院质控整改

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

@@ -17,6 +17,7 @@ import com.diagbot.util.DateUtil;
 import com.diagbot.util.IntegerUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.RuleAppIdVO;
 import com.diagbot.vo.RuleAppPageVO;
@@ -44,7 +45,9 @@ public class RuleAppFacade extends RuleAppServiceImpl {
     public IPage<RuleAppDTO> pageRuleApp(RuleAppPageVO ruleAppPageVO) {
         IPage<RuleAppDTO> res = new Page<>(ruleAppPageVO.getCurrent(), ruleAppPageVO.getSize());
         QueryWrapper<RuleApp> ruleAppQueryWrapper = new QueryWrapper<>();
-        ruleAppQueryWrapper.orderByDesc("gmt_modified", "id");
+        ruleAppQueryWrapper.like(StringUtil.isNotBlank(ruleAppPageVO.getRemind()), "remind", ruleAppPageVO.getRemind())
+                .eq(StringUtil.isNotBlank(ruleAppPageVO.getTypeId()), "type_id", ruleAppPageVO.getTypeId())
+                .orderByDesc("gmt_modified", "id");
         IPage<RuleApp> page = this.page(ruleAppPageVO, ruleAppQueryWrapper);
         BeanUtil.copyProperties(page, res);
         if (ListUtil.isNotEmpty(page.getRecords())) {

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

@@ -10,6 +10,7 @@ import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.RulePubServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.vo.RulePubIdVO;
 import com.diagbot.vo.RulePubPageVO;
 import com.diagbot.vo.RulePubSaveVO;
@@ -30,7 +31,8 @@ public class RulePubFacade extends RulePubServiceImpl {
     public IPage<RulePubDTO> pageRulePub(RulePubPageVO rulePubPageVO) {
         IPage<RulePubDTO> res = new Page<>(rulePubPageVO.getCurrent(), rulePubPageVO.getSize());
         QueryWrapper<RulePub> rulePubQueryWrapper = new QueryWrapper<>();
-        rulePubQueryWrapper.orderByDesc("id");
+        rulePubQueryWrapper.like(StringUtil.isNotBlank(rulePubPageVO.getPubName()), "pub_name", rulePubPageVO.getPubName())
+                .orderByDesc("id");
         IPage<RulePub> page = this.page(rulePubPageVO, rulePubQueryWrapper);
         BeanUtil.copyProperties(page, res);
         if (ListUtil.isNotEmpty(page.getRecords())) {

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

@@ -12,4 +12,13 @@ import lombok.Setter;
 @Getter
 @Setter
 public class RuleAppPageVO extends Page {
+    /**
+     * 1：危急值提醒  2：开单合理性  3：管理评估  4：不良反应  5：药物推荐  6：病情提示
+     */
+    private String typeId;
+
+    /**
+     * 套餐名称是否必须参与匹配
+     */
+    private String remind;
 }

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

@@ -12,4 +12,5 @@ import lombok.Setter;
 @Getter
 @Setter
 public class RulePubPageVO extends Page {
+    private String pubName;
 }