凌云集团更改公司

admin-ui/app/whepi/lingyun/HCDialogDetail.js

@@ -55,6 +55,22 @@ define(function (require) {
             },
             {field: 'temperature', title: '温度', maxWidth: 100, align: 'right',},
             {field: 'bingqingDesc', title: '病情表述', maxWidth: 300, align: 'left',},
+            {field: 'isContactDesc', title: '家人确诊或接触', align: 'left',formatter: function (value) {
+                if (value == "否") {
+                  return "<span style='color: green;'>否<span>";
+                } else {
+                  return "<span style='color: red;'>是<span>";
+                }
+              }
+            },
+            {field: 'isSuspectedDesc', title: '家人健康异常', align: 'left',formatter: function (value) {
+                if (value == "否") {
+                  return "<span style='color: green;'>否<span>";
+                } else {
+                  return "<span style='color: red;'>是<span>";
+                }
+              }
+            },
             // {field: 'autoLocal', title: '定位地区', maxWidth: 200, align: 'left',},
             // {field: 'autoAddr', title: '定位地址', maxWidth: 200, align: 'left',},
           ]],

admin-ui/app/whepi/lingyun/HCUser.js

@@ -195,6 +195,22 @@ define(function (require) {
                     {field: 'phone', title: '联系电话', maxWidth: 200, align: 'left',},
                     {field: 'doorplate', title: '工号', maxWidth: 200, align: 'left',},
                     {field: 'bingqingDesc', title: '病情表述', align: 'left',},
+                    {field: 'isContactDesc', title: '家人确诊或接触', align: 'left',formatter: function (value) {
+                        if (value == "否") {
+                          return "<span style='color: green;'>否<span>";
+                        } else {
+                          return "<span style='color: red;'>是<span>";
+                        }
+                      }
+                    },
+                    {field: 'isSuspectedDesc', title: '家人健康异常', align: 'left',formatter: function (value) {
+                        if (value == "否") {
+                          return "<span style='color: green;'>否<span>";
+                        } else {
+                          return "<span style='color: red;'>是<span>";
+                        }
+                      }
+                    },
                   ]
                 ]
             }

admin-ui/app/whepi/lingyun/dialogDetail.js

@@ -63,6 +63,14 @@ define(function (require) {
                 }
               }
             },
+            {field: 'isSuspectedDesc', title: '家人健康异常', align: 'left',formatter: function (value) {
+                if (value == "否") {
+                  return "<span style='color: green;'>否<span>";
+                } else {
+                  return "<span style='color: red;'>是<span>";
+                }
+              }
+            },
             {field: 'workLoalDesc', title: '工作驻地', maxWidth: 100, align: 'left',},
             {field: 'todayLoalDesc', title: '今晚住地', maxWidth: 100, align: 'left',},
             {field: 'autoLocal', title: '定位地区', maxWidth: 200, align: 'left',},

admin-ui/app/whepi/lingyun/lingyunUser.js

@@ -233,7 +233,7 @@ define(function (require) {
                         }
                       }
                     },
-                    {field: 'isSuspectedDesc', title: '同居或近期接触的家庭成员中有感冒、发热、咳嗽等症状', align: 'left',formatter: function (value) {
+                    {field: 'isSuspectedDesc', title: '家人健康异常', align: 'left',formatter: function (value) {
                         if (value == "否") {
                           return "<span style='color: green;'>否<span>";
                         } else {

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

@@ -105,7 +105,7 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
     @Select(
             "select suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.phone,msr.safety_num as safetyNum, msr.report_status as reportStatus,msr.ms_status as msStatus,\n" +
                     "msr.sure_num as sureNum,msr.suspected_num as suspectedNum,msr.normal_num as normalNum, msr.report_date as reportDate,\n" +
-                    "msr.single_num as singleNum,mss.user_name as userName,mss.grender, mss.is_contact, mss.age,mss.family_status as familyStatus,\n" +
+                    "msr.single_num as singleNum,mss.user_name as userName,mss.grender, mss.is_contact, mss.is_suspected, 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" +
                     "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\n" +
                     "from ms_report msr\n" +

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

@@ -45,6 +45,8 @@ public class ExcelRiBaoHCBM4 {
     private String autoLocal="";
     private String autoAddr="";
     private int isTrip = 0;
+    private int isContact = 0;
+    private int isSuspected = 0;
 
     private Date reportDate;
     private int msStatus;
@@ -365,4 +367,9 @@ public class ExcelRiBaoHCBM4 {
 
     private String tripDetDesc = "";
 
+    @ExcelProperty(value = "家人确诊或接触", index = 5)
+    private String isContactDesc = "";
+
+    @ExcelProperty(value = "家人健康异常", index = 6)
+    private String isSuspectedDesc = "";
 }

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

@@ -377,7 +377,7 @@ public class ExcelRiBaoLYBM4 {
     @ExcelProperty(value = "家人确诊或接触", index = 8)
     private String isContactDesc = "";
 
-    @ExcelProperty(value = "同居或近期接触的家庭成员中有感冒、发热、咳嗽等症状", index = 9)
+    @ExcelProperty(value = "家人健康异常", index = 9)
     private String isSuspectedDesc = "";
 
 }

whepi-web/src/main/java/com/bofeng/service/SweepCodeService.java

@@ -89,6 +89,16 @@ public class SweepCodeService {
         if (sysUptownHouses != null && sysUptownHouses.size() > 0) {
             String tripDet;
             for (ExcelRiBaoLYBM4 excelRiBaoLYBM4 : sysUptownHouses) {
+                if (excelRiBaoLYBM4.getIsContact() == 0) {
+                    excelRiBaoLYBM4.setIsContactDesc("否");
+                } else if (excelRiBaoLYBM4.getIsContact() == 1) {
+                    excelRiBaoLYBM4.setIsContactDesc("是");
+                }
+                if (excelRiBaoLYBM4.getIsSuspected() == 0) {
+                    excelRiBaoLYBM4.setIsSuspectedDesc("否");
+                } else if (excelRiBaoLYBM4.getIsSuspected() == 1) {
+                    excelRiBaoLYBM4.setIsSuspectedDesc("是");
+                }
                 tripDet = "";
                 //出行详细
                 List<MsTripDet> listDet = msSuspectedMapper.selectTripSuspected(excelRiBaoLYBM4.getTripId());
@@ -117,6 +127,11 @@ public class SweepCodeService {
                 } else if (excelRiBaoLYBM4.getIsContact() == 1) {
                     excelRiBaoLYBM4.setIsContactDesc("是");
                 }
+                if (excelRiBaoLYBM4.getIsSuspected() == 0) {
+                    excelRiBaoLYBM4.setIsSuspectedDesc("否");
+                } else if (excelRiBaoLYBM4.getIsSuspected() == 1) {
+                    excelRiBaoLYBM4.setIsSuspectedDesc("是");
+                }
                 tripDet = "";
                 //出行详细
                 List<MsTripDet> listDet = msSuspectedMapper.selectTripSuspected(excelRiBaoLYBM4.getTripId());
@@ -175,6 +190,16 @@ public class SweepCodeService {
         if (sysUptownHouses != null && sysUptownHouses.size() > 0) {
             String tripDet;
             for (ExcelRiBaoHCBM4 excelRiBaoLYBM4 : sysUptownHouses) {
+                if (excelRiBaoLYBM4.getIsContact() == 0) {
+                    excelRiBaoLYBM4.setIsContactDesc("否");
+                } else if (excelRiBaoLYBM4.getIsContact() == 1) {
+                    excelRiBaoLYBM4.setIsContactDesc("是");
+                }
+                if (excelRiBaoLYBM4.getIsSuspected() == 0) {
+                    excelRiBaoLYBM4.setIsSuspectedDesc("否");
+                } else if (excelRiBaoLYBM4.getIsSuspected() == 1) {
+                    excelRiBaoLYBM4.setIsSuspectedDesc("是");
+                }
                 tripDet = "";
                 //出行详细
                 List<MsTripDet> listDet = msSuspectedMapper.selectTripSuspected(excelRiBaoLYBM4.getTripId());

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

@@ -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.is_contact as isContact,mss.is_suspected as isSuspected,
+        mss.medical,mss.temperature,mss.cough,mss.is_contact, mss.is_suspected,mss.muscle ,mss.dyspnea,mss.fatigue,mss.diarrhea,mss.single_room as singleRoom,mss.score_rezult,mss.temperature_score,mss.is_contact as isContact,mss.is_suspected as isSuspected,
         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