xielianghe

whepi-doc/mrsb.sql

@@ -32,7 +32,7 @@ CREATE TABLE ms_suspected  (
   user_name         varchar(50)  NOT NULL DEFAULT ''                        COMMENT '家人姓名',
   grender            int(11)    NOT NULL DEFAULT 0                          COMMENT '性别:0未设置，1男,2女',
   age               int(11)    NOT NULL DEFAULT 0                           COMMENT '年龄',
-  family_status     int(11)    NOT NULL DEFAULT 0                           COMMENT '基本状态:0正常，1心血管疾病（服用ARB）,2心血管疾病（未服用ARB）,3呼吸系统病史，4肿瘤病史，5糖尿病史，6服用过激素药物，7妊娠期，8其他',
+  family_status     int(11)    NOT NULL DEFAULT 0                           COMMENT '基本状态:1,0,1,0,0,0,1 (0表示选中，1表示未选中)',
   status_desp       varchar(100)  NOT NULL DEFAULT ''                       COMMENT '状态描述',
   medical           int(11)    NOT NULL DEFAULT 0                           COMMENT '是否确诊:0否,1是',
   temperature       decimal(14,2) NOT NULL DEFAULT 0                        COMMENT '体温',

whepi-ui/templates/home/ribao.ftl

@@ -21,82 +21,174 @@
                             </div>
                             <div class="weui-cell__ft">
                                 <button id="btnAdd" href="javascript:" style="height:5vh; margin-right: 3vh;"
-                                   class="weui-btn weui-btn_mini weui-btn_primary">添加人员</button>
+                                        class="weui-btn weui-btn_mini weui-btn_primary">添加人员
+                                </button>
                             </div>
                         </div>
                     </div>
                     <div id="rb_family">
-                        <#--<div class="weui-media-box weui-media-box_text">-->
-                            <#--<h4 class="weui-media-box__title">家人1：咳嗽、乏力、未确诊 <a href="javascript:" >删除</a></h4>-->
-                            <#--<p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。</p>-->
-                        <#--</div>-->
+                    <#--<div class="weui-media-box weui-media-box_text">-->
+                    <#--<h4 class="weui-media-box__title">家人1：咳嗽、乏力、未确诊 <a href="javascript:" >删除</a></h4>-->
+                    <#--<p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。</p>-->
+                    <#--</div>-->
                     </div>
                     <div class="weui-cells__tips"> <span style="color: red">
                         注：请如实上报情况，便以相互帮助，小区是我家，团结就是力量！后期会有医生跟踪分析，给予大家医疗建议，请认真填报！
                     </span></div>
                     <div class="weui-btn-area">
-                        <a id="btn_shangbao" class="weui-btn weui-btn_primary" href="javascript:" id="showTooltips" onclick="addReport()">上报</a>
+                        <a id="btn_shangbao" class="weui-btn weui-btn_primary" href="javascript:" id="showTooltips"
+                           onclick="addReport()">上报</a>
                     </div>
                 </div>
                 <div id="ribao" class="weui-btn-area" style="display: none">
                     <div style="text-align: center;">基本信息</div>
                     <div style="display:flex; flex-direction: row; justify-content: space-between;">
-                        <input id="js_input_user_name" 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: 5vh; width: 30%; text-align: center;" />
-                        <input id="js_input_user_sex" 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: 5vh; width: 25%; text-align: center;" />
-                        <input id="js_input_user_age" class="weui-input" autofocus="" type="text" placeholder="年龄" maxlength="3" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 25%; text-align: center;" />
-                    </div>
-                    <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                        <div style="height: 5vh; line-height: 5vh;margin-left: 2vw;">基本状况</div>
-                        <input id="js_input_user_status" 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: 5vh; width: 75%;" />
+                        <input id="js_input_user_name" 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: 5vh; width: 30%; text-align: center;"/>
+                        <input id="js_input_user_sex" 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: 5vh; width: 25%; text-align: center;"/>
+                        <input id="js_input_user_age" class="weui-input" autofocus="" type="text" placeholder="年龄"
+                               maxlength="3"
+                               style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 25%; text-align: center;"/>
+                    </div>
+                    <div style="height: 5vh; line-height: 5vh;margin-left: 2vw;">基本情况</div>
+                    <div class="weui-cells weui-cells_checkbox">
+                        <label class="weui-cell weui-cell_active weui-check__label" for="s11">
+                            <div class="weui-cell__hd">
+                                <input type="checkbox" class="weui-check" name="checkbox1" id="s11">
+                                <i class="weui-icon-checked"></i>
+                            </div>
+                            <div class="weui-cell__bd">
+                                <p>心脑血管疾病（服用ARB）</p>
+                            </div>
+                        </label>
+                        <label class="weui-cell weui-cell_active weui-check__label" for="s12">
+                            <div class="weui-cell__hd">
+                                <input type="checkbox" name="checkbox2" class="weui-check" id="s12">
+                                <i class="weui-icon-checked"></i>
+                            </div>
+                            <div class="weui-cell__bd">
+                                <p>心脑血管疾病（未服ARB）</p>
+                            </div>
+                        </label>
+                        <label class="weui-cell weui-cell_active weui-check__label" for="s13">
+                            <div class="weui-cell__hd">
+                                <input type="checkbox" name="checkbox3" class="weui-check" id="s13">
+                                <i class="weui-icon-checked"></i>
+                            </div>
+                            <div class="weui-cell__bd">
+                                <p>呼吸系统病史</p>
+                            </div>
+                        </label>
+                        <label class="weui-cell weui-cell_active weui-check__label" for="s14">
+                            <div class="weui-cell__hd">
+                                <input type="checkbox" name="checkbox4" class="weui-check" id="s14">
+                                <i class="weui-icon-checked"></i>
+                            </div>
+                            <div class="weui-cell__bd">
+                                <p>肿瘤病史</p>
+                            </div>
+                        </label>
+                        <label class="weui-cell weui-cell_active weui-check__label" for="s15">
+                            <div class="weui-cell__hd">
+                                <input type="checkbox" name="checkbox5" class="weui-check" id="s15">
+                                <i class="weui-icon-checked"></i>
+                            </div>
+                            <div class="weui-cell__bd">
+                                <p>糖尿病史</p>
+                            </div>
+                        </label>
+                        <label class="weui-cell weui-cell_active weui-check__label" for="s16">
+                            <div class="weui-cell__hd">
+                                <input type="checkbox" name="checkbox6" class="weui-check" id="s16">
+                                <i class="weui-icon-checked"></i>
+                            </div>
+                            <div class="weui-cell__bd">
+                                <p>服用过激素药物</p>
+                            </div>
+                        </label>
+                        <label class="weui-cell weui-cell_active weui-check__label" for="s17">
+                            <div class="weui-cell__hd">
+                                <input type="checkbox" name="checkbox7" class="weui-check" id="s17">
+                                <i class="weui-icon-checked"></i>
+                            </div>
+                            <div class="weui-cell__bd">
+                                <p>妊娠期</p>
+                            </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;">
                         <div style="color: gray;height: 5vh; line-height: 5vh; width: 70%;">是否确诊新冠肺炎</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: 5vh;" />
+                        <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: 5vh;"/>
                     </div>
                     <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
                         <div style="color: gray;height: 5vh; line-height: 5vh; width: 30%;">单间隔离</div>
-                        <input id="switchDanjiangeli" 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: 5vh;" />
+                        <input id="switchDanjiangeli" 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: 5vh;"/>
                     </div>
 
                     <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
                         <div style="color: gray;height: 5vh; line-height: 5vh; width: 30%;">体温</div>
-                        <input id="js_input_user_tiwen" class="weui-input" autofocus="" type="number" placeholder="请输入" maxlength="4" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;" />
+                        <input id="js_input_user_tiwen" class="weui-input" autofocus="" type="number" placeholder="请输入"
+                               maxlength="4"
+                               style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>
                     </div>
                     <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
                         <div style="color: gray;height: 5vh; line-height: 5vh; width: 30%;">咳嗽现象</div>
-                        <input id="js_input_user_kesou" 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: 5vh;" />
+                        <input id="js_input_user_kesou" 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: 5vh;"/>
                     </div>
                     <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
                         <div style="color: gray;height: 5vh;line-height: 5vh; width: 30%;">肌肉酸痛</div>
-                        <input id="js_input_user_jirou" 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: 5vh;" />
+                        <input id="js_input_user_jirou" 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: 5vh;"/>
                     </div>
                     <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
                         <div style="color: gray;height: 5vh;line-height: 5vh; width: 30%;">呼吸困难</div>
-                        <input id="js_input_user_huxi" 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: 5vh;" />
+                        <input id="js_input_user_huxi" 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: 5vh;"/>
                     </div>
                     <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
                         <div style="color: gray;height: 5vh; line-height: 5vh; width: 30%;">乏力现象</div>
-                        <input id="js_input_user_fali" 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: 5vh;" />
+                        <input id="js_input_user_fali" 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: 5vh;"/>
                     </div>
                     <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
                         <div style="color: gray;height: 5vh; line-height: 5vh; width: 30%;">腹泻现象</div>
-                        <input id="js_input_user_fuxie" 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: 5vh;" />
+                        <input id="js_input_user_fuxie" 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: 5vh;"/>
                     </div>
                     <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
                         <div style="color: gray;height: 5vh; line-height: 5vh;margin-right: 2vw;width: 30%;">其他描述</div>
-                        <textarea id="shuruqita" class="weui-textarea" placeholder="输入内容（300字内）" rows="5" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; margin-top: 1vh;"></textarea>
+                        <textarea id="shuruqita" class="weui-textarea" placeholder="输入内容（300字内）" rows="5"
+                                  style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; margin-top: 1vh;"></textarea>
                     </div>
                     <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
                         <div style="color: gray;height: 5vh; line-height: 5vh;margin-right: 2vw;width: 40%;">
-                            <button id="ribao_score"  style="height:5vh;" class="weui-btn weui-btn_mini weui-btn_primary">健康评估</button></div>
-                            <input id="js_input_score_rezult" class="weui-input" autofocus=""  readonly="readonly" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;" />
-                             <input id="js_input_score_rezult_value" type="text" hidden="hidden" />
-                             <input id="js_input_temperature_score" type="text" hidden="hidden" />
-                             <input id="js_input_score_histroy" type="text" hidden="hidden" />
-                              <input id="js_input_score" type="text" hidden="hidden"/>
+                            <button id="ribao_score" style="height:5vh;"
+                                    class="weui-btn weui-btn_mini weui-btn_primary">健康评估
+                            </button>
+                        </div>
+                        <input id="js_input_score_rezult" class="weui-input" autofocus="" readonly="readonly"
+                               style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>
+                        <input id="js_input_score_rezult_value" type="text" hidden="hidden"/>
+                        <input id="js_input_temperature_score" type="text" hidden="hidden"/>
+                        <input id="js_input_score_histroy" type="text" hidden="hidden"/>
+                        <input id="js_input_score" type="text" hidden="hidden"/>
                     </div>
                     <div style="display: flex; justify-content: center;">
                         <div style="width: 70%;color: red; text-align: center;">
@@ -105,7 +197,8 @@
                     </div>
                     <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh; margin-bottom: 5vh;">
                         <a id="cancel" href="javascript:;" class="weui-btn weui-btn_default" style="width: 30%;">取消</a>
-                        <a id="commit" href="javascript:;" onclick="ribaoCommit();" class="weui-btn weui-btn_primary" style="margin-top: 0;width: 30%;">提交</a>
+                        <a id="commit" href="javascript:;" onclick="ribaoCommit();" class="weui-btn weui-btn_primary"
+                           style="margin-top: 0;width: 30%;">提交</a>
                     </div>
                 </div>
                 </br>
@@ -114,17 +207,18 @@
             <div id="rb_nav2" class="weui-tab__bd-item ">
                 <div id="my-input-ribao"></div>
                 <div class="weui-panel weui-panel_access">
-                    <div class="weui-panel__hd" style="color: #0bb20c; font-size: large" >我的家人</div>
+                    <div class="weui-panel__hd" style="color: #0bb20c; font-size: large">我的家人</div>
                     <div class="weui-panel__bd" id="ribao_famliy">
-                        <#--<div class="weui-media-box weui-media-box_text">-->
-                            <#--<h4 class="weui-media-box__title">家人1：咳嗽、乏力、未确诊</h4>-->
-                            <#--<p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。</p>-->
-                        <#--</div>-->
-                        <#--<div class="weui-media-box weui-media-box_text">-->
-                            <#--<h4 class="weui-media-box__title">家人1：咳嗽、乏力、确诊</h4>-->
-                            <#--<p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。</p>-->
-                        <#--</div>-->
-                    </div><br /><br />
+                    <#--<div class="weui-media-box weui-media-box_text">-->
+                    <#--<h4 class="weui-media-box__title">家人1：咳嗽、乏力、未确诊</h4>-->
+                    <#--<p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。</p>-->
+                    <#--</div>-->
+                    <#--<div class="weui-media-box weui-media-box_text">-->
+                    <#--<h4 class="weui-media-box__title">家人1：咳嗽、乏力、确诊</h4>-->
+                    <#--<p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。</p>-->
+                    <#--</div>-->
+                    </div>
+                    <br/><br/>
                 </div>
             </div>
         </div>

whepi-ui/templates/home/ribao.js

@@ -272,9 +272,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 +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%">' + familyStatus + 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' +
     '                              '));
 }
@@ -324,8 +324,9 @@ function ribao_add() {
       $('#ribao')[0].style.display = 'none';
     }
 
-    $("#js_input_user_status").val(getFamilyStatus(0));
-    $("#js_input_user_status").attr("data-values", 0);
+    // $("#js_input_user_status").val(getFamilyStatus(0));
+    // $("#js_input_user_status").attr("data-values", 0);
+
 
     $("#switchQuezhen").val(getMedical(0));
     $("#switchQuezhen").attr("data-values", 0);
@@ -373,7 +374,37 @@ 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();
-  var familyStatus = $("#js_input_user_status").attr("data-values") == undefined ? 0 : $("#js_input_user_status").attr("data-values");
+  //家庭状态
+  var familyStatus = "";
+  if ($("input[name='checkbox1']:checked").val() == "on")
+    familyStatus += "1";
+  else
+    familyStatus += "0";
+  if ($("input[name='checkbox2']:checked").val() == "on")
+    familyStatus += ",1";
+  else
+    familyStatus += ",0";
+  if ($("input[name='checkbox3']:checked").val() == "on")
+    familyStatus += ",1";
+  else
+    familyStatus += ",0";
+  if ($("input[name='checkbox4']:checked").val() == "on")
+    familyStatus += ",1";
+  else
+    familyStatus += ",0";
+  if ($("input[name='checkbox5']:checked").val() == "on")
+    familyStatus += ",1";
+  else
+    familyStatus += ",0";
+  if ($("input[name='checkbox6']:checked").val() == "on")
+    familyStatus += ",1";
+  else
+    familyStatus += ",0";
+  if ($("input[name='checkbox7']:checked").val() == "on")
+    familyStatus += ",1";
+  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 medical = $("#switchQuezhen").attr("data-values") == undefined ? 0 : $("#switchQuezhen").attr("data-values");
   var singleRoom = $("#switchDanjiangeli").attr("data-values") == undefined ? 0 : $("#switchDanjiangeli").attr("data-values");
@@ -441,10 +472,10 @@ function ribaoCommit() {
       "score": score,
     },
     success: function (data) {
-      if (data.msgReport == "2"){
+      if (data.msgReport == "2") {
         $.toast("家人姓名不能重复，如果重复，可以带上称呼");
         return;
-       }
+      }
       if ($('#ribao')[0].style.display == 'none') {
         $('#notOpenRibao').toggle();
         $('#ribao')[0].style.display = '';
@@ -502,8 +533,41 @@ function updateSuspected(suspectedId) {
         $("#js_input_user_sex").attr("data-values", suspected.grender);
         $("#js_input_user_name").val(suspected.userName);
         $("#js_input_user_age").val(suspected.age);
-        $("#js_input_user_status").val(getFamilyStatus(suspected.familyStatus));
-        $("#js_input_user_status").attr("data-values", suspected.familyStatus);
+        //基本情况
+        if (suspected.familyStatus != "") {
+          var familyStatusList = suspected.familyStatus.split(",");
+          if (familyStatusList[0] == 1)
+            $("input[name='checkbox1']").prop("checked","checked");
+          else
+            $("input[name='checkbox1']").removeAttr("checked");
+          if (familyStatusList[1] == 1)
+            $("input[name='checkbox2']").prop("checked","checked");
+          else
+            $("input[name='checkbox2']").removeAttr("checked");
+          if (familyStatusList[2] == 1)
+            $("input[name='checkbox3']").prop("checked","checked");
+          else
+            $("input[name='checkbox3']").removeAttr("checked");
+          if (familyStatusList[3] == 1)
+            $("input[name='checkbox4']").prop("checked","checked");
+          else
+            $("input[name='checkbox4']").removeAttr("checked");
+          if (familyStatusList[4] == 1)
+            $("input[name='checkbox5']").prop("checked","checked");
+          else
+            $("input[name='checkbox5']").removeAttr("checked");
+          if (familyStatusList[5] == 1)
+            $("input[name='checkbox6']").prop("checked","checked");
+          else
+            $("input[name='checkbox6']").removeAttr("checked");
+          if (familyStatusList[6] == 1)
+            $("input[name='checkbox7']").prop("checked","checked");
+          else
+            $("input[name='checkbox7']").removeAttr("checked");
+
+        }
+        // $("#js_input_user_status").val(getFamilyStatus(suspected.familyStatus));
+        // $("#js_input_user_status").attr("data-values", suspected.familyStatus);
 
         $("#jibenmiaoshu").val(suspected.statusDesp);
 
@@ -596,9 +660,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) + "；";
@@ -631,7 +695,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%">' + familyStatus + 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/java/com/bofeng/entity/MsSuspected.java

@@ -39,7 +39,7 @@ public class MsSuspected {
     private Integer age;
 
     @TableField("family_status")
-    private Integer familyStatus;
+    private String familyStatus;
 
     @TableField(exist = false)
     private String familyStatusStr = "";

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

@@ -41,7 +41,7 @@ public class MsSuspectedService {
 
     //添加家人
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public Long addSuspected(Long suspectedId, String userName, Integer grender, Integer age, Integer familyStatus,
+    public Long addSuspected(Long suspectedId, String userName, Integer grender, Integer age, String familyStatus,
                              String statusDesp, Integer medical, BigDecimal temperature, Integer cough, Integer muscle,
                              Integer dyspnea, Integer fatigue, Integer diarrhea, Integer singleRoom, String others, Long userCreate, Integer scoreRezult, Integer temperatureScore, Integer scoreHistroy, Integer score) {
         Long reportId = 0L;

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

@@ -180,25 +180,25 @@ public class RiBaoService {
             obj.setGrenderStr("女");
         }
 
-        if (obj.getFamilyStatus().intValue() == 0) {
-            obj.setFamilyStatusStr("正常");
-        } else if (obj.getFamilyStatus().intValue() == 1) {
-            obj.setFamilyStatusStr("心血管疾病（服用ARB）");
-        } else if (obj.getFamilyStatus().intValue() == 2) {
-            obj.setFamilyStatusStr("心血管疾病（未服用ARB）");
-        } else if (obj.getFamilyStatus().intValue() == 3) {
-            obj.setFamilyStatusStr("呼吸系统病史");
-        } else if (obj.getFamilyStatus().intValue() == 4) {
-            obj.setFamilyStatusStr("肿瘤病史");
-        } else if (obj.getFamilyStatus().intValue() == 5) {
-            obj.setFamilyStatusStr("糖尿病史");
-        } else if (obj.getFamilyStatus().intValue() == 6) {
-            obj.setFamilyStatusStr("服用过激素药物");
-        } else if (obj.getFamilyStatus().intValue() == 7) {
-            obj.setFamilyStatusStr("妊娠期");
-        } else if (obj.getFamilyStatus().intValue() == 8) {
-            obj.setFamilyStatusStr("其他");
-        }
+        // if (obj.getFamilyStatus().intValue() == 0) {
+        //     obj.setFamilyStatusStr("正常");
+        // } else if (obj.getFamilyStatus().intValue() == 1) {
+        //     obj.setFamilyStatusStr("心血管疾病（服用ARB）");
+        // } else if (obj.getFamilyStatus().intValue() == 2) {
+        //     obj.setFamilyStatusStr("心血管疾病（未服用ARB）");
+        // } else if (obj.getFamilyStatus().intValue() == 3) {
+        //     obj.setFamilyStatusStr("呼吸系统病史");
+        // } else if (obj.getFamilyStatus().intValue() == 4) {
+        //     obj.setFamilyStatusStr("肿瘤病史");
+        // } else if (obj.getFamilyStatus().intValue() == 5) {
+        //     obj.setFamilyStatusStr("糖尿病史");
+        // } else if (obj.getFamilyStatus().intValue() == 6) {
+        //     obj.setFamilyStatusStr("服用过激素药物");
+        // } else if (obj.getFamilyStatus().intValue() == 7) {
+        //     obj.setFamilyStatusStr("妊娠期");
+        // } else if (obj.getFamilyStatus().intValue() == 8) {
+        //     obj.setFamilyStatusStr("其他");
+        // }
 
         if (obj.getMedical().intValue() == 0) {
             obj.setMedicalStr("否");
@@ -301,25 +301,25 @@ public class RiBaoService {
                     obj.setGrenderStr("女");
                 }
 
-                if (obj.getFamilyStatus().intValue() == 0) {
-                    obj.setFamilyStatusStr("正常");
-                } else if (obj.getFamilyStatus().intValue() == 1) {
-                    obj.setFamilyStatusStr("心血管疾病（服用ARB）");
-                } else if (obj.getFamilyStatus().intValue() == 2) {
-                    obj.setFamilyStatusStr("心血管疾病（未服用ARB）");
-                } else if (obj.getFamilyStatus().intValue() == 3) {
-                    obj.setFamilyStatusStr("呼吸系统病史");
-                } else if (obj.getFamilyStatus().intValue() == 4) {
-                    obj.setFamilyStatusStr("肿瘤病史");
-                } else if (obj.getFamilyStatus().intValue() == 5) {
-                    obj.setFamilyStatusStr("糖尿病史");
-                } else if (obj.getFamilyStatus().intValue() == 6) {
-                    obj.setFamilyStatusStr("服用过激素药物");
-                } else if (obj.getFamilyStatus().intValue() == 7) {
-                    obj.setFamilyStatusStr("妊娠期");
-                } else if (obj.getFamilyStatus().intValue() == 8) {
-                    obj.setFamilyStatusStr("其他");
-                }
+                // if (obj.getFamilyStatus().intValue() == 0) {
+                //     obj.setFamilyStatusStr("正常");
+                // } else if (obj.getFamilyStatus().intValue() == 1) {
+                //     obj.setFamilyStatusStr("心血管疾病（服用ARB）");
+                // } else if (obj.getFamilyStatus().intValue() == 2) {
+                //     obj.setFamilyStatusStr("心血管疾病（未服用ARB）");
+                // } else if (obj.getFamilyStatus().intValue() == 3) {
+                //     obj.setFamilyStatusStr("呼吸系统病史");
+                // } else if (obj.getFamilyStatus().intValue() == 4) {
+                //     obj.setFamilyStatusStr("肿瘤病史");
+                // } else if (obj.getFamilyStatus().intValue() == 5) {
+                //     obj.setFamilyStatusStr("糖尿病史");
+                // } else if (obj.getFamilyStatus().intValue() == 6) {
+                //     obj.setFamilyStatusStr("服用过激素药物");
+                // } else if (obj.getFamilyStatus().intValue() == 7) {
+                //     obj.setFamilyStatusStr("妊娠期");
+                // } else if (obj.getFamilyStatus().intValue() == 8) {
+                //     obj.setFamilyStatusStr("其他");
+                // }
 
                 if (obj.getMedical().intValue() == 0) {
                     obj.setMedicalStr("否");

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

@@ -45,7 +45,7 @@ public class MsReportController {
 
         Integer grender = Conv.NI(request.getParameter("grender"));
         Integer age = Conv.NI(request.getParameter("age"));
-        Integer familyStatus = Conv.NI(request.getParameter("familyStatus"));
+        String familyStatus = request.getParameter("familyStatus");
         String statusDesp = request.getParameter("statusDesp");
         Integer medical = Conv.NI(request.getParameter("medical"));
         BigDecimal temperature = new BigDecimal(request.getParameter("temperature"));