Commit 61e5d61f1c748e5a558210fbe474190812dcaf9c
1 parent
7269863d68
Exists in
master
and in
6 other branches
更新
Showing 1 changed file with 16 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
View file @
61e5d61
| ... | ... | @@ -458,7 +458,7 @@ |
| 458 | 458 | return CheckByDate; |
| 459 | 459 | |
| 460 | 460 | }else{ |
| 461 | - List<CheckResponse> result = new ArrayList<>(); | |
| 461 | + List<CheckResponse> result = new ArrayList<CheckResponse>(); | |
| 462 | 462 | List<CheckByDate> CheckByDate=new ArrayList<CheckByDate>(); |
| 463 | 463 | List<CheckType> CheckType=new ArrayList<CheckType>(); |
| 464 | 464 | result.addAll(l); |
| ... | ... | @@ -527,7 +527,7 @@ |
| 527 | 527 | for(String typ:listtype){ |
| 528 | 528 | List<CheckResponse> result2=new ArrayList<>(); |
| 529 | 529 | CheckType CheckType1=new CheckType(); |
| 530 | - CheckType1.setType(typ); | |
| 530 | + //CheckType1.setType(typ); | |
| 531 | 531 | for(CheckResponse chre:result){ |
| 532 | 532 | if(type.equals(chre.getType().toString()) && typ.equals(chre.getTitle())){ |
| 533 | 533 | chre.setTitle(DateUtil.getyyyy_MM_dd(chre.getModified())+" "+chre.getTitle()); |
| ... | ... | @@ -537,8 +537,12 @@ |
| 537 | 537 | } |
| 538 | 538 | |
| 539 | 539 | } |
| 540 | - CheckType1.setTypeName(result2); | |
| 541 | - CheckType.add(CheckType1); | |
| 540 | + if(result2.size()>0){ | |
| 541 | + CheckType1.setType(typ); | |
| 542 | + CheckType1.setTypeName(result2); | |
| 543 | + CheckType.add(CheckType1); | |
| 544 | + } | |
| 545 | + | |
| 542 | 546 | } |
| 543 | 547 | |
| 544 | 548 | |
| ... | ... | @@ -558,6 +562,14 @@ |
| 558 | 562 | } |
| 559 | 563 | |
| 560 | 564 | } |
| 565 | + | |
| 566 | + for(String typ:listtype){ | |
| 567 | + | |
| 568 | + | |
| 569 | + } | |
| 570 | + | |
| 571 | + | |
| 572 | + | |
| 561 | 573 | |
| 562 | 574 | |
| 563 | 575 | return CheckByDate; |