From 6fa13e31d215b5a1d04148ce24f5105d51ba8561 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 2 Aug 2016 17:18:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E5=BB=BA=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/BabyBookbuildingFacade.java | 11 ++++++--
 .../operate/web/facade/StopPregnancyFacade.java    | 31 +++++++++++++++++++---
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index 15ddb28..61946a6 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -236,7 +236,14 @@ public class BabyBookbuildingFacade {
             if (pm != null)
             {
                 //查询最后一次建档记录
-                patients = patientsService.findLastBuildRecord(pm.getId(),YnEnums.YES.getId());
+                PatientsQuery patientsQuery = new PatientsQuery();
+                patientsQuery.setYn(YnEnums.YES.getId());
+                patientsQuery.setPid(pm.getId());
+                List<Patients> pats  = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
+                if (CollectionUtils.isNotEmpty(pats))
+                {
+                    patients = pats.get(0);
+                }
                 //当前状态为 孕妇状态
                 if (pm.getType() != null && pm.getType() == 1)
                 {
@@ -319,7 +326,7 @@ public class BabyBookbuildingFacade {
         if (model == null || model.getId() == null) {
             br.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
             br.setErrormsg("失败");
-
+            return br;
         }
         //创建建档短信
         createBuildSms(model);
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 597f375..492e385 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
@@ -2,9 +2,7 @@ package com.lyms.platform.operate.web.facade;
 
 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;
-import com.lyms.platform.common.enums.ZhiChenEnums;
+import com.lyms.platform.common.enums.*;
 import com.lyms.platform.common.result.BaseObjectResponse;
 import com.lyms.platform.common.result.BaseResponse;
 import com.lyms.platform.common.utils.DateUtil;
@@ -52,6 +50,7 @@ public class StopPregnancyFacade {
     @Autowired
     private YunBookbuildingService yunBookbuildingService;
 
+
     /**
      * 更新终止妊娠
      * @param request
@@ -96,6 +95,32 @@ public class StopPregnancyFacade {
 
         }
 
+        Patients pat = null;
+        PatientsQuery patientsQuery1 = new PatientsQuery();
+        patientsQuery1.setYn(YnEnums.YES.getId());
+        patientsQuery1.setId(request.getId());
+        List<Patients> pats  = yunBookbuildingService.queryPregnantWithQuery(patientsQuery1);
+        if (CollectionUtils.isNotEmpty(pats))
+        {
+            pat = pats.get(0);
+        }
+        if (pat != null)
+        {
+            //更新状态为过期
+            //判断其为增值服务还是 标准服务
+            if (pat.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId())
+            {
+                pat.setServiceStatus(ServiceStatusEnums.STANDARD_OVERDUE.getId());
+            }
+            else if (pat.getServiceType() == ServiceTypeEnums.ADD_SERVICE.getId())
+            {
+                pat.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId());
+            }
+            yunBookbuildingService.updatePregnant(pat,pat.getId());
+        }
+
+
+
         StopPregModel model = getStopPregModel(request);
         model.setCreated(new Date());
         model.setModified(new Date());
-- 
1.8.3.1