修改文字

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

@@ -14,6 +14,7 @@ public class ExcelRiBao {
     private String ridgepole;
     private String unit;
     private String doorplate;
+    private BigDecimal temperature;
     private int grender;
     private int familyStatus;
     private int medical;
@@ -89,7 +90,11 @@ public class ExcelRiBao {
 //    private String age;
 
     @ExcelProperty(value = "体温", index = 10)
-    private BigDecimal temperature;
+    private String temperatureStr;
+    public String getTemperatureStr() {
+        temperatureStr = temperature.floatValue()>10?temperature+"":"未填报";
+        return temperatureStr;
+    }
 
     @ExcelProperty(value = "确诊", index = 11)
     private String medicalStr;
@@ -113,90 +118,90 @@ public class ExcelRiBao {
         return singleRoomStr;
     }
 
-//    @ExcelProperty(value = "身体基本情况", index = 14)
-//    private String baseDesc;
-//    public String getBaseDesc() {
-//        if (familyStatus == 0) {
-//            baseDesc = "无病史";
-//        } else if (familyStatus == 1) {
-//            baseDesc = "心血管疾病（服用ARB）";
-//        } else if (familyStatus == 2) {
-//            baseDesc = "心血管疾病（未服用ARB）";
-//        } else if (familyStatus == 3) {
-//            baseDesc = "呼吸系统病史";
-//        } else if (familyStatus == 4) {
-//            baseDesc = "肿瘤病史";
-//        } else if (familyStatus == 5) {
-//            baseDesc = "糖尿病史";
-//        } else if (familyStatus == 6) {
-//            baseDesc = "服用过激素药物";
-//        } else if (familyStatus == 7) {
-//            baseDesc = "妊娠期";
-//        } else {
-//            baseDesc = "其他";
-//        }
-//        return baseDesc;
-//    }
-//
-//    @ExcelProperty(value = "病情描述", index = 15)
-//    private String bingqingDesc = "";
-//    public String getBingqingDesc() {
-//
-//        if (medical == 1) {
-//            bingqingDesc += "已确诊、";
-//        }
-//
-//        if (singleRoom == 1) {
-//            bingqingDesc += "单间隔离、";
-//        }
-//
-//        bingqingDesc = bingqingDesc + "体温：" + temperature + "、";
-//
-//        if (cough == 1) {
-//            bingqingDesc += "偶尔短暂咳嗽、";
-//        } else if (cough == 2) {
-//            bingqingDesc += "咳嗽轻度影响生活、";
-//        } else if (cough == 3) {
-//            bingqingDesc += "咳嗽严重影响生活、";
-//        }
-//        if (muscle == 1) {
-//            bingqingDesc += "肌肉按压有酸痛、";
-//        } else if (muscle == 2) {
-//            bingqingDesc += "偶尔肌肉按压酸痛、";
-//        } else if (muscle == 3) {
-//            bingqingDesc += "肌肉按压持续酸痛、";
-//        }
-//        if (dyspnea == 1) {
-//            bingqingDesc += "呼吸急走或上坡气短、";
-//        } else if (dyspnea == 2) {
-//            bingqingDesc += "呼吸气短而走路变慢、";
-//        } else if (dyspnea == 3) {
-//            bingqingDesc += "呼吸走路数分钟后气短、";
-//        } else if (dyspnea == 4) {
-//            bingqingDesc += "呼吸气短无法离开房间、";
-//        }
-//        if (fatigue == 1) {
-//            bingqingDesc += "可体力劳动但觉得累、";
-//        } else if (fatigue == 2) {
-//            bingqingDesc += "轻体力劳动后长时间不能恢复、";
-//        } else if (fatigue == 3) {
-//            bingqingDesc += "不能正常生活、";
-//        }
-//        if (diarrhea == 1) {
-//            bingqingDesc += "轻度腹泻少于于3次、";
-//        } else if (diarrhea == 2) {
-//            bingqingDesc += "中度腹泻4-6次、";
-//        } else if (diarrhea == 3) {
-//            bingqingDesc += "重度腹泻超过6次、";
-//        }
-//
-//        if (!Strings.isNullOrEmpty(statusDesp)) {
-//            bingqingDesc += statusDesp;
-//            bingqingDesc += "、";
-//        }
-//        if (!Strings.isNullOrEmpty(others)) {
-//            bingqingDesc += others;
-//        }
-//        return bingqingDesc;
-//    }
+    @ExcelProperty(value = "身体基本情况", index = 13)
+    private String baseDesc;
+    public String getBaseDesc() {
+        if (familyStatus == 0) {
+            baseDesc = "无病史";
+        } else if (familyStatus == 1) {
+            baseDesc = "心血管疾病（服用ARB）";
+        } else if (familyStatus == 2) {
+            baseDesc = "心血管疾病（未服用ARB）";
+        } else if (familyStatus == 3) {
+            baseDesc = "呼吸系统病史";
+        } else if (familyStatus == 4) {
+            baseDesc = "肿瘤病史";
+        } else if (familyStatus == 5) {
+            baseDesc = "糖尿病史";
+        } else if (familyStatus == 6) {
+            baseDesc = "服用过激素药物";
+        } else if (familyStatus == 7) {
+            baseDesc = "妊娠期";
+        } else {
+            baseDesc = "其他";
+        }
+        return baseDesc;
+    }
+
+    @ExcelProperty(value = "病情描述", index = 14)
+    private String bingqingDesc = "";
+    public String getBingqingDesc() {
+
+        if (medical == 1) {
+            bingqingDesc += "已确诊、";
+        }
+
+        if (singleRoom == 1) {
+            bingqingDesc += "单间隔离、";
+        }
+
+        bingqingDesc = bingqingDesc + "体温：" + temperatureStr + "、";
+
+        if (cough == 1) {
+            bingqingDesc += "偶尔短暂咳嗽、";
+        } else if (cough == 2) {
+            bingqingDesc += "咳嗽轻度影响生活、";
+        } else if (cough == 3) {
+            bingqingDesc += "咳嗽严重影响生活、";
+        }
+        if (muscle == 1) {
+            bingqingDesc += "肌肉按压有酸痛、";
+        } else if (muscle == 2) {
+            bingqingDesc += "偶尔肌肉按压酸痛、";
+        } else if (muscle == 3) {
+            bingqingDesc += "肌肉按压持续酸痛、";
+        }
+        if (dyspnea == 1) {
+            bingqingDesc += "呼吸急走或上坡气短、";
+        } else if (dyspnea == 2) {
+            bingqingDesc += "呼吸气短而走路变慢、";
+        } else if (dyspnea == 3) {
+            bingqingDesc += "呼吸走路数分钟后气短、";
+        } else if (dyspnea == 4) {
+            bingqingDesc += "呼吸气短无法离开房间、";
+        }
+        if (fatigue == 1) {
+            bingqingDesc += "可体力劳动但觉得累、";
+        } else if (fatigue == 2) {
+            bingqingDesc += "轻体力劳动后长时间不能恢复、";
+        } else if (fatigue == 3) {
+            bingqingDesc += "不能正常生活、";
+        }
+        if (diarrhea == 1) {
+            bingqingDesc += "轻度腹泻少于于3次、";
+        } else if (diarrhea == 2) {
+            bingqingDesc += "中度腹泻4-6次、";
+        } else if (diarrhea == 3) {
+            bingqingDesc += "重度腹泻超过6次、";
+        }
+
+        if (!Strings.isNullOrEmpty(statusDesp)) {
+            bingqingDesc += statusDesp;
+            bingqingDesc += "、";
+        }
+        if (!Strings.isNullOrEmpty(others)) {
+            bingqingDesc += others;
+        }
+        return bingqingDesc;
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.bofeng.entity;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.google.common.base.Strings;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -13,6 +14,7 @@ public class ExcelRiBaoLY {
     private String ridgepole;
     private String unit;
     private String doorplate;
+    private BigDecimal temperature;
     private int grender;
     private int familyStatus;
     private int medical;
@@ -87,8 +89,14 @@ public class ExcelRiBaoLY {
 //    @ExcelProperty(value = "年龄", index = 11)
 //    private String age;
 
+
     @ExcelProperty(value = "体温", index = 10)
-    private BigDecimal temperature;
+    private String temperatureStr;
+    public String getTemperatureStr() {
+        temperatureStr = temperature.floatValue()>10?temperature+"":"未填报";
+        return temperatureStr;
+    }
+
 
     @ExcelProperty(value = "确诊", index = 11)
     private String medicalStr;
@@ -112,90 +120,90 @@ public class ExcelRiBaoLY {
         return singleRoomStr;
     }
 
-//    @ExcelProperty(value = "身体基本情况", index = 14)
-//    private String baseDesc;
-//    public String getBaseDesc() {
-//        if (familyStatus == 0) {
-//            baseDesc = "无病史";
-//        } else if (familyStatus == 1) {
-//            baseDesc = "心血管疾病（服用ARB）";
-//        } else if (familyStatus == 2) {
-//            baseDesc = "心血管疾病（未服用ARB）";
-//        } else if (familyStatus == 3) {
-//            baseDesc = "呼吸系统病史";
-//        } else if (familyStatus == 4) {
-//            baseDesc = "肿瘤病史";
-//        } else if (familyStatus == 5) {
-//            baseDesc = "糖尿病史";
-//        } else if (familyStatus == 6) {
-//            baseDesc = "服用过激素药物";
-//        } else if (familyStatus == 7) {
-//            baseDesc = "妊娠期";
-//        } else {
-//            baseDesc = "其他";
-//        }
-//        return baseDesc;
-//    }
-//
-//    @ExcelProperty(value = "病情描述", index = 15)
-//    private String bingqingDesc = "";
-//    public String getBingqingDesc() {
-//
-//        if (medical == 1) {
-//            bingqingDesc += "已确诊、";
-//        }
-//
-//        if (singleRoom == 1) {
-//            bingqingDesc += "单间隔离、";
-//        }
-//
-//        bingqingDesc = bingqingDesc + "体温：" + temperature + "、";
-//
-//        if (cough == 1) {
-//            bingqingDesc += "偶尔短暂咳嗽、";
-//        } else if (cough == 2) {
-//            bingqingDesc += "咳嗽轻度影响生活、";
-//        } else if (cough == 3) {
-//            bingqingDesc += "咳嗽严重影响生活、";
-//        }
-//        if (muscle == 1) {
-//            bingqingDesc += "肌肉按压有酸痛、";
-//        } else if (muscle == 2) {
-//            bingqingDesc += "偶尔肌肉按压酸痛、";
-//        } else if (muscle == 3) {
-//            bingqingDesc += "肌肉按压持续酸痛、";
-//        }
-//        if (dyspnea == 1) {
-//            bingqingDesc += "呼吸急走或上坡气短、";
-//        } else if (dyspnea == 2) {
-//            bingqingDesc += "呼吸气短而走路变慢、";
-//        } else if (dyspnea == 3) {
-//            bingqingDesc += "呼吸走路数分钟后气短、";
-//        } else if (dyspnea == 4) {
-//            bingqingDesc += "呼吸气短无法离开房间、";
-//        }
-//        if (fatigue == 1) {
-//            bingqingDesc += "可体力劳动但觉得累、";
-//        } else if (fatigue == 2) {
-//            bingqingDesc += "轻体力劳动后长时间不能恢复、";
-//        } else if (fatigue == 3) {
-//            bingqingDesc += "不能正常生活、";
-//        }
-//        if (diarrhea == 1) {
-//            bingqingDesc += "轻度腹泻少于于3次、";
-//        } else if (diarrhea == 2) {
-//            bingqingDesc += "中度腹泻4-6次、";
-//        } else if (diarrhea == 3) {
-//            bingqingDesc += "重度腹泻超过6次、";
-//        }
-//
-//        if (!Strings.isNullOrEmpty(statusDesp)) {
-//            bingqingDesc += statusDesp;
-//            bingqingDesc += "、";
-//        }
-//        if (!Strings.isNullOrEmpty(others)) {
-//            bingqingDesc += others;
-//        }
-//        return bingqingDesc;
-//    }
+    @ExcelProperty(value = "身体基本情况", index = 13)
+    private String baseDesc;
+    public String getBaseDesc() {
+        if (familyStatus == 0) {
+            baseDesc = "无病史";
+        } else if (familyStatus == 1) {
+            baseDesc = "心血管疾病（服用ARB）";
+        } else if (familyStatus == 2) {
+            baseDesc = "心血管疾病（未服用ARB）";
+        } else if (familyStatus == 3) {
+            baseDesc = "呼吸系统病史";
+        } else if (familyStatus == 4) {
+            baseDesc = "肿瘤病史";
+        } else if (familyStatus == 5) {
+            baseDesc = "糖尿病史";
+        } else if (familyStatus == 6) {
+            baseDesc = "服用过激素药物";
+        } else if (familyStatus == 7) {
+            baseDesc = "妊娠期";
+        } else {
+            baseDesc = "其他";
+        }
+        return baseDesc;
+    }
+
+    @ExcelProperty(value = "病情描述", index = 14)
+    private String bingqingDesc = "";
+    public String getBingqingDesc() {
+
+        if (medical == 1) {
+            bingqingDesc += "已确诊、";
+        }
+
+        if (singleRoom == 1) {
+            bingqingDesc += "单间隔离、";
+        }
+
+        bingqingDesc = bingqingDesc + "体温：" + temperatureStr + "、";
+
+        if (cough == 1) {
+            bingqingDesc += "偶尔短暂咳嗽、";
+        } else if (cough == 2) {
+            bingqingDesc += "咳嗽轻度影响生活、";
+        } else if (cough == 3) {
+            bingqingDesc += "咳嗽严重影响生活、";
+        }
+        if (muscle == 1) {
+            bingqingDesc += "肌肉按压有酸痛、";
+        } else if (muscle == 2) {
+            bingqingDesc += "偶尔肌肉按压酸痛、";
+        } else if (muscle == 3) {
+            bingqingDesc += "肌肉按压持续酸痛、";
+        }
+        if (dyspnea == 1) {
+            bingqingDesc += "呼吸急走或上坡气短、";
+        } else if (dyspnea == 2) {
+            bingqingDesc += "呼吸气短而走路变慢、";
+        } else if (dyspnea == 3) {
+            bingqingDesc += "呼吸走路数分钟后气短、";
+        } else if (dyspnea == 4) {
+            bingqingDesc += "呼吸气短无法离开房间、";
+        }
+        if (fatigue == 1) {
+            bingqingDesc += "可体力劳动但觉得累、";
+        } else if (fatigue == 2) {
+            bingqingDesc += "轻体力劳动后长时间不能恢复、";
+        } else if (fatigue == 3) {
+            bingqingDesc += "不能正常生活、";
+        }
+        if (diarrhea == 1) {
+            bingqingDesc += "轻度腹泻少于于3次、";
+        } else if (diarrhea == 2) {
+            bingqingDesc += "中度腹泻4-6次、";
+        } else if (diarrhea == 3) {
+            bingqingDesc += "重度腹泻超过6次、";
+        }
+
+        if (!Strings.isNullOrEmpty(statusDesp)) {
+            bingqingDesc += statusDesp;
+            bingqingDesc += "、";
+        }
+        if (!Strings.isNullOrEmpty(others)) {
+            bingqingDesc += others;
+        }
+        return bingqingDesc;
+    }
 }

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

@@ -14,6 +14,7 @@ public class ExcelRiBaoPrivate {
     private String ridgepole;
     private String unit;
     private String doorplate;
+    private BigDecimal temperature;
     private int grender;
     private int familyStatus;
     private int medical;
@@ -23,6 +24,7 @@ public class ExcelRiBaoPrivate {
     private int fatigue;
     private int diarrhea;
     private int singleRoom;
+    private int scoreRezult;
     private String statusDesp = "";
     private String others = "";
 
@@ -98,7 +100,11 @@ public class ExcelRiBaoPrivate {
     private String age;
 
     @ExcelProperty(value = "体温", index = 13)
-    private BigDecimal temperature;
+    private String temperatureStr;
+    public String getTemperatureStr() {
+        temperatureStr = temperature.floatValue()>10?temperature+"":"未填报";
+        return temperatureStr;
+    }
 
     @ExcelProperty(value = "确诊", index = 14)
     private String medicalStr;
@@ -159,7 +165,7 @@ public class ExcelRiBaoPrivate {
             bingqingDesc += "单间隔离、";
         }
 
-        bingqingDesc = bingqingDesc + "体温：" + temperature + "、";
+        bingqingDesc = bingqingDesc + "体温：" + temperatureStr + "、";
 
         if (cough == 1) {
             bingqingDesc += "偶尔短暂咳嗽、";
@@ -208,4 +214,25 @@ public class ExcelRiBaoPrivate {
         }
         return bingqingDesc;
     }
+
+
+    @ExcelProperty(value = "健康评估", index = 18)
+    private String scoreRezultStr;
+    public String getScoreRezultStr() {
+        if (scoreRezult == 0) {
+            scoreRezultStr = "未评估";
+        } else if (scoreRezult == 1) {
+            scoreRezultStr = "正常";
+        } else if (scoreRezult == 2) {
+            scoreRezultStr = "注意观察";
+        } else if (scoreRezult == 3) {
+            scoreRezultStr = "联系医生";
+        } else if (scoreRezult == 4) {
+            scoreRezultStr = "尽快就诊";
+        } else {
+            scoreRezultStr = "";
+        }
+        return scoreRezultStr;
+    }
+
 }

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

@@ -93,7 +93,7 @@ public class MsSuspected {
     private Integer score;
 
     @TableField("score_rezult")
-    private Integer scoreRezult;
+    private Integer score_rezult;
 
     @TableField(exist = false)
     private String diarrheaStr = "";

whepi-web/src/main/java/com/bofeng/wx/controller/YeWeiHuiController.java

@@ -226,7 +226,9 @@ public class YeWeiHuiController {
     public void exportRiBao(@Pd(name = "uptownId") Long uptownId,
                             @Pd(name = "date") String date,
                             HttpServletResponse resp) {
-
+        if (uptownId == 1238790987234L) {
+            return;
+        }
         Uptown uptown = uptownMapper.selectById(uptownId);
         if (uptown!=null && uptown.getUptownId()>0) {
             Long upId = uptown.getUptownId();