Merge remote-tracking branch 'origin/test' into test

src/css/appealCheck.less

@@ -174,6 +174,7 @@ h2{
     height: 40px;
     line-height: 40px;
     margin: 0 20px 20px 0;
+    margin-right: 29px!important;
     span{
         display: inline-block;
         line-height: 32px;
@@ -213,7 +214,7 @@ h2{
     }
 }
 .deptList{
-    width: 160px;
+    width: 120px;
     max-height: 400px;
 }
 .modularList,.typeList,.qcCheckList{
@@ -237,7 +238,7 @@ h2{
     cursor: pointer;
 }
 .selectDept{
-    width: 160px;
+    width: 120px;
 }
 
 .filter,.reset,.export{

src/css/appealHistory.less

@@ -175,6 +175,7 @@ h2 {
   height: 40px;
   line-height: 40px;
   margin: 0 20px 20px 0;
+  margin-right: 29px!important;
   span {
     display: inline-block;
     line-height: 32px;
@@ -214,7 +215,7 @@ h2 {
   }
 }
 .deptList {
-  width: 160px;
+  width: 120px;
   max-height: 400px;
 }
 .modularList,
@@ -242,9 +243,6 @@ h2 {
   box-sizing: border-box;
   cursor: pointer;
 }
-.selectDept {
-  width: 160px;
-}
 
 .filter,
 .reset,

src/js/api.js

@@ -220,6 +220,8 @@ const api = {
   cancelAppealInfo:'/qc/appealInfo/cancelAppealInfo', //撤回申述
   getAppealOperationType:'/qc/appealInfo/getAppealOperationType', //再次申述
   getAuditNumber:'/qc/appealExamineInfo/getAuditNumber', //获取待审核数量
+  getAppealReviewExport:'/qc/appealExamineInfo/getAppealReviewExport', //申述审核导出
+  getComplaintRecordExport:'/qc/appealExamineInfo/getComplaintRecordExport', //申述记录导出
 }
 const ywCheckApi = {
   addMedCheckInfo: '/qc/medCheckInfo/addMedCheckInfo',   //核查

src/js/appealCheck.js

@@ -784,57 +784,20 @@ $((function ($) {
             return
         }
         const param = {
-            "behospitalCode": behospitalCode,
-            "deptId": deptId.trim(),
-            "doctorCode": doctorNum,
-            "doctorName": doctorName,
-            "asc": data_asc,     //升序
-            "desc": data_desc,       //降序
-            "leaveHosDateStart": isPlacefile == 1 ? behosDateStart : '', //出院日期--开始时间
-            "leaveHosDateEnd": isPlacefile == 1 ? behosDateEnd : '', //出院日期--结束时间
-            "behosDateStart": isPlacefile == 1 ? '' : behosDateStart, //出院日期--开始时间
-            "behosDateEnd": isPlacefile == 1 ? '' : behosDateEnd, //出院日期--结束时间
-            "isPlacefile": isPlacefile,
-            "level": level,
-            "name": name,
-            "checkStatus": qcCheckStatus ? Number(qcCheckStatus) : qcCheckStatus, //病历核查状态
-            "mrStatus": fpCheckStatus ? Number(fpCheckStatus) : fpCheckStatus,   //首页核查状态（1：已核查，0：未核查）
-            "chName": qcCheckName,   //病历核查人员
-            "diagnose": qcCheckMain,   //病历主症状..........
-            "mrName": fpCheckName,  //首页核查人员
-            "deptName": deptName == "全部" ? "" : deptName || '',
-            "statisticsType": statisticsType,
+            deptId: deptId.trim(),
+            deptName: deptName == "全部" ? "" : deptName || '',
+            casesName: casesName,
+            operationType: operationType,
+            state: state,
+            size: 15,
+            name: nameTemp,
+            complaintDateEnd: behosDateEnd.replaceAll("/", "-"),
+            complaintDateStart: behosDateStart.replaceAll("/", "-"),
         }
-        $.alerModal({ type: "radio", time: '1000', isFather: true, fatherWrapper: $("#mainBox", parent.document) });
-        closeRadio()
-        radioSelect()
-        bindSaveColPort(param)
+        expJson(api.getAppealReviewExport, param).then(res => {
+            downloadExportedData(res.data, "申述审核.xls")
+        })
 
     })
 })($));
-function closeRadio() {
-    $(".colSetBox .iconClose,.colSetBox .cancalColSet", parent.document).off("click").on("click", function () {
-        $(".divModal", parent.document).remove()
-    })
-}
-function radioSelect() {
-    $(".selectDate", parent.document).click(function () {
-        $(this).find("input").prop("checked", true)
-        $(this).siblings().find("input").prop("checked", false)
-    })
-}
-function bindSaveColPort(param) {
-    $(".savePort", parent.document).off("click").on("click", function () {
-        radioCheck = $(".selectDate input[type='radio']:checked", parent.document).attr("data-select")
-        let time = radioCheck == 2 ? exportTimeLimit.defectTime : exportTimeLimit.normalTime
-        if ((new Date(behosDateEnd) - new Date(behosDateStart)) / 24 / 60 / 60 / 1000 > time) {
-            $.alerModal({ "message": `最多只能导出${time}天`, type: "tip", time: '1000', isFather: true, fatherWrapper: $("#mainBox", parent.document) });
-            return
-        }
-        param.radioCheck = radioCheck || 1
-        expJson(api.exportQcListDept, param).then(res => {
-            $(".divModal", parent.document).remove()
-            downloadExportedData(res.data, behosDateStart.slice(0, 10).replace(/-/g, "") + "-" + behosDateEnd.slice(0, 10).replace(/-/g, "") + "抽查住院病历质量情况.xls")
-        })
-    })
-}
+

src/js/appealHistory.js

@@ -927,57 +927,18 @@ $((function ($) {
             return
         }
         const param = {
-            "behospitalCode": behospitalCode,
-            "deptId": deptId.trim(),
-            "doctorCode": doctorNum,
-            "doctorName": doctorName,
-            "asc": data_asc,     //升序
-            "desc": data_desc,       //降序
-            "leaveHosDateStart": isPlacefile == 1 ? behosDateStart : '', //出院日期--开始时间
-            "leaveHosDateEnd": isPlacefile == 1 ? behosDateEnd : '', //出院日期--结束时间
-            "behosDateStart": isPlacefile == 1 ? '' : behosDateStart, //出院日期--开始时间
-            "behosDateEnd": isPlacefile == 1 ? '' : behosDateEnd, //出院日期--结束时间
-            "isPlacefile": isPlacefile,
-            "level": level,
-            "name": name,
-            "checkStatus": qcCheckStatus ? Number(qcCheckStatus) : qcCheckStatus, //病历核查状态
-            "mrStatus": fpCheckStatus ? Number(fpCheckStatus) : fpCheckStatus,   //首页核查状态（1：已核查，0：未核查）
-            "chName": qcCheckName,   //病历核查人员
-            "diagnose": qcCheckMain,   //病历主症状..........
-            "mrName": fpCheckName,  //首页核查人员
-            "deptName": deptName == "全部" ? "" : deptName || '',
-            "statisticsType": statisticsType,
+            deptId: deptId.trim(),
+            deptName: deptName == "全部" ? "" : deptName || '',
+            casesName: moduleName,
+            operationType: operationType,
+            state: state,
+            size: 15,
+            name: $('.patientNameInp').val(),
+            complaintDateEnd: behosDateEnd.replaceAll("/", "-"),
+            complaintDateStart: behosDateStart.replaceAll("/", "-"),
         }
-        $.alerModal({ type: "radio", time: '1000', isFather: true, fatherWrapper: $("#mainBox", parent.document) });
-        closeRadio()
-        radioSelect()
-        bindSaveColPort(param)
-
-    })
-})($));
-function closeRadio() {
-    $(".colSetBox .iconClose,.colSetBox .cancalColSet", parent.document).off("click").on("click", function () {
-        $(".divModal", parent.document).remove()
-    })
-}
-function radioSelect() {
-    $(".selectDate", parent.document).click(function () {
-        $(this).find("input").prop("checked", true)
-        $(this).siblings().find("input").prop("checked", false)
-    })
-}
-function bindSaveColPort(param) {
-    $(".savePort", parent.document).off("click").on("click", function () {
-        radioCheck = $(".selectDate input[type='radio']:checked", parent.document).attr("data-select")
-        let time = radioCheck == 2 ? exportTimeLimit.defectTime : exportTimeLimit.normalTime
-        if ((new Date(behosDateEnd) - new Date(behosDateStart)) / 24 / 60 / 60 / 1000 > time) {
-            $.alerModal({ "message": `最多只能导出${time}天`, type: "tip", time: '1000', isFather: true, fatherWrapper: $("#mainBox", parent.document) });
-            return
-        }
-        param.radioCheck = radioCheck || 1
-        expJson(api.exportQcListDept, param).then(res => {
-            $(".divModal", parent.document).remove()
-            downloadExportedData(res.data, behosDateStart.slice(0, 10).replace(/-/g, "") + "-" + behosDateEnd.slice(0, 10).replace(/-/g, "") + "抽查住院病历质量情况.xls")
+        expJson(api.getComplaintRecordExport, param).then(res => {
+            downloadExportedData(res.data, "申述记录.xls")
         })
     })
-}
+})($));