zhouna 4 роки тому
батько
коміт
b3e39a8762

+ 26 - 2
src/css/creatCheckTask.less

@@ -189,7 +189,7 @@ h2{
     width: 160px;
     max-height: 400px;
 }
-.levelList,.checkList{
+.levelList,.checkList,.statusList{
     width: 120px;
     // height: 200px;
     li:hover{
@@ -197,7 +197,7 @@ h2{
         cursor: pointer;
     }
 }
-.selectLevel,.selectDept,.fpSelectCheck,.qcSelectCheck{
+.selectLevel,.selectDept,.selectStatus{
     display: inline-block;
     position: relative;
     width:120px;
@@ -382,6 +382,30 @@ h2{
     border-right: 6px solid #4D4D4D;
 }
 
+.tabBox {
+    .tab{
+        display: inline-block;
+        padding: 5px 10px;
+        cursor: pointer;
+        .active{
+            color: #00A1FF;
+        }
+    }
+    .creatTask{
+        width: 80px;
+        height: 32px;
+        background: #00A1FF;
+        border-radius: 4px;
+        color: #fff;
+        text-align: center;
+        line-height: 32px;
+        position: relative;
+        top: 2px;
+        cursor: pointer;
+        float: left;
+        margin: 0 0px 22px 0;
+    }
+}
 
 
 

+ 14 - 11
src/css/qcScore.less

@@ -543,20 +543,23 @@
       .opers{
         padding-right: 5px;
       }
+      .info{
+        p{
+          font-size: 12px;
+        }
+
+        .name{
+          max-width: 100px;
+        }
+      }
+      .delete{
+        text-decoration: line-through;
+      }
       .title{
         box-sizing: border-box;
         padding:5px;
-        .add-icon{
-          font-size: 12px;
-          display: inline-block;
-          text-align: center;
-          width:32px;
-          height:14px;
-          line-height: 14px;
-          color: #FFAD00;
-          border:1px #FFAD00 solid;
-          border-radius:8px;
-          margin-right: 6px;
+        img{
+          vertical-align: middle;
         }
       }
       &.active .title{

+ 38 - 40
src/html/checkTaskList.html

@@ -16,8 +16,8 @@
         <div class="clearfix">
         <span class="filterItem">
             <span>病历核查状态:</span>
-            <span class="selectLevel">全部</span>
-            <ul class="levelList filterDropList">
+            <span class="selectStatus">全部</span>
+            <ul class="statusList filterDropList">
                 <li class="levelItem" data-name="乙" data-id=乙>已核查</li>
                 <li class="levelItem" data-name="丙" data-id=丙>未核查</li>
             </ul>
@@ -27,25 +27,25 @@
             <input type="text" class="selectDept canEditDept" value="全部">
             <ul class="deptList filterDropList"></ul>
         </span>
-            <span class="filterItem typeFilter deptListWrap">
+            <span class="filterItem">
             <span>病人姓名:</span>
             <input type="text" placeholder="病人姓名">
         </span>
-            <span class="filterItem typeFilter deptListWrap">
+            <span class="filterItem">
             <span>病人住院序号:</span>
             <input type="text" placeholder="病人住院序号">
         </span>
-            <span class="filterItem typeFilter deptListWrap">
+            <span class="filterItem">
             <span>医生:</span>
             <input type="text" placeholder="医生">
         </span>
-            <span class="filterItem typeFilter clearfix" >
+        <span class="filterItem typeFilter clearfix" >
             <span class="fl">分配日期:</span>
             <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" readonly /></span>
-                        <span  class="divide fl">-</span>
-                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" readonly/></span>
+            <span  class="divide fl">-</span>
+            <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" readonly/></span>
         </span>
-            <span class="filterItem">
+        <span class="filterItem">
             <span>病历等级:</span>
             <span class="selectLevel">全部</span>
             <ul class="levelList filterDropList">
@@ -62,38 +62,36 @@
         </div>
 
     </div>
-        <div class="tabBox">
-            <div class="overAuto">
-                <table class="qctable">
-                    <thead>
-                    <tr class="tabTitle">
-                        <th class="beHospitalId textCenter" code="behospital_code">病人住院序号</th>
-                        <th class="scoreTime textCenter" code="grade_time">任务月份</th>
-                        <th class="doctorName textCenter" code="beh_doctor_name">病历核查状态</th>
-                        <th class="deptName textCenter">科室</th>
-                        <th class="patientName textCenter" code="name" style="width: 100px;">病人姓名</th>
-                        <th class="patientNo textCenter" code="file_code">病案号</th>
-                        <th class="doctorName textCenter">主管医生</th>
-                        <th class="outHospitalDate textCenter desc" code="leave_hospital_date">出院日期</th>
-                        <th class="inHospitalDate textCenter" code="behospital_date">分配日期</th>
-                        <th class="patientSex textCenter" code="sex">核查日期</th>
-                        <th class="patientage textCenter">核查员</th>
-                        <th class="bedNum textCenter" code="bed_code">任务数</th>
-                        <th class="recordLevel textCenter" code="level">病历等级</th>
-                        <th class="recordScore textCenter" code="score_res">病历得分</th>
-                        <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th>
-                    </tr>
-                    </thead>
-                    <tbody class="tbody">
+         <div class="overAuto">
+             <table class="qctable">
+                 <thead>
+                 <tr class="tabTitle">
+                     <th class="beHospitalId textCenter" code="behospital_code">病人住院序号</th>
+                     <th class="scoreTime textCenter" code="grade_time">任务月份</th>
+                     <th class="doctorName textCenter" code="beh_doctor_name">病历核查状态</th>
+                     <th class="deptName textCenter">科室</th>
+                     <th class="patientName textCenter" code="name" style="width: 100px;">病人姓名</th>
+                     <th class="patientNo textCenter" code="file_code">病案号</th>
+                     <th class="doctorName textCenter">主管医生</th>
+                     <th class="outHospitalDate textCenter desc" code="leave_hospital_date">出院日期</th>
+                     <th class="inHospitalDate textCenter" code="behospital_date">分配日期</th>
+                     <th class="patientSex textCenter" code="sex">核查日期</th>
+                     <th class="patientage textCenter">核查员</th>
+                     <th class="bedNum textCenter" code="bed_code">任务数</th>
+                     <th class="recordLevel textCenter" code="level">病历等级</th>
+                     <th class="recordScore textCenter" code="score_res">病历得分</th>
+                     <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th>
+                 </tr>
+                 </thead>
+                 <tbody class="tbody">
 
-                    </tbody>
-                    <tfoot>
-                    </tfoot>
-                </table>
-            </div>
-            <div class="pagination"></div>
-        </div>
-    </div>
+                 </tbody>
+                 <tfoot>
+                 </tfoot>
+             </table>
+         </div>
+         <div class="pagination"></div>
+     </div>
 </div>
 </body>
 

+ 35 - 19
src/html/creatCheckTask.html

@@ -17,47 +17,54 @@
                 <div class="clearfix">
                      <span class="filterItem typeFilter clearfix" >
                         <span class="fl">出院日期:</span>
-                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" readonly /></span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off"/></span>
                         <span  class="divide fl">-</span>
-                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" readonly/></span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off"/></span>
                     </span>
                     <span class="filterItem">
                         <span>生成状态:</span>
-                        <span class="selectLevel">全部</span>
-                        <ul class="levelList filterDropList">
-                            <li class="levelItem" data-name="乙" data-id=乙>未生成</li>
-                            <li class="levelItem" data-name="丙" data-id=丙>已生成</li>
+                        <span class="selectStatus">
+                            <i>全部</i>
+                            <img class="arrow" src="./../images/arrow_down.png" alt="下拉">
+                        </span>
+                        <ul class="statusList filterDropList">
+                            <li class="statusItem" data-name="未生成" data-id='0'>未生成</li>
+                            <li class="statusItem" data-name="已生成" data-id='1'>已生成</li>
                         </ul>
                     </span>
-                    <span class="filterItem typeFilter deptListWrap">
+                    <span class="filterItem typeFilter">
                         <span>病人姓名:</span>
-                        <input type="text" placeholder="病人姓名">
+                        <input class="patientName" type="text" placeholder="病人姓名">
                     </span>
-                    <span class="filterItem typeFilter deptListWrap">
+                    <span class="filterItem typeFilter">
                         <span>病人住院序号:</span>
-                        <input type="text" placeholder="病人住院序号">
+                        <input class="patientNumInp" type="text" placeholder="病人住院序号">
                     </span>
                      <span class="filterItem typeFilter deptListWrap">
                         <span>科室:</span>
                         <input type="text" class="selectDept canEditDept" value="全部">
+                         <img class="arrow" src="./../images/arrow_down.png" alt="下拉">
                         <ul class="deptList filterDropList"></ul>
                     </span>
-                    <span class="filterItem typeFilter deptListWrap">
+                    <span class="filterItem typeFilter">
                         <span>住院天数:</span>
-                        <input class="mini-inp" type="text"> -
-                        <input class="mini-inp" type="text"> 天
+                        <input class="mini-inp dayMin" type="text"> -
+                        <input class="mini-inp dayMax" type="text"> 天
                     </span>
-                    <span class="filterItem typeFilter deptListWrap">
+                    <span class="filterItem typeFilter">
                         <span>医生:</span>
-                        <input type="text" placeholder="医生">
+                        <input class="doctorInp" type="text" placeholder="医生">
                     </span>
-                    <span class="filterItem typeFilter deptListWrap">
+                    <span class="filterItem typeFilter">
                         <span>主诊断:</span>
-                        <input type="text" placeholder="主诊断">
+                        <input class="mainDiag" type="text" placeholder="主诊断">
                     </span>
                      <span class="filterItem">
                         <span>病历等级:</span>
-                        <span class="selectLevel">全部</span>
+                        <span class="selectLevel">
+                            <i>全部</i>
+                            <img class="arrow" src="./../images/arrow_down.png" alt="下拉">
+                        </span>
                         <ul class="levelList filterDropList">
                             <Li class="levelItem" data-name="全部" data-id="全部">全部</Li>
                             <Li class="levelItem" data-name="未评分" data-id="未评分">未评分</Li>
@@ -71,6 +78,15 @@
                     <!--<span class="export">导出</span>-->
                 </div>
             </div>
+            <div class="tabBox">
+                <div class="tabs">
+                    <ul>
+                        <li class="tab"><button class="active" data-code="1">科室任务</button></li>
+                        <li class="tab"><button data-code="2">质控科任务</button></li>
+                        <li class="tab"><button data-code="3">院级任务</button></li>
+                    </ul>
+                </div>
+                <button class="creatTask">生成任务</button>
             <div class="overAuto">
                 <table class="qctable">
                     <thead>
@@ -102,7 +118,7 @@
 
             <div class="pagination"></div>
         </div>
-
+        </div>
     </div>
 </body>
 

+ 14 - 5
src/html/qcScore.html

@@ -48,6 +48,9 @@
         {{if hasCheck}}
         <span class="check">${checkState===1 ? "重新核查" : "病历核查"}</span>
         {{/if}}
+        {{if showCheckBtns}}
+        <span class="ywCheck">${checkState===1 ? "重新核查" : "完成核查"}</span>
+        {{/if}}
     </script>
     <script type="text/html" id="tableTmpl">
          {{if k==="出院诊断"}}
@@ -142,25 +145,29 @@
         <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 class="title">
                 {{if gradeType===2}}
-                <i class="add-icon">人工</i>
+                <img {{if explainInfo}} title="${explainInfo}" {{/if}} src="../images/tag.png" alt=""/>
                 {{/if}}
                 {{if info}}
-                <a {{if pageKeyList[0]}} anchors="${pageKeyList}" code="${id}" href="#anchor${pageKeyList[0]}" {{/if}}>${msg}(${info})</a>
+                <a {{if pageKeyList[0]}} anchors="${pageKeyList}" {{if isDeleted==="Y"}} class="delete" {{/if}} code="${id}" href="#anchor${pageKeyList[0]}" {{/if}}>${msg}(${info})</a>
                 {{else}}
-                <a {{if pageKeyList[0]}} anchors="${pageKeyList}" code="${id}" href="#anchor${pageKeyList[0]}" {{/if}}>${msg}</a>
+                <a {{if pageKeyList[0]}} anchors="${pageKeyList}" {{if isDeleted==="Y"}} class="delete" {{/if}} code="${id}" href="#anchor${pageKeyList[0]}" {{/if}}>${msg}</a>
                 {{/if}}
             </div>
             <div class="opers clearfix">
                 {{if score===0}}
-                <p class="fl">评分:<span class="red">warn</span></p>
+                <p {{if isDeleted==="Y"}} class="fl delete" {{else}} class="fl" {{/if}}>评分:<span class="red">warn</span></p>
                 {{else}}
-                <p class="fl">评分:<span class="red">-${score}</span></p>
+                <p {{if isDeleted==="Y"}} class="fl delete"{{else}} class="fl" {{/if}}>评分:<span class="red">-${score}</span></p>
                 {{/if}}
                 <div class="oper fr">
                     <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>
                 </div>
             </div>
+            <div class="info clearfix">
+                <p class="fl name" title="${linkman}">${linkman}</p>
+                <p class="fr">${gmtModified}</p>
+            </div>
         </div>
     </script>
     <script type="text/html" id="emptyTmpl">
@@ -176,6 +183,7 @@
             <p><span>提示信息: </span><input id="qcMsg" class="ellipsis" type="text" title="${msg}" value="${msg}" /></p>
             <p><span style="margin-right: 8px">分值: </span> <input id="qcScore" type="text" value="${score}" /></p>
             <p class="warning"><span></span><span class="red">支持≥0的数字输入,最多保留小数点后1位~</span></p>
+            <p><span>备注: </span><input id="qcInfo" class="ellipsis" type="text" title="${explainInfo}" value="${explainInfo}" /></p>
         </div>
     </script>
     <script type="text/html" id="flawDropTmpl">
@@ -194,6 +202,7 @@
             <p><span style="margin-right: 16px;">提示信息:</span><input title="${msg}" class="ellipsis" id="addQcMsg" type="text" value="${msg}" /></p>
             <p><span>分值:</span> <input id="addQcScore" type="text" value="${score}" /></p>
             <p class="warning"><span></span><span class="red">支持≥0的数字输入,最多保留小数点后1位~</span></p>
+            <p><span style="margin-right: 16px;">备注:</span><input title="${explainInfo}" class="ellipsis" id="addQcInfo" type="text" value="${explainInfo}" /></p>
         </div>
     </script>
     <!--<script type="text/html" id="flawTotalList">

BIN
src/images/tag.png


+ 1 - 1
src/js/api.js

@@ -2,7 +2,7 @@ const api = {
   getMenu: '/sys/user/getUserOrgMenu', //获取菜单
   midifyPassword: '/sys/user/midifyPassword', //修改密码
   getSubMenu: '/qc/mode/getMenu', //获取质控评分菜单
-  delScore: '/qc/behospitalInfo/delCase', //删除评分项
+  delScore: '/qc/behospitalInfo/logicDelCase',//'/qc/behospitalInfo/delCase', //删除评分项
   editScore: '/qc/behospitalInfo/updCase', //修改评分
   addScore: '/qc/behospitalInfo/addCase', //添加评分项
   findQcCasesEntry: '/qc/casesEntryHospital/findQcCasesEntry', //条目下拉列表

Різницю між файлами не показано, бо вона завелика
+ 191 - 675
src/js/creatCheckTask.js


+ 37 - 12
src/js/qcScore.js

@@ -22,7 +22,8 @@ $(function(){
   let global_flaws=[];  //缺陷条目列表缓存
   let global_selectedFlaw = {};    //新增时选中的条目信息
   getAllModules();
-  let hasAu3 = hasData('FUNC000011');   //新增缺陷权限
+  let showCheckBtns=global_code==="YH-ZKHC-LBXQ";
+  let hasAu3 = showCheckBtns&&hasData('FUNC000011');   //新增缺陷权限
   if(hasAu3){
     $(".add-flaw").click(function(){
       getQcCasesEntry();
@@ -199,15 +200,18 @@ function changePay(){
 //填充患者信息
 function initPatientInfo(data){
   let hasCheck = false
-  if(hasData("FUNC000014")){
+  if(showCheckBtns&&hasData("FUNC000014")){
     hasCheck = true
   }
-  const obj=Object.assign({},data,{age:!global_age||global_age=="null"?"-":global_age,hasCheck,checkState:global_check,checkStateHome:global_check_home});
+  const obj=Object.assign({},data,{age:!global_age||global_age=="null"?"-":global_age,hasCheck,showCheckBtns,checkState:global_check,checkStateHome:global_check_home});
   
   $("#infoTmpl").tmpl(obj).appendTo("#patientInfo");
   $(".check").on("click", function(){
     checkQc()
   })
+  $(".ywCheck").on("click", function(){
+      checkYwQc()
+  })
 }
 //显示病例模块明细
 function initContent(data){
@@ -336,8 +340,8 @@ function initList(data,type){
 //评分项数据填充
 function initScoreItem(data){
   $("#flaws .flaw-box").html("");
-  let hasAu = hasData('FUNC000013');    //修改缺陷权限
-  let hasAu2 = hasData('FUNC000012');   //删除缺陷权限
+  let hasAu = showCheckBtns&&hasData('FUNC000013');    //修改缺陷权限
+  let hasAu2 = showCheckBtns&&hasData('FUNC000012');   //删除缺陷权限
   for(let k in data){
     $("#flawTmpl").tmpl(data[k]).appendTo("#flaws .flaw-box");
   }
@@ -353,9 +357,9 @@ function initScoreItem(data){
       showModal('1',code,i);
     }
   })
-  $(".edit-flaw").css({"opacity":hasAu?"1":"0.5",cursor:hasAu?"pointer":"unset"});
-  $(".del-flaw").css({"opacity":hasAu2?"1":"0.5",cursor:hasAu2?"pointer":"unset"});
-  $(".add-flaw").css({"opacity":hasAu3?"1":"0.5",cursor:hasAu3?"pointer":"unset"});
+  $(".edit-flaw").css({"display":hasAu?"inline":"none"});
+  $(".del-flaw").css({"display":hasAu2?"inline":"none"});
+  $(".add-flaw").css({"display":hasAu3?"inline":"none"});
   $(".flaw-item .title a[href]").click(function(){
     const id = $(this).attr("href");
     const anchors=$(this).attr("anchors").split(",");
@@ -433,7 +437,8 @@ function addScore(info){
     "info":info.info || "",
     "isReject": info.isReject,
     "msg": info.msg || "",
-    "score": info.score
+    "score": info.score,
+    "explainInfo": info.explainInfo
   }
   const param={
     "behospitalCode": global_id,
@@ -495,7 +500,8 @@ function showModal(flag,code,i){
       if($(".edit-box .warning").is(":visible")){
         return;
       }
-      const obj = Object.assign({},info,{msg:$("#delModal #qcMsg").val(),score:$("#delModal #qcScore").val()});
+      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==='2'){   //新增
@@ -532,10 +538,11 @@ function showModal(flag,code,i){
       }
       const msg=$("#delModal #addQcMsg").val();
       const score=Number($("#delModal #addQcScore").val());
+      const explainInfo=$("#delModal #addQcInfo").val();
       // if($(".add-box .warning").is(":visible")||!msg.trim()||!score){
       //   return;
       // }
-      const obj = Object.assign({},global_selectedFlaw,{msg,score});
+      const obj = Object.assign({},global_selectedFlaw,{msg,score,explainInfo});
       addScore(obj);
     });
   }else{
@@ -788,7 +795,25 @@ function formatFlawKeys(data){
       }
     });
   }
-  
+  function checkYwQc(){
+      const param={
+          behospitalCode:getUrlArgObject("id"),
+          hospitalId:getUrlArgObject("hid"),
+      };
+      post(api.checkQc,param).then((res)=>{
+          if(res.data.code==='0') {
+              if(global_activeTab == '病案首页'){
+                  global_check_home = 1
+              }else{
+                  global_check = 1
+              }
+              $(".check").text("重新核查")
+              $.alerModal({"message":"核查成功",type:"tip",time:'1000',win:true});
+          }else{
+              $.alerModal({"message":res.data.msg ||"核查失败",type:"tip",time:'1000',isFather: false});
+          }
+      });
+  }
 
 });