From 004e43e3a014c101cb3d9d04078948e5df0d7178 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Wed, 20 Dec 2017 12:53:50 +0800
Subject: [PATCH] 1

---
 .../main/java/com/lyms/platform/operate/web/Test.java  | 18 ++++++++++--------
 .../lyms/platform/operate/web/facade/TempFacade.java   |  4 ++--
 .../platform/operate/web/request/TempQueryRequest.java |  6 ++++++
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java
index 249479a..8fbd887 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java
@@ -1,11 +1,12 @@
 package com.lyms.platform.operate.web;
 
 import com.lyms.platform.common.utils.DateUtil;
+import com.lyms.platform.common.utils.ReflectionUtils;
+import com.lyms.platform.pojo.Patients;
 import net.sourceforge.pinyin4j.PinyinHelper;
 import org.apache.log4j.Logger;
 
-import java.util.Comparator;
-import java.util.Date;
+import java.util.*;
 
 /**
  * Created by Administrator on 2016/8/22 0022.
@@ -15,12 +16,13 @@ public class Test {
     private static org.apache.log4j.Logger log = Logger.getLogger("HTTP-INVOKE");
 
     public static void main(String[] args) throws Exception{
-
-        Date startDate = DateUtil.addDay(new Date(),-21);
-        Date endDate = DateUtil.addDay(new Date(),-22);
-        System.out.println(DateUtil.getyyyy_MM_dd(startDate));
-        System.out.println(DateUtil.getyyyy_MM_dd(endDate));
-
+        List<Map<String, Object>> restList = new ArrayList<>();
+        Map<String, Object> map = new HashMap<>();
+        map.put("date","1");
+        map.put("temp", "2");
+        restList.add(map);
+        com.lyms.platform.operate.web.utils.CollectionUtils.reverseList(restList);
+System.out.println(restList);
 
        /* PatientsQuery patientsQuery = new PatientsQuery();
         //排查本院隐藏建档
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java
index 825321b..8de6848 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java
@@ -113,7 +113,7 @@ public class TempFacade {
         PatientsQuery patientsQuery = new PatientsQuery();
         patientsQuery.setCardNo(queryRequest.getCardNo());
         patientsQuery.setVcCardNo(queryRequest.getVcCardNo());
-//        patientsQuery.setHospitalId(hospital);
+        patientsQuery.setHospitalId(hospital);
         patientsQuery.setLastMensesStart(queryRequest.capEnd());
         patientsQuery.setLastMensesEnd(queryRequest.capStart());
 
@@ -149,7 +149,7 @@ public class TempFacade {
 
         ArrayList list = new ArrayList();
         list.add(hospital);
-//        tempQuery.setHospitalList(list);
+        tempQuery.setHospitalList(list);
 
         List<TempModel> temp = tempService.queryTemp(tempQuery);
         List dataList = new ArrayList();
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TempQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TempQueryRequest.java
index 8601846..6a5648d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TempQueryRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TempQueryRequest.java
@@ -55,6 +55,9 @@ public class TempQueryRequest extends BasePageQueryRequest{
     }
 
     public String getVcCardNo() {
+        if(org.apache.commons.lang.StringUtils.isBlank(vcCardNo)){
+            return null;
+        }
         return vcCardNo;
     }
 
@@ -63,6 +66,9 @@ public class TempQueryRequest extends BasePageQueryRequest{
     }
 
     public String getCardNo() {
+        if(org.apache.commons.lang.StringUtils.isBlank(cardNo)){
+            return null;
+        }
         return cardNo;
     }
 
-- 
1.8.3.1