bug473

src/html/dept/statisticsDetailDept.html

@@ -50,11 +50,11 @@
                     </span>
                 <span class="filterItem doctorFilter">
                         <span>医生姓名：</span>
-                        <input class="doctorInp" type="text" placeholder="请输入医生姓名">
+                        <input class="doctorInp" type="text" placeholder="请输入医生姓名" disabled>
                     </span>
                 <span class="filterItem doctorFilter">
                         <span>医生工号：</span>
-                        <input class="doctorNumInp" type="text" placeholder="请输入医生工号">
+                        <input class="doctorNumInp" type="text" placeholder="请输入医生工号" disabled>
                     </span>
             </div>
         </div>

src/js/dept/improveStatisticsDept.js

@@ -210,7 +210,13 @@ function renderTab(data,hisId,activePage){
 	const item = data[i];
 
 	str += `
-            <tr data-index=${i} data-deptid="${item.deptId}" data-dept="${item.deptName}" data-casesid="${item.entryId}" data-casesname="${item.entryName}">
+            <tr data-index=${i} 
+            	data-deptid="${item.deptId}" 
+            	data-dept="${item.deptName}" 
+            	data-casesid="${item.entryId}" 
+            	data-casesname="${item.entryName}"
+            	data-doctorName="${item.doctorName}"
+            	data-doctorId="${item.doctorId}">
                 <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
                 <td >${item.deptName || "-"}</td>
                 <td >${item.casesName || "-"}</td>
@@ -227,11 +233,13 @@ function renderTab(data,hisId,activePage){
   $('.tbody').html(str?str:emptyBox())
   $(".goHomeDetail").click(function(){
 	let casesId =  $(this).parents("tr").attr("data-casesid");
-	let casesName =  $(this).parents("tr").attr("data-casesname")
-	let deptName = $(this).parents("tr").attr("data-dept")
-	let deptId = $(this).parents("tr").attr("data-deptid")
+	let casesName =  $(this).parents("tr").attr("data-casesname");
+	let deptName = $(this).parents("tr").attr("data-dept");
+	let deptId = $(this).parents("tr").attr("data-deptid");
+	let doctorName = $(this).parents("tr").attr("data-doctorName");
+	let doctorId = $(this).parents("tr").attr("data-doctorId");
 	let typeMark = $(this).attr("data-type")
-	$(parent.document).find("#contentIframe").attr("src", "statisticsDetailDept.html?deptName=" + deptName + "&deptId=" + deptId + "&casesId=" + casesId+"&defectName="+casesName+"&typeMark="+typeMark+"&startDate="+startDateParam+"&endDate="+endDateParam)
+	$(parent.document).find("#contentIframe").attr("src", "statisticsDetailDept.html?deptName=" + deptName + "&deptId=" + deptId +"&doctorName="+doctorName+"&doctorId="+doctorId+ "&casesId=" + casesId+"&defectName="+casesName+"&typeMark="+typeMark+"&startDate="+startDateParam+"&endDate="+endDateParam)
   })
 }
 //模块下拉

src/js/dept/statisticsDetailDept.js

@@ -21,12 +21,15 @@ let typeMark= getUrlArgObjectNew("typeMark",srcUrl)||"";       //0-总数量，1
 let defectName = getUrlArgObjectNew("defectName",srcUrl)||"";
 let casesId = getUrlArgObjectNew("casesId",srcUrl)||"";
 let deptListDept = JSON.parse(getCookie("deptList"))||[]
-let doctorNameUrl = getUrlArgObjectNew("doctorName", srcUrl) || ""
+let doctorNameParam = getUrlArgObjectNew("doctorName", srcUrl) || ""
+let doctorNumParam = getUrlArgObjectNew("doctorId", srcUrl) || ""
+doctorNumParam = doctorNumParam==='-'?'':doctorNumParam;
+$('.doctorInp').val(doctorNameParam)
+$('.doctorNumInp').val(doctorNumParam)
 let currentPage;
-deptNameTemp = docName = doctorNameUrl
 listenScroll()
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="",
-	nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", deptName="", deptNameTemp="",doctorNum="",doctorNameTemp="",doctorNumTemp="",
+	nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="",  deptName="", deptNameTemp="",
 	data_desc="leaveHospitalDate",data_asc="";
 //科室传参
 if(deptIdPram&&deptNamePram){
@@ -66,14 +69,7 @@ $(function() {
 	const val = $(this).val().trim()
 	nameTemp = val
   })
-  $("body").on("input",".doctorInp", function(e){
-	const val = $(this).val().trim()
-	doctorNameTemp = doctorNameUrl = val
-  })
-  $(".doctorNumInp").on("input", function(e){
-	const val = $(this).val().trim();
-	doctorNumTemp = val
-  })
+
   $(document).on("click", function(){
 	$(".levelList ").css("display", "none")
 	$(".selectDept .arrow").attr("src",iconDown)
@@ -104,8 +100,6 @@ $(function() {
 	level = levelTemp==="全部"?"":levelTemp
 	deptId = deptIdTemp
 	deptName = deptNameTemp
-	doctorName = doctorNameTemp
-	doctorNum = doctorNumTemp
 	if(deptName == ""){
 	  $(".selectDept").attr({'title':"全部",'data-id':''}).val("全部")
 	}
@@ -122,16 +116,12 @@ $(function() {
 	levelTemp="";
 	deptNameTemp="";
 	deptIdTemp="";
-	doctorName=doctorNameUrl=deptNameTemp="";;
-	doctorNum="";
-	doctorNameTemp="";
-	doctorNumTemp="";
 	data_desc="behospitalDate"
 	data_asc="";
 	$('.patientNumInp').val('')
 	$('.patientNameInp').val('')
-	$('.doctorInp').val('')
-	$('.doctorNumInp').val('')
+	$('.doctorInp').val(doctorNameParam)
+	$('.doctorNumInp').val(doctorNumParam)
 
 	deptId = deptIdTemp = deptIdPram
 	deptName = deptNameTemp = deptNamePram
@@ -156,8 +146,8 @@ $(function() {
 	  entryId:casesId,        //缺陷条目id
 	  deptId: deptId||"",     //科室id
 	  deptName: deptName == "全部" ? "":deptName||"",       //科室名称
-	  doctorId: doctorNum,    //医生id
-	  doctorName: doctorNameUrl,      //医生姓名
+	  doctorId: doctorNumParam,    //医生id
+	  doctorName: doctorNameParam,      //医生姓名
 	  level:level,//病历等级
 	  startDate: startDateParam, //选择日期--开始时间
 	  endDate: endDateParam, //选择日期--结束时间
@@ -193,8 +183,8 @@ function getTabData(activePage){
 	entryId:casesId,        //缺陷条目id
 	deptId: deptId||"",     //科室id
 	deptName: deptName == "全部" ? "":deptName||"",       //科室名称
-	doctorId: doctorNum,    //医生id
-	doctorName: doctorNameUrl,      //医生姓名
+	doctorId: doctorNumParam,    //医生id
+	doctorName: doctorNameParam,      //医生姓名
 	level:level,//病历等级
 	startDate: startDateParam, //选择日期--开始时间
 	endDate: endDateParam, //选择日期--结束时间