jiangjiazhi / regional-platform

Authored by liquanyu over 4 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 8 additions and 2 deletions

...	...	@@ -297,7 +297,7 @@
297	297	}
298	298	String result = HospitalCouponPrintUtils.qhdCouponUse(model);
299	299
300		- operateLogFacade.addAddOptLog(getUserId(request), Integer.valueOf(hospitalId), model, OptActionEnums.ADD.getId(), "秦皇岛消费优惠劵");
	300	+ // operateLogFacade.addAddOptLog(getUserId(request), Integer.valueOf(hospitalId), model, OptActionEnums.ADD.getId(), "秦皇岛消费优惠劵");
301	301
302	302	if("0".equals(result)){
303	303	int count = couponService.updateCouponStatus(param);

...	...	@@ -237,10 +237,11 @@
237	237	}
238	238
239	239	private void autoCreatedPatient(PostReviewRequest postReviewRequest, String hospital, String groupId) {
	240	+
240	241	//获取数据
241	242	Patients patients1 = patientsService.findOnePatientById(postReviewRequest.getParentId());
	243	+ String source = patients1.getSource();
242	244
243		-
244	245	PatientsQuery query = new PatientsQuery();
245	246	query.setYn(YnEnums.YES.getId());
246	247	query.setPid(patients1.getPid());
...	...	@@ -250,6 +251,10 @@
250	251	{
251	252	for(Patients patients2 : patients)
252	253	{
	254	+ if (StringUtils.isNotEmpty(patients2.getSource()))
	255	+ {
	256	+ source = patients2.getSource();
	257	+ }
253	258	if (patients2.getHospitalId().equals(hospital)) {
254	259	return;
255	260	}
...	...	@@ -263,6 +268,7 @@
263	268	patients1.setEnable("2");
264	269	}
265	270	patients1.setId(null);
	271	+ patients1.setSource(source);
266	272	patients1.setHospitalId(hospital);
267	273	patients1.setBuildType(0);
268	274	patients1.setBookbuildingDoctor(postReviewRequest.getProdDoctor());