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

src/css/appealExamine.less

@@ -34,7 +34,7 @@ h2 {
     font-size: 16px;
     font-weight: bold;
     position: relative;
-    padding-top: 15px;
+    padding-left: 15px;
   }
   .title::after {
     content: "";

src/css/qcScore.less

@@ -643,7 +643,7 @@
     text-align: right;
   }
 }
-.add-box{
+.add-box,.edit-box{
   .drop-box{
     position: relative;
     margin-bottom: 10px;
@@ -948,4 +948,27 @@
 #contentIframeIn,#pacsIframeIn,#assistIframeIn,#pacsDetailIframeIn,#contentNursing { //医嘱信息
   width: 100%;
   height: 100%;
-} 
+} 
+.appeal,.examine,.reject {
+  width: 44px;
+  height: 20px;
+  background: #fff2c8;
+  border-radius: 3px;
+  border: 1px solid #ebdaa9;
+  font-size: 12px;
+  color: #a07906;
+  line-height: 20px;
+  display: inline-block;
+  text-align: center;
+  cursor: pointer;
+}
+.examine {
+  background: #d3f7ed;
+  border: 1px solid #7ee7d5;
+  color: #04af9c;
+}
+.reject {
+  background: #ffebeb;
+  border: 1px solid #fbacae;
+  color: #ca0c0f;
+}

src/html/appealCheck.html

@@ -33,13 +33,13 @@
                     </span>
 
                     <span class="filterItem">
-                        <span>申述模块：</span>
+                        <span>申诉模块：</span>
                         <span class="selectModular">全部</span>
                         <ul class="modularList filterDropList">
-                            <Li class="modularItem" data-name="全部" data-id="全部">全部</Li>
+                            <!-- <Li class="modularItem" data-name="全部" data-id="">全部</Li>
                             <Li class="modularItem" data-name="病案首页" data-id="病案首页">病案首页</Li>
                             <Li class="modularItem" data-name="入院记录" data-id="入院记录">入院记录</Li>
-                            <li class="modularItem" data-name="出院记录" data-id=出院记录>出院记录</li>
+                            <li class="modularItem" data-name="出院记录" data-id=出院记录>出院记录</li> -->
                         </ul>
                     </span>
                     <span class="filterItem typeFilter">
@@ -50,21 +50,21 @@
                         <span>操作类型：</span>
                         <span class="selectType">全部</span>
                         <ul class="typeList filterDropList">
-                            <Li class="typeItem" data-name="全部" data-id="">全部</Li>
+                            <!-- <Li class="typeItem" data-name="全部" data-id="">全部</Li>
                             <Li class="typeItem" data-name="删除条目" data-id="0">删除条目</Li>
                             <Li class="typeItem" data-name="新增已有条目" data-id="1">新增已有条目</Li>
                             <li class="typeItem" data-name="新增缺失条目" data-id=2>新增缺失条目</li>
-                            <li class="typeItem" data-name="恢复条目" data-id=3>恢复条目</li>
+                            <li class="typeItem" data-name="恢复条目" data-id=3>恢复条目</li> -->
                         </ul>
                     </span>
                     <span class="filterItem">
                         <span>状态：</span>
                         <span class="qcSelectCheck">全部</span>
                         <ul class="qcCheckList filterDropList">
-                            <Li class="qcCheckItem" data-name="全部" data-id="">全部</Li>
+                            <!-- <Li class="qcCheckItem" data-name="全部" data-id="">全部</Li>
                             <Li class="qcCheckItem" data-name="待审核" data-id="0">待审核</Li>
                             <Li class="qcCheckItem" data-name="审核通过" data-id="2">审核通过</Li>
-                            <li class="qcCheckItem" data-name="已驳回" data-id="1">已驳回</li>
+                            <li class="qcCheckItem" data-name="已驳回" data-id="1">已驳回</li> -->
                         </ul>
                     </span>
                     <span class="filter">查询</span>
@@ -76,12 +76,12 @@
                 <table class="qctable">
                     <thead>
                         <tr class="tabTitle">
-                            <th class="recordScoreOpera textCenter" style="width: 65px;">申述人</th>
+                            <th class="recordScoreOpera textCenter" style="width: 65px;">申诉人</th>
                             <th class="beHospitalId textCenter" >所属科室</th>
-                            <th class="patientNo textCenter" >申述时间</th>
+                            <th class="patientNo textCenter" >申诉时间</th>
                             <th class="patientName textCenter" style="width: 100px;">病人住院序号</th>
                             <th class="patientSex textCenter" >患者姓名</th>
-                            <th class="patientage textCenter" >申述模块</th>
+                            <th class="patientage textCenter" >申诉模块</th>
                             <th class="bedNum textCenter" >缺陷详情</th>
                             <th class="inHospitalDate textCenter" >审核人</th>
                             <th class="outHospitalDate textCenter " >审核时间</th>

src/html/appealExamine.html

@@ -10,13 +10,13 @@
         <div class="appeal-box">
             <div class="item">
                 <span class="title">处理方式: </span>
-                <input type="radio" name="sex" value="2" class="radio" checked/>删除 
-                <input type="radio" name="sex" value="1" class="radio" />修改
+                <input type="radio" name="status" value="2" class="radio" checked/>删除 
+                <input type="radio" name="status" value="1" class="radio" />修改
             </div>
             <p class="item"><span class="title">质控条目：</span><input class="inp" disabled value="${casesEntryName}" /></p>
-            <p class="item"><span class="title">提示信息：</span><input class="inp" disabled value="${casesEntryMsg}" /></p>
-            <p class="item"><span class="title">分值：</span><input class="inp" disabled value="${value}" /></p>
-            <p class="item"><span class="title">备注：</span><input class="inp" disabled value="${explainInfo}"/></p>
+            <p class="item"><span class="title">提示信息：</span><input class="inp case endis" disabled value="${msg}" /></p>
+            <p class="item"><span class="title">分值：</span><input class="inp endis score" disabled value="${score}" /></p>
+            <p class="item"><span class="title">备注：</span><input class="inp endis explainInfo" disabled value="${explainInfo}"/></p>
         </div>
     </script>
 
@@ -24,9 +24,9 @@
         <div class="appeal-box">
             <p class="item"><span class="title">处理方式：</span>新增</p>
             <p class="item"><span class="title">质控条目：</span><input class="inp" disabled value="${casesEntryName}" /></p>
-            <p class="item"><span class="title">提示信息：</span><input class="inp" disabled value="${casesEntryMsg}" /></p>
-            <p class="item"><span class="title">分值：</span><input class="inp" disabled value="${value}" /></p>
-            <p class="item"><span class="title">备注：</span><input class="inp" disabled value="${explainInfo}"/></p>
+            <p class="item"><span class="title">提示信息：</span><input class="inp msg" value="${msg}" /></p>
+            <p class="item"><span class="title">分值：</span><input class="inp score"  value="${score}" /></p>
+            <p class="item"><span class="title">备注：</span><input class="inp explainInfo"  value="${explainInfo}"/></p>
         </div>
     </script>
 
@@ -56,13 +56,13 @@
                 </div>
             </div>
             <div class="appeal-content">
-                <p class="title">申述内容</p>
+                <p class="title">申诉内容</p>
                 <div class="content">
 
                 </div>
             </div>
             <div class="appeal-history">
-                <p class="title">申述记录</p>
+                <p class="title">申诉记录</p>
                 <div class="history">
 
                 </div>

src/html/appealHistory.html

@@ -19,7 +19,7 @@
                 <p class="checker-drop-input" code=${casesEntryId}>${checkName}</p>
                 <ul></ul>
             </div>
-            <p class="item"><span ><i class="required">*</i>申述说明：</span><textarea class="textarea" ></textarea></p>
+            <p class="item"><span ><i class="required">*</i>申诉说明：</span><textarea class="textarea" ></textarea></p>
             <p class="warning"><span></span><span class="red">申诉说明不能为空~</span></p>
         </div>
     </script>
@@ -54,13 +54,13 @@
                     </span>
 
                     <span class="filterItem">
-                        <span>申述模块：</span>
+                        <span>申诉模块：</span>
                         <span class="selectModular">全部</span>
                         <ul class="modularList filterDropList">
-                            <Li class="modularItem" data-name="全部" data-id="全部">全部</Li>
+                            <!-- <Li class="modularItem" data-name="全部" data-id="">全部</Li>
                             <Li class="modularItem" data-name="病案首页" data-id="病案首页">病案首页</Li>
                             <Li class="modularItem" data-name="入院记录" data-id="入院记录">入院记录</Li>
-                            <li class="modularItem" data-name="出院记录" data-id=出院记录>出院记录</li>
+                            <li class="modularItem" data-name="出院记录" data-id=出院记录>出院记录</li> -->
                         </ul>
                     </span>
                     <span class="filterItem typeFilter">
@@ -71,21 +71,21 @@
                         <span>操作类型：</span>
                         <span class="selectType">全部</span>
                         <ul class="typeList filterDropList">
-                            <Li class="typeItem" data-name="全部" data-id="">全部</Li>
+                            <!-- <Li class="typeItem" data-name="全部" data-id="">全部</Li>
                             <Li class="typeItem" data-name="删除条目" data-id="0">删除条目</Li>
                             <Li class="typeItem" data-name="新增已有条目" data-id="1">新增已有条目</Li>
                             <li class="typeItem" data-name="新增缺失条目" data-id=2>新增缺失条目</li>
-                            <li class="typeItem" data-name="恢复条目" data-id=3>恢复条目</li>
+                            <li class="typeItem" data-name="恢复条目" data-id=3>恢复条目</li> -->
                         </ul>
                     </span>
                     <span class="filterItem">
                         <span>状态：</span>
                         <span class="qcSelectCheck">全部</span>
                         <ul class="qcCheckList filterDropList">
-                            <Li class="qcCheckItem" data-name="全部" data-id="">全部</Li>
+                            <!-- <Li class="qcCheckItem" data-name="全部" data-id="">全部</Li>
                             <Li class="qcCheckItem" data-name="待审核" data-id="0">待审核</Li>
                             <Li class="qcCheckItem" data-name="审核通过" data-id="2">审核通过</Li>
-                            <li class="qcCheckItem" data-name="已驳回" data-id="1">已驳回</li>
+                            <li class="qcCheckItem" data-name="已驳回" data-id="1">已驳回</li> -->
                         </ul>
                     </span>
                     <span class="filter">查询</span>
@@ -97,12 +97,12 @@
                 <table class="qctable">
                     <thead>
                         <tr class="tabTitle">
-                            <th class="recordScoreOpera textCenter" style="width: 65px;">申述人</th>
+                            <th class="recordScoreOpera textCenter" style="width: 65px;">申诉人</th>
                             <th class="beHospitalId textCenter" >所属科室</th>
-                            <th class="patientNo textCenter" >申述时间</th>
+                            <th class="patientNo textCenter" >申诉时间</th>
                             <th class="patientName textCenter" style="width: 100px;">病人住院序号</th>
                             <th class="patientSex textCenter" >患者姓名</th>
-                            <th class="patientage textCenter" >申述模块</th>
+                            <th class="patientage textCenter" >申诉模块</th>
                             <th class="bedNum textCenter" >缺陷详情</th>
                             <th class="inHospitalDate textCenter" >审核人</th>
                             <th class="outHospitalDate textCenter" >审核时间</th>

src/html/appealUserPage.html

@@ -181,9 +181,9 @@
             {{if score===0}}
             <p><span>评分: </span> warn</p>
             {{else}}
-            <p><span>评分: </span> -${score}</p>
+            <p><span>评分: </span> ${score}</p>
             {{/if}}
-            <p><span>操作类型: </span> 删改条目</p>
+            <p><span>操作类型: </span>${appealOperationType == 3 ? '恢复条目' : appealOperationType == 1 ? '新增已有条目' : appealOperationType == 2 ? '新增缺失条目' : '删改条目'}</p>
             <p><span>缺陷详情: </span>${standardMsg}</p>
             <div class="drop-box checker-drop-box">
             <span><i class="required">*</i>审核人: </span>
@@ -226,10 +226,9 @@
             <p><span>申诉时间: </span> ${appealCreateDate}</p>
             <p><span>申诉人: </span> ${claimantName}</p>
             <p><span>审核人: </span> ${checkName}</p>
-            <p><span>操作类型: </span> ${appealOperationType}</p>
+            <p><span>操作类型: </span> ${appealOperationType == 0 ? '删改条目' : appealOperationType == 1 ? '新增已有条目' : appealOperationType == 2 ? '新增缺失条目' : '恢复条目'}</p>
             <p><span>申诉说明: </span> ${appealExplain}</p>
             {{if exampleStatus==='1'||exampleStatus==='2'}}
-            <p class="line"></p>
             <p class="check-item reject-item"><span>审核时间:</span>${appealExamineDate}</p>
             <p class="check-item reject-item"><span>审核人: </span> ${checkName}</p>
             <p class="check-item reject-item">
@@ -239,7 +238,7 @@
             <p class="check-item reject-item"><span>驳回理由:</span>${rejectReason}</p>
             {{/if}}
             {{if exampleStatus==='2'}}
-            <p class="check-item"><span>处理方式:</span>${exampleOperation}</p>
+            <p class="check-item"><span>处理方式:</span>${exampleOperation == 1 ? '修改' : exampleOperation == 2 ? '删除' : exampleOperation == 3 ? '新增已有' : exampleOperation == 4 ? '新增缺失' : '恢复条目'}</p>
             <p class="check-item"><span>质控条目:</span>${casesEntryName}</p>
             <p class="check-item"><span>提示信息:</span>${msg}</p>
             <p class="check-item"><span>分值:</span>${score}</p>

src/html/qcScore.html

@@ -138,9 +138,39 @@
          </table>
          {{/if}}
     </script>
+    <script type="text/html" id="appealStatusTmpl">
+        <div class="edit-box show-box ${exampleStatus==='1'?'refuse':exampleStatus==='2'?'pass':''}">
+            <p><span>申诉时间: </span> ${appealCreateDate}</p>
+            <p><span>申诉人: </span> ${claimantName}</p>
+            <p><span>审核人: </span> ${checkName}</p>
+            <p><span>操作类型: </span> ${appealOperationType == 0 ? '删改条目' : appealOperationType == 1 ? '新增已有条目' : appealOperationType == 2 ? '新增缺失条目' : '恢复条目'}</p>
+            <p><span>申诉说明: </span> ${appealExplain}</p>
+            {{if exampleStatus==='1'||exampleStatus==='2'}}
+            <p class="line"></p>
+            <p class="check-item reject-item"><span>审核时间:</span>${appealExamineDate}</p>
+            <p class="check-item reject-item"><span>审核人: </span> ${checkName}</p>
+            <p class="check-item reject-item">
+                <span>审核结果:</span>
+                <span class="check-status">${exampleStatus==='1'?'驳回':'审核通过'}</span>
+            </p>
+            <p class="check-item reject-item"><span>驳回理由:</span>${rejectReason}</p>
+            {{/if}}
+            {{if exampleStatus==='2'}}
+            <p class="check-item"><span>处理方式:</span>${exampleOperation == 1 ? '修改' : exampleOperation == 2 ? '删除' : exampleOperation == 3 ? '新增已有' : exampleOperation == 4 ? '新增缺失' : '恢复条目'}</p>
+            <p class="check-item"><span>质控条目:</span>${casesEntryName}</p>
+            <p class="check-item"><span>提示信息:</span>${msg}</p>
+            <p class="check-item"><span>分值:</span>${score}</p>
+            <p class="check-item"><span>备注:</span>${exampleRemark}</p>
+            {{/if}}
+            <p class="line"></p>
+        </div>
+    </script>
     <script type="text/html" id="flawTmpl">
         <div {{if isReject==='1'}} class="flaw-item high-light" {{else}} class="flaw-item" {{/if}} code="${modelName.replace(/[^\u4e00-\u9fa5|a-zA-Z0-9]+/g,'')}">
             <div  {{if isDeleted==="Y"}} class="delete title"{{else}}  class="title" {{/if}}>
+                {{if exampleStatus=="0"||exampleStatus=="1"||exampleStatus=="2"}}
+                <span data_id="${appealInfoId}" data_type="${exampleStatus}"  data_casesEntryId="${casesEntryId}" data_qcresultDetailId="${id}" class="btn ${exampleStatus==='0'?'appeal':exampleStatus==='2'?'examine':exampleStatus==='1'?'reject':''}" msg="${msg}">${exampleStatus==='0'?'申诉':exampleStatus==='2'?'审核':exampleStatus==='1'?'驳回':''}</span>
+                {{/if}}
                 {{if gradeType===2}}
                 <img {{if explainInfo}} title="${explainInfo}" {{/if}} src="../images/tag.png" alt=""/>
                 {{/if}}
@@ -158,8 +188,11 @@
                 {{/if}}
                 {{if isDeleted==="N"}}
                 <div class="oper fr">
+                    {{if appealOperationType}}
+                    {{else}}
                     <a class="edit-flaw blue" code="${id}" href="javascript:void(0);" style="margin-right: 18px;">修改</a>
                     <a class="del-flaw red" code="${id}" href="javascript:void(0);">删除</a>
+                    {{/if}}
                 </div>
                 {{else}}
                 <div class="oper fr">

src/js/api.js

@@ -216,12 +216,13 @@ const api = {
   getApprovedView:'/qc/appealExamineInfo/getApprovedView',    //获取申诉详情
   getAppealReview:'/qc/appealExamineInfo/getAppealReview', //申诉审核列表
   approved:'/qc/appealExamineInfo/approved', //审核通过
-  getAppealInfo:'/qc/appealInfo/getAppealInfo', //申述记录
-  cancelAppealInfo:'/qc/appealInfo/cancelAppealInfo', //撤回申述
-  getAppealOperationType:'/qc/appealInfo/getAppealOperationType', //再次申述
+  getAppealInfo:'/qc/appealInfo/getAppealInfo', //申诉记录
+  cancelAppealInfo:'/qc/appealInfo/cancelAppealInfo', //撤回申诉
+  getAppealOperationType:'/qc/appealInfo/getAppealOperationType', //再次申诉
   getAuditNumber:'/qc/appealExamineInfo/getAuditNumber', //获取待审核数量
-  getAppealReviewExport:'/qc/appealExamineInfo/getAppealReviewExport', //申述审核导出
-  getComplaintRecordExport:'/qc/appealExamineInfo/getComplaintRecordExport', //申述记录导出
+  getAppealReviewExport:'/qc/appealExamineInfo/getAppealReviewExport', //申诉审核导出
+  getComplaintRecordExport:'/qc/appealExamineInfo/getComplaintRecordExport', //申诉记录导出
+  getAppealReviewDictionary:'/qc/appealExamineInfo/getAppealReviewDictionary', //操作类型
 }
 const ywCheckApi = {
   addMedCheckInfo: '/qc/medCheckInfo/addMedCheckInfo',   //核查

src/js/appealCheck.js

@@ -11,7 +11,6 @@ const iconCalenBlue = require("./../images/icon_calen_blue.png")
 const iconCalenGrey = require("./../images/icon_calen_grey.png")
 const iconDown = require("./../images/arrow_down.png")
 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")
 const goUpG = require("./../images/arrow_up_grey.png")
@@ -29,10 +28,9 @@ let srcUrl = $("#contentIframe", parent.document).attr("src")
 let statisticsType = getUrlArgObjectNew("dateType", srcUrl) || getUrlArgObjectNew("shijian", srcUrl) || ""
 let startDateParam = getUrlArgObjectNew("startDateParam", srcUrl) || ""
 let endDateParam = getUrlArgObjectNew("endDateParam", srcUrl) || ""
-let tabList = [], name = "", behospitalCode = "", deptName = "", deptNameTemp = "", behosDateStart = "", level = "", behosDateEnd = "", nameTemp = "", casesName = "", operationType = "",
-    behospitalCodeTemp = "", levelTemp = "", deptId = "", deptIdTemp = "", doctorName = "", doctorNameTemp = "", doctorNum = "", doctorNumTemp = "",
-    fpCheckStatus = "", fpCheckStatusTemp = "", fpCheckName = "", fpCheckNameTemp = "", qcCheckName = "", qcCheckNameTemp = "", qcCheckMain = "", qcCheckStatus = "", state = "",
-    data_desc = ["leave_hospital_date"], data_asc = [];
+let tabList = [],  deptName = "", deptNameTemp = "", behosDateStart = "", behosDateEnd = "", nameTemp = "", casesName = "", operationType = "",
+    deptId = "", deptIdTemp = "",
+    fpCheckStatusTemp = "", fpCheckNameTemp = "", qcCheckNameTemp = "", state = "";
 let isPlacefile = getCookie('isPlacefile') || 1
 
 $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
@@ -61,8 +59,8 @@ function getTabData(activePage) {
         state: state,
         size: 15,
         name: nameTemp,
-        complaintDateEnd: behosDateEnd.replaceAll("/", "-"),
-        complaintDateStart: behosDateStart.replaceAll("/", "-"),
+        complaintDateEnd: behosDateEnd.replace(/\//g, '-'),
+        complaintDateStart: behosDateStart.replace(/\//g, '-'),
     }
     $('.pagination').html("")
     $('.tbody').html(emptyBox('努力加载中...', '',))
@@ -99,7 +97,7 @@ $(".filter").on("click", function (e) {
     const behosDateStartTime = new Date(behosDateStart).getTime()
     const behosDateEndTime = new Date(behosDateEnd).getTime()
     if (behosDateStartTime > behosDateEndTime) {
-        $.alerModal({ "message": '出院日期开始时间不能大于结束时间~', type: "tip", time: '1000', isFather: true, fatherWrapper: $("#mainBox", parent.document) });
+        $.alerModal({ "message": '申诉时间开始时间不能大于结束时间~', type: "tip", time: '1000', isFather: true, fatherWrapper: $("#mainBox", parent.document) });
         return
     }
     if (behosDateStart) {
@@ -108,17 +106,10 @@ $(".filter").on("click", function (e) {
     if (behosDateEnd) {
         behosDateEnd = behosDateEnd.replace(/\//g, '-') + ' 23:59:59'
     }
-    name = nameTemp
-    behospitalCode = behospitalCodeTemp
-    level = levelTemp === "全部" ? "" : levelTemp
     deptId = deptIdTemp
     deptName = deptNameTemp
-    doctorName = doctorNameTemp
     fpCheckName = fpCheckNameTemp
     qcCheckName = qcCheckNameTemp
-
-
-    doctorNum = doctorNumTemp
     fpCheckStatus = fpCheckStatusTemp
     qcCheckStatus = state
     getTabData(1)
@@ -126,23 +117,15 @@ $(".filter").on("click", function (e) {
 
 $(".abnormalClear").on("click", function (e) {
     tabList = [];
-    name = "";
     behospitalCode = "";
-    level = "";
     scoreSum = 0;
     nameTemp = "";
-    behospitalCodeTemp = "";
-    levelTemp = "";
     deptId = "";
     deptIdTemp = "";
     deptName = deptNameTemp = "";
-    doctorName = "";
     fpCheckName = "";
     qcCheckName = "";
     qcCheckMain = "";
-    doctorNum = "";
-    doctorNameTemp = "";
-    doctorNumTemp = "";
     fpCheckNameTemp = "";
     qcCheckNameTemp = "";
     qcCheckMainTemp = "";
@@ -150,6 +133,7 @@ $(".abnormalClear").on("click", function (e) {
     fpCheckStatusTemp = "";
     qcCheckStatus = "";
     state = ""
+    casesName = ""
     operationType = ""
     data_desc = ["leave_hospital_date"]
     if (isPlacefile != 1) {
@@ -238,7 +222,7 @@ function renderTab(data) {
                 <td >${item.behospitalCode}</td>
                 <td >${item.name || "-"}</td>
                 <td >${item.casesName || "-"}</td>
-                <td >${item.defectContent || "-"}</td>
+                <td >${item.qcresultDetailMsg || "-"}</td>
                 <td >${item.checkName || "-"}</td>
                 <td >${item.checkGmtCreate || "-"}</td>
                 <td >${item.appealOperationType == 0 ? '删改条目' : item.appealOperationType == 1 ? '新增已有条目' : item.appealOperationType == 2 ? '新增缺失条目' : '恢复条目'}</td>
@@ -328,24 +312,65 @@ $('.qcSelectCheck').on("click", function (e) {
         $(".qcSelectCheck .arrow").attr("src", iconDown)
     }
 })
+getmoduleList()
+
+//获取模块类型
+function getmoduleList() {
+    post(api.getQcCasesAll).then(res => {
+        if (res.data.code == '0') {
+            const moduleTypeList = res.data.data
+            renderModuleList(moduleTypeList)
+        } else { }
+    }).catch((e) => {
 
-bindLeveldSelect()
-//病历等级选择
-function bindLeveldSelect() {
+    })
+}
+
+function renderModuleList(moduleTypeList) {
+    let str = `<li class="modularItem " data-id="" data-name="全部">全部</li>`
+    for (let i = 0; i < moduleTypeList.length; i++) {
+        str += `<li class="modularItem ellipsis" title=${moduleTypeList[i].name} data-id=${moduleTypeList[i].id} data-name=${moduleTypeList[i].name}> ${moduleTypeList[i].name}</li>`
+    }
+    $('.modularList').html(str)
+    bindModuleSelect()
+}
+//模块类型选择
+function bindModuleSelect() {
     $('.modularItem').on("click", function () {
         const modularItemName = $(this).attr("data-name")
         const modularItemItemId = $(this).attr("data-id")
-        casesName = modularItemItemId
+        casesName = modularItemName
         $('.selectModular').html(modularItemName)
         $(".modularList").css("display", "none")
         $(".selectModular").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
         $('.selectModular').removeClass('unSelect')
     })
 }
+getAppealReviewDictionary()
+//获取操作类型
+function getAppealReviewDictionary() {
+    post(api.getAppealReviewDictionary).then(res => {
+        if (res.data.code == '0') {
+            const typeList = res.data.data['操作类型']
+            const statusList = res.data.data['状态']
+            renderTypeList(typeList)
+            renderStatusList(statusList)
+        } else { }
+    }).catch((e) => {
 
+    })
+}
 
-bindTypedSelect()
-//操作类型
+function renderTypeList(data) {
+    console.log(data);
+    let str = `<li class="typeItem " data-id="" data-name="全部">全部</li>`
+    for (var i in data) {
+        str += `<li class="typeItem ellipsis" title=${data[i]} data-id=${i} data-name=${data[i]}> ${data[i]}</li>`
+    }
+    $('.typeList').html(str)
+    bindTypedSelect()
+}
+//操作类型选择
 function bindTypedSelect() {
     $('.typeItem').on("click", function () {
         const typeItemName = $(this).attr("data-name")
@@ -357,9 +382,15 @@ function bindTypedSelect() {
         $('.selectType').removeClass('unSelect')
     })
 }
-
-bindCheckedSelectQc()
-//病历核查状态选择
+function renderStatusList(data) {
+    let str = `<li class="qcCheckItem " data-id=" " data-name="全部">全部</li>`
+    for (var i in data) {
+        str += `<li class="qcCheckItem ellipsis" title=${data[i]} data-id=${i} data-name=${data[i]}> ${data[i]}</li>`
+    }
+    $('.qcCheckList').html(str)
+    bindCheckedSelectQc()
+}
+//状态
 function bindCheckedSelectQc() {
     $('.qcCheckItem').on("click", function () {
         const qcCheckItemName = $(this).attr("data-name")
@@ -795,7 +826,7 @@ $((function ($) {
             complaintDateStart: behosDateStart.replaceAll("/", "-"),
         }
         expJson(api.getAppealReviewExport, param).then(res => {
-            downloadExportedData(res.data, "申述审核.xls")
+            downloadExportedData(res.data, "申诉审核.xls")
         })
 
     })

src/js/appealExamine.js

@@ -28,7 +28,7 @@ const casesEntryId = getUrlArgObjectNew("casesEntryId", srcUrl) || "";
 const qcresultDetailId = getUrlArgObjectNew("qcresultDetailId", srcUrl) || "";
 const appealOperationType = getUrlArgObjectNew("appealOperationType", srcUrl) || "";
 const form = getUrlArgObjectNew("form", srcUrl) || "";
-let appealInfo;
+let appealInfo, appealExamineRecordDTOList, auditNumber;
 (function () {
     getApprovedView()
     if (form == 2) {
@@ -38,6 +38,7 @@ let appealInfo;
         $(".bot").hide();
         $('.appealExamine h2').html('申诉信息 > 申诉记录 > 查看');
     }
+
 })();
 //获取审核详情
 function getApprovedView() {
@@ -51,23 +52,30 @@ function getApprovedView() {
     return post(api.getApprovedView, param).then(res => {
         if (res.data.code == '0') {
             data = res.data.data.data
+            appealExamineRecordDTOList = data.appealExamineRecordDTOList;
             appealInfo = {
                 exampleOperation: 2,
                 casesEntryName: data.casesEntryName,
                 casesEntryMsg: data.casesEntryMsg,
-                value: data.qcresultDetaiValue,
                 remark: data.remark,
                 behospitalCode: data.behospitalCode,
                 qcResultAlgVO: {
                     casesEntryId: casesEntryId,
                     casesId: data.casesId,
                     id: data.qcresultDetailId,
-                    exampleOperation: appealOperationType
+                    casesScore: appealExamineRecordDTOList[0].casesScore,
+                    msg: appealExamineRecordDTOList[0].msg,
+                    score: appealExamineRecordDTOList[0].qcresultDetaiValue,
+                    isReject: appealExamineRecordDTOList[0].isReject,
+                    explainInfo: appealExamineRecordDTOList[0].explainInfo,
                 }
-            }
-            getInfo(data)
-            getCon(data)
-            getAppealInfo(id, behospitalCode, casesEntryId, hospitalId, qcresultDetailId)
+            };
+            $('.info').html('');
+            $('.content').html('');
+            $('.history').html('');
+            getInfo(data);
+            getCon(data);
+            getAppealInfo(id, behospitalCode, casesEntryId, hospitalId, qcresultDetailId);
         } else {
             const token = localStorage.getItem('accessToken');
             if (!token && window.location.href.indexOf('login') == -1) {
@@ -118,13 +126,18 @@ function getInfo(data) {
     $('.info').append(str);
 }
 function getCon(data) {
+    console.log(data);
     let str = ''
-    str += `<p class="con-title">申述模块：${data.casesName || '-'}</p>
+    str += `<p class="con-title">申诉模块：${data.casesName || '-'}</p>
         <p class="con-title">病历内容：${data.defectContent || '-'}</p>
         <p class="con-title">缺陷详情：${data.qcresultDetailMsg || '-'}</p>
         <p class="con-title">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 评分：${data.qcresultDetaiValue || '-'}</p>
         <p class="con-title">病案详情：<span class="goDetail">查看</span></p>`;
     $('.content').append(str);
+    $('.goDetail').on('click', function (e) {
+        scoreDetail(data.behospitalCode, data.age, 'YH-BLZK-ZKSSKS', data.name)
+    })
+
 }
 
 function getHistory(data) {
@@ -132,40 +145,60 @@ function getHistory(data) {
     for (let i = 0; i < data.length; i++) {
         const item = data[i]
         str += `<div class="box">
-            <p class="con-title"><span>申述时间：${item.appealCreateDate || '-'}</span><span>申述人：${item.claimantName || '-'}</span><span>审核人：${item.checkName || '-'}</span></p>
+            <p class="con-title"><span>申诉时间：${item.appealCreateDate || '-'}</span><span>申诉人：${item.claimantName || '-'}</span><span>审核人：${item.checkName || '-'}</span></p>
             <p class="con-title">操作类型：${item.appealOperationType == 0 ? '删改条目' : item.appealOperationType == 1 ? '新增已有条目' : item.appealOperationType == 2 ? '新增缺失条目' : '恢复条目'}</p>
-            <p class="con-title">申述说明：${item.appealExplain || '-'}</p>
+            <p class="con-title">申诉说明：${item.appealExplain || '-'}</p>
+            ${item.exampleStatus == 2 ?
+                `<p class="con-title" style="border-top: 1px solid #333;margin-top: 10px;padding-top: 10px;">审核时间：${item.appealExamineDate || '-'}</p>
+                <p class="con-title">申诉结果：审核通过</p>
+                <p class="con-title">处理方式：${item.exampleOperation == 1 ? '修改' : item.exampleOperation == 2 ? '删除' : item.exampleOperation == 3 ? '新增已有' : item.exampleOperation == 4 ? '新增缺失' : '恢复条目'}</p>
+                <p class="con-title">质控条目：${item.casesEntryName || '-'}</p>
+                <p class="con-title">提示信息：${item.msg || '-'}</p>
+                <p class="con-title">分值：${item.score || '-'}</p>
+                <p class="con-title">备注：${item.exampleRemark || '-'}</p>`
+                : item.exampleStatus == 1 ?
+                    `<p class="con-title" style="border-top: 1px solid #333;margin-top: 10px;padding-top: 10px;">审核时间：${item.appealExamineDate || '-'}</p>
+                <p class="con-title">申诉结果：审核通过</p>
+                <p class="con-title">驳回理由：${item.rejectReason || '-'}</p>`
+                    : ""}
         </div>`;
     }
     $('.history').append(str);
 }
 
-$(document).on("click", ".goDetail", (e) => {
-    $(parent.document).find("#contentIframe").attr("src", "checkTaskList.html")
-});
 
+function scoreDetail(id, age, code, name) {
+    const logoParam = getLogoParam();
+    window.open(`./appealUserPage.html?id=${id}&age=${age}&code=${code}&hid=${getCookie('hospitalid')}&name=${name}&form=44` + logoParam)
+}
+
+$(document).on("click", "input[type=radio][value=1]", (e) => {
+    $(".endis").attr("disabled", false);
+});
+$(document).on("click", "input[type=radio][value=2]", (e) => {
+    $(".endis").attr("disabled", true);
+});
 $(document).on("click", ".btn-sure", (e) => {
     $("#delModal .modal-body").html("");
     $("#delModal").show();
     if (appealOperationType == 0) {
-        $("#appealDel").tmpl(appealInfo).appendTo("#delModal .modal-body");
+        $("#appealDel").tmpl(appealExamineRecordDTOList[0]).appendTo("#delModal .modal-body");
         $("#delModal .confirm").text("确定").unbind("click").click(function () {
             approved(1)
         });
     } else if (appealOperationType == 1) {
-
-        $("#appealAdd").tmpl(appealInfo).appendTo("#delModal .modal-body");
+        console.log(appealInfo);
+        $("#appealAdd").tmpl(appealExamineRecordDTOList[0]).appendTo("#delModal .modal-body");
         $("#delModal .confirm").text("确定").unbind("click").click(function () {
             approved(2)
         });
     } else if (appealOperationType == 2) {
 
-        $("#appealDef").tmpl(appealInfo).appendTo("#delModal .modal-body");
+        $("#appealDef").tmpl(appealExamineRecordDTOList[0]).appendTo("#delModal .modal-body");
         $("#delModal .confirm").text("确定").unbind("click").click(function () {
             approved(3)
         });
     }
-    console.log(appealOperationType);
 });
 
 
@@ -178,7 +211,7 @@ $(document).on("click", ".btn-cancel", (e) => {
     $("#delModal").show();
     $("#delModal .modal-header .title").html('驳回');
 
-    $("#appealReject").tmpl(appealInfo).appendTo("#delModal .modal-body");
+    $("#appealReject").tmpl(appealExamineRecordDTOList[0]).appendTo("#delModal .modal-body");
     $("#delModal .confirm").text("确定").unbind("click").click(function () {
         rejected()
     });
@@ -190,9 +223,17 @@ function approved(type) {
         appealInfo.exampleOperation = $('input:radio:checked').val()
         if ($('input:radio:checked').val() == 2) {
             appealInfo.delStatus == 0
+        } else {
+            appealInfo.casesEntryMsg == $(".case").val()
+            appealInfo.qcResultAlgVO.score = $('.score').val()
+            appealInfo.qcResultAlgVO.explainInfo = $('.explainInfo').val()
+            appealInfo.qcResultAlgVO.msg = $('.msg').val()
         }
     } else if (type == 2) {
         appealInfo.exampleOperation = 3
+        appealInfo.qcResultAlgVO.score = $('.score').val()
+        appealInfo.qcResultAlgVO.explainInfo = $('.explainInfo').val()
+        appealInfo.qcResultAlgVO.msg = $('.msg').val()
     } else if (type == 3) {
         appealInfo.exampleOperation = 4
         appealInfo.processResult = $(".textarea").val()
@@ -215,6 +256,8 @@ function approved(type) {
     post(api.approved, param).then(function (res) {
         if (res.data.code === '0') {
             $("#delModal").hide();
+            getApprovedView()
+            getAuditNumber()
             $.alerModal({ "message": "审核成功", type: "tip", time: '1000', win: true });
         } else {
             $.alerModal({ "message": res.data.msg || '失败,请重试~', type: "tip", time: '1000', win: 'default' });
@@ -245,15 +288,35 @@ function rejected() {
         rejectedReason: $(".textarea2").val()
     };
     post(api.rejected, param).then(function (res) {
-        console.log(res.data.data.code);
         if (res.data.data.code === '0') {
             $("#delModal").hide();
+            getApprovedView()
+            getAuditNumber()
             $.alerModal({ "message": "驳回成功", type: "tip", time: '1000', win: true });
         } else {
-            console.log(123);
             $.alerModal({ "message": res.data.data.msg || '失败,请重试~', type: "tip", time: '1000', win: 'default' });
         }
     }).catch(() => {
         $.alerModal({ "message": '失败,请重试~', type: "tip", time: '1000', win: 'default' });
     });
+}
+
+//获取待审核数量
+getAuditNumber()
+function getAuditNumber() {
+    return post(api.getAuditNumber, {}).then(res => {
+        if (res.data.code == '0') {
+            auditNumber = res.data.data.data > 99 ? '99+' : res.data.data.data
+            $(".menu .page", parent.document).children('.reds').html(auditNumber)
+        } else {
+            const token = localStorage.getItem('accessToken');
+            if (!token && window.location.href.indexOf('login') == -1) {
+                //alert('无token判断，跳回登录')
+            } else {
+                $.alerModal({ "message": res.data.msg, type: "tip", time: '1000', isFather: true, fatherWrapper: $("#mainBox", parent.document) });
+            }
+        }
+    }).catch((e) => {
+
+    })
 }

src/js/appealHistory.js

@@ -1,3 +1,4 @@
+
 const $ = require('jquery');
 require("../css/appealHistory.less");
 require('./modal.js');
@@ -12,7 +13,6 @@ const iconCalenBlue = require("./../images/icon_calen_blue.png")
 const iconCalenGrey = require("./../images/icon_calen_grey.png")
 const iconDown = require("./../images/arrow_down.png")
 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")
 const goUpG = require("./../images/arrow_up_grey.png")
@@ -31,10 +31,10 @@ let srcUrl = $("#contentIframe", parent.document).attr("src")
 let statisticsType = getUrlArgObjectNew("dateType", srcUrl) || getUrlArgObjectNew("shijian", srcUrl) || ""
 let startDateParam = getUrlArgObjectNew("startDateParam", srcUrl) || ""
 let endDateParam = getUrlArgObjectNew("endDateParam", srcUrl) || ""
-let tabList = [], name = "", behospitalCode = "", deptName = "", deptNameTemp = "", behosDateStart = "", level = "", behosDateEnd = "", nameTemp = "", moduleName = "", operationType = "",
-    behospitalCodeTemp = "", levelTemp = "", deptId = "", deptIdTemp = "", doctorName = "", doctorNameTemp = "", doctorNum = "", doctorNumTemp = "",
-    fpCheckStatus = "", fpCheckStatusTemp = "", fpCheckName = "", fpCheckNameTemp = "", qcCheckName = "", qcCheckNameTemp = "", qcCheckMain = "", qcCheckStatus = "", state = "",
-    data_desc = ["leave_hospital_date"], data_asc = [], global_checkers = [];    //审核人列表;
+let tabList = [], deptName = "", deptNameTemp = "", behosDateStart = "", behosDateEnd = "", moduleName = "", operationType = "",
+    deptId = "", deptIdTemp = "",
+    fpCheckStatusTemp = "", fpCheckNameTemp = "", qcCheckNameTemp = "", state = "",
+    global_checkers = [];    //审核人列表;
 let isPlacefile = getCookie('isPlacefile') || 1
 
 $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
@@ -63,8 +63,8 @@ function getTabData(activePage) {
         state: state,
         size: 15,
         name: $('.patientNameInp').val(),
-        complaintDateEnd: behosDateEnd.replaceAll("/", "-"),
-        complaintDateStart: behosDateStart.replaceAll("/", "-"),
+        complaintDateEnd: behosDateEnd.replace(/\//g, '-'),
+        complaintDateStart: behosDateStart.replace(/\//g, '-'),
     }
     $('.pagination').html("")
     $('.tbody').html(emptyBox('努力加载中...', '',))
@@ -101,7 +101,7 @@ $(".filter").on("click", function (e) {
     const behosDateStartTime = new Date(behosDateStart).getTime()
     const behosDateEndTime = new Date(behosDateEnd).getTime()
     if (behosDateStartTime > behosDateEndTime) {
-        $.alerModal({ "message": '出院日期开始时间不能大于结束时间~', type: "tip", time: '1000', isFather: true, fatherWrapper: $("#mainBox", parent.document) });
+        $.alerModal({ "message": '申诉时间开始时间不能大于结束时间~', type: "tip", time: '1000', isFather: true, fatherWrapper: $("#mainBox", parent.document) });
         return
     }
     if (behosDateStart) {
@@ -110,17 +110,10 @@ $(".filter").on("click", function (e) {
     if (behosDateEnd) {
         behosDateEnd = behosDateEnd.replace(/\//g, '-') + ' 23:59:59'
     }
-    name = nameTemp
-    behospitalCode = behospitalCodeTemp
-    level = levelTemp === "全部" ? "" : levelTemp
     deptId = deptIdTemp
     deptName = deptNameTemp
-    doctorName = doctorNameTemp
     fpCheckName = fpCheckNameTemp
     qcCheckName = qcCheckNameTemp
-
-
-    doctorNum = doctorNumTemp
     fpCheckStatus = fpCheckStatusTemp
     qcCheckStatus = state
     getTabData(1)
@@ -128,23 +121,13 @@ $(".filter").on("click", function (e) {
 
 $(".abnormalClear").on("click", function (e) {
     tabList = [];
-    name = "";
-    behospitalCode = "";
-    level = "";
     scoreSum = 0;
-    nameTemp = "";
-    behospitalCodeTemp = "";
-    levelTemp = "";
     deptId = "";
     deptIdTemp = "";
     deptName = deptNameTemp = "";
-    doctorName = "";
     fpCheckName = "";
     qcCheckName = "";
     qcCheckMain = "";
-    doctorNum = "";
-    doctorNameTemp = "";
-    doctorNumTemp = "";
     fpCheckNameTemp = "";
     qcCheckNameTemp = "";
     qcCheckMainTemp = "";
@@ -153,6 +136,7 @@ $(".abnormalClear").on("click", function (e) {
     qcCheckStatus = "";
     state = ""
     operationType = ""
+    moduleName = "",
     data_desc = ["leave_hospital_date"]
     if (isPlacefile != 1) {
         data_desc = ["behospital_date"]
@@ -224,6 +208,95 @@ $(".abnormalClear").on("click", function (e) {
     getTabData(1)
 })
 
+getmoduleList()
+
+//获取模块类型
+function getmoduleList() {
+    post(api.getQcCasesAll).then(res => {
+        if (res.data.code == '0') {
+            const moduleTypeList = res.data.data
+            renderModuleList(moduleTypeList)
+        } else { }
+    }).catch((e) => {
+
+    })
+}
+
+function renderModuleList(moduleTypeList) {
+    let str = `<li class="modularItem " data-id="" data-name="全部">全部</li>`
+    for (let i = 0; i < moduleTypeList.length; i++) {
+        str += `<li class="modularItem ellipsis" title=${moduleTypeList[i].name} data-id=${moduleTypeList[i].id} data-name=${moduleTypeList[i].name}> ${moduleTypeList[i].name}</li>`
+    }
+    $('.modularList').html(str)
+    bindModuleSelect()
+}
+//模块类型选择
+function bindModuleSelect() {
+    $('.modularItem').on("click", function () {
+        const modularItemName = $(this).attr("data-name")
+        const modularItemItemId = $(this).attr("data-id")
+        moduleName = modularItemName
+        $('.selectModular').html(modularItemName)
+        $(".modularList").css("display", "none")
+        $(".selectModular").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+        $('.selectModular').removeClass('unSelect')
+    })
+}
+getAppealReviewDictionary()
+//获取操作类型
+function getAppealReviewDictionary() {
+    post(api.getAppealReviewDictionary).then(res => {
+        if (res.data.code == '0') {
+            const typeList = res.data.data['操作类型']
+            const statusList = res.data.data['状态']
+            renderTypeList(typeList)
+            renderStatusList(statusList)
+        } else { }
+    }).catch((e) => {
+
+    })
+}
+
+function renderTypeList(data) {
+    let str = `<li class="typeItem " data-id="" data-name="全部">全部</li>`
+    for (var i in data) {
+        str += `<li class="typeItem ellipsis" title=${data[i]} data-id=${i} data-name=${data[i]}> ${data[i]}</li>`
+    }
+    $('.typeList').html(str)
+    bindTypedSelect()
+}
+//操作类型选择
+function bindTypedSelect() {
+    $('.typeItem').on("click", function () {
+        const typeItemName = $(this).attr("data-name")
+        const typeItemItemId = $(this).attr("data-id")
+        operationType = typeItemItemId
+        $('.selectType').html(typeItemName)
+        $(".typeList").css("display", "none")
+        $(".selectType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+        $('.selectType').removeClass('unSelect')
+    })
+}
+function renderStatusList(data) {
+    let str = `<li class="qcCheckItem " data-id="" data-name="全部">全部</li>`
+    for (var i in data) {
+        str += `<li class="qcCheckItem ellipsis" title=${data[i]} data-id=${i} data-name=${data[i]}> ${data[i]}</li>`
+    }
+    $('.qcCheckList').html(str)
+    bindCheckedSelectQc()
+}
+//状态
+function bindCheckedSelectQc() {
+    $('.qcCheckItem').on("click", function () {
+        const qcCheckItemName = $(this).attr("data-name")
+        const qcCheckItemItemId = $(this).attr("data-id") || ""
+        state = qcCheckItemItemId
+        $('.qcSelectCheck').html(qcCheckItemName)
+        $(".qcCheckList").css("display", "none")
+        $(".qcSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+        $('.qcSelectCheck').removeClass('unSelect')
+    })
+}
 //获取审核人下拉列表
 function getCheckUser() {
     const param = {};
@@ -270,14 +343,14 @@ function renderTab(data) {
                 <td >${item.behospitalCode}</td>
                 <td >${item.name || "-"}</td>
                 <td >${item.casesName || "-"}</td>
-                <td >${item.defectContent || "-"}</td>
+                <td >${item.qcresultDetailMsg || "-"}</td>
                 <td >${item.checkName || "-"}</td>
                 <td >${item.checkGmtCreate || "-"}</td>
                 <td >${item.appealOperationType == 0 ? '删改条目' : item.appealOperationType == 1 ? '新增已有条目' : item.appealOperationType == 2 ? '新增缺失条目' : '恢复条目'}</td>
                 <td >${item.exampleStatus == 0 ? '<span class="review"><i></i>待审核</span>' : item.exampleStatus == 1 ? '<span class="rejected"><i></i>已驳回</span>' : '<span class="approved"><i></i>审核通过</span>'}</td>
                 <td data-id="${item.id || ""}" data-hos="${item.hospitalId || ""}" data-behospitalCode="${item.behospitalCode || ""}" data-casesEntryId="${item.casesEntryId || ""}" data-qcresultDetailId="${item.qcresultDetailId || ""}" data-appealOperationType="${item.appealOperationType || ""}" data-index=${i}>
                     ${item.exampleStatus == 0 ? `<span class="appealBtn goHomeDetail1">查看</span><span class="appealBtn withdraw" >撤回</span>` : ''}
-                    ${item.exampleStatus == 1 || item.exampleStatus == 2 ? `<span class="appealBtn appealAgain">再次申述</span>` : ''}
+                    ${item.exampleStatus == 1 || item.exampleStatus == 2 ? `<span class="appealBtn appealAgain">再次申诉</span>` : ''}
                 </td>
             </tr>
         `
@@ -293,6 +366,15 @@ function renderTab(data) {
         $("#delModal .modal-body").html("");
         $("#delModal").show();
         getCheckUser()
+        if (data[i].appealOperationType == 1) {
+            if (data[i].exampleStatus == 2) {
+                data[i].appealOperationType = 0
+            } else {
+                data[i].appealOperationType = 1
+            }
+        } else if (data[i].appealOperationType == 3) {
+            data[i].appealOperationType = 0
+        }
         $("#appealDef").tmpl(data[i]).appendTo("#delModal .modal-body");
         $("#delModal .confirm").text("确定").unbind("click").click(function () {
             addAppealInfo(data[i])
@@ -324,17 +406,9 @@ function cancelAppealInfo(id) {
     });
 }
 
-//再次申述
+//再次申诉
 function addAppealInfo(data) {
-    if (data.appealOperationType == 1) {
-        if (data.exampleStatus == 2) {
-            data.appealOperationType = 0
-        } else {
-            data.appealOperationType = 1
-        }
-    } else if (data.appealOperationType == 3) {
-        data.appealOperationType = 0
-    }
+
     $(".warning").hide();
     let val = $(".textarea").val()
     let num = 500
@@ -353,12 +427,13 @@ function addAppealInfo(data) {
         behospitalCode: data.behospitalCode,
         checkId: $(".checker-drop-input").attr("code"),
         appealType: 1,
+        qcresultDetailId: data.qcresultDetailId,
     }
     post(api.addAppealInfo, param).then(function (res) {
         if (res.data.code === '0') {
             getTabData(1)
             $("#delModal").hide();
-            $.alerModal({ "message": "申述成功", type: "tip", time: '1000', win: true });
+            $.alerModal({ "message": "申诉成功", type: "tip", time: '1000', win: true });
         } else {
             $.alerModal({ "message": res.data.msg || '失败,请重试~', type: "tip", time: '1000', win: 'default' });
 
@@ -419,7 +494,6 @@ $('.selectType').on("click", function (e) {
     }
 })
 
-
 //选择状态
 $('.qcSelectCheck').on("click", function (e) {
     e.stopPropagation()
@@ -439,48 +513,8 @@ $('.qcSelectCheck').on("click", function (e) {
     }
 })
 
-bindLeveldSelect()
-//病历等级选择
-function bindLeveldSelect() {
-    $('.modularItem').on("click", function () {
-        const modularItemName = $(this).attr("data-name")
-        const modularItemItemId = $(this).attr("data-id")
-        moduleName = modularItemItemId
-        $('.selectModular').html(modularItemName)
-        $(".modularList").css("display", "none")
-        $(".selectModular").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-        $('.selectModular').removeClass('unSelect')
-    })
-}
-
 
-bindTypedSelect()
-//操作类型
-function bindTypedSelect() {
-    $('.typeItem').on("click", function () {
-        const typeItemName = $(this).attr("data-name")
-        const typeItemItemId = $(this).attr("data-id")
-        operationType = typeItemItemId
-        $('.selectType').html(typeItemName)
-        $(".typeList").css("display", "none")
-        $(".selectType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-        $('.selectType').removeClass('unSelect')
-    })
-}
 
-bindCheckedSelectQc()
-//病历核查状态选择
-function bindCheckedSelectQc() {
-    $('.qcCheckItem').on("click", function () {
-        const qcCheckItemName = $(this).attr("data-name")
-        const qcCheckItemItemId = $(this).attr("data-id") || ""
-        state = qcCheckItemItemId
-        $('.qcSelectCheck').html(qcCheckItemName)
-        $(".qcCheckList").css("display", "none")
-        $(".qcSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-        $('.qcSelectCheck').removeClass('unSelect')
-    })
-}
 
 $('.selectDept').on("click", function (e) {
     e.stopPropagation()
@@ -726,23 +760,6 @@ function bindColOrder() {
         }
     })
 }
-$(".patientNumInp").on("input", function (e) {
-    const val = $(this).val().trim()
-    let beCode = behospitalCode;
-    const patrn = /[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘'，。、]/g;
-    beCode = val.replace(patrn, function (x) {
-        return "\\" + x;
-    });
-    behospitalCodeTemp = beCode
-})
-$(".patientNameInp").on("input", function (e) {
-    const val = $(this).val().trim()
-    nameTemp = val
-})
-$(".doctorInp").on("input", function (e) {
-    const val = $(this).val().trim()
-    doctorNameTemp = val
-})
 $(".fpCheckPeople").on("input", function (e) {
     const val = $(this).val().trim()
     fpCheckNameTemp = val
@@ -755,10 +772,6 @@ $(".qcCheckMain").on("input", function (e) {
     const val = $(this).val().trim()
     qcCheckMain = qcCheckMainTemp = val
 })
-$(".doctorNumInp").on("input", function (e) {
-    const val = $(this).val().trim();
-    doctorNumTemp = val
-})
 $(function () {
     $.datepicker.regional['zh-CN'] = {
         clearText: '清除',
@@ -938,7 +951,7 @@ $((function ($) {
             complaintDateStart: behosDateStart.replaceAll("/", "-"),
         }
         expJson(api.getComplaintRecordExport, param).then(res => {
-            downloadExportedData(res.data, "申述记录.xls")
+            downloadExportedData(res.data, "申诉记录.xls")
         })
     })
 })($));

src/js/appealUserPage.js

@@ -36,8 +36,10 @@ $(function () {
   let global_checkers = [];    //审核人列表
   getAllModules();
   getCheckUser(); //获取审核人列表
+  const form = getUrlArgObject("form");
   window.document.title = "质控申诉-" + getUrlArgObject("name");
   //新增申诉点击事件
+
   $(".add-flaw").click(function () {
     showModal('2');
   });
@@ -45,7 +47,7 @@ $(function () {
   function showAppealDetailEvent() {
     //申诉状态点击事件
     $(".flaw-item").off("click").on("click", ".title .btn", function () {
-      showModal("1", $(this).attr("data_id"), $(this).attr("data_type"), $(this).attr("casesEntryId"),$(this).attr("qcresultDetailId"));
+      showModal("1", $(this).attr("data_id"), $(this).attr("data_type"), $(this).attr("data_casesEntryId"), $(this).attr("data_qcresultDetailId"));
     });
   }
 
@@ -110,7 +112,6 @@ $(function () {
     // initScroll("subMenu","Y",2)
   }
   function iframeShow(title) {
-    console.log(title)
     if (title === '医嘱信息') {
       $("#pacsIframeIn,#assistIframeIn,#pacsDetailIframeIn,#contentNursing").css("display", "none")
       $("#contentIframeIn").css({ display: 'block' }).attr("src", 'advice.html').contents().find(".adviceWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
@@ -152,8 +153,24 @@ $(function () {
         const info = Object.assign(beHospital, result);
         initMenu(JSON.parse(result.menuData));
         // $(".sub-menu>ul>li:first-child.page,.menu-mini>ul>li:first-child.page").addClass("active");
-        $(".subMenu >li:first-child.page,.menu-mini>ul>li:first-child.page").addClass("active");
-        global_activeTab = $(".sub-menu .page.active").attr("code");
+        if (form == 44) {
+          //选中样式
+          $(".sub-menu .active,.menu-mini .active").removeClass('active');
+          const mItems = $(".sub-menu .page[code=" + '查房记录' + "],.menu-mini .page[code=" + '查房记录' + "]");
+          mItems.addClass("active");
+          mItems.parents(".list-1").addClass("active");
+          mItems.parents(".list-1").addClass("slide-up");
+          mItems.parents("ul").show()
+          //  //显示对应内容
+          getQcCasesEntry();
+          //initModuleData();
+          global_activeTab = $(".sub-menu .page.active").attr("code");
+          showFlawList();
+          $("#contentInfo").scrollTop(0)
+        } else {
+          $(".subMenu >li:first-child.page,.menu-mini>ul>li:first-child.page").addClass("active");
+          global_activeTab = $(".sub-menu .page.active").attr("code");
+        }
         $(".operation").show()
         initPatientInfo(info);
         initContent(result.pageData);
@@ -324,8 +341,13 @@ $(function () {
   function initList(data, type) {
     //$("#flawTotalList").tmpl({title:"缺陷总览",data:data}).appendTo(".flaw-table");
     formatSpecPage(data, "缺陷总览", type);
-    $(".flaw-table").show();
-    $(".flaw-table .page-item[code=" + global_activeTab + "]").show();
+    if (form == 44) {
+      $(".flaw-table").hide();
+      $(".flaw-table .page-item[code=" + global_activeTab + "]").hide();
+    } else {
+      $(".flaw-table").show();
+      $(".flaw-table .page-item[code=" + global_activeTab + "]").show();
+    }
     $(".slide-up").off("click").on("click", function () {
       const name = $(this).text();
       $("tr[code='" + name + "']").slideToggle();
@@ -335,10 +357,9 @@ $(function () {
 
   //评分项数据填充
   function initScoreItem(data) {
-    
+
     $("#flaws .flaw-box").html("");
     for (let k in data) {
-      console.log(data[k]);
       $("#flawTmpl").tmpl(data[k]).appendTo("#flaws .flaw-box");
     }
     showFlawList();
@@ -346,6 +367,7 @@ $(function () {
       const i = $(".flaw-item[code=" + global_activeTab + "]").index($(this).parents(".flaw-item"));
       const code = $(this).attr("code");
       showModal('0', code, i);  //申诉
+
       //审核人下拉渲染
       $("#delModal .checker-drop-box ul").html("");
       $("#flawDropTmpl").tmpl({ info: global_checkers }).appendTo("#delModal .checker-drop-box ul");
@@ -397,6 +419,7 @@ $(function () {
   //新增申诉
   function addScore(info) {
     let param = {};
+    console.log(info);
     if (info.type === '1') {
       param = {
         "appealExplain": info.appealExec,
@@ -407,10 +430,14 @@ $(function () {
         "casesEntryMsg": info.msg,
         "casesEntryName": info.standardMsg,
         "checkId": info.userId,
-        "casesId": info.modeId,
+        "casesId": info.casesId,
         "modeName": info.modelName,
         "remark": info.explainInfo,
         "value": info.score,
+        "casesScore": info.caseScore,
+        "score": info.score,
+        "msg": info.msg,
+        "isReject": info.isReject,
       };
     } else {
       param = {
@@ -419,7 +446,6 @@ $(function () {
         "appealType": 1,
         "behospitalCode": global_id,
         "checkId": info.userId,
-        "casesId": info.modelId,
         "modeName": info.modelName,
         "remark": info.explainInfo
       };
@@ -440,7 +466,7 @@ $(function () {
     });
   }
 
-  function getAppealDetail(id, flg,casesEntryId,qcresultDetailId) {
+  function getAppealDetail(id, flg, casesEntryId, qcresultDetailId) {
     const param = {
       behospitalCode: global_id,
       casesEntryId: casesEntryId,
@@ -462,7 +488,7 @@ $(function () {
   }
 
   //申诉弹窗
-  function showModal(flag, code, i,id,qcresultDetailId) {
+  function showModal(flag, code, i, id, qcresultDetailId) {
     $("#delModal .modal-body").html("");
     $("#delModal").show();
     //事件解绑
@@ -472,7 +498,18 @@ $(function () {
 
     if (flag === '0') {   //申诉
       const flawsList = formatFlawKeys(global_flawData);
-      const info = flawsList[global_activeTab] && flawsList[global_activeTab][i];
+      const info = JSON.parse(JSON.stringify(flawsList[global_activeTab])) && JSON.parse(JSON.stringify(flawsList[global_activeTab][i]))
+      if (info.appealOperationType == 1) {
+        if (info.exampleStatus == 2) {
+          info.appealOperationType = 0
+        } else {
+          info.appealOperationType = 1
+        }
+      } else if (info.appealOperationType == 3) {
+        info.appealOperationType = 0
+      } else if (info.isDeleted == 'Y') {
+        info.appealOperationType = 3
+      }
       $("#delModal .title").text("申诉");
       $("#delModal .modal-box").css("margin-top", "-215px");
       $("#editTmpl").tmpl(info).appendTo("#delModal .modal-body");
@@ -494,25 +531,26 @@ $(function () {
           return;
         }
       });
-      console.log(info);
+
       $("#delModal .confirm").unbind("click").click(function () {
         if ($(".edit-box .warning").is(":visible")) {
           return;
         }
-        
         const obj = {
           appealExplain: $("#delModal #qcInfo").val(),
-          appealOperationType: 0,
+          appealOperationType: info.appealOperationType ? info.appealOperationType : 0,
           appealType: 1,
           checkId: $(".checker-drop-input").attr("code"),
           modeId: info.modelId,
           modeName: info.modelName,
           qcresultDetailId: info.id,
           workFlowNodeId: 1,
-          casesScore:info.casesScore,
-          casesEntryId:info.casesEntryId,
-          casesId:info.casesId,
-          isReject:info.isReject,
+          casesScore: info.casesScore,
+          casesEntryId: info.casesEntryId,
+          casesId: info.casesId,
+          isReject: info.isReject,
+          qcresultDetaiValue: info.score,
+          qcresultDetailMsg:info.standardMsg
         };
         appealItem(obj);
       });
@@ -522,7 +560,7 @@ $(function () {
       $("#delModal .modal-box").css("margin-top", '-245px');
       //0申诉1驳回2审核
       //新增项模板
-      getAppealDetail(code, i,id,qcresultDetailId);
+      getAppealDetail(code, i, id, qcresultDetailId);
     } else if (flag === '2') {   //新增
       $("#delModal .title").text("申诉新增");
       $("#delModal .modal-box").css("margin-top", "-281px");
@@ -641,7 +679,7 @@ $(function () {
     const param = {};
     post(api.getReviewer, param).then(function (res) {
       if (res.data.code === '0') {
-        const data = res.data.data; console.log(223, data)
+        const data = res.data.data;
         global_checkers = data;
         $("#delModal .checker-drop-box ul").html("");
         $("#flawDropTmpl").tmpl({ info: data }).appendTo("#delModal .checker-drop-box ul");
@@ -678,7 +716,8 @@ $(function () {
   }
   //审核人下拉事件
   function userDropEvent(domSelector, selectEvent) {
-    $("body").on("click", domSelector, function () {
+    $("body").on("click", domSelector, function (e) {
+      e.stopPropagation()
       $(domSelector).parents(".drop-box").toggleClass("show");
     });
     $("body").on("click", ".checker-drop-box li", function () {
@@ -689,6 +728,10 @@ $(function () {
       $(domSelector).parents(".drop-box").removeClass("show");
     });
   }
+  $(document).on("click", function () {
+    $(".checker-drop-box").removeClass("show");
+
+  })
   //增加条目弹窗元素事件
   function flawDropEvent(domSelector, getData, selectEvent) {
     $("body").off("click,blur,input");

src/js/index.js

@@ -347,7 +347,6 @@ function getAuditNumber() {
   })
 }
 function initMenu(data, userInfo) {
-  console.log(data);
   //菜单数据填充
   $(".menu ul").html("");
   $(".menu-mini ul").html("");
@@ -460,9 +459,6 @@ function getMenu() {
         data.menuWrappers[i].isPlacefile = isPlacefile
       }
       for (let i = 0; i < data.menuWrappers.length; i++) {
-        if (isPlacefile === '0' && data.menuWrappers[i].code === 'YH-ZKHC') {
-          $(".YH-ZKHC").hide()
-        }
         if (data.menuWrappers[i].code === 'YH-SSXX') {
           data.menuWrappers[i].num = auditNumber
           for (let j = 0; j < data.menuWrappers[i].subMenuList.length; j++) {
@@ -477,7 +473,14 @@ function getMenu() {
       setCookie("hospital", data.basHospitalInfoDTO.name)
       setCookie("hospitalid", data.basHospitalInfoDTO.id)
       getAllCode(data.menuWrappers);
-
+      for (let i = 0; i < data.menuWrappers.length; i++) {
+        console.log(isPlacefile);
+        if (isPlacefile === '0' && data.menuWrappers[i].code === 'YH-ZKHC') {
+          console.log(123);
+          $(".menuList .YH-ZKHC").hide()
+        }
+        
+      }
     }
   })
 };

src/js/qcScore.js

@@ -25,7 +25,7 @@ $(function(){
   let global_flawData = {};    //缺陷数据
   let global_flawDataPay = {};    //缺陷数据
   const global_id=getUrlArgObject("id");
-  const global_age = getUrlArgObject("age");
+  const global_hid = getUrlArgObject("hid");
   let global_check;
   let global_check_home,global_check_show;
   const global_code = getUrlArgObject("code");
@@ -44,6 +44,12 @@ $(function(){
     });
   }
 
+  function showAppealDetailEvent() {
+    //申诉状态点击事件
+    $(".flaw-item").off("click").on("click", ".title .btn", function () {
+      showModal("5", $(this).attr("data_id"), $(this).attr("data_type"), $(this).attr("data_casesEntryId"), $(this).attr("data_qcresultDetailId"));
+    });
+  }
 function initMenu(data){
   const menu=[{id:0,name:"缺陷总览",parentId: -1,sonMode: []},...(data||[])];
   //菜单数据填充
@@ -122,7 +128,6 @@ function initMenu(data){
   // initScroll("subMenu","Y",2)
 }
 function iframeShow(title){
-  console.log(title)
   if(title === '医嘱信息'){
     $("#pacsIframeIn,#assistIframeIn,#pacsDetailIframeIn,#contentNursing").css("display","none")
     $("#contentIframeIn").css({display:'block'}).attr("src",'advice.html').contents().find(".adviceWrp").height(window.innerHeight-$("#patientInfo").height()-20+'px')
@@ -363,6 +368,7 @@ function initScoreItem(data){
   let hasAu = showCheckBtns&&global_check_show&&hasData('FUNC000013');    //修改缺陷权限
   let hasAu2 = showCheckBtns&&global_check_show&&hasData('FUNC000012');   //删除缺陷权限
   for(let k in data){
+    console.log(data[k],111);
     $("#flawTmpl").tmpl(data[k]).appendTo("#flaws .flaw-box");
   }
   showFlawList();
@@ -406,6 +412,7 @@ function showFlawList(){
   }else{
     $("#flaws .empty").length?$("#flaws .empty").show():$("#emptyTmpl").tmpl().appendTo("#flaws .flaw-box");
   }
+  showAppealDetailEvent();
 }
 
 //删除评分项
@@ -488,7 +495,7 @@ function addScore(info){
 
 
 //显示删除/修改弹窗
-function showModal(flag,code,i){
+function showModal(flag, code, i, id, qcresultDetailId){
   $("#delModal .modal-body").html("");
   $("#delModal").show();
   $("#delModal .cancel").hide();
@@ -545,9 +552,16 @@ function showModal(flag,code,i){
         return;
       }
       const obj = Object.assign({},info,{explainInfo:$("#delModal #qcInfo").val(),msg:$("#delModal #qcMsg").val(),score:$("#delModal #qcScore").val()});
-      console.log(212,$("#delModal #qcInfo").val())
       editScore(obj);
     });
+  }else if (flag === '5') {   //查看
+    $("#delModal .title").text("查看");
+    $("#delModal .confirm").hide();
+    $("#delModal .cancel").show();
+    $("#delModal .modal-box").css("margin-top", '-245px');
+    //0申诉1驳回2审核
+    //新增项模板
+    getAppealDetail(code, i, id, qcresultDetailId);
   }else if(flag==='2'){   //新增
     $("#delModal .title").text("新增");
     $("#delModal .confirm").text("保存");
@@ -639,6 +653,26 @@ function showModal(flag,code,i){
     });
   }
 }
+function getAppealDetail(id, flg, casesEntryId, qcresultDetailId) {
+  const param = {
+    behospitalCode: global_id,
+    casesEntryId: casesEntryId,
+    hospitalId: global_hid,
+    qcresultDetailId: qcresultDetailId,
+    id: +id
+  };
+  post(api.getApprovedView, param).then((res) => {
+    const info = res.data.data.data || {};
+    const appealInfo = info.appealExamineRecordDTOList;
+    $("#appealStatusTmpl").tmpl(appealInfo).appendTo("#delModal .modal-body");
+    /*if (flg === '1') {
+      $(".check-item").hide();
+      $(".reject-item").show();
+    } else if (flg === '2') {
+      $(".check-item").show();
+    }*/
+  })
+}
 //缺陷列表key值去掉特殊符号
 function formatFlawKeys(data){
     const obj = {};
@@ -775,7 +809,6 @@ function formatFlawKeys(data){
 
   //基础类型结构生成
   function simpleStructure(data,obj){
-    console.log(data,obj,7878787)
     const {name, val,monoLine,addLine,position,bold,retract,id} = data;
     if(name==="手术记录表格-1"){
       const value = val.replace("【","").replace("】","");

webpack.config.js

@@ -7,7 +7,7 @@ const CopyWebpackPlugin = require('copy-webpack-plugin');
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
 const webpack = require('webpack');
 const glob = require('glob');
-const proxyHost = "http://192.168.2.236:5858";
+const proxyHost = "http://192.168.2.241:5858";
 // const proxyHost = "http://192.168.2.241:5858";
 // const proxyHost = "http://192.168.4.222:5858";
 // const proxyHost = "http://192.168.3.117:5858";//铁钢