tjiao

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

@@ -42,10 +42,11 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
     List<MsSuspected> selectYcXq(@Param("houseId") Long houseId, @Param("dateStr") String dateStr);
 
     @Select(
-            "select suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.phone,msr.safety_num," +
-            "msr.sure_num,msr.suspected_num,msr.normal_num,msr.single_num,mss.user_name,mss.grender," +
-            "mss.age,mss.family_status,mss.medical,mss.temperature,mss.cough,mss.muscle ,mss.dyspnea," +
-            "mss.fatigue,mss.diarrhea,mss.single_room from ms_suspected mss "+
+            "select suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.phone,msr.safety_num as safetyNum," +
+            "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 "+
             "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

@@ -15,7 +15,7 @@ public class ExcelRiBao {
     private String unit;
     private String doorplate;
     private int grender;
-    private int family_status;
+    private int familyStatus;
     private int medical;
     private BigDecimal temperature;
     private int cough;
@@ -23,8 +23,8 @@ public class ExcelRiBao {
     private int dyspnea;
     private int fatigue;
     private int diarrhea;
-    private int single_room;
-    private String status_desp = "";
+    private int singleRoom;
+    private String statusDesp = "";
     private String others = "";
 
 
@@ -55,22 +55,22 @@ public class ExcelRiBao {
     private String phone;
 
     @ExcelProperty(value = "今日居家人数", index = 4)
-    private int safety_num;
+    private int safetyNum;
 
     @ExcelProperty(value = "确诊入院人数", index = 5)
-    private int sure_num;
+    private int sureNum;
 
     @ExcelProperty(value = "隔离人数", index = 6)
-    private int single_num;
+    private int singleNum;
 
     @ExcelProperty(value = "异常观察人数", index = 7)
-    private int suspected_num;
+    private int suspectedNum;
 
     @ExcelProperty(value = "身体正常人数", index = 8)
-    private int normal_num;
+    private int normalNum;
 
     @ExcelProperty(value = "居家人员姓名", index = 9)
-    private String user_name;
+    private String userName;
 
     @ExcelProperty(value = "性别", index = 10)
     private String grenderStr;
@@ -92,21 +92,21 @@ public class ExcelRiBao {
     @ExcelProperty(value = "身体基本情况", index = 12)
     private String baseDesc;
     public String getBaseDesc() {
-        if (family_status == 0) {
+        if (familyStatus == 0) {
             baseDesc = "无病史";
-        } else if (family_status == 1) {
+        } else if (familyStatus == 1) {
             baseDesc = "心血管疾病（服用ARB）";
-        } else if (family_status == 2) {
+        } else if (familyStatus == 2) {
             baseDesc = "心血管疾病（未服用ARB）";
-        } else if (family_status == 3) {
+        } else if (familyStatus == 3) {
             baseDesc = "呼吸系统病史";
-        } else if (family_status == 4) {
+        } else if (familyStatus == 4) {
             baseDesc = "肿瘤病史";
-        } else if (family_status == 5) {
+        } else if (familyStatus == 5) {
             baseDesc = "糖尿病史";
-        } else if (family_status == 6) {
+        } else if (familyStatus == 6) {
             baseDesc = "服用过激素药物";
-        } else if (family_status == 7) {
+        } else if (familyStatus == 7) {
             baseDesc = "妊娠期";
         } else {
             baseDesc = "其他";
@@ -155,11 +155,11 @@ public class ExcelRiBao {
         } else if (diarrhea == 3) {
             bingqingDesc += "重度腹泻超过6次、";
         }
-        if (single_room == 1) {
+        if (singleRoom == 1) {
             bingqingDesc += "单间隔离、";
         }
-        if (!Strings.isNullOrEmpty(status_desp)) {
-            bingqingDesc += status_desp;
+        if (!Strings.isNullOrEmpty(statusDesp)) {
+            bingqingDesc += statusDesp;
             bingqingDesc += "、";
         }
         if (!Strings.isNullOrEmpty(others)) {