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 |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 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 f85f37b..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;
@@ -41,9 +42,11 @@
 
     @Override
     public void saveEmergencyInfo(Long taskId, String createUserName, TaskCreateVO createVO,
-                                  String serviceOrderId, String dispatchOrderId, String serviceOrdNo) {
+                                  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());
@@ -123,13 +126,13 @@
         }
 
         if (serviceOrderId != null) {
-            emergencyInfo.setLegacyServiceOrdId(Long.parseLong(serviceOrderId));
+            emergencyInfo.setLegacyServiceOrdId(serviceOrderId);
             emergencyInfo.setSyncStatus(2);
             emergencyInfo.setSyncTime(DateUtils.getNowDate());
             emergencyInfo.setSyncErrorMsg("鏃х郴缁熷悓姝ヨ繃鏉�");
         }
         if (dispatchOrderId != null) {
-            emergencyInfo.setLegacyDispatchOrdId(Long.parseLong(dispatchOrderId));
+            emergencyInfo.setLegacyDispatchOrdId(dispatchOrderId);
             emergencyInfo.setDispatchSyncStatus(2);
             emergencyInfo.setDispatchSyncTime(DateUtils.getNowDate());
             emergencyInfo.setDispatchSyncErrorMsg("鏃х郴缁熷悓姝ヨ繃鏉�");
@@ -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,7 +434,7 @@
         }
         
         // 鏇存柊璐圭敤淇℃伅
-        if (createVO.getTransferDistance() != null) {
+        if (createVO.getTransferDistance() != null && BigDecimalUtil.izBigZero(createVO.getTransferDistance())) {
             existingInfo.setTransferDistance(createVO.getTransferDistance());
         }
         if (createVO.getPrice() != null) {
@@ -472,7 +478,10 @@
         if(createVO.getLegacyServiceOrdClass() != null){
             existingInfo.setLegacyServiceOrdClass(createVO.getLegacyServiceOrdClass());
         }
-        
+
+        existingInfo.setServiceOrdVip(createVO.getServiceOrdVIP());
+        existingInfo.setFromHq2Is(createVO.getFromHQ2_is());
+
         // 鎵ц鏇存柊
         sysTaskEmergencyMapper.updateSysTaskEmergency(existingInfo);
     }
@@ -484,6 +493,7 @@
         }
         try {
             sysTaskEmergencyService.markNeedResync(taskId);
+
         } catch (Exception e) {
             // 鏍囪澶辫触涓嶅奖鍝嶄富娴佺▼
         }

--
Gitblit v1.9.1