From 7fc0abe83e2b5f68732fd031f03aeead21384649 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Thu, 7 Jul 2016 09:53:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/facade/AntenatalExaminationFacade.java       | 15 ++++++++++++++-
 .../web/result/AntenatalExaminationResult.java       | 20 ++++++++++++++++++++
 .../platform/operate/web/result/AntexChuResult.java  | 20 ++++++++++++++++++++
 3 files changed, 54 insertions(+), 1 deletion(-)

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 d18dfb0..951a120 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
@@ -326,6 +326,13 @@ public class AntenatalExaminationFacade {
                 antenatalExaminationResult.setDiagnosis(queryRisk(list));
             } catch (Exception e) {
             }
+            ReferralApplyOrderQuery referralApplyOrderQuery=new ReferralApplyOrderQuery();
+            referralApplyOrderQuery.setParentId(examinationModel.getParentId());
+            antenatalExaminationResult.setHasRefer(CollectionUtils.isEmpty(applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery)) ? 0 : 1);
+            SieveApplyOrderQuery applyOrderQuery=new SieveApplyOrderQuery();
+            applyOrderQuery.setParentId(examinationModel.getParentId());
+            applyOrderQuery.setYn(YnEnums.YES.getId());
+            antenatalExaminationResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery))?0:1);
             object = antenatalExaminationResult;
         } else {
             //查询初诊数据
@@ -348,8 +355,14 @@ public class AntenatalExaminationFacade {
                 List list1 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class);
                 antexChuResult.setHighrisk(queryRisk(list1));
             } catch (Exception e) {
-
             }
+            ReferralApplyOrderQuery referralApplyOrderQuery=new ReferralApplyOrderQuery();
+            referralApplyOrderQuery.setParentId(antExChuModel.getParentId());
+            antexChuResult.setHasRefer(CollectionUtils.isEmpty(applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery)) ? 0 : 1);
+            SieveApplyOrderQuery applyOrderQuery=new SieveApplyOrderQuery();
+            applyOrderQuery.setParentId(antExChuModel.getParentId());
+            applyOrderQuery.setYn(YnEnums.YES.getId());
+            antexChuResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery))?0:1);
             object = antexChuResult;
         }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
index 2e4eedf..a404fdb 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
@@ -69,6 +69,26 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
     private String checkDate;
     //下次产检日期
     private Map nextCheckTime;
+    //是否有转诊
+    private int hasRefer;
+    //是否有产筛
+    private int hasSieve;
+
+    public int getHasRefer() {
+        return hasRefer;
+    }
+
+    public void setHasRefer(int hasRefer) {
+        this.hasRefer = hasRefer;
+    }
+
+    public int getHasSieve() {
+        return hasSieve;
+    }
+
+    public void setHasSieve(int hasSieve) {
+        this.hasSieve = hasSieve;
+    }
 
     public Map getNextCheckTime() {
         return nextCheckTime;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
index 030e4ef..6cb9ed7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
@@ -199,6 +199,26 @@ public class AntexChuResult {
     private String ydqjd;
     //实验结果
     private String syjg;
+    //是否有转诊
+    private int hasRefer;
+    //是否有产筛
+    private int hasSieve;
+
+    public int getHasRefer() {
+        return hasRefer;
+    }
+
+    public void setHasRefer(int hasRefer) {
+        this.hasRefer = hasRefer;
+    }
+
+    public int getHasSieve() {
+        return hasSieve;
+    }
+
+    public void setHasSieve(int hasSieve) {
+        this.hasSieve = hasSieve;
+    }
 
     public String getSyjg() {
         return syjg;
-- 
1.8.3.1