From df6bac84f1c177cc13e165483d47d1080991d372 Mon Sep 17 00:00:00 2001 From: shiyang Date: Tue, 17 Aug 2021 17:34:02 +0800 Subject: [PATCH] update --- .../java/com/lyms/platform/pojo/AntExChuModel.java | 14 +++++++++ .../platform/pojo/AntenatalExaminationModel.java | 14 +++++++++ .../java/com/lyms/platform/pojo/BabyModel.java | 34 +++++++++++++++++++++ .../platform/pojo/DischargeAbstractBabyModel.java | 34 +++++++++++++++++++++ .../platform/operate/web/facade/ViewFacade.java | 5 ++++ .../operate/web/request/AntExAddRequest.java | 15 ++++++++++ .../web/request/DischargeAbstractSaveRequest.java | 35 ++++++++++++++++++++++ 7 files changed, 151 insertions(+) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java index 733a081..edb23a9 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java @@ -479,6 +479,20 @@ public class AntExChuModel extends BaseModel { //操作人id private String operaterUserId; + /** + * 围场-孕产妇产检页面新加字段 + */ + //NT检查 + private String ntWoman; + + public String getNtWoman() { + return ntWoman; + } + + public void setNtWoman(String ntWoman) { + this.ntWoman = ntWoman; + } + public String getOperaterUserId() { return operaterUserId; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java index 086d9a1..223ab49 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java @@ -372,6 +372,20 @@ public class AntenatalExaminationModel extends BaseModel { //操作人id private String operaterUserId; + /** + * 围场孕妇产检新加字段 + */ + //孕妇NT + private String wcNt; + + public String getWcNt() { + return wcNt; + } + + public void setWcNt(String wcNt) { + this.wcNt = wcNt; + } + public String getOperaterUserId() { return operaterUserId; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java index 959976a..dfcb404 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java @@ -598,6 +598,40 @@ public class BabyModel extends BaseModel { //最后儿保检查医生 private String lastCheckDoctor; + /** + * 围场出院小结页面新增字段 + */ + //耳聋基因筛查 0：未筛查，1：已筛查 + private Integer deafnessGene; + //筛查日期 + private String deafnessGeneDate; + //检查医生 + private String deafnessCheckDoctor; + + public Integer getDeafnessGene() { + return deafnessGene; + } + + public void setDeafnessGene(Integer deafnessGene) { + this.deafnessGene = deafnessGene; + } + + public String getDeafnessGeneDate() { + return deafnessGeneDate; + } + + public void setDeafnessGeneDate(String deafnessGeneDate) { + this.deafnessGeneDate = deafnessGeneDate; + } + + public String getDeafnessCheckDoctor() { + return deafnessCheckDoctor; + } + + public void setDeafnessCheckDoctor(String deafnessCheckDoctor) { + this.deafnessCheckDoctor = deafnessCheckDoctor; + } + public String getFirstPyName() { return firstPyName; } 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 c7b69f4..8fe6cd1 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 @@ -199,6 +199,40 @@ public class DischargeAbstractBabyModel extends BaseModel { private Integer yn; + /** + * 围场出院小结页面新增字段 + */ + //耳聋基因筛查 0：未筛查，1：已筛查 + private Integer deafnessGene; + //筛查日期 + private String deafnessGeneDate; + //检查医生 + private String deafnessCheckDoctor; + + public Integer getDeafnessGene() { + return deafnessGene; + } + + public void setDeafnessGene(Integer deafnessGene) { + this.deafnessGene = deafnessGene; + } + + public String getDeafnessGeneDate() { + return deafnessGeneDate; + } + + public void setDeafnessGeneDate(String deafnessGeneDate) { + this.deafnessGeneDate = deafnessGeneDate; + } + + public String getDeafnessCheckDoctor() { + return deafnessCheckDoctor; + } + + public void setDeafnessCheckDoctor(String deafnessCheckDoctor) { + this.deafnessCheckDoctor = deafnessCheckDoctor; + } + public String getIsHighRisk() { return isHighRisk; } 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 e58c2da..f6e2588 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 @@ -3284,6 +3284,7 @@ public class ViewFacade { map.put("hemoglobin", UnitUtils.unitSplice(data.getHemoglobin(), UnitConstants.GL)); map.put("urineProtein", data.getUrineProtein()); map.put("bChao", data.getbChao()); + map.put("wcNt",data.getWcNt()); /* 诊断指导 */ String diagnosis = ""; @@ -5316,6 +5317,10 @@ public class ViewFacade { babyMap.put("isCH", FunvCommonUtil.checkIsScreening(temp.getIsCH())); babyMap.put("isUNHS", FunvCommonUtil.checkIsScreening(temp.getIsUNHS())); babyMap.put("hearScrResult", temp.getHearScrResult()); + /* 围场出院小结新加字段 耳聋基因 20210817*/ + babyMap.put("deafnessGene",FunvCommonUtil.checkIsScreening(temp.getDeafnessGene())); + babyMap.put("deafnessGeneDate",(temp.getDeafnessGeneDate())); + babyMap.put("deafnessCheckDoctor",(temp.getDeafnessCheckDoctor())); /*滦平start 20201103 */ babyMap.put("esfs", temp.getEsfs()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java index acf604c..960482a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java @@ -357,6 +357,20 @@ public class AntExAddRequest implements IBasicRequestConvert