Merge branch 'master' of linehang/PC-prescription into master

js/buz/body-record.js

@@ -120,12 +120,8 @@
		lastXY = '';
	bodyRecordApis.getBodyRecoredLast({data: dataLast}).then(function(res){
		if(res.status == 200){
			if(!res.data.xt || !res.data.xy) {
				showWarningMsg("该居民无体征记录");
				return;
			}
        	lastXT = res.data.xt.recordDate;
        	lastXY = res.data.xy.recordDate;
        	lastXT = res.data.xt ? res.data.xt.recordDate : null;
        	lastXY = res.data.xy ? res.data.xy.recordDate : null;
        	// 初始化执行
			getBodyRecord(tabIndex, dayIndex, statusIndex);
    	}else{
@@ -134,10 +130,6 @@
	})
	// 获取数据
	function getBodyRecord(tab, day, statu) {
		if(!lastXT || !lastXY) {
			showWarningMsg("该居民无体征记录");
			return;
		};
		var xtMax = getNormalLevel(statusIndex)[0],
			xtMin = getNormalLevel(statusIndex)[1],
			xyMax = [139, 89],
@@ -160,7 +152,12 @@
		}
		var type = (tab == 0 ? 1 : 2),
			startdate = (tab == 0 ? lastXT : lastXY),
			enddate = null;
		if(startdate) {
			enddate = getDateFromCurrentDate(startdate, -dayNum);
		} else {
			showWarningMsg("当前状态下无居民体征记录");return;
		}
		$('.data-record').html('<' + enddate.substr(0, 10) + '至' + startdate.substr(0,10) + '>');
		var recordData = {
			type: type,

js/buz/prescription-tabs.js

@@ -80,7 +80,7 @@ function judgeRecordFn() {
	var recordData = {patient: patiCode};
	bodyRecordApis.getBodyRecoredLast({data: recordData}).then(function(res){
		if(res.status == 200){
			if(!res.data.xt || !res.data.xy) {
			if(!res.data.xt && !res.data.xy) {
				links[3].class="hidden";
			}
			initPage();