diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/InspectPatientController.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/InspectPatientController.java index c7d9443..6382bd3 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/InspectPatientController.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/InspectPatientController.java @@ -1475,8 +1475,8 @@ public class InspectPatientController { @GetMapping("/PatientBySearchKey") @Operation(summary = "根据姓名、身份证号、体检编号获得患者信息") - public CommonResult> getPatientBySearchKey(@RequestParam("searchKey") String searchKey) { - return success(patientService.getPatientBySearchKey(searchKey)); + public CommonResult> getPatientBySearchKey(@RequestParam("searchKey") String searchKey,@RequestParam("examhoscode") String examhoscode,@RequestParam("status") String status) { + return success(patientService.getPatientBySearchKey(searchKey,examhoscode,status)); } @GetMapping("/getecgTj") diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientService.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientService.java index e35b931..d601617 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientService.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientService.java @@ -126,7 +126,7 @@ public interface InspectPatientService { boolean IsMedicalSnExist(String medicalSn); //根据身份证、姓名、体检编码获取患者信息 - List getPatientBySearchKey(String searchKey); + List getPatientBySearchKey(String searchKey,String examhoscode,String status); //更新患者汇总分析结果 void updateSummaryResult(@Valid InspectPatientSaveReqVO updateReqVO); diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientServiceImpl.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientServiceImpl.java index 9c4d591..84b78ef 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientServiceImpl.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientServiceImpl.java @@ -247,7 +247,7 @@ public class InspectPatientServiceImpl implements InspectPatientService { return patientMapper.selectCount(queryWrapper) > 0; } @Override - public List getPatientBySearchKey(String searchKey) { + public List getPatientBySearchKey(String searchKey,String examhoscode,String status) { LambdaQueryWrapper lambdaQuery = new LambdaQueryWrapper<>(); lambdaQuery.or(wrapper -> wrapper @@ -256,6 +256,27 @@ public class InspectPatientServiceImpl implements InspectPatientService { .eq(InspectPatientDO::getCardId, searchKey) .or() .like(InspectPatientDO::getPName, searchKey)); + + // 只有当 examhoscode 不为 null 且不为空字符串时,才添加查询条件 + if (examhoscode != null && !examhoscode.isEmpty()) { + lambdaQuery.eq(InspectPatientDO::getExamhoscode, examhoscode); + } + //判断状态 + switch (status) + { + case "0": + lambdaQuery.eq(InspectPatientDO::getStatus, 0); + break; + case "1": + lambdaQuery.eq(InspectPatientDO::getStatus, 1); + break; + case "2": + lambdaQuery.eq(InspectPatientDO::getIsprint, 1); + break; + default: + break; + } + lambdaQuery.select( InspectPatientDO::getId, InspectPatientDO::getMedicalSn,