From 860ddc632a782c974ec8de92c41dbf4bc46afad9 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 11 Jan 2023 14:24:23 +0800
Subject: [PATCH] =?UTF-8?q?IcNatServiceImpl.getNatList=E7=A9=BA=E6=8C=87?=
 =?UTF-8?q?=E9=92=88=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/IcNatServiceImpl.java  | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java
index cbcbaf427f..f58d457652 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java
@@ -459,16 +459,20 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
             NatListDTO dto = new NatListDTO();
             dto.setAddress(item.getNatAddress());
             dto.setTestTime(DateUtils.format(item.getNatTime(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE));
-            switch (item.getNatResult())
-            {
-                case NumConstant.ZERO_STR:
-                    dto.setResult("阴性");
-                    break;
-                case NumConstant.ONE_STR:
-                    dto.setResult("阳性");
-                    break;
-                default:
-                    dto.setResult("未知");
+            if(StringUtils.isNotBlank(item.getNatResult())){
+                switch (item.getNatResult())
+                {
+                    case NumConstant.ZERO_STR:
+                        dto.setResult("阴性");
+                        break;
+                    case NumConstant.ONE_STR:
+                        dto.setResult("阳性");
+                        break;
+                    default:
+                        dto.setResult("未知");
+                }
+            }else{
+                dto.setResult("未知");
             }
             return dto;
         }).collect(Collectors.toList());