Merge branch 'dev' of humingfen/patient-co-management into dev

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/questionnaire/template/template_result.jsp

@@ -65,11 +65,11 @@
                <span>&nbsp;&nbsp;~&nbsp;&nbsp;</span>
                <input type="text" class="form-control flex-box-item mw100 high_score">
                <span class="mr40"><span class="red-color">*</span>分析结果&nbsp;&nbsp;</span>
                <input type="text" class="form-control flex-box-item result"></div>
                <input type="text" class="form-control flex-box-item result" placeholder="请输入不超过200字的分析结果"></div>
            <div class="col-xs-10 flex-box">
                <span style="align-self: flex-start;"><span class="red-color">*</span>筛查建议&nbsp;&nbsp;</span>
                <textarea rows="5" class="form-control flex-box-item h120 advice" placeholder="筛查建议"></textarea>
                <textarea rows="5" class="form-control flex-box-item h120 advice" placeholder="请输入不超过200字的筛查建议"></textarea>
            </div>
            <div class="col-xs-2 caozuo-btn">
                <label class="btn btn-success width100">显示预警<input type="checkbox" class="xsyj"><i></i></label>