Browse Source

修复测试bug

linehang 6 years ago
parent
commit
5ea1624530

+ 6 - 0
html/home/html/huanzhe.html

@ -23,6 +23,12 @@
		<div id="patient_list_wrap">
			<div class="mui-scroll-wrapper" style="top:45px;">
				<div class="list-wrap mui-scroll">
					<div class="lin-search searchbar">
						<div class="c-f12 search-input">
							<img src="../../../images/sousuo_icon.png" />
							搜索居民
						</div>
					</div>
					<ul class="n-list" id="pati_list">
					</ul>

+ 12 - 0
html/home/js/huanzhe.js

@ -9,6 +9,8 @@ var baseInfo = null,
var $patientListWrapper = $('#patient_list_wrap'),
	$patientList = $('#pati_list'),
	// 搜索输入框
	$searchbarInput = $('.searchbar .search-input'),
	// 搜索无结果时显示
	$noResultWrap = $('#no_result_wrap'),
	patientInfo = null;
@ -61,8 +63,10 @@ searchByPaging = function (isRefresh) {
         if(data.length < pageSize){
            hasMore = false;
            myScroll.endPullUpToRefresh(!hasMore);
            $(".mui-pull-bottom-tips").hide();
        }else{
            hasMore = true;
            $(".mui-pull-bottom-tips").show()
        }
	}).catch(function(e) {
		console && console.error(e)
@ -121,6 +125,14 @@ bindEvents = function () {
		}
		return false;
	})
	
	$searchbarInput.on('tap',function() {
		mui.openWindow({
			id: "searchhuanzhe2",
			url: "../../huanzhe/html/searchhuanzhe.html",
			extras: {}
		})	
	});
	/*刷新事件*/
//	window.addEventListener("refresh", function group(e) {
//		searchByPaging(true);

+ 2 - 2
html/huanzhe/html/fuwutongji.html

@ -33,7 +33,7 @@
                </div>
                <div class="c-f12 pl10">
                    <div class="c-fwb">备注:</div>
                    <div>&emsp;&emsp;1、年度为本签约年度</div>
                    <div>&emsp;&emsp;1、年度为本关注年度</div>
                    <div>&emsp;&emsp;2、随访为完成量/已计划量</div>
                </div>
                <div id="wrapper" class="pl10 pr10 mt10">
@ -54,7 +54,7 @@
				</thead>
				<tbody>
					<tr>
						<td rowspan="5" class="c-t-center c-f14 c-fwb pl5 pr5" style="width: 50px;">家庭医生签约医生</td>
						<td rowspan="5" class="c-t-center c-f14 c-fwb pl5 pr5" style="width: 50px;">医生服务数据统计</td>
						<td class="c-t-center" style="width: 80px;">健康咨询</td>
						<td class="c-17b3ec c-t-center">{{data.consult.month}}</td>
						<td class="c-17b3ec c-t-center">{{data.consult.year}}</td>

+ 4 - 1
html/huanzhe/html/huanzeziliao.html

@ -136,6 +136,9 @@
						<h4>手机号码</h4>
					</div>
					<div class="c-list-info c-t-right">
						<div class="c-nowrap">{{mobile}}</div>
					</div>
					<!--<div class="c-list-info c-t-right">
						<div class="c-nowrap">
							<div class="no"></div>
							<input value="{{mobile}}" 
@ -145,7 +148,7 @@
								style="color: #909090; text-align: right; width: 80%;"/>
						</div>
					</div>
					<span style="margin-top: 6px;" class="list-icon arrow-right"></span>
					<span style="margin-top: 6px;" class="list-icon arrow-right"></span>-->
				</li>
				<li class="c-list-text">
					<div class="c-list-value">

+ 6 - 40
html/huanzhe/html/searchhuanzhe.html

@ -16,25 +16,15 @@
			<section style="position: fixed;top: 0px;left: 0px;width: 100%;z-index: 5;">
				<div class="lin-search-ipt" style="border-bottom: 1px solid #dcdcdc;">
					<div class="div-input">
						<input id="searchPut" placeholder="可按姓名、身份证、标签搜索" class="f-fs12"/>
						<input id="searchPut" placeholder="输入姓名搜索" class="f-fs12"/>
					</div>
					<a href="javascript:;" class="searchbar-cancel">取消</a>
				</div>
				
				<div id="search_suggest_text" class="c-dn"></div>
				
				<div class="ui-grid plr10 ptb10 c-border-b c-position-r bgc-fff" id="searchAll">
	                <div class="ui-col-0" style="width: 50px;">
	                    <img src="../images/sousuo_qianyu_icon.png" class="img-circle" width="40"/>
	                </div>
	                <div class="ui-col-1">
	                    <h2 class="c-333 c-f18">签约搜索</h2>
	                    <p class="c-909090 c-f16">根据完整姓名、身份证号搜索居民</p>
	                </div>
	                <span class="arrow-right"></span>
	            </div>
	        </section>
            <div class="search-his c-hide" id="history_search" style="position: absolute;top:114px;z-index:3;width: 100%;">
            <div class="search-his c-hide" id="history_search" style="position: absolute;top:45px;z-index:3;width: 100%;">
				<div class="title">
					<div class="his">历史搜索</div>
					<div id="clear_his_data" class="cler">清空</div>
@ -64,46 +54,22 @@
		</div>
		<script type="text/html" id="pati_list_tmpl">
			{{each list as value j}}
			<li class="n-list-link list-arrow-r n-list-cover" data-patient-code="{{value.code}}" data-json="{{value.jsonStr}}">
			<li class="n-list-link list-arrow-r n-list-cover" data-patient-code="{{value.code}}" data-patient-phone="{{value.phone}}" data-patient-address="{{value.address}}">
				<div class="patient-face patient-face-new">
					<img src="{{value.photo,value.sex | setPatiPic}}"> 
					<img src="{{value.photo}}"> 
				</div>
				<div class="n-list-info">
					<h4 class="c-nowrap c-f16 mt5">{{value.name}}
						<em class="mb-em">({{value.sex | setSex}} {{value.age | setAge}}岁 {{if value.signType!=1}}{{value.expensesStatus | setExpenses}}{{/if}})</em>
						{{if value.standardStatus == 1}}
						<img class="mb-yu" src="../../../images/yujing_biaoqian_icon.png" alt="" />
						{{/if}}
						<em class="mb-em">({{value.sex | setSex}} {{value.age | setAge}}岁 )</em>
					</h4>
					<div class="mj-flex">
						{{if value.openid}}
						{{if value.isWX}}
						<img class="weixin-icon" src="../../../images/weixing_icon2.png"/>
						{{else}}
						<img class="weixin-icon" src="../../../images/weixing_zihui_icon.png"/>
						{{/if}}
						{{if value.deviceType && value.deviceType.indexOf("2") > -1}}
                        <img class="xueya-icon" src="../../../images/icon_xueyaji2.png"/>
                        {{else}}
                        <img class="xueya-icon" src="../../../images/icon_xueyaji_zhihui.png"/>
                        {{/if}}
                        {{if value.deviceType && value.deviceType.indexOf("1") > -1}}
                        <img class="xuetang-icon" src="../../../images/icon_xuetangyi2.png"/>
                        {{else}}
                        <img class="xuetang-icon" src="../../../images/icon_xuetangyi_zhihui.png"/>
                        {{/if}}
					</div>
				</div>
				<div class="c-t-right n-list-info mb-icon-flex">
					{{if value.disease==1 && value.diseaseCondition==0}}<div class="mb-icon-round green">高</div>{{/if}}
					{{if value.disease==2 && value.diseaseCondition==0}}<div class="mb-icon-round green">糖</div>{{/if}}
					{{if (value.disease=='1,2' || value.disease=='2,1') && value.diseaseCondition==0}}<div class="mb-icon-round green">高糖</div>{{/if}}
					{{if value.disease==1 && value.diseaseCondition==1}}<div class="mb-icon-round orange">高</div>{{/if}}
					{{if value.disease==2 && value.diseaseCondition==1}}<div class="mb-icon-round orange">糖</div>{{/if}}
					{{if (value.disease=='1,2' || value.disease=='2,1') && value.diseaseCondition==1}}<div class="mb-icon-round orange">高糖</div>{{/if}}
					{{if value.disease==1 && value.diseaseCondition==2}}<div class="mb-icon-round red">高</div>{{/if}}
					{{if value.disease==2 && value.diseaseCondition==2}}<div class="mb-icon-round red">糖</div>{{/if}}
					{{if (value.disease=='1,2' || value.disease=='2,1') && value.diseaseCondition==2}}<div class="mb-icon-round red">高糖</div>{{/if}}
				</div>
			</li>
			{{/each}}
		</script>

+ 1 - 1
html/huanzhe/js/fuwutongji.js

@ -21,7 +21,7 @@ new Promise(function(resolve, reject) {
		patiName = self.patiName;
		teamCode = self.teamCode;
		teamName = self.teamName;
		$('#team_name').text(teamName);
		$('#team_name').text(JSON.parse(plus.storage.getItem("docInfo")).name);
		$('#patientName').text(patiName);
		initScroller();
		resolve(true);

+ 11 - 0
html/huanzhe/js/huanzeziliao.js

@ -83,6 +83,8 @@ function getPatientInfo() {
			}
			data.photo = patiPhoto;
			data.idcard = plusXing(data.idcard,9,2);
			data.ssc = plusXing(data.ssc,3,2);
			$("#pati_info").html(template("info_tmpl", data));
//			//取家庭签约团队
//			sendGet("/doctor/admin-teams/team/members/" + patiCode, {}, null, function(res1) {
@ -111,6 +113,15 @@ function getPatientInfo() {
		}
	});
}
//参数的含义:str:字符串,frontLen:前面保留位数,endLen:后面保留位数。
function plusXing (str,frontLen,endLen) { 
 var len = str.length-frontLen-endLen;
 var xing = '';
 for (var i=0;i<len;i++) {
 xing+='*';
 }
 return str.substring(0,frontLen)+xing+str.substring(str.length-endLen);
}
function changeInfo() {

+ 31 - 74
html/huanzhe/js/searchhuanzhe.js

@ -19,7 +19,7 @@ var $searchbar = $('.searchbar'),
	// 分页查询最后一页
	$history = $('#history_search'),//历史搜索
	$hisSearList = $('#his_sear_list');
var page = 1,
var page = 0,
    search_keyword = "", //记录搜索框的内容
	lastTeamId,// 从缓存取出所选团队
	pagesize = 15,
@ -83,24 +83,7 @@ historyList = function(){
},
// 初始化“患者”视图列表
initPatientViewList = function(data,keyword,isAppend) {
	var html = template("pati_list_tmpl", {list: _.map(data,function(o) {
		o.jsonStr = JSON.stringify(o);
		var labels = [], tmp,id="";
		//判断身份证匹配
		if(o.idcard.indexOf(keyword) != -1){
		    id = o.idcard;
		}
		for(var k in o.labels){
			tmp = o.labels[k];
			if((tmp.labelType == 3 || tmp.labelType == 4)
					&& labels.indexOf(tmp.labelName) == -1){
			    if(tmp.labelName.indexOf(keyword) != -1)
				labels.push(tmp.labelName);
			}
		}
		o.labels = id+" "+labels.join(',');
		return o;
	})});
	var html = template("pati_list_tmpl", {list: data});
	searchText = $searchbarInput.val().trim();
	if(isAppend == true){
		$patiList.append(html)
@ -212,16 +195,11 @@ searchByPaging = function (isAppend,fun) {
		return ;
	}
	plus.nativeUI.showWaiting();
	if(self.labelType == '9'){//签约到期
		var url = self.type==1? "doctor/patient_label_info/patient_search_all_exitdoc_overdue" : "doctor/patient_label_info/patient_search_Overdue";
	}else{
		var url = self.type==1? "doctor/patient_label_info/patient_search_all_exitdoc" : "doctor/patient_label_info/patient_search";
	}
	var params = { page:page, filter: search_keyword, pagesize:pagesize, teamCode: lastTeamId};
	var reqType = self.type==1? "GET" : "POST";
	getReqPromise(url,params, reqType).then(function(res){
	var url = "/doctor/concern/getConcernPatients",
	 params = { page:page,pageSize:pagesize,patientName:search_keyword};
	getReqPromise(url,params, "GET").then(function(res){
 		if(res.status == 200) {
			if((page==1 && !res.data) || (page==1 && !res.data.length)) {
			if((page==0 && !res.data) || (page==0 && !res.data.length)) {
				$searchtResult.hide();
				$noResultWrap.show();
			} else {
@ -272,49 +250,7 @@ bindEvents = function (){
	})
	mui('#his_scroll').scroll({
    	bounce: true, //是否启用回弹
    })
	
	$patiList.on('tap','.patient-list',function() {
		var code = $.trim($(this).attr("data-group")),
			isOpen = togglePatientListShow($(this));
		code && !isOpen && initPatientListByGroup(code);
	}).on('tap','li[data-patient-code]',function() {
		var patiInfo = $(this).attr("data-json");
		var info = JSON.parse(patiInfo);
		if(baseEnv.webview.msgForward) {
			// 转发的消息
			var messages = baseEnv.webview.imMessages;
			mui.confirm("是否确认将消息逐条转发给"+info.name+"?", "提示", ["不了,谢谢", "确认转发"], function(e) {
				if(e.index == 0) {
					
				} else {
					Promise.all(_.map(messages,function(msg){
						return new Promise(function(resolve, reject) {
							im.sendPrivateMsg(baseInfo.userAgent.uid,info.code,msg.content,msg.type,function() {
								resolve(true);
							},function() {
								resolve(true);
							})
						})
					})).then(function() {
						openWebview("../../message/html/p2p.html",{otherCode: info.code,otherName: info.name,otherPhoto: info.photo,otherSex: info.sex});
					});
					
				}
			})
		} else if(baseEnv.webview.message) {
			openWebview("../../message/html/p2p.html",{otherCode: info.code,otherName: info.name,otherPhoto: info.photo,otherSex: info.sex});
		} else {
			openWebview("../../huanzhe/html/huanzhexinxi.html",{
				teamCode: self.type==1? lastTeamId : undefined, 
				patiInfo: patiInfo,
				patiCode: info.code
			});
		}
		
		return false;
	});
   })
	
	$searchbarInput.on('input', function() {
		var text = $(this).val().trim();
@ -330,7 +266,7 @@ bindEvents = function (){
		showSearchSuggest(text);
	}).on('keydown',function(e) {
		if (e.which === 13) {
		    page = 1;
		    page = 0;
		    $searchSuggest.hide();
			searchByPaging(false);
			//保存历史数据20个
@ -346,7 +282,7 @@ bindEvents = function (){
	
	$hisSearList.on('click','.his-list',function(){
		var $that = $(this);
		page = 1;
		page = 0;
		$("#searchAll").hide();
	    $searchSuggest.hide();
	    $history.hide();
@ -366,7 +302,7 @@ bindEvents = function (){
	})
	
	$searchSuggest.on('click',function() {
	    page = 1;
	    page = 0;
		$searchSuggest.hide();
		searchByPaging(false);
		
@ -374,6 +310,27 @@ bindEvents = function (){
		saveHisData()
	});
	
	$patiList.on('tap','li[data-patient-code]',function(e) {
		var code = $(this).attr("data-patient-code");
		var mobile = $(this).attr("data-patient-phone");
		var address = $(this).attr("data-patient-address");
		if(baseEnv.webview.origin=="suifang") {//“随访”功能
			if(baseEnv.webview.follow_type == 1){
	            openWebview("../../suifang/html/add_plan.html",{patientInfo: {code:code,mobile:mobile,address:address},chooseDate:baseEnv.webview.chooseDate});
	            return false;
	        }
	        if(baseEnv.webview.follow_type == 2){
	            openWebview("../../suifang/html/follow_way.html",{patientInfo: {code:code,mobile:mobile,address:address}});
	            return false;
	        }
		}else{
			openWebview("../../huanzhe/html/huanzhexinxi.html",{
				patiCode: code
			});
		}
		return false;
	})
	
	function saveHisData(){
		//保存历史数据20个
		var value = $searchbarInput.val().trim();