jiangjiazhi / regional-platform

Commit 568cc179d98592ee4bb80ace578b422679bb8cc2

Authored by liquanyu over 8 years ago

Exists in master and in 6 other branches

update code

Showing 1 changed file with 18 additions and 6 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java

...	...	@@ -79,6 +79,9 @@
79	79	private PatientsService patientsService;
80	80
81	81	@Autowired
	82	+ private MatDeliverService matDeliverService;
	83	+
	84	+ @Autowired
82	85	private PatientCheckTicketService patientCheckTicketService;
83	86
84	87	@Autowired
...	...	@@ -293,7 +296,7 @@
293	296	* @return
294	297	*/
295	298	public BaseResponse updateBabyBookbuilding(BabyBookbuildingAddRequest request, Integer userId) {
296		- BabyModel model = getBabyModel(request,false);
	299	+ BabyModel model = getBabyModel(request,true);
297	300	model.setModified(new Date());
298	301	model.setOperator(userId);
299	302	if (StringUtils.isNotEmpty(request.getMommyCertificateNum())) {
...	...	@@ -340,11 +343,20 @@
340	343	Date brith = DateUtil.parseYMD(request.getBabyBirthday());
341	344	Date tempDate = DateUtil.addWeek(lastMenses, 24);
342	345	if (brith.getTime() >= tempDate.getTime()) {
343		- //设置孕妇分娩日期
344		- Patients patientUpdate = new Patients();
345		- patientUpdate.setId(pat.getId());
346		- patientUpdate.setFmDate(StringUtils.isEmpty(request.getDueDate()) ? DateUtil.parseYMD(request.getBabyBirthday()) : DateUtil.parseYMD(request.getDueDate()));
347		- patientsService.updatePatient(patientUpdate);
	346	+ MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
	347	+ matDeliverQuery.setPid(pat.getPid());
	348	+ matDeliverQuery.setYn(YnEnums.YES.getId());
	349	+ List<MaternalDeliverModel> list = matDeliverService.query(matDeliverQuery);
	350	+ //有孕妇分娩记录就不修改分娩时间否则修改分娩时间为儿童生日
	351	+ if (CollectionUtils.isEmpty(list))
	352	+ {
	353	+ //设置孕妇分娩日期
	354	+ Patients patientUpdate = new Patients();
	355	+ patientUpdate.setId(pat.getId());
	356	+ patientUpdate.setFmDate(StringUtils.isEmpty(request.getDueDate()) ? DateUtil.parseYMD(request.getBabyBirthday()) : DateUtil.parseYMD(request.getDueDate()));
	357	+ patientsService.updatePatient(patientUpdate);
	358	+ }
	359	+
348	360	}
349	361	}
350	362	}