From 678e0c321125e7b43f28875a661481f9bd358b06 Mon Sep 17 00:00:00 2001
From: hzj <1831054011@qq.com>
Date: 星期三, 09 七月 2025 16:35:30 +0800
Subject: [PATCH] feat(派单系统): 添加针对转运组的敏感信息隐藏功能
---
Report_DispatchDetailed.php | 195 ---------------------------------------
m_DispatchOrder.gds | 74 ++++++++++++--
camepay | 1
3 files changed, 64 insertions(+), 206 deletions(-)
diff --git a/Report_DispatchDetailed.php b/Report_DispatchDetailed.php
index 3ae9a84..d5736e6 100644
--- a/Report_DispatchDetailed.php
+++ b/Report_DispatchDetailed.php
@@ -347,201 +347,6 @@
</div>
</li>
- <li>
- <div class="search">
- <div id="Date_container" class="select-container" style="overflow: hidden;cursor:pointer" onclick="JS_OrdDateType()">
- <span class="select-content" style="width: 46px;" id="OrdDateType_span">鏈熼棿锛�<?php echo $OrdDateTypeName?></span><span class="arrow" id="Date_arrow"></span>
- </div>
- <div id="Date_list" class="select-list scroll-pane" style="overflow: hidden; position: absolute; background-color: white; width: 65px; display: none;background-position: initial initial; background-repeat: initial initial;margin-left: 35px;">
- <div class="jspContainer" style="width: 63px;">
- <div style="padding: 0px; top: 0px; width: 63px;">
- <?php for($i=0;$i<count($OrdDateTypes);$i++) {?>
- <span title="<?php echo $OrdDateTypes[$i][1]?>" onmouseover="JS_OrdDateTypeMouseover('OrdDateType_<?php echo $OrdDateTypes[$i][0]?>')" onclick="JS_OrdDateTypeJump2('<?php echo $OrdDateTypes[$i][0]?>','鏈熼棿锛�<?php echo $OrdDateTypes[$i][1]?>')" id="OrdDateType_<?php echo $OrdDateTypes[$i][0]?>" class="list-option<?php if ($OrdDateTypes[$i][0]==$OrdDateType){echo " option";}?>"><?php echo $OrdDateTypes[$i][1]?></span>
- <?php }?>
- <span title="鑷畾涔�" onmouseover="JS_OrdDateTypeMouseover('OrdDateType_0')" onclick="JS_OrdDateTypeCreateOpen()" id="OrdDateType_0" name="OrdDateType" class="list-option">鑷畾涔�</span>
- </div>
- </div>
- </div>
- </div>
- </li>
- <div class="search">
- <form action="?" method="post">
- <div class="input">
- <input name="orderby" id="Menu_orderby" type="hidden" value="<?php echo $orderby?>">
- <input name="OrdClassType" id="Menu_OrdClassType" type="hidden" value="<?php echo $OrdClassType?>">
- <input name="OrdType" id="Menu_OrdType" type="hidden" value="<?php echo $OrdType?>">
- <input name="OrderLevel" id="Menu_OrderLevel" type="hidden" value="<?php echo $OrderLevel?>">
- <input name="UnitNameID" id="Menu_UnitNameID" type="hidden" value="<?php echo $UnitNameID?>">
- <input name="CoopUnitID" id="Menu_CoopUnitID" type="hidden" value="<?php echo $CoopUnitID?>">
-
- <input name="OrdDateType" id="Menu_OrdDateType" type="hidden" value="<?php echo $OrdDateType?>">
- <input name="OrdDateStart" id="Menu_OrdDateStart" type="hidden" value="<?php echo $OrdDateStart?>">
- <input name="OrdDateEnd" id="Menu_OrdDateEnd" type="hidden" value="<?php echo $OrdDateEnd?>">
- <input type="text" id="searchTXT" name="searchTXT" value="<?php echo $searchTXT?>" />
- </div>
- <div class="button">
- <input type="submit" name="submit" value="鎼滅储" />
- </div>
- </form>
- </div>
- </ul>
- </div>
- <div class="dialogJ dialogJfix dialogJshadow" id="OrdDateTypeCreate" style="width: 440px;right: 80px; top: 150px;height:80px ;display:none;">
- <div class="dialogJtitle">
- <a href="javascript:JS_OrdDateTypeCreateClose();" class="dialogJclose" title="鍏抽棴鏈獥鍙�"> </a>
- <span class="dialogJtxt" id="EditPhotoTXT">璇烽�夋嫨鏃堕棿娈�</span>
- </div>
- <div class="dialogJcontent" style="margin-left: 5px;margin-right:5px;">
- <div class="input" style="float:left;margin-top: 10px;margin-left: 5px;" id="two-inputs">
- 鏈熼棿锛�
- <input type="text" id="OrdDateStart" name="OrdDateStart" class="date" style="width:138px;" value="<?php echo $OrdDateStart?>">
- 鑷�
- <input type="text" id="OrdDateEnd" name="OrdDateEnd" class="date" style="width:138px;" value="<?php echo $OrdDateEnd?>">
-
- </div>
- <div class="input" style="float:left;margin-top: 5px;margin-left: 5px;"><input type="button" class="dialogJbtn first-child" onclick="JS_OrdDateJump2()" value="鏌ヨ"></div>
- </div>
- </div>
- <!--鏃堕棿閫夋嫨js liang------------->
- <link rel="stylesheet" href="css/daterangepicker.css">
- <script src="js/jquery-1.12.3.min.js"></script>
- <script src="js/moment.min.js"></script>
- <script src="js/jquery.daterangepicker.js"></script>
- <script>
- $(function()
- {
- $('#two-inputs').dateRangePicker(
- {
- separator : ' to ',
- getValue: function()
- {
- if ($('#OrdDateStart').val() && $('#OrdDateEnd').val() )
- return $('#OrdDateStart').val() + ' to ' + $('#OrdDateEnd').val();
- else
- return '';
- },
- setValue: function(s,s1,s2)
- {
- $('#OrdDateStart').val(s1);
- $('#OrdDateEnd').val(s2);
- }
-
- });
- });
- </script>
- <!--鏃堕棿閫夋嫨js liang------------->
- <script type="text/javascript">
- //鏃堕棿琛ㄥ垪鏄剧ず涓嬫媺鑿滃崟
- function JS_OrdDateType(){
- if (Date_container.className!="select-container select-container-show-list"){
- Date_container.className="select-container select-container-show-list";
- Date_arrow.className="arrow arrow-up";
- Date_list.style.display="block";
- //OrdClass_container.className="select-container";
- //OrdClass_arrow.className="arrow";
- //OrdClass_list.style.display="none";
- //OrdDateTypeCreate.style.display="none";
- }
- else {
- Date_container.className="select-container";
- Date_arrow.className="arrow";
- Date_list.style.display="none";
- }
- }
- //鏃堕棿琛ㄥ垪鎸囬拡绉诲姩鍒颁笅鎷夎彍鍗�
- function JS_OrdDateTypeMouseover(id){
- var d=document.getElementById(id);
- <?php for($i=0;$i<count($OrdDateTypes);$i++) {?>
- document.getElementById("OrdDateType_<?php echo $OrdDateTypes[$i][0]?>").className="list-option";
- <?php }?>
- document.getElementById("OrdDateType_0").className="list-option";
- d.className="list-option option";
- }
- //鑷畾涔夋椂闂�-鎵撳紑绐楀彛
- function JS_OrdDateTypeCreateOpen()
- {
- JS_OrdDateType();
- OrdDateTypeCreate.style.display="block";
- }
- //鑷畾涔夋椂闂�-鍏抽棴绐楀彛
- function JS_OrdDateTypeCreateClose()
- {
- JS_OrdDateType();
- OrdDateTypeCreate.style.display="none";
- }
- //鑷畾涔夋椂闂�-纭畾鏃堕棿
- function JS_OrdDateTypeCreateSave()
- {
- document.getElementById('ServiceOrdTraStreet').value=document.getElementById('Duration').value;
- document.getElementById('ServiceOrdTraEnd').value=document.getElementById('ServiceOrdTraEnd').value;
- document.getElementById('ServiceOrdTraStreetCoo').value=results.sw.point.lng + ','+ results.sw.point.lat; //璧风偣鍧愭爣
- document.getElementById('ServiceOrdTraEndCoo').value=results.Lu.point.lng + ','+ results.Lu.point.lat; //璧风偣鍧愭爣
- }
- //鏃堕棿绫昏〃鍒楄浆璺�
- function JS_OrdDateJump(id){
- var OrdDateStart=document.getElementById("OrdDateStart").value;
- var OrdDateEnd=document.getElementById("OrdDateEnd").value;
- //var searchTXT=document.getElementById("searchTXT").value;
- window.location.href='?<?php echo $page_URL_noDate?>&OrdDateType=0&OrdDateStart='+OrdDateStart+'&OrdDateEnd='+OrdDateEnd;
- }
- //鑷畾涔夋椂闂磋浆璺�
- function JS_OrdDateTypeJump(id){
- //var searchTXT=document.getElementById("searchTXT").value;
- window.location.href='?<?php echo $page_URL_noDate?>&OrdDateType='+id;
- }
-
- //鏃堕棿琛ㄥ垪杞烦
- function JS_OrdClassTypeJump(id){
- //var searchTXT=document.getElementById("searchTXT").value;
- window.location.href='?<?php echo $page_URL_noDate?>&OrdClassList='+id;
- }
-
- </script>
- <!-- end box / title -->
- <?php //鏁版嵁璇诲彇
- $is_CSV=0; ?>
- <?php require 'Report_DispatchDetailed_Data.php';?>
-
- <?php require '/inc/SystemMessages.php';?>
- <div class="table" style="overflow:auto">
- <table>
- <?php if ($SystemMessageType!="2"){ ?>
- <thead>
- <tr style="white-space: nowrap;">
- <?php
- for($x=0;$x<$FormArrayX;$x++) {
- if ($x==$FormArrayX-1){
- $classHtml=" class=\"last\"";
- }
- elseif ($x==0){
- $classHtml=" class=\"selected\"";
- }else{
- $classHtml="";
- }
- echo "<th$classHtml>".$FormArray[0][$x]."</th>";
- }
- ?>
- </tr>
- </thead>
- <tbody>
- <?php
- for($y=1;$y<count($FormArray);$y++) {
- echo "<tr style=\"white-space: nowrap;\">";
- for($x=0;$x<count($FormArray[$y]);$x++) {
- if ($x==count($FormArray[$y])-1){
- $classHtml=" class=\"category category2 last\"";
- }
- elseif ($x==0){
- $classHtml=" class=\"selected\"";
- }else{
- $classHtml=" class=\"category category2\"";
- }
- echo "<td$classHtml>".$FormArray[$y][$x]."</td>";
- }
- }
- ?>
- <?php }?>
- <?php
$classHtml="";
for($j=$y;$j<=20;$j++) {
echo "<tr>";
diff --git a/camepay b/camepay
new file mode 160000
index 0000000..9b8a715
--- /dev/null
+++ b/camepay
@@ -0,0 +1 @@
+Subproject commit 9b8a7157bb9c401de973a4107f74ff3e723ec156
diff --git a/m_DispatchOrder.gds b/m_DispatchOrder.gds
index ae9927b..a003ad4 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,7 +552,18 @@
<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)) Then %>
+ <%If DispatchOrdClass = "SA" And (Now() < ServiceOrdEstimatedOrderDate) Then %>
+ <div class="os_shopname" style="color: #F13F11;">
+ 杞嚭搴婁綅锛氥�愰殣銆�
+ </div>
+ <%ElseIf CInt(session("adminID"))=CInt(EntourageLeadID) Then %>
+ <div class="os_shopname" style="color: #F13F11;">
+ 杞嚭搴婁綅锛�<%=HospitalDepartment(ServiceOrdPtServicesID)%> <%=ServiceOrdPtServices%>
+ </div>
+
+ <%End If%>
+<%End If%>
<div class="os_shopname"></div>
<%End if%>
@@ -582,7 +601,18 @@
<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)) Then %>
+ <%If DispatchOrdClass = "SA" And (Now() < ServiceOrdEstimatedOrderDate) Then %>
+ <div class="os_shopname" style="color: #009900;">
+ 杞叆搴婁綅锛氥�愰殣銆�
+ </div>
+ <%ElseIf CInt(session("adminID"))=CInt(EntourageLeadID) Then %>
+ <div class="os_shopname" style="color: #009900;">
+ 杞叆搴婁綅锛�<%=HospitalDepartment(ServiceOrdPtInServicesID)%> <%=ServiceOrdPtInServices%>
+ </div>
+
+ <%End If%>
+<%End If%>
<div class="os_shopname"></div>
<%Else%>
<div class="os_shopname" style="color: #009900;">鐩殑鍦帮細<a onclick="lbs_distance('<%=DispatchOrdTraEnd%>','<%=DispatchOrdTraEnd%>')" style="color: #009900;"><%=DispatchOrdTraEnd%></a></div>
@@ -678,7 +708,6 @@
<%End If%>
<%End if%>
<%If ServiceOrdTraDistance<>"" And ServiceOrdTraDistance<>"0" And ServiceOrdTraDistance<>"0鍏噷" then%><div class="os_shopname">棰勪及璺濈锛�<%=ServiceOrdTraDistance%></div><%End if%>
-
<%If OrderLevel<>1 Or isDepartment("020111")=1 Or PowerOrderLevel=1 Or (DispatchOrdID="" And NEWOrder<>"") Then%>
<%
'鏁忔劅淇℃伅澶勭悊
@@ -714,17 +743,32 @@
<div class="os_shopname">浠嬬粛浜猴細<%=UnitIntroducer(ServiceOrdIntroducer,"UnitName")%></div>
<%End If%>
+
<%'鑱旂郴浜烘柟寮�
- 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>
+<% ElseIf (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 ServiceOrdID<>"" then%>
- <%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 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%>
+<%End If%>
<%If DispatchOrdID<>"" Then%><div class="os_shopname"></div><%End If%>
<%
sql="select icd_id,icd_name from ServiceOrder_ICD,ICD10 where icd_id=id and ServiceOrdIDDt="&ServiceOrdID&" order by idDt"
@@ -739,7 +783,15 @@
loop
rs.close()
%>
- <%If ServiceOrdPtDiagnosis<>"" Or OrdICD_name<>"" Then%><div class="os_shopname">璇婃柇锛�<%=OrdICD_name%><%=ServiceOrdPtDiagnosis%></div><%End if%>
+ <%If ServiceOrdPtDiagnosis<>"" Or OrdICD_name<>"" Then%>
+ <div class="os_shopname">
+ <%If DispatchOrdState >=4 Then%>
+ 璇婃柇锛�<%=OrdICD_name%><%=ServiceOrdPtDiagnosis%>
+ <%Else%>
+ 璇婃柇锛氶殣
+ <%End If%>
+ </div>
+<%End if%>
<div class="os_shopname" style="float: left;">
<%
sql="select ConditionID,vOrder2,vtext from ServiceOrd_Condition,dictionary where vtitle='Condition' and ConditionID=vID and ServiceOrdCoID="&ServiceOrdID&" order by vOrder,vID"
--
Gitblit v1.9.1