jiangjiazhi / regional-platform

Commit ab3c6f9051eb6665c3217c01d11906825af982c7

Authored by jiangjiazhi almost 9 years ago

Exists in master and in 8 other branches

Merge remote-tracking branch 'origin/master'

Showing 6 changed files

platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java

...	...	@@ -47,6 +47,9 @@
47	47	//户籍类型Id
48	48	private String pcensusTypeId;
49	49
	50	+ //孕妇文化程度Id
	51	+ private String plevelTypeId;
	52	+
50	53	//工作单位
51	54	private String pworkUnit;
52	55
...	...	@@ -209,6 +212,26 @@
209	212	private String husbandName;
210	213	private String husbandPhone;
211	214	private String vcCardNo;
	215	+
	216	+ //丈夫文化程度Id
	217	+ private String hlevelTypeId;
	218	+
	219	+
	220	+ public String getPlevelTypeId() {
	221	+ return plevelTypeId;
	222	+ }
	223	+
	224	+ public void setPlevelTypeId(String plevelTypeId) {
	225	+ this.plevelTypeId = plevelTypeId;
	226	+ }
	227	+
	228	+ public String getHlevelTypeId() {
	229	+ return hlevelTypeId;
	230	+ }
	231	+
	232	+ public void setHlevelTypeId(String hlevelTypeId) {
	233	+ this.hlevelTypeId = hlevelTypeId;
	234	+ }
212	235
213	236	public Date getFmDate() {
214	237	return fmDate;

...	...	@@ -62,7 +62,7 @@
62	62	*/
63	63	@RequestMapping(method = RequestMethod.POST, value = "/addOrUpdateYunBuild")
64	64	@ResponseBody
65		- public BaseResponse addPregnantBookbuilding(@RequestBody YunBookbuildingAddRequest yunBookbuildingAddRequest) {
	65	+ public BaseResponse addOrUpdateYunBuild(@RequestBody YunBookbuildingAddRequest yunBookbuildingAddRequest) {
66	66	if (yunBookbuildingAddRequest != null && !StringUtils.isEmpty(yunBookbuildingAddRequest.getId()) )
67	67	{
68	68	bookbuildingFacade.updatePregnantById(yunBookbuildingAddRequest.getId(), yunBookbuildingAddRequest);

...	...	@@ -84,14 +84,24 @@
84	84
85	85	if (patients != null)
86	86	{
87		- if (patients.getType() != 3)
	87	+ if (patients.getType() == 1)
88	88	{
89		- //设置孕妇已分娩
90		- Patients patientUpdate = new Patients();
91		- patientUpdate.setId(patients.getId());
92		- patientUpdate.setYn(YnEnums.YES.getId());
93		- patientUpdate.setType(3);
94		- patientsService.updatePatient(patientUpdate);
	89	+
	90	+ //判断在儿童建档的时候，是否设置到这个儿童对应的孕妇设置成产妇
	91	+ //计算规则儿童生日 > 孕妇分娩时间 - 60 设置成分娩
	92	+ Date dueDate = patients.getDueDate();
	93	+ Date brith = DateUtil.parseYMD(request.getBabyBirthday());
	94	+ Date tempDate = DateUtil.addDay(dueDate,-60);
	95	+ if (brith.getTime() > tempDate.getTime())
	96	+ {
	97	+ //设置孕妇已分娩
	98	+ Patients patientUpdate = new Patients();
	99	+ patientUpdate.setId(patients.getId());
	100	+ patientUpdate.setYn(YnEnums.YES.getId());
	101	+ patientUpdate.setType(3);
	102	+ patientsService.updatePatient(patientUpdate);
	103	+ }
	104	+
95	105	}
96	106
97	107	}
98	108
99	109
100	110
...	...	@@ -149,21 +159,18 @@
149	159	patient.setHusbandPhone(request.getFatherPhone());
150	160
151	161	patient.setHprofessionTypeId(request.getFatherProfessionTypeId());
	162	+ patient.setPlevelTypeId(request.getMommyLevelId());
	163	+ patient.setHlevelTypeId(request.getFatherLevelId());
152	164
153	165
154		-// patient.setMremark(yunRequest.getMremark());
155		-//
156		-// patient.setLastMenses(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()));
157		-// patient.setDueDate(DateUtil.parseYMD(yunRequest.getDueDate()));
158		-// patient.setFileCode(yunRequest.getFileCode());
159		-// patient.setBookbuildingDoctor(yunRequest.getBookbuildingDoctor());
160		-// patient.setBookbuildingDate(DateUtil.parseYMD(yunRequest.getBookbuildingDate()));
161		-// patient.setServiceType(yunRequest.getServiceType());
162		-// patient.setVcCardNo(yunRequest.getVcCardNo());
	166	+ patient.setMremark(request.getMremark());
163	167
164		- patient.setDueDate(DateUtil.parseYMD(request.getDueDate()));
165	168
166		- patient.setBookbuildingDoctor(request.getBuildDoctor());
	169	+
	170	+
	171	+ patient.setFmDate(DateUtil.parseYMD(request.getBabyBirthday()));
	172	+
	173	+ patient.setServiceStatus(request.getServiceStatus());
167	174	patient.setBookbuildingDate(DateUtil.parseYMD(request.getBuildDate()));
168	175	patient.setServiceType(request.getServiceType());
169	176	patient.setHospitalId(request.getHospitalId());

...	...	@@ -195,6 +195,7 @@
195	195	patient.setPhone(yunRequest.getPregnantPhone());
196	196
197	197	patient.setPworkUnit(yunRequest.getPregnantWorkUnit());
	198	+ patient.setPlevelTypeId(yunRequest.getPregnantLevelTypeId());
198	199
199	200	//孕妇户籍地址
200	201	patient.setAddressRegister(yunRequest.getPregnantCensusAddr());
...	...	@@ -231,6 +232,7 @@
231	232	patient.setHcityRegisterId(yunRequest.getHusbandCityRegisterId());
232	233	patient.setHareaRegisterId(yunRequest.getHusbandAreaRegisterId());
233	234	patient.setHstreetRegisterId(yunRequest.getHusbandStreetRegisterId());
	235	+ patient.setHlevelTypeId(yunRequest.getHusbandLevelTypeId());
234	236
235	237	patient.setServiceStatus(yunRequest.getServiceStatus());
236	238	patient.setVipEndTime(DateUtil.parseYMD(yunRequest.getVipEndTime()));
...	...	@@ -281,6 +283,7 @@
281	283	result.setPregnantCensusTypeId(p.getPcensusTypeId());
282	284	result.setPregnantLiveTypeId(p.getPliveTypeId());
283	285	result.setPregnantProfessionTypeId(p.getPprofessionTypeId());
	286	+ result.setPregnantLevelTypeId(p.getPlevelTypeId());
284	287
285	288	/********孕妇联系方式*************/
286	289	result.setPregnantPhone(p.getPhone());
...	...	@@ -315,6 +318,7 @@
315	318	result.setHusbandNationId(p.getHnationId());
316	319	result.setHusbandProfessionTypeId(p.getHprofessionTypeId());
317	320	result.setHusbandWorkUnit(p.getHworkUnit());
	321	+ result.setHusbandLevelTypeId(p.getHlevelTypeId());
318	322
319	323	result.setHusbandAddressRegister(p.getHaddressRegister());
320	324	result.setHusbandProvinceRegisterId(p.getHprovinceRegisterId());

...	...	@@ -30,6 +30,9 @@
30	30	private String pregnantLiveTypeId;
31	31	//职业类别
32	32	private String pregnantProfessionTypeId;
	33	+
	34	+ //孕妇文化程度
	35	+ private String pregnantLevelTypeId;
33	36	/*********孕妇基本信息*********/
34	37
35	38	/*********孕妇联系方式*********/
...	...	@@ -79,6 +82,9 @@
79	82	private String husbandWorkUnit;
80	83	//职业类别
81	84	private String husbandProfessionTypeId;
	85	+
	86	+ //丈夫文化程度
	87	+ private String husbandLevelTypeId;
82	88
83	89	//户籍地址
84	90	private String husbandAddressRegister;
...	...	@@ -156,6 +162,22 @@
156	162
157	163	public void setVipEndTime(String vipEndTime) {
158	164	this.vipEndTime = vipEndTime;
	165	+ }
	166	+
	167	+ public String getPregnantLevelTypeId() {
	168	+ return pregnantLevelTypeId;
	169	+ }
	170	+
	171	+ public void setPregnantLevelTypeId(String pregnantLevelTypeId) {
	172	+ this.pregnantLevelTypeId = pregnantLevelTypeId;
	173	+ }
	174	+
	175	+ public String getHusbandLevelTypeId() {
	176	+ return husbandLevelTypeId;
	177	+ }
	178	+
	179	+ public void setHusbandLevelTypeId(String husbandLevelTypeId) {
	180	+ this.husbandLevelTypeId = husbandLevelTypeId;
159	181	}
160	182
161	183	/*********院内信息*********/

...	...	@@ -27,6 +27,9 @@
27	27	private String pregnantLiveTypeId;
28	28	//职业类别
29	29	private String pregnantProfessionTypeId;
	30	+
	31	+ //孕妇文化程度
	32	+ private String pregnantLevelTypeId;
30	33	/*********孕妇基本信息*********/
31	34
32	35	/*********孕妇联系方式*********/
...	...	@@ -76,6 +79,8 @@
76	79	private String husbandWorkUnit;
77	80	//职业类别
78	81	private String husbandProfessionTypeId;
	82	+ //丈夫文化程度
	83	+ private String husbandLevelTypeId;
79	84
80	85	//户籍地址
81	86	private String husbandAddressRegister;
...	...	@@ -152,6 +157,22 @@
152	157
153	158	public void setVipEndTime(String vipEndTime) {
154	159	this.vipEndTime = vipEndTime;
	160	+ }
	161	+
	162	+ public String getPregnantLevelTypeId() {
	163	+ return pregnantLevelTypeId;
	164	+ }
	165	+
	166	+ public void setPregnantLevelTypeId(String pregnantLevelTypeId) {
	167	+ this.pregnantLevelTypeId = pregnantLevelTypeId;
	168	+ }
	169	+
	170	+ public String getHusbandLevelTypeId() {
	171	+ return husbandLevelTypeId;
	172	+ }
	173	+
	174	+ public void setHusbandLevelTypeId(String husbandLevelTypeId) {
	175	+ this.husbandLevelTypeId = husbandLevelTypeId;
155	176	}
156	177
157	178	/*********院内信息*********/