jiangjiazhi / regional-platform

Authored by dongqin over 6 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 46 additions and 0 deletions

...	...	@@ -171,6 +171,19 @@
171	171
172	172	private List<Integer> fmChildTimes;
173	173
	174	+ /**
	175	+ * 血肿 1-无 2-有
	176	+ */
	177	+ private String xzType;
	178	+
	179	+ public String getXzType() {
	180	+ return xzType;
	181	+ }
	182	+
	183	+ public void setXzType(String xzType) {
	184	+ this.xzType = xzType;
	185	+ }
	186	+
174	187	public String getSupervisorDoctor() {
175	188	return supervisorDoctor;
176	189	}

...	...	@@ -2667,6 +2667,8 @@
2667	2667	map.put("tireNumber", TaiShuEnums.getTitle(data.getTireNumber() + ""));//胎数
2668	2668	map.put("placenta", UnitUtils.unitSplice(data.getPlacenta(), UnitConstants.GE));//胎盘
2669	2669
	2670	+ // 血肿
	2671	+ map.put("xzType", data.getXzType());
2670	2672	List<Map<String, Object>> placetaList = new ArrayList<>();
2671	2673
2672	2674	if (CollectionUtils.isNotEmpty(data.getPlacentas())) {

...	...	@@ -102,9 +102,21 @@
102	102
103	103	private Integer couponType;
104	104
	105	+ /**
	106	+ * 血肿 1-无 2-有
	107	+ */
	108	+ private String xzType;
105	109
106	110	private YunBookbuildingAddRequest patient;
107	111
	112	+ public String getXzType() {
	113	+ return xzType;
	114	+ }
	115	+
	116	+ public void setXzType(String xzType) {
	117	+ this.xzType = xzType;
	118	+ }
	119	+
108	120	public String getSupervisorDoctor() {
109	121	return supervisorDoctor;
110	122	}
...	...	@@ -476,6 +488,9 @@
476	488	maternalDeliverModel.setParturientTime(DateUtil.parseYMDHM(parturientTime));
477	489	maternalDeliverModel.setVaginaBloodAmount(vaginaBloodAmount);
478	490
	491	+ if (null != xzType && !"".equals(xzType)){
	492	+ maternalDeliverModel.setXzType(xzType);
	493	+ }
479	494
480	495	return maternalDeliverModel;
481	496	}

...	...	@@ -89,6 +89,19 @@
89	89	//督导医生
90	90	private Map<String, String> supervisorDoctor;
91	91
	92	+ /**
	93	+ * 血肿
	94	+ */
	95	+ private String xzType;
	96	+
	97	+ public String getXzType() {
	98	+ return xzType;
	99	+ }
	100	+
	101	+ public void setXzType(String xzType) {
	102	+ this.xzType = xzType;
	103	+ }
	104	+
92	105	public Map<String, String> getSupervisorDoctor() {
93	106	return supervisorDoctor;
94	107	}
...	...	@@ -600,6 +613,9 @@
600	613	setComment(destModel.getComment());
601	614	setAfv(destModel.getAfv());
602	615	setParturientTime(DateUtil.gety_m_dhm(destModel.getParturientTime()));
	616	+
	617	+ // 血肿
	618	+ setXzType(destModel.getXzType());
603	619	return this;
604	620	}
605	621