xielianghe

whepi-ui/templates/home/ribao.ftl

@@ -124,7 +124,7 @@
                     <input id="suspectedId" type="text" hidden="hidden" value=""/>
                     <div style="height: 5vh; line-height: 5vh;margin-left: 2vw;">病情描述</div>
                     <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                        <div style="color: gray;height: 5vh; line-height: 5vh; width: 70%;">是否确诊新冠肺炎</div>
+                        <div style="color: gray;height: 5vh; line-height: 5vh; width: 70%;">确诊新冠肺炎</div>
                         <input id="switchQuezhen" class="weui-input" autofocus="" type="text" placeholder="请选择"
                                maxlength="20"
                                style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>

whepi-ui/templates/home/ribao.js

@@ -572,10 +572,10 @@ function updateSuspected(suspectedId) {
         $("#jibenmiaoshu").val(suspected.statusDesp);
 
         $("#switchQuezhen").val(getMedical(suspected.medical));
-        $("#switchQuezhen").attr("data-values", suspected.familyStatus);
+        $("#switchQuezhen").attr("data-values", suspected.medical);
 
         $("#switchDanjiangeli").val(getSingleRoom(suspected.singleRoom));
-        $("#switchDanjiangeli").attr("data-values", suspected.familyStatus);
+        $("#switchDanjiangeli").attr("data-values", suspected.singleRoom);
 
         $("#js_input_user_tiwen").val(suspected.temperature);
 
@@ -709,25 +709,25 @@ function getGreder(greder) {
   return "";
 }
 
-function getFamilyStatus(familyStatus) {
-  if (familyStatus == 0)
-    return "无病史";
-  if (familyStatus == 1)
-    return "心脑血管疾病（服用ARB）";
-  else if (familyStatus == 2)
-    return "心脑血管疾病（未服ARB）";
-  else if (familyStatus == 3)
-    return "呼吸系统病史";
-  else if (familyStatus == 4)
-    return "肿瘤病史";
-  else if (familyStatus == 5)
-    return "糖尿病史";
-  else if (familyStatus == 6)
-    return "服用过激素药物";
-  else if (familyStatus == 7)
-    return "妊娠期";
-  return "";
-}
+// function getFamilyStatus(familyStatus) {
+//   if (familyStatus == 0)
+//     return "无病史";
+//   if (familyStatus == 1)
+//     return "心脑血管疾病（服用ARB）";
+//   else if (familyStatus == 2)
+//     return "心脑血管疾病（未服ARB）";
+//   else if (familyStatus == 3)
+//     return "呼吸系统病史";
+//   else if (familyStatus == 4)
+//     return "肿瘤病史";
+//   else if (familyStatus == 5)
+//     return "糖尿病史";
+//   else if (familyStatus == 6)
+//     return "服用过激素药物";
+//   else if (familyStatus == 7)
+//     return "妊娠期";
+//   return "";
+// }
 
 function getCough(cough) {
   if (cough == 0)

whepi-web/src/main/java/com/bofeng/dao/RbMapper.java

@@ -73,7 +73,7 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
             "msr.sure_num as sureNum,msr.suspected_num as suspectedNum,msr.normal_num as normalNum," +
                     "msr.single_num as singleNum,mss.user_name as userName,mss.grender," +
             "mss.age,mss.family_status as familyStatus,mss.medical,mss.temperature,mss.cough,mss.muscle ,mss.dyspnea," +
-            "mss.fatigue,mss.diarrhea,mss.single_room as singleRoom from ms_suspected mss "+
+            "mss.fatigue,mss.diarrhea,mss.single_room as singleRoom,mss.score_rezult from ms_suspected mss "+
             "inner join ms_report msr on msr.report_id = mss.report_id and msr.report_date = #{date} "+
             "inner join sys_uptown_house suh on suh.house_id = msr.house_id "+
             "inner join sys_uptown_unit suu on suu.unit_id = suh.unit_id and suu.uptown_id=#{uptownId} "+
@@ -86,7 +86,7 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
                     "msr.sure_num as sureNum,msr.suspected_num as suspectedNum,msr.normal_num as normalNum," +
                     "msr.single_num as singleNum,mss.user_name as userName,mss.grender," +
                     "mss.age,mss.family_status as familyStatus,mss.medical,mss.temperature,mss.cough,mss.muscle ,mss.dyspnea," +
-                    "mss.fatigue,mss.diarrhea,mss.single_room as singleRoom from ms_suspected mss "+
+                    "mss.fatigue,mss.diarrhea,mss.single_room as singleRoom,mss.score_rezult from ms_suspected mss "+
                     "inner join ms_report msr on msr.report_id = mss.report_id and msr.report_date = #{date} "+
                     "inner join sys_uptown_house suh on suh.house_id = msr.house_id "+
                     "inner join sys_uptown_unit suu on suu.unit_id = suh.unit_id and suu.uptown_id=#{uptownId} "+
@@ -99,7 +99,7 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
                     "msr.sure_num as sureNum,msr.suspected_num as suspectedNum,msr.normal_num as normalNum," +
                     "msr.single_num as singleNum,mss.user_name as userName,mss.grender," +
                     "mss.age,mss.family_status as familyStatus,mss.medical,mss.temperature,mss.cough,mss.muscle ,mss.dyspnea," +
-                    "mss.fatigue,mss.diarrhea,mss.single_room as singleRoom from ms_suspected mss "+
+                    "mss.fatigue,mss.diarrhea,mss.single_room as singleRoom,mss.score_rezult from ms_suspected mss "+
                     "inner join ms_report msr on msr.report_id = mss.report_id and msr.report_date = #{date} "+
                     "inner join sys_uptown_house suh on suh.house_id = msr.house_id "+
                     "inner join sys_uptown_unit suu on suu.unit_id = suh.unit_id and suu.uptown_id=#{uptownId} "+

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

@@ -2,6 +2,7 @@ package com.bofeng.entity;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.google.common.base.Strings;
+import com.yvan.platform.Conv;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -16,7 +17,7 @@ public class ExcelRiBao {
     private String doorplate;
     private BigDecimal temperature;
     private int grender;
-    private int familyStatus;
+    private String familyStatus;
     private int medical;
     private int cough;
     private int muscle;
@@ -119,28 +120,32 @@ public class ExcelRiBao {
     }
 
     @ExcelProperty(value = "身体基本情况", index = 13)
-    private String baseDesc;
+    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 = "其他";
+
+        if (Conv.NI(familyStatus.split(",")[0]) == 1) {
+            baseDesc = "心血管疾病（服用ARB）,";
+        }
+        if (Conv.NI(familyStatus.split(",")[1]) == 1) {
+            baseDesc += "心血管疾病（未服用ARB）,";
+        }
+        if (Conv.NI(familyStatus.split(",")[2]) == 1) {
+            baseDesc += "呼吸系统病史,";
+        }
+        if (Conv.NI(familyStatus.split(",")[3]) == 1) {
+            baseDesc += "肿瘤病史,";
+        }
+        if (Conv.NI(familyStatus.split(",")[4]) == 1) {
+            baseDesc += "糖尿病史,";
+        }
+        if (Conv.NI(familyStatus.split(",")[5]) == 1) {
+            baseDesc += "服用过激素药物,";
+        }
+        if (Conv.NI(familyStatus.split(",")[6]) == 1) {
+            baseDesc += "妊娠期";
         }
-        return baseDesc;
+        return baseDesc.substring(0, baseDesc.length() - 1);
     }
 
     @ExcelProperty(value = "病情描述", index = 14)

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

@@ -2,6 +2,7 @@ package com.bofeng.entity;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.google.common.base.Strings;
+import com.yvan.platform.Conv;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -16,7 +17,7 @@ public class ExcelRiBaoLY {
     private String doorplate;
     private BigDecimal temperature;
     private int grender;
-    private int familyStatus;
+    private String familyStatus;
     private int medical;
     private int cough;
     private int muscle;
@@ -121,28 +122,32 @@ public class ExcelRiBaoLY {
     }
 
     @ExcelProperty(value = "身体基本情况", index = 13)
-    private String baseDesc;
+    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 = "其他";
+
+        if (Conv.NI(familyStatus.split(",")[0]) == 1) {
+            baseDesc = "心血管疾病（服用ARB）,";
+        }
+        if (Conv.NI(familyStatus.split(",")[1]) == 1) {
+            baseDesc += "心血管疾病（未服用ARB）,";
+        }
+        if (Conv.NI(familyStatus.split(",")[2]) == 1) {
+            baseDesc += "呼吸系统病史,";
+        }
+        if (Conv.NI(familyStatus.split(",")[3]) == 1) {
+            baseDesc += "肿瘤病史,";
+        }
+        if (Conv.NI(familyStatus.split(",")[4]) == 1) {
+            baseDesc += "糖尿病史,";
+        }
+        if (Conv.NI(familyStatus.split(",")[5]) == 1) {
+            baseDesc += "服用过激素药物,";
+        }
+        if (Conv.NI(familyStatus.split(",")[6]) == 1) {
+            baseDesc += "妊娠期";
         }
-        return baseDesc;
+        return baseDesc.substring(0, baseDesc.length() - 1);
     }
 
     @ExcelProperty(value = "病情描述", index = 14)

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

@@ -2,6 +2,7 @@ package com.bofeng.entity;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.google.common.base.Strings;
+import com.yvan.platform.Conv;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -16,7 +17,7 @@ public class ExcelRiBaoPrivate {
     private String doorplate;
     private BigDecimal temperature;
     private int grender;
-    private int familyStatus;
+    private String familyStatus;
     private int medical;
     private int cough;
     private int muscle;
@@ -41,6 +42,7 @@ public class ExcelRiBaoPrivate {
 
     @ExcelProperty(value = "单元", index = 1)
     private String danyuan = "";
+
     public String getDanyuan() {
         if (danyuan.length() <= 0) {
             danyuan = unit;
@@ -101,13 +103,15 @@ public class ExcelRiBaoPrivate {
 
     @ExcelProperty(value = "体温", index = 13)
     private String temperatureStr;
+
     public String getTemperatureStr() {
-        temperatureStr = temperature.floatValue()>10?temperature+"":"未填报";
+        temperatureStr = temperature.floatValue() > 10 ? temperature + "" : "未填报";
         return temperatureStr;
     }
 
     @ExcelProperty(value = "确诊", index = 14)
     private String medicalStr;
+
     public String getMedicalStr() {
         if (medical == 0) {
             medicalStr = "否";
@@ -119,6 +123,7 @@ public class ExcelRiBaoPrivate {
 
     @ExcelProperty(value = "单间隔离", index = 15)
     private String singleRoomStr;
+
     public String getSingleRoomStr() {
         if (singleRoom == 0) {
             singleRoomStr = "否";
@@ -129,32 +134,37 @@ public class ExcelRiBaoPrivate {
     }
 
     @ExcelProperty(value = "身体基本情况", index = 16)
-    private String baseDesc;
+    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 = "其他";
+
+        if (Conv.NI(familyStatus.split(",")[0]) == 1) {
+            baseDesc = "心血管疾病（服用ARB）,";
+        }
+        if (Conv.NI(familyStatus.split(",")[1]) == 1) {
+            baseDesc += "心血管疾病（未服用ARB）,";
         }
-        return baseDesc;
+        if (Conv.NI(familyStatus.split(",")[2]) == 1) {
+            baseDesc += "呼吸系统病史,";
+        }
+        if (Conv.NI(familyStatus.split(",")[3]) == 1) {
+            baseDesc += "肿瘤病史,";
+        }
+        if (Conv.NI(familyStatus.split(",")[4]) == 1) {
+            baseDesc += "糖尿病史,";
+        }
+        if (Conv.NI(familyStatus.split(",")[5]) == 1) {
+            baseDesc += "服用过激素药物,";
+        }
+        if (Conv.NI(familyStatus.split(",")[6]) == 1) {
+            baseDesc += "妊娠期";
+        }
+        return baseDesc.substring(0, baseDesc.length() - 1);
     }
 
     @ExcelProperty(value = "病情描述", index = 17)
     private String bingqingDesc = "";
+
     public String getBingqingDesc() {
 
         if (medical == 1) {
@@ -218,6 +228,7 @@ public class ExcelRiBaoPrivate {
 
     @ExcelProperty(value = "健康评估", index = 18)
     private String scoreRezultStr;
+
     public String getScoreRezultStr() {
         if (scoreRezult == 0) {
             scoreRezultStr = "未评估";