tjiao

whepi-ui/templates/yeweihui/ribaohuiz.ftl

@@ -1,5 +1,7 @@
 <#assign title="业委会"/>
+
 <div class="page__bd" style="height: 300px">
+    <div class="container">
     <header class="demos-header">
         <h1 class="demos-title" id="xiaoqu"></h1>
     </header>
@@ -37,4 +39,7 @@
             </div>
         </div>
     </div>
+        <div style="height: 30vh">
+        </div>
+    </div>
 </div>

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

@@ -17,7 +17,6 @@ public class ExcelRiBao {
     private int grender;
     private int familyStatus;
     private int medical;
-    private BigDecimal temperature;
     private int cough;
     private int muscle;
     private int dyspnea;
@@ -89,7 +88,21 @@ public class ExcelRiBao {
     @ExcelProperty(value = "年龄", index = 11)
     private String age;
 
-    @ExcelProperty(value = "身体基本情况", index = 12)
+    @ExcelProperty(value = "体温", index = 12)
+    private BigDecimal temperature;
+
+    @ExcelProperty(value = "确诊", index = 13)
+    private String medicalStr;
+    public String getMedicalStr() {
+        if (medical == 0) {
+            medicalStr = "否";
+        } else {
+            medicalStr = "是";
+        }
+        return medicalStr;
+    }
+
+    @ExcelProperty(value = "身体基本情况", index = 14)
     private String baseDesc;
     public String getBaseDesc() {
         if (familyStatus == 0) {
@@ -114,10 +127,20 @@ public class ExcelRiBao {
         return baseDesc;
     }
 
-    @ExcelProperty(value = "病情描述", index = 13)
+    @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) {
@@ -155,9 +178,7 @@ public class ExcelRiBao {
         } else if (diarrhea == 3) {
             bingqingDesc += "重度腹泻超过6次、";
         }
-        if (singleRoom == 1) {
-            bingqingDesc += "单间隔离、";
-        }
+
         if (!Strings.isNullOrEmpty(statusDesp)) {
             bingqingDesc += statusDesp;
             bingqingDesc += "、";