详情增加返参

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java

@@ -607,6 +607,16 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
             latestNotice.putAll(map);
             gzIdCardList.addAll(gzIdCards);
         });
+        //获取需要的字典表数据
+        //交通方式
+        Result<Map<String, String>> trafficTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRAFFIC_TYPE.getCode());
+        //7天内旅居史情况
+        Result<Map<String, String>> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode());
+        //隔离状态
+        Result<Map<String, String>> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode());
+        //行程记录类型
+        Result<Map<String, String>> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode());
+
         for (IcTripReportRecordDTO dto : list) {
             //默认未加入
             dto.setHeSuanCheck(false);
@@ -618,6 +628,16 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
             if (MapUtils.isNotEmpty(latestNotice) && latestNotice.containsKey(dto.getIdCard())) {
                 dto.setLatestNoticeTime(latestNotice.get(dto.getIdCard()));
             }
+            //字典表字段、是否字段赋值对应中国字
+            dto.setTrafficTypeName(trafficTypeMap.getData().containsKey(dto.getTrafficType()) ? trafficTypeMap.getData().get(dto.getTrafficType()) : "无");
+            dto.setVaccineNumName(StringUtils.isNotBlank(dto.getVaccineNum()) ? dto.getVaccineNum().concat("针") : "");
+            dto.setIsNatRecordName("1".equals(dto.getIsNatRecord()) ? "是" : "否");
+            dto.setNatOutcomeName("1".equals(dto.getIsNatRecord()) ? "阳性" : "阴性");
+            dto.setSojournHistoryName(sojournHistoryMap.getData().containsKey(dto.getSojournHistory()) ? sojournHistoryMap.getData().get(dto.getSojournHistory()) : "无");
+            dto.setIsolateTypeName(isolateTypeMap.getData().containsKey(dto.getIsolateType()) ? isolateTypeMap.getData().get(dto.getIsolateType()) : "无");
+            dto.setIsArriveCheckName("1".equals(dto.getIsArriveCheck()) ? "是" : "否");
+            dto.setIsArriveName("1".equals(dto.getIsArrive()) ? "是" : "否");
+            dto.setTripDataTypeName(tripDataTypeMap.getData().containsKey(dto.getTripDataType()) ? tripDataTypeMap.getData().get(dto.getTripDataType()) : "无");
         }
         return list.get(NumConstant.ZERO);
     }