소스 검색

xielianghe

lange 5 년 전
부모
커밋
5396ed19d9
3개의 변경된 파일258개의 추가작업 그리고 246개의 파일을 삭제
  1. 257 244
      whepi-ui/templates/home/ribao.ftl
  2. 0 1
      whepi-ui/templates/home/ribao.js
  3. 1 1
      whepi-web/src/main/java/com/bofeng/service/MsSuspectedService.java

+ 257 - 244
whepi-ui/templates/home/ribao.ftl

@@ -54,286 +54,299 @@
                     </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 id="ribao_jbqk">
-                        <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 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 id="ribao_jbqk">
+                            <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>
                         </div>
-                    </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>-->
-                    <input id="suspectedId" type="text" hidden="hidden" value=""/>
-                    <div style="height: 5vh; line-height: 5vh;margin-left: 2vw;">病情描述</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>-->
+                        <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: 55%;">新冠肺炎</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;"/>-->
-                        <div class="weui-cells_checkbox" style="width: 125%">
-                            <label class="weui-radio weui-cell_active weui-check__label" for="s18" >
-                                <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" >
-                                <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="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                            <div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">新冠肺炎</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;"/>-->
+                            <div class="weui-cells_checkbox" style="width: 125%">
+                                <label class="weui-radio weui-cell_active weui-check__label" for="s18">
+                                    <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">
+                                    <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>解除隔离
-                            </label>
+                                <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>
+                        </div>
+                        <div id="ribao_djgl">
+                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                                <div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">单间隔离</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;"/>
+                            </div>
+                        </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: 55%;">体温</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;"/>
                         </div>
-                    </div>
-                    <div id="ribao_djgl">
                         <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                            <div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">单间隔离</div>
-                            <input id="switchDanjiangeli" class="weui-input" autofocus="" type="text" placeholder="请选择"
+                            <div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">咳嗽现象</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;"/>
                         </div>
-                    </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: 55%;">体温</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;"/>
-                    </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: 55%;">咳嗽现象</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;"/>
-                    </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: 55%;">肌肉酸痛</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;"/>
-                    </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: 55%;">呼吸困难</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;"/>
-                    </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: 55%;">乏力现象</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;"/>
-                    </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: 55%;">腹泻现象</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;"/>
-                    </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: 55%;">其他描述</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>
-                    </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: 55%;">
-                            <button id="ribao_score" style="height:5vh;"
-                                    class="weui-btn weui-btn_mini weui-btn_primary">健康评估
-                            </button>
+                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                            <div style="color: gray;height: 5vh;line-height: 5vh; width: 55%;">肌肉酸痛</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;"/>
                         </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;">
-                            <br/>
-                            自愿填写病情描述(温度为必填项),提交后会根据每天病情描述变化趋势给出更加科学的健康评估建议
+                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                            <div style="color: gray;height: 5vh;line-height: 5vh; width: 55%;">呼吸困难</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;"/>
                         </div>
-                    </div>
-                    <div id="ribao_trip" class="weui-btn-area"><#--style="display: none"-->
-                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 6vh;">
-                            <div style="height: 5vh; line-height: 5vh; width: 55%;">工作驻地</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: 5vh;width: 50%"
-                                   onchange="selectinput1(this)"/>
-                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                            <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: 5vh;font-size:inherit;color:inherit;"/>
+                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                            <div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">乏力现象</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;"/>
                         </div>
                         <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                            <div style="height: 5vh; line-height: 5vh; width: 55%;">今晚住地</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: 5vh;width: 50%"
-                                   onchange="selectinput2(this)"/>
-                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                            <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: 5vh;font-size:inherit;color:inherit;"/>
+                            <div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">腹泻现象</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;"/>
                         </div>
                         <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                            <div style="height: 5vh; line-height: 5vh; width: 55%;">是否出行</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: 5vh;width: 145%"
-                                   onchange="selectinput6(this)"/>
+                            <div style="color: gray;height: 5vh; line-height: 5vh;width: 55%;">其他描述</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>
                         </div>
-                        <br/>
-                    <#--<div style="text-align: center;height: 1vh;">出行情况上报</div>-->
-
-                        <div id="none">
-                            <div class="weui-loadmore weui-loadmore_line" style="width: 100%;height: 1vh;">
-                                <span class="weui-loadmore__tips">出行情况上报</span>
+                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                            <div style="color: gray;height: 5vh; line-height: 5vh;width: 55%;">
+                                <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;">
+                                <br/>
+                                自愿填写病情描述(温度为必填项),提交后会根据每天病情描述变化趋势给出更加科学的健康评估建议
                             </div>
+                        </div>
+                        <div id="ribao_trip" class="weui-btn-area"><#--style="display: none"-->
                             <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 6vh;">
-                                <div style="height: 5vh; line-height: 5vh; width: 55%;">出发地</div>
-                                <input id="js_input_cfd" class="weui-input" type="text" placeholder="请选择"
+                                <div style="height: 5vh; line-height: 5vh; width: 55%;">工作驻地</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: 5vh;width: 50%"
-                                       onchange="selectinput3(this)"/>
+                                       onchange="selectinput1(this)"/>
                                 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                <input id="js_input_cfdq" placeholder="其它地点" disabled="disabled" type="text"
+                                <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: 5vh;font-size:inherit;color:inherit;"/>
                             </div>
                             <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                                <div style="height: 5vh; line-height: 5vh; width: 55%;">目的地</div>
-                                <input id="js_input_mdd" class="weui-input" type="text" placeholder="请选择"
+                                <div style="height: 5vh; line-height: 5vh; width: 55%;">今晚住地</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: 5vh;width: 50%"
-                                       onchange="selectinput4(this)"/>
+                                       onchange="selectinput2(this)"/>
                                 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                <input id="js_input_mddq" placeholder="其它地点" disabled="disabled" type="text"
+                                <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: 5vh;font-size:inherit;color:inherit;"/>
                             </div>
                             <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                                <div style="height: 5vh; line-height: 5vh; width: 55%;">出行方式</div>
-                                <input id="js_input_cxfs" class="weui-input" type="text" placeholder="请选择出行方式"
-                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%"
-                                       onchange="selectinput5(this)"/>
-                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                <input id="js_input_cxfsq" placeholder="车次/航班/车牌" 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: 5vh;font-size:inherit;color:inherit;"/>
-
-                            </div>
-                            <div class="weui-cell__ft" style="margin-top: 1vh;">
-                                <button href="javascript:" style="height:5vh; margin-right: 0vh;width: 70px;"
-                                        class="weui-btn weui-btn_mini weui-btn_primary" onclick="insertlingyun()">添加
-                                </button>
-                            </div>
-                            <div class="weui-loadmore tt" style="width: 100%;height: 1vh;margin-top: 1vh;">
+                                <div style="height: 5vh; line-height: 5vh; width: 55%;">是否出行</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: 5vh;width: 145%"
+                                       onchange="selectinput6(this)"/>
                             </div>
-                            <div>
-                                <table cellspacing="0" cellpadding="0" style="width: 100%">
-                                    <tbody id="tabtr"><#--border="1" cellspacing="0" cellpadding="0"-->
-                                    <tr style="background-color: #f8f8f8;">
-                                    <#-- <td style="text-align: center;">序号</td>
+                            <br/>
+                        <#--<div style="text-align: center;height: 1vh;">出行情况上报</div>-->
+
+                            <div id="none">
+                                <div class="weui-loadmore weui-loadmore_line" style="width: 100%;height: 1vh;">
+                                    <span class="weui-loadmore__tips">出行情况上报</span>
+                                </div>
+                                <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 6vh;">
+                                    <div style="height: 5vh; line-height: 5vh; width: 55%;">出发地</div>
+                                    <input id="js_input_cfd" class="weui-input" type="text" placeholder="请选择"
+                                           style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%"
+                                           onchange="selectinput3(this)"/>
+                                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                    <input id="js_input_cfdq" 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: 5vh;font-size:inherit;color:inherit;"/>
+                                </div>
+                                <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                                    <div style="height: 5vh; line-height: 5vh; width: 55%;">目的地</div>
+                                    <input id="js_input_mdd" class="weui-input" type="text" placeholder="请选择"
+                                           style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%"
+                                           onchange="selectinput4(this)"/>
+                                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                    <input id="js_input_mddq" 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: 5vh;font-size:inherit;color:inherit;"/>
+                                </div>
+                                <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                                    <div style="height: 5vh; line-height: 5vh; width: 55%;">出行方式</div>
+                                    <input id="js_input_cxfs" class="weui-input" type="text" placeholder="请选择出行方式"
+                                           style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%"
+                                           onchange="selectinput5(this)"/>
+                                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                    <input id="js_input_cxfsq" placeholder="车次/航班/车牌" 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: 5vh;font-size:inherit;color:inherit;"/>
+
+                                </div>
+                                <div class="weui-cell__ft" style="margin-top: 1vh;">
+                                    <button href="javascript:" style="height:5vh; margin-right: 0vh;width: 70px;"
+                                            class="weui-btn weui-btn_mini weui-btn_primary" onclick="insertlingyun()">添加
+                                    </button>
+                                </div>
+                                <div class="weui-loadmore tt" style="width: 100%;height: 1vh;margin-top: 1vh;">
+                                </div>
+                                <div>
+                                    <table cellspacing="0" cellpadding="0" style="width: 100%">
+                                        <tbody id="tabtr"><#--border="1" cellspacing="0" cellpadding="0"-->
+                                        <tr style="background-color: #f8f8f8;">
+                                        <#-- <td style="text-align: center;">序号</td>
                                 <td style="text-align: center;">出发地</td>
                                 <td style="text-align: center;">目的地</td>
                                 <td style="text-align: center;">出行方式</td>
                                 <td style="text-align: center;">车次/航班/车牌</td>-->
-                                    </tr>
-                                    </tbody>
-                                </table>
-                                <table id="tab5" class="new_tab" align="left" cellpadding="0" cellspacing="0"
-                                       style="width: 100%;">
-                                </table>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                    <table id="tab5" class="new_tab" align="left" cellpadding="0" cellspacing="0"
+                                           style="width: 100%;">
+                                    </table>
+                                </div>
                             </div>
-                        </div>
 
+                        </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>
+                        </div>
                     </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>
-                    </div>
-                </div>
                 </div>
                 </br>
                 </br>

+ 0 - 1
whepi-ui/templates/home/ribao.js

@@ -1593,7 +1593,6 @@ function helpValue1(v) {
 
   $('#ribao_famliy').append($('<div class="weui-media-box weui-media-box_text" style="height: auto">\n' +
     '                                      <h4 class="weui-media-box__title">' + userName + '&nbsp;&nbsp;&nbsp;' + grender + '&nbsp;&nbsp;&nbsp;' + age + '</h4>\n' +
-    '                                      &nbsp;&nbsp;<a style="color: #2a62bc" onclick=\'updateSuspected(' + JSON.stringify(v.suspectedId) + ')\'>修改</a></h4>\n' +
     '                                      <div style="height: auto">' + familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + workLocal + todayLocal + isTrip + tripDet + '</div>\n' +
     '                                    </div>\n' +
     '                              '));

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

@@ -288,7 +288,7 @@ public class MsSuspectedService {
                 msReport.setMsStatus(2);
             else
                 msReport.setMsStatus(1);
-            //msReport.setReportStatus(0);
+            msReport.setReportStatus(0);
             msReportMapper.updateById(msReport);
         }
     }