From 2d4caaef63813345c1da7eadaa078acb27efc3e6 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Thu, 3 Nov 2022 15:52:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A3=90=E7=9F=B3=E9=98=B4=E9=98=B3=E6=80=A7?=
 =?UTF-8?q?=E5=8F=96=E5=80=BC=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/IcTripReportRecordServiceImpl.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java
index 9b27816145..5db0b44648 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java
@@ -164,7 +164,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
                 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.setNatOutcomeName("1".equals(dto.getNatOutcome()) ? "阳性" : "阴性");
                 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()) ? "是" : "否");
@@ -431,7 +431,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
             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.setNatOutcomeName("1".equals(dto.getNatOutcome()) ? "阳性" : "阴性");
             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()) ? "是" : "否");
@@ -612,7 +612,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
             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.setNatOutcomeName("1".equals(dto.getNatOutcome()) ? "阳性" : "阴性");
             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()) ? "是" : "否");