字典表值调整

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");
+                        e.setSojournHistory("3");//无风险
-                        if (map1.containsKey(str[2])) {
+                        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")));
+                            e.setSojournHistory(map1.get(str[2]));
-                        }
+                        } else if (map2.containsKey(str[1])) {//中风险
-                        if (map2.containsKey(str[1])) {
+                            e.setSojournHistory(map2.get(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")));
+                        } else if (map3.containsKey(str[0])) {//低风险
-                        }
+                            e.setSojournHistory(map3.get(str[0]));
-                        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")));
                         }
                     }
                     if (StringUtils.isNotBlank(l.getIsolateType())) {