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 dd48cd5..4524b39 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 @@ -1948,9 +1948,9 @@ public class InspectPatientController { @GetMapping("/getworkload") @Operation(summary = "根据日期获取卫生院体检统计") public CommonResult> getWorkload(@RequestParam("dates") @DateTimeFormat(pattern = "yyyy-MM-dd") List dates, - @RequestParam(value = "examhosname", required = false) String examhosname) { + @RequestParam(value = "hospitalNo", required = false) String hospitalNo) { // 获取指定日期范围内的所有患者补充信息,如果有医院名称则在数据库层面直接过滤 - List supplements = patientService.getPatientSupplementsByDatesAndHospital(dates, examhosname); + List supplements = patientService.getPatientSupplementsByDatesAndHospital(dates, hospitalNo); // 使用Map来存储统计结果,key为卫生院名称+行政村名称 Map statisticsMap = new HashMap<>(); diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/PatientDetailsVO.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/PatientDetailsVO.java index 6bc2f5b..1ae7536 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/PatientDetailsVO.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/PatientDetailsVO.java @@ -20,4 +20,7 @@ public class PatientDetailsVO { @Schema(description = "所属机构") private String orgid; + @Schema(description = "送检机构") + private String hospitalNo; + } 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 b5fe690..1835031 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 @@ -175,7 +175,7 @@ public interface InspectPatientService { * @param examhosname 医院名称(可选) * @return 患者补充信息列表 */ - List getPatientSupplementsByDatesAndHospital(List dates, String examhosname); + List getPatientSupplementsByDatesAndHospital(List dates, String hospitalNo); void exportStatistics(List dates, HttpServletResponse response); 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 3891ebb..b8fa638 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 @@ -182,7 +182,7 @@ public class InspectPatientServiceImpl implements InspectPatientService { InspectPatientDO::getGender, InspectPatientDO::getPName, InspectPatientDO::getCardId, - InspectPatientDO::getOrgname, + InspectPatientDO::getHospitalNo, InspectPatientDO::getDistrictname, InspectPatientDO::getOldmanflag, InspectPatientDO::getHtnflag, @@ -221,9 +221,9 @@ public class InspectPatientServiceImpl implements InspectPatientService { queryWrapper.eq(InspectPatientDO::getDistrictname, detailsVO.getAddname()); } } - if(detailsVO.getExamhosname()!=null && !detailsVO.getExamhosname().isEmpty()) + if(detailsVO.getHospitalNo()!=null && !detailsVO.getHospitalNo().isEmpty()) { - queryWrapper.eq(InspectPatientDO::getOrgname, detailsVO.getExamhosname()); + queryWrapper.eq(InspectPatientDO::getHospitalNo, detailsVO.getHospitalNo()); } if(detailsVO.getOrgid()!=null&& !detailsVO.getOrgid().isEmpty()) { @@ -907,7 +907,7 @@ public class InspectPatientServiceImpl implements InspectPatientService { } @Override - public List getPatientSupplementsByDatesAndHospital(List dates, String examhosname) { + public List getPatientSupplementsByDatesAndHospital(List dates, String hospitalNo) { if (dates == null || dates.isEmpty() || dates.size() < 2) { return Collections.emptyList(); } @@ -933,8 +933,8 @@ public class InspectPatientServiceImpl implements InspectPatientService { .between(InspectPatientDO::getPrinttime, startDate.atStartOfDay(), endDate.atTime(23, 59, 59)); // 如果医院名称有效,添加筛选条件 - if (examhosname != null && !examhosname.isEmpty() && !"null".equals(examhosname)) { - queryWrapper.eq(InspectPatientDO::getExamhosname, examhosname); + if (hospitalNo != null && !hospitalNo.isEmpty() && !"null".equals(hospitalNo)) { + queryWrapper.eq(InspectPatientDO::getHospitalNo, hospitalNo); } // 查询患者信息