xielianghe

whepi-ui/templates/home/ribao.ftl

@@ -1,7 +1,7 @@
 <div class="page__bd">
     <div class="weui-tab">
         <div class="weui-navbar">
-            <a class="weui-navbar__item weui-bar__item_on" target="#rb_nav1" module="ri_bao">
+            <a class="weui-navbar__item weui-bar__item_on" target="#rb_nav1" module="ri_bao" onclick="ribao_refrash()">
                 今日报告
             </a>
             <a class="weui-navbar__item" target="#rb_nav2" module="ri_bao">
@@ -109,7 +109,7 @@
                                     <div class="weui-cell__bd">
                                         <textarea id="rb_remarks" class="weui-textarea" placeholder="请输入病情描述"
                                                   rows="3"></textarea>
-                                        <div class="weui-textarea-counter"><span>0</span>/200</div>
+                                        <div class="weui-textarea-counter"><span>0</span>/100</div>
                                     </div>
                                 </div>
                                 <div class="weui-cell weui-cell_switch">

whepi-ui/templates/home/ribao.js

@@ -10,7 +10,7 @@ function ribaoInitialization(reportId) {
   if (reportId == null)
     return;
   $.ajax({
-    url: '/home/home/queryRibao',
+    url: '/home/home/queryRibaoRefresh',
     data: {
       reportId: reportId
     },
@@ -20,7 +20,30 @@ function ribaoInitialization(reportId) {
       if (data.data.length > 0) {
         hasData = true;
         data.data.forEach(function (v) {
-          helpValue(v);
+          ribao_cell(v);
+        });
+      } else {
+
+      }
+    },
+    error: function () {
+    }
+  });
+}
+
+//刷新今日日报
+function ribao_refrash() {
+  $.ajax({
+    url: '/home/home/queryRibao',
+    data: {},
+    type: 'GET',
+    success: function (data) {
+      console.log(data);
+      if (data.data.length > 0) {
+        hasData = true;
+        $('#rb_family').empty();
+        data.data.forEach(function (v) {
+          ribao_cell(v);
         });
       } else {
 
@@ -31,7 +54,7 @@ function ribaoInitialization(reportId) {
   });
 }
 
-function helpValue(v) {
+function ribao_cell(v) {
   var conditionStatusList = v.conditionStatus.split(',');
   var conditionStatus = v.userName + "：";
   if (conditionStatusList[0] > 0)
@@ -51,7 +74,7 @@ function helpValue(v) {
   else
     conditionStatus += "   未确诊"
   $('#rb_family').append($('<div class="weui-media-box weui-media-box_text">\n' +
-    '                                      <h4 class="weui-media-box__title">' + conditionStatus + '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #2a62bc" onclick=\'deleteSuspected(' + JSON.stringify(v.suspectedId,v.reportId)+ ')\'>删除</a></h4>\n' +
+    '                                      <h4 class="weui-media-box__title">' + conditionStatus + '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #2a62bc" onclick=\'deleteSuspected(' + JSON.stringify(v.suspectedId)+ ')\'>删除</a></h4>\n' +
     '                                      <p class="weui-media-box__desc">' + v.remarks + '</p>\n' +
     '                                    </div>\n' +
     '                              '));
@@ -98,11 +121,20 @@ function ribao_commit() {
 function ribaoCommit() {
   var user_name = $("#js_input_user_name").val();
   if(user_name==""){
-    alert("请填写家人姓名")
+    alert("请填写家人姓名");
+    return;
   }if(user_name.length>25){
-    alert("请填写正确格式家人姓名")
+    alert("请填写正确格式家人姓名");
+    return;
   }
   var remarks = $("#rb_remarks").val();
+  if(remarks==""){
+    alert("请填写病情描述");
+    return;
+  }if(remarks.length>100){
+    alert("病情描述内容太长");
+    return;
+  }
   var medical = "";
   if ($("input[name='medical']:checked").val() == "on")
     medical = "1";
@@ -143,22 +175,32 @@ function ribaoCommit() {
       "medical": medical,
       "remarks": remarks,
     },
+    success: function (data) {
+      ribao_refrash();
+    },
   });
 }
 
-function deleteSuspected(suspectedId,reportId) {
+function deleteSuspected(suspectedId) {
   $.ajax({
     url: '/home/deleteSuspected.json',
     type: "post",
     data: {
       "suspectedId": suspectedId
     },
+    success: function (data) {
+      ribao_refrash();
+    },
   });
 }
 
 
 function addReport() {
   var safety_num = $("#ribao_safety_num").val();
+  if(safety_num==""){
+    alert("请填写居家人数");
+    return;
+  }
   $.ajax({
     url: '/home/addReport.json',
     type: "post",

whepi-web/src/main/java/com/bofeng/wx/controller/MsReportController.java

@@ -14,6 +14,8 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -54,6 +56,17 @@ public class MsReportController {
 
     //获取家人
     @GetMapping("/home/home/queryRibao")
+    public Model<List<MsSuspected>> queryRibao() {
+        //UserOpen userOpen = homeService.getUserOpen();
+        long userId = 1224706869998772226L;
+        Date t = new Date();
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+        String reportDate = df.format(t);
+        return Model.newSuccess(msReportService.getByReportReportDate(reportDate, userId));
+    }
+
+    //获取家人
+    @GetMapping("/home/home/queryRibaoRefresh")
     public Model<List<MsSuspected>> queryRibao(@Pd(name = "reportId") Long reportId) {
         return Model.newSuccess(msReportService.getByReportId(reportId));
     }