From 642a26358423743d22f68fc6c4bf94652b3e93a0 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 10 Jan 2017 15:20:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E4=BD=9C=E5=BA=9F=E4=BA=A7?=
 =?UTF-8?q?=E6=A3=80=E5=8A=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/facade/AntenatalExaminationFacade.java     | 37 +++++++++++++++-------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
index f507559..625e28b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
@@ -77,10 +77,10 @@ public class AntenatalExaminationFacade {
      */
     public String handHideBuild(String pid, String parentId, Integer userId, int type) {
         String hospitalId = autoMatchFacade.getHospitalId(userId);
-        Patients patients=null;
+        Patients patients = null;
         Patients patients1 = patientsService.findOnePatientById(parentId);
-        if(StringUtils.isEmpty(pid)){
-            pid=patients1.getPid();
+        if (StringUtils.isEmpty(pid)) {
+            pid = patients1.getPid();
         }
         List li = new ArrayList();
         li.add(hospitalId);
@@ -186,7 +186,7 @@ public class AntenatalExaminationFacade {
             }
             model.setParentId(parentId);
             antExAddRequest.setParentId(parentId);
-            Patients p=patientsService.findOnePatientById(parentId);
+            Patients p = patientsService.findOnePatientById(parentId);
 
             //加入产筛
             patientsService.validata(p);
@@ -347,7 +347,7 @@ public class AntenatalExaminationFacade {
             antExChuModel.setParentId(parentId);
             excAddRequest.setParentId(parentId);
 
-            Patients p=patientsService.findOnePatientById(parentId);
+            Patients p = patientsService.findOnePatientById(parentId);
 
             //加入产筛
             patientsService.validata(p);
@@ -793,7 +793,7 @@ public class AntenatalExaminationFacade {
         patientsQuery.setPid(exListQueryRequest.getPid());
         patientsQuery.setBuildType(1);
         //在区域组的时候不用查询隐藏档案
-        if(null!=groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId))){
+        if (null != groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId))) {
             patientsQuery.setExtEnable(false);
         }
         //获取所有的建档记录
@@ -850,7 +850,7 @@ public class AntenatalExaminationFacade {
                     patientsQuery1.setLastMensesEnd(end);
                     patientsQuery1.setBuildType(1);
                     //在区域组的时候不用查询隐藏档案
-                    if(null!=groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId))){
+                    if (null != groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId))) {
                         patientsQuery1.setExtEnable(false);
                     }
 
@@ -1678,6 +1678,20 @@ public class AntenatalExaminationFacade {
         return "0";
     }
 
+
+    private String checkTicket(String id) {
+        PatientCheckTicket ticket = patientCheckTicketService.getTicket(id);
+        if (ticket == null) {
+            return "当前免费券不存在";
+        } else if (ticket.getStatus() == 2) {
+            return "当前免费券已被使用";
+        } else if (ticket.getStatus() == 3) {
+            return "当前免费券已经失效";
+        }
+        return null;
+    }
+
+
     /**
      * 查询产前检查
      *
@@ -1698,11 +1712,10 @@ public class AntenatalExaminationFacade {
                 patients = list.get(0);
             }
         } else if (StringUtils.isNotEmpty(queryRequest.getBarCode())) {
-            PatientCheckTicketQuery checkTicketQuery = new PatientCheckTicketQuery();
-            checkTicketQuery.setId(queryRequest.getBarCode());
-            checkTicketQuery.setStatus(1);
-            if (patientCheckTicketService.queryTicketCount(checkTicketQuery)  ==0) {
-                return new BaseResponse().setErrorcode(ErrorCodeConstants.TICKET_USED).setErrormsg("不能使用.");
+
+            String result = checkTicket(queryRequest.getBarCode());
+            if (StringUtils.isNotEmpty(result)) {
+                return new BaseResponse().setErrorcode(ErrorCodeConstants.TICKET_USED).setErrormsg(result);
             }
 
             PatientCheckTicket checkTicket = patientCheckTicketService.getTicket(queryRequest.getBarCode());
-- 
1.8.3.1