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 2aa79a7..84ca636 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 @@ -598,6 +598,29 @@ public class BabyCheckModel extends BaseModel { } /***********************************************************/ + /** + * 滦平-儿童检查3-6月龄套餐增加: + * 氟化防龋治疗 1 筛查 2 未筛查。 + * 一般细菌培养: 1 筛查 2 未筛查 + */ + private Integer fhfz; + private Integer ybxj; + + public Integer getFhfz() { + return fhfz; + } + + public void setFhfz(Integer fhfz) { + this.fhfz = fhfz; + } + + public Integer getYbxj() { + return ybxj; + } + + public void setYbxj(Integer ybxj) { + this.ybxj = ybxj; + } public Integer getCheckDay() { return checkDay; } 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 0e4e2ab..6b28a85 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 @@ -615,6 +615,13 @@ public class BabyCheckFacade extends BaseServiceImpl { model.setScreeningOther(StringUtils.isNotEmpty(request.getScreeningOther())?request.getScreeningOther():""); //秦皇岛-儿保检查-高危儿详情 model.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(request.getQhdHighRiskInfo())?request.getQhdHighRiskInfo():null); + //滦平-滦平-儿童检查3-6月龄套餐增加,氟化防龋治疗,一般细菌培养 + if(null!=request.getFhfz()){ + model.setFhfz(request.getFhfz()); + } + if(null!=request.getYbxj()){ + model.setYbxj(request.getYbxj()); + } return model; } @@ -2491,6 +2498,14 @@ public class BabyCheckFacade extends BaseServiceImpl { model.setScreeningOther(StringUtils.isNotEmpty(checkModel.getScreeningOther())?checkModel.getScreeningOther():""); //秦皇岛-新高危儿详情 model.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(checkModel.getQhdHighRiskInfo())?checkModel.getQhdHighRiskInfo():null); + //滦平-滦平-儿童检查3-6月龄套餐增加,氟化防龋治疗,一般细菌培养 + if(null!=checkModel.getFhfz()){ + model.setFhfz(checkModel.getFhfz()); + } + if(null!=checkModel.getYbxj()){ + model.setYbxj(checkModel.getYbxj()); + } + 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 760c4ae..b61faaf 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 @@ -6355,6 +6355,13 @@ public class ViewFacade { //秦皇岛-高危儿详情 model.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(checkModel.getQhdHighRiskInfo())?checkModel.getQhdHighRiskInfo():null); + //滦平-滦平-儿童检查3-6月龄套餐增加,氟化防龋治疗,一般细菌培养 + if(null!=checkModel.getFhfz()){ + model.setFhfz(checkModel.getFhfz()); + } + if(null!=checkModel.getYbxj()){ + model.setYbxj(checkModel.getYbxj()); + } return model; 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 50ac3dd..e8e8e84 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 @@ -560,6 +560,30 @@ public class BabyCheckRequest { } /***********************************************************/ + /** + * 滦平-儿童检查3-6月龄套餐增加: + * 氟化防龋治疗 1 筛查 2 未筛查。 + * 一般细菌培养: 1 筛查 2 未筛查 + */ + private Integer fhfz; + private Integer ybxj; + + public Integer getFhfz() { + return fhfz; + } + + public void setFhfz(Integer fhfz) { + this.fhfz = fhfz; + } + + public Integer getYbxj() { + return ybxj; + } + + public void setYbxj(Integer ybxj) { + this.ybxj = ybxj; + } + 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 21d55df..50c8cbd 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 @@ -776,6 +776,30 @@ public class BabyCheckPageResult { } /***********************************************************/ + /** + * 滦平-儿童检查3-6月龄套餐增加: + * 氟化防龋治疗 1 筛查 2 未筛查。 + * 一般细菌培养: 1 筛查 2 未筛查 + */ + private Integer fhfz; + private Integer ybxj; + + public Integer getFhfz() { + return fhfz; + } + + public void setFhfz(Integer fhfz) { + this.fhfz = fhfz; + } + + public Integer getYbxj() { + return ybxj; + } + + public void setYbxj(Integer ybxj) { + this.ybxj = ybxj; + } + public String getTcmGuide() { return tcmGuide; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java index c48db79..5edb224 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java @@ -799,6 +799,29 @@ public class BabyCheckResult { this.qhdHighRiskInfo = qhdHighRiskInfo; } /***********************************************************/ + /** + * 滦平-儿童检查3-6月龄套餐增加: + * 氟化防龋治疗 1 筛查 2 未筛查。 + * 一般细菌培养: 1 筛查 2 未筛查 + */ + private Integer fhfz; + private Integer ybxj; + + public Integer getFhfz() { + return fhfz; + } + + public void setFhfz(Integer fhfz) { + this.fhfz = fhfz; + } + + public Integer getYbxj() { + return ybxj; + } + + public void setYbxj(Integer ybxj) { + this.ybxj = ybxj; + } public String getExerciseIA() { return exerciseIA;