From 654b03aeb46d9107357d05a0e2f8400b058c43a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Wed, 15 Oct 2025 16:09:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E8=8E=B7=E5=8F=96=E5=8F=8A=E5=AD=98=E5=82=A8=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NuBizNuCustomerServerServiceImpl.java     | 66 ++++++++++---------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java
index dd5b1b8..6b1d55f 100644
--- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java
+++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java
@@ -62,7 +62,7 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl<NuBizNuCustome
 //            Map<String,Object> posMap = new HashMap<>();
 //            posMap.put("positioning",groupPositioning1);
 //            List<Map<String,Object>> childrenList = new ArrayList<>();
-            for(NuBizNuCustomerServer par : groupList){
+//            for(NuBizNuCustomerServer par : groupList){
 //                if(StringUtils.equals(groupPositioning1,par.getPositioning())){
 //                    Map<String,Object> map = new HashMap<>();
 //                    map.put("nuId",nuBizNuCustomerServer.getNuId());
@@ -115,42 +115,44 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl<NuBizNuCustome
 //                        map.put("netPreviewFileSmall","");
 //                    }
 //                    childrenList.add(map);
-
-                if(par.getImmediateFile()!=null&&!par.getImmediateFile().equals("")){
-                    String immediateFile = getImageNetUrl(par.getImmediateFile());
-                    par.setNetImmediateFile(immediateFile);
-                }else{
-                    par.setImmediateFile("");
-                    par.setNetImmediateFile("");
-                }
-                if(par.getImmediateFileFocus()!=null&&!par.getImmediateFileFocus().equals("")){
-                    String immediateFileFocus = getImageNetUrl(par.getImmediateFileFocus());
-                    par.setNetImmediateFileFocus(immediateFileFocus);
-                }else{
-                    par.setImmediateFileFocus("");
-                    par.setNetImmediateFileFocus("");
-                }
-                if(par.getPreviewFile()!=null&&!par.getPreviewFile().equals("")){
-                    String previewFile = getImageNetUrl(par.getPreviewFile());
-                    par.setNetPreviewFile(previewFile);
-                }else{
-                    par.setPreviewFile("");
-                    par.setNetPreviewFile("");
-                }
-                if(par.getPreviewFileSmall()!=null&&!par.getPreviewFileSmall().equals("")){
-                    String previewFileSmall = getImageNetUrl(par.getPreviewFileSmall());
-                    par.setNetPreviewFileSmall(previewFileSmall);
-                }else{
-                    par.setPreviewFileSmall("");
-                    par.setNetPreviewFileSmall("");
-                }
-
 //                }
-            }
+//            }
 //            posMap.put("children",childrenList);
 //            allList.add(posMap);
 //        }
 //        resMap.put("serviceList",allList);//服务指令计划
+
+        for(NuBizNuCustomerServer par : groupList){
+            if(par.getImmediateFile()!=null&&!par.getImmediateFile().equals("")){
+                String immediateFile = getImageNetUrl(par.getImmediateFile());
+                par.setNetImmediateFile(immediateFile);
+            }else{
+                par.setImmediateFile("");
+                par.setNetImmediateFile("");
+            }
+            if(par.getImmediateFileFocus()!=null&&!par.getImmediateFileFocus().equals("")){
+                String immediateFileFocus = getImageNetUrl(par.getImmediateFileFocus());
+                par.setNetImmediateFileFocus(immediateFileFocus);
+            }else{
+                par.setImmediateFileFocus("");
+                par.setNetImmediateFileFocus("");
+            }
+            if(par.getPreviewFile()!=null&&!par.getPreviewFile().equals("")){
+                String previewFile = getImageNetUrl(par.getPreviewFile());
+                par.setNetPreviewFile(previewFile);
+            }else{
+                par.setPreviewFile("");
+                par.setNetPreviewFile("");
+            }
+            if(par.getPreviewFileSmall()!=null&&!par.getPreviewFileSmall().equals("")){
+                String previewFileSmall = getImageNetUrl(par.getPreviewFileSmall());
+                par.setNetPreviewFileSmall(previewFileSmall);
+            }else{
+                par.setPreviewFileSmall("");
+                par.setNetPreviewFileSmall("");
+            }
+        }
+
         resMap.put("serviceList",groupList);//服务指令计划
         //即时指令
         QueryWrapper<NuBizNuCustomerServerInstant> instantQueryWrapper = new QueryWrapper<>();