xielianghe

whepi-ui/templates/home/ribao.ftl

@@ -178,15 +178,32 @@
                                 </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>-->
-                                <#--<input id="switchDanjiangeli" class="weui-input" autofocus="" type="text"-->
-                                       <#--placeholder="请选择"-->
-                                       <#--maxlength="20"-->
-                                       <#--style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>-->
-                            <#--</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: 125%;">
+                                家庭成员中有新冠肺炎疫情或有过病例接触史人员
+                            </div>
+                            <div class="weui-cells_checkbox" style="width: 125%; margin-top: 2.5vh;">
+                                <label class="weui-radio weui-cell_active weui-check__label" for="s28">
+                                    <input type="radio" name="radio1" value="0" class="weui-check" id="s28"
+                                           style="width: 10%"/>
+                                    <i class="weui-icon-checked"></i>否
+                                </label>
+                                <label class="weui-radio weui-cell_active weui-check__label" for="s29">
+                                    <input type="radio" name="radio1" value="1" class="weui-check" id="s29"
+                                           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>-->
+                    <#--<input id="switchDanjiangeli" class="weui-input" autofocus="" type="text"-->
+                    <#--placeholder="请选择"-->
+                    <#--maxlength="20"-->
+                    <#--style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>-->
+                    <#--</div>-->
+                    <#--</div>-->
 
                         <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

@@ -748,6 +748,9 @@ function ribao_cell(v) {
   var medical = "";
   if (v.medical != 0)
     medical = "新冠肺炎：" + getMedical(v.medical) + "；";
+  var isContact = "";
+  if (v.isContact != 0)
+    isContact = "家庭成员中有新冠肺炎疫情或有过病例接触史人员：" + getIsContact(v.isContact) + "；";
   var singleRoom = "";
   var uptownId = $("#uptownId").val();
   if (uptownId != xiaoquId && uptownId != ceshixiaoquId) {
@@ -811,7 +814,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 + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + workLocal + todayLocal + isTrip + tripDet + '</>\n' +
+    '                                      <div style="height: auto">' + familyStatus + medical +isContact+ singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + workLocal + todayLocal + isTrip + tripDet + '</>\n' +
     '                                    </div>\n' +
     '                              '));
 }
@@ -1127,6 +1130,13 @@ function ribaoCommit() {
     return;
   }
 
+  var isContact = $("input[name='radio1']:checked").val();
+  if (isContact == undefined) {
+    cantijiao = true;
+    $.alert("请选择家庭成员中有新冠肺炎疫情或有过病例接触史人员");
+    return;
+  }
+
 
   //var familyStatus = $("#js_input_user_status").attr("data-values") == undefined ? 0 : $("#js_input_user_status").attr("data-values");
   //var statusDesp = $("#jibenmiaoshu").val() == undefined ? "" : $("#jibenmiaoshu").val();
@@ -1274,6 +1284,7 @@ function ribaoCommit() {
     "temperatureScore": temperatureScore,
     "scoreHistroy": scoreHistroy,
     "score": score,
+    "isContact": isContact,
     "workLocal": workLocal,
     "workLocalOther": workLocalOther,
     "todayLocal": todyLocal,
@@ -1455,6 +1466,10 @@ function updateSuspected(suspectedId) {
           $("input[id='s21']").prop("checked", "checked");
         if (suspected.medical == 4)
           $("input[id='s22']").prop("checked", "checked");
+        if (suspected.isContact == 0)
+          $("input[id='s28']").prop("checked", "checked");
+        if (suspected.isContact == 1)
+          $("input[id='s29']").prop("checked", "checked");
         // $("#switchQuezhen").val(getMedical(suspected.medical));
         // $("#switchQuezhen").attr("data-values", suspected.medical);
 
@@ -1660,6 +1675,10 @@ function helpValue1(v) {
   var medical = "";
   if (v.medical != 0)
     medical = "新冠肺炎：" + getMedical(v.medical) + "；";
+
+  var isContact = "";
+  if (v.isContact != 0)
+    isContact = "家庭成员中有新冠肺炎疫情或有过病例接触史人员：" + getIsContact(v.isContact) + "；";
   var singleRoom = "";
 
   var uptownId = $("#uptownId").val();
@@ -1724,7 +1743,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 + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + workLocal + todayLocal + isTrip + tripDet + '</div>\n' +
+    '                                      <div style="height: auto">' + familyStatus + medical +isContact+ singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + workLocal + todayLocal + isTrip + tripDet + '</div>\n' +
     '                                    </div>\n' +
     '                              '));
 }
@@ -1826,6 +1845,13 @@ function getMedical(medical) {
   return "";
 }
 
+function getIsContact(isContact) {
+  if (isContact == 0)
+    return "否";
+  else if (isContact == 1)
+    return "是";
+  return "";
+}
 
 function getSingleRoom(singleRoom) {
   if (singleRoom == 0)
@@ -1960,6 +1986,8 @@ function clearShow() {
   $("input[id='s20']").removeAttr("checked");
   $("input[id='s21']").removeAttr("checked");
   $("input[id='s22']").removeAttr("checked");
+  $("input[id='s28']").removeAttr("checked");
+  $("input[id='s29']").removeAttr("checked");
 }
 
 //健康评估

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

@@ -131,6 +131,9 @@ public class MsSuspected {
     @TableField("time_update")
     private DateTime timeUpdate;
 
+    @TableField("is_contact")
+    private Integer isContact;
+
     @TableField(exist = false)
     private Integer safetyNum;
 

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

@@ -527,6 +527,7 @@ public class MsReportService {
                 // msSuspected1.setScore(msSuspected.getScore());
                 // msSuspected1.setScoreHistroy(msSuspected.getScoreHistroy());
                 // msSuspected1.setTemperatureScore(msSuspected.getTemperatureScore());
+                msSuspected1.setIsContact(msSuspected.getIsContact());
                 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 workLocal, String workLocalOther, Integer todayLocal, String todayLocalOther,String autoLocal, String autoAddr, Integer isTrip, List<MsTripDet> listTripDet) {
+           ,Integer isContact , Integer workLocal, String workLocalOther, Integer todayLocal, String todayLocalOther,String autoLocal, String autoAddr, Integer isTrip, List<MsTripDet> listTripDet) {
         Long reportId = 0L;
         //如果是当前日期 已经添加
         Date t = new Date();
@@ -140,6 +140,7 @@ public class MsTripService {
             msSuspected.setScore(score);
             msSuspected.setScoreHistroy(scoreHistroy);
             msSuspected.setTemperatureScore(temperatureScore);
+            msSuspected.setIsContact(isContact);
             msSuspected.setUserCreate(userCreate);
             msSuspected.setTimeCreate(DateTime.now());
             msSuspected.setUserUpdate(userCreate);
@@ -222,6 +223,7 @@ public class MsTripService {
                 msSuspected1.setScoreHistroy(scoreHistroy);
                 msSuspected1.setTemperatureScore(temperatureScore);
                 msSuspected1.setSuspectedStatus(suspectedStatus);
+                msSuspected1.setIsContact(isContact);
                 msSuspectedMapper.updateById(msSuspected1);
             }
             //编辑行程