处理情况 健康文章问题

app/article/html/article.html

@@ -84,20 +84,22 @@
		<!--<script src="../../../plugins/layer/layer.min.js"></script>-->
        <script type="text/javascript">
	    	var httpData=GetRequest();
        	var loginDoctor = JSON.parse(window.localStorage.getItem('severDocInfo') || window.localStorage.getItem('docInfo') ||  window.localStorage.getItem('wlyyAgent')),
        	var loginDoctor = JSON.parse(window.localStorage.getItem('wlyyAgent') || window.localStorage.getItem('severDocInfo') || window.localStorage.getItem('docInfo')),
        	
//      	currentUserRole = window.localStorage.getItem('userRose'),
		     userRole = loginDoctor && loginDoctor.userRole && loginDoctor.userRole,
		     userRole = (loginDoctor && loginDoctor.hospital) || (loginDoctor && loginDoctor.userRole && loginDoctor.userRole),
//			     currentUserRoleLevel = loginDoctor.currentUserRole.level,
		    // roleType = Number(loginDoctor.currentUserRole.isManage) ? 2 : 1
		    currentUserRoleLevel = 4,
		    roleType = 1;
		    alert(JSON.stringify(userRole))
		    var currentDoc = _.find((userRole||[]),function(o) {
				return o.level =="4";
			}) || {};
		    alert(JSON.stringify(currentDoc))
			var currentUserRole=currentDoc.code || currentDoc[0] && currentDoc[0].code
		    var currentUserRole=userRole
		    if(typeof userRole === "object"){
		    	var currentDoc = _.find((userRole||[]),function(o) {
					return o.level =="4";
				}) || {};
				currentUserRole=currentDoc.code || currentDoc[0] && currentDoc[0].code
		    }
		    
	    	new Vue({
				el: "#app",
			    data:{

app/jbsc/html/view_screening_results.html

@@ -100,7 +100,7 @@
					<div class="flex-box-item">体征记录：<span v-if="!noTiZhong"><span v-text="tizhongRecord.value1+'kg'"></span>&nbsp;&nbsp;身高<span v-text="tizhongRecord.value2+'cm'"></span></span><span v-else>暂无体征</span></div>
				</div>
				<div class="flex-box">
					<div class="flex-box-item">处理情况：<span>健康跟踪</span></div>
					<div class="flex-box-item">处理情况：<span>{{dealAction}}</span></div>
					<div class="flex-box-item">筛查机构：<span v-text="doctorInfo.hospitalName"></span></div>
				</div>
			</div>
@@ -194,7 +194,8 @@
					noTiZhong:true,
					doctorInfo:{code:wlyyAgentForDoc.uid},
					resultCode:httpData['resultCode'],
					isView: httpData['isView']|| false
					isView: httpData['isView']|| false,
					dealAction:[]
				},
				mounted: function(){
					this.getScreenResultDetail()
@@ -258,6 +259,24 @@
								data && (vm.answer=data.answer,vm.userInfo=data.info,vm.result=data.result);
								data && data.info && data.info.code && vm.getHealth();
								data && (vm.specialDoctorName = data.specialDoctorName);
								if(userInfo.isDanger==1 || userInfo.is_danger==1){
						           //只有高危的筛查需要处理
						            if(userInfo.following == 1){
						                vm.dealAction.push("已跟踪");
						            }
						            if(userInfo.isOrder == 1 || userInfo.is_order == 1){
						                vm.dealAction.push("已预约转诊");
						            }
						            if(userInfo.isOrder == 2 || userInfo.is_order == 2){
						                vm.dealAction.push("已接诊");
						            }
						            if(dealAction.length == 0){
						                vm.dealAction.push("待处理");
						            }
						        }else{
						            vm.dealAction.push("日常健康管理");
						        }
						        vm.dealAction=vm.dealAction.join(',');
							}else{
								top.layer.msg(res.msg, {icon: 5});
							}