From 5a75290aa9d2b69d1d088155e59bd7f1c262d803 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Tue, 1 Nov 2022 17:25:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E8=A1=A8=E5=80=BC=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IcTripReportRecordServiceImpl.java      | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 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 67f2e06383..57363b1bdb 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
@@ -607,15 +607,13 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
                             bl.set(true);
                             errMsg.append("数据不完整，‘来源地’信息填写格式错误;");
                         }
-                        e.setSojournHistory("4");
-                        if (map1.containsKey(str[2])) {
-                            e.setSojournHistory(map1.get(str[2]).equals("2") ? "1" : ("1".equals(map1.get(str[2])) ? "2" : ("0".equals(map1.get(str[2])) ? "3" : "4")));
-                        }
-                        if (map2.containsKey(str[1])) {
-                            e.setSojournHistory(map2.get(str[1]).equals("2") ? "1" : ("1".equals(map2.get(str[1])) ? "2" : ("0".equals(map2.get(str[1])) ? "3" : "4")));
-                        }
-                        if (map3.containsKey(str[0])) {
-                            e.setSojournHistory(map3.get(str[0]).equals("2") ? "1" : ("1".equals(map3.get(str[0])) ? "2" : ("0".equals(map3.get(str[0])) ? "3" : "4")));
+                        e.setSojournHistory("3");//无风险
+                        if (map1.containsKey(str[2])) {//高风险
+                            e.setSojournHistory(map1.get(str[2]));
+                        } else if (map2.containsKey(str[1])) {//中风险
+                            e.setSojournHistory(map2.get(str[1]));
+                        } else if (map3.containsKey(str[0])) {//低风险
+                            e.setSojournHistory(map3.get(str[0]));
                         }
                     }
                     if (StringUtils.isNotBlank(l.getIsolateType())) {