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

app/recover/css/new_recover.css

@@ -86,7 +86,7 @@ ul {
.border-c12b7f5 {
	border-color: #12b7f5;
}
.bgc-green {background-color: green;}
.bgc-green {background-color: #00bb00;}
.b-r-3 {border-radius: 3px;}
.txt-ells {
	overflow: hidden;

app/recover/css/select-patient.css

@@ -59,3 +59,6 @@
	background: url(../images/jiaobiao_xuanzhe_img.png) no-repeat no-repeat bottom right;
}
.bgc-f2fcfe {background-color: #f2fcfe;}
.pat-list .set-no-hover:hover {
	background-color: #fff;
}

app/recover/html/new_recover.html

@@ -50,9 +50,9 @@
		        	</ul>
		        	<h4 class="h30 m0 c-f14 c-border-b">家庭医生</h4>
		        	<ul class="c-333 m0 p0 pb20">
		        		<li class="pt10"><span class="c-999">签约社区：</span>{{patiInfo.ssHospitalName}}</li>
		        		<li class="pt10"><span class="c-999">全科医生：</span>{{patiInfo.ssDoctorName}}</li>
		        		<li class="pt10"><span class="c-999">健&ensp;管&ensp;师：</span>{{patiInfo.ssDoctorHealthName}}</li>
		        		<li class="pt10"><span class="c-999">签约社区：</span>{{patiInfo.ssHospitalName || patiInfo.jtHospitalName}}</li>
		        		<li class="pt10"><span class="c-999">全科医生：</span>{{patiInfo.ssDoctorName || patiInfo.jtDoctorName}}</li>
		        		<li class="pt10"><span class="c-999">健&ensp;管&ensp;师：</span>{{patiInfo.ssDoctorHealthName || patiInfo.jtDoctorHealthName}}</li>
		        	</ul>
		        	<!--<h4 class="h30 m0 c-f14 c-border-b">诊疗信息</h4>
		        	<ul class="c-333 m0 p0 pb20">
@@ -227,7 +227,7 @@
                	allFee: 0,
                	projectList: null,
                	labelIndex: 2,
                	labelCode: null,
                	labelCode: 1,
                	spanLabel: [{
                		labelName: "(转)家庭病床",
                		code: 3
@@ -258,12 +258,13 @@
							layer.close(loadding)
							if(res.status == 200) {
								vm.patiInfo = res.data
								console.log(vm.patiInfo)
								vm.jDlist = [{
									name: vm.patiInfo.ssDoctorName,
									code: vm.patiInfo.ssDoctor
									name: vm.patiInfo.ssDoctorName || vm.patiInfo.jtDoctorName,
									code: vm.patiInfo.ssDoctor || vm.patiInfo.jtDoctor
								}, {
									name: vm.patiInfo.ssDoctorHealthName,
									code: vm.patiInfo.ssDoctorHealth
									name: vm.patiInfo.ssDoctorHealthName || vm.patiInfo.jtDoctorHealthName,
									code: vm.patiInfo.ssDoctorHealth || vm.patiInfo.jtDoctorHealth
								}]
							} else {
								showErrorMessage(res.msg);
@@ -518,6 +519,8 @@
                		this.labelCode = label.code
                	},
                	selectTime: function(index) {
                		event.cancelBubble = true;
                		event.stopPropagation();
                		var currentEle = $(event.target),
                			vm = this;
                		currentEle.flatpickr({

app/recover/html/select-patient.html

@@ -12,8 +12,8 @@
	<div id="app" style="height: 100%;" v-cloak>
		<div class="plr20 ptb10 c-border-b">
			<div class="clearfix c-border">
				<input class="fl search-input plr10" type="text" placeholder="输入居民姓名或身份证号码" :value="keyword" />
				<span class="fr search-btn"></span>
				<input class="fl search-input plr10" type="text" placeholder="输入居民姓名或身份证号码" v-model="keyword" />
				<span class="fr search-btn" @click="getPatientInfoByDoctor()"></span>
			</div>
		</div>
		<div style="overflow: hidden; height: calc(100% - 59px);">
@@ -25,6 +25,7 @@
					<span class="fl ml20 mr10 c-333 c-f16">{{pati.patientName}}</span>
					<span class="fl c-999">（{{pati.sex}}&emsp;{{pati.age}}岁）</span>
				</li>
				<li v-if="!patiList.length" class="c-t-center pt40 set-no-hover">无查询数据</li>
			</ul>
			<ul class="label-list p0 m0" style="overflow: auto; height: 100%;" v-if="isLabel">
				<li v-for="(label, index) in labelList" :key="index">
@@ -158,7 +159,7 @@
			    			params = {
			    				doctor: doctorCode,
								patientInfo: this.keyword, // 居民身份证或者姓名
								disease: label.label,
								disease: label ? label.label : "",
								page: vm.page,
								size: 50
			    			}
@@ -166,6 +167,14 @@
							layer.close(loadding)
							if(res.status == 200) {
								vm.patiList = res.data
								if(!label) {
									vm.isSearch = true
									vm.isLabel = false
								}
								if(!vm.keyword) {
									vm.isSearch = false
									vm.isLabel = true
								}
							} else {
								showErrorMessage(res.msg);
							}

app/rehabilitation/html/moreplan.html

@@ -5,7 +5,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <meta http-equiv="X-UA-Compatible" content="ie=edge">
    <title>Document</title>
    <title>康复管理</title>
    <link rel="shortcut icon" href="../../../favicon.ico">
    <link rel="stylesheet" href="../../../css/font-awesome.min.css">
    <link rel="stylesheet" type="text/css" href="../../../css/cross.css" />

app/rehabilitation/js/health_control.js

@@ -37,7 +37,7 @@ layui.use('element', function () {
                 $("#stopBtn_"+planid).html("终止计划")
             }
          
          console.log(isStop)
            var params = {
                status: isStop,
@@ -105,6 +105,18 @@ layui.use('element', function () {
                            var progressNum = Math.ceil((allFinishCount / allCount) * 100)
                            Progress(val[i].id, progressNum + "%")
                        }
                        if (isStop == 0) {
                            $("#progress_"+val[i].id).css({
                                 "background-color": "gray"
                             })
                            $("#stopBtn_"+val[i].id).html("激活计划")
                         } else {
                             $("#progress_"+val[i].id).css({
                                 "background-color": "#ff9526"
                             })
                             $("#stopBtn_"+val[i].id).html("终止计划")
            
                         }
                      
                    }

app/rehabilitation/js/moreplan.js

@@ -102,6 +102,15 @@ layui.use('element', function () {
                        if (isStop == 0) {
                            $("#span_font"+val[i].planId).html("已中止")
                            $("#span_font"+val[i].planId).addClass("cgre")
                            $("#progress_"+val[i].planId).css({
                                "background-color": "gray"
                            })
                           $("#stopBtn_"+val[i].planId).html("激活计划")
                        }else{
                            $("#progress_"+val[i].planId).css({
                                "background-color": "#ff9526"
                            })
                            $("#stopBtn_"+val[i].planId).html("终止计划")
                        } 
                        var progressNum = Math.ceil((allFinishCount / allCount) * 100)
@@ -177,7 +186,7 @@ layui.use('element', function () {
                vm.planid = data.planId
                console.log(data.planId)
                conFirm("确定终止该计划吗", data.status, vm.isStop, vm.planid, vm.getDatas)
                
                console.log(vm.isStop)
            },