From 1503b9d7ed1d71b98bd5715c23d236ef3c019ead Mon Sep 17 00:00:00 2001
From: hzj <1831054011@qq.com>
Date: 星期一, 13 十月 2025 15:40:20 +0800
Subject: [PATCH] Merge branch 'main' of http://8.134.184.104:10801/r/came
---
Report_MileageMan3_Data.php | 54 ++++++++++++++++++++++++++++--------------------------
1 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/Report_MileageMan3_Data.php b/Report_MileageMan3_Data.php
index 814fd31..3bd5e1d 100644
--- a/Report_MileageMan3_Data.php
+++ b/Report_MileageMan3_Data.php
@@ -110,7 +110,7 @@
,ServiceOrdAreaType,ServiceOrdType,DispatchOrd_NS_Time=convert(char,DispatchOrd_NS_Time,120),TimeLength_Program,TimeLength_ICU,TimeLength_Wait,EntourageOT_is,EntourageOT2_is,EntourageBetimesHH,EntourageState_Time,Entourage_Time=convert(char,Entourage_Time,120)
,EntourageOA_DepartmentName,EntourageOutHosp,EntourageInHosp,DispatchOrdPerfomance
,ConversionDistance,EntourageOT_Money,Stretcher_Money,EntourageMileageFactor,EntourageMileageEdit
- ,ServiceOrdPtOutHosp,ServiceOrdTraVia,ServiceOrdPtInHosp,ServiceOrdTraEnd
+ ,ServiceOrdPtOutHosp,ServiceOrdTraVia,ServiceOrdPtInHosp,ServiceOrdTraEnd,ServiceOrdStairClimberPrice
from DispatchOrd_Entourage,DispatchOrd,ServiceOrder
where ServiceOrdID=ServiceOrdIDDt and DispatchOrdID=DispatchOrdIDDt and DispatchOrdState in (8,9) and EntourageState<>4".$OAOccupationSQL." and DispatchOrd_NS_Time ".$SqlOrdDateType.$searchSql." order by EntourageOAid,DispatchOrd_NS_Time";
//echo $sql;exit;
@@ -118,7 +118,7 @@
if($data == true){
$FormArray=array();
//琛ㄥご
- $FormArray[0]=array("鍛樺伐濮撳悕","鎵�灞為儴闂�","鏃ユ湡","鍗曞彿","鎬绘垚浜や环","绛夊緟璐�","鎷呮灦璐�","灞呭ICU璐�","鍖哄煙","绫诲瀷","杞嚭鍖婚櫌","杞嚭鍦板潃","杞叆鍖婚櫌","杞叆鍦板潃","鐝","鍑鸿溅鏃堕棿","鏀惰溅鏃堕棿","鍔犵彮鏃堕暱","鍑鸿溅閲岀▼","鏀惰溅閲岀▼","瀹為檯鍏噷","棰勪及璺濈","娲诲姩淇濋殰","灞呭ICU","绛夊緟","灞呭ICU缁╂晥","鎷呮灦璐硅鎻�","璁㈠崟鎻愭垚");
+ $FormArray[0]=array("鍛樺伐濮撳悕","鎵�灞為儴闂�","鏃ユ湡","鍗曞彿","鎬绘垚浜や环","鐖ゼ鏈鸿垂","绛夊緟璐�","鎷呮灦璐�","灞呭ICU璐�","鍖哄煙","绫诲瀷","杞嚭鍖婚櫌","杞嚭鍦板潃","杞叆鍖婚櫌","杞叆鍦板潃","鐝","鍑鸿溅鏃堕棿","鏀惰溅鏃堕棿","鍔犵彮鏃堕暱","鍑鸿溅閲岀▼","鏀惰溅閲岀▼","瀹為檯鍏噷","棰勪及璺濈","娲诲姩淇濋殰","灞呭ICU","绛夊緟","灞呭ICU缁╂晥","鎷呮灦璐硅鎻�","璁㈠崟鎻愭垚");
$FormArrayX=count($FormArray[0]);
if (sqlsrv_rows_affected($data)==0) {
@@ -173,6 +173,7 @@
$EntourageOT_Money = $rs['EntourageOT_Money']; //鍔犵彮璐�/椤圭洰璐�
$EntourageMileageEdit = $rs['EntourageMileageEdit']; //淇敼鎻愭垚閲戦
$Entourage_Time = $rs['Entourage_Time'];
+ $ServiceOrdStairClimberPrice = $rs['ServiceOrdStairClimberPrice']; //鐖ゼ鏈轰环鏍�
//鍔犵彮鍑鸿溅缁╂晥1.1鍊�,瓒�12鐐瑰嚭杞�1.2鍊�
$EntourageDKPOTScale = 1;
If ($EntourageOT2_is==1 And date("H:i",strtotime($Entourage_Time))<"07:00") {
@@ -255,35 +256,36 @@
$FormArray[$i][2]=date("Y-m-d",strtotime($DispatchOrd_NS_Time));
$FormArray[$i][3]="<a href=DispatchOrder.gds?DispatchOrdID=".$DispatchOrdID."&OrdDateType=4&OrdClassList=&h_menu1_1=1 target=_blank>".$DispatchOrdNo."</a>";
$FormArray[$i][4]=floatval(number_format(($ServiceOrdTraTxnPrice+$AddMoney2+$AddMoney3),2,".",""));
- $FormArray[$i][5]=floatval(number_format($AddMoney1,2,".",""));
- $FormArray[$i][6]=floatval(number_format($AddMoney2,2,".",""));
- $FormArray[$i][7]=floatval(number_format($AddMoney3,2,".",""));
- $FormArray[$i][8]=$ArrayOrdAreaType[$ServiceOrdAreaType];
- $FormArray[$i][9]=$ArrayOrdType[$ServiceOrdType];
- $FormArray[$i][10]=$EntourageOutHosp;
- $FormArray[$i][11]=$ServiceOrdTraVia;
- $FormArray[$i][12]=$EntourageInHosp;
- $FormArray[$i][13]=$ServiceOrdTraEnd;
- $FormArray[$i][14]=date("H:i",strtotime($DispatchOrd_NS_Time))>"08:30" && date("H:i",strtotime($DispatchOrd_NS_Time))<"17:30" ? "鐧界彮" : "澶滅彮";
- $FormArray[$i][15]=$DispatchOrdActualDate;
- $FormArray[$i][16]=$DispatchOrdReturnDate;
+ $FormArray[$i][5]=floatval(number_format($ServiceOrdStairClimberPrice,2,".",""));
+ $FormArray[$i][6]=floatval(number_format($AddMoney1,2,".",""));
+ $FormArray[$i][7]=floatval(number_format($AddMoney2,2,".",""));
+ $FormArray[$i][8]=floatval(number_format($AddMoney3,2,".",""));
+ $FormArray[$i][9]=$ArrayOrdAreaType[$ServiceOrdAreaType];
+ $FormArray[$i][10]=$ArrayOrdType[$ServiceOrdType];
+ $FormArray[$i][11]=$EntourageOutHosp;
+ $FormArray[$i][12]=$ServiceOrdTraVia;
+ $FormArray[$i][13]=$EntourageInHosp;
+ $FormArray[$i][14]=$ServiceOrdTraEnd;
+ $FormArray[$i][15]=date("H:i",strtotime($DispatchOrd_NS_Time))>"08:30" && date("H:i",strtotime($DispatchOrd_NS_Time))<"17:30" ? "鐧界彮" : "澶滅彮";
+ $FormArray[$i][16]=$DispatchOrdActualDate;
+ $FormArray[$i][17]=$DispatchOrdReturnDate;
//$FormArray[$i][14]=floatval(number_format($OTTime/60/60,1,".","")); //鍔犻暱鏃堕暱-灏忔椂
if (isDepartment("070122")==1) {
- $FormArray[$i][17]=time2second($OTTime); //鍔犻暱鏃堕暱-X澶灏忔椂X鍒嗛挓
+ $FormArray[$i][18]=time2second($OTTime); //鍔犻暱鏃堕暱-X澶灏忔椂X鍒嗛挓
}else{
- $FormArray[$i][17]="--";
+ $FormArray[$i][18]="--";
}
- $FormArray[$i][18]=floatval(number_format($DispatchOrdTraStreetMileage,2,".",""));
- $FormArray[$i][19]=floatval(number_format($DispatchOrdTraEndMileage,2,".",""));
- $FormArray[$i][20]=floatval(number_format($DispatchOrdMileage,2,".",""));
- $FormArray[$i][21]=floatval(number_format($OrdDistance,2,".",""));
+ $FormArray[$i][19]=floatval(number_format($DispatchOrdTraStreetMileage,2,".",""));
+ $FormArray[$i][20]=floatval(number_format($DispatchOrdTraEndMileage,2,".",""));
+ $FormArray[$i][21]=floatval(number_format($DispatchOrdMileage,2,".",""));
+ $FormArray[$i][22]=floatval(number_format($OrdDistance,2,".",""));
- $FormArray[$i][22]=floatval(number_format($TimeLength_Program,2,".",""));
- $FormArray[$i][23]=floatval(number_format($TimeLength_ICU,2,".",""));
- $FormArray[$i][24]=floatval(number_format($TimeLength_Wait,2,".",""));
- $FormArray[$i][25]=floatval(number_format($TimeLength_ICU_Money,2,".",""));
- $FormArray[$i][26]=floatval(number_format($Stretcher_Money,2,".",""));
- $FormArray[$i][27]=floatval(number_format($EntourageDKP_Money,2,".",""));
+ $FormArray[$i][23]=floatval(number_format($TimeLength_Program,2,".",""));
+ $FormArray[$i][24]=floatval(number_format($TimeLength_ICU,2,".",""));
+ $FormArray[$i][25]=floatval(number_format($TimeLength_Wait,2,".",""));
+ $FormArray[$i][26]=floatval(number_format($TimeLength_ICU_Money,2,".",""));
+ $FormArray[$i][27]=floatval(number_format($Stretcher_Money,2,".",""));
+ $FormArray[$i][28]=floatval(number_format($EntourageDKP_Money,2,".",""));
$i++;
--
Gitblit v1.9.1