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 43d46aa..351b264 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 @@ -706,6 +706,21 @@ public class BabyModel extends BaseModel { /****************************************/ + /************************************************* + * 秦皇岛-高危儿因素详情 + */ + + private List> qhdHighRiskInfo; + + public List> getQhdHighRiskInfo() { + return qhdHighRiskInfo; + } + + public void setQhdHighRiskInfo(List> qhdHighRiskInfo) { + this.qhdHighRiskInfo = qhdHighRiskInfo; + } + /***********************************************************/ + public Integer getDeafnessGene() { return deafnessGene; } 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 c8224e3..7e3ed4f 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 @@ -225,8 +225,9 @@ public class BabyCheckFacade extends BaseServiceImpl { } bm.setLastDiagnose(diagnoseNames); } - bm.setDiseases(request.getDiseases()); + //秦皇岛-高危详情添加到儿童表 + bm.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(request.getQhdHighRiskInfo())?request.getQhdHighRiskInfo():null); //如果这次更新的检查记录是最新的记录就更新对应档案数据否则不更新 @@ -728,6 +729,8 @@ public class BabyCheckFacade extends BaseServiceImpl { } bm.setLastCheckDoctor(request.getCheckDoctor()); bm.setDiseases(request.getDiseases()); + //秦皇岛-高危儿详情添加到儿童档案 + bm.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(request.getQhdHighRiskInfo())?request.getQhdHighRiskInfo():null); babyBookbuildingService.updateBabyBuild(bm, request.getBuildId()); syncMaster(request.getBuildId()); BabyCheckModel model = getBabyCheckModel(request); @@ -1926,6 +1929,8 @@ public class BabyCheckFacade extends BaseServiceImpl { result.setHighRisk(model.getHighRisk()); result.setWeakSon(model.getWeakSon()); result.setBabyDiagnosis(model.getBabyDiagnosis()); + //秦皇岛-高危儿详情 + result.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(model.getQhdHighRiskInfo())?model.getQhdHighRiskInfo():null); List list = new ArrayList <>(); if (listMap.get(model.getPid()) != null) { list = listMap.get(model.getPid()); @@ -2401,6 +2406,8 @@ public class BabyCheckFacade extends BaseServiceImpl { //秦皇岛-发育筛查模块 model.setDevelopAssess(StringUtils.isNotEmpty(checkModel.getDevelopAssess())?checkModel.getDevelopAssess():""); model.setScreeningOther(StringUtils.isNotEmpty(checkModel.getScreeningOther())?checkModel.getScreeningOther():""); + //秦皇岛-新高危儿详情 + model.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(checkModel.getQhdHighRiskInfo())?checkModel.getQhdHighRiskInfo():null); return model; } 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 bf20e50..c48db79 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 @@ -785,6 +785,21 @@ public class BabyCheckResult { /***********************************************/ + /************************************************* + * 秦皇岛-高危儿因素详情 + */ + + private List> qhdHighRiskInfo; + + public List> getQhdHighRiskInfo() { + return qhdHighRiskInfo; + } + + public void setQhdHighRiskInfo(List> qhdHighRiskInfo) { + this.qhdHighRiskInfo = qhdHighRiskInfo; + } + /***********************************************************/ + public String getExerciseIA() { return exerciseIA; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyChooseResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyChooseResult.java index fd70728..6bffc4a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyChooseResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyChooseResult.java @@ -29,6 +29,21 @@ public class BabyChooseResult { //儿童诊断 private String babyDiagnosis; + /************************************************* + * 秦皇岛-高危儿因素详情 + */ + + private List> qhdHighRiskInfo; + + public List> getQhdHighRiskInfo() { + return qhdHighRiskInfo; + } + + public void setQhdHighRiskInfo(List> qhdHighRiskInfo) { + this.qhdHighRiskInfo = qhdHighRiskInfo; + } + /***********************************************************/ + public String getBabyDiagnosis() { return babyDiagnosis; }