From 3bae53b89c8c1b9fbb06769c7d536210ab937555 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 16 Oct 2018 15:14:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=B7=BB=E5=8A=A0=E9=AB=98?= =?UTF-8?q?=E5=8D=B1=E5=9B=A0=E7=B4=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/common/enums/HighRiskEnum.java | 13 +++++++++ .../com/lyms/platform/common/utils/DateUtil.java | 12 ++++++-- .../operate/web/facade/MatDeliverFacade.java | 33 ++++++++++++++++++++++ .../web/request/MatdeliverFollowRequest.java | 28 ++++++++++++++++++ 4 files changed, 84 insertions(+), 2 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/HighRiskEnum.java b/platform-common/src/main/java/com/lyms/platform/common/enums/HighRiskEnum.java index 40567d6..7d67ede 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/HighRiskEnum.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/HighRiskEnum.java @@ -19,6 +19,19 @@ public enum HighRiskEnum { TWMGY(10, "体外膜给氧"), JXTQCG(11, "机械通气超过48小时"), MQYQTNB(12, "母亲孕期糖尿病、妊高症或曾使用过耳毒性药物或袢利尿剂、或滥用药物和酒精"), + M1(14, "听力异常家族史"), + M2(15, "宫内感染史"), + M3(16, "极低体重儿"), + M4(17, "出生窒息史"), + M5(18, "机械通气史"), + M6(19, "颌面畸形史"), + M7(20, "颅内感染史"), + M8(21, "耳外伤史"), + M9(22, "反复发作的中耳炎"), + M10(23, "耳毒性药物使用史"), + M11(24, "早产儿"), + M12(25, "II型神经纤维瘤和神经衰退性疾病"), + M13(26, "其他"), LCSCZ(13, "临床上存在或怀疑有与听力障碍有关的综合征或遗传病"); private int id; 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 33beafc..e58fbfbfa 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 @@ -1556,8 +1556,16 @@ public class DateUtil { // int weeks = daysBetween(baby, new Date()) / 7; // String weekAge = String.valueOf(weeks); - Date baby = parseDate("2018-07-15"); - System.out.println(baby.getTime()); + Date startDate = addDay(new Date(),-10-1); + Date endDate = addDay(new Date(), -10); + + String start = getyyyy_MM_dd(startDate); + String end = getyyyy_MM_dd(endDate); + + System.out.println(start+"=="+end); + +// Date baby = parseDate("2018-07-15"); +// System.out.println(baby.getTime()); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index a8baa93..b5e0386 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -1678,6 +1678,25 @@ public class MatDeliverFacade { matDeliverQuery.setCreatedStart(DateUtil.getSNDate(matdeliverFollowRequest.getBirthDate())[0]); matDeliverQuery.setEndStart(DateUtil.getSNDate(matdeliverFollowRequest.getBirthDate())[1]); } + if (matdeliverFollowRequest.getStartDay() != null && matdeliverFollowRequest.getEndDay() != null ) + { + matDeliverQuery.setCreatedStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getEndDay()))); + matDeliverQuery.setEndStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getStartDay()))); + } + else if (matdeliverFollowRequest.getStartDay() != null) + { + matDeliverQuery.setCreatedStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getStartDay()-1))); + matDeliverQuery.setEndStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getStartDay()))); + } + else if(matdeliverFollowRequest.getEndDay() != null) + { + matDeliverQuery.setCreatedStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getEndDay()-1))); + matDeliverQuery.setEndStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getEndDay()))); + } + + System.out.println(DateUtil.getyyyy_MM_dd(matDeliverQuery.getCreatedStart())); + System.out.println(DateUtil.getyyyy_MM_dd(matDeliverQuery.getEndStart())); + if (matdeliverFollowRequest.getFollowStage() != null) {//按访视阶段查询 if (matdeliverFollowRequest.getFollowStage() == 1) {//1、访视期内 分娩时间为：21天到当前时间 matDeliverQuery.setCreatedStart(DateUtil.addDay(new Date(), -22)); @@ -1701,6 +1720,20 @@ public class MatDeliverFacade { matDeliverQuery.setMakeType(matdeliverFollowRequest.getMakeType()); List maternalDeliverModelList; + if (StringUtils.isNotEmpty(matdeliverFollowRequest.getRiskId())) + { + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setrFactor(matdeliverFollowRequest.getRiskId()); + List parentIdList = new ArrayList<>(); + List patientsList = patientsService.queryPatient(patientsQuery); + for (Patients md : patientsList) { + parentIdList.add(md.getId()); + } + matDeliverQuery.setParentIdList(parentIdList); + } + + if (StringUtils.isNotEmpty(matdeliverFollowRequest.getNeed())) {//是否分页 matDeliverQuery.setNeed("need"); matDeliverQuery.setLimit(matdeliverFollowRequest.getLimit()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java index a5696c8..7277e3a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java @@ -94,6 +94,34 @@ public class MatdeliverFollowRequest extends BasePageQueryRequest{ */ private String need; + private String riskId; + private Integer startDay; + private Integer endDay; + + public String getRiskId() { + return riskId; + } + + public void setRiskId(String riskId) { + this.riskId = riskId; + } + + public Integer getStartDay() { + return startDay; + } + + public void setStartDay(Integer startDay) { + this.startDay = startDay; + } + + public Integer getEndDay() { + return endDay; + } + + public void setEndDay(Integer endDay) { + this.endDay = endDay; + } + public Date getFollowStarDate() { return followStarDate; } -- 1.8.3.1