新疆大屏

functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClient.java

@@ -94,7 +94,7 @@ public interface AnYanClient {
      * @param healthRoomDTO
      * @return
      */
-    IPage<HealthPlaceHomDetailsVO> healthPlaceHomDetailList(HealthRoomDTO healthRoomDTO);
+    IPage<HealthPlaceHomeDetailsVO> healthPlaceHomDetailList(HealthRoomDTO healthRoomDTO);
 
     /**
      * 当年体检异常人数统计
@@ -152,11 +152,10 @@ public interface AnYanClient {
     /**
      * 一人一案信息详情接口 (用大屏首页重点关爱趋势预警滚动列表点击数据详情)
      *
-     * @param anYanUserId 安眼系统的用户ID (从上级列表接口获取) 与 idNo 参数二选一即可
-     * @param idNo 安眼系统的用户身份证号 (从上级列表接口获取) 与 anYanUserId 参数二选一即可
+     * @param employeeNum 工号
      * @return
      */
-    CareUserListVo careUserDetails(String anYanUserId, String idNo);
+    CareUserListVo careUserDetails(String anYanUserId,String employeeNum);
 
     /**
      * 一人一案分页列表查询接口(用大屏首页重点关爱趋势预警弹窗列表)

functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClientExecutor.java

@@ -216,9 +216,9 @@ public class AnYanClientExecutor implements AnYanClient {
 
     @Override
     @Retryable(maxAttempts = 2)
-    public IPage<HealthPlaceHomDetailsVO> healthPlaceHomDetailList(HealthRoomDTO healthRoomDTO) {
+    public IPage<HealthPlaceHomeDetailsVO> healthPlaceHomDetailList(HealthRoomDTO healthRoomDTO) {
         AnYanResult<Object> result = RestTemplateUtil.postExchange(AnYanApiEnum.HEALTH_PLACE_ROOM_INFO_LIST, buildTokenHeader(), healthRoomDTO);
-        return new PageResultToBeanUtil<HealthPlaceHomDetailsVO>().transform(result, HealthPlaceHomDetailsVO.class);
+        return new PageResultToBeanUtil<HealthPlaceHomeDetailsVO>().transform(result, HealthPlaceHomeDetailsVO.class);
     }
 
     @Override
@@ -313,13 +313,13 @@ public class AnYanClientExecutor implements AnYanClient {
     }
 
     @Override
-    public CareUserListVo careUserDetails(String anYanUserId, String idNo){
+    public CareUserListVo careUserDetails(String anYanUserId,String employeeNum){
         JSONObject param = new JSONObject();
         if(StrUtil.isNotEmpty(anYanUserId)){
             param.put("id", anYanUserId);
         }
-        if(StrUtil.isNotEmpty(idNo)){
-            param.put("idNo", idNo);
+        if(StrUtil.isNotEmpty(employeeNum)){
+            param.put("employeeNum", employeeNum);
         }
         AnYanResult<Object> result = RestTemplateUtil.postExchange(AnYanApiEnum.CARE_PERSON_Details, buildTokenHeader(), param);
         return BeanUtil.toBean(result.getData(), CareUserListVo.class);

functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/CareUserListVo.java

@@ -153,4 +153,12 @@ public class CareUserListVo {
     @Schema(title = "日常生活管理反馈")
     private String lifeManageResponse;
 
+    public Double getBmi() {
+        if (bmi == null) {
+            return null;
+        }
+        return Math.round(bmi * 10) / 10.0;
+    }
+
+
 }

functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/HealthPlaceHomeDetailsVO.java

@@ -2,11 +2,10 @@ package com.renkang.anyan.model.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import org.jeecg.common.aspect.annotation.Dict;
 
 @Data
 @Schema(title="健康小屋数据详情列表", description="健康小屋数据详情列表")
-public class HealthPlaceHomDetailsVO {
+public class HealthPlaceHomeDetailsVO {
     /**
      * id
      */
@@ -27,6 +26,10 @@ public class HealthPlaceHomDetailsVO {
      */
     @Schema(title = "健康小屋id")
     private String roomId;
+    @Schema(title = "健康小屋名称")
+    private String roomName;
+    @Schema(title = "地址")
+    private String address;
     /**
      * 姓名
      */