From 0df39a8c5a45c6ff25411eace15d40a606f9769c Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期五, 06 十二月 2024 17:59:13 +0800
Subject: [PATCH] 修复小程序分析统计的问题

---
 Report_WXCXOrdAnalysis_Data.php |    2 +-
 ServiceOrder_List.gds           |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Report_WXCXOrdAnalysis_Data.php b/Report_WXCXOrdAnalysis_Data.php
index 6e84cba..87e0bbc 100644
--- a/Report_WXCXOrdAnalysis_Data.php
+++ b/Report_WXCXOrdAnalysis_Data.php
@@ -56,7 +56,7 @@
 ,ServiceOrdTraTxnPrice as OrdSumPrice
 ,OrdSumPriceDel=(select sum(ServiceOrdTraTxnPrice) from ServiceOrder as b where ServiceOrdState=4 and a.ServiceOrdID=b.ServiceOrdID)
 from ServiceOrder as a 
-where ((ServiceOrdCancelReason<>10 or ServiceOrdCancelReason is null) and (ServiceOrdCancelReasonTXT<>'鑷姩鍙栨秷' or ServiceOrdCancelReasonTXT is null)) and (ServiceOrdOperationRemarks<>'[瀹㈡埛鏈寮忔彁浜ら渶姹傦紝鍙笉鑱旂郴]' or ServiceOrdOperationRemarks is null) and ServiceOrdUserID not in (4,53,11638,93481) and ServiceOrd_CC_Time ".$SqlDateType." and ServiceOrdSource=5
+where ((ServiceOrdCancelReason<>10 or ServiceOrdCancelReason is null) and (ServiceOrdCancelReasonTXT<>'鑷姩鍙栨秷' or ServiceOrdCancelReasonTXT is null)) and (ServiceOrdOperationRemarks<>'[瀹㈡埛鏈寮忔彁浜ら渶姹傦紝鍙笉鑱旂郴]' or ServiceOrdOperationRemarks is null) and ServiceOrdUserID not in (4,53,116368,93481) and ServiceOrd_CC_Time ".$SqlDateType." and ServiceOrdSource=5
 ) as aa GROUP BY SourceName,UserSource";
 //echo $sql;//exit;
 $data = sqlsrv_query($conn,$sql);
diff --git a/ServiceOrder_List.gds b/ServiceOrder_List.gds
index 1874907..e15fe06 100644
--- a/ServiceOrder_List.gds
+++ b/ServiceOrder_List.gds
@@ -672,7 +672,7 @@
 				searchSql=" (ServiceOrdPtOutHosp in (select vid from dictionary where vType=1 and vtitle='HospName' and vtext='"&Mid(searchTXT,6)&"') or ServiceOrdPtInHosp in (select vid from dictionary where vType=1 and vtitle='HospName' and vtext='"&Mid(searchTXT,6)&"')) and ServiceOrd_CC_Time "&SqlOrdDateType
 			  ElseIf Mid(searchTXT,1,5)="WXCX|" Then
 				'searchSql=" (ServiceOrdPtOutHosp in (select vid from dictionary where vType=1 and vtitle='HospName' and vtext='"&Mid(searchTXT,6)&"') or ServiceOrdPtInHosp in (select vid from dictionary where vType=1 and vtitle='HospName' and vtext='"&Mid(searchTXT,6)&"')) and ServiceOrd_CC_Time "&SqlOrdDateType
-				searchSql=" ((ServiceOrdCancelReason<>10 or ServiceOrdCancelReason is null) and (ServiceOrdCancelReasonTXT<>'鑷姩鍙栨秷' or ServiceOrdCancelReasonTXT is null)) and (ServiceOrdOperationRemarks<>'[瀹㈡埛鏈寮忔彁浜ら渶姹傦紝鍙笉鑱旂郴]' or ServiceOrdOperationRemarks is null) and ServiceOrdUserID not in (4,53) and ServiceOrdSource=5 and ServiceOrd_CC_Time "&SqlOrdDateType
+				searchSql=" ((ServiceOrdCancelReason<>10 or ServiceOrdCancelReason is null) and (ServiceOrdCancelReasonTXT<>'鑷姩鍙栨秷' or ServiceOrdCancelReasonTXT is null)) and (ServiceOrdOperationRemarks<>'[瀹㈡埛鏈寮忔彁浜ら渶姹傦紝鍙笉鑱旂郴]'  or ServiceOrdOperationRemarks is null) and ServiceOrdUserID not in (4,53,116368,93481) and ServiceOrdSource=5 and ServiceOrd_CC_Time "&SqlOrdDateType
 				If Mid(searchTXT,6,1)="4" Then
 					searchSql=searchSql&" and ServiceOrdState=4 "
 				ElseIf Mid(searchTXT,6,1)="3" Then

--
Gitblit v1.9.1