diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/controller/LargeScreenNewController.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/controller/LargeScreenNewController.java index 3313208..8f7bdc9 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/controller/LargeScreenNewController.java +++ b/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 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)); } diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java index 6ae324e..9eca210 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java +++ b/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 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();