diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index dca50c3..f1c03f6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1292,6 +1292,9 @@ public class BabyBookbuildingFacade { BabyModel bm = new BabyModel(); bm.setNextDate(DateUtil.parseYMD(b.getNextDate())); bm.setYlSelect(b.getYlSelect()); + bm.setIsUNHS(b.getIsUNHS()); + bm.setHearScrResult(b.getHearScrResult()); + //遵化定制 路北辖区状态 bm.setZhlbxqState(b.getZhlbxqState()); bm.setKouqNew(b.getKouqNew()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index 47d32d7..1eefe83 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -152,6 +152,7 @@ public class PremaritalCheckupFacade { if (archiveModel != null) { archiveMap = new HashMap<>(); archiveMap.put("certificateNum", archiveModel.getCertificateNum()); + archiveMap.put("vcCardNo", archiveModel.getVcCardNo()); archiveMap.put("archId", archiveModel.getId()); archiveMap.put("levelType", FunvCommonUtil.getBaseicConfigByid(archiveModel.getLevelTypeId(), basicConfigService)); archiveMap.put("certificateTypeId", archiveModel.getCertificateTypeId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java index a9f798b..e653d83 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java @@ -15,9 +15,17 @@ public class BabyBookbuildingAddRequest { //月龄下拉框 private String ylSelect; + //下次预约 private String nextDate; + // 听力是否筛查(20210122 张洁滦平需求,出院小结听力是否筛查 就是 baby耳声发射) + private Integer isUNHS; + /** + * 听筛结果 1-双耳通过,2-右侧未通过,3-左侧为通过,4-双侧未通过 + */ + private Integer hearScrResult; + /***********母亲基本信息***********/ // 儿童高危因素标记 private List babyHighRiskReason; @@ -850,6 +858,22 @@ public class BabyBookbuildingAddRequest { return jxBcSele; } + public Integer getIsUNHS() { + return isUNHS; + } + + public void setIsUNHS(Integer isUNHS) { + this.isUNHS = isUNHS; + } + + public Integer getHearScrResult() { + return hearScrResult; + } + + public void setHearScrResult(Integer hearScrResult) { + this.hearScrResult = hearScrResult; + } + public void setJxBcSele(Map jxBcSele) { this.jxBcSele = jxBcSele; }