jiangjiazhi / regional-platform

Authored by wtt over 4 years ago

Exists in master and in 6 other branches

Showing 5 changed files with 55 additions and 3 deletions

...	...	@@ -542,6 +542,8 @@
542	542	private String babyWeight;
543	543	//新生儿血红蛋白，自动诊断使用
544	544	private String babyXhdb;
	545	+ //儿保检查体格发育评价
	546	+ private String babyFypj;
545	547	//新生儿生长
546	548	private String babyHeight;
547	549	//畸形 0非畸形 1畸形
...	...	@@ -730,6 +732,14 @@
730	732
731	733	public void setBabyXhdb(String babyXhdb) {
732	734	this.babyXhdb = babyXhdb;
	735	+ }
	736	+
	737	+ public String getBabyFypj() {
	738	+ return babyFypj;
	739	+ }
	740	+
	741	+ public void setBabyFypj(String babyFypj) {
	742	+ this.babyFypj = babyFypj;
733	743	}
734	744
735	745	public String getBabyQX() {

...	...	@@ -455,8 +455,27 @@
455	455	}
456	456	}
457	457	}
458		-
459		-
	458	+ /*
	459	+ * 儿保检查体格发育评价 13
	460	+ */
	461	+ if (isEnableItem(status, BabyAutoDiagnoseEnums.BabyDiagnoseEnums.fypj.getId()) && maternalDeliverModel.getBaby() != null) {
	462	+ List<MaternalDeliverModel.Baby> baby = maternalDeliverModel.getBaby();
	463	+ if (CollectionUtils.isNotEmpty(baby)) {
	464	+ MaternalDeliverModel.Baby baby1 = baby.get(ii);
	465	+ if (baby1 != null) {
	466	+ List<DiagnoseItemModel> items = mapItems.get(BabyAutoDiagnoseEnums.BabyDiagnoseEnums.fypj.getId());
	467	+ if (type == 2 && CollectionUtils.isNotEmpty(items) && StringUtils.isNotEmpty(baby1.getBabyFypj())) {
	468	+ String babyFypj = baby1.getBabyFypj().toString();
	469	+ for (DiagnoseItemModel item : items) {
	470	+ String valueTwo = item.getValueTwo();
	471	+ if (valueTwo.equals(babyFypj) && CollectionUtils.isNotEmpty(item.getRiskIds())) {
	472	+ list.addAll(item.getRiskIds());
	473	+ }
	474	+ }
	475	+ }
	476	+ }
	477	+ }
	478	+ }
460	479	}
461	480
462	481	if (list.size() > 0) {

...	...	@@ -24,6 +24,8 @@
24	24	private String babyWeight;
25	25	//血红蛋白
26	26	private String babyXhdb;
	27	+ //儿保检查体格发育评价
	28	+ private String babyFypj;
27	29	//apgar评分
28	30	private Map apgarScore;
29	31	//分娩孕周
...	...	@@ -106,6 +108,7 @@
106	108	MatDeliverAddRequest.Baby baby = new MatDeliverAddRequest.Baby();
107	109	baby.setBabyWeight(babyWeight);
108	110	baby.setBabyXhdb(babyXhdb);
	111	+ baby.setBabyFypj(babyFypj);
109	112	baby.setApgarScore(apgarScore);
110	113	baby.setJxWn(jxWn);
111	114	baby.setJxJzl(jxJzl);
...	...	@@ -135,6 +138,14 @@
135	138	babies.add(baby);
136	139	babyAutoRiskRequest.setBabies(babies);
137	140	return babyAutoRiskRequest;
	141	+ }
	142	+
	143	+ public String getBabyFypj() {
	144	+ return babyFypj;
	145	+ }
	146	+
	147	+ public void setBabyFypj(String babyFypj) {
	148	+ this.babyFypj = babyFypj;
138	149	}
139	150
140	151	public List <String> getRiskFactorId() {

...	...	@@ -1209,6 +1209,8 @@
1209	1209	private String babyWeight;
1210	1210	//新生儿血红蛋白，自动诊断使用
1211	1211	private String babyXhdb;
	1212	+ //儿保检查体格发育评价
	1213	+ private String babyFypj;
1212	1214	//新生儿生长
1213	1215	private String babyHeight;
1214	1216	//畸形 0非畸形 1畸形
...	...	@@ -1410,6 +1412,14 @@
1410	1412	this.babyXhdb = babyXhdb;
1411	1413	}
1412	1414
	1415	+ public String getBabyFypj() {
	1416	+ return babyFypj;
	1417	+ }
	1418	+
	1419	+ public void setBabyFypj(String babyFypj) {
	1420	+ this.babyFypj = babyFypj;
	1421	+ }
	1422	+
1413	1423	@Override
1414	1424	public MaternalDeliverModel.Baby convertToDataModel() {
1415	1425	MaternalDeliverModel.Baby baby = new MaternalDeliverModel.Baby();
...	...	@@ -1424,6 +1434,7 @@
1424	1434	baby.setBabyHealthy(babyHealthy);
1425	1435	baby.setBabyWeight(babyWeight);
1426	1436	baby.setBabyXhdb(babyXhdb);
	1437	+ baby.setBabyFypj(babyFypj);
1427	1438	baby.setBabyHeight(babyHeight);
1428	1439	baby.setDeformity(deformity);
1429	1440	baby.setPregnancyOut(pregnancyOut);