查询

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

@@ -122,7 +122,12 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
 
     @ApiOperation(value = "规则库类别下拉值", notes = "规则库类别下拉值")
     @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) {
+    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());
@@ -134,18 +139,19 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
         List<Integer> searchIds = new ArrayList<>();
         LambdaQueryWrapper<MedicalInsRuleProject> queryWrapper = new LambdaQueryWrapper<>();
         if (StringUtils.hasText(drugId) && type.equals("1")) {
-            List<MedicalInsuranceDrugs> list = drugsService.lambdaQuery().eq(MedicalInsuranceDrugs::getItemIdHosp, drugId).list();
+
+            List<MedicalInsuranceDrugs> list = drugsService.lambdaQuery().eq(MedicalInsuranceDrugs::getItemIdHosp, drugId.trim()).list();
             if (list.size() > 0) {
                 drugId = list.get(0).getMedicineCode();
             }
-            queryWrapper.eq(MedicalInsRuleProject::getProjectCode, drugId);
+            queryWrapper.eq(MedicalInsRuleProject::getProjectCode, drugId.trim());
             search=true;
         } else if (StringUtils.hasText(drugId) && type.equals("2")) {
-            queryWrapper.eq(MedicalInsRuleProject::getProjectCode, drugId);
+            queryWrapper.eq(MedicalInsRuleProject::getProjectCode, drugId.trim());
             search=true;
         }
         if (StringUtils.hasText(drugName) && type.equals("1")) {
-            List<MedicalInsuranceDrugs> list = drugsService.lambdaQuery().like(MedicalInsuranceDrugs::getItemNameHosp, drugName).list();
+            List<MedicalInsuranceDrugs> list = drugsService.lambdaQuery().like(MedicalInsuranceDrugs::getItemNameHosp, drugName.trim()).list();
             List<String> drugCode = new ArrayList<>();
             if (list.size() > 0) {
                  drugCode = list.stream().map(item -> item.getMedicineCode()).collect(Collectors.toList());
@@ -156,11 +162,11 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
             search=true;
 
         } else if (StringUtils.hasText(drugName) && type.equals("2")) {
-            queryWrapper.like(MedicalInsRuleProject::getProjectName, drugName);
+            queryWrapper.like(MedicalInsRuleProject::getProjectName, drugName.trim());
             search=true;
         }
         if (StringUtils.hasText(ruleName)) {
-            List<MedicalInsRuleInfo> list = medicalInsRuleInfoService.lambdaQuery().like(MedicalInsRuleInfo::getRuleName, ruleName).in(MedicalInsRuleInfo::getCategory, codeList).list();
+            List<MedicalInsRuleInfo> list = medicalInsRuleInfoService.lambdaQuery().like(MedicalInsRuleInfo::getRuleName, ruleName.trim()).in(MedicalInsRuleInfo::getCategory, codeList).list();
             ids = list.stream().map(item -> item.getId()).collect(Collectors.toList());
             search=true;
         }
@@ -236,10 +242,10 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
         MedicalInsRuleProject medicalInsRuleProject = new MedicalInsRuleProject();
         medicalInsRuleProject.setMedicalInsRuleInfoId(id);
         if (StringUtils.hasText(projectName)) {
-            medicalInsRuleProject.setProjectName(projectName);
+            medicalInsRuleProject.setProjectName(projectName.trim());
         }
         if (StringUtils.hasText(projectCode)) {
-            medicalInsRuleProject.setProjectCode(projectCode);
+            medicalInsRuleProject.setProjectCode(projectCode.trim());
         }
         if (StringUtils.hasText(gender)) {
             medicalInsRuleProject.setGender(gender);