diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckResponse.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckResponse.java index 2e2e8a5..18df6c3 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckResponse.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckResponse.java @@ -24,6 +24,16 @@ public class CheckResponse { private String title; private Date modified; + private String hospitalName;//表示医院名称 + + public String getHospitalName() { + return hospitalName; + } + + public void setHospitalName(String hospitalName) { + this.hospitalName = hospitalName; + } + public Date getModified() { return modified; } 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 bf1de1d..8d2b272 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 @@ -286,6 +286,7 @@ public class QhdfyHisService { public List queryCheckListupdate(String cardNo,int ftype){ CheckResponse check1=new CheckResponse(); + check1.setHospitalName("秦皇岛妇幼保健"); check1.setModified(DateUtil.parseYMDHMS("2017-3-31 10:20:58")); check1.setType(1); check1.setName("张三"); @@ -297,6 +298,7 @@ public class QhdfyHisService { check1.setDoctor("王医生"); CheckResponse check10=new CheckResponse(); + check10.setHospitalName("秦皇岛妇幼保健"); check10.setModified(DateUtil.parseYMDHMS("2017-3-31 10:20:58")); check10.setType(1); check10.setName("张三"); @@ -308,6 +310,7 @@ public class QhdfyHisService { check10.setDoctor("刘医生"); CheckResponse check9=new CheckResponse(); + check9.setHospitalName("秦皇岛妇幼保健"); check9.setModified(DateUtil.parseYMDHMS("2017-3-31 10:20:58")); check9.setType(2); check9.setName("张三"); @@ -408,7 +411,9 @@ public class QhdfyHisService { } for(String time:keyList){ - List result2=new ArrayList<>(); + List result2=new ArrayList<>();//存放所有检验报告(type=1) + List result3=new ArrayList<>();//存放所有影像报告(type=2) + List result4=new ArrayList<>();//存放所有其他报告 CheckType jianyan=new CheckType(); jianyan.setType("检验报告"); CheckType yingxiang=new CheckType(); @@ -419,21 +424,31 @@ public class QhdfyHisService { if(time.equals(DateUtil.getyyyy_MM_dd(chre.getModified()))){ if(chre.getType() == 1){ result2.add(chre); - jianyan.setTypeName(result2); - CheckType.add(jianyan); + //jianyan.setTypeName(result2); + //CheckType.add(jianyan); }else if(chre.getType() == 2){ - result2.add(chre); - yingxiang.setTypeName(result2); - CheckType.add(yingxiang); + result3.add(chre); + //yingxiang.setTypeName(result3); + //CheckType.add(yingxiang); }else{ - result2.add(chre); - other.setTypeName(result2); - CheckType.add(other); + result4.add(chre); + //other.setTypeName(result4); + //CheckType.add(other); } } } + jianyan.setTypeName(result2); + CheckType.add(jianyan); + + yingxiang.setTypeName(result3); + CheckType.add(yingxiang); + + other.setTypeName(result4); + CheckType.add(other); + + CheckByDate CheckByDate1=new CheckByDate(); CheckByDate1.setTime(time); CheckByDate1.setTypes(CheckType); @@ -517,11 +532,13 @@ public class QhdfyHisService { if(type.equals(chre.getType().toString()) && typ.equals(chre.getTitle())){ chre.setTitle(DateUtil.getyyyy_MM_dd(chre.getModified())+" "+chre.getTitle()); result2.add(chre); - CheckType1.setTypeName(result2); - CheckType.add(CheckType1); + //CheckType1.setTypeName(result2); + //CheckType.add(CheckType1); } } + CheckType1.setTypeName(result2); + CheckType.add(CheckType1); } @@ -575,6 +592,7 @@ public class QhdfyHisService { check.setType(1); check.setName(lisReport.getName()); check.setTitle(lisReport.getClassifyName()); + check.setHospitalName("秦皇岛妇幼保健");//新增医院名称字段赋值 if (lisReport.getAge() != null) { check.setAge(lisReport.getAge().toString()); }