From 355dda1f90c70ab04c4517688da37d1a4236f112 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期二, 23 十二月 2025 21:43:30 +0800
Subject: [PATCH] fix:优化保存

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysEmergencyTaskServiceImpl.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 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..6b50a98 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());
@@ -307,6 +310,9 @@
             oldEmergency.setLegacyServiceOrdClass(updateVO.getLegacyServiceOrdClass());
         }
 
+        oldEmergency.setFromHq2Is(updateVO.getFromHQ2_is());
+        oldEmergency.setServiceOrdVip(updateVO.getServiceOrdVIP());
+
         sysTaskEmergencyMapper.updateSysTaskEmergency(oldEmergency);
     }
 
@@ -428,7 +434,7 @@
         }
         
         // 鏇存柊璐圭敤淇℃伅
-        if (createVO.getDistance() != null) {
+        if (createVO.getDistance() != null && BigDecimalUtil.izBigZero(createVO.getDistance())) {
             existingInfo.setTransferDistance(createVO.getDistance());
         }
         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);
     }

--
Gitblit v1.9.1