更改页面

admin-ui/app/whepi/lingyun/liaodan.js

@@ -247,11 +247,11 @@ define(function (require) {
                                         title: '岁数', field: 'age'
                                     },
                                     {title: '基本情况', field: 'familyStatus'},
-                                    {title: '新冠肺炎', field: 'medicalStr',formatter:function(value){
+                                    {title: '本人身体情况', field: 'medicalStr',formatter:function(value){
                                       if(value == 0){
-                                        return "无"
+                                        return "正常"
                                       }else if(value == 1){
-                                        return "确诊"
+                                        return "异常"
                                       }else if(value == 2){
                                         return "疑似"
                                       }else if(value == 3){

whepi-ui/templates/home/ribao.ftl

@@ -190,20 +190,20 @@
                                 </div>
 
                             <div style="display:flex; display: -webkit-flex;flex-direction: row; -webkit-flex-direction: row;justify-content: space-between; -webkit-justify-content: space-between;margin-top: 5px;">
-                                <div style="color: gray;height: 30px; line-height: 30px; flex: 8;-webkit-flex: 8;">新冠肺炎</div>
+                                <div style="color: gray;height: 30px; line-height: 30px; flex: 8;-webkit-flex: 8;">本人身体情况</div>
                             <#--<input id="switchQuezhen" 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: 30px;"/>-->
-                                <div class="weui-cells_checkbox" style="flex: 5;-webkit-flex: 5;">
+                                <div class="weui-cells_checkbox" style="flex: 7;-webkit-flex: 7;">
                                     <label class="weui-radio weui-cell_active weui-check__label" for="s18" style="padding: 10px 0 10px 10px;">
                                         <input type="radio" name="radio" value="0" class="weui-check" id="s18"
                                                style="width: 10%"/>
-                                        <i class="weui-icon-checked"></i>无
+                                        <i class="weui-icon-checked"></i>正常
                                     </label>
                                     <label class="weui-radio weui-cell_active weui-check__label" for="s19" style="padding: 10px 0 10px 10px;">
                                         <input type="radio" name="radio" value="1" class="weui-check" id="s19"
                                                style="width: 10%"/>
-                                        <i class="weui-icon-checked"></i>有
+                                        <i class="weui-icon-checked"></i>异常
                                     </label>
 <#--                                    <div style="height: 20px"></div>-->
 <#--                                    <label class="weui-radio weui-cell_active weui-check__label" for="s20">-->
@@ -311,34 +311,34 @@
                                 <span class="weui-loadmore__tips">接触史</span>
                             </div>
                             <div style="display:flex; display: -webkit-flex;flex-direction: row; -webkit-flex-direction: row;justify-content: space-between; -webkit-justify-content: space-between;margin-top: 5px;">
-                                <div style="color: gray;height: 30px; line-height: 30px; flex: 8;-webkit-flex: 8;">新冠肺炎接触史</div>
-                                <div class="weui-cells_checkbox" style="flex: 5;-webkit-flex: 5;">
+                                <div style="color: gray;height: 30px; line-height: 30px; flex: 8;-webkit-flex: 8;">家庭成员情况</div>
+                                <div class="weui-cells_checkbox" style="flex: 7;-webkit-flex: 7;">
                                     <label class="weui-radio weui-cell_active weui-check__label" for="s40" style="padding: 10px 0 10px 10px;">
                                         <input type="radio" name="radio3" value="0" class="weui-check" id="s40"
                                                style="width: 10%"/>
-                                        <i class="weui-icon-checked"></i>无
+                                        <i class="weui-icon-checked"></i>正常
                                     </label>
                                     <label class="weui-radio weui-cell_active weui-check__label" for="s41" style="padding: 10px 0 10px 10px;">
                                         <input type="radio" name="radio3" value="1" class="weui-check" id="s41"
                                                style="width: 10%"/>
-                                        <i class="weui-icon-checked"></i>有
+                                        <i class="weui-icon-checked"></i>异常
                                     </label>
                                 </div>
                             </div>
                             <div id="isContactView" style="display:flex; display: -webkit-flex;flex-direction: row; -webkit-flex-direction: row;justify-content: space-between; -webkit-justify-content: space-between;margin-top: 5px;">
-                                <div style="color: gray;height: 60px; line-height: 30px; flex: 8;-webkit-flex: 8;">
-                                    家庭成员中有新冠肺炎疫情或有过病例接触史人员
+                                <div style="color: gray;height: 110px; line-height: 30px; flex: 8;-webkit-flex: 8;">
+                                    密切接触人员（含家庭成员）有新冠肺炎或有1月25日以来中高风险地区旅居史
                                 </div>
-                                <div class="weui-cells_checkbox" style="flex: 5; -webkit-flex: 5;margin-top: 15px;">
+                                <div class="weui-cells_checkbox" style="flex: 7;-webkit-flex: 7;margin-top: 30px;">
                                     <label class="weui-radio weui-cell_active weui-check__label" for="s28" style="padding: 10px 0 10px 10px;">
                                         <input type="radio" name="radio1" value="0" class="weui-check" id="s28"
                                                style="width: 10%"/>
-                                        <i class="weui-icon-checked"></i>否
+                                        <i class="weui-icon-checked"></i>正常
                                     </label>
                                     <label class="weui-radio weui-cell_active weui-check__label" for="s29" style="padding: 10px 0 10px 10px;">
                                         <input type="radio" name="radio1" value="1" class="weui-check" id="s29"
                                                style="width: 10%"/>
-                                        <i class="weui-icon-checked"></i>是
+                                        <i class="weui-icon-checked"></i>异常
                                     </label>
                                 </div>
                             </div>

whepi-ui/templates/home/ribao.js

@@ -917,16 +917,16 @@ function ribao_cell(v) {
   var familyStatus = "";
   // if (v.familyStatus != 0)
   //   familyStatus = getFamilyStatus(v.familyStatus) + "；";
-  var medical = "新冠肺炎：" + getMedical(v.medical) + "；<br/>";
+  var medical = "本人身体情况：" + getMedical(v.medical) + "；<br/>";
   var isContact = "";
   if (v.isContact != 0)
-    isContact = "家庭成员中有新冠肺炎疫情或有过病例接触史人员：" + getIsContact(v.isContact) + "；<br/>";
+    isContact = "密切接触人员（含家庭成员）有新冠肺炎或有1月25日以来中高风险地区旅居史：" + getIsContact(v.isContact) + "；<br/>";
   var isSuspected = "";
   if (v.isSuspected != 0)
     isSuspected = "近期接触的家庭成员中有感冒、发热、咳嗽等症状：" + getIsContact(v.isContact) + "；<br/>";
   var isContactHistory = '';
   if(!isContact && !isSuspected){
-    isContactHistory = "新冠肺炎接触史：无；<br/>";
+    isContactHistory = "家庭成员情况：正常；<br/>";
   }
   var singleRoom = "";
   var uptownId = $("#uptownId").val();
@@ -1387,7 +1387,7 @@ function ribaoCommit() {
   var isContact = $("input[name='radio1']:checked").val();
   if (isContact == undefined) {
     cantijiao = true;
-    $.alert("请选择家庭成员中有新冠肺炎疫情或有过病例接触史人员");
+    $.alert("密切接触人员（含家庭成员）有新冠肺炎或有1月25日以来中高风险地区旅居史");
     return;
   }
   var isSuspected = $("input[name='radio2']:checked").val();
@@ -2080,11 +2080,11 @@ function helpValue1(v) {
   // if (v.familyStatus != 0)
   //   familyStatus = "基本状况：" + getFamilyStatus(v.familyStatus) + "；";
 
-  var medical = "新冠肺炎：" + getMedical(v.medical) + "；<br/>";
+  var medical = "本人身体情况：" + getMedical(v.medical) + "；<br/>";
 
   var isContact = "";
   if (v.isContact != 0)
-    isContact = "家庭成员中有新冠肺炎疫情或有过病例接触史人员：" + getIsContact(v.isContact) + "；<br/>";
+    isContact = "密切接触人员（含家庭成员）有新冠肺炎或有1月25日以来中高风险地区旅居史：" + getIsContact(v.isContact) + "；<br/>";
 
   var isSuspected = "";
   if (v.isSuspected != 0)
@@ -2092,7 +2092,7 @@ function helpValue1(v) {
 
   var isContactHistory = '';
   if(!isContact && !isSuspected){
-    isContactHistory = "新冠肺炎接触史：无；<br/>";
+    isContactHistory = "家庭成员情况：正常；<br/>";
   }
 
   var singleRoom = "";
@@ -2284,9 +2284,9 @@ function getFatigue(fatigue) {
 
 function getMedical(medical) {
   if (medical == 0)
-    return "无";
+    return "正常";
   else if (medical == 1)
-    return "确诊";
+    return "异常";
   else if (medical == 2)
     return "疑似";
   else if (medical == 3)
@@ -2298,9 +2298,9 @@ function getMedical(medical) {
 
 function getIsContact(isContact) {
   if (isContact == 0)
-    return "否";
+    return "正常";
   else if (isContact == 1)
-    return "是";
+    return "异常";
   return "";
 }
 

whepi-web/src/main/java/com/bofeng/wx/WxController.java

@@ -162,7 +162,7 @@ public class WxController {
 
 
         val btn31 = new WxMenuButton();
-        btn31.setName("用户指南");
+        btn31.setName("注册说明");
         btn31.setType(WxConsts.MenuButtonType.VIEW);
         btn31.setUrl(
                 wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +