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
---
Report_DispatchDetailed_Data.php | 76 +++++++++++++++++++------------------
1 files changed, 39 insertions(+), 37 deletions(-)
diff --git a/Report_DispatchDetailed_Data.php b/Report_DispatchDetailed_Data.php
index 3d2c514..45e0867 100644
--- a/Report_DispatchDetailed_Data.php
+++ b/Report_DispatchDetailed_Data.php
@@ -266,7 +266,7 @@
,ServiceOrdTraDistance,DispatchOrdCarID,DispatchOrd_NS_Time,DispatchOrdActualDate,DispatchOrd_OAName,DispatchOrd_OAEntourage,FromHQ_is,FromHQ2_is,ServiceOrdPtName,ServiceOrdPtServices,ServiceOrdTraVia,ServiceOrdTraEnd
,HopsProvince=hospA.HopsProvince,HopsCity=hospA.HopsCity,HopsArea=hospA.HopsArea,HospName=hospA.HospName
,HopsProvinceIn=hospB.HopsProvince,HopsCityIn=hospB.HopsCity,HopsAreaIn=hospB.HopsArea,HospNameIn=hospB.HospName,ServiceOrdTaskRemarks
- ,ServiceOrd_work_ID,ServiceOrd_work_IDs,ServiceOrd_work_is,CommissionScenarioID
+ ,ServiceOrd_work_ID,ServiceOrd_work_IDs,ServiceOrd_work_is,CommissionScenarioID,ServiceOrdStairClimberPrice
,row_number() over (order by ServiceOrd_CC_Time desc) n $sqlWhere";
//闄勫姞缁撴灉SQL
//$Additional_sql = ",ServiceOrderStateTXT=(select vtext from dictionary where vtitle='ServiceOrderState' and vID=ServiceOrdState),ServiceOrd_SaleName=(select OA_Name from OA_User where OA_User_ID=ServiceOrd_Sale_ID),ServiceOrd_CCName=(select OA_Name from OA_User where OA_User_ID=ServiceOrd_CC_ID),DispatchOrd_NSName=(select OA_Name from OA_User where OA_User_ID=DispatchOrd_NS_ID),ServiceOrdSource=(select vtext from dictionary where vtitle='OrdSource' and vID=ServiceOrdSource) ,HospNameA=(select HospName from HospData where HospID=ServiceOrdPtOutHospID),HospNameB=(select HospName from HospData where HospID=ServiceOrdPtInHospID),PaidType=(SELECT STUFF(( select ',' + vtext from PaidMoney,dictionary where vtitle='PaidMoneyType' and vType>=1 and vID=PaidMoneyType and PaidMoney<>0 and ServiceOrdIDDt=ServiceOrdID GROUP BY vtext FOR XML PATH('')), 1, 1, '') AS PaidType),HospDepartmentName=isnull((select top 1 vtext from dictionary where vtitle='HospitalDepartment' and ServiceOrdPtServicesID=vID),''),HospDepartmentInName=isnull((select top 1 vtext from dictionary where vtitle='HospitalDepartment' and ServiceOrdPtInServicesID=vID),''),isRespirator=AMV_is,EntourageName='--',MessageCountInt=FromHQ_is,Stime2='--'";
@@ -304,7 +304,7 @@
,ServiceOrdTraDistance,DispatchOrdCarID,DispatchOrd_NS_Time,DispatchOrdActualDate,DispatchOrd_OAName,DispatchOrd_OAEntourage,FromHQ_is,FromHQ2_is,ServiceOrdPtName,ServiceOrdPtServices,ServiceOrdTraVia,ServiceOrdTraEnd
,HopsProvince=hospA.HopsProvince,HopsCity=hospA.HopsCity,HopsArea=hospA.HopsArea,HospName=hospA.HospName
,HopsProvinceIn=hospB.HopsProvince,HopsCityIn=hospB.HopsCity,HopsAreaIn=hospB.HopsArea,HospNameIn=hospB.HospName,ServiceOrdTaskRemarks
- ,ServiceOrd_work_ID,ServiceOrd_work_IDs,ServiceOrd_work_is,CommissionScenarioID
+ ,ServiceOrd_work_ID,ServiceOrd_work_IDs,ServiceOrd_work_is,CommissionScenarioID,ServiceOrdStairClimberPrice
,row_number() over (order by DispatchOrd_NS_Time desc) n $sqlWhere";
//闄勫姞缁撴灉SQL
$Additional_sql = ",DispatchOrdStateTXT=(select vtext from dictionary where vtitle='DispatchOrdState' and vID=DispatchOrdState)
@@ -386,7 +386,7 @@
$data = sqlsrv_query($conn,$sql);
if($data == true){
//琛ㄥご
- $FormArray[0]=array("搴忓彿","鏈嶅姟鍗曞彿","璋冨害鍗曞彿","绾у埆","鍒嗗尯","棰勭害绫诲瀷","璋冨害鍗曠姸鎬�","鏃ユ湡","鏃堕棿","鐝","鑱旂郴浜�","鑱旂郴鐢佃瘽","鎮ｈ�呭鍚�","閿�鍞�","浠嬬粛浜�","瀹㈡湇","璋冨害","鏉ユ簮","鏄惁浼佸井鎴愪氦","涓昏浼佸井瀹㈡湇","鍏朵粬浼佸井瀹㈡湇","鎯呮櫙缂栧彿","浼佸井缁╂晥","鎬婚儴涓嬪彂","鏀彺鎬婚儴","鎵垮寘缁�","鍖哄煙","绫诲瀷","鍑哄彂鐪佷唤","鍑哄彂甯�","鍑哄彂鍖�","杞嚭鍖婚櫌","杞嚭绉戝","杞嚭搴婁綅","杞叆鐪佷唤","杞叆甯�","杞叆鍖�","杞叆鍖婚櫌","杞叆绉戝","鎬绘垚浜や环","绯荤粺鎶ヤ环鍙傝��","绛夊緟璐�","鎷呮灦璐�","灞呭ICU璐�","璺濈(鍏噷)","鏀粯鏂瑰紡","浣跨敤鍛煎惛鏈�","杞︾墝","鍑鸿溅鎴愬憳","鍑鸿溅宀椾綅","鍖绘姢鍑鸿溅鏃堕棿(鍒嗛挓)","寮�鍗曚汉","寮�鍗曚汉鎻愭垚姣斾緥","璺熷崟浜�","璺熷崟浜烘彁鎴愭瘮渚�","璺熷崟浜�","璺熷崟浜烘彁鎴愭瘮渚�","璺熷崟浜�","璺熷崟浜烘彁鎴愭瘮渚�","璺熷崟浜�","璺熷崟浜烘彁鎴愭瘮渚�");
+ $FormArray[0]=array("搴忓彿","鏈嶅姟鍗曞彿","璋冨害鍗曞彿","绾у埆","鍒嗗尯","棰勭害绫诲瀷","璋冨害鍗曠姸鎬�","鏃ユ湡","鏃堕棿","鐝","鑱旂郴浜�","鑱旂郴鐢佃瘽","鎮ｈ�呭鍚�","閿�鍞�","浠嬬粛浜�","瀹㈡湇","璋冨害","鏉ユ簮","鏄惁浼佸井鎴愪氦","涓昏浼佸井瀹㈡湇","鍏朵粬浼佸井瀹㈡湇","鎯呮櫙缂栧彿","浼佸井缁╂晥","鎬婚儴涓嬪彂","鏀彺鎬婚儴","鎵垮寘缁�","鍖哄煙","绫诲瀷","鍑哄彂鐪佷唤","鍑哄彂甯�","鍑哄彂鍖�","杞嚭鍖婚櫌","杞嚭绉戝","杞嚭搴婁綅","杞叆鐪佷唤","杞叆甯�","杞叆鍖�","杞叆鍖婚櫌","杞叆绉戝","鎬绘垚浜や环","鐖ゼ鏈鸿垂","绯荤粺鎶ヤ环鍙傝��","绛夊緟璐�","鎷呮灦璐�","灞呭ICU璐�","璺濈(鍏噷)","鏀粯鏂瑰紡","浣跨敤鍛煎惛鏈�","杞︾墝","鍑鸿溅鎴愬憳","鍑鸿溅宀椾綅","鍖绘姢鍑鸿溅鏃堕棿(鍒嗛挓)","寮�鍗曚汉","寮�鍗曚汉鎻愭垚姣斾緥","璺熷崟浜�","璺熷崟浜烘彁鎴愭瘮渚�","璺熷崟浜�","璺熷崟浜烘彁鎴愭瘮渚�","璺熷崟浜�","璺熷崟浜烘彁鎴愭瘮渚�","璺熷崟浜�","璺熷崟浜烘彁鎴愭瘮渚�");
if ($is_CSV==1){array_push($FormArray[0],"浠诲姟澶囨敞");}
$FormArrayX=count($FormArray[0]);
if (sqlsrv_rows_affected($data)==0) {
@@ -515,58 +515,60 @@
$FormArray[$i][37]=$HospNameIn;
$FormArray[$i][38]=$rs['HospDepartmentInName'];
$FormArray[$i][39]=round($rs['OrdTraPrice'],2);
+ $ServiceOrdStairClimberPrice=$rs['ServiceOrdStairClimberPrice'];
+ $FormArray[$i][40]=floatval(number_format($ServiceOrdStairClimberPrice,2,".",""));
if (!empty($rs['OrderPrice_Auto'])) {$OrderPrice_Auto=round($rs['OrderPrice_Auto'],2);}else{$OrderPrice_Auto='--';}
- $FormArray[$i][40]=$OrderPrice_Auto;
- $FormArray[$i][41]=round($rs['AddMoney1'],2);
- $FormArray[$i][42]=round($rs['AddMoney2'],2);
- $FormArray[$i][43]=round($rs['AddMoney3'],2);
- $FormArray[$i][44]=str_replace("鍏噷","",$rs['ServiceOrdTraDistance']);
- $FormArray[$i][45]=$rs['PaidType'];
- $FormArray[$i][46]=$isRespirator;
- $FormArray[$i][47]=CarDataA($rs['DispatchOrdCarID'],'','CarLicense');
- $FormArray[$i][48]=$rs['EntourageName'];
- $FormArray[$i][49]=$rs['EntouragePost'];
- $FormArray[$i][50]=$rs['Stime2'];
+ $FormArray[$i][41]=$OrderPrice_Auto;
+ $FormArray[$i][42]=round($rs['AddMoney1'],2);
+ $FormArray[$i][43]=round($rs['AddMoney2'],2);
+ $FormArray[$i][44]=round($rs['AddMoney3'],2);
+ $FormArray[$i][45]=str_replace("鍏噷","",$rs['ServiceOrdTraDistance']);
+ $FormArray[$i][46]=$rs['PaidType'];
+ $FormArray[$i][47]=$isRespirator;
+ $FormArray[$i][48]=CarDataA($rs['DispatchOrdCarID'],'','CarLicense');
+ $FormArray[$i][49]=$rs['EntourageName'];
+ $FormArray[$i][50]=$rs['EntouragePost'];
+ $FormArray[$i][51]=$rs['Stime2'];
$rs2=getDispatchOrderStaff($ServiceOrdID, $conn);
//濡傛灉 $rs2 涓虹┖锛岃缃粯璁ゅ��
if (empty($rs2)) {
- $FormArray[$i][51]='--';
- $FormArray[$i][52]='';
+ $FormArray[$i][52]='--';
+ $FormArray[$i][53]='';
}else{
- $FormArray[$i][51]=isset($rs2['Opener'])?$rs2['Opener']:'--';
- $FormArray[$i][52]=isset($rs2['OpenerCommissionRatio'])?$rs2['OpenerCommissionRatio']:'';
+ $FormArray[$i][52]=isset($rs2['Opener'])?$rs2['Opener']:'--';
+ $FormArray[$i][53]=isset($rs2['OpenerCommissionRatio'])?$rs2['OpenerCommissionRatio']:'';
}
if (!empty($rs2['entourage'])) {
//$rs2['entourage']鐨勯暱搴�
- $FormArray[$i][53]='--';
- $FormArray[$i][54]='';
- $FormArray[$i][55]='--';
- $FormArray[$i][56]='';
- $FormArray[$i][57]='--';
- $FormArray[$i][58]='';
- $FormArray[$i][59]='--';
- $FormArray[$i][60]='';
+ $FormArray[$i][54]='--';
+ $FormArray[$i][55]='';
+ $FormArray[$i][56]='--';
+ $FormArray[$i][57]='';
+ $FormArray[$i][58]='--';
+ $FormArray[$i][59]='';
+ $FormArray[$i][60]='--';
+ $FormArray[$i][61]='';
$j=0;
foreach ($rs2['entourage'] as $key => $value) {
- $FormArray[$i][53+$j*2]=$value['Follower'];
- $FormArray[$i][54+$j*2]=$value['FollowerRatio'];
+ $FormArray[$i][54+$j*2]=$value['Follower'];
+ $FormArray[$i][55+$j*2]=$value['FollowerRatio'];
$j++;
}
}else{
- $FormArray[$i][53]='--';
- $FormArray[$i][54]='';
- $FormArray[$i][55]='--';
- $FormArray[$i][56]='';
- $FormArray[$i][57]='--';
- $FormArray[$i][58]='';
- $FormArray[$i][59]='--';
- $FormArray[$i][60]='';
+ $FormArray[$i][54]='--';
+ $FormArray[$i][55]='';
+ $FormArray[$i][56]='--';
+ $FormArray[$i][57]='';
+ $FormArray[$i][58]='--';
+ $FormArray[$i][59]='';
+ $FormArray[$i][60]='--';
+ $FormArray[$i][61]='';
}
- if ($is_CSV==1){$FormArray[$i][61]=$rs['ServiceOrdTaskRemarks'];}
+ if ($is_CSV==1){$FormArray[$i][62]=$rs['ServiceOrdTaskRemarks'];}
$i++;
//鍐欏叆鏁扮粍--End
--
Gitblit v1.9.1