xielianghe

whepi-ui/templates/home/home.ftl

@@ -63,6 +63,9 @@
 
         <#if msReport ??>var msReport = ${msReport}</#if>;
         $('#ribao_jinrijujian').append(msReport.safetyNum);
+        if (msReport.reportStatus == 1) {
+            document.getElementById("btn_shangbao").style['background-color'] = "#D9D9D9";
+        }
         ribaoInitialization(msReport.reportId);
         $("#my-input-ribao").calendar();
         /*submit_back();*/

whepi-ui/templates/home/ribao.ftl

@@ -36,7 +36,7 @@
                         注：请如实上报情况，便以相互帮助，小区是我家，团结就是力量！后期会有医生跟踪分析，给予大家医疗建议，请认真填报！
                     </span></div>
                     <div class="weui-btn-area">
-                        <a id="btn_shangbao" class="weui-btn weui-btn_primary" href="javascript:" id="showTooltips"
+                        <a id="btn_shangbao" class="weui-btn weui-btn_primary" href="javascript:" id="showTooltips" style=""
                            onclick="addReport()">上报</a>
                     </div>
                 </div>
@@ -119,8 +119,8 @@
                             </div>
                         </label>
                     </div>
-                    <textarea id="jibenmiaoshu" class="weui-textarea" placeholder="身体基本状况描述" rows="5"
-                              style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; margin-top: 1vh;"></textarea>
+                    <#--<textarea id="jibenmiaoshu" class="weui-textarea" placeholder="身体基本状况描述" rows="5"-->
+                              <#--style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; margin-top: 1vh;"></textarea>-->
                     <input id="suspectedId" type="text" hidden="hidden" value=""/>
                     <div style="height: 5vh; line-height: 5vh;margin-left: 2vw;">病情描述</div>
                     <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">

whepi-ui/templates/home/ribao.js

@@ -224,13 +224,10 @@ function ribaoInitialization(reportId) {
     success: function (data) {
       console.log(data);
       if (data.data.length > 0) {
-        $('#btn_shangbao').text('上报');
         hasData = true;
         data.data.forEach(function (v) {
           ribao_cell(v);
         });
-      } else {
-        $('#btn_shangbao').text('上报');
       }
     },
     error: function () {
@@ -272,9 +269,9 @@ function ribao_cell(v) {
   var userName = v.userName + "：";
   var grender = getGreder(v.grender);
   var age = v.age;
-  // var familyStatus = "";
-  // if (v.familyStatus != 0)
-  //   familyStatus = "基本状况：" + getFamilyStatus(v.familyStatus) + "；";
+  var familyStatus = "";
+  if (v.familyStatus != 0)
+    familyStatus = "基本状况：" + getFamilyStatus(v.familyStatus) + "；";
   var medical = "";
   if (v.medical != 0)
     medical = "是否确诊：" + getMedical(v.medical) + "；";
@@ -308,7 +305,7 @@ function ribao_cell(v) {
   $('#rb_family').append($('<div class="weui-media-box weui-media-box_text" style="height: 12vh">\n' +
     '                                      <h4 class="weui-media-box__title">' + userName + '&nbsp;&nbsp;&nbsp;' + grender + '&nbsp;&nbsp;&nbsp;' + age + '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #bc4246" onclick=\'deleteSuspected(' + JSON.stringify(v.suspectedId) + ')\'>删除</a>\n' +
     '                                      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #2a62bc" onclick=\'updateSuspected(' + JSON.stringify(v.suspectedId) + ')\'>修改</a></h4>\n' +
-    '                                      <p class="weui-media-box__desc" style="height: 80%">' + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + '</p>\n' +
+    '                                      <p class="weui-media-box__desc" style="height: 80%">' + familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + '</p>\n' +
     '                                    </div>\n' +
     '                              '));
 }
@@ -324,9 +321,15 @@ function ribao_add() {
       $('#ribao')[0].style.display = 'none';
     }
 
-    // $("#js_input_user_status").val(getFamilyStatus(0));
-    // $("#js_input_user_status").attr("data-values", 0);
 
+    //基本情况
+    $("input[name='checkbox1']").removeAttr("checked");
+    $("input[name='checkbox2']").removeAttr("checked");
+    $("input[name='checkbox3']").removeAttr("checked");
+    $("input[name='checkbox4']").removeAttr("checked");
+    $("input[name='checkbox5']").removeAttr("checked");
+    $("input[name='checkbox6']").removeAttr("checked");
+    $("input[name='checkbox7']").removeAttr("checked");
 
     $("#switchQuezhen").val(getMedical(0));
     $("#switchQuezhen").attr("data-values", 0);
@@ -410,7 +413,8 @@ function ribaoCommit() {
   else
     familyStatus += ",0";
   //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();
+  //var statusDesp = $("#jibenmiaoshu").val() == undefined ? "" : $("#jibenmiaoshu").val();
+  var statusDesp = "";
   var medical = $("#switchQuezhen").attr("data-values") == undefined ? 0 : $("#switchQuezhen").attr("data-values");
   var singleRoom = $("#switchDanjiangeli").attr("data-values") == undefined ? 0 : $("#switchDanjiangeli").attr("data-values");
   var temperature = $("#js_input_user_tiwen").val() == "" ? 0 : $("#js_input_user_tiwen").val();
@@ -494,7 +498,7 @@ function ribaoCommit() {
       ribao_refrash();
 
       clearShow();
-
+      document.getElementById("btn_shangbao").style['background-color'] = "#0bb20c";
     },
   });
 }
@@ -574,7 +578,7 @@ function updateSuspected(suspectedId) {
         // $("#js_input_user_status").val(getFamilyStatus(suspected.familyStatus));
         // $("#js_input_user_status").attr("data-values", suspected.familyStatus);
 
-        $("#jibenmiaoshu").val(suspected.statusDesp);
+        // $("#jibenmiaoshu").val(suspected.statusDesp);
 
         $("#switchQuezhen").val(getMedical(suspected.medical));
         $("#switchQuezhen").attr("data-values", suspected.medical);
@@ -622,6 +626,7 @@ function addReport() {
     },
     success: function (data) {
       $.toast(data.msg);
+      document.getElementById("btn_shangbao").style['background-color'] = "#D9D9D9";
     },
   });
 }
@@ -665,9 +670,9 @@ function helpValue1(v) {
   var userName = v.userName + "：";
   var grender = getGreder(v.grender);
   var age = v.age;
-  // var familyStatus = "";
-  // if (v.familyStatus != 0)
-  //   familyStatus = "基本状况：" + getFamilyStatus(v.familyStatus) + "；";
+  var familyStatus = "";
+  if (v.familyStatus != 0)
+    familyStatus = "基本状况：" + getFamilyStatus(v.familyStatus) + "；";
   var medical = "";
   if (v.medical != 0)
     medical = "是否确诊：" + getMedical(v.medical) + "；";
@@ -694,13 +699,13 @@ function helpValue1(v) {
     diarrhea = "腹泻现象：" + getDiarrhea(v.diarrhea) + "；";
   var others = "";
   if (v.others != "")
-    others = "其他：" + v.others;
+    others = "其他：" + v.others + "；";
   var scoreRezult = "";
   if (v.scoreRezult != 0)
     scoreRezult = "评估结果：" + getScoreRezult(v.scoreRezult, v.temperatureScore) + "；";
   $('#ribao_famliy').append($('<div class="weui-media-box weui-media-box_text" style="height: 12vh">\n' +
     '                                      <h4 class="weui-media-box__title">' + userName + '&nbsp;&nbsp;&nbsp;' + grender + '&nbsp;&nbsp;&nbsp;' + age + '</h4>\n' +
-    '                                      <p class="weui-media-box__desc" style="height: 80%">' + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + '</p>\n' +
+    '                                      <p class="weui-media-box__desc" style="height: 80%">' + familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + '</p>\n' +
     '                                    </div>\n' +
     '                              '));
 }
@@ -714,25 +719,25 @@ function getGreder(greder) {
   return "";
 }
 
-// function getFamilyStatus(familyStatus) {
-//   if (familyStatus == 0)
-//     return "无病史";
-//   if (familyStatus == 1)
-//     return "心脑血管疾病（服用ARB）";
-//   else if (familyStatus == 2)
-//     return "心脑血管疾病（未服ARB）";
-//   else if (familyStatus == 3)
-//     return "呼吸系统病史";
-//   else if (familyStatus == 4)
-//     return "肿瘤病史";
-//   else if (familyStatus == 5)
-//     return "糖尿病史";
-//   else if (familyStatus == 6)
-//     return "服用过激素药物";
-//   else if (familyStatus == 7)
-//     return "妊娠期";
-//   return "";
-// }
+function getFamilyStatus(familyStatus) {
+  var familyStatusList = familyStatus.split(",");
+  var familyStatusString = "";
+  if (familyStatusList[0] == 1)
+    familyStatusString += "心脑血管疾病(服用ARB),";
+  if (familyStatusList[1] == 1)
+    familyStatusString += "心脑血管疾病(未服ARB),";
+  if (familyStatusList[2] == 1)
+    familyStatusString += "呼吸系统病史,";
+  if (familyStatusList[3] == 1)
+    familyStatusString += "肿瘤病史,";
+  if (familyStatusList[4] == 1)
+    familyStatusString += "糖尿病史,";
+  if (familyStatusList[5] == 1)
+    familyStatusString += "服用过激素药物,";
+  if (familyStatusList[6] == 1)
+    familyStatusString += "妊娠期,";
+  return familyStatusString.substring(0, familyStatusString.length - 1);
+}
 
 function getCough(cough) {
   if (cough == 0)

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

@@ -58,8 +58,9 @@ public class MsReportService {
     //获取今天数据
     public MsReport getReportByDateNow(Long userCreate) {
         //根据昨天的获取今天的
-       // msReportService.getNowByYesterday(userCreate);
+        // msReportService.getNowByYesterday(userCreate);
         //msReportService.getNowByYesterdayDate();
+        //msReportService.addReport250();
         Date t = new Date();
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
         String reportDate = df.format(t);
@@ -189,7 +190,7 @@ public class MsReportService {
         Long start = 0L, count = 100L;
         while (true) {
             //今天以前一共有多少用户
-            List<Long> listUser = msReportMapper.getUserByYesterdayDate(start,count);
+            List<Long> listUser = msReportMapper.getUserByYesterdayDate(start, count);
             if (listUser != null && listUser.size() > 0) {
                 for (Long userCreate : listUser) {
                     //判断用户今天是否有数据
@@ -261,7 +262,37 @@ public class MsReportService {
                 }
             }
             start += count;
-            if (listUser == null || listUser.size()<count) {
+            if (listUser == null || listUser.size() < count) {
+                break;
+            }
+        }
+    }
+
+    //添加250条记录
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+    public void addReport250() {
+        //每次执行100条
+        Long count = 0L;
+        while (true) {
+            //添加日报
+            MsReport msReport1 = new MsReport();
+            msReport1.setReportId(IdWorker.getId());
+            msReport1.setHouseId(0L);
+            msReport1.setSafetyNum(0);
+            msReport1.setSureNum(0);
+            msReport1.setSuspectedNum(0);
+            msReport1.setNormalNum(0);
+            msReport1.setSingleNum(0);
+            msReport1.setRemarks("");
+            msReport1.setReportDate(DateTime.now().toDate());
+            msReport1.setReportStatus(0);//未上报
+            msReport1.setMsStatus(0);
+            msReport1.setUserCreate(count);
+            msReport1.setTimeCreate(DateTime.now());
+            msReport1.setUserUpdate(count);
+            msReport1.setTimeUpdate(DateTime.now());
+            count += msReportMapper.insert(msReport1);
+            if (count> 250) {
                 break;
             }
         }