jiangjiazhi / regional-platform

Authored by wtt over 5 years ago

Exists in master and in 6 other branches

Showing 7 changed files with 61 additions and 21 deletions

...	...	@@ -143,8 +143,10 @@
143	143	//腹部
144	144	private String belly;
145	145
146		- //脊柱四肢
	146	+ //脊柱四肢(脊柱)
147	147	private String spineFours;
	148	+ //四肢 yesOrNo yes○正常 no○异常：noValue异常内容_____
	149	+ private Map<String,String> limb;
148	150
149	151	//肝门/生殖器
150	152	private String portaGenitals;
...	...	@@ -1548,6 +1550,14 @@
1548	1550
1549	1551	public String getSleep() {
1550	1552	return sleep;
	1553	+ }
	1554	+
	1555	+ public Map<String, String> getLimb() {
	1556	+ return limb;
	1557	+ }
	1558	+
	1559	+ public void setLimb(Map<String, String> limb) {
	1560	+ this.limb = limb;
1551	1561	}
1552	1562
1553	1563	public void setSleep(String sleep) {

...	...	@@ -447,6 +447,7 @@
447	447	model.setChest(JsonUtil.obj2JsonString(request.getChest()));
448	448	model.setBelly(request.getBelly());
449	449	model.setSpineFours(request.getSpineFours());
	450	+ model.setLimb(request.getLimb());
450	451	model.setPortaGenitals(JsonUtil.obj2JsonString(request.getPortaGenitals()));
451	452	model.setStepStatus(request.getStepStatus());
452	453	model.setStoopStatus(JsonUtil.obj2JsonString(request.getStoopStatus()));
...	...	@@ -1849,6 +1850,7 @@
1849	1850	}
1850	1851
1851	1852	result = getBabyCheckResult(checkModel, babyModel);
	1853	+ result.setLimb(checkModel.getLimb());
1852	1854	result.setCouponCode(couponService.findByType(id, 8));
1853	1855	/** 优惠券编号 */
1854	1856	String hemoglobinCoupon = couponService.findByType(id, 10);

...	...	@@ -5425,6 +5425,7 @@
5425	5425
5426	5426	result = getBabyCheckResult(checkModel, babyModel);
5427	5427	result.setId(checkModel.getId());
	5428	+ result.setLimb(checkModel.getLimb());
5428	5429
5429	5430	/** 优惠券编号 */
5430	5431	result.setCouponCode(couponService.findByType(id, 8));

...	...	@@ -150,8 +150,10 @@
150	150	private Map<String, String> chest;
151	151	//腹部
152	152	private String belly;
153		- //脊柱四肢
	153	+ //脊柱四肢(脊柱)
154	154	private String spineFours;
	155	+ //四肢 yesOrNo yes○正常 no○异常：noValue异常内容_____
	156	+ private Map<String,String> limb;
155	157	//肛门/生殖器
156	158	private Map<String, String> portaGenitals;
157	159	//步态
...	...	@@ -2125,6 +2127,14 @@
2125	2127
2126	2128	public void setSlscx(Map slscx) {
2127	2129	this.slscx = slscx;
	2130	+ }
	2131	+
	2132	+ public Map<String, String> getLimb() {
	2133	+ return limb;
	2134	+ }
	2135	+
	2136	+ public void setLimb(Map<String, String> limb) {
	2137	+ this.limb = limb;
2128	2138	}
2129	2139	}

...	...	@@ -1265,8 +1265,21 @@
1265	1265
1266	1266	public void setDueType(String dueType) {
1267	1267	this.dueType = dueType;
	1268	+ if ("1".equals(dueType)) {
	1269	+ this.fmfs = "shun";
	1270	+ } else if ("2".equals(dueType)) {
	1271	+ this.fmfs = "pao";
	1272	+ }
1268	1273	}
1269	1274
	1275	+ public String getFmfs() {
	1276	+ return fmfs;
	1277	+ }
	1278	+
	1279	+ public void setFmfs(String fmfs) {
	1280	+ this.fmfs = fmfs;
	1281	+ }
	1282	+
1270	1283	public String getFetusCount() {
1271	1284	return fetusCount;
1272	1285	}
...	...	@@ -1391,23 +1404,7 @@
1391	1404	this.mHighRiskReason2 = mHighRiskReason2;
1392	1405	}
1393	1406
1394		- /*
1395		- <select ng-model="formData.dueType" ng-options="item.id as item.name for item in FMFS"
1396		- class="fgl_five_Input100 ng-pristine ng-untouched ng-valid"><option value="" class="">--请选择--</option>
1397		- <option value="0" label="顺产">顺产</option>
1398		- <option value="1" label="剖宫产">剖宫产</option>
1399		- <option value="2" label="流产">流产</option>
1400		- <option value="3" label="引产">引产</option></select>
1401		- shun 顺产 pao剖宫产
1402		- */
1403		- public String getFmfs() {
1404		- if ("0".equals(dueType)){
1405		- fmfs = "shun";
1406		- }else if("1".equals(dueType)){
1407		- fmfs = "pao";
1408		- }
1409		- return fmfs;
1410		- }
	1407	+
1411	1408
1412	1409
1413	1410	}

...	...	@@ -347,8 +347,10 @@
347	347	//腹部
348	348	private String belly;
349	349
350		- //脊柱四肢
	350	+ //脊柱四肢(脊柱)
351	351	private String spineFours;
	352	+ //四肢 yesOrNo yes○正常 no○异常：noValue异常内容_____
	353	+ private Map<String,String> limb;
352	354
353	355	//肝门/生殖器
354	356	private String portaGenitals;
...	...	@@ -2198,6 +2200,14 @@
2198	2200
2199	2201	public void setOtherUrine(String otherUrine) {
2200	2202	this.otherUrine = otherUrine;
	2203	+ }
	2204	+
	2205	+ public Map<String, String> getLimb() {
	2206	+ return limb;
	2207	+ }
	2208	+
	2209	+ public void setLimb(Map<String, String> limb) {
	2210	+ this.limb = limb;
2201	2211	}
2202	2212
2203	2213	public String getCheckDiagnose() {

...	...	@@ -308,8 +308,10 @@
308	308	//腹部
309	309	private String belly;
310	310
311		- //脊柱四肢
	311	+ //脊柱四肢(脊柱)
312	312	private String spineFours;
	313	+ //四肢 yesOrNo yes○正常 no○异常：noValue异常内容_____
	314	+ private Map<String,String> limb;
313	315
314	316	//肝门/生殖器
315	317	private String portaGenitals;
...	...	@@ -2098,6 +2100,14 @@
2098	2100
2099	2101	public void setNextDate(String nextDate) {
2100	2102	this.nextDate = nextDate;
	2103	+ }
	2104	+
	2105	+ public Map<String, String> getLimb() {
	2106	+ return limb;
	2107	+ }
	2108	+
	2109	+ public void setLimb(Map<String, String> limb) {
	2110	+ this.limb = limb;
2101	2111	}
2102	2112
2103	2113	public Integer getHighRisk() {