From a35d5fb8f59ba835c7ee885e8deb720202186a67 Mon Sep 17 00:00:00 2001 From: yangfei Date: Mon, 25 Sep 2017 10:23:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=8F=E9=99=A2=E7=AE=A1=E7=90=86=E6=8F=90?= =?UTF-8?q?=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/PatientMarkHospServiceFacade.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java index 15bfe8d..aaa6f04 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java @@ -161,7 +161,10 @@ public class PatientMarkHospServiceFacade { markHospitalLog.setMarkeDoctor(ps.getInHospitDoctor()); markHospitalLog.setMarkeDate(ps.getInHospitDate()); markHospitalLog.setMarkeType(3); - ps.setHospitStatus(1); + // ps.setHospitStatus(1); + if(ps.getHospitStatus()==null){ + ps.setHospitStatus(1); + } ps.setInHospitDoctor(String.valueOf(id)); ps.setInHospitDate(new Date()); ps.setInHospitStatus(2); @@ -330,6 +333,8 @@ public class PatientMarkHospServiceFacade { patientMarkHospQuery.setBackFailure(patientMarkRequest.getFailure()); patientMarkHospQuery.setBackStartDate(patientMarkRequest.getMakeStartDate()); patientMarkHospQuery.setBackEndDate(patientMarkRequest.getMakeEndDate()); + patientMarkHospQuery.setSort("back_status asc,back_date desc"); + patientMarkHospQuery.setNeed("y"); } else if (patientMarkRequest.getType() == 3) {//3-住院提醒 //回院提醒状态为已提醒 patientMarkHospQuery.setBackStatus(2); @@ -339,10 +344,10 @@ public class PatientMarkHospServiceFacade { patientMarkHospQuery.setInHospitFailure(patientMarkRequest.getFailure()); patientMarkHospQuery.setInHospitStartDate(patientMarkRequest.getMakeStartDate()); patientMarkHospQuery.setInHospitEndDate(patientMarkRequest.getMakeEndDate()); + patientMarkHospQuery.setSort("in_hospit_status asc,in_hospit_date desc"); + patientMarkHospQuery.setNeed("y"); } - patientMarkHospQuery.setSort("hospit_date"); - patientMarkHospQuery.setNeed("y"); patientMarkHospQuery.setOffset((patientMarkRequest.getPage() - 1) * patientMarkRequest.getLimit()); patientMarkHospQuery.setLimit(patientMarkRequest.getLimit()); patientMarkHospQuery.setPage(patientMarkRequest.getPage()); -- 1.8.3.1