xielianghe

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

@@ -233,6 +233,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: 200, align: 'left',},
                     {field: 'todayLoalDesc', title: '今晚住地', maxWidth: 200, align: 'left',},
                     {field: 'autoLocal', title: '定位地区', maxWidth: 200, align: 'left',},

whepi-ui/templates/home/ribao.ftl

@@ -179,7 +179,7 @@
                             </div>
                         </div>
                         <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                            <div style="color: gray;height: 10vh; line-height: 5vh; width: 140%;">
+                            <div style="color: gray;height: 10vh; line-height: 5vh; width: 150%;">
                                 家庭成员中有新冠肺炎疫情或有过病例接触史人员
                             </div>
                             <div class="weui-cells_checkbox" style="width: 100%; margin-top: 2.5vh;">
@@ -195,6 +195,23 @@
                                 </label>
                             </div>
                         </div>
+                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                            <div style="color: gray;height: 10vh; line-height: 5vh; width: 150%;">
+                                同居或近期接触的家庭成员中有感冒、发热、咳嗽等症状
+                            </div>
+                            <div class="weui-cells_checkbox" style="width: 100%; margin-top: 2.5vh;">
+                                <label class="weui-radio weui-cell_active weui-check__label" for="s38">
+                                    <input type="radio" name="radio2" value="0" class="weui-check" id="s38"
+                                           style="width: 10%"/>
+                                    <i class="weui-icon-checked"></i>否
+                                </label>
+                                <label class="weui-radio weui-cell_active weui-check__label" for="s39">
+                                    <input type="radio" name="radio2" value="1" class="weui-check" id="s39"
+                                           style="width: 10%"/>
+                                    <i class="weui-icon-checked"></i>是
+                                </label>
+                            </div>
+                        </div>
                     <#--<div id="ribao_djgl">-->
                     <#--<div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">-->
                     <#--<div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">单间隔离</div>-->

whepi-ui/templates/home/ribao.js

@@ -402,7 +402,7 @@ function selectinput1(obj) {
   if (grender != 4) {//js_input_qtdd
     // $('#js_input_qtdd')[0].disabled == 'disabled'+
     +
-    $("#js_input_qtdd").val("");
+      $("#js_input_qtdd").val("");
   } else {
     $('#js_input_qtdd').removeAttr("disabled")
   }
@@ -749,6 +749,9 @@ function ribao_cell(v) {
   var isContact = "";
   if (v.isContact != 0)
     isContact = "家庭成员中有新冠肺炎疫情或有过病例接触史人员：" + getIsContact(v.isContact) + "；";
+  var isSuspected = "";
+  if (v.isSuspected != 0)
+    isSuspected = "同居或近期接触的家庭成员中有感冒、发热、咳嗽等症状：" + getIsContact(v.isContact) + "；";
   var singleRoom = "";
   var uptownId = $("#uptownId").val();
   if (uptownId != xiaoquId && uptownId != ceshixiaoquId) {
@@ -812,7 +815,7 @@ function ribao_cell(v) {
   $('#rb_family').append($('<div class="weui-media-box weui-media-box_text" style="height: auto">\n' +
     '                                      <h4 class="weui-media-box__title">' + userName + '&nbsp;&nbsp;' + grender + '&nbsp;&nbsp;&nbsp;' + age + '&nbsp;&nbsp;<a style="color: #bc4246" onclick=\'deleteSuspected(' + JSON.stringify(v.suspectedId) + ')\'>删除</a>\n' +
     '                                      &nbsp;&nbsp;<a style="color: #2a62bc" onclick=\'updateSuspected(' + JSON.stringify(v.suspectedId) + ')\'>修改上报</a></h4>\n' +
-    '                                      <div style="height: auto">' + familyStatus + medical + isContact + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + workLocal + todayLocal + isTrip + tripDet + '</>\n' +
+    '                                      <div style="height: auto">' + familyStatus + medical + isContact + isSuspected + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + workLocal + todayLocal + isTrip + tripDet + '</>\n' +
     '                                    </div>\n' +
     '                              '));
 }
@@ -1140,6 +1143,12 @@ function ribaoCommit() {
     $.alert("请选择家庭成员中有新冠肺炎疫情或有过病例接触史人员");
     return;
   }
+  var isSuspected = $("input[name='radio2']:checked").val();
+  if (isSuspected == undefined) {
+    isSuspected = true;
+    $.alert("请选择同居或近期接触的家庭成员中有感冒、发热、咳嗽等症状");
+    return;
+  }
 
 
   //var familyStatus = $("#js_input_user_status").attr("data-values") == undefined ? 0 : $("#js_input_user_status").attr("data-values");
@@ -1290,6 +1299,7 @@ function ribaoCommit() {
     "scoreHistroy": scoreHistroy,
     "score": score,
     "isContact": isContact,
+    "isSuspected": isSuspected,
     "workLocal": workLocal,
     "workLocalOther": workLocalOther,
     "todayLocal": todyLocal,
@@ -1487,6 +1497,10 @@ function updateSuspected(suspectedId) {
           $("input[id='s28']").prop("checked", "checked");
         if (suspected.isContact == 1)
           $("input[id='s29']").prop("checked", "checked");
+        if (suspected.isSuspected == 0)
+          $("input[id='s38']").prop("checked", "checked");
+        if (suspected.isSuspected == 1)
+          $("input[id='s39']").prop("checked", "checked");
         // $("#switchQuezhen").val(getMedical(suspected.medical));
         // $("#switchQuezhen").attr("data-values", suspected.medical);
 
@@ -1699,6 +1713,10 @@ function helpValue1(v) {
   var isContact = "";
   if (v.isContact != 0)
     isContact = "家庭成员中有新冠肺炎疫情或有过病例接触史人员：" + getIsContact(v.isContact) + "；";
+
+  var isSuspected = "";
+  if (v.isSuspected != 0)
+    isSuspected = "同居或近期接触的家庭成员中有感冒、发热、咳嗽等症状：" + getIsContact(v.isContact) + "；";
   var singleRoom = "";
 
   var uptownId = $("#uptownId").val();
@@ -1763,7 +1781,7 @@ function helpValue1(v) {
 
   $('#ribao_famliy').append($('<div class="weui-media-box weui-media-box_text" style="height: auto">\n' +
     '                                      <h4 class="weui-media-box__title">' + userName + '&nbsp;&nbsp;&nbsp;' + grender + '&nbsp;&nbsp;&nbsp;' + age + '</h4>\n' +
-    '                                      <div style="height: auto">' + familyStatus + medical + isContact + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + workLocal + todayLocal + isTrip + tripDet + '</div>\n' +
+    '                                      <div style="height: auto">' + familyStatus + medical + isContact + isSuspected + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + workLocal + todayLocal + isTrip + tripDet + '</div>\n' +
     '                                    </div>\n' +
     '                              '));
 }

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

@@ -46,6 +46,7 @@ public class ExcelRiBaoLYBM4 {
     private String autoAddr="";
     private int isTrip = 0;
     private int isContact = 0;
+    private int isSuspected = 0;
 
     private Date reportDate;
     private int msStatus;
@@ -376,4 +377,7 @@ public class ExcelRiBaoLYBM4 {
     @ExcelProperty(value = "家人确诊或接触", index = 8)
     private String isContactDesc = "";
 
+    @ExcelProperty(value = "同居或近期接触的家庭成员中有感冒、发热、咳嗽等症状", index = 9)
+    private String isSuspectedDesc = "";
+
 }

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

@@ -134,6 +134,9 @@ public class MsSuspected {
     @TableField("is_contact")
     private Integer isContact;
 
+    @TableField("is_suspected")
+    private Integer isSuspected;
+
     @TableField(exist = false)
     private Integer safetyNum;
 

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

@@ -151,7 +151,7 @@ public class MsReportService {
         return tripTypeDet;
     }
 
-    //获取今天数据
+    //获取今天数据（停用）
     public MsReport getReportByDateNow(Long userCreate) {
         //根据昨天的获取今天的
         //msReportService.getNowByYesterday(userCreate);
@@ -258,7 +258,7 @@ public class MsReportService {
         return 1;
     }
 
-    //通过昨天数据更新今天数据
+    //通过昨天数据更新今天数据(停用)
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public void getNowByYesterday(Long userCreate) {
 
@@ -530,6 +530,7 @@ public class MsReportService {
                 // msSuspected1.setScoreHistroy(msSuspected.getScoreHistroy());
                 // msSuspected1.setTemperatureScore(msSuspected.getTemperatureScore());
                 msSuspected1.setIsContact(msSuspected.getIsContact());
+                msSuspected1.setIsSuspected(msSuspected.getIsSuspected());
                 msSuspected1.setSuspectedStatus(0);
                 msSuspected1.setUserCreate(userCreate);
                 msSuspected1.setTimeCreate(DateTime.now());

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

@@ -45,7 +45,7 @@ public class MsTripService {
     public Long addSuspectedTrip(Long suspectedId, String userName, Integer grender, Integer age, String familyStatus,
                                  String statusDesp, Integer medical, BigDecimal temperature, Integer cough, Integer muscle,
                                  Integer dyspnea, Integer fatigue, Integer diarrhea, Integer singleRoom, String others, Long userCreate, Integer scoreRezult, Integer temperatureScore, Integer scoreHistroy, Integer score
-           ,Integer isContact , Integer workLocal, String workLocalOther, Integer todayLocal, String todayLocalOther,String autoLocal, String autoAddr, Integer isTrip, List<MsTripDet> listTripDet) {
+           ,Integer isContact ,Integer isSuspected , Integer workLocal, String workLocalOther, Integer todayLocal, String todayLocalOther,String autoLocal, String autoAddr, Integer isTrip, List<MsTripDet> listTripDet) {
         Long reportId = 0L;
         //如果是当前日期 已经添加
         Date t = new Date();
@@ -141,6 +141,7 @@ public class MsTripService {
             msSuspected.setScoreHistroy(scoreHistroy);
             msSuspected.setTemperatureScore(temperatureScore);
             msSuspected.setIsContact(isContact);
+            msSuspected.setIsSuspected(isSuspected);
             msSuspected.setUserCreate(userCreate);
             msSuspected.setTimeCreate(DateTime.now());
             msSuspected.setUserUpdate(userCreate);
@@ -224,6 +225,7 @@ public class MsTripService {
                 msSuspected1.setTemperatureScore(temperatureScore);
                 msSuspected1.setSuspectedStatus(suspectedStatus);
                 msSuspected1.setIsContact(isContact);
+                msSuspected1.setIsSuspected(isSuspected);
                 msSuspectedMapper.updateById(msSuspected1);
             }
             //编辑行程

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

@@ -61,6 +61,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());
@@ -141,6 +146,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());

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.is_contact,
+        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,mss.is_suspected,
         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.is_contact as isContact,
+        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,
         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