From 268cb9c048c1f38ca2cb475b88be3154518fb271 Mon Sep 17 00:00:00 2001
From: dongqin <123456>
Date: Thu, 5 Sep 2019 11:01:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8E=E5=A4=A7=E6=8E=A8=E9=80=81=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/pojo/SieveApplyOrderModel.java   | 12 ++++++++++
 .../operate/web/facade/ApplyOrderFacade.java       | 28 +++++++++++++++-------
 .../operate/web/result/SieveApplyOrderResult.java  | 14 +++++++++++
 3 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java
index 3ef81e3..90d5b50 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java
@@ -245,6 +245,18 @@ public class SieveApplyOrderModel extends BaseModel {
      */
     private String jzsInfo;
 
+    /**
+     * 推送到华大系统的结果记录
+     */
+    private boolean huaDaPushResult;
+
+    public boolean isHuaDaPushResult() {
+        return huaDaPushResult;
+    }
+
+    public void setHuaDaPushResult(boolean huaDaPushResult) {
+        this.huaDaPushResult = huaDaPushResult;
+    }
 
     private String ypglx;
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
index 4cb7a82..441f42f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
@@ -580,9 +580,10 @@ public class ApplyOrderFacade {
      * @param hospitalId
      */
     private void callHuaDa(SieveApplyOrderModel sieveApplyOrderModel, String hospitalId) {
-        try{
-            String sieveType = sieveApplyOrderModel.getSieveType();
-            //if ("4".equals(HIS_VERSION)) {
+        String sieveType = sieveApplyOrderModel.getSieveType();
+        if ("4".equals(HIS_VERSION)) {
+            boolean result = false;
+            try{
                 if (StringUtils.isNotEmpty(sieveType) && "2".equals(sieveType)) {
                     final String productCode = "DX1331";
                     HuadaSieveApplyOrderAddRequest request = new HuadaSieveApplyOrderAddRequest();
@@ -710,13 +711,16 @@ public class ApplyOrderFacade {
                     request.setNativePlace(addressRegister);
 
 
-                    huadaSaveSampleInfo(request);
+                    result = huadaSaveSampleInfo(request);
                 }
-           // }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("调用华大接口失败", e);
+            }catch (Exception e){
+                e.printStackTrace();
+                logger.error("调用华大接口失败", e);
+            }
+
+
         }
+
     }
 
     /**
@@ -1656,13 +1660,19 @@ public class ApplyOrderFacade {
             if (jsonArray.isEmpty()) {
                 return false;
             }
-            return true;
+
+            Map m = (Map) jsonArray.get(0);
+            boolean result = (boolean) m.get("result");
+
+            return result;
         } catch (Exception e) {
             e.printStackTrace();
         }
         return false;
     }
 
+
+
     public Map huadaCallback(String syscode, String sign, String timestamp, String params) {
         Map map = new HashMap();
         System.out.println("syscode:" + syscode + "sign:" + sign + "timestamp:" + timestamp);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveApplyOrderResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveApplyOrderResult.java
index 8c37b1d..fc53c4d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveApplyOrderResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveApplyOrderResult.java
@@ -48,6 +48,19 @@ public class SieveApplyOrderResult  {
     //申请医生
     private String applyDoctor;
 
+    /**
+     * 华大推送结果
+     */
+    private boolean huaDaPushResult;
+
+    public boolean isHuaDaPushResult() {
+        return huaDaPushResult;
+    }
+
+    public void setHuaDaPushResult(boolean huaDaPushResult) {
+        this.huaDaPushResult = huaDaPushResult;
+    }
+
     public String getApplyDoctor() {
         return applyDoctor;
     }
@@ -102,6 +115,7 @@ public class SieveApplyOrderResult  {
         setApplyDoctor(destModel.getApplyDoctor());
         setCheckDate(destModel.getCheckDate());
         setGuide(destModel.getGuide());
+        setHuaDaPushResult(destModel.isHuaDaPushResult());
         if(StringUtils.isNotEmpty(destModel.getCheckItem())){
             setCheckItem(JsonUtil.toList(destModel.getCheckItem(),List.class));
         }
-- 
1.8.3.1