From 962519811b7c4be07f30d09e791798b0ea79d3ae Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期三, 08 三月 2023 09:54:02 +0800
Subject: [PATCH] 同步代码

---
 force-app/main/default/classes/NFM704Rest.cls |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/classes/NFM704Rest.cls b/force-app/main/default/classes/NFM704Rest.cls
index 0305411..fc1ea27 100644
--- a/force-app/main/default/classes/NFM704Rest.cls
+++ b/force-app/main/default/classes/NFM704Rest.cls
@@ -117,6 +117,11 @@
 
         Savepoint sp = Database.setSavepoint();
 
+        // 704鏀瑰杽 2023-02-09 ssm start
+        // 澧炲姞涓�涓爣璁帮紝褰撳洖浼犳暟鎹噷锛屽尰闄㈢鐞嗙紪鐮佷负绌烘椂锛屾姤閿欎絾涓嶉噸鍙�
+        Boolean error_without_resend = false;
+        // 704鏀瑰杽 2023-02-09 ssm end
+
         try{
             //绠$悊缂栫爜List
             List<String> DoctorNoList = new List<String>();
@@ -198,6 +203,10 @@
                 }else{//鍚�
                     // continue;
                     logstr += '涓嶅瓨鍦ㄧ殑鍖婚櫌绠$悊缂栫爜:['+accMap.get(ged.HospitalMCode)+']/n';
+                    // 704鏀瑰杽 2023-02-09 ssm start
+                    // 璁剧疆鏍囪涓簍rue
+                    error_without_resend = true;
+                    // 704鏀瑰杽 2023-02-09 ssm end
                     throw new ControllerUtil.myException('涓嶅瓨鍦ㄧ殑鍖婚櫌绠$悊缂栫爜:['+accMap.get(ged.HospitalMCode)+']');
                 }
 
@@ -232,7 +241,20 @@
             logstr += '\n' + ex.getMessage();
             iflog.ErrorLog__c = ex.getMessage() + '\n' + ex.getStackTraceString() + '\n' + iflog.ErrorLog__c;
             // 寮傚父閲嶅彂
-            rowData = NFMUtil.LogAutoSend(rowData, ex, null);
+            // 704鏀瑰杽 2023-02-09 ssm start
+            if (error_without_resend) {
+                // retry_cnt璁剧疆涓�0
+                rowData.retry_cnt__c = 0;
+                logstr += '\nend';
+                rowData.ErrorLog__c += ex.getMessage() + '\n' + ex.getStackTraceString() + '\n';
+                iflog.ErrorLog__c += ex.getMessage() + '\n' + ex.getStackTraceString() + '\n';
+                iflog.Log__c += logstr;
+                upsert iflog;
+                upsert rowData;
+            } else {
+                rowData = NFMUtil.LogAutoSend(rowData, ex, null);
+            }
+            // 704鏀瑰杽 2023-02-09 ssm end
         }
         iflog.Log__c = logstr;
         upsert iflog;

--
Gitblit v1.9.1