xiugai

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

@@ -45,6 +45,7 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
     @Select(
             "select count(a.house_id) as houseCount\n" +
                     "from sys_uptown_house a \n" +
+                    "inner join sys_uptown_home c on a.house_id=c.house_id\n" +
                     "INNER JOIN sys_uptown_unit b ON b.unit_id = a.unit_id and b.uptown_id = #{uptownId}"
     )
     Map<String, Integer> selecthuiz1(@Param("uptownId") Long uptownId);
@@ -69,41 +70,44 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
     Map<String, Integer> selecthuiz(@Param("uptownId") Long uptownId, @Param("date") String date);
 
     @Select(
-            "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,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} "+
-            "left join sys_uptown_home suho on suho.house_id = suh.house_id order by doorplate asc"
+            "select suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.phone,msr.safety_num as safetyNum, \n" +
+                    "msr.sure_num as sureNum,msr.suspected_num as suspectedNum,msr.normal_num as normalNum, \n" +
+                    "msr.single_num as singleNum,mss.user_name as userName,mss.grender, mss.age,mss.family_status as familyStatus,\n" +
+                    "mss.medical,mss.temperature,mss.cough,mss.muscle ,mss.dyspnea,mss.fatigue,mss.diarrhea,mss.single_room as singleRoom,mss.score_rezult \n" +
+                    "from sys_uptown_house suh\n" +
+                    "inner join sys_uptown_home suho on suho.house_id=suh.house_id\n" +
+                    "INNER JOIN sys_uptown_unit suu ON suu.unit_id = suh.unit_id and suu.uptown_id=#{uptownId}\n" +
+                    "left join ms_report msr on msr.house_id = suh.house_id and msr.report_date = #{date}\n" +
+                    "left join ms_suspected mss on mss.report_id=msr.report_id\n" +
+                    "order by suu.unit_id asc "
     )
     List<ExcelRiBao> selectExcelRiBao(@Param("uptownId") Long uptownId, @Param("date") String date);
 
     @Select(
-            "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,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} "+
-                    "left join sys_uptown_home suho on suho.house_id = suh.house_id order by doorplate asc"
+            "select suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.phone,msr.safety_num as safetyNum, \n" +
+                    "msr.sure_num as sureNum,msr.suspected_num as suspectedNum,msr.normal_num as normalNum, \n" +
+                    "msr.single_num as singleNum,mss.user_name as userName,mss.grender, mss.age,mss.family_status as familyStatus,\n" +
+                    "mss.medical,mss.temperature,mss.cough,mss.muscle ,mss.dyspnea,mss.fatigue,mss.diarrhea,mss.single_room as singleRoom,mss.score_rezult \n" +
+                    "from sys_uptown_house suh\n" +
+                    "inner join sys_uptown_home suho on suho.house_id=suh.house_id\n" +
+                    "INNER JOIN sys_uptown_unit suu ON suu.unit_id = suh.unit_id and suu.uptown_id=#{uptownId}\n" +
+                    "left join ms_report msr on msr.house_id = suh.house_id and msr.report_date = #{date}\n" +
+                    "left join ms_suspected mss on mss.report_id=msr.report_id\n" +
+                    "order by suu.unit_id asc "
     )
     List<ExcelRiBaoLY> selectExcelRiBaoLY(@Param("uptownId") Long uptownId, @Param("date") String date);
 
     @Select(
-            "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,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} "+
-                    "left join sys_uptown_home suho on suho.house_id = suh.house_id order by doorplate asc"
+            "select suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.phone,msr.safety_num as safetyNum, \n" +
+                    "msr.sure_num as sureNum,msr.suspected_num as suspectedNum,msr.normal_num as normalNum, \n" +
+                    "msr.single_num as singleNum,mss.user_name as userName,mss.grender, mss.age,mss.family_status as familyStatus,\n" +
+                    "mss.medical,mss.temperature,mss.cough,mss.muscle ,mss.dyspnea,mss.fatigue,mss.diarrhea,mss.single_room as singleRoom,mss.score_rezult \n" +
+                    "from sys_uptown_house suh\n" +
+                    "inner join sys_uptown_home suho on suho.house_id=suh.house_id\n" +
+                    "INNER JOIN sys_uptown_unit suu ON suu.unit_id = suh.unit_id and suu.uptown_id=#{uptownId}\n" +
+                    "left join ms_report msr on msr.house_id = suh.house_id and msr.report_date = #{date}\n" +
+                    "left join ms_suspected mss on mss.report_id=msr.report_id\n" +
+                    "order by suu.unit_id asc "
     )
     List<ExcelRiBaoPrivate> selectExcelRiBaoPrivate(@Param("uptownId") Long uptownId, @Param("date") String date);
 

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

@@ -12,19 +12,20 @@ import java.math.BigDecimal;
 @Setter
 public class ExcelRiBao {
 
-    private String ridgepole;
-    private String unit;
-    private String doorplate;
-    private BigDecimal temperature;
-    private int grender;
-    private String familyStatus;
-    private int medical;
-    private int cough;
-    private int muscle;
-    private int dyspnea;
-    private int fatigue;
-    private int diarrhea;
-    private int singleRoom;
+    private String ridgepole = "";
+    private String unit = "";
+    private String doorplate = "";
+    private BigDecimal temperature = new BigDecimal(0);
+    private int grender = 0;
+    private String familyStatus = "0,0,0,0,0,0,0";
+    private int medical = 0;
+    private int cough = 0;
+    private int muscle = 0;
+    private int dyspnea = 0;
+    private int fatigue = 0;
+    private int diarrhea = 0;
+    private int singleRoom = 0;
+    private int scoreRezult = 0;
     private String statusDesp = "";
     private String others = "";
 

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

@@ -12,19 +12,20 @@ import java.math.BigDecimal;
 @Setter
 public class ExcelRiBaoLY {
 
-    private String ridgepole;
-    private String unit;
-    private String doorplate;
-    private BigDecimal temperature;
-    private int grender;
-    private String familyStatus;
-    private int medical;
-    private int cough;
-    private int muscle;
-    private int dyspnea;
-    private int fatigue;
-    private int diarrhea;
-    private int singleRoom;
+    private String ridgepole = "";
+    private String unit = "";
+    private String doorplate = "";
+    private BigDecimal temperature = new BigDecimal(0);
+    private int grender = 0;
+    private String familyStatus = "0,0,0,0,0,0,0";
+    private int medical = 0;
+    private int cough = 0;
+    private int muscle = 0;
+    private int dyspnea = 0;
+    private int fatigue = 0;
+    private int diarrhea = 0;
+    private int singleRoom = 0;
+    private int scoreRezult = 0;
     private String statusDesp = "";
     private String others = "";
 

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

@@ -12,20 +12,20 @@ import java.math.BigDecimal;
 @Setter
 public class ExcelRiBaoPrivate {
 
-    private String ridgepole;
-    private String unit;
-    private String doorplate;
-    private BigDecimal temperature;
-    private int grender;
-    private String familyStatus;
-    private int medical;
-    private int cough;
-    private int muscle;
-    private int dyspnea;
-    private int fatigue;
-    private int diarrhea;
-    private int singleRoom;
-    private int scoreRezult;
+    private String ridgepole = "";
+    private String unit = "";
+    private String doorplate = "";
+    private BigDecimal temperature = new BigDecimal(0);
+    private int grender = 0;
+    private String familyStatus = "0,0,0,0,0,0,0";
+    private int medical = 0;
+    private int cough = 0;
+    private int muscle = 0;
+    private int dyspnea = 0;
+    private int fatigue = 0;
+    private int diarrhea = 0;
+    private int singleRoom = 0;
+    private int scoreRezult = 0;
     private String statusDesp = "";
     private String others = "";