Merge branch 'develop' of https://gitea.rk-health.com/renkang/xj-platform into develop

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

@@ -136,7 +136,7 @@ public class LargeScreenNewController {
 
     @PostMapping("/healthSign")
     @Operation(summary = "健康打卡数据", description = "健康打卡数据")
-    public Result<HealthSignVO> healthSign(HealthSignDTO dto){
+    public Result<HealthSignVO> healthSign(@RequestBody HealthSignDTO dto){
         return Result.ok(largeScreenService.healthSign(dto));
     }
 

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

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.renkang.emergency.bean.response.XjDemandTypeFakerData;
 import com.renkang.emergency.bean.response.XjHealthSignFakerData;
 import com.renkang.emergency.bean.response.XjMedicalCountFakerData;
+import com.renkang.emergency.bean.response.XjMedicalDataFakerData;
 import com.renkang.emergency.entity.EmergencyHealthRoom;
 import com.renkang.emergency.entity.Resource;
 import com.renkang.emergency.entity.TblHelpCentorVo;
@@ -442,7 +443,15 @@ public class LargeScreenServiceImpl extends ServiceImpl<LargeScreenMapper, Large
                 return Collections.emptyList();
             }
             try {
-                return (List<MedicalPeopleNumStatisticsVO>) data;
+                List<MedicalPeopleNumStatisticsVO> voList = new ArrayList<>();
+                List<XjMedicalCountFakerData> returnDataList = (List<XjMedicalCountFakerData>) data;
+                for (XjMedicalCountFakerData fakerData : returnDataList) {
+                    MedicalPeopleNumStatisticsVO vo = new MedicalPeopleNumStatisticsVO();
+                    vo.setHospitalName(fakerData.getName());
+                    vo.setCheckedCount(Integer.valueOf(fakerData.getCount()));
+                    voList.add(vo);
+                }
+                return voList;
             } catch (Exception e) {
                 log.error("新疆大屏体检人数统计数据转化异常", e);
                 return Collections.emptyList();
@@ -467,7 +476,7 @@ public class LargeScreenServiceImpl extends ServiceImpl<LargeScreenMapper, Large
     private MedicalAbnormalStatisticsVO XjMedicalDataFakerDataNew(String centerId) {
         try {
             MedicalAbnormalStatisticsVO vo = new MedicalAbnormalStatisticsVO();
-            XjMedicalCountFakerData data = (XjMedicalCountFakerData) redisUtil.get(StrUtil.isNotEmpty(centerId)
+            XjMedicalDataFakerData data = (XjMedicalDataFakerData) redisUtil.get(StrUtil.isNotEmpty(centerId)
                     ? FakerDataConstant.XJ_MEDICAL_DATA + ":" + centerId : FakerDataConstant.XJ_MEDICAL_DATA);
             BeanUtils.copyProperties(data,vo);
             return vo;

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

@@ -340,9 +340,9 @@ public class FakerDataServiceImpl implements IFakerDataService {
     @Override
     public void createXjMedicalDataFakerData(XjMedicalDataFakerData data) {
         if (StrUtil.isNotEmpty(data.getCenterId())) {
-            redisUtil.set(FakerDataConstant.XJ_HEALTH_SIGN_COUNT + ":" + data.getCenterId(), data);
+            redisUtil.set(FakerDataConstant.XJ_MEDICAL_DATA + ":" + data.getCenterId(), data);
         } else {
-            redisUtil.set(FakerDataConstant.XJ_HEALTH_SIGN_COUNT, data);
+            redisUtil.set(FakerDataConstant.XJ_MEDICAL_DATA, data);
         }
     }
 }