Commit 69a508a4d1953959a71ba56c09f5594c3974fad9
1 parent
9a08545c60
Exists in
master
and in
6 other branches
update code
Showing 2 changed files with 39 additions and 50 deletions
platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
View file @
69a508a
... | ... | @@ -970,9 +970,8 @@ |
970 | 970 | } |
971 | 971 | |
972 | 972 | public static void main(String[] arg) throws Exception { |
973 | - Date lastMensesMax = DateUtil.getNewDate(-42, "周", 0); | |
974 | 973 | |
975 | - System.out.println(getyyyy_MM_dd_hms(lastMensesMax)); | |
974 | + System.out.println(parseYMDHMS("2017-02-10")); | |
976 | 975 | // System.out.println(getMonth(start)); |
977 | 976 | // System.out.println(getMonth(end)); |
978 | 977 | } |
platform-operate-api/src/main/java/com/lyms/hospitalapi/Nczxyy/NczxyyLisService.java
View file @
69a508a
... | ... | @@ -220,17 +220,6 @@ |
220 | 220 | |
221 | 221 | } |
222 | 222 | |
223 | - | |
224 | - | |
225 | - | |
226 | - | |
227 | - | |
228 | - | |
229 | - | |
230 | - | |
231 | - | |
232 | - | |
233 | - | |
234 | 223 | public static List<CheckResponse> queryLisCheckList(String cardNo){ |
235 | 224 | SimpleDateFormat formatter = new SimpleDateFormat( "yyyy-MM-dd "); |
236 | 225 | List<CheckResponse> result = new ArrayList<>(); |
237 | 226 | |
238 | 227 | |
239 | 228 | |
... | ... | @@ -248,50 +237,51 @@ |
248 | 237 | JSONObject json=new JSONObject(map1); |
249 | 238 | Nczxyy2 nczxyy2=null; |
250 | 239 | nczxyy2=(Nczxyy2)json.getObject("result", Nczxyy2.class); |
251 | - for(int i=0;i<nczxyy2.getList().size();i++){ | |
252 | - String DetailId=nczxyy2.getList().get(i).getId(); | |
253 | - String Str="{\"api_id\":\"800020\",\"active_key\":\"LYMS\",\"user_token\":\"LYMS\",\"operator_id\":\"YD_WX\",\"DetailId\":\""+DetailId+"\"}"; | |
254 | - map1.put("result1",HttpClientUtil.doPostHTTP(url, Str)); | |
255 | - JSONObject json1=new JSONObject(map1); | |
256 | - NczxyyXQ2 nczxyyxq2=null; | |
257 | - nczxyyxq2=(NczxyyXQ2)json1.getObject("result1", NczxyyXQ2.class); | |
258 | - if(nczxyyxq2!=null){ | |
259 | - try{ | |
260 | - CheckResponse CheckResponse=new CheckResponse(); | |
261 | - CheckResponse.setHospitalName("四川省南充市中心医院"); | |
262 | - CheckResponse.setName(nczxyyxq2.getData().get姓名()); | |
263 | - CheckResponse.setModified(formatter.parse(nczxyyxq2.getData().get报告时间())); | |
264 | - CheckResponse.setType(1); | |
265 | - CheckResponse.setDoctor(nczxyyxq2.getData().get申请医师()); | |
266 | - CheckResponse.setTitle(nczxyyxq2.getData().get申请项目()); | |
267 | - CheckResponse.setAge(nczxyyxq2.getData().get年龄()); | |
268 | - CheckResponse.setApplyDate(formatter.parse(nczxyyxq2.getData().get申请时间())); | |
269 | - CheckResponse.setApplyDateStr(nczxyyxq2.getData().get申请时间()); | |
270 | - CheckResponse.setCheckDept(nczxyyxq2.getData().get科室()); | |
271 | - CheckResponse.setSex(nczxyyxq2.getData().get性别()); | |
272 | - List<CheckItemResponse> itemlist=new ArrayList<CheckItemResponse>(); | |
273 | - CheckResponse.setItemList(itemlist); | |
274 | - for(int j=0;j<nczxyyxq2.getData().getLisPatResults().size();j++){ | |
275 | - CheckItemResponse item = new CheckItemResponse(); | |
276 | - item.setName(nczxyyxq2.getData().getLisPatResults().get(j).get名称()); | |
277 | - item.setCode(nczxyyxq2.getData().getLisPatResults().get(j).get项目号()); | |
278 | - item.setRefer(nczxyyxq2.getData().getLisPatResults().get(j).get临界值()); | |
279 | - item.setResult(nczxyyxq2.getData().getLisPatResults().get(j).get检验值()); | |
280 | - item.setUnit(nczxyyxq2.getData().getLisPatResults().get(j).get单位()); | |
281 | - item.setSpecial(nczxyyxq2.getData().getLisPatResults().get(j).get结论()); | |
282 | - itemlist.add(item); | |
240 | + if(nczxyy2.getList()!=null && !nczxyy2.getList().isEmpty()) { | |
241 | + for (int i = 0; i < nczxyy2.getList().size(); i++) { | |
242 | + String DetailId = nczxyy2.getList().get(i).getId(); | |
243 | + String Str = "{\"api_id\":\"800020\",\"active_key\":\"LYMS\",\"user_token\":\"LYMS\",\"operator_id\":\"YD_WX\",\"DetailId\":\"" + DetailId + "\"}"; | |
244 | + map1.put("result1", HttpClientUtil.doPostHTTP(url, Str)); | |
245 | + JSONObject json1 = new JSONObject(map1); | |
246 | + NczxyyXQ2 nczxyyxq2 = null; | |
247 | + nczxyyxq2 = (NczxyyXQ2) json1.getObject("result1", NczxyyXQ2.class); | |
248 | + if (nczxyyxq2 != null) { | |
249 | + try { | |
250 | + CheckResponse CheckResponse = new CheckResponse(); | |
251 | + CheckResponse.setHospitalName("四川省南充市中心医院"); | |
252 | + CheckResponse.setName(nczxyyxq2.getData().get姓名()); | |
253 | + CheckResponse.setModified(formatter.parse(nczxyyxq2.getData().get报告时间())); | |
254 | + CheckResponse.setType(1); | |
255 | + CheckResponse.setDoctor(nczxyyxq2.getData().get申请医师()); | |
256 | + CheckResponse.setTitle(nczxyyxq2.getData().get申请项目()); | |
257 | + CheckResponse.setAge(nczxyyxq2.getData().get年龄()); | |
258 | + CheckResponse.setApplyDate(formatter.parse(nczxyyxq2.getData().get申请时间())); | |
259 | + CheckResponse.setApplyDateStr(nczxyyxq2.getData().get申请时间()); | |
260 | + CheckResponse.setCheckDept(nczxyyxq2.getData().get科室()); | |
261 | + CheckResponse.setSex(nczxyyxq2.getData().get性别()); | |
262 | + List<CheckItemResponse> itemlist = new ArrayList<CheckItemResponse>(); | |
263 | + CheckResponse.setItemList(itemlist); | |
264 | + for (int j = 0; j < nczxyyxq2.getData().getLisPatResults().size(); j++) { | |
265 | + CheckItemResponse item = new CheckItemResponse(); | |
266 | + item.setName(nczxyyxq2.getData().getLisPatResults().get(j).get名称()); | |
267 | + item.setCode(nczxyyxq2.getData().getLisPatResults().get(j).get项目号()); | |
268 | + item.setRefer(nczxyyxq2.getData().getLisPatResults().get(j).get临界值()); | |
269 | + item.setResult(nczxyyxq2.getData().getLisPatResults().get(j).get检验值()); | |
270 | + item.setUnit(nczxyyxq2.getData().getLisPatResults().get(j).get单位()); | |
271 | + item.setSpecial(nczxyyxq2.getData().getLisPatResults().get(j).get结论()); | |
272 | + itemlist.add(item); | |
273 | + } | |
274 | + result.add(CheckResponse); | |
275 | + } catch (Exception e) { | |
276 | + e.printStackTrace(); | |
283 | 277 | } |
284 | - result.add(CheckResponse); | |
285 | - }catch (Exception e){ | |
286 | - e.printStackTrace(); | |
278 | + | |
287 | 279 | } |
288 | 280 | |
289 | 281 | } |
290 | - | |
291 | 282 | } |
292 | 283 | |
293 | 284 | return result; |
294 | 285 | } |
295 | - | |
296 | 286 | } |