参数修改

src/html/pacs.html

@@ -50,14 +50,8 @@
                     <th class="moduleName" style="width: 65px;">序号</th>
                     <th class="moduleItemName">检验类型</th>
                     <th class="moduleItemName">检验项目名称</th>
-                    <th class="moduleItemName"></th>
-                    <th class="moduleItemName"></th>
-                    <th class="moduleItemName"></th>
-                    <th class="moduleItemName"></th>
                     <th class="moduleItemName">检验时间</th>
                     <th class="moduleItemName">报告时间</th>
-                    <th class="moduleItemName"></th>
-                    <th class="moduleItemName"></th>
                     <th class="moduleItemName">开单医生姓名</th>
                 </thead>
                 <tbody class="tbody">

src/html/pacsDetail.html

@@ -50,14 +50,8 @@
                     <th class="moduleName" style="width: 65px;">序号</th>
                     <th class="moduleItemName">检验类型</th>
                     <th class="moduleItemName">检验项目名称</th>
-                    <th class="moduleItemName"></th>
-                    <th class="moduleItemName"></th>
-                    <th class="moduleItemName"></th>
-                    <th class="moduleItemName"></th>
                     <th class="moduleItemName">检验时间</th>
                     <th class="moduleItemName">报告时间</th>
-                    <th class="moduleItemName"></th>
-                    <th class="moduleItemName"></th>
                     <th class="moduleItemName">开单医生姓名</th>
                 </thead>
                 <tbody class="tbody">

src/html/singleVeto.html

@@ -60,10 +60,10 @@
                     <th class="moduleName" style="width: 65px;">序号</th>
                     <th class="moduleItemName">所属模块</th>
                     <th class="moduleItemName">缺陷名称</th>
-                    <th class="moduleItemName" code="score">分值</th>
+                    <th class="moduleItemName">分值</th>
                     <th class="moduleItemName">单项否决</th>
                     <th class="moduleItemName" code="num">数量</th>
-                    <th class="moduleScore" code="percentStr" style="width: 80px;">缺陷占比</th>
+                    <th class="moduleScore" style="width: 80px;">缺陷占比</th>
                 </thead>
                 <tbody class="tbody">
 

src/js/pacs.js

@@ -145,14 +145,14 @@ function getTabData(activePage){
     endDateParam=dateEnd                                                                                                                                                                                                                                                                                                                                  
     const param = {
         current:activePage,
-        checkType: name,//医嘱类型（模糊搜索）
-        daItemName:names, //医嘱项目名称（模糊搜索）
+        examineItemName:names, 
         behospitalCode:perId,
         examineType:adviceShow,
+        examineItemType:name,
         size: 15,
         "daStartDateStart":dateStatrt.replace(/\//g,'-'),
         "daStartDateEnd":dateEnd.replace(/\//g,'-'),
-        "descs":['da_start_date'],     
+        "descs":[],     
     }
     $('.pagination').html("")
     $('.tbody').html(emptyBox('努力加载中...','',1))
@@ -282,7 +282,7 @@ function renderTab(data,activePage){
             <tr data-id=${item.id} data-index=${i}>
                 <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
                 <td class="textCenter">${item.examineItemType||'-'}</td>
-                <td class="textCenter pacsNameClick" data-name="${item.examineItemName||''}">${item.examineItemName||'-'}</td>
+                <td class="textCenter pacsNameClick" data-name="${item.repNo||''}">${item.examineItemName||'-'}</td>
                 <td class="textCenter">${item.cTime||'-'}</td>
                 <td class="textCenter">${item.rTime||'-'}</td>
                 <td class="textCenter">${item.doctorName||'-'}</td>
@@ -296,12 +296,10 @@ function renderTab(data,activePage){
 }
 $(document).on('click','.pacsNameClick',function(){
     let name = $(this).attr("data-name")
-    console.log($(document.parent))
-    console.log($(parent.document).find("#pacsIframeIn")[0])
     $(parent.document).find("#pacsIframeIn,#contentIframeIn,#assistIframeIn").css("display","none")
 
     // $(parent.document).find("#pacsDetailIframeIn").attr("src",'pacsDetail.html?name='+name)
-    $("#pacsDetailIframeIn",parent.document).css({display:'block'}).attr("src",'pacsDetail.html?name='+name).contents().find(".assistWrp").height(window.innerHeight-$("#patientInfo").height()-20+'px')
+    $("#pacsDetailIframeIn",parent.document).css({display:'block'}).attr("src",'pacsDetail.html?qxName='+name).contents().find(".assistWrp").height(window.innerHeight-$("#patientInfo").height()-20+'px')
     $(window).resize(function(){
       $("#pacsDetailIframeIn",parent.document).contents().find(".assistWrp").height(window.innerHeight-$("#patientInfo").height()-20+'px')
     });

src/js/pacsDetail.js

@@ -17,7 +17,7 @@ if(currentPage==="YH-ZKK-TMQXZB_XQ"){
   $(".export").css("display","inline-block");
 }
 
-let casesId="",adviceShow='1', name="", names="", isReject ="",deptName="",startDateParam="",data_asc=[],data_desc=[],endDateParam="", isUsed ="",casesIdTemp="", nameTemp="", nameTemps="", isRejectTemp ="",model='', isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId="",isSingleReject="", isSingleRejectTemp="",casesName="",casesNameTemp="",paramObj={}
+let casesId="",adviceShow='1', name="", names="",repNo="", isReject ="",deptName="",startDateParam="",data_asc=[],data_desc=[],endDateParam="", isUsed ="",casesIdTemp="", nameTemp="", nameTemps="", isRejectTemp ="",model='', isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId="",isSingleReject="", isSingleRejectTemp="",casesName="",casesNameTemp="",paramObj={}
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -32,7 +32,7 @@ $(function(){
     selectReject = getUrlArgObjectNew("selectReject",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
     special = getUrlArgObjectNew("special",srcUrl)||""
-    name=nameTemp = getUrlArgObjectNew("qxName",srcUrl)||""
+    repNo = getUrlArgObjectNew("qxName",srcUrlSon)||""
     casesName =casesNameTemp = getUrlArgObjectNew("model",srcUrl)||""
     startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
     endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
@@ -146,7 +146,7 @@ function getTabData(activePage){
     endDateParam=dateEnd                                                                                                                                                                                                                                                                                                                                  
     const param = {
         current:activePage,
-        repNo: name,//医嘱类型（模糊搜索）
+        repNo: repNo,
         behospitalCode:perId,
         size: 15,    
     }

src/js/singleVeto.js

@@ -17,7 +17,7 @@ if(currentPage==="YH-ZKK-TMQXZB_XQ"){
   $(".export").css("display","inline-block");
 }
 
-let casesId="",data_desc="",data_asc="", name="", isReject ="",deptName="",startDateParam="",endDateParam="", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="",model='', isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId="",isSingleReject="", isSingleRejectTemp="",casesName="",casesNameTemp="",paramObj={}
+let casesId="",data_desc=[],data_asc=[], name="", isReject ="",deptName="",startDateParam="",endDateParam="", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="",model='', isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId="",isSingleReject="", isSingleRejectTemp="",casesName="",casesNameTemp="",paramObj={}
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -135,14 +135,14 @@ function bindDeptSelect(){
 
 $("th[code]").on("click",function(e){
     const code=$(this).attr("code");
-    if(data_asc==code){
-      data_desc=code;
-      data_asc="";
+    if(data_asc[0]==code){
+      data_desc=[code];
+      data_asc=[];
       $("th[code]").removeClass("asc desc");
       $(this).addClass("desc");
     }else{
-      data_desc="";
-      data_asc=code;
+      data_desc=[];
+      data_asc=[code];
       $("th[code]").removeClass("asc desc");
       $(this).addClass("asc");
     }
@@ -196,8 +196,8 @@ function getTabData(activePage){
         name: name, //条目名
         deptName: deptName, //科室名
         size: 15,
-        // desc:data_desc,
-        // asc:data_asc,
+        desc:data_desc,
+        asc:data_asc,
         "startDate":dateStatrt,
         "endDate":dateEnd
     }

src/js/uncorrectedCopy.js

@@ -12,7 +12,7 @@ const iconUp = require("./../images/arrow_up.png")
 const loadingImg = require("./../images/loading.gif")
 const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
-let deptName = "", behospitalCode = "", deptNameTemp = "",orderTitle=[],orderKey=[], deptId = '', deptIdTemp = '', behospitalCodeTemp = "", data_desc = "", data_asc = "", columns = [], isfirstRenderTitle=false; 
+let deptName = "", behospitalCode = "", deptNameTemp = "",orderTitle=[],orderKey=[],orderList=[], deptId = '', deptIdTemp = '', behospitalCodeTemp = "", data_desc = "", data_asc = "", columns = [], isfirstRenderTitle=false; 
 let srcUrl = $("#contentIframe",parent.document).attr("src")
 statisticsType = getUrlArgObjectNew("dateType",srcUrl)||"";
 from = getUrlArgObjectNew("from",srcUrl)||""
@@ -150,10 +150,11 @@ function renderTab(data,hisId,activePage){
             <td  class="textCenter">${(activePage-1)*15 + i+1}</td>`
       for(var j = 0; j < orderTitle.length; j++) {
         let tmpKey = orderTitle[j]
+
         if(tmpKey=='deptName'||tmpKey=='doctorName'){
-          str += `<td dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.numId || ""}" data-name="${orderKey[j] || ""}">${item[tmpKey]+'' || "-"}</td>`
+          str += `<td dept-id="${item.deptId || ""}" data-tid="${orderList[j].id}" dept-name="${item.deptName || ""}" data-id="${item.numId || ""}" data-name="${orderKey[j] || ""}">${item[tmpKey]+'' || "-"}</td>`
         }else{
-          str += `<td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.numId || ""}" data-name="${orderKey[j] || ""}">${item[tmpKey]+'' || "-"}</td>`
+          str += `<td class="goHomeDetail" data-tid="${orderList[j].id}" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.numId || ""}" data-name="${orderKey[j] || ""}">${item[tmpKey]+'' || "-"}</td>`
         }
       }      
     str += `</tr>`
@@ -164,11 +165,10 @@ function renderTab(data,hisId,activePage){
   // 跳转至详情页
   $(".goHomeDetail").click(function(){
     let casesName = $(this).attr("data-name") || '';
-    let casesId = $(this).attr("data-id");
+    let casesId = $(this).attr("data-tid");
     let name=$(this).attr("dept-name");
     name=name==="全院"?"全部":name;
     let id=$(this).attr("dept-id");
-
     $(parent.document).find("#contentIframe").attr("src","uccDetail.html?from=4&deptName="+name+"&deptId="+id+"&casesEntryId="+casesId+"&defectName="+casesName+"&startDate="+startDateParam+"&endDate="+endDateParam)
   })
   // initScroll("partDetailControl","YX",1)
@@ -203,7 +203,6 @@ function getDeptList(){
 // 渲染table表头
 function renderTabTitle(data){
   isfirstRenderTitle = true
-  let orderList = []
   let str = `
   <th class="moduleName" style="width: 65px;">序号</th>`
   for(let i = 0; i < data.length; i++){