Merge remote-tracking branch 'origin/master'

admin-ui/app/whepi/ceshi.js

@@ -64,7 +64,7 @@ define(function (require) {
                     var a = $form.formGet()
 
                     $.yvan.ajax({
-                      method: 'post',
+                      method: 'get',
                       url: 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa3991865de920847&redirect_uri=http://yuliang.ng.yvanui.com/userOpen/loginTest&response_type=code&scope=snsapi_userinfo&state=123#wechat_redirect',
                       data: $form.formGet(),
                       success: function (data) {

admin-ui/app/whepi/mock/menu.json

@@ -34,6 +34,14 @@
           "children": []
         }
       ]
+    },
+    {
+      "id": "ENT10011",
+      "text": "授权测试",
+      "href": "/app/whepi/ceshi.js",
+      "iconCls": "icon-blank fa fa-align-justify",
+      "state": "close",
+      "children": []
     }
   ]
 }

whepi-ui/templates/home/ribao.js

@@ -308,7 +308,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%">' + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + '</p>\n' +
     '                                    </div>\n' +
     '                              '));
 }
@@ -374,6 +374,11 @@ function ribaoCommit() {
   var userName = $("#js_input_user_name").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();
+  //不能同时选择服用和未服用
+  if ($("input[name='checkbox1']:checked").val() == "on" && $("input[name='checkbox2']:checked").val() == "on") {
+    $.alert("心脑血管不能同时选择服用和未服用");
+    return;
+  }
   //家庭状态
   var familyStatus = "";
   if ($("input[name='checkbox1']:checked").val() == "on")
@@ -537,31 +542,31 @@ function updateSuspected(suspectedId) {
         if (suspected.familyStatus != "") {
           var familyStatusList = suspected.familyStatus.split(",");
           if (familyStatusList[0] == 1)
-            $("input[name='checkbox1']").prop("checked","checked");
+            $("input[name='checkbox1']").prop("checked", "checked");
           else
             $("input[name='checkbox1']").removeAttr("checked");
           if (familyStatusList[1] == 1)
-            $("input[name='checkbox2']").prop("checked","checked");
+            $("input[name='checkbox2']").prop("checked", "checked");
           else
             $("input[name='checkbox2']").removeAttr("checked");
           if (familyStatusList[2] == 1)
-            $("input[name='checkbox3']").prop("checked","checked");
+            $("input[name='checkbox3']").prop("checked", "checked");
           else
             $("input[name='checkbox3']").removeAttr("checked");
           if (familyStatusList[3] == 1)
-            $("input[name='checkbox4']").prop("checked","checked");
+            $("input[name='checkbox4']").prop("checked", "checked");
           else
             $("input[name='checkbox4']").removeAttr("checked");
           if (familyStatusList[4] == 1)
-            $("input[name='checkbox5']").prop("checked","checked");
+            $("input[name='checkbox5']").prop("checked", "checked");
           else
             $("input[name='checkbox5']").removeAttr("checked");
           if (familyStatusList[5] == 1)
-            $("input[name='checkbox6']").prop("checked","checked");
+            $("input[name='checkbox6']").prop("checked", "checked");
           else
             $("input[name='checkbox6']").removeAttr("checked");
           if (familyStatusList[6] == 1)
-            $("input[name='checkbox7']").prop("checked","checked");
+            $("input[name='checkbox7']").prop("checked", "checked");
           else
             $("input[name='checkbox7']").removeAttr("checked");
 
@@ -695,7 +700,7 @@ function helpValue1(v) {
     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%">' + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + '</p>\n' +
     '                                    </div>\n' +
     '                              '));
 }

whepi-web/src/main/resources/mapper/MsReport.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bofeng.dao.MsReportMapper">
     <select id="selectByReportDate" resultType="com.bofeng.entity.MsReport">
-        select * from ms_report where report_date = #{reportDate} and  user_create = #{userCreate} and report_status=1
+        select * from ms_report where report_date = #{reportDate} and  user_create = #{userCreate}
         order by report_date desc
     </select>
 </mapper>