查询

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

@@ -215,6 +215,8 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
     public Result<?> projectPage(@RequestParam(name = "id") Integer id,
                                  @RequestParam(name = "projectName", required = false) String projectName,
                                  @RequestParam(name = "projectCode", required = false) String projectCode,
+                                 @RequestParam(name = "state", required = false) String state,
+                                 @RequestParam(name = "gender", required = false) String gender,
                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                  HttpServletRequest req) {
@@ -225,10 +227,10 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
         List<MedicalDto> dictDtos = new ArrayList<>();
         if (medicalInsRuleInfo.getSelectedRoles() != null) {
             dictDtos = sysDictService.queryDictByKeys(Arrays.asList(medicalInsRuleInfo.getSelectedRoles().split(",")));
-            MedicalDto state = new MedicalDto();
-            state.setText("状态");
-            state.setValue("state");
-            dictDtos.add(state);
+//            MedicalDto state = new MedicalDto();
+//            state.setText("状态");
+//            state.setValue("state");
+//            dictDtos.add(state);
         }
 
         MedicalInsRuleProject medicalInsRuleProject = new MedicalInsRuleProject();
@@ -239,6 +241,13 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
         if (StringUtils.hasText(projectCode)) {
             medicalInsRuleProject.setProjectCode(projectCode);
         }
+        if (StringUtils.hasText(gender)) {
+            medicalInsRuleProject.setGender(gender);
+        }
+        if (StringUtils.hasText(state)) {
+            medicalInsRuleProject.setState(state);
+        }
+
         QueryWrapper<MedicalInsRuleProject> queryWrapper = QueryGenerator.initQueryWrapper(medicalInsRuleProject, req.getParameterMap());
         Page<MedicalInsRuleProject> page = new Page<MedicalInsRuleProject>(pageNo, pageSize);
         IPage<MedicalInsRuleProject> pageList = projectService.page(page, queryWrapper);