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

# Conflicts:
#	app/recover/html/new_recover.html

api/http-request.js

@@ -1,5 +1,5 @@
(function($) {
    var publish_version = false;
    var publish_version = true;
    var isInner = false; //发布线上后有内外网的配置
    var docInfo = "app_storage";
    var agentName = "wlyyAgentForDoc";
@@ -13,7 +13,7 @@
        server = "http://www.xmtyw.cn/wlyy/"
        imserver = "http://27.155.101.77:3000/api/v2";
        socketUrl = "http://27.155.101.77:3000";
        articleServer = "http://www.xmtyw.cn/wlyy/"
        articleServer = "http://www.xmtyw.cn/wlyytest/"
        loginUrl = "../../login/login.html";
        imgServer = "http://www.xmtyw.cn/";
        if(isInner){
@@ -25,13 +25,13 @@
            imgServer = "http://10.95.22.10:8011/";
        }
    } else { // 测试环境配置
        server = "http://172.26.0.118:9092/wlyy/"
        imserver = "http://172.26.0.118:3000/api/v2";
        socketUrl = "http://172.26.0.118:3000";
        server = "http://192.168.131.172:9092/wlyy/"
        imserver = "http://192.168.131.172:3000/api/v2";
        socketUrl = "http://192.168.131.172:3000";
//      server = "http://192.168.131.154:8080/"
        articleServer="http://172.26.0.118:9092/wlyy/"
        articleServer="http://192.168.131.172:9092/wlyy/"
//   server = "http://192.168.131.130:8080/";
//		server = "http://192.168.131.118:8080/"; // 明芬
//		server = "http://192.168.131.123:8080/"; // 明芬
//      server = "http://192.168.131.127:8060/"; //逸祥
//      server = "http://192.168.131.24:8080/"; //仕杰
//		server = "http://192.168.131.143:8080/"; // 志南
@@ -41,7 +41,6 @@
        loginUrl = "../../login/login.html";
//      loginUrl = "/PC-prescription/login.html"; //自己本地测试时的路径
        imgServer = "http://172.19.103.54/";
        imgServer = "http://172.26.0.110:8888/";
    }
    var baseInfo = window.localStorage.getItem(docInfo);

api/recover_api.js

@@ -73,7 +73,7 @@
			return httpRequest.post("doctor/specialist/diagnosisInformation/createDiagnosisInformation", {data: data})
		},
		// 根据康复计划id获取诊疗信息
		createDiagnosisInformation: function(data) {
		findDiagnosisInformationByPlanId: function(data) {
			return httpRequest.get("doctor/specialist/diagnosisInformation/findDiagnosisInformationByPlanId", {data: data})
		},
		// 根据居民获取诊疗信息

app/recover/css/new_recover.css

@@ -186,6 +186,7 @@ ul {
}
.el-date-editor .el-range__icon, .el-date-editor .el-range-separator, .el-date-editor .el-range__close-icon {
	line-height: 18px;
	width: 20px;
}
.el-date-editor .el-range-input::-webkit-input-placeholder, .el-input__inner::-webkit-input-placeholder {
   color: #12b7f5;
@@ -209,3 +210,11 @@ ul {
	height: 40px;
	resize: none;
}
.el-date-editor .el-range__close-icon {
    font-size: 14px;
    color: #C0C4CC;
    width: 5px;
    display: inline-block;
    float: right;
    line-height: 20px;
}

app/recover/html/new_recover.html

@@ -68,26 +68,26 @@
								</ul>
							</div>
						</div>
		        		<li class="pt10"style="display: flex;">
		        		<li class="pt10"style="display: flex;" id="department">
		        			<label class="c-999" style="font-weight: normal;">入院科室:</label>
		        			<input class="form-control" v-bind:disabled="edit" v-bind:placeholder="nodata == true? '请输入': subsidiaryInfo.data.department" style=" text-align: center; height: 22px; border-radius: 3px; width: 80%;">
		        			<input class="form-control" v-bind:disabled="edit" v-bind:value="nodata == true? '请输入': subsidiaryInfo.data.department" style=" text-align: center; height: 22px; border-radius: 3px; width: 80%;">
		        		</li>
		        		<li class="pt10"style="display: flex;">
		        		<li class="pt10"style="display: flex;" id="attendingDoctor">
		        			<label class="c-999" style="font-weight: normal;">主治医师:</label>
		        			<input class="form-control" v-bind:disabled="edit" v-bind:placeholder="nodata == true? '请输入': subsidiaryInfo.data.attendingDoctor" style="text-align: center; height: 22px; border-radius: 3px; width: 80%;">
		        			<input class="form-control" v-bind:disabled="edit" v-bind:value="nodata == true? '请输入': subsidiaryInfo.data.attendingDoctor" style="text-align: center; height: 22px; border-radius: 3px; width: 80%;">
		        		</li>
		        		<li class="pt10"style="display: flex;">
		        		<li class="pt10"style="display: flex;" id="admissionDiagnosis">
		        			<label class="c-999" style="font-weight: normal;">入院诊断:</label>
		        			<input class="form-control" v-bind:disabled="edit" v-bind:placeholder="nodata == true? '请输入': subsidiaryInfo.data.admissionDiagnosis" style="text-align: center; height: 22px; border-radius: 3px; width: 80%;">
		        			<input class="form-control" v-bind:disabled="edit" v-bind:value="nodata == true? '请输入': subsidiaryInfo.data.admissionDiagnosis" style="text-align: center; height: 22px; border-radius: 3px; width: 80%;">
		        		</li>
		        		<li class="pt10"style="display: flex;">
		        		<li class="pt10"style="display: flex;" id="dischargeDiagnosis">
		        			<label class="c-999" style="font-weight: normal;">出院诊断:</label>
		        			<input class="form-control" v-bind:disabled="edit" v-bind:placeholder="nodata == true? '请输入': subsidiaryInfo.data.dischargeDiagnosis" style="text-align: center; height: 22px; border-radius: 3px; width: 80%;">
		        			<input class="form-control" v-bind:disabled="edit" v-bind:value="nodata == true? '请输入': subsidiaryInfo.data.dischargeDiagnosis" style="text-align: center; height: 22px; border-radius: 3px; width: 80%;">
		        		</li>
		        	</ul>
		        	<h4 class="h30 m0 c-f14 c-border-b c-999">医嘱小结</h4>
		        	<!--<p class="m0 pt10 c-333">依旧本次判断，对新消息进行出院诊断做出以下结论：忧郁啥啥事等等等问题</p>-->
		        	<textarea v-bind:disabled="edit" class="tipText m0 pt10 c-333 mt10" style="width: 100%; border:1px solid #e1e1e1; resize:none;text-indent:28px" v-html="subsidiaryInfo.data.dischargeOrder"></textarea>
		        	<textarea v-bind:disabled="edit" class="tipText m0 pt10 c-333 mt10" style="height: 200px; width: 100%; border:1px solid #e1e1e1; resize:none;text-indent:28px" v-html="subsidiaryInfo.data.dischargeOrder"></textarea>
		        	<button type="button" class="btn btn-default fr" style="width: 60px; background: #12B7F5; border-radius: 0px ;border: 0px ;" @click="editdiagnosis()" v-html="edit == true? '编辑':'保存'"></button>
	        	</div>
	        </div>
@@ -156,7 +156,7 @@
	        											<!--<p class="lh24 pl10 mb5 mr20 clearfix" v-for="(time, ind) in detail.specialistServiceItemDO.selectDateRange" :key="ind" v-if="detail.specialistServiceItemDO.selectDateRange.length">
		        											<span class="pb10 mr10">{{time.startTime}}</span>至<span class="pb10 ml10">{{time.endTime}}</span><span class="pb10 ml5 c-red cur-pit" @click="spliceTimeRange(index, ind)">删除</span>
		        										</p>-->
	        											<el-date-picker v-model="detail.value14" type="daterange" :picker-options="pickerOptions1" value-format="yyyy-MM-dd" @input="getRandgeDate(index)" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
	        											<el-date-picker  v-model="detail.value14" type="daterange" :picker-options="pickerOptions1" value-format="yyyy-MM-dd" @input="getRandgeDate(index)" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
	        										</div>
	        										<span class="fl lh24 mlr10 c-999">或</span>
	        										<div class="fl maxw600 c-border mb10">
@@ -218,8 +218,8 @@
															<span class="fr lh18 b-r-3 c-f12 ml5 bgc-4dcd70 plr5 c-fff" v-if="project3.flag == 1 || project3.flag == 3">社区</span>
															<span class="fr lh18 b-r-3 c-f12 ml5 bgc-55cefc plr5 c-fff" v-if="project3.flag == 2 || project3.flag == 3">医院</span>
														</div>
														<span class="fr h30 btn cur-pit plr10 bgc-12b7f5 c-fff b-r-3" v-if="!project3.isSelect" @click="addProject(index, index2, index3, project3)">添加</span>
														<span class="fr h30 btn plr10 bgc-e1e1e1 c-fff b-r-3" v-else>添加</span>
														<span class="fr h30 btn cur-pit plr10 bgc-12b7f5 c-fff b-r-3" style="padding: 0 10px;" v-if="!project3.isSelect" @click="addProject(index, index2, index3, project3)">添加</span>
														<span class="fr h30 btn plr10 bgc-e1e1e1 c-fff b-r-3" style="padding: 0 10px;" v-else>添加</span>
													</li>
												</ul>
											</li>
@@ -275,7 +275,7 @@
                el: "#app",
                data: {
                	pickerOptions1: {
			        	disabledDate(time) {
			        	disabledDate: function(time) {
			            	return time.getTime() < Date.now() - 8.64e7;
			        	}
			        },
@@ -338,6 +338,7 @@
                		loadding = layer.load(0, {shade: false});
                		params = {
                			patient: this.pati.patient,
//              			patient:"3b26a7905e034c36a5ba8e65bdc0dc7f",
							type: '2',
							page: 1,
							pageSize: 50,
@@ -349,15 +350,14 @@
                				if(res.data.length == 0){
                					vm.diagnosisInfo = [{orgName:'无'}]
                					console.log(vm.diagnosisInfo)
                					debugger
                					vm.nodata = true
                				}else{
                					vm.diagnosisInfo = res.data;
                				}
                				vm.orderHospital(0)
                			}else{
//              				vm.diagnosisInfo = [{orgName:'无'}]
//              				vm.orderHospital(0)
                				vm.diagnosisInfo = [{orgName:'无'}]
                				vm.orderHospital(0)
                				showErrorMessage(res.msg);
                			}
                		})
@@ -441,34 +441,12 @@
					//编辑诊疗
					editdiagnosis:function(){
						var  vm = this;
						if(vm.isPlanId){
							vm.edit = !vm.edit;
							if(vm.edit == true){
								var thr_parems ={
									patient:vm.pati.patient,
									patientName:vm.pati.patientName,
									planId:vm.isPlanId,
									hospitalName:$('.input-group-btn button').text().trim(),
									department:vm.subsidiaryInfo.data.department|| "",
									attendingDoctorName:vm.subsidiaryInfo.data.attendingDoctor ||"",
									admittingDiagnosis:vm.subsidiaryInfo.data.admissionDiagnosis || "",
									dischargeDiagnosis:vm.subsidiaryInfo.data.dischargeDiagnosis|| "",
									advice:vm.subsidiaryInfo.data.dischargeOrder ||"",
									dischargeTime:vm.subsidiaryInfo.data.dischargeTime || ""
								}
								loadding = layer.load(0, {shade: false});
								recoverAPI.preservationInfo(thr_parems).then(function(res){
		        					layer.close(loadding)
		        					if (res.status == 200) {
		                				showSuccessMessage('保存成功')
	            					}else{
	                					showErrorMessage(res.msg);
	                				}
	                			})
							}
						}else{
                			showWarningMessage("请先生成计划")
						}
						vm.edit = !vm.edit;
						vm.nodata = false
						vm.subsidiaryInfo.data.department = $('#department').find('input').val()
						vm.subsidiaryInfo.data.attendingDoctor = $('#attendingDoctor').find('input').val()
						vm.subsidiaryInfo.data.admissionDiagnosis = $('#department').find('input').val()
						vm.subsidiaryInfo.data.dischargeDiagnosis = $('#dischargeDiagnosis').find('input').val()
					},
                	// 获取频次列表
                	selectFrequencys: function() {
@@ -797,7 +775,11 @@
                		this.pati = pati
                		this.getPatientInfo()
                		this.findTemplateList()
<<<<<<< HEAD
//              		this.diagnosisQuery()
=======
                		this.diagnosisQuery()
>>>>>>> c5dc237fd8688dc3370532b7c19f9580c3a15538
                	},
                	// 添加模板
                	addMuban: function(oId) {
@@ -989,8 +971,10 @@
//		    					}
//		    				}
//              		}
                		var vm = this,
			    			loadding = layer.load(0, {shade: false}),
                		
						var vm = this;
			    		if(vm.edit == true){
			    			var loadding = layer.load(0, {shade: false}),
			    			data = {
			    				patient: this.pati.patient,
			    				name: this.pati.patientName,
@@ -1003,49 +987,75 @@
			    				detail: []
			    			},
			    			params = {};
			    		$.each(vm.templateDetail, function(index, o) {
			    			if(o.specialistServiceItemDO.executeTime.length) {
			    				var executeTime = []
			    				$.each(o.specialistServiceItemDO.executeTime, function(ind, v) {
			    					v += ' 00:00'
			    					executeTime.push(v)
			    				});
			    				var obj = {
			    					hospitalServiceItemId: o.id,
			    					type: o.flag == 2 ? 2 : 1,
			    					doctor: o.executeDoctor,
			    					doctorName: o.executeDoctorName,
			    					executeTimes: executeTime.join(","),
			    					frequencyCode: o.frequencyCode,
			    					timeType: o.timeType,
			    					remark: o.remark || ''
			    				}
			    				data.detail.push(obj)
			    			}
			    		});
			    		params = {
			    			json: JSON.stringify(data)
			    		}
						recoverAPI.createRehabilitationPlan(params).then(function(res) {
							layer.close(loadding)
							if(res.status == 200) {
								vm.isPlanId = res.data
								showSuccessMessage("康复计划配置成功！")
//								setTimeout(function() {
//									window.location.href = "../../rehabilitation/html/health_control.html"
//								}, 1000)
							} else {
								showErrorMessage(res.msg || "同康复计划项目创建时间重复！");
								vm.templateDetail = $.map(vm.templateDetail, function(o, index) {
									$.each(res.data, function(ind, v) {
										if(v == o.id) {
											o.isTimeSame = true
				    		$.each(vm.templateDetail, function(index, o) {
				    			if(o.specialistServiceItemDO.executeTime.length) {
				    				var executeTime = []
				    				$.each(o.specialistServiceItemDO.executeTime, function(ind, v) {
				    					v += ' 00:00'
				    					executeTime.push(v)
				    				});
				    				var obj = {
				    					hospitalServiceItemId: o.id,
				    					type: o.flag == 2 ? 2 : 1,
				    					doctor: o.executeDoctor,
				    					doctorName: o.executeDoctorName,
				    					executeTimes: executeTime.join(","),
				    					frequencyCode: o.frequencyCode,
				    					timeType: o.timeType,
				    					remark: o.remark || ''
				    				}
				    				data.detail.push(obj)
				    			}
				    		});
				    		params = {
				    			json: JSON.stringify(data)
				    		}
							recoverAPI.createRehabilitationPlan(params).then(function(res) {
								layer.close(loadding)
								if(res.status == 200) {
									vm.isPlanId = res.data
									if(vm.isPlanId){
										var thr_parems ={
											patient:vm.pati.patient,
											patientName:vm.pati.patientName,
											planId:vm.isPlanId,
											hospitalName:$('.input-group-btn button').text().trim(),
											department:$('#department').find('input').val(),//vm.subsidiaryInfo.data.department|| ""
											attendingDoctorName:$('#attendingDoctor').find('input').val(),//vm.subsidiaryInfo.data.attendingDoctor ||""
											admittingDiagnosis:$('#admissionDiagnosis').find('input').val(),//vm.subsidiaryInfo.data.admissionDiagnosis || ""
											dischargeDiagnosis:$('#dischargeDiagnosis').find('input').val(),//vm.subsidiaryInfo.data.dischargeDiagnosis|| ""
											advice:$('.tipText').val().trim(),//vm.subsidiaryInfo.data.dischargeOrder ||""
											dischargeTime:vm.subsidiaryInfo.data.dischargeTime || ""
										}
									});
									return o
								})
							}
						})
										loadding = layer.load(0, {shade: false});
										recoverAPI.preservationInfo(thr_parems).then(function(res){
				        					layer.close(loadding)
				        					if (res.status == 200) {
				        						setTimeout(function() {
													window.location.href = "../../rehabilitation/html/health_control.html"
												}, 1000)
				                				showSuccessMessage('保存成功')
			            					}else{
			                					showErrorMessage(res.msg);
			                				}
			                			})
									}
									showSuccessMessage("康复计划配置成功！")
								} else {
									showErrorMessage(res.msg || "同康复计划项目创建时间重复！");
									vm.templateDetail = $.map(vm.templateDetail, function(o, index) {
										$.each(res.data, function(ind, v) {
											if(v == o.id) {
												o.isTimeSame = true
											}
										});
										return o
									})
								}
							})
			    		}else{
			    			showSuccessMessage("请先保存诊疗信息！")
			    		}
    				},
    				// 字符串方法计算加减乘除（精确度百分位）
               		add: function(num1,num2){

app/recover/html/personal-manage.html

@@ -63,8 +63,8 @@
    			<h4 class="m0 pl15 lh40 c-position-r"><em class="c-position-a set-blue-span"></em>医嘱小结</h4>
				<ul class="m0 p0 ptb10 ui-col-1 c-border b-r-3 c-h100" style="overflow: auto;">
					<li class="pt5 plr10" v-for="(info, index) in diagnosisInformation" :key="index">
						<p class="c-999 lh40 clearfix">
							<span class="fl">{{info.dischargeDiagnosis}}</span>
						<p class="c-999 ptb10 clearfix" style="line-height: 20px;">
							<span class="fl w-100-78">&emsp;{{info.dischargeDiagnosis}}</span>
							<span class="fr">{{info.dischargeTime}}</span>
						</p>
						<div class="bgc-f5f5fa plr5 ptb10" style="line-height: 20px;">
@@ -307,7 +307,7 @@
                		location.href = "new_recover.html?patient=" + httpData.patientCode
                	},
                	jumpPlan: function(plan) {
                		location.href = "../../rehabilitation/html/rehabilitation_management.html?planId=" + plan.planId
                		location.href = "../../rehabilitation/html/rehabilitation_management.html?planId=" + plan.planId + "&patientCode=" + httpData.patientCode
                	},
					lookProject: function(obj) {
						layer.open({
@@ -533,7 +533,9 @@
			    			showErrorMessage("暂无体征数据");
			    			this.chartData = {
		                		opinion:[],
				                opinionData:[]
				                opinionData:[],
				                recordType: vm.recordType,
				                opinionData2: [],
				            }
			    			return false;
			    		}
@@ -561,10 +563,10 @@
									arr3.push(obj2)
								}
								vm.chartData = {
			                		opinion: arr1,
					                opinionData: arr2,
			                		opinion: arr1.length ? arr1 : [],
					                opinionData: arr2.length ? arr2 : [],
					                recordType: vm.recordType,
					                opinionData2: arr3,
					                opinionData2: vm.recordType == 2 ? arr3 : [],
					            }
							} else {
								showErrorMessage(res.msg);

app/rehabilitation/html/rehabilitation_management.html

@@ -161,7 +161,7 @@
								<span>图例注释： </span><i class="icon icon-blue"></i> <span>专科团队</span>&emsp;<i class="icon icon-green"></i> <span>家医团队</span>&emsp; <i class="icon icon-flag"></i> <span>我的任务</span>
							</div>
							<!--快速查找-->
							<div class="ui-col-1" style="overflow: hidden; overflow-y: scroll;" v-if="isFastSearch">
							<div class="ui-col-1 c-border-t" style="overflow: hidden; overflow-y: scroll;" v-if="isFastSearch">
								<div class="calendar-days" v-for="searchData1 in searchData">
                                    <div v-for="items in searchData1" class="flex-box clearfix">
                                    	<div class="fl flex-box calendar-day c-fff c-f28 bgc-2dbe55">

app/rehabilitation/js/rehabilitation_management.js

@@ -49,7 +49,7 @@
			this.serviceDoctorList();//获取服务医生列表
			this.bindEvents();
			// 获取最新的诊疗信息1条
            this.findDiagnosisInformationByPatient()
            this.findDiagnosisInformationByPlanId()
		},
		methods:{
			//获取计划表
@@ -76,17 +76,16 @@
				})
			},
			// 获取最新的诊疗消息
			findDiagnosisInformationByPatient: function() {
			findDiagnosisInformationByPlanId: function() {
				var vm = this,
					loading = layer.load(0, {shade: false}),params = {
						patient: vm.patientCode || "e040dd6814b648ceb3ba8d8a04f9f22c",
						page: 0,
						size: 1
					loading = layer.load(0, {shade: false}),
					params = {
						planId: vm.planId
					}
				recoverAPI.findDiagnosisInformationByPatient(params).then(function(res) {
				recoverAPI.findDiagnosisInformationByPlanId(params).then(function(res) {
					layer.close(loading)
					if(res.status == 200) {
						vm.diagnosisInformation = res.data.detailModelList[0]
						vm.diagnosisInformation = res.data
					} else {
						showErrorMessage(res.msg);
					}
@@ -252,6 +251,7 @@
			goToLoadData:function(flag){//flag是否更新数据
				this.tabStatus==1 && (!this.calendarData.length || flag) && this.calendar();
				this.tabStatus==2 && (!this.timeAxisData.length || flag) && this.timeAxis();
				this.changeSearch(-1)
			},
			calendar:function(){
			  var nlstr = new Date(this.ynow,this.mnow,1);  //当月第一天
@@ -288,6 +288,21 @@
			  this.monDetail();
			  this.calenderPlanDetail();
			},
			daysSort: function(arr) {
				var getArr = JSON.parse(JSON.stringify(arr)),
					returnArr = []
				for(var i = 1; i < 31; i++) {
					for(var j = 0, len = getArr.length; j < len; j++) {
						var stri = i > 9 + '' ? i : '0'+i
						if(getArr[j].day == stri) {
							returnArr.push(getArr[j])
							getArr.splice(j,1)
							break;
						}
					}
				}
				return returnArr
			},
			// 日历有计划数据处理
			planHandleData: function(data, day, mounth) {
				var item = data;
@@ -371,31 +386,34 @@
									}
								}
								if(data0.length) {
									var addlen = (data0.length + 1) % 7 ? (data0.length + 1) % 7 : 7
									var dataSort = vm.daysSort(data0)
									var addlen = (dataSort.length + 1) % 7 ? (dataSort.length + 1) % 7 : 7
									for(var i = 0; i < 7 - addlen; i++) {
										data0.push({
										dataSort.push({
											noService:true
										})	
									}
									searchData0.push(data0)
									searchData0.push(dataSort)
								}
								if(data1.length) {
									var addlen = (data1.length + 1) % 7 ? (data1.length + 1) % 7 : 7
									var dataSort = vm.daysSort(data1)
									var addlen = (dataSort.length + 1) % 7 ? (dataSort.length + 1) % 7 : 7
									for(var i = 0; i < 7 - addlen; i++) {
										data1.push({
										dataSort.push({
											noService:true
										})	
									}
									searchData1.push(data1)
									searchData1.push(dataSort)
								}
								if(data2.length) {
									var addlen = (data2.length + 1) % 7 ? (data2.length + 1) % 7 : 7
									var dataSort = vm.daysSort(data2)
									var addlen = (dataSort.length + 1) % 7 ? (dataSort.length + 1) % 7 : 7
									for(var i = 0; i < 7 - addlen; i++) {
										data2.push({
										dataSort.push({
											noService:true
										})	
									}
									searchData2.push(data2)
									searchData2.push(dataSort)
								}
							}
							if(searchData0.length) {vm.searchData.push(searchData0)}
@@ -475,7 +493,6 @@
							return o;
						})||[];
					}
					console.log(vm.timeAxisData)
				})
			},
			changeSearch: function(status) {

component/rehabilitation/my-echart.js

@@ -18,22 +18,20 @@ Vue.component('my-chart', {
    methods: {
		drawPie(){
			var vm = this,
				seriesData = [
				        {
				        	name: vm.chartData.recordType == 1 ? "血糖值" : "收缩压",
				            type:'line',
				            itemStyle: {
				            	normal: {
				            		lineStyle: {
				            			color: 'rgb(102,204,204)'
				            		}
				            	}
				            },
				            data: vm.chartData.opinionData
				        }
				    ]
				seriesData = []
			if(vm.chartData.recordType == 2) {
				seriesData.push({
				seriesData = [{
		        	name: "收缩压",
		            type:'line',
		            itemStyle: {
		            	normal: {
		            		lineStyle: {
		            			color: 'rgb(102,204,204)'
		            		}
		            	}
		            },
		            data: vm.chartData.opinionData
		        }, {
					name: "舒张压",
					type:'line',
		            itemStyle: {
@@ -44,7 +42,20 @@ Vue.component('my-chart', {
		            	}
		            },
		            data: vm.chartData.opinionData2
				})
				}]
			} else {
				seriesData = [{
		        	name: "血糖值",
		            type:'line',
		            itemStyle: {
		            	normal: {
		            		lineStyle: {
		            			color: 'rgb(102,204,204)'
		            		}
		            	}
		            },
		            data: vm.chartData.opinionData
		        }]
			}
	        var options = {
	        		grid: {
@@ -94,6 +105,7 @@ Vue.component('my-chart', {
    },
    watch: {
    	chartData: function(data) {
    		this.charts.clear();
	        this.drawPie()
    	}
    }