xielianghe

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

@@ -45,6 +45,7 @@ public class ExcelRiBaoLYBM4 {
     private String autoLocal="";
     private String autoAddr="";
     private int isTrip = 0;
+    private int isContact = 0;
 
     private Date reportDate;
     private int msStatus;
@@ -242,6 +243,9 @@ public class ExcelRiBaoLYBM4 {
             bingqingDesc += "解除隔离、";
         }
 
+        if (isContact == 1) {
+            bingqingDesc += "家庭成员中有新冠肺炎疫情或有过病例接触史人员、";
+        }
         if (singleRoom == 1) {
             bingqingDesc += "单间隔离、";
         }

whepi-web/src/main/resources/mapper/RbMapper.xml

@@ -34,7 +34,7 @@
         select suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.phone,msr.safety_num as safetyNum, msr.report_status as reportStatus,
         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,
+        mss.medical,mss.temperature,mss.cough,mss.muscle ,mss.dyspnea,mss.fatigue,mss.diarrhea,mss.single_room as singleRoom,mss.score_rezult,mss.is_contact,
         tr.trip_id,tr.is_trip,tr.today_local,tr.today_local_other,tr.work_local,tr.work_local_other, tr.auto_local, tr.auto_addr,ur.user_id as userId
         from sys_uptown_house suh
         inner join sys_uptown_home suho on suho.house_id=suh.house_id
@@ -102,7 +102,7 @@
         select suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.phone,msr.safety_num as safetyNum, msr.report_status as reportStatus,
         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,mss.temperature_score,
+        mss.medical,mss.temperature,mss.cough,mss.muscle ,mss.dyspnea,mss.fatigue,mss.diarrhea,mss.single_room as singleRoom,mss.score_rezult,mss.temperature_score,mss.is_contact,
         tr.trip_id,tr.is_trip,tr.today_local,tr.today_local_other,tr.work_local,tr.work_local_other, tr.auto_local, tr.auto_addr,ur.user_id as userId
         from sys_uptown_house suh
         inner join sys_uptown_home suho on suho.house_id=suh.house_id