jiangjiazhi / regional-platform

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 31 additions and 2 deletions

...	...	@@ -37,6 +37,16 @@
37	37	private String lastMenstrualPeriodBasisDoctorId;
38	38	// 末次月经纠正时间
39	39	private String lastMenstrualPeriodBasisDate;
	40	+ //丈夫信息是否必须
	41	+ private Boolean reqHusband;
	42	+
	43	+ public Boolean getReqHusband() {
	44	+ return reqHusband;
	45	+ }
	46	+
	47	+ public void setReqHusband(Boolean reqHusband) {
	48	+ this.reqHusband = reqHusband;
	49	+ }
40	50
41	51	public Date getFuckLastMens() {
42	52	return fuckLastMens;

...	...	@@ -1114,6 +1114,7 @@
1114	1114	*/
1115	1115	public Patients getPatientsData(YunBookbuildingAddRequest yunRequest) {
1116	1116	Patients patient = new Patients();
	1117	+ patient.setReqHusband(yunRequest.getReqHusband());
1117	1118	patient.setFuckLastMens(DateUtil.parseYMD(yunRequest.getFuckLastMens()));
1118	1119	patient.setLastMenses(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()));
1119	1120
...	...	@@ -1297,7 +1298,7 @@
1297	1298
1298	1299	public PregnantInfoResult getResult(Patients p) {
1299	1300	PregnantInfoResult result = new PregnantInfoResult();
1300		-
	1301	+ result.setReqHusband(p.getReqHusband());
1301	1302	result.setLastMenstrualPeriodBasisOther(p.getLastMenstrualPeriodBasisOther());
1302	1303	result.setFuckLastMens(DateUtil.getyyyy_MM_dd(p.getFuckLastMens()));
1303	1304	result.setLastMenstrualPeriodBasis(BasisEnums.getName(p.getLastMenstrualPeriodBasis()));

...	...	@@ -28,6 +28,16 @@
28	28	private String lastMenstrualPeriodBasisDoctorName;
29	29
30	30	private List patientSerResults;
	31	+ //丈夫信息是否必须
	32	+ private Boolean reqHusband;
	33	+
	34	+ public Boolean getReqHusband() {
	35	+ return reqHusband;
	36	+ }
	37	+
	38	+ public void setReqHusband(Boolean reqHusband) {
	39	+ this.reqHusband = reqHusband;
	40	+ }
31	41
32	42	public List getPatientSerResults() {
33	43	return patientSerResults;

...	...	@@ -18,7 +18,8 @@
18	18	// 末次月经纠正医生ID
19	19	private String lastMenstrualPeriodBasisDoctorId;
20	20	private String lastMenstrualPeriodBasisDoctorName;
21		-
	21	+ //是否提供丈夫信息
	22	+ private Boolean reqHusband;
22	23	/**
23	24	* 编辑时服务信息
24	25	*/
...	...	@@ -26,6 +27,13 @@
26	27	//显示服务信息
27	28	private List<PatientSerResult> patientSerResults;
28	29
	30	+ public Boolean getReqHusband() {
	31	+ return reqHusband;
	32	+ }
	33	+
	34	+ public void setReqHusband(Boolean reqHusband) {
	35	+ this.reqHusband = reqHusband;
	36	+ }
29	37
30	38	public List<PatientSerResult> getPatientSerResults() {
31	39	return patientSerResults;