凌云集团更改公司

whepi-web/src/main/java/com/bofeng/entity/MsReport.java

@@ -111,17 +111,20 @@ public class MsReport {
     @ApiModelProperty("是否有过确诊：0否，1是")
     @TableField(exist = false)
     private Integer isSure;
+    @ExcelProperty(value = "是否有过疑似", index = 5)
+    @TableField(exist = false)
+    private String isSuspectedMsg;
     @ExcelProperty(value = "是否有过确诊", index = 4)
     @TableField(exist = false)
     private String isSureMsg;
 
     public String getIsSureMsg() {
-        if (isSure == 0) {
+        if (isSure == null) {
+            isSureMsg = null;
+        } else if (isSure == 0) {
             isSureMsg = "否";
         } else if (isSure == 1) {
             isSureMsg = "是";
-        } else{
-            isSureMsg = "";
         }
         return isSureMsg;
     }
@@ -129,17 +132,15 @@ public class MsReport {
     @ApiModelProperty("是否有过疑似：0否，1是")
     @TableField(exist = false)
     private Integer isSuspected;
-    @ExcelProperty(value = "是否有过疑似", index = 5)
-    @TableField(exist = false)
-    private String isSuspectedMsg;
+
 
     public String getIsSuspectedMsg() {
-        if (isSuspected == 0) {
+        if (isSuspected == null) {
+            isSuspectedMsg = null;
+        } else if (isSuspected == 0) {
             isSuspectedMsg = "否";
         } else if (isSuspected == 1) {
             isSuspectedMsg = "是";
-        } else{
-            isSuspectedMsg = "";
         }
         return isSuspectedMsg;
     }
@@ -156,12 +157,12 @@ public class MsReport {
     private String isContactMsg;
 
     public String getIsContactMsg() {
-        if (isContact == 0) {
+        if (isContact == null) {
+            isContactMsg = null;
+        } else if (isContact == 0) {
             isContactMsg = "否";
         } else if (isContact == 1) {
             isContactMsg = "是";
-        } else{
-            isContactMsg = "";
         }
         return isContactMsg;
     }
@@ -174,12 +175,12 @@ public class MsReport {
     private String isFamliyContactMsg;
 
     public String getIsFamliyContactMsg() {
-        if (isFamliyContact == 0) {
+        if (isFamliyContact == null) {
+            isFamliyContactMsg = null;
+        } else if (isFamliyContact == 0) {
             isFamliyContactMsg = "否";
         } else if (isFamliyContact == 1) {
             isFamliyContactMsg = "是";
-        } else{
-            isFamliyContactMsg = "";
         }
         return isFamliyContactMsg;
     }
@@ -192,12 +193,12 @@ public class MsReport {
     private String isWorkMsg;
 
     public String getIsWorkMsg() {
-        if (isWork == 0) {
+        if (isWork == null) {
+            isWorkMsg = null;
+        } else if (isWork == 0) {
             isWorkMsg = "否";
         } else if (isWork == 1) {
             isWorkMsg = "是";
-        } else{
-            isWorkMsg = "";
         }
         return isWorkMsg;
     }