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 2e8dd0f..cc442b2 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 @@ -65,6 +65,9 @@ public class PatientsService { patientsQuery.mysqlBuild(iPatientDao.queryPatientCount(query)); query.start(patientsQuery.getOffset()).end(patientsQuery.getLimit()); } + if(!StringUtils.isEmpty(patientsQuery.getSort())){ + return iPatientDao.queryPatient(query.addOrder(Sort.Direction.ASC, patientsQuery.getSort())); + } return iPatientDao.queryPatient(query.addOrder(Sort.Direction.DESC, "id")); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index d5b6945..e56112c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1439,12 +1439,12 @@ public class BabyBookbuildingFacade { if(String.valueOf(YnEnums.YES.getId()).equals(request.getIsArea())){ OrganizationQuery organizationQuery = new OrganizationQuery(); - List typeList = new ArrayList<>(); - typeList.add(OrganizationTypeEnum.NY.getId()); - typeList.add(OrganizationTypeEnum.FB.getId()); - typeList.add(OrganizationTypeEnum.JMQY.getId()); - typeList.add(OrganizationTypeEnum.TY.getId()); - organizationQuery.setTypeList(typeList); + // List typeList = new ArrayList<>(); + // typeList.add(OrganizationTypeEnum.NY.getId()); + // typeList.add(OrganizationTypeEnum.FB.getId()); + // typeList.add(OrganizationTypeEnum.JMQY.getId()); + // typeList.add(OrganizationTypeEnum.TY.getId()); + // organizationQuery.setTypeList(typeList); if(!StringUtils.isEmpty(request.getHospitalId())){ hospitalIdList.add(request.getHospitalId()); }else if(!StringUtils.isEmpty(request.getHospitalAreaId())){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java index 0350b5d..e619293 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java @@ -71,6 +71,7 @@ public class PredictedStatisticsFacade { patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(predictedStatisticsRequest.getOperatorId())); patientsQuery.setType(1); + patientsQuery.setSort("dueDate"); String doctorId = predictedStatisticsRequest.getDoctorId(); if (!StringUtils.isEmpty(doctorId)) { patientsQuery.setLastCheckEmployeeId(doctorId);