From d10ed72968a41dfc2c963101eaa16276a7f7b1a6 Mon Sep 17 00:00:00 2001
From: hzj <1831054011@qq.com>
Date: 星期一, 13 十月 2025 14:20:51 +0800
Subject: [PATCH] Merge branch 'main' of http://8.134.184.104:10801/r/came
---
m_DispatchOrder.gds | 63 +++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 8 deletions(-)
diff --git a/m_DispatchOrder.gds b/m_DispatchOrder.gds
index ae9927b..eb3b1db 100644
--- a/m_DispatchOrder.gds
+++ b/m_DispatchOrder.gds
@@ -145,6 +145,14 @@
End If
rs.close()
+'鑾峰彇棰勮娲惧崟鏃堕棿
+sql="select DispatchOrd.*, ServiceOrder.ServiceOrdEstimatedOrderDate from DispatchOrd inner join ServiceOrder on DispatchOrd.ServiceOrdIDDt = ServiceOrder.ServiceOrdID where DispatchOrdID="&DispatchOrdID
+rs.open sql,objConn,1,1
+If not rs.Eof Then
+ ServiceOrdEstimatedOrderDate = rs("ServiceOrdEstimatedOrderDate")
+End If
+rs.close()
+
'棰嗛槦鎯呭喌
isCarUpdate="0"
sql="select DispatchOrd_Entourage.id,EntourageOAid,EntourageLead,OA_weixinUserID,EntourageState,EntourageState_Time,OA_Name,OA_weixinAvatar,vtext from DispatchOrd_Entourage,OA_User,dictionary where vtitle='DispatchOrdEntourage' and EntourageID=vID and OA_User_ID=EntourageOAid and EntourageState<>4 and DispatchOrdIDDt="&DispatchOrdID
@@ -544,10 +552,22 @@
<div class="os_shopname" style="color: #F13F11;" onclick="lbs_distance('<%=PtOutHospName%>','<%=address%>')"><%If PtOutHospName="" Then%>閫旂粡<%else%>杞嚭鍦板潃<%End If%>锛�<%=DispatchOrdTraViaTXT%>
<div class="os_weight" style="right: 15px;transform: translateY(35%);"><img src="/resources/images/lbs-red.png" width="20" height="20" border="0"></div>
</div>
- <%If (ServiceOrdPtServices<>"" Or (ServiceOrdPtServicesID<>0 And ServiceOrdPtServicesID<>22)) And CInt(session("adminID"))=CInt(EntourageLeadID) Then %><div class="os_shopname" style="color: #F13F11;">杞嚭搴婁綅锛�<%=HospitalDepartment(ServiceOrdPtServicesID)%> <%=ServiceOrdPtServices%></div><%End if%>
+
+ <%If (ServiceOrdPtServices<>"" Or (ServiceOrdPtServicesID<>0 And ServiceOrdPtServicesID<>22)) And CInt(session("adminID"))=CInt(EntourageLeadID) Then %>
+
+ <%If DispatchOrdClass = "SA" And (Now() < ServiceOrdEstimatedOrderDate) Then %>
+ <div class="os_shopname" style="color: #F13F11;">
+ 杞嚭搴婁綅锛氥�愰殣銆�
+ </div>
+<%Else%>
+ <div class="os_shopname" style="color: #F13F11;">
+ 杞嚭搴婁綅锛�<%=HospitalDepartment(ServiceOrdPtServicesID)%> <%=ServiceOrdPtServices%>
+ </div>
+<%End if%>
+<%End If%>
<div class="os_shopname"></div>
<%End if%>
-
+
<%'杞叆鍖婚櫌
If ServiceOrdID<>"" then%>
<%If ServiceOrdPtInHospID<>"" And ServiceOrdPtInHospID<>"0" And ServiceOrdPtInHospID<>"153" Then
@@ -582,8 +602,16 @@
<div class="os_shopname" style="color: #009900;" onclick="lbs_distance('<%=DispatchOrdTraEnd%>','<%=address%>')"><%If PtInHospName="" Then%>鐩殑鍦�<%else%>杞叆鍦板潃<%End If%>锛�<%=DispatchOrdTraEnd%>
<div class="os_weight" style="right: 15px;transform: translateY(35%);"><img src="/resources/images/lbs-green.png" width="20" height="20" border="0"></div>
</div>
- <%If (ServiceOrdPtInServices<>"" Or (ServiceOrdPtInServicesID<>0 And ServiceOrdPtInServicesID<>22)) And CInt(session("adminID"))=CInt(EntourageLeadID) Then %><div class="os_shopname" style="color: #009900;">杞叆搴婁綅锛�<%=HospitalDepartment(ServiceOrdPtInServicesID)%> <%=ServiceOrdPtInServices%></div><%End if%>
+
+ <%If (ServiceOrdPtInServices<>"" Or (ServiceOrdPtInServicesID<>0 And ServiceOrdPtInServicesID<>22)) And CInt(session("adminID"))=CInt(EntourageLeadID) Then %>
+ <%If DispatchOrdClass = "SA" And (Now() < ServiceOrdEstimatedOrderDate) Then %>
+ <div class="os_shopname" style="color: #F13F11;">
+ 杞叆搴婁綅锛氥�愰殣銆�
+ </div>
+<%Else%>
+ <div class="os_shopname" style="color: #009900;">杞叆搴婁綅锛�<%=HospitalDepartment(ServiceOrdPtInServicesID)%> <%=ServiceOrdPtInServices%></div><%End if%>
<div class="os_shopname"></div>
+ <%End if%>
<%Else%>
<div class="os_shopname" style="color: #009900;">鐩殑鍦帮細<a onclick="lbs_distance('<%=DispatchOrdTraEnd%>','<%=DispatchOrdTraEnd%>')" style="color: #009900;"><%=DispatchOrdTraEnd%></a></div>
<div class="os_shopname"></div>
@@ -608,8 +636,12 @@
<%End If%>
<%'鏀粯鎯呭喌
If (DispatchOrdState>=5 And DispatchOrdState<=9) And ServiceOrdTraTxnPrice<>"" And CInt(session("adminID"))=CInt(EntourageLeadID) then%>
+ <%If ServiceOrdType="27" Then%>
+ <div class="os_shopname">鎴愪氦浠凤細銆愰殣銆�<%If ServiceOrdTraPaidPrice<>"" Then%><%If StretcherMoney<>"" And StretcherMoney>0 Then%> 闄勫姞璐癸細<%=FormatCurrency(StretcherMoney,-1,-1)%><%End if%> 宸叉敮浠橈細銆愰殣銆�<%End if%><%If ServiceOrdTraTxnPrice+StretcherMoney-ServiceOrdTraPaidPrice>0 Then%><br>鏈敮浠橈細銆愰殣銆�</div>
+ <%Else%>
<div class="os_shopname"></div>
<div class="os_shopname">杞繍璐圭敤锛�<%=FormatCurrency(ServiceOrdTraTxnPrice,-1,-1)%><%If StretcherMoney<>"" And StretcherMoney>0 Then%> 闄勫姞璐癸細<%=FormatCurrency(StretcherMoney,-1,-1)%><%End if%><%If ServiceOrdTraPaidPrice<>"" Then%> 宸叉敮浠橈細<%=FormatCurrency(ServiceOrdTraPaidPrice,-1,-1)%><%End if%>
+ <%End if%>
<%If (ServiceOrdTraTxnPrice+StretcherMoney)-ServiceOrdTraPaidPrice>0 And 1=2 Then%><br>鐜版敮浠橈細
<select name="PaidMoneyType" id="PaidMoneyType" style="-webkit-appearance: none;outline: none;border: none;font-size: 14px;" >
<option value="">璇烽�夋嫨</option>
@@ -626,11 +658,15 @@
<input name="PaidMoneyType" id="PaidMoneyType" type="hidden" value="">
<input name="PaidMoney" id="PaidMoney" type="hidden" value="0">
<%End if%>
+ <%End if%>
</div>
<%ElseIf ServiceOrdTraTxnPrice<>"" And ServiceOrdTraTxnPrice<>"0" Then%>
<div class="os_shopname"></div>
+ <%If ServiceOrdType="27" Then%>
+ <div class="os_shopname">鎴愪氦浠凤細銆愰殣銆�<%If ServiceOrdTraPaidPrice<>"" Then%><%If StretcherMoney<>"" And StretcherMoney>0 Then%> 闄勫姞璐癸細<%=FormatCurrency(StretcherMoney,-1,-1)%><%End if%> 宸叉敮浠橈細銆愰殣銆�<%End if%><%If ServiceOrdTraTxnPrice+StretcherMoney-ServiceOrdTraPaidPrice>0 Then%><br>鏈敮浠橈細銆愰殣銆�</div>
+ <%Else%>
<div class="os_shopname">鎴愪氦浠凤細<%=FormatCurrency(ServiceOrdTraTxnPrice,-1,-1)%><%If ServiceOrdTraPaidPrice<>"" Then%><%If StretcherMoney<>"" And StretcherMoney>0 Then%> 闄勫姞璐癸細<%=FormatCurrency(StretcherMoney,-1,-1)%><%End if%> 宸叉敮浠橈細<%=FormatCurrency(ServiceOrdTraPaidPrice,-1,-1)%><%End if%><%If ServiceOrdTraTxnPrice+StretcherMoney-ServiceOrdTraPaidPrice>0 Then%><br>鏈敮浠橈細<%=FormatCurrency(ServiceOrdTraTxnPrice+StretcherMoney-ServiceOrdTraPaidPrice,-1,-1)%>
-
+ <%End If%>
<%If ServiceOrdTraTxnPrice>0 And ServiceOrdTraPaidPrice<ServiceOrdTraTxnPrice And DispatchOrdCoPhone<>"" And (NEWOrder<>"" Or DispatchOrdState=8) Then%> <a onclick="JS_SMSCreateSave('<%=DispatchOrdCoPhone%>','[Pay|0|<%=ServiceOrdID%>] ')">鍙戜粯<label style="color: #ff0000;">鍏ㄦ</label>鐭俊</a>
<script>
//鍙戦�佺煭淇�
@@ -644,6 +680,7 @@
<%End If%>
<%End if%></div>
+ <%End If%>
<%
UserPointsCost=0 '绉垎鎴愭湰
UserPoints=0 '鐢ㄦ埛绉垎
@@ -716,16 +753,26 @@
<%'鑱旂郴浜烘柟寮�
If CInt(session("adminID"))=CInt(EntourageLeadID) Or (DispatchOrdID="" And NEWOrder<>"") then%>
- <%If DispatchOrdID<>"" Then%><div class="os_shopname"></div><%End If%>
- <div class="os_shopname">鑱旂郴浜猴細<%=DispatchOrdCoName%><%If ServiceOrdCoTies<>"" Then%> 涓庢偅鑰呭叧绯伙細<%=ServiceOrdCoTies%><%End if%></div>
- <div class="os_shopname">鑱旂郴鐢佃瘽锛�<a href="tel://<%=DispatchOrdCoPhone%>"><%=DispatchOrdCoPhone%></a></div>
- <%End if%>
+ <%If DispatchOrdClass = "SA" And (Now() < ServiceOrdEstimatedOrderDate) Then %>
+ <div class="os_shopname">鑱旂郴浜猴細銆愰殣銆� 涓庢偅鑰呭叧绯伙細銆愰殣銆�</div>
+ <div class="os_shopname">鑱旂郴鐢佃瘽锛氥�愰殣銆�</div>
+ <% Else %>
+ <%If DispatchOrdID<>"" Then%><div class="os_shopname"></div><%End If%>
+ <div class="os_shopname">鑱旂郴浜猴細<%=DispatchOrdCoName%><%If ServiceOrdCoTies<>"" Then%> 涓庢偅鑰呭叧绯伙細<%=ServiceOrdCoTies%><%End If%></div>
+ <div class="os_shopname">鑱旂郴鐢佃瘽锛�<a href="tel://<%=DispatchOrdCoPhone%>"><%=DispatchOrdCoPhone%></a></div>
+ <% End If %>
+<% End If %>
<%'鐩稿叧鍙楃悊鍗曡鎯�
If ServiceOrdID<>"" then%>
+ <%If DispatchOrdClass = "SA" And (Now() < ServiceOrdEstimatedOrderDate) Then %>
+ <div class="os_shopname">鎮ｈ�呬俊鎭細銆愰殣銆�</div>
+ <div class="os_shopname">骞撮緞锛氥�愰殣銆� 鎬у埆锛氥�愰殣銆� 浣撻噸(KG)锛氥�愰殣銆� 鍥界睄锛氥�愰殣銆�</div>
+ <% Else %>
<%If ServiceOrdPtName<>"" Then%><div class="os_shopname">鎮ｈ�呭鍚嶏細<%=ServiceOrdPtName%></div><%End if%>
<%If ServiceOrdPtAge<>"" Or ServiceOrdPtSex<>"" Or ServiceOrdPtNat<>"" Or ServiceOrdPtKG<>"" Then%><div class="os_shopname"><%If ServiceOrdPtAge<>"" then%>骞撮緞锛�<%=ServiceOrdPtAge%> <%End if%><%If ServiceOrdPtSex<>"" then%>鎬у埆锛�<%=ServiceOrdPtSex%> <%End if%><%If ServiceOrdPtKG<>"" then%>浣撻噸(KG)锛�<%=ServiceOrdPtKG%> <%End if%><%If ServiceOrdPtNat<>"" then%>鍥界睄锛�<%=ServiceOrdPtNat%><%End if%></div><%End if%>
<%If DispatchOrdID<>"" Then%><div class="os_shopname"></div><%End If%>
+ <%End If%>
<%
sql="select icd_id,icd_name from ServiceOrder_ICD,ICD10 where icd_id=id and ServiceOrdIDDt="&ServiceOrdID&" order by idDt"
rs.open sql,objConn,1,1
--
Gitblit v1.9.1