From 6eb3cb218c7a995d05b25f172fe2abfb1ce447dd Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 28 Jul 2016 10:42:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E8=AE=B0=E5=BD=95=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=A6=8A=E5=A8=A0=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/BookbuildingFacade.java | 1 + .../operate/web/facade/StopPregnancyFacade.java | 31 ++++++++++++++++++---- .../web/result/BookbuildingRecordResult.java | 12 +++++++++ 3 files changed, 39 insertions(+), 5 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 09fede8..7f91506 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -254,6 +254,7 @@ public class BookbuildingFacade { result.setBookbuildDate(DateUtil.getyyyy_MM_dd(pat.getBookbuildingDate())); result.setId(pat.getId()); result.setType(pat.getType()); + result.setDueStatus(pat.getDueStatus()); results.add(result); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java index 410e8ab..496d58d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java @@ -1,9 +1,6 @@ package com.lyms.platform.operate.web.facade; -import com.lyms.platform.biz.service.AntenatalExaminationService; -import com.lyms.platform.biz.service.BasicConfigService; -import com.lyms.platform.biz.service.PatientsService; -import com.lyms.platform.biz.service.StopPregnancyService; +import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.StopPregEnums; import com.lyms.platform.common.enums.YnEnums; @@ -51,6 +48,9 @@ public class StopPregnancyFacade { @Autowired private BasicConfigService basicConfigService; + @Autowired + private YunBookbuildingService yunBookbuildingService; + /** * 更新终止妊娠 * @param request @@ -60,7 +60,7 @@ public class StopPregnancyFacade { StopPregModel model = getStopPregModel(request); model.setModified(new Date()); - stopPregnancyService.updateStopPreg(model,request.getId()); + stopPregnancyService.updateStopPreg(model, request.getId()); BaseResponse objectResponse = new BaseResponse(); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setErrormsg("成功"); @@ -74,6 +74,27 @@ public class StopPregnancyFacade { */ public BaseResponse addStopPreg(StopPregRequest request) { + + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setType(1); + patientsQuery.setId(request.getId()); + patientsQuery.setHospitalId(request.getHospitalId()); + + List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); + if (CollectionUtils.isNotEmpty(patients)) + { + Patients patient = patients.get(0); + if (patient != null) + { + patient.setModified(new Date()); + patient.setDueStatus(1); + //分娩状态 0未终止妊娠 1终止妊娠 + yunBookbuildingService.updatePregnant(patient, request.getPid()); + } + + } + StopPregModel model = getStopPregModel(request); model.setCreated(new Date()); model.setModified(new Date()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BookbuildingRecordResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BookbuildingRecordResult.java index a168cf1..dabe4a3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BookbuildingRecordResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BookbuildingRecordResult.java @@ -16,6 +16,18 @@ public class BookbuildingRecordResult { //1孕妇 3产妇 private Integer type; + + //分娩状态 0未终止妊娠 1终止妊娠 + private Integer dueStatus; + + public Integer getDueStatus() { + return dueStatus; + } + + public void setDueStatus(Integer dueStatus) { + this.dueStatus = dueStatus; + } + public Integer getType() { return type; } -- 1.8.3.1