From 4fdde57a837b47b0a04aa17a7627c21b7425eda2 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期五, 26 十二月 2025 23:25:11 +0800
Subject: [PATCH] feat: 优化取消时，调度单中显示原因
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysEmergencyTaskServiceImpl.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysEmergencyTaskServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysEmergencyTaskServiceImpl.java
index 50eb36f..7ea9400 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysEmergencyTaskServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysEmergencyTaskServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.service.impl;
+import com.ruoyi.common.utils.BigDecimalUtil;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.SysTask;
@@ -44,6 +45,8 @@
Long serviceOrderId, Long dispatchOrderId, String serviceOrdNo) {
SysTaskEmergency emergencyInfo = new SysTaskEmergency();
emergencyInfo.setTaskId(taskId);
+ emergencyInfo.setServiceOrdVip(createVO.getServiceOrdVIP());
+ emergencyInfo.setFromHq2Is(createVO.getFromHQ2_is());
if (createVO.getPatient() != null) {
emergencyInfo.setPatientContact(createVO.getPatient().getContact());
@@ -110,7 +113,7 @@
}
}
- emergencyInfo.setTransferDistance(createVO.getDistance());
+ emergencyInfo.setTransferDistance(createVO.getTransferDistance());
emergencyInfo.setTransferPrice(createVO.getPrice());
emergencyInfo.setDocumentTypeId(createVO.getDocumentTypeId());
emergencyInfo.setTaskTypeId(createVO.getTaskTypeId());
@@ -266,8 +269,8 @@
}
}
- if (updateVO.getDistance() != null) {
- oldEmergency.setTransferDistance(updateVO.getDistance());
+ if (updateVO.getTransferDistance() != null) {
+ oldEmergency.setTransferDistance(updateVO.getTransferDistance());
}
if (updateVO.getPrice() != null) {
oldEmergency.setTransferPrice(updateVO.getPrice());
@@ -307,6 +310,9 @@
oldEmergency.setLegacyServiceOrdClass(updateVO.getLegacyServiceOrdClass());
}
+ oldEmergency.setFromHq2Is(updateVO.getFromHQ2_is());
+ oldEmergency.setServiceOrdVip(updateVO.getServiceOrdVIP());
+
sysTaskEmergencyMapper.updateSysTaskEmergency(oldEmergency);
}
@@ -321,7 +327,7 @@
return;
}
- log.info("鏇存柊杞繍浠诲姟 taskId:{}", existingInfo.getTaskId());
+// log.info("鏇存柊杞繍浠诲姟 taskId:{}", existingInfo.getTaskId());
// 鏇存柊鎮ｈ�呬俊鎭�
if (createVO.getPatient() != null) {
@@ -377,7 +383,7 @@
if (coords != null) {
existingInfo.setHospitalOutLongitude(BigDecimal.valueOf(coords.get("lng")));
existingInfo.setHospitalOutLatitude(BigDecimal.valueOf(coords.get("lat")));
- log.info("杞嚭鍖婚櫌GPS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
+// log.info("杞嚭鍖婚櫌GPS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
}
} catch (Exception e) {
log.error("鑷姩鑾峰彇杞嚭鍖婚櫌GPS鍧愭爣澶辫触", e);
@@ -418,7 +424,7 @@
if (coords != null) {
existingInfo.setHospitalInLongitude(BigDecimal.valueOf(coords.get("lng")));
existingInfo.setHospitalInLatitude(BigDecimal.valueOf(coords.get("lat")));
- log.info("杞叆鍖婚櫌GPS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
+// log.info("杞叆鍖婚櫌GPS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
}
} catch (Exception e) {
log.error("鑷姩鑾峰彇杞叆鍖婚櫌GPS鍧愭爣澶辫触", e);
@@ -428,8 +434,8 @@
}
// 鏇存柊璐圭敤淇℃伅
- if (createVO.getDistance() != null) {
- existingInfo.setTransferDistance(createVO.getDistance());
+ if (createVO.getTransferDistance() != null && BigDecimalUtil.izBigZero(createVO.getTransferDistance())) {
+ existingInfo.setTransferDistance(createVO.getTransferDistance());
}
if (createVO.getPrice() != null) {
existingInfo.setTransferPrice(createVO.getPrice());
@@ -472,7 +478,10 @@
if(createVO.getLegacyServiceOrdClass() != null){
existingInfo.setLegacyServiceOrdClass(createVO.getLegacyServiceOrdClass());
}
-
+
+ existingInfo.setServiceOrdVip(createVO.getServiceOrdVIP());
+ existingInfo.setFromHq2Is(createVO.getFromHQ2_is());
+
// 鎵ц鏇存柊
sysTaskEmergencyMapper.updateSysTaskEmergency(existingInfo);
}
--
Gitblit v1.9.1