Merge branch 'master' of http://192.168.1.220:10080/raolu/PC-application

app/jbsc/html/filter_result.html

@@ -75,7 +75,7 @@
					<p class="f16 mb20">评估报告</p>
					<p v-text="result.advice"></p>
				</div>
				<div class="clear-bottom">
				<div class="clear-bottom" v-if="userInfo.is_danger==1">
					<div class="btn-group-bottom">
						<button class="btn btn-primary" @click="referral">转诊</button>
						<button class="btn btn-warning" @click="heathTrack">健康跟踪</button>			

app/jbsc/html/statistics.html

@@ -209,7 +209,7 @@
								<td>{{data.screenResult}}</td>
								<td style="width:155px;">{{data.czrq}}</td>
								<td style="width:200px;">
									<div v-if="data.isAgain==1">
									<div v-if="data.isAgain==1 && data.isDanger==1">
										<div v-if="data.isOrder==1" class="c-12B7F5">
											已预约
										</div>

app/jbsc/html/view_screening_results.html

@@ -159,7 +159,7 @@
				</div>
				
			</div>
			<div class="clear-bottom" v-if="!isView || userInfo.is_again">
			<div class="clear-bottom" v-if="!isView || (userInfo.is_again==1 && userInfo.is_danger==1)">
				<div class="btn-group-bottom flex-box">
					<button class="btn bgc-2DBE55" @click="jkjy" v-if="result.doctorOtherAdvice || result.doctorAdvice">健康教育</button>
					<button class="btn bgc-FF9630" @click="jkzg" v-else>健康跟踪</button>