jiangjiazhi / regional-platform

Commit 7d147c3df5c2b2ae9f306112747f274d78bb3e6b

Authored by shiyang over 3 years ago

Exists in master and in 6 other branches

update

Showing 4 changed files with 53 additions and 1 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyChooseResult.java

...	...	@@ -706,6 +706,21 @@
706	706
707	707	/****************************************/
708	708
	709	+ /*************************************************
	710	+ * 秦皇岛-高危儿因素详情
	711	+ */
	712	+
	713	+ private List<Map<String,String>> qhdHighRiskInfo;
	714	+
	715	+ public List<Map<String, String>> getQhdHighRiskInfo() {
	716	+ return qhdHighRiskInfo;
	717	+ }
	718	+
	719	+ public void setQhdHighRiskInfo(List<Map<String, String>> qhdHighRiskInfo) {
	720	+ this.qhdHighRiskInfo = qhdHighRiskInfo;
	721	+ }
	722	+ /***********************************************************/
	723	+
709	724	public Integer getDeafnessGene() {
710	725	return deafnessGene;
711	726	}

...	...	@@ -225,8 +225,9 @@
225	225	}
226	226	bm.setLastDiagnose(diagnoseNames);
227	227	}
228		-
229	228	bm.setDiseases(request.getDiseases());
	229	+ //秦皇岛-高危详情添加到儿童表
	230	+ bm.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(request.getQhdHighRiskInfo())?request.getQhdHighRiskInfo():null);
230	231
231	232
232	233	//如果这次更新的检查记录是最新的记录就更新对应档案数据否则不更新
...	...	@@ -728,6 +729,8 @@
728	729	}
729	730	bm.setLastCheckDoctor(request.getCheckDoctor());
730	731	bm.setDiseases(request.getDiseases());
	732	+ //秦皇岛-高危儿详情添加到儿童档案
	733	+ bm.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(request.getQhdHighRiskInfo())?request.getQhdHighRiskInfo():null);
731	734	babyBookbuildingService.updateBabyBuild(bm, request.getBuildId());
732	735	syncMaster(request.getBuildId());
733	736	BabyCheckModel model = getBabyCheckModel(request);
...	...	@@ -1926,6 +1929,8 @@
1926	1929	result.setHighRisk(model.getHighRisk());
1927	1930	result.setWeakSon(model.getWeakSon());
1928	1931	result.setBabyDiagnosis(model.getBabyDiagnosis());
	1932	+ //秦皇岛-高危儿详情
	1933	+ result.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(model.getQhdHighRiskInfo())?model.getQhdHighRiskInfo():null);
1929	1934	List <BabyChooseResult> list = new ArrayList <>();
1930	1935	if (listMap.get(model.getPid()) != null) {
1931	1936	list = listMap.get(model.getPid());
...	...	@@ -2401,6 +2406,8 @@
2401	2406	//秦皇岛-发育筛查模块
2402	2407	model.setDevelopAssess(StringUtils.isNotEmpty(checkModel.getDevelopAssess())?checkModel.getDevelopAssess():"");
2403	2408	model.setScreeningOther(StringUtils.isNotEmpty(checkModel.getScreeningOther())?checkModel.getScreeningOther():"");
	2409	+ //秦皇岛-新高危儿详情
	2410	+ model.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(checkModel.getQhdHighRiskInfo())?checkModel.getQhdHighRiskInfo():null);
2404	2411	return model;
2405	2412
2406	2413	}

...	...	@@ -785,6 +785,21 @@
785	785
786	786	/***********************************************/
787	787
	788	+ /*************************************************
	789	+ * 秦皇岛-高危儿因素详情
	790	+ */
	791	+
	792	+ private List<Map<String,String>> qhdHighRiskInfo;
	793	+
	794	+ public List<Map<String, String>> getQhdHighRiskInfo() {
	795	+ return qhdHighRiskInfo;
	796	+ }
	797	+
	798	+ public void setQhdHighRiskInfo(List<Map<String, String>> qhdHighRiskInfo) {
	799	+ this.qhdHighRiskInfo = qhdHighRiskInfo;
	800	+ }
	801	+ /***********************************************************/
	802	+
788	803	public String getExerciseIA() {
789	804	return exerciseIA;
790	805	}

...	...	@@ -29,6 +29,21 @@
29	29	//儿童诊断
30	30	private String babyDiagnosis;
31	31
	32	+ /*************************************************
	33	+ * 秦皇岛-高危儿因素详情
	34	+ */
	35	+
	36	+ private List<Map<String,String>> qhdHighRiskInfo;
	37	+
	38	+ public List<Map<String, String>> getQhdHighRiskInfo() {
	39	+ return qhdHighRiskInfo;
	40	+ }
	41	+
	42	+ public void setQhdHighRiskInfo(List<Map<String, String>> qhdHighRiskInfo) {
	43	+ this.qhdHighRiskInfo = qhdHighRiskInfo;
	44	+ }
	45	+ /***********************************************************/
	46	+
32	47	public String getBabyDiagnosis() {
33	48	return babyDiagnosis;
34	49	}