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 a8e4dc0..5f190c1 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 @@ -2,7 +2,6 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; -import com.lyms.platform.common.constants.TimeConstants; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; @@ -1085,7 +1084,7 @@ public class MatDeliverFacade { patientsQuery.setAreaRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getLivingAreaId()) ? null : childbirthManagerRequest.getLivingAreaId()); patientsQuery.setHusbandPhone(StringUtils.isEmpty(childbirthManagerRequest.getHusbandPhone()) ? null : childbirthManagerRequest.getHusbandPhone()); patientsQuery.setQueryNo(StringUtils.isEmpty(childbirthManagerRequest.getQueryNo()) ? null : childbirthManagerRequest.getQueryNo()); - patientsQuery.setFmHospitalQueryList(hospitalList); + // patientsQuery.setFmHospitalQueryList(hospitalList); String deliveryModeQueryJson = "fmfs\\\":\\\"" + childbirthManagerRequest.getDeliveryMode(); patientsQuery.setFmType(StringUtils.isEmpty(childbirthManagerRequest.getDeliveryMode()) ? null : deliveryModeQueryJson); patientsQuery.setFmAgeStart(StringUtils.isEmpty(childbirthManagerRequest.getStartAge()) ? null : Integer.valueOf(childbirthManagerRequest.getStartAge())); @@ -1282,6 +1281,10 @@ public class MatDeliverFacade { childbirthManagerQueryModel.setLoseBloodCause(""); } } + // 1/2/24小时失血量 + childbirthManagerQueryModel.setOhloseBloodL(maternalDeliverModel.getsHloseBloodL()); + childbirthManagerQueryModel.setThloseBloodL(maternalDeliverModel.gettHloseBloodL()); + childbirthManagerQueryModel.setRhloseBloodL(maternalDeliverModel.getrHloseBloodL()); // 查询分娩方式 childbirthManagerQueryModel.setMaternalDeliverId(maternalDeliverModel.getId()); 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 4c0aa8a..ef82ccf 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 @@ -392,9 +392,9 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { initQueryMap.put("chBpSzy1", "舒张压"); initQueryMap.put("breath", "呼吸"); initQueryMap.put("pulse", "脉搏"); - initQueryMap.put("oHloseBloodL", "产后1小时失血量"); - initQueryMap.put("tHloseBloodL", "产后2小时失血量"); - initQueryMap.put("rHloseBloodL", "产后24小时内失血量"); + initQueryMap.put("ohloseBloodL", "产后1小时失血量"); + initQueryMap.put("thloseBloodL", "产后2小时失血量"); + initQueryMap.put("rhloseBloodL", "产后24小时内失血量"); initQueryMap.put("loseBloodCause", "失血原因"); initQueryMap.put("tpmcType", "胎盘娩出方式"); initQueryMap.put("tpSize", "胎盘大小"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java index 629cb3f..1f6b525 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java @@ -236,21 +236,21 @@ public class ChildbirthManagerQueryModel { * @createTime 2016年12月09日 15时54分 * @discription 产后1小时失血量 */ - private Double oHloseBloodL; + private Double ohloseBloodL; /** * @auther HuJiaqi * @createTime 2016年12月09日 15时54分 * @discription 产后2小时失血量 */ - private Double tHloseBloodL; + private Double thloseBloodL; /** * @auther HuJiaqi * @createTime 2016年12月09日 15时54分 * @discription 产后24小时内失血量 */ - private Double rHloseBloodL; + private Double rhloseBloodL; /** * @auther HuJiaqi @@ -656,28 +656,28 @@ public class ChildbirthManagerQueryModel { this.pulse = pulse; } - public Double getoHloseBloodL() { - return oHloseBloodL; + public Double getOhloseBloodL() { + return ohloseBloodL; } - public void setoHloseBloodL(Double oHloseBloodL) { - this.oHloseBloodL = oHloseBloodL; + public void setOhloseBloodL(Double ohloseBloodL) { + this.ohloseBloodL = ohloseBloodL; } - public Double gettHloseBloodL() { - return tHloseBloodL; + public Double getThloseBloodL() { + return thloseBloodL; } - public void settHloseBloodL(Double tHloseBloodL) { - this.tHloseBloodL = tHloseBloodL; + public void setThloseBloodL(Double thloseBloodL) { + this.thloseBloodL = thloseBloodL; } - public Double getrHloseBloodL() { - return rHloseBloodL; + public Double getRhloseBloodL() { + return rhloseBloodL; } - public void setrHloseBloodL(Double rHloseBloodL) { - this.rHloseBloodL = rHloseBloodL; + public void setRhloseBloodL(Double rhloseBloodL) { + this.rhloseBloodL = rhloseBloodL; } public String getLoseBloodCause() {