jiangjiazhi / regional-platform

Commit 513986162ae787b6882884881d90ba1f26f6be93

Authored by zhangchao about 1 year ago

Exists in dev

#fix:新增体重营养报告添加逻辑及对应字段

Showing 2 changed files with 16 additions and 0 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/PatientWeight.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java

...	...	@@ -150,6 +150,16 @@
150	150	* 是否打印过报告 1：已打印 2：未已打印
151	151	*/
152	152	private Integer isPrint ;
	153	+ @Transient
	154	+ private Integer week;
	155	+
	156	+ public Integer getWeek() {
	157	+ return week;
	158	+ }
	159	+
	160	+ public void setWeek(Integer week) {
	161	+ this.week = week;
	162	+ }
153	163
154	164	public Integer getIsPrint() {
155	165	return isPrint;

...	...	@@ -199,6 +199,7 @@
199	199	map.put("nowWeight", nowWeight);
200	200	if ("2100002419".equals(hospitalId)){
201	201	map.put("riskFactorId", patients.getRiskFactorId());
	202	+ map.put("week", patientWeight.getWeek());
202	203	}
203	204	}
204	205	}
...	...	@@ -211,6 +212,7 @@
211	212	/m.put("doctorId", doctorId);/
212	213	if ("2100002419".equals(hospitalId)){
213	214	m.put("riskFactorId", patients.getRiskFactorId());
	215	+ m.put("week", patientWeight.getWeek());
214	216	}
215	217	dayWeights2.add(m);
216	218	}
...	...	@@ -250,6 +252,7 @@
250	252	m.put("nowWeight", nowWeight);
251	253	if ("2100002419".equals(hospitalId)){
252	254	m.put("riskFactorId", patients.getRiskFactorId());
	255	+ m.put("week", patientWeight.getWeek());
253	256	}
254	257	/m.put("doctorId", doctorId);/
255	258	dayWeights2.add(m);
...	...	@@ -1415,6 +1418,7 @@
1415	1418	//如果是大同添加当前患者高危因素
1416	1419	if ("2100002419".equals(hospitalId)){
1417	1420	map.put("riskFactorId", patients.getRiskFactorId());
	1421	+ map.put("week", patientWeight.getWeek());
1418	1422	}
1419	1423	} else {
1420	1424	map.put("hospitalId2", hospitalId);
...	...	@@ -1431,6 +1435,7 @@
1431	1435	//如果是大同添加当前患者高危因素
1432	1436	if ("2100002419".equals(hospitalId)){
1433	1437	m.put("riskFactorId", patients.getRiskFactorId());
	1438	+ m.put("week", patientWeight.getWeek());
1434	1439	}
1435	1440	dayWeights2.add(m);
1436	1441	}
...	...	@@ -1450,6 +1455,7 @@
1450	1455	//如果是大同添加当前患者高危因素
1451	1456	if ("2100002419".equals(hospitalId)){
1452	1457	m.put("riskFactorId", patients.getRiskFactorId());
	1458	+ m.put("week", patientWeight.getWeek());
1453	1459	}
1454	1460	dayWeights2.add(m);
1455	1461	patientWeight.setDayWeights2(dayWeights2);