Merge branch 'master' of http://192.168.1.220:10080/raolu/sr-iHealthApp

html/home/html/admin.html

@@ -58,7 +58,7 @@
							<ul class="l-qytj-barner">
								<li data-index="0">
									<div id="zcjmAmount" class="l-qytj-val l-data c-f20 c-17b3ec">0<span class="c-f12">人</span></div>
									<div class="l-qytj-name c-f12">注册居民></div>
									<div class="l-qytj-name c-f12">注册居民>&emsp;</div>
								</li>
								<li data-index="1">
									<div id="jmzxlAmount" class="l-qytj-val l-data c-f20 c-17b3ec">0<span class="c-f12">次</span></div>

html/huanzhe/html/disease-label-edit.html

@@ -25,7 +25,14 @@
				<a href="javascript:void(0);" class="btntrue c-ccc">保存</a>
			</div>
		</div>
		
		<ul class="c-list msg-list" id='disease-box1'>	
			<li class="mb15 c-head">
				<div><i class="other-icon"></i><span>服务类型</span></div>		
			</li>			
			<!-- <li class="c-list-add">
				<div><span id='add-span'>添加标签</span><input maxlength="6" class="add-input" id='labelinput' type="input"/></div>	
			</li> -->
		</ul>
		<ul class="c-list msg-list" id='disease-box4'>	
			<li class="mb15 c-head">
				<div><i class="other-icon"></i><span>自定义标签</span></div>		
@@ -79,7 +86,6 @@
					
					
				});
				
				$("#disease-box4").on("click",".c-list-li",function(){
					if(!$(this).hasClass('cant-active')){
						if($(this).hasClass("active-icon")){
@@ -92,6 +98,20 @@
					}	
				})
				
				$("#disease-box1").on("click",".c-list-li",function(){
					if(!$(this).hasClass('cant-active')){
						if($(this).hasClass("active-icon")){
							$(this).removeClass("active-icon");
							$(this).addClass("no-active");
						}else{
							$(this).removeClass("no-active");
							$(this).addClass("active-icon");
						}
					}	
					$("#disease-box1 .c-list-li").removeClass("active-icon").removeClass("no-active");
					$(this).addClass("active-icon");
				})
				
				$("#disease-box3").on("click",".c-list-li",function(){
					if(!$(this).hasClass('cant-active')){
						if($(this).attr('data-noselect') == 'true'){
@@ -156,11 +176,11 @@
			})
			
			function saveData(){
				var health = [];
				var health = [];//服务类型
				var disease=[];
				var custom =[];
				var diseaseName = [];
				$("#disease-box2 .active-icon").each(function(){
				$("#disease-box1 .active-icon").each(function(){
					var val = $(this).attr("data-code");
					health.push(val);
					diseaseName.push($(this).attr("data-name"));
@@ -200,6 +220,7 @@
				params.disease = disease.join(",");
				params.custom = custom.join(",");
				params.patient = patientCode;
				console.error(JSON.stringify(params))
				sendPost("doctor/patient_label_info/patient_label_update",params,addPatientLabelErr,function(res){
					if(res.status==200){
						mui.toast('保存成功');
@@ -282,6 +303,7 @@
					{url:"/doctor/patient_label/labels_by_type",data:{labelType:3}},
					{url:"/doctor/patient_label/labels_by_type",data:{labelType:4,teamCode:docInfo.adminTeamCode}},
					{url:"/doctor/patient_label/patientAllLabels",data:{patient:patientCode}}, //获取选中的标签
					{url:"/wlyygc/doctor/label/labels", reqType: "get" ,data:{labelType:1}},//服务类型
					])
					return promise.then(function(datas){
						var data0 = datas[0],
@@ -291,6 +313,8 @@
						initData(2,data0);
						initData(3,data1);
						initData(4,data2);
						serviceTypeData(datas[4])
						console.error(activeArr.length+JSON.stringify(activeArr))
						
						setTimeout(function(){
							isValueChange();
@@ -317,6 +341,28 @@
					querySuccess(res);
			}
			
			function serviceTypeData(res){
				var labelhtml ="";
				if(res.status==10000){
					var data = res.result;
					for(var j in data){
						var disabled = "no-active";
					    var noselect = "";
					    var isExit=false;
						activeArr.map(function(v){
							console.error("v.label:"+v.label)
							console.error("data[j].code:"+data[j].code)
							if(v.label == data[j].code && v.labelType=='1')isExit =true;
						})
						if(isExit)disabled = "active-icon"  //本来就有的默认高亮
						labelhtml +='<li id="'+data[j].code+'" data-code="'+data[j].code+'" data-name="'+data[j].name+'"  data-noselect="' + noselect + '" class="c-list-li '+disabled+'">'+
										'<div><span >'+data[j].name+'</span></div>'+			
									'</li>'
					}
					$("#disease-box1").append(labelhtml);
				}
			}
			
			function initPatientData(type){
				sendPost("/doctor/patient_label_info/patient_label",{labelType:type,patient:patientCode},queryFailed,function(res){
					if(res.status==200){
@@ -405,6 +451,7 @@
						activeArr.map(function(v){
							if(v.label == data[j].labelCode)isExit =true;
						})
						
						if(isExit)disabled = "active-icon"  //本来就有的默认高亮
						labelhtml +='<li id="'+data[j].labelType+'-'+data[j].labelCode+'" data-code="'+data[j].labelCode+'" data-name="'+data[j].labelName+'"  data-noselect="' + noselect + '" class="c-list-li '+disabled+'">'+
										'<div><span >'+data[j].labelName+'</span></div>'+			

html/huanzhe/js/huanzhexinxi.js

@@ -57,7 +57,7 @@ function getPatientAllLabels(){
	sendPost("/doctor/patient_label/patientAllLabels",  
		{patient: patiCode}, null,
		function(res){ 
			console.log(res)
			console.error(JSON.stringify(res))
			if(res.status == 200){
				if(res.data){
					var str = ''

html/manager/css/manager.css

@@ -671,3 +671,7 @@
    text-align: center;
}
#list2 .l-arrow-right{display: none;}
.c-lab-mor li{
	height: 50px;
	padding-top: 10px;
}

html/manager/js/comprehensive-analysis.js

@@ -54,7 +54,9 @@ mui.plusReady(function(){
    $("#areaTitle").text(areaTitle);
    $("#infoText").text(information[index]);
    $(".choose-label").text(chooseYear + '年');
    
    //初始化趋势图时间
    nowYear = new Date().getYear()
	nowYear += (nowYear < 2000) ? 1900 : 0;
    initReqParams(); //初始请求参数信息
    loadData([0,1,2]);
    
@@ -461,9 +463,6 @@ function bindEvents(){
        }else{
        	 $(".qushi-span").text(tagName+"新增趋势");
        }
        //初始化趋势图时间
        nowYear = new Date().getYear()
		nowYear += (nowYear < 2000) ? 1900 : 0;
		//加载数据
        initReqParams();
        loadData([1,2]);

html/tuandui/js/gongzuobaogao.js

@@ -127,8 +127,8 @@ $(function() {
				if (me.type === 1) {
					me.monthData = ress;
				}
				console.error(JSON.stringify(ress))
				console.error(JSON.stringify(ress[3]))
//				console.error(JSON.stringify(ress))
//				console.error(JSON.stringify(ress[3]))
				me.setDateInPage();
				plus.nativeUI.closeWaiting();
			});
@@ -171,7 +171,7 @@ $(function() {
			    zxtj = [],
			    jgnfw = [],
			    jmgzqs = [],
			    gzbhqs = [],
			    gzbhqs = {},
			    pjmyd = {dt:[],da:[]},
			    xqzq = {da1: [], da2: []},
			    dArr = $d.init(5);
@@ -214,7 +214,26 @@ $(function() {
    				me.dateArr = d1.dt;
				}
		    }
		    gzbhqs = data[3].data;
			//处理关注变化趋势
			 if(data[3].status == 200){
			 	gzbhqs = data[3].data; 
			 	var concorn = gzbhqs[0].concorn//新增关注
				var cancel = gzbhqs[0].cancel;//取消关注
			 	concorn = me.getDataXY(concorn, 3);
				cancel = me.getDataXY(cancel, 4);
				if (me.type === 0) {
					concorn = $h.contrastDate(dArr, concorn, 'dt', 'da');
					cancel = $h.contrastDate(dArr, cancel, 'dt', 'da');
				}
				if (me.type === 1) {
					var d1 = $h.getWeeksData( concorn, 'dt', 'da');
					var d2 = $h.getWeeksData( cancel, 'dt', 'da');
					concorn = d1.da;
					cancel = d2.da;
    				me.dateArr = d1.dt;
				}
				gzbhqs = {concorn:concorn,cancel:cancel}
		    }
		    me.loadCharts(qy, zxtj, jgnfw, pjmyd, jmgzqs, gzbhqs);
		},
		loadCharts: function(qy, zxtj, jgnfw, pjmyd, jmgzqs, gzbhqs) {
@@ -222,27 +241,12 @@ $(function() {
			var count = zxtj.onReyCount + zxtj.totalCount;
			var zx = count == 0 ? (1/2)*100 : 0;
			jgnfw.splice(1,2);//删除随访和代预约的值
			if (me.type === 0) {
				_.map(gzbhqs,function(item,idx){
					gzbhxAxisData.push(item.date.substring(5,10));
					gzbhSeriesData1.push(item.concernCount);
					gzbhSeriesData2.push(item.cancelCount);
				})
			}
			if (me.type === 1) {
				_.map(gzbhqs,function(item,idx){
					gzbhxAxisData.push("第"+item.date+"周");
					gzbhSeriesData1.push(item.concernCount);
					gzbhSeriesData2.push(item.cancelCount);
				})
			}
			
			//处理咨询统计
			var unreplay = zxtj.onReyCount, //未回复数
            total = zxtj.totalCount, 
            replay = parseInt(total) - parseInt(unreplay); //已回复咨询数
        	$("#totalCount").text(total);//总咨询数
			debugger
        	
			Promise.all([
				//咨询统计
				$ic.init({
@@ -283,7 +287,7 @@ $(function() {
				//关注变化趋势
				$ic.init({
					el: me.$gzbhChart,
					xAxisData:  gzbhxAxisData,
					xAxisData: me.dateArr,
					legend: {
				        data:['新增关注','取消关注']
				    },
@@ -291,13 +295,13 @@ $(function() {
									name:"新增关注",
									type: "line",
									symbol: "emptyCircle",
									data: gzbhSeriesData1
									data: gzbhqs.concorn
								},
								{
									name:"取消关注",
									type: "line",
									symbol: "emptyCircle",
									data: gzbhSeriesData2
									data: gzbhqs.cancel
								}],
					chartsType: 1
				}),
@@ -308,14 +312,14 @@ $(function() {
			if (this.type == 0) {
				for (var i = 0, len = d.length; i< len; i++) {
					data.dt.push(t == 1 ? d[i].applyDate : t == 2 ?d[i].dateNo:d[i].applyDate);
					data.da.push(t == 1 ? d[i].signCount : t == 2 ?d[i].avgCount:d[i].concernCount);
					data.da.push(t == 1 ? d[i].signCount : t == 2 ?d[i].avgCount:t == 4?d[i].cancelCount:d[i].concernCount);
				}
				return data;
			}
			if (this.type == 1) {
				for (var i = 0, len = d.length; i< len; i++) {
					data.dt.push(t == 1 ? d[i].weekOfMonth : t == 2 ?d[i].weekNo:d[i].weekOfMonth);
					data.da.push(t == 1 ? d[i].signCount : t == 2 ?d[i].avgCount:d[i].concernCount);
					data.da.push(t == 1 ? d[i].signCount : t == 2 ?d[i].avgCount:t == 4?d[i].cancelCount:d[i].concernCount);
				}
				return data;
			}