大屏 fix

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/controller/ScreenAnimationController.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/screen/animation")
+@RequestMapping("/api/anon/screen-animation")
 public class ScreenAnimationController {
     private final ScreenAnimationService screenAnimationService;
 

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java

@@ -21,6 +21,7 @@ import com.renkang.emergency.entity.dto.LargeScreenDataValueDTO;
 import com.renkang.emergency.entity.vo.DataDetailVO;
 import com.renkang.emergency.entity.vo.MedicalDataVO;
 import com.renkang.emergency.largeScreen.entity.dto.TodayEmergencyDTO;
+import com.renkang.emergency.largeScreen.entity.vo.LargeScreenMap;
 import com.renkang.emergency.largeScreen.entity.vo.TodayEmergencyVO;
 import com.renkang.emergency.largeScreen.mapper.LargeScreenDataMapper;
 import com.renkang.emergency.largeScreen.service.ILargeScreenDataService;
@@ -45,6 +46,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * @Description: large_screen_data
@@ -522,6 +524,30 @@ public class LargeScreenDataServiceImpl extends ServiceImpl<LargeScreenDataMappe
         hospitalList = findThreeNearestHospitals(2, hospitalList, TypeConversionUtil.toDoubleOfNull(longitude), TypeConversionUtil.toDoubleOfNull(latitude));
         roomList = findThreeNearestHospitals(2, roomList, TypeConversionUtil.toDoubleOfNull(longitude), TypeConversionUtil.toDoubleOfNull(latitude));
         xjAedList = findThreeNearestHospitals(2, xjAedList, TypeConversionUtil.toDoubleOfNull(longitude), TypeConversionUtil.toDoubleOfNull(latitude));
+        //处理AED单位名称
+        if(ObjectUtil.isNotEmpty(xjAedList)){
+            //AED部门code翻译,要求单位和部门拆开显示
+            Set<String> orgCodes = xjAedList.stream()
+                    .map(TblBaseHospitalVo::getDepartCode)
+                    .filter(Objects::nonNull)
+                    .flatMap(departCode ->
+                            departCode.length() > 6
+                                    ? Stream.of(departCode, GlobalUtils.getSecondDepartOrgCode(departCode))
+                                    : Stream.of(departCode)
+                    )
+                    .collect(Collectors.toSet());
+            Map<String,String> deptMap = sysBaseAPI.queryDepartNameByOrgCodes(orgCodes);
+            xjAedList.forEach(aed ->{
+                if(null != aed.getDepartCode()){
+                    if(aed.getDepartCode().length() > 6){
+                        aed.setOrgName(deptMap.get(GlobalUtils.getSecondDepartOrgCode(aed.getDepartCode())));
+                        aed.setDeptName(deptMap.get(aed.getDepartCode()));
+                    }else {
+                        aed.setOrgName(deptMap.get(aed.getDepartCode()));
+                    }
+                }
+            });
+        }
         list.addAll(hospitalList);
         list.addAll(roomList);
         list.addAll(xjAedList);