diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index f6f1f81..2499117 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -64,14 +64,14 @@ public class PatientsService { return iPatientDao.queryPatient(mongoQuery); } - public List queryPatient1(PatientsQuery patientsQuery) { + public List queryPatient1(PatientsQuery patientsQuery,String field) { MongoQuery query = patientsQuery.convertToQuery(); if (StringUtils.isNotEmpty(patientsQuery.getNeed())) { patientsQuery.mysqlBuild(iPatientDao.queryPatientCount(patientsQuery.convertToQuery())); query.start(patientsQuery.getOffset()).end(patientsQuery.getLimit()); } - return iPatientDao.queryPatient(query.addOrder(Sort.Direction.DESC, "created")); + return iPatientDao.queryPatient(query.addOrder(Sort.Direction.DESC, field)); } public int queryPatientCount(PatientsQuery patientsQuery) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 4c99c88..31c3c45 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -572,7 +572,7 @@ public class AntenatalExaminationFacade { } pid = list.get(0).getPid(); patientsQuery1.setPid(pid); - List patientses = patientsService.queryPatient1(patientsQuery1); + List patientses = patientsService.queryPatient1(patientsQuery1,"created"); if (CollectionUtils.isNotEmpty(patientses)) { count=count+patientses.size(); Iterator iterator = patientses.iterator(); 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 e09dd1c..1eee6a6 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 @@ -227,7 +227,7 @@ public class PatientFacade { patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(userId)); patientsQuery.setNeed("1"); //查询符合条件的孕妇 - List patientses = patientsService.queryPatient1(patientsQuery); + List patientses = patientsService.queryPatient1(patientsQuery,"modified"); List data = new ArrayList<>(); if (CollectionUtils.isNotEmpty(patientses)) { //如果是查高危孕妇