From bf5daf7ee194d28bc0448ba5719544e174883759 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 7 Mar 2018 11:37:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=AD=A6=E6=A0=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/PatientCourseFacade.java    | 40 +++++++++++++++++-----
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java
index bc1c9fa..e68c9a1 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java
@@ -21,14 +21,8 @@ import com.lyms.platform.permission.model.OrganizationQuery;
 import com.lyms.platform.permission.model.Users;
 import com.lyms.platform.permission.service.OrganizationService;
 import com.lyms.platform.permission.service.UsersService;
-import com.lyms.platform.pojo.CourseModel;
-import com.lyms.platform.pojo.CourseTypeModel;
-import com.lyms.platform.pojo.PatientCourseModel;
-import com.lyms.platform.pojo.Patients;
-import com.lyms.platform.query.CourseQuery;
-import com.lyms.platform.query.CourseTypeQuery;
-import com.lyms.platform.query.PatientCourseQuery;
-import com.lyms.platform.query.PatientsQuery;
+import com.lyms.platform.pojo.*;
+import com.lyms.platform.query.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -163,6 +157,8 @@ public class PatientCourseFacade {
             patientsQuery.setYn(YnEnums.YES.getId());
             patientsQuery.setPvc(queryNo);
             patientsQuery.setHospitalId(hospitalId);
+            patientsQuery.setDesc("true");
+            patientsQuery.setSort("created");
             List<Patients> patientses = patientsService.queryPatient(patientsQuery);
             if (CollectionUtils.isNotEmpty(patientses))
             {
@@ -251,6 +247,34 @@ public class PatientCourseFacade {
                 return objectResponse;
             }
         }
+        else
+        {
+            objectResponse.setErrorcode(ErrorCodeConstants.NO_DATA);
+            objectResponse.setErrormsg("该课程不存在");
+            return objectResponse;
+        }
+
+        if (orderType == 2)
+        {
+            PatientsQuery patientsQuery = new PatientsQuery();
+            patientsQuery.setYn(YnEnums.YES.getId());
+            patientsQuery.setId(patientId);
+            List<Patients> patientses = patientsService.queryPatient(patientsQuery);
+            if (CollectionUtils.isNotEmpty(patientses)) {
+
+                Patients patients = patientses.get(0);
+                patientsQuery.setId(null);
+                patientsQuery.setPid(patients.getPid());
+                patientsQuery.setHospitalId(courseModels.get(0).getHospitalId());
+                patientsQuery.setDesc("true");
+                patientsQuery.setSort("created");
+                patientses = patientsService.queryPatient(patientsQuery);
+                if (CollectionUtils.isNotEmpty(patientses))
+                {
+                    patientId = patientses.get(0).getId();
+                }
+            }
+        }
 
         PatientCourseQuery patientCourseQuery = new PatientCourseQuery();
         patientCourseQuery.setCourseId(courseId);
-- 
1.8.3.1