Commit afd92dfc8f40661a24486c82fed09e0c5493b191
1 parent
9cb7d0877d
Exists in
master
and in
6 other branches
更新
Showing 1 changed file with 6 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
View file @
afd92df
| ... | ... | @@ -285,7 +285,7 @@ |
| 285 | 285 | */ |
| 286 | 286 | public List<CheckByDate> queryCheckListupdate(String cardNo,int ftype){ |
| 287 | 287 | |
| 288 | - CheckResponse check1=new CheckResponse(); | |
| 288 | + /* CheckResponse check1=new CheckResponse(); | |
| 289 | 289 | check1.setHospitalName("秦皇岛妇幼保健"); |
| 290 | 290 | check1.setModified(DateUtil.parseYMDHMS("2017-3-31 10:20:58")); |
| 291 | 291 | check1.setType(1); |
| 292 | 292 | |
| ... | ... | @@ -365,15 +365,15 @@ |
| 365 | 365 | List<CheckResponse> l=new ArrayList<CheckResponse>(); |
| 366 | 366 | l.add(check1); |
| 367 | 367 | l.add(check10); |
| 368 | - l.add(check9); | |
| 368 | + l.add(check9);*/ | |
| 369 | 369 | |
| 370 | 370 | if(1==ftype){ |
| 371 | 371 | List<CheckResponse> result = new ArrayList<>(); |
| 372 | 372 | |
| 373 | 373 | List<CheckByDate> CheckByDate=new ArrayList<CheckByDate>(); |
| 374 | 374 | //List<CheckType> CheckType=new ArrayList<CheckType>(); |
| 375 | - result.addAll(l); | |
| 376 | - //result.addAll(queryLisCheckList(cardNo));解开 | |
| 375 | + //result.addAll(l); | |
| 376 | + result.addAll(queryLisCheckList(cardNo)); | |
| 377 | 377 | //result.addAll(queryPacsCheckList(cardNo)); |
| 378 | 378 | List<String> keyList = new ArrayList<>(); |
| 379 | 379 | // 去重 |
| ... | ... | @@ -462,8 +462,8 @@ |
| 462 | 462 | List<CheckResponse> result = new ArrayList<CheckResponse>(); |
| 463 | 463 | List<CheckByDate> CheckByDate=new ArrayList<CheckByDate>(); |
| 464 | 464 | //List<CheckType> CheckType=new ArrayList<CheckType>(); |
| 465 | - result.addAll(l); | |
| 466 | - //result.addAll(queryLisCheckList(cardNo));解开 | |
| 465 | + //result.addAll(l); | |
| 466 | + result.addAll(queryLisCheckList(cardNo)); | |
| 467 | 467 | //result.addAll(queryPacsCheckList(cardNo)); |
| 468 | 468 | List<String> keyList = new ArrayList<>(); |
| 469 | 469 | List<String> listtype=new ArrayList<>(); |