jiangjiazhi / regional-platform

Authored by wtt almost 5 years ago

1 parent 1977b6e742

Exists in master and in 6 other branches

Showing 3 changed files with 44 additions and 1 deletions

...	...	@@ -145,7 +145,10 @@
145	145	* 胎数 0/单胎 1/双胎 2/多胎 3/异常
146	146	*/
147	147	private String fetusNum;
148		-
	148	+ //异常多胎
	149	+ private String fetusDuo;
	150	+ //异常单胎
	151	+ private String fetusDan;
149	152	/**
150	153	* 异常说明
151	154	*/
...	...	@@ -387,6 +390,22 @@
387	390
388	391	public Boolean getpAPPAType() {
389	392	return pAPPAType;
	393	+ }
	394	+
	395	+ public String getFetusDuo() {
	396	+ return fetusDuo;
	397	+ }
	398	+
	399	+ public void setFetusDuo(String fetusDuo) {
	400	+ this.fetusDuo = fetusDuo;
	401	+ }
	402	+
	403	+ public String getFetusDan() {
	404	+ return fetusDan;
	405	+ }
	406	+
	407	+ public void setFetusDan(String fetusDan) {
	408	+ this.fetusDan = fetusDan;
390	409	}
391	410
392	411	public void setpAPPAType(Boolean pAPPAType) {

...	...	@@ -1428,6 +1428,9 @@
1428	1428	if (StringUtils.isNotEmpty(lymsSieveId)) {
1429	1429	result.put("lymsSieveId", lymsSieveId);
1430	1430	}
	1431	+ result.put("fetusDan", sieveApply.getFetusDan());
	1432	+ result.put("fetusDuo", sieveApply.getFetusDuo());
	1433	+
1431	1434	result.put("timeOfFetuses", sieveApply.getTimeOfFetuses());
1432	1435	result.put("diabetes", sieveApply.getDiabetes());
1433	1436	result.put("addTSH", sieveApply.getAddTSH());

...	...	@@ -146,6 +146,10 @@
146	146	* 胎数 1/单胎 2/双胎 3/多胎 4/异常
147	147	*/
148	148	private String fetusNum;
	149	+ //异常多胎
	150	+ private String fetusDuo;
	151	+ //异常单胎
	152	+ private String fetusDan;
149	153
150	154	/**
151	155	* 异常说明
152	156
153	157
...	...	@@ -455,8 +459,22 @@
455	459	this.mannualEntry = mannualEntry;
456	460	}
457	461
	462	+ public String getFetusDuo() {
	463	+ return fetusDuo;
	464	+ }
458	465
	466	+ public void setFetusDuo(String fetusDuo) {
	467	+ this.fetusDuo = fetusDuo;
	468	+ }
459	469
	470	+ public String getFetusDan() {
	471	+ return fetusDan;
	472	+ }
	473	+
	474	+ public void setFetusDan(String fetusDan) {
	475	+ this.fetusDan = fetusDan;
	476	+ }
	477	+
460	478	public String getResponsibleCode() {
461	479	return responsibleCode;
462	480	}
...	...	@@ -580,6 +598,9 @@
580	598	@Override
581	599	public SieveApplyOrderModel convertToDataModel() {
582	600	SieveApplyOrderModel sieveApplyOrderModel = new SieveApplyOrderModel();
	601	+ sieveApplyOrderModel.setFetusDan(fetusDuo);
	602	+ sieveApplyOrderModel.setFetusDuo(fetusDan);
	603	+
583	604	sieveApplyOrderModel.setParentId(parentId);
584	605	sieveApplyOrderModel.setApplyDoctor(applyDoctor);
585	606	sieveApplyOrderModel.setCheckItem(JsonUtil.array2JsonString(check));