Merge remote-tracking branch 'origin/master'

whepi-doc/mrsb.sql

@@ -10,7 +10,7 @@ CREATE TABLE ms_report  (
   suspected_num     int(11) NOT NULL DEFAULT 0                              COMMENT '疑似人数',
   remarks           varchar(200)  NOT NULL DEFAULT ''                       COMMENT '异常备注',
   report_date       date                                                    COMMENT '上报日期',
-  report_status     int(11) NOT NULL DEFAULT 1                              COMMENT '上报状态:0草稿,1正常',
+  report_status     int(11) NOT NULL DEFAULT 0                              COMMENT '上报状态:0草稿,1正常',
   ms_status         int(11) NOT NULL DEFAULT 1                              COMMENT '健康状态:1正常,2异常',
   user_create       bigint(20) NOT NULL DEFAULT 0                           COMMENT '新增人',
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0)       COMMENT '新增时间',

whepi-ui/templates/home/ribao.js

@@ -20,6 +20,9 @@ function ribao_init() {
     title: "选择基本状况",
     items: [
       {
+        title: "正常",
+        value: "0",
+      }, {
         title: "心脑血管疾病（服用ARB）",
         value: "1",
       },
@@ -223,12 +226,12 @@ function ribao_refrash() {
     success: function (data) {
       console.log(data);
       if (data.data == undefined) {
-        $('#ribao_famliy').empty();
+        $('#rb_family').empty();
       }
       else {
+        $('#rb_family').empty();
         if (data.data.length > 0) {
           hasData = true;
-          $('#rb_family').empty();
           data.data.forEach(function (v) {
             ribao_cell(v);
           });
@@ -311,20 +314,20 @@ function ribaoCommit() {
   // return;
   var userId = $("#userId").val();
   var userName = $("#js_input_user_name").val();
-  var grender = $("#js_input_user_sex").attr("data-values");
-  var age = $("#js_input_user_age").val();
-  var familyStatus = $("#js_input_user_status").attr("data-values");
-  var statusDesp = $("#jibenmiaoshu").val();
+  var grender = $("#js_input_user_sex").attr("data-values") == undefined ? 0 : $("#js_input_user_sex").attr("data-values");
+  var age = $("#js_input_user_age").val()== "" ? 0 :  $("#js_input_user_age").val();
+  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 medical = $("#switchQuezhen").val() == "on" ? 1 : 0;
-  var temperature = $("#js_input_user_tiwen").val();
-  var cough = $("#js_input_user_kesou").attr("data-values");
-  var muscle = $("#js_input_user_jirou").attr("data-values");
-  var dyspnea = $("#js_input_user_huxi").attr("data-values");
-  var chest = $("#js_input_user_xiongmen").attr("data-values");
-  var fatigue = $("#js_input_user_fali").attr("data-values");
-  var diarrhea = $("#js_input_user_fuxie").attr("data-values");
-  var diarrheaNum = $("#js_input_user_cishu").val();
-  var others = $("#shuruqita").val();
+  var temperature = $("#js_input_user_tiwen").val()== "" ? 0 : $("#js_input_user_tiwen").val();
+  var cough = $("#js_input_user_kesou").attr("data-values") == undefined ? 0 : $("#js_input_user_kesou").attr("data-values");
+  var muscle = $("#js_input_user_jirou").attr("data-values") == undefined ? 0 : $("#js_input_user_jirou").attr("data-values");
+  var dyspnea = $("#js_input_user_huxi").attr("data-values") == undefined ? 0 : $("#js_input_user_huxi").attr("data-values");
+  var chest = $("#js_input_user_xiongmen").attr("data-values") == undefined ? 0 : $("#js_input_user_xiongmen").attr("data-values");
+  var fatigue = $("#js_input_user_fali").attr("data-values") == undefined ? 0 : $("#js_input_user_fali").attr("data-values");
+  var diarrhea = $("#js_input_user_fuxie").attr("data-values") == undefined ? 0 : $("#js_input_user_fuxie").attr("data-values");
+  var diarrheaNum = $("#js_input_user_cishu").val()== "" ? 0 : $("#jibenmiaoshu").val();
+  var others = $("#shuruqita").val()== undefined ? "" : $("#jibenmiaoshu").val();
   $.ajax({
     url: '/home/addRibao',
     type: "post",
@@ -460,6 +463,8 @@ function getGreder(greder) {
 }
 
 function getFamilyStatus(familyStatus) {
+  if (familyStatus == 0)
+    return "正常";
   if (familyStatus == 1)
     return "心脑血管疾病（服用ARB）";
   else if (familyStatus == 2)

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

@@ -51,7 +51,7 @@ public class HomeController {
         //初始化今日日报
         UserOpen userOpen = homeService.getUserOpen();
         Long userId = userOpen.getUserId();
-        //Long userId = 1224706869998772226L;
+       // Long userId = 1224706869998772226L;
         MsReport msReport = msReportService.getReportByDateNow(userId);
         model.put("msReport", new JsonWapper(msReport));
         return new ModelAndView("/home/home.ftl", model);