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 4900a90..c34a707 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 @@ -750,11 +750,15 @@ public class PatientFacade extends BaseServiceImpl { patientsQuery.setNextCheckTimeIs(true); patientsQuery.setNextCheckTimeNe(false); patientses = patientsService.queryPatientBySort(patientsQuery, "created","desc"); - } else{ + } else if ("1".equals(riskPatientsQueryRequest.getYyzt())){ //获取有检查数据 patientsQuery.setNextCheckTimeNe(true); patientsQuery.setNextCheckTimeIs(false); patientses = patientsService.queryPatientBySort(patientsQuery, "nextCheckTime","asc"); + }else { + patientsQuery.setNextCheckTimeNe(false); + patientsQuery.setNextCheckTimeIs(false); + patientses = patientsService.queryPatientBySort(patientsQuery, "created","desc"); } }else { //这里排序参考RiskPatientsQueryRequest里面的sort和order字段逻辑