From 0174cd239f1af01bf77fcbd53151285242c044b0 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 18 Jul 2016 10:33:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E9=80=9A?= =?UTF-8?q?=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/common/utils/DateUtil.java | 28 +++++++++++++++++++--- .../web/facade/AntenatalExaminationFacade.java | 21 ++++++++++++---- .../lyms/platform/operate/web/result/AntData.java | 13 ++++++++++ 3 files changed, 55 insertions(+), 7 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index 430d2f8..13f2f1c 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -33,7 +33,19 @@ public class DateUtil { } return days; } - + public static void orderDate(List dates){ + Collections.sort(dates, new Comparator() { + @Override + public int compare(Date o1, Date o2) { + if(o1.before(o2)){ + return -1; + }else if(o1.after(o2)){ + return 1; + } + return 0; + } + }); + } public static Integer minute2Index(Date date) { DateTime dt = new DateTime(date.getTime()); return dt.getMinuteOfDay() / 10; @@ -492,10 +504,20 @@ public class DateUtil { int s = getBabyAgeMonth(parseYMD("2016-05-26"), new Date()); SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd "); // System.out.println(getBabyAgeMonth(parseYMD("2016-05-23"), new Date())); - System.out.println(DateUtil.getyyyy_MM_dd_hms(DateUtil.addDay(new Date(),-108))); - System.out.println(DateUtil.getyyyy_MM_dd_hms(DateUtil.addDay(new Date(), -146))); + /* System.out.println(DateUtil.getyyyy_MM_dd_hms(DateUtil.addDay(new Date(),-108))); + System.out.println(DateUtil.getyyyy_MM_dd_hms(DateUtil.addDay(new Date(), -146))); */ // System.out.print(1457688652-23341); //1457711993 // 1426089600 + List data =new ArrayList<>(); + data.add(parseYMD("2016-01-26")); + data.add(parseYMD("2016-04-26")); + data.add(parseYMD("2016-02-26")); + data.add(parseYMD("2016-05-26")); + data.add(parseYMD("2016-03-26")); + orderDate(data); + for(Date d:data){ + System.out.print(simpleDateFormat.format(d)); + } } } 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 304740a..e71f8f1 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 @@ -10,10 +10,7 @@ import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.*; -import com.lyms.platform.operate.web.result.AntData; -import com.lyms.platform.operate.web.result.AntenatalExaminationResult; -import com.lyms.platform.operate.web.result.AntexChuResult; -import com.lyms.platform.operate.web.result.AntexListResult; +import com.lyms.platform.operate.web.result.*; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.pojo.*; @@ -51,6 +48,8 @@ public class AntenatalExaminationFacade { private PostReviewService postReviewService; @Autowired private AutoMatchFacade autoMatchFacade; + @Autowired + private StopPregnancyService stopPregnancyService; /** * 增加一条产前检查 @@ -172,6 +171,7 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(list)) { antexListResult.convertToResult(null, list.get(0), null); for (Patients patients : list) { + List stopPregs =null; List data = new ArrayList<>(); MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); matDeliverQuery.setYn(YnEnums.YES.getId()); @@ -188,6 +188,15 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(modelList)) { MaternalDeliverModel model = modelList.get(0); dueDate = model.getDueDate(); + }else { + //终止妊娠 + StopPregQuery query = new StopPregQuery(); + query.setYn(YnEnums.YES.getId()); + query.setPid(patients.getPid()); + stopPregs = stopPregnancyService.queryStopPreg(query); + if(CollectionUtils.isNotEmpty(stopPregs)){ + dueDate=DateUtil.getyyyy_MM_dd(stopPregs.get(0).getStopDate()); + } } PostReviewQuery postReviewQuery = new PostReviewQuery();; if (StringUtils.isNotEmpty(dueDate)) { @@ -238,6 +247,10 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(modelList)) { organization = organizationService.getOrganization(Integer.valueOf(modelList.get(0).getHospitalId())); data.add(new AntData(modelList.get(0), patients.getLastMenses(), null != organization ? organization.getName() : "")); + }else if(CollectionUtils.isNotEmpty(stopPregs)){ + //终止妊娠记录 + organization = organizationService.getOrganization(Integer.valueOf(modelList.get(0).getHospitalId())); + data.add(new AntData(stopPregs.get(0), patients.getLastMenses(), null != organization ? organization.getName() : "")); } //产后复查记录 List reviewModels = postReviewService.findWithList(postReviewQuery); 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 a64099a..54e2057 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 @@ -112,6 +112,19 @@ public class AntData { this.hospitalId=postReviewModel.getHospitalId(); } + public AntData(StopPregModel postReviewModel,Date lastMenses,String hospitalName) { + this.id=postReviewModel.getId(); + int days= DateUtil.daysBetween(lastMenses,postReviewModel.getStopDate()); + String week= (days/7)+""; + int day = (days%7); + this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":""); + this.checkTime=DateUtil.getyyyy_MM_dd(postReviewModel.getCreated()); + this.title="终止妊娠"; + this.type="6"; + this.hospitalName=hospitalName; + this.hospitalId="医院id"; + } + public String getCheckTime() { return checkTime; } -- 1.8.3.1