jiangjiazhi / regional-platform

Commit a5bc8897fb54d5ff69c41689780496e50d8c6132

Authored by zhangchao over 1 year ago

Exists in dev

#fix:新增出生证明姓、名等字段

Showing 3 changed files with 64 additions and 1 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BirthResult.java

...	...	@@ -253,6 +253,9 @@
253	253	*/
254	254	private String name;
255	255
	256	+ private String firstName;
	257	+ private String lastName;
	258	+
256	259	//儿童姓名首字母拼音
257	260	private String firstPyName;
258	261
...	...	@@ -2769,6 +2772,22 @@
2769	2772
2770	2773	this.firstPyName = PingYinUtil.getFirstSpell(name);
2771	2774	this.name = name;
	2775	+ }
	2776	+
	2777	+ public String getFirstName() {
	2778	+ return firstName;
	2779	+ }
	2780	+
	2781	+ public void setFirstName(String firstName) {
	2782	+ this.firstName = firstName;
	2783	+ }
	2784	+
	2785	+ public String getLastName() {
	2786	+ return lastName;
	2787	+ }
	2788	+
	2789	+ public void setLastName(String lastName) {
	2790	+ this.lastName = lastName;
2772	2791	}
2773	2792
2774	2793	public String getId() {

...	...	@@ -1905,6 +1905,8 @@
1905	1905	babyModel.setDeliverOrg(birthResult.getDeliverOrg());
1906	1906	babyModel.setSex(birthResult.getBabySex());
1907	1907	babyModel.setName(birthResult.getBabyName());
	1908	+ babyModel.setFirstName(birthResult.getFirstName());
	1909	+ babyModel.setLastName(birthResult.getLastName());
1908	1910	babyService.updateOneBaby(babyModel,babyModel.getId());
1909	1911	baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
1910	1912	baseResponse.setErrormsg("成功");
...	...	@@ -1938,6 +1940,8 @@
1938	1940	birthResult.setCommunityId(babyModel.getCommunityId());
1939	1941	birthResult.setDeliverOrg(babyModel.getDeliverOrg());
1940	1942	birthResult.setBlNo(babyModel.getBlNo());
	1943	+ birthResult.setFirstName(babyModel.getFirstName());
	1944	+ birthResult.setLastName(babyModel.getLastName());
1941	1945	}
1942	1946	baseResponse.setObject(birthResult);
1943	1947	baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);

1	1	package com.lyms.platform.operate.web.result;
2	2
3	3
	4	+import com.lyms.platform.common.utils.DateUtil;
	5	+
4	6	import java.util.Date;
5	7
6	8	public class BirthResult {
7	9
...	...	@@ -13,11 +15,13 @@
13	15	// 分娩孕周
14	16	private String dueWeek;
15	17	private Date fmDate;
	18	+ private Date birth;
16	19	/**
17	20	* @auther HuJiaqi
18	21	* @createTime 2016年12月20日 14时42分
19	22	* @discription 年龄
20	23	*/
	24	+ @SuppressWarnings("unused")
21	25	private Integer age;
22	26	//孕妇国籍Id
23	27	private String pcountryId;
...	...	@@ -36,6 +40,8 @@
36	40	* @discription 丈夫姓名
37	41	*/
38	42	private String husbandName;
	43	+ //丈夫电话
	44	+ private String husbandPhone;
39	45	//证件号
40	46	private String hcertificateNum;
41	47	//国籍Id
42	48
...	...	@@ -90,9 +96,27 @@
90	96	* 小孩名称
91	97	*/
92	98	private String babyName;
	99	+ private String firstName;
	100	+ private String lastName;
93	101	//病历号(住院号)
94	102	private String blNo;
95	103
	104	+ public String getFirstName() {
	105	+ return firstName;
	106	+ }
	107	+
	108	+ public void setFirstName(String firstName) {
	109	+ this.firstName = firstName;
	110	+ }
	111	+
	112	+ public String getLastName() {
	113	+ return lastName;
	114	+ }
	115	+
	116	+ public void setLastName(String lastName) {
	117	+ this.lastName = lastName;
	118	+ }
	119	+
96	120	public String getBabyId() {
97	121	return babyId;
98	122	}
...	...	@@ -174,7 +198,7 @@
174	198	}
175	199
176	200	public Integer getAge() {
177		- return age;
	201	+ return DateUtil.getAge(birth);
178	202	}
179	203
180	204	public void setAge(Integer age) {
...	...	@@ -427,6 +451,22 @@
427	451
428	452	public void setBabyName(String babyName) {
429	453	this.babyName = babyName;
	454	+ }
	455	+
	456	+ public Date getBirth() {
	457	+ return birth;
	458	+ }
	459	+
	460	+ public void setBirth(Date birth) {
	461	+ this.birth = birth;
	462	+ }
	463	+
	464	+ public String getHusbandPhone() {
	465	+ return husbandPhone;
	466	+ }
	467	+
	468	+ public void setHusbandPhone(String husbandPhone) {
	469	+ this.husbandPhone = husbandPhone;
430	470	}
431	471	}