jiangjiazhi / regional-platform

Authored by liquanyu over 3 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 67 additions and 2 deletions

...	...	@@ -2536,6 +2536,9 @@
2536	2536	map.put("ctpoab", data.getCtpoab());
2537	2537	map.put("productionSieveType", data.getProductionSieveType());
2538	2538
	2539	+ map.put("jmxspg", data.getJmxspg());
	2540	+ map.put("jmxsScore", data.getJmxsScore());
	2541	+ map.put("jmxsLevel", data.getJmxsLevel());
2539	2542
2540	2543	//医生所在团队
2541	2544	if(StringUtils.isNotEmpty(data.getTeamId())){
...	...	@@ -3036,6 +3039,10 @@
3036	3039	Map <String, Object> map = new HashMap <>();
3037	3040	map.put("doctorSign", data.getDoctorSign());
3038	3041	map.put("patientSign", data.getPatientSign());
	3042	+
	3043	+ map.put("jmxspg", data.getJmxspg());
	3044	+ map.put("jmxsScore", data.getJmxsScore());
	3045	+ map.put("jmxsLevel", data.getJmxsLevel());
3039	3046
3040	3047	/**
3041	3048	* start

...	...	@@ -121,7 +121,9 @@
121	121
122	122	//秦皇岛定制字段：是否产筛 0：未产筛 1：已产筛
123	123	public Integer productionSieveType;
124		-
	124	+ private List<String> jmxspg;
	125	+ private Integer jmxsScore;
	126	+ private Integer jmxsLevel;
125	127	public Integer getProductionSieveType() {
126	128	return productionSieveType;
127	129	}
...	...	@@ -1171,6 +1173,30 @@
1171	1173	this.secondaryDiagnosis = secondaryDiagnosis;
1172	1174	}
1173	1175
	1176	+ public List<String> getJmxspg() {
	1177	+ return jmxspg;
	1178	+ }
	1179	+
	1180	+ public void setJmxspg(List<String> jmxspg) {
	1181	+ this.jmxspg = jmxspg;
	1182	+ }
	1183	+
	1184	+ public Integer getJmxsScore() {
	1185	+ return jmxsScore;
	1186	+ }
	1187	+
	1188	+ public void setJmxsScore(Integer jmxsScore) {
	1189	+ this.jmxsScore = jmxsScore;
	1190	+ }
	1191	+
	1192	+ public Integer getJmxsLevel() {
	1193	+ return jmxsLevel;
	1194	+ }
	1195	+
	1196	+ public void setJmxsLevel(Integer jmxsLevel) {
	1197	+ this.jmxsLevel = jmxsLevel;
	1198	+ }
	1199	+
1174	1200	//血糖
1175	1201	//空腹
1176	1202	private String bloodSugarKf;
...	...	@@ -1376,6 +1402,9 @@
1376	1402	setBloodSugarKf(destModel.getBloodSugarKf());
1377	1403	setBloodSugar1h(destModel.getBloodSugar1h());
1378	1404	setBloodSugar2h(destModel.getBloodSugar2h());
	1405	+ setJmxspg(destModel.getJmxspg());
	1406	+ setJmxsScore(destModel.getJmxsScore());
	1407	+ setJmxsLevel(destModel.getJmxsLevel());
1379	1408	return this;
1380	1409	}
1381	1410

...	...	@@ -18,7 +18,9 @@
18	18	* Created by Administrator on 2016/6/20 0020.
19	19	*/
20	20	public class AntexChuResult {
21		-
	21	+ private List<String> jmxspg;
	22	+ private Integer jmxsScore;
	23	+ private Integer jmxsLevel;
22	24	//预约住院分娩医院
23	25	private String yyzyfmHospitalId;
24	26
25	27
...	...	@@ -32,7 +34,30 @@
32	34	//次要诊断手入
33	35	private String secondaryDiagnosis;
34	36
	37	+ public List<String> getJmxspg() {
	38	+ return jmxspg;
	39	+ }
35	40
	41	+ public void setJmxspg(List<String> jmxspg) {
	42	+ this.jmxspg = jmxspg;
	43	+ }
	44	+
	45	+ public Integer getJmxsScore() {
	46	+ return jmxsScore;
	47	+ }
	48	+
	49	+ public void setJmxsScore(Integer jmxsScore) {
	50	+ this.jmxsScore = jmxsScore;
	51	+ }
	52	+
	53	+ public Integer getJmxsLevel() {
	54	+ return jmxsLevel;
	55	+ }
	56	+
	57	+ public void setJmxsLevel(Integer jmxsLevel) {
	58	+ this.jmxsLevel = jmxsLevel;
	59	+ }
	60	+
36	61	public String getSecondaryDiagnosis() {
37	62	return secondaryDiagnosis;
38	63	}
...	...	@@ -2444,6 +2469,10 @@
2444	2469	setCtsh(antExChuModel.getCtsh());
2445	2470	setCtgab(antExChuModel.getCtgab());
2446	2471	setCtpoab(antExChuModel.getCtpoab());
	2472	+
	2473	+ setJmxspg(antExChuModel.getJmxspg());
	2474	+ setJmxsScore(antExChuModel.getJmxsScore());
	2475	+ setJmxsLevel(antExChuModel.getJmxsLevel());
2447	2476
2448	2477	}
2449	2478	return this;