caixing200 5 rokov pred
rodič
commit
ca213affb4

+ 5 - 0
whepi-ui/templates/home/frag.head.ftl

@@ -84,6 +84,11 @@
             right: 0;
         }
 
+        .cx-reset-ribao #rb_family .weui-form-preview .weui-form-preview__bd{
+            max-height: 50vh;
+            overflow-y: auto;
+        }
+
         .user-header {
 
             padding: 15px 0 5px 0;

+ 2 - 2
whepi-ui/templates/home/home.ftl

@@ -75,13 +75,13 @@
         if (uptownId == xiaoquId || uptownId == ceshixiaoquId) {
             $('#ribao_trip')[0].style.display = '';
             // $('#ribao_djgl')[0].style.display = 'none';
-            $('#ribao_jbqk')[0].style.display = '';
+            // $('#ribao_jbqk')[0].style.display = '';
             // $('#qz_nav1_t')[0].style.display = 'none';
             // $('#qz_nav1')[0].style.display = 'none';
         } else {
             $('#ribao_trip')[0].style.display = 'none';
             // $('#ribao_djgl')[0].style.display = '';
-            $('#ribao_jbqk')[0].style.display = '';
+            // $('#ribao_jbqk')[0].style.display = '';
             if ($('#qz_nav1_t') && $('#qz_nav1_t').length > 0) {
                 $('#qz_nav1_t')[0].style.display = '';
                 $('#qz_nav1')[0].style.display = '';

+ 120 - 79
whepi-ui/templates/home/ribao.ftl

@@ -5,11 +5,11 @@
                 今日报告
             </a>
             <a class="weui-navbar__item" target="#rb_nav2" module="ri_bao">
-                健康日历
+                报告历史
             </a>
             <#if (uptownId??) && (uptownId == 1238790987234 || uptownId == 5 || uptownId == 100000002 )>
             <a class="weui-navbar__item" target="#rb_nav3" module="ri_bao">
-                更改部门
+                所属部门
             </a>
             </#if>
             <#if (uptownId??) && (uptownId == 100000002 )>
@@ -83,7 +83,15 @@
                                        maxlength="3"
                                        style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 30px; width: 25%; text-align: center;"/>
                             </div>
-                            <div id="ribao_jbqk">
+                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
+                                <div style="color: gray;height: 30px; line-height: 30px; width: 35%;">体温</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: 30px;"/>
+                            </div>
+
+                            <div id="ribao_jbqk" style="display: none;">
                                 <div style="height: 30px; line-height: 30px;margin-left: 2vw; display: none;">健康情况</div>
                                 <div class="weui-cells weui-cells_checkbox" style="display: none;">
                                     <label class="weui-cell weui-cell_active weui-check__label" for="s11">
@@ -158,7 +166,6 @@
                                            placeholder="请选择"
                                            style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 30px;"/>
                                 </div>
-
                             </div>
 
                         <#--<textarea id="jibenmiaoshu" class="weui-textarea" placeholder="身体基本状况描述" rows="5"-->
@@ -170,82 +177,47 @@
                                 </div>
 
                             <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
-                                <div style="color: gray;height: 30px; line-height: 30px; width: 35%;">新冠肺炎</div>
+                                <div style="color: gray;height: 30px; line-height: 30px; 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="width: 125%;display: none;">
-                                    <label class="weui-radio weui-cell_active weui-check__label" for="s18">
+                                <div class="weui-cells_checkbox" style="flex: 5">
+                                    <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>无
                                     </label>
-                                    <label class="weui-radio weui-cell_active weui-check__label" for="s19">
+                                    <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>确诊
-                                    </label>
-                                    <br/>
-                                    <div style="height: 20px"></div>
-                                    <label class="weui-radio weui-cell_active weui-check__label" for="s20">
-                                        <input type="radio" name="radio" value="2" class="weui-check" id="s20"
-                                               style="width: 10%">
-                                        <i class="weui-icon-checked"></i>疑似
-                                    </label>
-                                <#--<div style="height: 10px"></div>-->
-                                    <label class="weui-radio weui-cell_active weui-check__label" for="s21"
-                                           style="width: 25%">
-                                        <input type="radio" name="radio" value="3" class="weui-check" id="s21">
-                                        <i class="weui-icon-checked"></i>有接触史
-                                    </label>
-                                    <br/>
-                                    <div style="height: 20px"></div>
-                                    <label class="weui-radio weui-cell_active weui-check__label" for="s22"
-                                           style="width: 25%">
-                                        <input type="radio" name="radio" value="4" class="weui-check" id="s22">
-                                        <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">-->
+<#--                                        <input type="radio" name="radio" value="2" class="weui-check" id="s20"-->
+<#--                                               style="width: 10%">-->
+<#--                                        <i class="weui-icon-checked"></i>疑似-->
+<#--                                    </label>-->
+<#--                                &lt;#&ndash;<div style="height: 10px"></div>&ndash;&gt;-->
+<#--                                    <label class="weui-radio weui-cell_active weui-check__label" for="s21"-->
+<#--                                           style="width: 25%">-->
+<#--                                        <input type="radio" name="radio" value="3" class="weui-check" id="s21">-->
+<#--                                        <i class="weui-icon-checked"></i>有接触史-->
+<#--                                    </label>-->
+<#--                                    <br/>-->
+<#--                                    <div style="height: 20px"></div>-->
+<#--                                    <label class="weui-radio weui-cell_active weui-check__label" for="s22"-->
+<#--                                           style="width: 25%">-->
+<#--                                        <input type="radio" name="radio" value="4" class="weui-check" id="s22">-->
+<#--                                        <i class="weui-icon-checked"></i>解除隔离-->
+<#--                                    </label>-->
                                 </div>
                                 <input id="js_input_user_crov19"
                                        class="weui-input"
                                        autofocus=""
                                        type="text"
                                        placeholder="请选择"
-                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 30px;"/>
-                            </div>
-                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
-                                <div style="color: gray;height: 60px; line-height: 30px; flex: 8">
-                                    家庭成员中有新冠肺炎疫情或有过病例接触史人员
-                                </div>
-                                <div class="weui-cells_checkbox" style="flex: 5; margin-top: 15px;">
-                                    <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>否
-                                    </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>是
-                                    </label>
-                                </div>
-                            </div>
-                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
-                                <div style="color: gray;height: 60px; line-height: 30px;flex: 8;">
-                                    近期接触的家庭成员中有感冒、发热、咳嗽等症状
-                                </div>
-                                <div class="weui-cells_checkbox" style="flex: 5; margin-top: 15px;">
-                                    <label class="weui-radio weui-cell_active weui-check__label" for="s38" style="padding: 10px 0 10px 10px;">
-                                        <input type="radio" name="radio2" value="0" class="weui-check" id="s38"
-                                               style="width: 10%"/>
-                                        <i class="weui-icon-checked"></i>否
-                                    </label>
-                                    <label class="weui-radio weui-cell_active weui-check__label" for="s39" style="padding: 10px 0 10px 10px;">
-                                        <input type="radio" name="radio2" value="1" class="weui-check" id="s39"
-                                               style="width: 10%"/>
-                                        <i class="weui-icon-checked"></i>是
-                                    </label>
-                                </div>
+                                       style="display: none;border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 30px;"/>
                             </div>
                         <#--<div id="ribao_djgl">-->
                         <#--<div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">-->
@@ -256,55 +228,54 @@
                         <#--style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>-->
                         <#--</div>-->
                         <#--</div>-->
-
-                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
-                                <div style="color: gray;height: 30px; line-height: 30px; width: 35%;">体温</div>
-                                <input id="js_input_user_tiwen" class="weui-input" autofocus="" type="number"
-                                       placeholder="请输入"
-                                       maxlength="4"
+                            <div id="js_input_user_xinguan_view" style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
+                                <div style="color: gray;height: 30px; line-height: 30px; width: 35%;">新冠现象</div>
+                                <input id="js_input_user_xinguan" 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>
-                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
+                            <div id="js_input_user_kesou_view" style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
                                 <div style="color: gray;height: 30px; line-height: 30px; width: 35%;">咳嗽现象</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: 30px;"/>
                             </div>
-                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
+                            <div id="js_input_user_jirou_view" style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
                                 <div style="color: gray;height: 30px;line-height: 30px; width: 35%;">肌肉酸痛</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: 30px;"/>
                             </div>
-                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
+                            <div id="js_input_user_huxi_view" style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
                                 <div style="color: gray;height: 30px;line-height: 30px; width: 35%;">呼吸困难</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: 30px;"/>
                             </div>
-                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
+                            <div id="js_input_user_fali_view" style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
                                 <div style="color: gray;height: 30px; line-height: 30px; width: 35%;">乏力现象</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: 30px;"/>
                             </div>
-                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
+                            <div id="js_input_user_fuxie_view" style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
                                 <div style="color: gray;height: 30px; line-height: 30px; width: 35%;">腹泻现象</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: 30px;"/>
                             </div>
-                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
+                            <div id="shuruqita_view" style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
                                 <div style="color: gray;height: 30px; line-height: 30px;width: 35%;">其他描述</div>
                                 <textarea id="shuruqita" class="weui-textarea" placeholder="输入内容(300字内)" rows="2"
                                           style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; margin-top: 5px;"></textarea>
                             </div>
-                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
+                            <div style="display:none; flex-direction: row; justify-content: space-between; margin-top: 5px;">
                                 <div style="color: gray;height: 30px;width: 35%;">
                                     <button id="ribao_score" style="height:30px;"
                                             class="weui-btn weui-btn_mini weui-btn_primary">健康评估
@@ -323,11 +294,81 @@
                         <#--自愿填写病情描述(温度为必填项),提交后会根据每天病情描述变化趋势给出更加科学的健康评估建议-->
                         <#--</div>-->
                         <#--</div>-->
+                            <div class="weui-loadmore weui-loadmore_line" style="margin: 20px 0 0 0;width: 100%;height: 20px">
+                                <span class="weui-loadmore__tips">接触史</span>
+                            </div>
+                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
+                                <div style="color: gray;height: 30px; line-height: 30px; flex: 8">新冠肺炎接触史</div>
+                                <div class="weui-cells_checkbox" style="flex: 5">
+                                    <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>无
+                                    </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>有
+                                    </label>
+                                </div>
+                            </div>
+                            <div id="isContactView" style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
+                                <div style="color: gray;height: 60px; line-height: 30px; flex: 8">
+                                    家庭成员中有新冠肺炎疫情或有过病例接触史人员
+                                </div>
+                                <div class="weui-cells_checkbox" style="flex: 5; margin-top: 15px;">
+                                    <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>否
+                                    </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>是
+                                    </label>
+                                </div>
+                            </div>
+                            <div id="isSuspectedView" style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
+                                <div style="color: gray;height: 60px; line-height: 30px;flex: 8;">
+                                    近期接触的家庭成员中有感冒、发热、咳嗽等症状
+                                </div>
+                                <div class="weui-cells_checkbox" style="flex: 5; margin-top: 15px;">
+                                    <label class="weui-radio weui-cell_active weui-check__label" for="s38" style="padding: 10px 0 10px 10px;">
+                                        <input type="radio" name="radio2" value="0" class="weui-check" id="s38"
+                                               style="width: 10%"/>
+                                        <i class="weui-icon-checked"></i>否
+                                    </label>
+                                    <label class="weui-radio weui-cell_active weui-check__label" for="s39" style="padding: 10px 0 10px 10px;">
+                                        <input type="radio" name="radio2" value="1" class="weui-check" id="s39"
+                                               style="width: 10%"/>
+                                        <i class="weui-icon-checked"></i>是
+                                    </label>
+                                </div>
+                            </div>
+
+
+
                                 <div class="weui-loadmore weui-loadmore_line" style="margin: 20px 0 0 0;width: 100%;height: 20px">
                                     <span class="weui-loadmore__tips">驻地情况</span>
                                 </div>
                             <div id="ribao_trip" class="weui-btn-area" style="margin: 0"><#--style="display: none"-->
                                 <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 0;">
+                                    <div style="color: gray;height: 30px; line-height: 30px; flex: 8">离开工作驻地</div>
+                                    <div class="weui-cells_checkbox" style="flex: 5">
+                                        <label class="weui-radio weui-cell_active weui-check__label" for="s50" style="padding: 10px 0 10px 10px;">
+                                            <input type="radio" name="radio4" value="0" class="weui-check" id="s50"
+                                                   style="width: 10%"/>
+                                            <i class="weui-icon-checked"></i>无
+                                        </label>
+                                        <label class="weui-radio weui-cell_active weui-check__label" for="s51" style="padding: 10px 0 10px 10px;">
+                                            <input type="radio" name="radio4" value="1" class="weui-check" id="s51"
+                                                   style="width: 10%"/>
+                                            <i class="weui-icon-checked"></i>有
+                                        </label>
+                                    </div>
+                                </div>
+                                <div style="display:none; flex-direction: row; justify-content: space-between; margin-top: 0;">
                                     <div style="height: 30px; line-height: 30px; width: 35%;">工作驻地</div>
                                     <input id="js_input_gzzd" class="weui-input" type="text" placeholder="请选择"
                                            style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 30px;width: 50%"
@@ -336,7 +377,7 @@
                                     <input id="js_input_qtdd" placeholder="仅填市级如,上海市" disabled="disabled" type="text"
                                            style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 30px;font-size:inherit;color:inherit;"/>
                                 </div>
-                                <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
+                                <div style="display:none; flex-direction: row; justify-content: space-between; margin-top: 5px;">
                                     <div style="height: 30px; line-height: 30px; width: 35%;">今晚住地</div>
                                     <input id="js_input_jrszd" class="weui-input" type="text" placeholder="请选择"
                                            style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 30px;width: 50%"
@@ -345,7 +386,7 @@
                                     <input id="js_input_jrszq" placeholder="仅填市级如,上海市" disabled="disabled" type="text"
                                            style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 30px;font-size:inherit;color:inherit;"/>
                                 </div>
-                                <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 5px;">
+                                <div style="display:none; flex-direction: row; justify-content: space-between; margin-top: 5px;">
                                     <div style="height: 30px; line-height: 30px; width: 50%;">是否跨市出行</div>
                                     <input id="js_input_sf" class="weui-input" type="text" placeholder="请选择"
                                            style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 30px;width: 90%"

+ 377 - 154
whepi-ui/templates/home/ribao.js

@@ -217,83 +217,104 @@ function ribao_init() {
       }
       ];
 
-  $("#js_input_user_status").select({
-    title: "选择基本状况",
-      multi: true,
-    items: userStatus,
-      // onOpen:function (e) {
-      //   var target = $("#js_input_user_status");
-      //   console.log(target.data().values,userFamilyStatusStr,userFamilyStatus)
-      //   target.val(userFamilyStatusStr);
-      //   target.data('values',userFamilyStatus);
-      //     console.log(target.data().values,userFamilyStatusStr,userFamilyStatus)
-      // }
-    // onChange:function(e){
-    //   var selectStr = e.values
-    //   if(!selectStr){
-    //     $("#js_input_user_status").select('update',{
-    //       multi: true,
-    //     })
-    //   }else {
-    //     if(selectStr.indexOf('0')>-1){
-    //       $("#js_input_user_status").select('update',{
-    //         multi: false,
-    //       })
-    //     }else {
-    //       $("#js_input_user_status").select('update',{
-    //         multi: true,
-    //       })
-    //     }
-    //   }
-    //     // var target = $("#js_input_user_status");
-    //     // console.log(target.data().values,userFamilyStatusStr,userFamilyStatus)
-    //   console.log(e)
-    // },
-    beforeClose:function (e) {
-      if(e){
-        if(e.indexOf('0')>-1 && e.length>1){
-          $.toast("无病史不能与其他项同时被选中", "text");
-          return false
-        }else {
-          return true
-        }
-      }
-    }
+  // $("#js_input_user_status").select({
+  //   title: "选择基本状况",
+  //     multi: true,
+  //   items: userStatus,
+  //     // onOpen:function (e) {
+  //     //   var target = $("#js_input_user_status");
+  //     //   console.log(target.data().values,userFamilyStatusStr,userFamilyStatus)
+  //     //   target.val(userFamilyStatusStr);
+  //     //   target.data('values',userFamilyStatus);
+  //     //     console.log(target.data().values,userFamilyStatusStr,userFamilyStatus)
+  //     // }
+  //   // onChange:function(e){
+  //   //   var selectStr = e.values
+  //   //   if(!selectStr){
+  //   //     $("#js_input_user_status").select('update',{
+  //   //       multi: true,
+  //   //     })
+  //   //   }else {
+  //   //     if(selectStr.indexOf('0')>-1){
+  //   //       $("#js_input_user_status").select('update',{
+  //   //         multi: false,
+  //   //       })
+  //   //     }else {
+  //   //       $("#js_input_user_status").select('update',{
+  //   //         multi: true,
+  //   //       })
+  //   //     }
+  //   //   }
+  //   //     // var target = $("#js_input_user_status");
+  //   //     // console.log(target.data().values,userFamilyStatusStr,userFamilyStatus)
+  //   //   console.log(e)
+  //   // },
+  //   beforeClose:function (e) {
+  //     if(e){
+  //       if(e.indexOf('0')>-1 && e.length>1){
+  //         $.toast("无病史不能与其他项同时被选中", "text");
+  //         return false
+  //       }else {
+  //         return true
+  //       }
+  //     }
+  //   }
+  //
+  // });
+
+  // $("#js_input_user_crov19").select({
+  //   title: "选择基本状况",
+  //   items: [
+  //       {
+  //           title: "无",
+  //           value: "0",
+  //       },
+  //       {
+  //           title: "确诊",
+  //           value: "1",
+  //       },
+  //       {
+  //           title: "疑似",
+  //           value: "2",
+  //       },
+  //       {
+  //           title: "有接触史",
+  //           value: "3",
+  //       },
+  //       {
+  //           title: "解除隔离",
+  //           value: "4",
+  //       },
+  //   ],
+  // });
 
-  });
 
-  $("#js_input_user_crov19").select({
-    title: "选择基本状况",
+  $("#js_input_user_xinguan").select({
+    title: "选择新冠情况",
     items: [
-        {
-            title: "无",
-            value: "0",
-        },
-        {
-            title: "确诊",
-            value: "1",
-        },
-        {
-            title: "疑似",
-            value: "2",
-        },
-        {
-            title: "有接触史",
-            value: "3",
-        },
-        {
-            title: "解除隔离",
-            value: "4",
-        },
-    ],
+      {
+        title: "无",
+        value: "0",
+      },
+      {
+        title: "确诊",
+        value: "1",
+      },
+      {
+        title: "疑似",
+        value: "2",
+      },
+      {
+        title: "解除隔离",
+        value: "3",
+      }]
   });
 
-
   $("#js_input_user_kesou").select({
     title: "选择咳嗽情况",
     items: [
       {
-        title: "无咳嗽",
+        title: "无",
         value: "0",
       },
       {
@@ -468,6 +489,8 @@ function ribao_init() {
   //
   // var grender = $("#js_input_user_sex").attr("data-values") == undefined ? 0 : $("#js_input_user_sex").attr("data-values");
   // console.log("grender:" + grender)
+
+  initRadioEvent()
 }
 
 function selectinput1(obj) {
@@ -548,14 +571,48 @@ function selectinput6(obj) {
   }
 
 }
+function resetTravelState(bool) {
+  if (bool) {
+    $('#none').hide('fast');
+    $("#js_input_cfd").val("");
+    $("#js_input_cfd").attr("data-values", "");
+    $("#js_input_mdd").val("");
+    $("#js_input_mdd").attr("data-values", "");
+    $("#js_input_cxfs").val("");
+    $("#js_input_cxfs").attr("data-values", "");
+    $('#js_input_cxfsq').val("");
+    $('#js_input_cfdq').val("");
+    $('#js_input_mddq').val("");
+    listcx.splice(0, listcx.length);
+    $('#tabtr').empty();
+  } else {
+    $('#none').show('fast');
+  }
+
+}
 
 //添加出行详情
 function insertlingyun() {
-  var sf = $("#js_input_sf").attr("data-values") == undefined ? 3 : $("#js_input_sf").attr("data-values");
-  if (sf == 0 || sf == 3) {
-    cantijiao = true;
-    $.alert("请选择是否出行");
-    return;
+  // var sf = $("#js_input_sf").attr("data-values") == undefined ? 3 : $("#js_input_sf").attr("data-values");
+  // if (sf == 0 || sf == 3) {
+  //   cantijiao = true;
+  //   $.alert("请选择是否出行");
+  //   return;
+  // }
+  if($("#js_input_cfd").attr("data-values") == undefined){
+      cantijiao = true;
+      $.alert("请选择出发地");
+      return;
+  }
+  if($("#js_input_mdd").attr("data-values") == undefined){
+      cantijiao = true;
+      $.alert("请选择目的地");
+      return;
+  }
+  if($("#js_input_cxfs").attr("data-values") == undefined){
+      cantijiao = true;
+      $.alert("请选择出行方式");
+      return;
   }
   var person = new Object();
   var cxfs = $("#js_input_cxfs").attr("data-values") == undefined ? 0 : $("#js_input_cxfs").attr("data-values");
@@ -851,8 +908,8 @@ function ribao_cell(v) {
   var grender = getGreder(v.grender);
   var age = v.age;
   var familyStatus = "";
-  if (v.familyStatus != 0)
-    familyStatus = getFamilyStatus(v.familyStatus) + ";";
+  // if (v.familyStatus != 0)
+  //   familyStatus = getFamilyStatus(v.familyStatus) + ";";
   var medical = "";
   if (v.medical != 0)
     medical = "新冠肺炎:" + getMedical(v.medical) + ";";
@@ -949,8 +1006,8 @@ function ribao_cell(v) {
 
 function ribao_add() {
   $('#btnAdd').on('click', function () {
-    userFamilyStatus = '';
-    userFamilyStatusStr = '';
+    // userFamilyStatus = '';
+    // userFamilyStatusStr = '';
     if ($('#ribao')[0].style.display == 'none') {
       $('#notOpenRibao').toggle();
       $('#ribao')[0].style.display = '';
@@ -970,14 +1027,18 @@ function ribao_add() {
       $("#js_input_user_sex").val('男');
       $("#js_input_user_sex").attr("data-values", 1);
 
-      $("#js_input_user_status").val('');
-      $("#js_input_user_status").attr("data-values", '');
-      $("#js_input_user_crov19").val('无');
-      $("#js_input_user_crov19").attr("data-values", 0);
+      // $("#js_input_user_status").val('');
+      // $("#js_input_user_status").attr("data-values", '');
+      // $("#js_input_user_crov19").val('无');
+      // $("#js_input_user_crov19").attr("data-values", 0);
+
+      $("input[id='s18']").prop("checked", "checked");
 
       $("input[id='s28']").prop("checked", "checked");
       $("input[id='s38']").prop("checked", "checked");
 
+      $("input[id='s40']").prop("checked", "checked");
+
 
     $("#switchQuezhen").val(getMedical(0));
     $("#switchQuezhen").attr("data-values", 0);
@@ -987,6 +1048,9 @@ function ribao_add() {
 
     $("#js_input_user_tiwen").val(36.5);
 
+    $("#js_input_user_xinguan").val(getXinguan(0));
+    $("#js_input_user_xinguan").attr("data-values", 0);
+
     $("#js_input_user_kesou").val(getCough(0));
     $("#js_input_user_kesou").attr("data-values", 0);
 
@@ -1225,10 +1289,11 @@ function ribaoCommit() {
   //   $.alert("请先设置微信获取当前位置");
   //   return;
   // }
-  var sf = $("#js_input_sf").attr("data-values") == undefined ? 3 : $("#js_input_sf").attr("data-values");
+  //var sf = $("#js_input_sf").attr("data-values") == undefined ? 3 : $("#js_input_sf").attr("data-values");
+  var sf = $("input[name=radio4]:checked").val()
   if (listcx.length == 0 && sf == 1) {
     cantijiao = true;
-    $.alert("请添加出行");
+    $.alert("请添加出行信息");
     return;
   }
   var suspectedId = $("#suspectedId").val();
@@ -1236,19 +1301,20 @@ 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 userStatus = filterUserStatus($("#js_input_user_status").data().values)
-  //不能同时选择服用和未服用
-  if (userStatus.indexOf('1')>-1 && userStatus.indexOf('2')>-1) {
-    cantijiao = true;
-    $.alert("心脑血管不能同时选择服用和未服用");
-    return;
-  }
-  //男性不能选择妊娠期
-  if ($("#js_input_user_sex").attr("data-values") == 1 && userStatus.indexOf('7')>-1) {
-    cantijiao = true;
-    $.alert("男性不能选择妊娠期");
-    return;
-  }
+  // var userStatus = filterUserStatus($("#js_input_user_status").data().values)
+  var userStatus = []
+  // //不能同时选择服用和未服用
+  // if (userStatus.indexOf('1')>-1 && userStatus.indexOf('2')>-1) {
+  //   cantijiao = true;
+  //   $.alert("心脑血管不能同时选择服用和未服用");
+  //   return;
+  // }
+  // //男性不能选择妊娠期
+  // if ($("#js_input_user_sex").attr("data-values") == 1 && userStatus.indexOf('7')>-1) {
+  //   cantijiao = true;
+  //   $.alert("男性不能选择妊娠期");
+  //   return;
+  // }
   //家庭状态
   var familyStatus = "";
   if(!userStatus.length){
@@ -1284,13 +1350,23 @@ function ribaoCommit() {
           familyStatus += ",0";
   }
 
-  var medical = $("#js_input_user_crov19").data().values;
+  // var medical = $("#js_input_user_crov19").data().values;
+  var medical = $("input[name='radio']:checked").val();
   if (medical == undefined) {
     cantijiao = true;
     $.alert("请选择新冠肺炎");
     return;
   }
 
+  var medicalState = $("#js_input_user_xinguan").data().values;
+  if(medical == 1){
+    if(medicalState == undefined){
+      cantijiao = true;
+      $.alert("请选择新冠现象");
+      return;
+    }
+  }
+
   var isContact = $("input[name='radio1']:checked").val();
   if (isContact == undefined) {
     cantijiao = true;
@@ -1413,15 +1489,16 @@ function ribaoCommit() {
       todyLocal = 4;
       todyLocalOther = jrszq;
     }
-    var sf = $("#js_input_sf").attr("data-values") == undefined ? 3 : $("#js_input_sf").attr("data-values");
-    var isTrip = "";
-    if (sf == 3) {
-      cantijiao = true;
-      $.alert("请选择是否出行");
-      return;
-    } else {
-      isTrip = sf;
-    }
+    //var sf = $("#js_input_sf").attr("data-values") == undefined ? 3 : $("#js_input_sf").attr("data-values");
+    //var sf = $("input[name=radio4]:checked").val()
+    var isTrip = $("input[name=radio4]:checked").val();
+    // if (sf == 1) {
+    //   cantijiao = true;
+    //   $.alert("请选择是否出行");
+    //   return;
+    // } else {
+    //   isTrip = sf;
+    // }
 
   } else {
     workLocal = 0;
@@ -1440,6 +1517,7 @@ function ribaoCommit() {
     "familyStatus": familyStatus,
     "statusDesp": statusDesp,
     "medical": medical,
+    "medicalState": medicalState,
     "singleRoom": singleRoom,
     "temperature": temperature,
     "cough": cough,
@@ -1602,30 +1680,14 @@ function goReport() {
 
 //修改上报
 function updateSuspected(suspectedId) {
+
     userFamilyStatus = ''
     userFamilyStatusStr = ''
-  var crov19States = [
-          {
-              title: "无",
-              value: "0",
-          },
-          {
-              title: "确诊",
-              value: "1",
-          },
-          {
-              title: "疑似",
-              value: "2",
-          },
-          {
-              title: "有接触史",
-              value: "3",
-          },
-          {
-              title: "解除隔离",
-              value: "4",
-          },
-      ];
+  //病情
+  var ids = ['js_input_user_xinguan_view','js_input_user_kesou_view','js_input_user_jirou_view','js_input_user_huxi_view','js_input_user_fali_view','js_input_user_fuxie_view','shuruqita_view'];
+  //接触史
+  var ids2 = ['isContactView','isSuspectedView'];
+
   $("#suspectedId").val("");
   if ($('#ribao')[0].style.display == 'none') {
     $('#notOpenRibao').toggle();
@@ -1685,26 +1747,31 @@ function updateSuspected(suspectedId) {
         //     $("input[name='checkbox7']").removeAttr("checked");
         //
         // }
-          userFamilyStatus = formatUserStatus(suspected.familyStatus)
-          userFamilyStatusStr = getFamilyStatus(suspected.familyStatus)
-        $("#js_input_user_status").val(userFamilyStatusStr);
+        //   userFamilyStatus = formatUserStatus(suspected.familyStatus)
+        //   userFamilyStatusStr = getFamilyStatus(suspected.familyStatus)
+        // $("#js_input_user_status").val(userFamilyStatusStr);
         // $("#js_input_user_status").attr("data-values", formatUserStatus(suspected.familyStatus));
 
-        $("#js_input_user_status").data("values", userFamilyStatus);
+        // $("#js_input_user_status").data("values", userFamilyStatus);
 
         // $("#jibenmiaoshu").val(suspected.statusDesp);
-        // if (suspected.medical == 0)
-        //   $("input[id='s18']").prop("checked", "checked");
-        // if (suspected.medical == 1)
-        //   $("input[id='s19']").prop("checked", "checked");
+        if (suspected.medical == 0)
+          $("input[id='s18']").prop("checked", "checked");
+        if (suspected.medical == 1){
+          $("input[id='s19']").prop("checked", "checked");
+          ids.forEach(v=>{
+            $('#'+v).show('fast')
+          })
+        }
+
         // if (suspected.medical == 2)
         //   $("input[id='s20']").prop("checked", "checked");
         // if (suspected.medical == 3)
         //   $("input[id='s21']").prop("checked", "checked");
         // if (suspected.medical == 4)
         //   $("input[id='s22']").prop("checked", "checked");
-          $("#js_input_user_crov19").val(crov19States[suspected.medical].title);
-          $("#js_input_user_crov19").attr("data-values", suspected.medical);
+        //   $("#js_input_user_crov19").val(crov19States[suspected.medical].title);
+        //   $("#js_input_user_crov19").attr("data-values", suspected.medical);
 
 
         if (suspected.isContact == 0)
@@ -1715,6 +1782,24 @@ function updateSuspected(suspectedId) {
           $("input[id='s38']").prop("checked", "checked");
         if (suspected.isSuspected == 1)
           $("input[id='s39']").prop("checked", "checked");
+
+        if (suspected.isContact == 0 && suspected.isSuspected == 0)
+          $("input[id='s40']").prop("checked", "checked");
+        if (suspected.isContact == 1 || suspected.isSuspected == 1){
+          $("input[id='s41']").prop("checked", "checked");
+          ids2.forEach(v=>{
+            $('#'+v).show('fast')
+          })
+        }
+
+        if(suspected.isTrip == 0){
+          $("input[id='s50']").prop("checked", "checked");
+        }else {
+          $("input[id='s51']").prop("checked", "checked");
+        }
+
+
+
         // $("#switchQuezhen").val(getMedical(suspected.medical));
         // $("#switchQuezhen").attr("data-values", suspected.medical);
 
@@ -1723,6 +1808,9 @@ function updateSuspected(suspectedId) {
 
         $("#js_input_user_tiwen").val(suspected.temperature);
 
+        $("#js_input_user_xinguan").val(getXinguan(suspected.medicalState||0));
+        $("#js_input_user_xinguan").attr("data-values", suspected.medicalState||0);
+
         $("#js_input_user_kesou").val(getCough(suspected.cough));
         $("#js_input_user_kesou").attr("data-values", suspected.cough);
 
@@ -1766,13 +1854,15 @@ function updateSuspected(suspectedId) {
           $('#js_input_jrszq').removeAttr("disabled")
         }
         $("#js_input_jrszq").val(suspected.todayLocalOther);
+
         //是否出行
-        $("#js_input_sf").val(getIsTrip(suspected.isTrip));
-        $("#js_input_sf").attr("data-values", suspected.isTrip);
-        if (suspected.isTrip == 0)
-          $('#none')[0].style.display = 'none';
-        else
-          $('#none')[0].style.display = '';
+        // $("#js_input_sf").val(getIsTrip(suspected.isTrip));
+        // $("#js_input_sf").attr("data-values", suspected.isTrip);
+        if (suspected.isTrip == 0){
+          $('#none').hide('fast')
+        }else {
+          $('#none').show('fast')
+        }
         //详细
         $.ajax({
           url: '/home/selectTripSuspected',
@@ -1916,8 +2006,8 @@ function helpValue1(v) {
   var grender = getGreder(v.grender);
   var age = v.age;
   var familyStatus = "";
-  if (v.familyStatus != 0)
-    familyStatus = "基本状况:" + getFamilyStatus(v.familyStatus) + ";";
+  // if (v.familyStatus != 0)
+  //   familyStatus = "基本状况:" + getFamilyStatus(v.familyStatus) + ";";
 
   var medical = "";
   if (v.medical != 0)
@@ -2054,9 +2144,21 @@ function formatUserStatus(str) {
     return resultStr
 }
 
+function getXinguan(cough) {
+  if (cough == 0)
+    return "无";
+  else if (cough == 1)
+    return "确诊";
+  else if (cough == 2)
+    return "疑似";
+  else if (cough == 3)
+    return "解除隔离";
+  return "";
+}
+
 function getCough(cough) {
   if (cough == 0)
-    return "无咳嗽";
+    return "无";
   else if (cough == 1)
     return "偶尔短暂咳嗽";
   else if (cough == 2)
@@ -2199,6 +2301,16 @@ function getDiarrhea(diarrhea) {
 
 function clearShow() {
   console.log("qingkong")
+  //病情
+  var ids = ['js_input_user_xinguan_view','js_input_user_kesou_view','js_input_user_jirou_view','js_input_user_huxi_view','js_input_user_fali_view','js_input_user_fuxie_view','shuruqita_view'];
+  ids.forEach(iv=>{
+    $('#'+iv).hide()
+  })
+  //接触史
+  var ids2 = ['isContactView','isSuspectedView'];
+  ids2.forEach(iv=>{
+    $('#'+iv).hide()
+  })
   $("#suspectedId").val("");
     $("#js_input_user_name").val("");
     $("#js_input_user_age").val("");
@@ -2217,6 +2329,9 @@ function clearShow() {
 
   $("#js_input_user_tiwen").val("");
 
+  $("#js_input_user_xinguan").val("");
+  $("#js_input_user_xinguan").attr("data-values", "");
+
   $("#js_input_user_kesou").val("");
   $("#js_input_user_kesou").attr("data-values", "");
 
@@ -2248,24 +2363,30 @@ function clearShow() {
   $("#js_input_jrszq").val("");
   $("#js_input_sf").val(getIsTrip(0));
   $("#js_input_sf").attr("data-values", 0);
-  $('#none')[0].style.display = 'none';
+  $('#none').hide();
 
 
-  // $("input[id='s18']").removeAttr("checked");
-  // $("input[id='s19']").removeAttr("checked");
+  $("input[id='s18']").removeAttr("checked");
+  $("input[id='s19']").removeAttr("checked");
   // $("input[id='s20']").removeAttr("checked");
   // $("input[id='s21']").removeAttr("checked");
   // $("input[id='s22']").removeAttr("checked");
-    $("#js_input_user_status").val('');
-    $("#js_input_user_status").attr("data-values", '');
-    $("#js_input_user_crov19").val('无');
-    $("#js_input_user_crov19").attr("data-values", '0');
+  //   $("#js_input_user_status").val('');
+  //   $("#js_input_user_status").attr("data-values", '');
+  //   $("#js_input_user_crov19").val('无');
+  //   $("#js_input_user_crov19").attr("data-values", '0');
 
 
   $("input[id='s28']").removeAttr("checked");
   $("input[id='s29']").removeAttr("checked");
   $("input[id='s38']").removeAttr("checked");
   $("input[id='s39']").removeAttr("checked");
+  $("input[id='s40']").removeAttr("checked");
+  $("input[id='s41']").removeAttr("checked");
+  $("input[id='s50']").removeAttr("checked");
+  $("input[id='s51']").removeAttr("checked");
+
+  resetTravelState(true)
 }
 
 //健康评估
@@ -2356,6 +2477,108 @@ function getScoreRezult(scoreRezult, temperatureScore) {
   return "";
 }
 
+//2020-06-16
+function initRadioEvent() {
+  //各选择器
+  var selects = [
+      'js_input_gzzd',
+      'js_input_jrszd',
+      'js_input_sf',
+      'js_input_cfd',
+      'js_input_mdd',
+      'js_input_cxfs',
+      'js_input_user_sex',
+      'js_input_user_xinguan',
+      'js_input_user_jirou',
+      'js_input_user_kesou',
+      'js_input_user_huxi',
+      'js_input_user_fali',
+      'js_input_user_fuxie'
+  ];
+
+  //病情
+  var ids = ['js_input_user_xinguan_view','js_input_user_kesou_view','js_input_user_jirou_view','js_input_user_huxi_view','js_input_user_fali_view','js_input_user_fuxie_view','shuruqita_view']
+  ids.forEach(iv=>{
+    $('#'+iv).hide()
+  })
+  $('input[name="radio"]').on('change',function () {
+    selects.forEach(v=>{
+      $('#'+v).select("close")
+    })
+    var state = this.value
+    ids.forEach(v=>{
+      if(state == 1){
+        $('#'+v).show('fast')
+      }else {
+        $('#'+v).hide('fast')
+      }
+
+    })
+  })
+
+
+
+
+
+
+
+  //接触史
+  var ids2 = ['isContactView','isSuspectedView'];
+  ids2.forEach(iv=>{
+    $('#'+iv).hide()
+  })
+  $('input[name="radio3"]').on('change',function () {
+    selects.forEach(v=>{
+      $('#'+v).select("close")
+    })
+    var state = this.value
+    ids2.forEach(v=>{
+      if(state == 1){
+        $("input[id='s28']").removeAttr("checked");
+        $("input[id='s38']").removeAttr("checked");
+        $("input[id='s29']").prop("checked", "checked");
+        $("input[id='s39']").prop("checked", "checked");
+        $('#'+v).show('fast')
+      }else {
+        $("input[id='s28']").prop("checked", "checked");
+        $("input[id='s29']").removeAttr("checked");
+        $("input[id='s38']").prop("checked", "checked");
+        $("input[id='s39']").removeAttr("checked");
+        $('#'+v).hide('fast')
+      }
+    })
+  })
+  $('input[name="radio1"]').on('click',function () {
+    var state = this.value
+    if(state == 0 && $('input[name="radio2"]:checked').val() == 0){
+      $("input[id='s41']").removeAttr("checked");
+      $("input[id='s40']").prop("checked", "checked");
+      ids2.forEach(iv=>{
+        $('#'+iv).hide('fast')
+      })
+    }
+  })
+  $('input[name="radio2"]').on('click',function () {
+    var state = this.value
+    if(state == 0 && $('input[name="radio1"]:checked').val() == 0){
+      $("input[id='s41']").removeAttr("checked");
+      $("input[id='s40']").prop("checked", "checked");
+      ids2.forEach(iv=>{
+        $('#'+iv).hide('fast')
+      })
+    }
+  })
+
+
+  //出行
+  $('input[name="radio4"]').on('change',function () {
+    var state = this.value
+    resetTravelState(state == 0)
+  })
+}
+
+
+