From f5c900c58513bad824381e69750ac7667ef35de0 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期四, 26 二月 2026 22:29:46 +0800
Subject: [PATCH] feat: 修改增另任务单查询，使用单号查询
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskSyncUtilService.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskSyncUtilService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskSyncUtilService.java
index 5bc0c13..379c0e1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskSyncUtilService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskSyncUtilService.java
@@ -4,6 +4,7 @@
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.http.HttpHelper;
import com.ruoyi.system.domain.SysTask;
import com.ruoyi.system.domain.SysTaskEmergency;
import com.ruoyi.system.service.ISysDeptService;
@@ -19,6 +20,7 @@
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.io.OutputStream;
+import java.math.BigDecimal;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLEncoder;
@@ -91,6 +93,9 @@
return adminID;
}
+ private String getCoo(BigDecimal lng, BigDecimal lat){
+ return lng+","+lat;
+ }
/**
* 鏋勫缓鍚屾鍙傛暟
*/
@@ -160,7 +165,7 @@
params.put("ServiceOrdCoName", StringUtils.nvl(emergency.getPatientContact(), ""));
params.put("ServiceOrdCoPhone", StringUtils.nvl(emergency.getPatientPhone(), ""));
params.put("ServiceOrdCoTies", ""); // 鑱旂郴浜轰笌鎮ｈ�呭叧绯�
-
+//ServiceOrdTraVia
// 鎮ｈ�呬俊鎭�
params.put("ServiceOrdPtName", StringUtils.nvl(emergency.getPatientName(), ""));
params.put("ServiceOrdPtAge", ""); // 骞撮緞
@@ -196,14 +201,14 @@
params.put("ServiceOrdTraStreetCoo", ""); // 鍑哄彂鍦板潗鏍�
params.put("ServiceOrdTraEnd", StringUtils.nvl(task.getDestinationAddress(), StringUtils.nvl(emergency.getHospitalInAddress(), "")));
params.put("ServiceOrdTraEndCoo", ""); // 鐩殑鍦板潗鏍�
- params.put("ServiceOrdTraVia", ""); // 閫旂粡鍦�
+ params.put("ServiceOrdTraVia", emergency.getHospitalOutAddress()!=null ? emergency.getHospitalOutAddress() : ""); // 閫旂粡鍦�
// 璺濈鍜屼环鏍间俊鎭�
params.put("ServiceOrdViaDistance", "0"); // 涓�旇窛绂�
params.put("ServiceOrdTraDistance", emergency.getTransferDistance() != null ? emergency.getTransferDistance().toString() : "0");
params.put("ServiceOrdTraDuration", ""); // 棰勮琛岀▼鏃堕棿
params.put("ServiceOrdTraUnitPrice", "0"); // 鍗曚环/鍏噷
- params.put("ServiceOrdTraOfferPrice", emergency.getTransferPrice() != null ? emergency.getTransferPrice().toString() : "0");
+// params.put("ServiceOrdTraOfferPrice", emergency.getTransferPrice() != null ? emergency.getTransferPrice().toString() : "0");
params.put("ServiceOrdTraTxnPrice", emergency.getTransferPrice() != null ? emergency.getTransferPrice().toString() : "0");
params.put("ServiceOrdTraPrePayment", "0"); // 闇�棰勪粯娆�
params.put("SettlementPrice", "0"); // 缁撶畻浠�
@@ -224,7 +229,7 @@
params.put("CommissionScenarioID", "0"); // 浼佸井缁╂晥鏂规
params.put("ServiceOrdOperationRemarks", "鏂扮郴缁熷悓姝ュ垱寤�"); // 鎿嶄綔澶囨敞
params.put("ServiceOrdEstimatedOrderDate", ""); // 棰勮娲惧崟鏃堕棿
- params.put("ServiceOrdSource", "10"); // 璁㈠崟鏉ユ簮锛�10=鏂扮郴缁燂級
+ params.put("ServiceOrdSource", "0"); // 璁㈠崟鏉ユ簮锛�10=鏂扮郴缁燂級
params.put("OrderLevel", "0"); // 鏌ョ湅绛夌骇
params.put("ServiceOrdDepartureType", "1"); // 棰勭害绫诲瀷
params.put("ConditionLevel", "0"); // 鐥呴噸绾у埆
@@ -271,9 +276,11 @@
}
postData.append(URLEncoder.encode(entry.getKey(), legacySystemConfig.getCharset()));
postData.append("=");
- postData.append(URLEncoder.encode(entry.getValue().toString(), legacySystemConfig.getCharset()));
+ postData.append(HttpHelper.UrlEncode(entry.getValue().toString(), legacySystemConfig.getCharset()));
}
+ // log.info("鍙戦�丳OST璇锋眰鍒版棫绯荤粺锛孶RL: {}, 鍙傛暟: {}", urlString, postData.toString());
+
// 鍙戦�丳OST鏁版嵁
try (OutputStream os = conn.getOutputStream()) {
os.write(postData.toString().getBytes(legacySystemConfig.getCharset()));
--
Gitblit v1.9.1