From 5324a8d969a042baa780f60214a2b9cd2cbcbce3 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Fri, 24 Apr 2026 15:32:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E6=AC=A1-=E8=AE=BE=E5=A4=87=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=20=E4=BF=9D=E5=AD=98=E9=80=BB=E8=BE=91=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=9A=E5=8F=AA=E4=BF=9D=E5=AD=98=E9=9D=9E0?=
 =?UTF-8?q?=E4=B8=AA=E7=9A=84=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E5=88=A0=E9=99=A4=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?0=E4=B8=AA=E6=95=B0=E9=87=8F=E7=9A=84=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DeviceManagerController.java       | 15 ++++++++++-----
 .../manager/service/IDeviceManagerService.java    |  1 +
 .../service/impl/DeviceManagerServiceImpl.java    |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/controller/DeviceManagerController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/controller/DeviceManagerController.java
index ec6b88e..486e13a 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/controller/DeviceManagerController.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/controller/DeviceManagerController.java
@@ -200,6 +200,7 @@ public class DeviceManagerController extends JeecgController<DeviceManager, IDev
 
     /**
      * 查询对应机构+批次 各护理单元已配置的设备数量
+     *
      * @param batchNo
      * @param orgCode
      * @return
@@ -212,10 +213,14 @@ public class DeviceManagerController extends JeecgController<DeviceManager, IDev
     @RequestMapping(value = "/batchSave", method = RequestMethod.POST)
     public Result<String> batchSave(@RequestBody List<DevicePreview> list) {
         list.forEach(item -> {
-            if (item.getId() == null) {
+            if (item.getId() == null && item.getPurchaseQuantity() != null && item.getPurchaseQuantity() != 0) {
                 service.addPreviewPlan(item);
             } else {
-                service.updatePreviewPlan(item);
+                if (item.getPurchaseQuantity() != null && item.getPurchaseQuantity() != 0) {
+                    service.updatePreviewPlan(item);
+                } else {
+                    service.deletePreviewPlan(item);
+                }
             }
         });
         return Result.OK("保存成功!");
@@ -228,11 +233,11 @@ public class DeviceManagerController extends JeecgController<DeviceManager, IDev
      * @return
      */
     @GetMapping("/getNuListByOrgCode")
-    public Result<Map<String,Map<String, Object>>> getNuListByOrgCode(@RequestParam("orgCode") String orgCode) {
-        if(StringUtils.isBlank(orgCode)){
+    public Result<Map<String, Map<String, Object>>> getNuListByOrgCode(@RequestParam("orgCode") String orgCode) {
+        if (StringUtils.isBlank(orgCode)) {
             return Result.error("orgCode不能为空");
         }
-        Map<String,Map<String, Object>> result = service.getNuListByOrgCode(orgCode);
+        Map<String, Map<String, Object>> result = service.getNuListByOrgCode(orgCode);
         return Result.ok(result);
     }
 
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/service/IDeviceManagerService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/service/IDeviceManagerService.java
index f9d513a..4afbf62 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/service/IDeviceManagerService.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/service/IDeviceManagerService.java
@@ -52,4 +52,5 @@ public interface IDeviceManagerService extends IService<DeviceManager> {
     List<DevicePreview> queryQuantityByOrgCode(String batchNo, String orgCode);
 
     Map<String,Map<String, Object>> getNuListByOrgCode(String orgCode);
+
 }
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/service/impl/DeviceManagerServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/service/impl/DeviceManagerServiceImpl.java
index 3cd93cd..2427833 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/service/impl/DeviceManagerServiceImpl.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/service/impl/DeviceManagerServiceImpl.java
@@ -495,7 +495,7 @@ public class DeviceManagerServiceImpl extends ServiceImpl<DeviceManagerMapper, D
                     "wsdjList", wsdjStr,
                     "children", children
             );
-            result.put(info.getNuId(),map);
+            result.put(info.getNuId(), map);
 
 
         }