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 081d286..188f3e3 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 @@ -668,7 +668,9 @@ public class PatientFacade { //滦平实现 下次预约时间升序方式,但是空默认在最前特两次查询组合在一起实现 List patientses = new ArrayList <>(); if("lp".equals(riskPatientsQueryRequest.getHstart())){ - if(patientsQuery.getNextCheckTimeStart()!=null || patientsQuery.getNextCheckTimeEnd()!=null){ + patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); + + /* if(patientsQuery.getNextCheckTimeStart()!=null || patientsQuery.getNextCheckTimeEnd()!=null){ //下次检查时间非空,不用考虑空排序在前面问题 patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); }else { @@ -683,7 +685,7 @@ public class PatientFacade { patientsQuery.setNextCheckTimeNe(false); List patientsesm = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); patientses.addAll(patientsesm); - } + }*/ }else { //以前逻辑 @@ -696,6 +698,7 @@ public class PatientFacade { //如果是查高危孕妇 if (null != isHighRisk && Boolean.TRUE.equals(isHighRisk)) { data = convertToHighRisk(patientses, userId, hospital); + data = convertToHighRisk(patientses, userId, hospital); } else if (type == 1) { //处理全部孕妇的情况 data = convertToQuanPatient(patientses, userId, hospital); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 25ddec5..cc402e2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -3640,7 +3640,6 @@ public class ViewFacade { map.put("gcdfDoctorId", users.getName()); } } catch (NumberFormatException e) { - e.printStackTrace(); map.put("gcdfDoctorId", data.getGcdfDoctorId()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java index 3364090..b702a33 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java @@ -239,7 +239,6 @@ public class QuanChanPatientWorker implements Callable > { chanResult.setGcdfDoctorId(users.getName());//分娩时的管床大夫 } } catch (NumberFormatException e) { - e.printStackTrace(); chanResult.setGcdfDoctorId(maternalDeliverModels.get(0).getGcdfDoctorId());//分娩时的管床大夫 } }