From df9666954d6ff12cc9ed2ff85d3605690640af1a Mon Sep 17 00:00:00 2001 From: yangfei Date: Wed, 28 Mar 2018 16:26:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E9=99=A2=E5=B0=8F=E7=BB=93=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=90=AC=E7=AD=9B=E7=BB=93=E6=9E=9C=E3=80=81=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E9=AB=98=E5=8D=B1=E5=84=BF=E3=80=81=E9=AB=98=E5=8D=B1?= =?UTF-8?q?=E5=84=BF=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/pojo/DischargeAbstractBabyModel.java | 37 +++++++++++++++++++ .../platform/operate/web/facade/ViewFacade.java | 3 ++ .../web/request/DischargeAbstractSaveRequest.java | 35 ++++++++++++++++++ .../result/DischargeAbstractBabyQueryModel.java | 41 +++++++++++++++++++++- 4 files changed, 115 insertions(+), 1 deletion(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java index 190564e..213b5e9 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java @@ -5,6 +5,7 @@ import com.lyms.platform.common.result.BaseModel; import org.springframework.data.mongodb.core.mapping.Document; import java.util.Date; +import java.util.Map; /** * @auther HuJiaqi @@ -147,12 +148,24 @@ public class DischargeAbstractBabyModel extends BaseModel { private Integer isUNHS; /** + * 听筛结果 + */ + private Map hearScrResult; + + /** * @auther HuJiaqi * @createTime 2016年12月05日 18时25分 * @discription 是否有其他筛查 */ private Integer isOtherScreen; + //是否高危儿童 + private boolean isHighRisk; + /** + * 高危详情 + */ + private Map highRiskResult; + /** * @auther HuJiaqi * @createTime 2016年12月05日 18时26分 @@ -169,6 +182,30 @@ public class DischargeAbstractBabyModel extends BaseModel { private Integer yn; + public boolean isHighRisk() { + return isHighRisk; + } + + public void setHighRisk(boolean highRisk) { + isHighRisk = highRisk; + } + + public Map getHighRiskResult() { + return highRiskResult; + } + + public void setHighRiskResult(Map highRiskResult) { + this.highRiskResult = highRiskResult; + } + + public Map getHearScrResult() { + return hearScrResult; + } + + public void setHearScrResult(Map hearScrResult) { + this.hearScrResult = hearScrResult; + } + public Date getbCGVaccinDate() { return bCGVaccinDate; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 9e80ab7..e92db48 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -2983,6 +2983,9 @@ public class ViewFacade { babyMap.put("isPKU", FunvCommonUtil.checkIsScreening(temp.getIsPKU())); babyMap.put("isCH", FunvCommonUtil.checkIsScreening(temp.getIsCH())); babyMap.put("isUNHS", FunvCommonUtil.checkIsScreening(temp.getIsUNHS())); + babyMap.put("hearScrResult", temp.getHearScrResult()); + babyMap.put("isHighRisk", temp.isHighRisk()); + babyMap.put("highRiskResult", FunvCommonUtil.checkIsScreening(temp.getIsUNHS())); String isOtherScreen = ""; if (temp.getIsOtherScreen() != null) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java index 3ee35c5..514b98f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.request; import java.util.List; +import java.util.Map; /** * @auther HuJiaqi @@ -208,6 +209,17 @@ public class DischargeAbstractSaveRequest { * @discription 听力是否筛查 */ private Integer isUNHS; + /** + * 听筛结果 + */ + private Map hearScrResult; + + //是否高危儿童 + private boolean isHighRisk; + /** + * 高危详情 + */ + private Map highRiskResult; /** * @auther HuJiaqi @@ -223,6 +235,29 @@ public class DischargeAbstractSaveRequest { */ private String orderScreenDescription; + public boolean isHighRisk() { + return isHighRisk; + } + + public void setHighRisk(boolean highRisk) { + isHighRisk = highRisk; + } + + public Map getHighRiskResult() { + return highRiskResult; + } + + public void setHighRiskResult(Map highRiskResult) { + this.highRiskResult = highRiskResult; + } + + public Map getHearScrResult() { + return hearScrResult; + } + + public void setHearScrResult(Map hearScrResult) { + this.hearScrResult = hearScrResult; + } public String getbCGVaccinDate() { return bCGVaccinDate; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractBabyQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractBabyQueryModel.java index 299eb61..ff71991 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractBabyQueryModel.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractBabyQueryModel.java @@ -1,5 +1,7 @@ package com.lyms.platform.operate.web.result; +import java.util.Map; + /** * @auther HuJiaqi * @createTime 2016年12月06日 14时17分 @@ -63,7 +65,8 @@ public class DischargeAbstractBabyQueryModel { */ private String bCGAndHBVVaccinationInjectUserName; - /** 2018年3月21日要求进行分离 + /** + * 2018年3月21日要求进行分离 * 卡介苗接种日期 */ private String bCGVaccinDate; @@ -134,6 +137,18 @@ public class DischargeAbstractBabyQueryModel { private Integer isUNHS; /** + * 听筛结果 + */ + private Map hearScrResult; + + //是否高危儿童 + private boolean isHighRisk; + /** + * 高危详情 + */ + private Map highRiskResult; + + /** * @auther HuJiaqi * @createTime 2016年12月05日 18时25分 * @discription 是否有其他筛查 @@ -147,6 +162,30 @@ public class DischargeAbstractBabyQueryModel { */ private String orderScreenDescription; + public boolean isHighRisk() { + return isHighRisk; + } + + public void setHighRisk(boolean highRisk) { + isHighRisk = highRisk; + } + + public Map getHighRiskResult() { + return highRiskResult; + } + + public void setHighRiskResult(Map highRiskResult) { + this.highRiskResult = highRiskResult; + } + + public Map getHearScrResult() { + return hearScrResult; + } + + public void setHearScrResult(Map hearScrResult) { + this.hearScrResult = hearScrResult; + } + public String getbCGVaccinDate() { return bCGVaccinDate; } -- 1.8.3.1