jiangjiazhi / regional-platform

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 34 additions and 2 deletions

...	...	@@ -1188,6 +1188,10 @@
1188	1188	}
1189	1189	}
1190	1190
	1191	+ if(StringUtils.isNotEmpty(yunRequest.getHusbandBirth())){//如果前端传入的丈夫生日，则用传入的数据
	1192	+ patient.setHusbandBirth(DateUtil.parseYMD(yunRequest.getHusbandBirth()));
	1193	+ }
	1194	+
1191	1195	patient.setHcertificateNum(yunRequest.getHusbandCertificateNum());
1192	1196	patient.setHusbandPhone(yunRequest.getHusbandPhone());
1193	1197	patient.setHcountryId(yunRequest.getHusbandCountryId());
...	...	@@ -1353,7 +1357,7 @@
1353	1357	/**************丈夫信息************/
1354	1358	result.setHusbandName(p.getHusbandName());
1355	1359	result.setHusbandPhone(p.getHusbandPhone());
1356		-
	1360	+ result.setHusbandBirth(DateUtil.getyyyy_MM_dd(p.getHusbandBirth()));
1357	1361	result.setHusbandCertificateTypeId(p.getHcertificateTypeId());
1358	1362	result.setHusbandCertificateNum(p.getHcertificateNum());
1359	1363	result.setHusbandCountryId(p.getHcountryId());

...	...	@@ -147,6 +147,7 @@
147	147	babyMap.put("0", b6);
148	148	}
149	149
	150	+
150	151	/**
151	152	* 增加或者修改分娩记录
152	153	*
153	154
...	...	@@ -281,10 +282,17 @@
281	282	maternalDeliverModel.setHospitalId(hospitalId);
282	283	}
283	284	//做分娩的时候需要删除产筛数据
284		-
285	285	sieveService.deleteSieve(deliverAddRequest.getParentId(), hospitalId, null);
286	286
287	287	maternalDeliverModel.setYn(YnEnums.YES.getId());
	288	+ //可能baby保存失败，所以导致babyId为null，这里为了处理打印出生医学证明
	289	+ for(MaternalDeliverModel.Baby baby:maternalDeliverModel.getBaby()){
	290	+ if(StringUtils.isEmpty(baby.getId())){//如果是空则创建一个uuid，但是baby表还是没有数据，处理办法是医生手动去建档（泉渝说）
	291	+ baby.setId(com.lyms.platform.common.utils.StringUtils.uuid());
	292	+ }
	293	+ }
	294	+
	295	+
288	296	//新增分娩信息
289	297	matDeliverService.addMatDeliver(maternalDeliverModel);
290	298

...	...	@@ -208,6 +208,8 @@
208	208	private String husbandCertificateNum;
209	209	//证件类型
210	210	private String husbandCertificateTypeId;
	211	+ //丈夫生日
	212	+ private String husbandBirth;
211	213	//国籍
212	214	private String husbandCountryId;
213	215	//民族
...	...	@@ -303,6 +305,14 @@
303	305	@FormParam
304	306	@NotEmpty(message = "填写日期")
305	307	private String fillDate;
	308	+
	309	+ public String getHusbandBirth() {
	310	+ return husbandBirth;
	311	+ }
	312	+
	313	+ public void setHusbandBirth(String husbandBirth) {
	314	+ this.husbandBirth = husbandBirth;
	315	+ }
306	316
307	317	public String getFillDate() {
308	318	return fillDate;

...	...	@@ -196,6 +196,8 @@
196	196
197	197	//丈夫姓名
198	198	private String husbandName;
	199	+ //丈夫生日
	200	+ private String husbandBirth;
199	201	//证件号
200	202	private String husbandCertificateNum;
201	203	//证件类型
...	...	@@ -263,6 +265,14 @@
263	265
264	266	//分娩状态 0未终止妊娠 1终止妊娠
265	267	private Integer dueStatus;
	268	+
	269	+ public String getHusbandBirth() {
	270	+ return husbandBirth;
	271	+ }
	272	+
	273	+ public void setHusbandBirth(String husbandBirth) {
	274	+ this.husbandBirth = husbandBirth;
	275	+ }
266	276
267	277	public boolean isSendCoupon() {
268	278	return isSendCoupon;