jiangjiazhi / regional-platform

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 11 additions and 11 deletions

...	...	@@ -1298,6 +1298,7 @@
1298	1298	result.setFuckLastMens(DateUtil.getyyyy_MM_dd(p.getLastMenses()));
1299	1299	result.setLastMenstrualPeriod(DateUtil.getyyyy_MM_dd(p.getFuckLastMens()));
1300	1300	}
	1301	+ result.setSendCareMan(p.getSendCareMan());
1301	1302	result.setLastMenstrualPeriodBasis(p.getLastMenstrualPeriodBasis());
1302	1303	result.setLastMenstrualPeriodBasisOther(p.getLastMenstrualPeriodBasisOther());
1303	1304	result.setLastMenstrualPeriodBasisDoctorId(p.getLastMenstrualPeriodBasisDoctorId());

...	...	@@ -436,7 +436,6 @@
436	436	else if (patients.getType() == 3) {
437	437	result.setcDueWeek("已分娩");
438	438	}
439		- result.setSendCareMan(patients.getSendCareMan());
440	439	result.setAge(DateUtil.getAge(patients.getBirth()) + "岁");
441	440	result.setName(patients.getUsername());
442	441	result.setDueDate(DateUtil.getyyyy_MM_dd(patients.getDueDate()));

...	...	@@ -109,8 +109,6 @@
109	109	*/
110	110	private Integer status;
111	111	private String statusStr;
112		- //是否发放母子保健手册
113		- private String sendCareMan;
114	112	/**
115	113	* 退款时间
116	114	*/
...	...	@@ -119,14 +117,6 @@
119	117	* 退款人
120	118	*/
121	119	private String backUser;
122		-
123		- public String getSendCareMan() {
124		- return sendCareMan;
125		- }
126		-
127		- public void setSendCareMan(String sendCareMan) {
128		- this.sendCareMan = sendCareMan;
129		- }
130	120
131	121	public String getSex() {
132	122	return sex;

...	...	@@ -20,12 +20,22 @@
20	20	private String lastMenstrualPeriodBasisDoctorName;
21	21	//是否提供丈夫信息
22	22	private Boolean reqHusband;
	23	+ //是否发放母子保健手册
	24	+ private String sendCareMan;
23	25	/**
24	26	* 编辑时服务信息
25	27	*/
26	28	private List<Map<String,String>> serInfos;
27	29	//显示服务信息
28	30	private List<PatientSerResult> patientSerResults;
	31	+
	32	+ public String getSendCareMan() {
	33	+ return sendCareMan;
	34	+ }
	35	+
	36	+ public void setSendCareMan(String sendCareMan) {
	37	+ this.sendCareMan = sendCareMan;
	38	+ }
29	39
30	40	public Boolean getReqHusband() {
31	41	return reqHusband;