From d83600aff04b5679fef9cb18b46d0c932cce9141 Mon Sep 17 00:00:00 2001
From: hujiaqi <hujiaqi@lymsh.com>
Date: Thu, 12 Jan 2017 16:57:24 +0800
Subject: [PATCH] BUG

---
 .../java/com/lyms/platform/biz/service/PatientsService.java    |  4 ++++
 .../src/main/java/com/lyms/platform/query/PatientsQuery.java   | 10 ++++++++++
 .../com/lyms/platform/operate/web/facade/MatDeliverFacade.java |  3 +++
 3 files changed, 17 insertions(+)

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 1a1a542..c372df9 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
@@ -66,10 +66,14 @@ public class PatientsService {
             patientsQuery.mysqlBuild(iPatientDao.queryPatientCount(query));
             query.start(patientsQuery.getOffset()).end(patientsQuery.getLimit());
         }
+        if(!StringUtils.isEmpty(patientsQuery.getDesc())){
+            return iPatientDao.queryPatient(query.addOrder(Sort.Direction.DESC, patientsQuery.getSort()));
+        }
         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-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
index 5c7cdb2..fda9aef 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
@@ -117,6 +117,16 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
     //区域来源
     private String source;
 
+    private String desc;
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
     public String getNotEnable() {
         return notEnable;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index 6d19106..6c43882 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -1058,6 +1058,8 @@ public class MatDeliverFacade {
         patientsQuery.setFmWeekStart(StringUtils.isEmpty(childbirthManagerRequest.getStartDueWeek()) ? null : Integer.valueOf(childbirthManagerRequest.getStartDueWeek()) * 7);
         patientsQuery.setFmWeekEnd(StringUtils.isEmpty(childbirthManagerRequest.getEndDueWeek()) ? null : Integer.valueOf(childbirthManagerRequest.getEndDueWeek()) * 7);
         // 分娩方式去另外一张表查
+        patientsQuery.setDesc("fmDate");
+        patientsQuery.setSort("fmDate");
         List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
         // 这里就设置分页内容
         childbirthManagerResult.setPageInfo(patientsQuery.getPageInfo());
@@ -1507,6 +1509,7 @@ public class MatDeliverFacade {
         }
         babyModelQuery.setHospitalId(autoMatchFacade.getHospitalId(newBabyManagerRequest.getOperatorId()));
         babyModelQuery.setBuildType(2);
+        babyModelQuery.setOrder("birth");
         List<BabyModel> babyModelList = babyService.queryBabyWithQuery(babyModelQuery);
         if (CollectionUtils.isEmpty(babyModelList)) {
             newBabyManagerResult.setPageInfo(babyModelQuery.getPageInfo());
-- 
1.8.3.1