规则库查询

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

@@ -4,6 +4,8 @@ import java.util.Arrays;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson.JSONObject;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.medical.common.bo.before.MedicalHistoryRecord;
@@ -20,6 +22,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.message.websocket.WebSocket;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -30,176 +33,175 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 /**
  * @Description: advance_warning_audit
  * @Author: jeecg-boot
- * @Date:   2023-05-09 14:37:15
+ * @Date: 2023-05-09 14:37:15
  * @Version: V1.0
  */
-@Api(tags="事前模块api")
+@Api(tags = "事前模块api")
 @RestController
 @RequestMapping("/notify/medical/advanceWarningAudit")
 @Slf4j
 public class AdvanceWarningAuditController extends JeecgController<AdvanceWarningAudit, IAdvanceWarningAuditService> {
-	@Autowired
-	private IAdvanceWarningAuditService advanceWarningAuditService;
-	@Autowired
-	private IAdvanceWarningAuditDetailService iAdvanceWarningAuditDetailService;
-
-
-	 @ApiOperation(value = "事前工单-根据事前工单查询患者信息", notes = "根据事前工单查询患者信息")
-	 @GetMapping(value = "/patient/info")
-	 public Result<PatientInformationResponse> loadPatientInfoById(@RequestParam(name = "id", required = true) String id) {
-		 PatientInformationResponse patientInfoResponse = advanceWarningAuditService
-				 .loadPatientInfoById(id, iAdvanceWarningAuditDetailService);
-		 return Result.OK(patientInfoResponse);
-	 }
-
-	 @ApiOperation(value = "事前工单-查询就诊历史记录", notes = "根据事前工单查询患者的就诊历史记录")
-	 @GetMapping(value = "/patient/medicalHistory")
-	 public Result<IPage<MedicalHistoryRecord>> queryMedicalHistoryRecords(
-			 @RequestParam(name = "id", required = true) String id,
-			 @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-			 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
-		 if (pageSize > 100) {
-			 pageSize = 100;
-		 }
-		 Page<MedicalHistoryRecord> page = new Page<>(pageNo, pageSize);
-		 IPage<MedicalHistoryRecord> medicalHistoryRecords = advanceWarningAuditService
-				 .queryMedicalHistoryRecords(page, id, iAdvanceWarningAuditDetailService);
-		 return Result.OK("查询成功", medicalHistoryRecords);
-	 }
-
-
-	 @ApiOperation(value = "事前工单-查询诊断信息", notes = "根据就诊历史记录，查询诊断信息")
-	 @GetMapping(value = "/patient/diagnosis/info")
-	 public Result<List<PatientDiagnosisInfo>> loadPatientDiagnosisInfo(@RequestParam(name = "id", required = true) String id,
-																		@RequestParam(name = "treatmentType", required = true) String treatmentType) {
-		 List<PatientDiagnosisInfo> result = advanceWarningAuditService.loadPatientDiagnosisInfo(id, treatmentType);
-		 return Result.OK(result);
-	 }
-
-	 @ApiOperation(value = "事前工单-根据病例查询开药信息", notes = "根据病例查询开药信息")
-	 @GetMapping(value = "/case/prescriptions")
-	 public Result<IPage<PrescriptionDetail>> getPrescriptionsByCase(
-			 @RequestParam(name = "id", required = true) Integer id,
-			 @RequestParam(name = "treatmentType", required = true) String treatmentType,
-			 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-			 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
-
-		 if (pageSize >= 100) {
-			 pageSize = 100;
-		 }
-		 Page<MedicalHistoryRecord> page = new Page<>(pageNo, pageSize);
-		 IPage<PrescriptionDetail> prescriptions = advanceWarningAuditService.loadPrescriptionsByCase(page, id, treatmentType);
-		 return Result.OK(prescriptions);
-	 }
-
-
-
-
-	/**
-	 * 分页列表查询
-	 *
-	 * @param advanceWarningAudit
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "advance_warning_audit-分页列表查询")
-	@ApiOperation(value="advance_warning_audit-分页列表查询", notes="advance_warning_audit-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<AdvanceWarningAudit>> queryPageList(AdvanceWarningAudit advanceWarningAudit,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<AdvanceWarningAudit> queryWrapper = QueryGenerator.initQueryWrapper(advanceWarningAudit, req.getParameterMap());
-		Page<AdvanceWarningAudit> page = new Page<AdvanceWarningAudit>(pageNo, pageSize);
-		IPage<AdvanceWarningAudit> pageList = advanceWarningAuditService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-
-	/**
-	 *   添加
-	 *
-	 * @param advanceWarningAudit
-	 * @return
-	 */
-	@AutoLog(value = "advance_warning_audit-添加")
-	@ApiOperation(value="advance_warning_audit-添加", notes="advance_warning_audit-添加")
+    @Autowired
+    private IAdvanceWarningAuditService advanceWarningAuditService;
+    @Autowired
+    private IAdvanceWarningAuditDetailService iAdvanceWarningAuditDetailService;
+    @Autowired
+    private WebSocket webSocket;
+
+    @ApiOperation(value = "事前工单-根据事前工单查询患者信息", notes = "根据事前工单查询患者信息")
+    @GetMapping(value = "/patient/info")
+    public Result<PatientInformationResponse> loadPatientInfoById(@RequestParam(name = "id", required = true) String id) {
+        PatientInformationResponse patientInfoResponse = advanceWarningAuditService
+                .loadPatientInfoById(id, iAdvanceWarningAuditDetailService);
+        return Result.OK(patientInfoResponse);
+    }
+
+    @ApiOperation(value = "事前工单-查询就诊历史记录", notes = "根据事前工单查询患者的就诊历史记录")
+    @GetMapping(value = "/patient/medicalHistory")
+    public Result<IPage<MedicalHistoryRecord>> queryMedicalHistoryRecords(
+            @RequestParam(name = "id", required = true) String id,
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+        if (pageSize > 100) {
+            pageSize = 100;
+        }
+        Page<MedicalHistoryRecord> page = new Page<>(pageNo, pageSize);
+        IPage<MedicalHistoryRecord> medicalHistoryRecords = advanceWarningAuditService
+                .queryMedicalHistoryRecords(page, id, iAdvanceWarningAuditDetailService);
+        return Result.OK("查询成功", medicalHistoryRecords);
+    }
+
+
+    @ApiOperation(value = "事前工单-查询诊断信息", notes = "根据就诊历史记录，查询诊断信息")
+    @GetMapping(value = "/patient/diagnosis/info")
+    public Result<List<PatientDiagnosisInfo>> loadPatientDiagnosisInfo(@RequestParam(name = "id", required = true) String id,
+                                                                       @RequestParam(name = "treatmentType", required = true) String treatmentType) {
+        List<PatientDiagnosisInfo> result = advanceWarningAuditService.loadPatientDiagnosisInfo(id, treatmentType);
+        return Result.OK(result);
+    }
+
+    @ApiOperation(value = "事前工单-根据病例查询开药信息", notes = "根据病例查询开药信息")
+    @GetMapping(value = "/case/prescriptions")
+    public Result<IPage<PrescriptionDetail>> getPrescriptionsByCase(
+            @RequestParam(name = "id", required = true) Integer id,
+            @RequestParam(name = "treatmentType", required = true) String treatmentType,
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+
+        if (pageSize >= 100) {
+            pageSize = 100;
+        }
+        Page<MedicalHistoryRecord> page = new Page<>(pageNo, pageSize);
+        IPage<PrescriptionDetail> prescriptions = advanceWarningAuditService.loadPrescriptionsByCase(page, id, treatmentType);
+        return Result.OK(prescriptions);
+    }
+
+
+    /**
+     * 分页列表查询
+     *
+     * @param advanceWarningAudit
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "advance_warning_audit-分页列表查询")
+    @ApiOperation(value = "advance_warning_audit-分页列表查询", notes = "advance_warning_audit-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<AdvanceWarningAudit>> queryPageList(AdvanceWarningAudit advanceWarningAudit,
+                                                            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                            HttpServletRequest req) {
+        QueryWrapper<AdvanceWarningAudit> queryWrapper = QueryGenerator.initQueryWrapper(advanceWarningAudit, req.getParameterMap());
+        Page<AdvanceWarningAudit> page = new Page<AdvanceWarningAudit>(pageNo, pageSize);
+        IPage<AdvanceWarningAudit> pageList = advanceWarningAuditService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 添加
+     *
+     * @param advanceWarningAudit
+     * @return
+     */
+    @AutoLog(value = "advance_warning_audit-添加")
+    @ApiOperation(value = "advance_warning_audit-添加", notes = "advance_warning_audit-添加")
 //	@RequiresPermissions("medical:advance_warning_audit:add")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody AdvanceWarningAudit advanceWarningAudit) {
-		advanceWarningAuditService.save(advanceWarningAudit);
-		return Result.OK("添加成功！");
-	}
-
-	/**
-	 *  编辑
-	 *
-	 * @param advanceWarningAudit
-	 * @return
-	 */
-	@AutoLog(value = "advance_warning_audit-编辑")
-	@ApiOperation(value="advance_warning_audit-编辑", notes="advance_warning_audit-编辑")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody AdvanceWarningAudit advanceWarningAudit) {
+        advanceWarningAuditService.save(advanceWarningAudit);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param advanceWarningAudit
+     * @return
+     */
+    @AutoLog(value = "advance_warning_audit-编辑")
+    @ApiOperation(value = "advance_warning_audit-编辑", notes = "advance_warning_audit-编辑")
 //	@RequiresPermissions("medical:advance_warning_audit:edit")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody AdvanceWarningAudit advanceWarningAudit) {
-		advanceWarningAuditService.updateById(advanceWarningAudit);
-		return Result.OK("编辑成功!");
-	}
-
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "advance_warning_audit-通过id删除")
-	@ApiOperation(value="advance_warning_audit-通过id删除", notes="advance_warning_audit-通过id删除")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody AdvanceWarningAudit advanceWarningAudit) {
+        advanceWarningAuditService.updateById(advanceWarningAudit);
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "advance_warning_audit-通过id删除")
+    @ApiOperation(value = "advance_warning_audit-通过id删除", notes = "advance_warning_audit-通过id删除")
 //	@RequiresPermissions("medical:advance_warning_audit:delete")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		advanceWarningAuditService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "advance_warning_audit-批量删除")
-	@ApiOperation(value="advance_warning_audit-批量删除", notes="advance_warning_audit-批量删除")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        advanceWarningAuditService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "advance_warning_audit-批量删除")
+    @ApiOperation(value = "advance_warning_audit-批量删除", notes = "advance_warning_audit-批量删除")
 //	@RequiresPermissions("medical:advance_warning_audit:deleteBatch")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.advanceWarningAuditService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "advance_warning_audit-通过id查询")
-	@ApiOperation(value="advance_warning_audit-通过id查询", notes="advance_warning_audit-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<AdvanceWarningAudit> queryById(@RequestParam(name="id",required=true) String id) {
-		AdvanceWarningAudit advanceWarningAudit = advanceWarningAuditService.getById(id);
-		if(advanceWarningAudit==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(advanceWarningAudit);
-	}
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.advanceWarningAuditService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
 
     /**
-    * 导出excel
-    *
-    * @param request
-    * @param advanceWarningAudit
-    */
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "advance_warning_audit-通过id查询")
+    @ApiOperation(value = "advance_warning_audit-通过id查询", notes = "advance_warning_audit-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<AdvanceWarningAudit> queryById(@RequestParam(name = "id", required = true) String id) {
+        AdvanceWarningAudit advanceWarningAudit = advanceWarningAuditService.getById(id);
+        if (advanceWarningAudit == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(advanceWarningAudit);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param advanceWarningAudit
+     */
 //    @RequiresPermissions("medical:advance_warning_audit:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, AdvanceWarningAudit advanceWarningAudit) {
@@ -207,16 +209,25 @@ public class AdvanceWarningAuditController extends JeecgController<AdvanceWarnin
     }
 
     /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
 //    @RequiresPermissions("medical:advance_warning_audit:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, AdvanceWarningAudit.class);
     }
 
+    @ApiOperation(value = "socket", notes = "socket")
+    @GetMapping(value = "/socket")
+    public Result<?> socket(@RequestParam(name = "ip") String ip, @RequestParam(name = "id") Integer id, @RequestParam(name = "type") String type, HttpServletRequest req) {
+        JSONObject obj = new JSONObject();
+        obj.put("type", type);
+        obj.put("id", id);
+        webSocket.sendMessage(ip, obj.toJSONString());
+        return Result.OK();
+    }
 }

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

@@ -8,6 +8,7 @@ import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import org.apache.commons.collections.ArrayStack;
@@ -18,10 +19,12 @@ import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.medical.Constant;
 import org.jeecg.modules.medical.EnchanceTypeEnum;
 import org.jeecg.modules.medical.entity.*;
+import org.jeecg.modules.medical.ruleengine.PluginInterface;
 import org.jeecg.modules.medical.service.*;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -30,6 +33,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.modules.medical.vo.CommonResponse;
+import org.jeecg.modules.message.websocket.WebSocket;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -71,6 +75,7 @@ public class FactorEnchanceController extends JeecgController<FactorEnchance, IF
     @Autowired
     private IRuleFactorRelaService ruleFactorRelaService;
 
+
     /**
      * 分页列表查询
      *
@@ -242,10 +247,53 @@ public class FactorEnchanceController extends JeecgController<FactorEnchance, IF
         }
         return Result.OK(factorEnchance);
     }
+
     @ApiOperation(value = "factor_enchance-通过id查询", notes = "factor_enchance-通过id查询")
     @GetMapping(value = "/queryDynamicDataById")
     public Result<FactorEnchance> queryDynamicDataById(@RequestParam(name = "id", required = true) String id) {
-        FactorEnchance factorEnchance = factorEnchanceService.getById(id);
+        RuleFactorRela ruleFactorRela = ruleFactorRelaService.getById(id);
+
+        FactorEnchance factorEnchance = factorEnchanceService.getById(ruleFactorRela.getFactorEnhanceId());
+        EnchanceTypeEnum enchanceTypeEnum = EnchanceTypeEnum.getType(factorEnchance.getEnhanceType());
+        HashMap<String, String> map = new HashMap<>();
+        switch (enchanceTypeEnum) {
+            case SQL:
+                map.put("要素提取标题\n", "");
+                map.put("医保规则\n", "");
+                map.put("数据库\n\n", "");
+                map.put("SQL语句\n\n\n", "");
+                map.put("输入要素\n\n", "");
+                map.put("输出要素\n\n\n", "");
+                map.put("备注\n\n\n\n", "");
+                break;
+            case EXPRESSION:
+                map.put("要素提取标题\n", "");
+                map.put("医保规则\n", "");
+                map.put("数据库\n\n", "");
+                map.put("SQL语句\n\n\n", "");
+                map.put("输入要素\n\n", "");
+                map.put("输出要素\n\n\n", "");
+                map.put("备注\n\n\n\n", "");
+                break;
+            case DICT:
+                break;
+            case PLUGIN:
+
+                break;
+            case CONSTANT:
+                break;
+            case LOGICAL_EXPRESSION:
+
+                break;
+            case PROPERTIES:
+
+                break;
+            default:
+                log.error("有配置的未处理类型");
+                break;
+        }
+
+
         if (factorEnchance == null) {
             return Result.error("未找到对应数据");
         }
@@ -325,7 +373,7 @@ public class FactorEnchanceController extends JeecgController<FactorEnchance, IF
                 Optional<FactorEnchance> first = factorEnchanceList.stream().filter(o ->
                         ObjectUtils.nullSafeEquals(o.getId(), info.getFactorEnhanceId())).findFirst();
                 if (first.isPresent()) {
-                    response.setType(first.get().getEnhanceType()==null?null:first.get().getEnhanceType().toString());
+                    response.setType(first.get().getEnhanceType() == null ? null : first.get().getEnhanceType().toString());
                 }
                 responses.add(response);
             }
@@ -334,4 +382,5 @@ public class FactorEnchanceController extends JeecgController<FactorEnchance, IF
     }
 
 
+
 }

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

@@ -145,12 +145,16 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
             search=true;
         }
         if (StringUtils.hasText(drugName) && type.equals("1")) {
-            List<MedicalInsuranceDrugs> list = drugsService.lambdaQuery().eq(MedicalInsuranceDrugs::getItemNameHosp, drugName).list();
+            List<MedicalInsuranceDrugs> list = drugsService.lambdaQuery().like(MedicalInsuranceDrugs::getItemNameHosp, drugName).list();
+            List<String> drugCode = new ArrayList<>();
             if (list.size() > 0) {
-                List<String> drugCode = list.stream().map(item -> item.getMedicineCode()).collect(Collectors.toList());
+                 drugCode = list.stream().map(item -> item.getMedicineCode()).collect(Collectors.toList());
                 queryWrapper.in(MedicalInsRuleProject::getProjectCode, drugCode);
-                search=true;
+            }else{
+                queryWrapper.in(MedicalInsRuleProject::getProjectCode, "0");
             }
+            search=true;
+
         } else if (StringUtils.hasText(drugName) && type.equals("2")) {
             queryWrapper.like(MedicalInsRuleProject::getProjectName, drugName);
             search=true;
@@ -166,6 +170,9 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
             if (searchIds.size() > 0) {
                 ids.addAll(searchIds);
             }
+            if(ids.size()==0){
+                return Result.OK(treeSelectModels);
+            }
         }
 
         for (TreeSelectModel model : treeSelectModels) {
@@ -207,6 +214,7 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
     @GetMapping(value = "/projectPage")
     public Result<?> projectPage(@RequestParam(name = "id") Integer id,
                                  @RequestParam(name = "projectName", required = false) String projectName,
+                                 @RequestParam(name = "projectCode", required = false) String projectCode,
                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                  HttpServletRequest req) {
@@ -224,6 +232,9 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
         if (StringUtils.hasText(projectName)) {
             medicalInsRuleProject.setProjectName(projectName);
         }
+        if (StringUtils.hasText(projectCode)) {
+            medicalInsRuleProject.setProjectCode(projectCode);
+        }
         QueryWrapper<MedicalInsRuleProject> queryWrapper = QueryGenerator.initQueryWrapper(medicalInsRuleProject, req.getParameterMap());
         Page<MedicalInsRuleProject> page = new Page<MedicalInsRuleProject>(pageNo, pageSize);
         IPage<MedicalInsRuleProject> pageList = projectService.page(page, queryWrapper);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/AfterIncidentDetailLog.java

@@ -90,6 +90,7 @@ public class AfterIncidentDetailLog implements Serializable {
 	/**患者性别;*/
 	@Excel(name = "患者性别;", width = 15)
     @ApiModelProperty(value = "患者性别;")
+    @Dict(dicCode = "sex")
     private java.lang.String patientGender;
 	/**患者年龄;*/
 	@Excel(name = "患者年龄;", width = 15)

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/CheckList.java

@@ -47,6 +47,7 @@ public class CheckList implements Serializable {
 	/**性别*/
 	@Excel(name = "性别", width = 15)
     @ApiModelProperty(value = "性别")
+    @Dict(dicCode = "sex")
     private java.lang.String gender;
 	/**年龄*/
 	@Excel(name = "年龄", width = 15)

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/MasterAdmissionBill.java

@@ -151,6 +151,7 @@ public class MasterAdmissionBill implements Serializable {
 	/**患者性别*/
 	@Excel(name = "患者性别", width = 15)
     @ApiModelProperty(value = "患者性别")
+    @Dict(dicCode = "sex")
     private java.lang.String patientGender;
 	/**患者出生日期;MMDDYYYY日期型字段,不含分秒时，用于计算患者年龄，患者年龄或出生日期有一个字段即可*/
 	@Excel(name = "患者出生日期;MMDDYYYY日期型字段,不含分秒时，用于计算患者年龄，患者年龄或出生日期有一个字段即可", width = 15, format =  "yyyy-MM-dd HH:mm:ss")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/MedicalInsRuleProject.java

@@ -119,6 +119,7 @@ public class MedicalInsRuleProject implements Serializable {
      */
     @Excel(name = "性别", width = 15)
     @ApiModelProperty(value = "性别;0 未知的性别 1 男性 2 女性 9 未说明性别")
+    @Dict(dicCode = "sex")
     private java.lang.String gender;
     /**
      * 医疗机构等级;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/MidIncidentAudit.java

@@ -89,6 +89,7 @@ public class MidIncidentAudit implements Serializable {
     /**病人性别;*/
     @Excel(name = "病人性别;", width = 15)
     @ApiModelProperty(value = "病人性别;")
+    @Dict(dicCode = "sex")
     private java.lang.String patientGender;
 //    inpatient_area	true	char	20	病区
     /**

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/MidIncidentVisitLog.java

@@ -87,6 +87,7 @@ public class MidIncidentVisitLog implements Serializable {
 	/**病人性别;*/
 	@Excel(name = "病人性别;", width = 15)
     @ApiModelProperty(value = "病人性别;")
+    @Dict(dicCode = "sex")
     private java.lang.String patientGender;
     /**病人性别;*/
     @Excel(name = "病区;就诊类型为住院时候必填", width = 15)

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/OutpatientSettleBill.java

@@ -125,6 +125,7 @@ public class OutpatientSettleBill implements Serializable {
 	/**患者性别*/
 	@Excel(name = "患者性别", width = 15)
     @ApiModelProperty(value = "患者性别")
+    @Dict(dicCode = "sex")
     private java.lang.String patientGender;
 	/**患者出生日期;MMDDYYYY日期型字段,不含分秒时，用于计算患者年龄，患者年龄或出生日期有一个字段即可*/
 	@Excel(name = "患者出生日期;MMDDYYYY日期型字段,不含分秒时，用于计算患者年龄，患者年龄或出生日期有一个字段即可", width = 15, format =  "yyyy-MM-dd HH:mm:ss")