diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 5d29656..d947eb6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -438,37 +438,33 @@ public class AntenatalExaminationFacade { }else if(listDate.size()>1){ patientsQuery1.setBookbuildingDateStart(new Date()); } - /* else{ - Date end = patientsQuery1.getBookbuildingDateEnd(); - patientsQuery1.setBookbuildingDateEnd(new Date()); - patientsQuery1.setBookbuildingDateStart(end); - }*/ pid=list.get(0).getPid(); patientsQuery1.setPid(pid); List patientses = patientsService.queryPatient1(patientsQuery1); - Iterator iterator=patientses.iterator(); - while(iterator.hasNext()){ - Patients patients= iterator.next(); - Date date = DateUtil.addWeek(patients.getLastMenses(),42); - Date currentDate = DateUtil.formatDate(patients.getBookbuildingDate()); - if (date.getTime() <= currentDate.getTime()) - { + if(CollectionUtils.isNotEmpty(patientses)){ + Iterator iterator=patientses.iterator(); + while(iterator.hasNext()){ + Patients patients= iterator.next(); + Date date = DateUtil.addWeek(patients.getLastMenses(),42); + Date currentDate = DateUtil.formatDate(patients.getBookbuildingDate()); + if (date.getTime() <= currentDate.getTime()) + { //建档记录 - if (null != patients.getHospitalId()) { - organization = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())); - } - pid = patients.getPid(); - listData.add(new AntData(patients, null != organization ? organization.getName() : "")); - iterator.remove(); + if (null != patients.getHospitalId()) { + organization = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())); + } + pid = patients.getPid(); + listData.add(new AntData(patients, null != organization ? organization.getName() : "")); + iterator.remove(); - PostReviewQuery postReviewQuery = new PostReviewQuery(); - if (list.size() - 1 > i) { - postReviewQuery.setStart(dueDate); - //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示 - postReviewQuery.setEnd(patientses.get(0).getBookbuildingDate()); - } - postReviewQuery.setPid(pid); + PostReviewQuery postReviewQuery = new PostReviewQuery(); + if (list.size() - 1 > i) { + postReviewQuery.setStart(dueDate); + //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示 + postReviewQuery.setEnd(patientses.get(0).getBookbuildingDate()); + } + postReviewQuery.setPid(pid); // Object obj = map.get(listDate.get(i).getId()); /* if (obj instanceof MaternalDeliverModel) { listData.add(new AntData((MaternalDeliverModel) obj, patientses.get(0).getLastMenses(), null != organization ? organization.getName() : "")); @@ -476,20 +472,22 @@ public class AntenatalExaminationFacade { listData.add(new AntData(stopPregs.get(0), patientses.get(0).getLastMenses(), null != organization ? organization.getName() : "")); }*/ - //产后复查记录 - List reviewModels = postReviewService.findWithList(postReviewQuery); - if (CollectionUtils.isNotEmpty(reviewModels)) { - for (PostReviewModel postReviewModel : reviewModels) { - if (null != postReviewModel.getHospitalId()) { - organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId())); + //产后复查记录 + List reviewModels = postReviewService.findWithList(postReviewQuery); + if (CollectionUtils.isNotEmpty(reviewModels)) { + for (PostReviewModel postReviewModel : reviewModels) { + if (null != postReviewModel.getHospitalId()) { + organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId())); + } + listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patientses.get(0).getFmDate())); } - listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patientses.get(0).getFmDate())); } + sortList.add(listData); + listData=new ArrayList(); } - sortList.add(listData); - listData=new ArrayList(); } } + if(CollectionUtils.isNotEmpty(patientses)){ buildPatientList(dueDate,patientses,listData); @@ -521,6 +519,18 @@ public class AntenatalExaminationFacade { if(!listData.isEmpty()){ sortList.add(listData); } + Collections.sort(listData, new Comparator() { + @Override + public int compare(AntData o1, AntData o2) { + if (o1.getCreated().after(o2.getCreated())) { + return -1; + } + if (o1.getCreated().before(o2.getCreated())) { + return 1; + } + return 0; + } + }); } PatientsQuery patientsQuery1=new PatientsQuery(); patientsQuery1.setYn(YnEnums.YES.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java index ea016d2..c04eb05 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java @@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.result; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.pojo.*; +import org.codehaus.jackson.annotate.JsonIgnore; import java.util.Date; @@ -18,6 +19,16 @@ public class AntData { private String hospitalName; private String hospitalId; + @JsonIgnore + private Date created; + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } public String getHospitalId() { return hospitalId; @@ -65,6 +76,7 @@ public class AntData { this.dueWeek = StringUtils.dueWeek(days); if(null!=model.getCheckDate()){ this.checkTime = DateUtil.getyyyy_MM_dd(model.getCheckDate()); + this.created=model.getCheckDate(); } this.title="复诊"; this.type="3"; @@ -78,6 +90,7 @@ public class AntData { this.dueWeek = StringUtils.dueWeek(days); if(null!=model.getCheckTime()){ this.checkTime = DateUtil.getyyyy_MM_dd(model.getCheckTime()); + this.created=model.getCheckTime(); } this.title="初诊"; @@ -91,6 +104,7 @@ public class AntData { int days = DateUtil.daysBetween(model.getLastMenses(), model.getBookbuildingDate()); this.dueWeek = StringUtils.dueWeek(days); this.checkTime = DateUtil.getyyyy_MM_dd(model.getBookbuildingDate()); + this.created=model.getBookbuildingDate(); this.title="孕妇建档"; this.type="1"; this.hospitalName=hospitalName; @@ -101,6 +115,9 @@ public class AntData { this.id = model.getId(); int days = DateUtil.daysBetween(lastMenses,DateUtil.parseYMD(model.getDueDate())); this.dueWeek = StringUtils.dueWeek(days); + if(null!=model.getDueDate()){ + this.created = DateUtil.parseYMD(model.getDueDate()); + } this.checkTime =model.getDueDate(); this.title="孕妇分娩"; this.type="4"; @@ -114,6 +131,7 @@ public class AntData { this.dueWeek= "产后"+days+"天"; this.dueDate=DateUtil.getyyyy_MM_dd(dueDate); this.checkTime=DateUtil.getyyyy_MM_dd(postReviewModel.getCheckTime()); + this.created=postReviewModel.getCheckTime(); this.title="产后复查"; this.type="5"; this.hospitalName=hospitalName; @@ -125,6 +143,7 @@ public class AntData { int days= DateUtil.daysBetween(lastMenses,postReviewModel.getStopDate()); this.dueWeek=StringUtils.dueWeek(days); this.checkTime=DateUtil.getyyyy_MM_dd(postReviewModel.getStopDate()); + this.created=postReviewModel.getStopDate(); this.title="终止妊娠"; this.type="6"; this.hospitalName=hospitalName;