diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java index e4cf0c9..e37c9e0 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java @@ -539,6 +539,23 @@ public class BabyCheckModel extends BaseModel { //中医指导 private String tcmGuide; + /** + * 围场-儿童建档和儿童体检 添加字段 + */ + //儿童高危-其它高危 + private String otherHighRisk; + + public String getOtherHighRisk() { + return otherHighRisk; + } + + public void setOtherHighRisk(String otherHighRisk) { + this.otherHighRisk = otherHighRisk; + } + + /********************************************/ + + public Integer getCheckDay() { return checkDay; } @@ -2435,6 +2452,7 @@ public class BabyCheckModel extends BaseModel { ", alotExercise='" + alotExercise + '\'' + ", fineExercise='" + fineExercise + '\'' + ", tcmGuide='" + tcmGuide + '\'' + + ", otherHighRisk='" + otherHighRisk + '\'' + '}'; } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 5410255..266d609 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -576,6 +576,7 @@ public class BabyCheckFacade extends BaseServiceImpl { model.setZhipJoint(request.getZhipJoint()); model.setYhipJoint(request.getYhipJoint()); model.setTcmGuide(request.getTcmGuide()); + model.setOtherHighRisk(request.getOtherHighRisk()); return model; } 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 f6e2588..4347a4a 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 @@ -2518,6 +2518,8 @@ public class ViewFacade { map.put("ssy", ssy); // 血压 map.put("szy", szy); // 血压 map.put("yn", data.getYn()); // + //围场孕妇产检新加字段nt + map.put("wcNt",data.getWcNt()); br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); @@ -6172,7 +6174,10 @@ public class ViewFacade { model.setCheckDiagnoseLevel(diagnoseList); model.setHandlSuggest(checkModel.getHandlSuggest()); model.setGuideSuggest(checkModel.getGuideSuggest()); + //隆化新加中医指导 model.setTcmGuide(checkModel.getTcmGuide()); + //围场新加其它高危 + model.setOtherHighRisk(checkModel.getOtherHighRisk()); if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(checkModel.getCheckDoctor())) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java index 18811f8..dd1facb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java @@ -499,9 +499,23 @@ public class BabyCheckRequest { */ private String tcmGuide; + /** + * 围场-儿童建档和儿童体检 添加字段 + */ + //儿童高危-其它高危 + private String otherHighRisk; + /********************************************/ + //儿童疾病 private List diseases; + public String getOtherHighRisk() { + return otherHighRisk; + } + + public void setOtherHighRisk(String otherHighRisk) { + this.otherHighRisk = otherHighRisk; + } public String getTcmGuide() { return tcmGuide; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java index 5d39053..fbf70ad 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java @@ -706,7 +706,21 @@ public class BabyCheckPageResult { /**新增字段 中医指导**/ //中医指导 private String tcmGuide; + /** + * 围场-儿童建档和儿童体检 添加字段 + */ + //儿童高危-其它高危 + private String otherHighRisk; + + public String getOtherHighRisk() { + return otherHighRisk; + } + + public void setOtherHighRisk(String otherHighRisk) { + this.otherHighRisk = otherHighRisk; + } + /********************************************/ public String getTcmGuide() { return tcmGuide;