From 42dd37935cc5489d178de00cc1479295740dd7f2 Mon Sep 17 00:00:00 2001 From: hujiaqi Date: Tue, 13 Dec 2016 17:18:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E4=BC=A0?= =?UTF-8?q?=E5=85=A5=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/MatDeliverFacade.java | 41 ++++++++++++++---- .../web/request/ChildbirthManagerRequest.java | 25 +++++------ .../operate/web/request/NewBabyManagerRequest.java | 48 ++++------------------ 3 files changed, 51 insertions(+), 63 deletions(-) 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 8664d5b..7ffd71b 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 @@ -925,12 +925,15 @@ public class MatDeliverFacade { PatientsQuery patientsQuery = new PatientsQuery(); - patientsQuery.setFmDateStart(DateUtil.parseYMD(childbirthManagerRequest.getStartDate())); - patientsQuery.setFmDateEnd(DateUtil.parseYMD(childbirthManagerRequest.getEndDate())); + if (StringUtils.isNotEmpty(childbirthManagerRequest.getDate())) { + patientsQuery.setBirthStart(DateUtil.getSNDate(childbirthManagerRequest.getDate())[0]); + patientsQuery.setBirthEnd(DateUtil.getSNDate(childbirthManagerRequest.getDate())[1]); + } + patientsQuery.setName(childbirthManagerRequest.getUserName()); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setType(3); - // patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId())); + patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId())); patientsQuery.setCardNo(childbirthManagerRequest.getCardNo()); patientsQuery.setPhone(childbirthManagerRequest.getPhone()); patientsQuery.setHusbandPhone(childbirthManagerRequest.getHusbandPhone()); @@ -1000,19 +1003,33 @@ public class MatDeliverFacade { String fetalPosition = ""; String heartRate = ""; String fetalPresentation = ""; - try { - for (MatDeliverAddRequest.Placenta placenta : placentaList) { + for (Object obj : placentaList) { + if ("com.lyms.platform.operate.web.request.MatDeliverAddRequest$Placenta".equals(obj.getClass().getName())) { + MatDeliverAddRequest.Placenta placenta = (MatDeliverAddRequest.Placenta) obj; for (FetalPositionEnums fetalPositionEnums : FetalPositionEnums.values()) { if (fetalPositionEnums.getId().equals(placenta.getFetalPosition())) { fetalPosition += fetalPositionEnums.getName() + ","; + break; } } heartRate += placenta.getHeartRate() == null ? "" : placenta.getHeartRate().toString() + ","; fetalPresentation += placenta.getFetalPresentation() == null ? "" : placenta.getFetalPresentation() + ","; } - } catch (Exception e) { - // 什么都不干，这么干是为了避开原始数据的问题 + if ("java.util.LinkedHashMap".equals(obj.getClass().getName())) { + Map placenta = JsonUtil.getMap(obj.toString()); + if (MapUtils.isNotEmpty(placenta)) { + for (FetalPositionEnums fetalPositionEnums : FetalPositionEnums.values()) { + if (fetalPositionEnums.getId().equals(placenta.get("fetalPosition"))) { + fetalPosition += fetalPositionEnums.getName() + ","; + break; + } + } + heartRate += placenta.get("heartRate") == null ? "" : placenta.get("heartRate") + ","; + fetalPresentation += placenta.get("fetalPresentation") == null ? "" : placenta.get("fetalPresentation") + ","; + } + } } + childbirthManagerQueryModel.setFetalPosition(fetalPosition.length() == 0 ? "" : fetalPosition.substring(0, fetalPosition.length() - 1)); childbirthManagerQueryModel.setHeartRate(heartRate.length() == 0 ? "" : heartRate.substring(0, heartRate.length() - 1)); childbirthManagerQueryModel.setFetalPresentation(fetalPresentation.length() == 0 ? "" : fetalPresentation.substring(0, fetalPresentation.length() - 1)); @@ -1058,6 +1075,7 @@ public class MatDeliverFacade { for (TpmcTypeEnums tpmcTypeEnums : TpmcTypeEnums.values()) { if (tpmcTypeEnums.getId().equals(extPlacenta.getTpmcType())) { tpmcType += tpmcTypeEnums.getName() + ","; + break; } } tpSize += extPlacenta.getTpSize() == null ? "" : extPlacenta.getTpSize() + ","; @@ -1093,11 +1111,13 @@ public class MatDeliverFacade { for (RenShenJieJuEnums renShenJieJuEnums : RenShenJieJuEnums.values()) { if (renShenJieJuEnums.getId().equals(babyModel.getPregnancyOut())) { pregnancyOut += renShenJieJuEnums.getName() + ","; + break; } } for (SexEnum sexEnum : SexEnum.values()) { if (sexEnum.getId().equals(babyModel.getSex())) { sex += sexEnum.getText() + ","; + break; } } babyWeight += babyModel.getBabyWeight() == null ? "" : babyModel.getBabyWeight() + ","; @@ -1152,8 +1172,10 @@ public class MatDeliverFacade { BabyModelQuery babyModelQuery = new BabyModelQuery(); babyModelQuery.setYn(YnEnums.YES.getId()); babyModelQuery.setQueryNo(newBabyManagerRequest.getQueryNo()); - babyModelQuery.setBirthStart(DateUtil.parseYMD(newBabyManagerRequest.getBirthStartDate())); - babyModelQuery.setBirthEnd(DateUtil.parseYMD(newBabyManagerRequest.getBirthEndDate())); + if (StringUtils.isNotEmpty(newBabyManagerRequest.getDate())) { + babyModelQuery.setBirthStart(DateUtil.getSNDate(newBabyManagerRequest.getDate())[0]); + babyModelQuery.setBirthEnd(DateUtil.getSNDate(newBabyManagerRequest.getDate())[1]); + } babyModelQuery.setDueType(newBabyManagerRequest.getDueType()); babyModelQuery.setPage(newBabyManagerRequest.getPage()); babyModelQuery.setLimit(newBabyManagerRequest.getLimit()); @@ -1184,6 +1206,7 @@ public class MatDeliverFacade { for (SexEnum sexEnum : SexEnum.values()) { if (sexEnum.getId().equals(babyModel.getSex())) { newBabyManagerQueryModel.setSex(sexEnum.getText()); + break; } } Integer highRisk = babyModel.getHighRisk(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java index 3a16565..90486fe 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java @@ -28,9 +28,12 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { */ private String phone; - private String startDate; - - private String endDate; + /** + * @auther HuJiaqi + * @createTime 2016年12月13日 17时13分 + * @discription 分娩日期 + */ + private String date; /** * @auther HuJiaqi @@ -74,20 +77,12 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { this.phone = phone; } - public String getStartDate() { - return startDate; - } - - public void setStartDate(String startDate) { - this.startDate = startDate; - } - - public String getEndDate() { - return endDate; + public String getDate() { + return date; } - public void setEndDate(String endDate) { - this.endDate = endDate; + public void setDate(String date) { + this.date = date; } public String getDeliveryMode() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java index 978dd25..154b685 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java @@ -9,39 +9,17 @@ public class NewBabyManagerRequest extends BasePageQueryRequest { /** * @auther HuJiaqi - * @createTime 2016年12月08日 09时56分 - * @discription 母亲姓名 + * @createTime 2016年12月13日 16时54分 + * @discription 查询号 */ - // private String mname; - - /** - * @auther HuJiaqi - * @createTime 2016年12月08日 09时56分 - * @discription 母亲证件号 - */ - // private String mcertNo; - - /** - * @auther HuJiaqi - * @createTime 2016年12月08日 09时57分 - * @discription 母亲联系方式 - */ - // private String mphone; private String queryNo; /** * @auther HuJiaqi - * @createTime 2016年12月08日 09时57分 - * @discription 分娩日期开始 + * @createTime 2016年12月13日 16时54分 + * @discription 分娩日期 */ - private String birthStartDate; - - /** - * @auther HuJiaqi - * @createTime 2016年12月08日 09时57分 - * @discription 分娩日期结束 - */ - private String birthEndDate; + private String date; /** * @auther HuJiaqi @@ -62,20 +40,12 @@ public class NewBabyManagerRequest extends BasePageQueryRequest { this.queryNo = queryNo; } - public String getBirthStartDate() { - return birthStartDate; - } - - public void setBirthStartDate(String birthStartDate) { - this.birthStartDate = birthStartDate; - } - - public String getBirthEndDate() { - return birthEndDate; + public String getDate() { + return date; } - public void setBirthEndDate(String birthEndDate) { - this.birthEndDate = birthEndDate; + public void setDate(String date) { + this.date = date; } public String getDueType() { -- 1.8.3.1