详情新增反参

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EmphasisTripListResultDTO.java

@@ -22,6 +22,7 @@ public class EmphasisTripListResultDTO implements Serializable {
      * 来源地
      */
     private String sourceAddress;
+    private String sourceDetailAddress;
 
     /**
      * 来曹事由
@@ -68,4 +69,24 @@ public class EmphasisTripListResultDTO implements Serializable {
 
     private String remark;
 
+    /**
+     * 返回方式
+     */
+    private String trafficTypeName;
+
+    /**
+     * 疫苗接种针次
+     */
+    private Integer vaccineNum;
+
+    /**
+     * 交通方式
+     */
+    private String trafficType;
+
+    /**
+     * 其他返回方式，交通方式为其他时此列需要有值
+     */
+    private String trafficTypeExplain;
+
 }

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

@@ -759,6 +759,8 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
         // 7天旅居史字典
         Result<List<SysDictDataDTO>> sojournMapRes = adminOpenFeignClient.dictDataList(DictTypeEnum.SOJOURN_HISTORY.getCode());
         Map<String, String> sojournMap = sojournMapRes.success() && CollectionUtils.isNotEmpty(sojournMapRes.getData()) ? sojournMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictValue, SysDictDataDTO::getDictLabel)) : new HashMap<>();
+        //交通方式
+        Map<String, String> trafficTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRAFFIC_TYPE.getCode()).getData();
 
         // 隔离状态字典
         Map<String, String> isolateMap = new HashMap<>();
@@ -768,6 +770,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
             result.getList().forEach(l -> {
                 l.setIsolateTypeName(isolateMap.get(l.getIsolateType()));
                 l.setSojournHistoryName(sojournMap.get(l.getSojournHistory()));
+                l.setTrafficTypeName(trafficTypeMap.containsKey(l.getTrafficType())  ? trafficTypeMap.get(l.getTrafficType()) : "无");
             });
         }
         return result;

epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml

@@ -87,6 +87,10 @@
             LEAVE_DATE,
             PRESENT_ADDRESS,
             DETAIL_ADDRESS,
+            IFNULL(source_detail_address,'') AS sourceDetailAddress,
+            IFNULL(vaccine_num,0) AS vaccineNum,
+            traffic_type,
+            IFNULL(traffic_type_explain,'') AS trafficTypeExplain,
             REMARK,
             IFNULL(nat_outcome,'0') as natOutcome,
             (case when nat_outcome = '1' then '阳性' when nat_outcome = '0' then '阴性' else '阴性' end) as natOutComeName