diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 068b163..aec03cf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -820,6 +820,14 @@ public class PatientFacade { patientsQuery.setLastMensesEnd(riskPatientsQueryRequest.capStart()); patientsQuery.setrLevel(riskPatientsQueryRequest.getrLevel()); patientsQuery.setrFactorList(com.lyms.platform.common.utils.StringUtils.covertToList(riskPatientsQueryRequest.getrFacotr(), String.class)); + if (StringUtils.isNotEmpty(riskPatientsQueryRequest.getFmTime())) { + String fmTime = riskPatientsQueryRequest.getFmTime(); + String[] dates = fmTime.split(" - "); + patientsQuery.setFmDateStart(DateUtil.parseYMD(dates[0])); + if (dates.length == 2) { + patientsQuery.setFmDateEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59")); + } + } List patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); List data = new ArrayList<>(); List idsMd = new ArrayList<>();