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 a57fc54..ea29220 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 @@ -38,8 +38,6 @@ public class PatientsService { private ISieveDao sieveDao; @Autowired private IAntenatalExaminationDao iAntenatalExaminationDao; - @Autowired - private ISieveApplyOrderDao iSieveApplyOrderDao; public Patients addPatient(Patients obj) { return iPatientDao.addPatient(obj); @@ -58,7 +56,15 @@ public class PatientsService { return iPatientDao.queryPatient(query.addOrder(Sort.Direction.DESC, "id")); } + public List queryPatient1(PatientsQuery patientsQuery) { + 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, "modified")); + } public int queryPatientCount(PatientsQuery patientsQuery) { return iPatientDao.queryPatientCount(patientsQuery.convertToQuery()); 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 2357662..4645ed0 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 @@ -217,7 +217,7 @@ public class PatientFacade { patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(userId)); patientsQuery.setNeed("1"); //查询符合条件的孕妇 - List patientses = patientsService.queryPatient(patientsQuery); + List patientses = patientsService.queryPatient1(patientsQuery); List data = new ArrayList<>(); if (CollectionUtils.isNotEmpty(patientses)) { //如果是查高危孕妇