规则库查询

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/MedicalInsRuleInfoController.java

@@ -124,6 +124,7 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
     @GetMapping(value = "/baseChildrenList")
     public Result<?> baseChildrenList(@RequestParam(name = "dictCode") String dictCode, @RequestParam(name = "drugId", required = false) String drugId, @RequestParam(name = "drugName", required = false) String drugName, @RequestParam(name = "type", required = false) String type, @RequestParam(name = "ruleName", required = false) String ruleName, HttpServletRequest req) {
         List<TreeSelectModel> treeSelectModels = sysCategoryService.queryListByCode(dictCode);
+        boolean search=false;
         List<String> codeList = treeSelectModels.stream().map(item -> item.getCode()).collect(Collectors.toList());
         //type 1 医院 2医保
         if (!StringUtils.hasText(type)) {
@@ -138,27 +139,35 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
                 drugId = list.get(0).getMedicineCode();
             }
             queryWrapper.eq(MedicalInsRuleProject::getProjectCode, drugId);
+            search=true;
         } else if (StringUtils.hasText(drugId) && type.equals("2")) {
             queryWrapper.eq(MedicalInsRuleProject::getProjectCode, drugId);
+            search=true;
         }
         if (StringUtils.hasText(drugName) && type.equals("1")) {
             List<MedicalInsuranceDrugs> list = drugsService.lambdaQuery().eq(MedicalInsuranceDrugs::getItemNameHosp, drugName).list();
             if (list.size() > 0) {
                 List<String> drugCode = list.stream().map(item -> item.getMedicineCode()).collect(Collectors.toList());
                 queryWrapper.in(MedicalInsRuleProject::getProjectCode, drugCode);
+                search=true;
             }
         } else if (StringUtils.hasText(drugName) && type.equals("2")) {
             queryWrapper.like(MedicalInsRuleProject::getProjectName, drugName);
+            search=true;
         }
         if (StringUtils.hasText(ruleName)) {
             List<MedicalInsRuleInfo> list = medicalInsRuleInfoService.lambdaQuery().like(MedicalInsRuleInfo::getRuleName, ruleName).in(MedicalInsRuleInfo::getCategory, codeList).list();
             ids = list.stream().map(item -> item.getId()).collect(Collectors.toList());
+            search=true;
         }
-        List<MedicalInsRuleProject> ruleList = projectService.list(queryWrapper);
-        searchIds = ruleList.stream().map(item -> item.getMedicalInsRuleInfoId()).collect(Collectors.toList());
-        if (searchIds.size() > 0) {
-            ids.addAll(searchIds);
+        if(search){
+            List<MedicalInsRuleProject> ruleList = projectService.list(queryWrapper);
+            searchIds = ruleList.stream().map(item -> item.getMedicalInsRuleInfoId()).collect(Collectors.toList());
+            if (searchIds.size() > 0) {
+                ids.addAll(searchIds);
+            }
         }
+
         for (TreeSelectModel model : treeSelectModels) {
             List<TreeSelectModel> treeList = new ArrayList<>();
             LambdaQueryWrapper<MedicalInsRuleInfo> ruleInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();

jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/fallback/sentinel/GatewaySentinelExceptionConfig.java

@@ -22,7 +22,7 @@ import java.util.HashMap;
 @Configuration
 public class GatewaySentinelExceptionConfig {
 
-    @PostConstruct
+//    @PostConstruct
     public void init() {
 
         BlockRequestHandler blockRequestHandler = (serverWebExchange, ex) -> {