冲突

api/jbsc-api.js

@@ -38,7 +38,7 @@
		},
//		获取居民健康
		getHealth: function(data){
			return httpRequest.get('/patient/health_index/last',{data:data})
			return httpRequest.get('doctor/health_index/last',{data:data})
		},
//		获取医生基础信息
		doctorBaseinfo: function(data){

app/jbsc/html/statistics.html

@@ -179,7 +179,7 @@
							</tr>
						</thead>
						<tbody>
							<tr v-if="!wujilu" v-for="(data, index) in tablelist" @click="detail(data)">
							<tr v-if="!wujilu" v-for="(data, index) in tablelist" @click="view(data)">
								<td style="width:80px">{{data.patientName}}</td>
								<td>{{data.templateTitle}}</td>
								<td class="c-FF9630" style="width:50px">{{data.screenResultScore}}分</td>

app/jbsc/html/view_screening_results.html

@@ -154,7 +154,7 @@
				</div>
				
			</div>
			<div class="clear-bottom">
			<div class="clear-bottom" v-if="!isView">
				<div class="btn-group-bottom flex-box">
					<button class="btn btn-success" @click="jkjy">健康教育</button>
					<button class="btn bgc-12b7f5" v-if="userInfo.is_again" @click="reScreening">再次筛查</button>
@@ -181,6 +181,7 @@
					noTiZhong:true,
					doctorInfo:{code:wlyyAgentForDoc.uid},
					resultCode:httpData['resultCode'],
					isView: httpData['isView']|| false
				},
				mounted: function(){
					this.getScreenResultDetail()
@@ -204,7 +205,7 @@
						var vm=this
				  		var receiver={"code":vm.userInfo.patient_code,name:vm.userInfo.patient_name}
						sessionStorage.setItem("jbsc-jkwzreceiver",JSON.stringify(receiver))
						location.href="../../../../health-education/login.html?origin=jbsc"
						top.location.href="../../../../health-education/login.html?origin=jbsc"
				  	},
					getScreenResultDetail:function(){
						var vm=this;

app/jbsc/js/statistics.js

@@ -4,19 +4,19 @@ toastr.options = {
}
function showSuccessMessage(msg) {
    toastr.success(msg)
    layer.msg(msg,{icon:1})
}
function showErrorMessage(msg) {
    toastr.error(msg)
   	layer.msg(msg,{icon:5})
}
function showWarningMessage(msg) {
    toastr.warning(msg)
    layer.msg(msg,{icon:2})
}
function showInfoMessage(msg) {
    toastr.info(msg)
    layer.msg(msg,{icon:6})
}
new Vue({
@@ -110,6 +110,21 @@ new Vue({
  		sessionStorage.setItem("jbsc-jkwzreceiver",JSON.stringify(receiver))
  		location.href="../../../../health-education/login.html?origin=jbsc"
  	},
  	view:function(data){
  		top.layer.open({
		  type: 2,
//				  offset: ['100px'], //右下角弹出
		  area: ['568px', '100%'],
		  shade: 0.5,
		  title: '查看筛选结果',
		  fixed: true, //不固定
		  maxmin: true,
		  closeBtn:1,
		  shift: 5,
		  shadeClose: false, //点击遮罩关闭层
		  content: 'view_screening_results.html?isView=true&resultCode='+data.code
		});
  	},
  	//筛查
  	shaicha:function(data,isNew){
  		var vm=this
@@ -148,10 +163,22 @@ new Vue({
		});
  	},
  	//健康跟踪
  	jkgz:function(id){
  	jkgz:function(data){
  		var vm=this
  		//跳转到筛查结果页面
		showInfoMessage(id+"筛查结果")
  	},
		layer.open({
		  type: 2,
//				  offset: ['100px'], //右下角弹出
		  area: ['568px', '100%'],
		  shade: 0.5,
		  title: '查看筛选结果',
		  fixed: true, //不固定
		  maxmin: true,
		  closeBtn:1,
		  shift: 5,
		  shadeClose: false, //点击遮罩关闭层
		  content: 'advice.html?resultCode='+data.code+'&filter_code='+data.templateCode
		});
	}
  }
})