fix

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

@@ -295,7 +295,7 @@ public class LargeScreenNewController {
      */
     @GetMapping("careUser")
     public Result<CareUserVO> careUser(@RequestParam(name = "userId") String userId,
-                                       @RequestParam(name = "workNo") String workNo){
+                                       @RequestParam(name = "workNo",required = false) String workNo){
         return Result.ok(largeScreenDataService.careUser(userId,workNo));
     }
 

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

@@ -32,6 +32,7 @@ import com.renkang.emergency.service.IXjAedService;
 import com.renkang.watch.api.WatchApi;
 import com.renkang.watch.vo.WatchMonitorDataVo;
 import lombok.RequiredArgsConstructor;
+import org.jeecg.bean.response.BaseEmployeeInfo;
 import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.global.GlobalUtils;
@@ -871,7 +872,13 @@ public class LargeScreenDataServiceImpl extends ServiceImpl<LargeScreenDataMappe
             careUserVO.setLifeguardName(healthUserEmployeeExes.get(0).getLifeguardName());
             careUserVO.setLifeguardPhone(healthUserEmployeeExes.get(0).getLifeguardPhone());
         }*/
-
+        if(StrUtil.isEmpty(workNo)){
+            //通过用户ID查工号  解决前端传值有问题
+            List<BaseEmployeeInfo>  employeeInfos = sysBaseAPI.queryBaseEmployeeInfo(new HashSet<>(Arrays.asList(userId)));
+            if(null != employeeInfos && employeeInfos.size()>0){
+                workNo = employeeInfos.get(0).getWorkNo();
+            }
+        }
         if(StrUtil.isNotEmpty(workNo)){
             try {
                 EmergencyContactParam param = new EmergencyContactParam();