diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java index 8d2b272..d8e5182 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java @@ -458,7 +458,7 @@ public class QhdfyHisService { return CheckByDate; }else{ - List result = new ArrayList<>(); + List result = new ArrayList(); List CheckByDate=new ArrayList(); List CheckType=new ArrayList(); result.addAll(l); @@ -527,7 +527,7 @@ public class QhdfyHisService { for(String typ:listtype){ List result2=new ArrayList<>(); CheckType CheckType1=new CheckType(); - CheckType1.setType(typ); + //CheckType1.setType(typ); for(CheckResponse chre:result){ if(type.equals(chre.getType().toString()) && typ.equals(chre.getTitle())){ chre.setTitle(DateUtil.getyyyy_MM_dd(chre.getModified())+" "+chre.getTitle()); @@ -537,8 +537,12 @@ public class QhdfyHisService { } } - CheckType1.setTypeName(result2); - CheckType.add(CheckType1); + if(result2.size()>0){ + CheckType1.setType(typ); + CheckType1.setTypeName(result2); + CheckType.add(CheckType1); + } + } @@ -559,6 +563,14 @@ public class QhdfyHisService { } + for(String typ:listtype){ + + + } + + + + return CheckByDate; }