Commit 004e43e3a014c101cb3d9d04078948e5df0d7178
1 parent
3dd138f6cf
Exists in
master
and in
6 other branches
1
Showing 3 changed files with 18 additions and 10 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java
View file @
004e43e
1 | 1 | package com.lyms.platform.operate.web; |
2 | 2 | |
3 | 3 | import com.lyms.platform.common.utils.DateUtil; |
4 | +import com.lyms.platform.common.utils.ReflectionUtils; | |
5 | +import com.lyms.platform.pojo.Patients; | |
4 | 6 | import net.sourceforge.pinyin4j.PinyinHelper; |
5 | 7 | import org.apache.log4j.Logger; |
6 | 8 | |
7 | -import java.util.Comparator; | |
8 | -import java.util.Date; | |
9 | +import java.util.*; | |
9 | 10 | |
10 | 11 | /** |
11 | 12 | * Created by Administrator on 2016/8/22 0022. |
... | ... | @@ -15,12 +16,13 @@ |
15 | 16 | private static org.apache.log4j.Logger log = Logger.getLogger("HTTP-INVOKE"); |
16 | 17 | |
17 | 18 | public static void main(String[] args) throws Exception{ |
18 | - | |
19 | - Date startDate = DateUtil.addDay(new Date(),-21); | |
20 | - Date endDate = DateUtil.addDay(new Date(),-22); | |
21 | - System.out.println(DateUtil.getyyyy_MM_dd(startDate)); | |
22 | - System.out.println(DateUtil.getyyyy_MM_dd(endDate)); | |
23 | - | |
19 | + List<Map<String, Object>> restList = new ArrayList<>(); | |
20 | + Map<String, Object> map = new HashMap<>(); | |
21 | + map.put("date","1"); | |
22 | + map.put("temp", "2"); | |
23 | + restList.add(map); | |
24 | + com.lyms.platform.operate.web.utils.CollectionUtils.reverseList(restList); | |
25 | +System.out.println(restList); | |
24 | 26 | |
25 | 27 | /* PatientsQuery patientsQuery = new PatientsQuery(); |
26 | 28 | //排查本院隐藏建档 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java
View file @
004e43e
... | ... | @@ -113,7 +113,7 @@ |
113 | 113 | PatientsQuery patientsQuery = new PatientsQuery(); |
114 | 114 | patientsQuery.setCardNo(queryRequest.getCardNo()); |
115 | 115 | patientsQuery.setVcCardNo(queryRequest.getVcCardNo()); |
116 | -// patientsQuery.setHospitalId(hospital); | |
116 | + patientsQuery.setHospitalId(hospital); | |
117 | 117 | patientsQuery.setLastMensesStart(queryRequest.capEnd()); |
118 | 118 | patientsQuery.setLastMensesEnd(queryRequest.capStart()); |
119 | 119 | |
... | ... | @@ -149,7 +149,7 @@ |
149 | 149 | |
150 | 150 | ArrayList list = new ArrayList(); |
151 | 151 | list.add(hospital); |
152 | -// tempQuery.setHospitalList(list); | |
152 | + tempQuery.setHospitalList(list); | |
153 | 153 | |
154 | 154 | List<TempModel> temp = tempService.queryTemp(tempQuery); |
155 | 155 | List dataList = new ArrayList(); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TempQueryRequest.java
View file @
004e43e
... | ... | @@ -55,6 +55,9 @@ |
55 | 55 | } |
56 | 56 | |
57 | 57 | public String getVcCardNo() { |
58 | + if(org.apache.commons.lang.StringUtils.isBlank(vcCardNo)){ | |
59 | + return null; | |
60 | + } | |
58 | 61 | return vcCardNo; |
59 | 62 | } |
60 | 63 | |
... | ... | @@ -63,6 +66,9 @@ |
63 | 66 | } |
64 | 67 | |
65 | 68 | public String getCardNo() { |
69 | + if(org.apache.commons.lang.StringUtils.isBlank(cardNo)){ | |
70 | + return null; | |
71 | + } | |
66 | 72 | return cardNo; |
67 | 73 | } |
68 | 74 |