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

app/rehabilitation/html/guide_the_message.html

@@ -61,7 +61,7 @@
	      				</div>
	      			</div>
	      			<div class="flex-box btns-group" v-if="(service.isMyTask==1 || service.isCreate || service.isCK) && service.planStatus!=0 && service.status!=1">
	      				<button class="btn btn-yuyue" v-if="service.reserve==1" @click="qwapp">转诊预约</button>
	      				<button class="btn btn-yuyue" v-if="service.reserve==1 && service.status!=2" @click="qwapp">转诊预约</button>
	      				<button class="btn btn-yuyue" v-if="service.type==2 && service.operate!=1 && !service.isZK" @click="jkjy(service.patient,service.planDetaiId)">健康教育</button>
	      				<button class="btn btn-yuyue" v-if="service.type==3 && service.operate!=1 && !service.isZK" @click="jkzd(service.planDetaiId,service.patient)">健康指导</button>
	      				<button class="btn btn-yuyue" v-if="service.type==4 && service.operate!=1 && !service.isZK" @click="qwapp">随访</button>

app/rehabilitation/html/service_item_content.html

@@ -57,7 +57,7 @@
		      				</div>
	      				</div>
		      			<div class="flex-box btns-group" v-if="(service.isMyTask==1 || service.isCreate || service.isCK) && service.planStatus!=0">
		      				<button class="btn btn-yuyue" v-if="service.reserve==1" @click="qwapp">转诊预约</button>
		      				<button class="btn btn-yuyue" v-if="service.reserve==1 && service.status!=2" @click="qwapp">转诊预约</button>
		      				<button class="btn btn-yuyue" v-if="service.itemType==2 && service.operate!=1 && !service.isZK" @click="jkjy(service.patient,service.planDetaiId)">健康教育</button>
		      				<button class="btn btn-yuyue" v-if="service.itemType==3 && service.operate!=1 && !service.isZK" @click="jkzd(service.planDetaiId,service.patient)">健康指导</button>
		      				<button class="btn btn-yuyue" v-if="service.itemType==4 && service.operate!=1 && !service.isZK" @click="qwapp">随访</button>