瀏覽代碼

Merge branch 'v1.3.3' into byll

luolei 5 年之前
父節點
當前提交
364c13a41a
共有 7 個文件被更改,包括 96 次插入17 次删除
  1. 4 3
      src/html/qcList.html
  2. 4 3
      src/html/qcListDept.html
  3. 4 3
      src/html/qcListPerson.html
  4. 3 2
      src/js/qcList.js
  5. 3 2
      src/js/qcListDept.js
  6. 3 2
      src/js/qcListPerson.js
  7. 75 2
      src/js/utils.js

+ 4 - 3
src/html/qcList.html

@@ -68,7 +68,7 @@
                 <table>
                     <thead>
                     <tr>
-                        <td colspan="18" style="background: #fff">
+                        <td colspan="19" style="background: #fff">
                             <div class="tabFoot">
                                 <span class="scoreOpera" data-selectAll=false><img class="iconCheck" src="../images/icon_unchecked.png" alt="checkbox">全选</span>
                                 <span class="recordScoreBtn">评分</span>
@@ -77,6 +77,8 @@
                     </tr>
                     <th class="textCenter" ></th>
                     <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th>
+                    <th class="recordLevel textCenter" code="level">病历等级</th>
+                    <th class="recordScore textCenter" code="score_res">病历得分</th>
                     <th class="beHospitalId textCenter" code="behospital_code">病人住院序号</th>
                     <th class="patientNo textCenter" code="file_code">病案号</th>
                     <th class="patientName textCenter" code="name" style="width: 100px;">病人姓名</th>
@@ -85,13 +87,12 @@
                     <th class="bedNum textCenter" code="bed_code">床号</th>
                     <th class="inHospitalDate textCenter" code="behospital_date">入院日期</th>
                     <th class="outHospitalDate textCenter desc" code="leave_hospital_date">出院日期</th>
+                    <th class="placefileDate textCenter" code="placefile_date">归档日期</th>
                     <th class="diagnose textCenter" code="diagnose">主诊断</th>
                     <th class="doctorName textCenter" code="beh_doctor_name">住院医生</th>
                     <th class="doctorName textCenter" code="doctor_name">主管医生</th>
                     <th class="doctorName textCenter" code="director_doctor_name">主任医生</th>
                     <th class="deptName textCenter" code="beh_dept_name">科室</th>
-                    <th class="recordLevel textCenter" code="level">病历等级</th>
-                    <th class="recordScore textCenter" code="score_res">病历得分</th>
                     <th class="scoreTime textCenter" code="grade_time">评分时间</th>
                     </thead>
                     <tbody>

+ 4 - 3
src/html/qcListDept.html

@@ -68,7 +68,7 @@
                 <table>
                     <thead>
                         <tr>
-                            <td colspan="18" style="background: #fff">
+                            <td colspan="19" style="background: #fff">
                                 <div class="tabFoot">
                                     <span class="scoreOpera" data-selectAll=false><img class="iconCheck" src="../images/icon_unchecked.png" alt="checkbox">全选</span>
                                     <span class="recordScoreBtn">评分</span>
@@ -77,6 +77,8 @@
                         </tr>
                         <th class="textCenter" ></th>
                         <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th>
+                        <th class="recordLevel textCenter" code="level">病历等级</th>
+                        <th class="recordScore textCenter" code="score_res">病历得分</th>
                         <th class="beHospitalId textCenter" code="behospital_code">病人住院序号</th>
                         <th class="patientNo textCenter" code="file_code">病案号</th>
                         <th class="patientName textCenter" code="name" style="width: 100px;">病人姓名</th>
@@ -85,13 +87,12 @@
                         <th class="bedNum textCenter" code="bed_code">床号</th>
                         <th class="inHospitalDate textCenter" code="behospital_date">入院日期</th>
                         <th class="outHospitalDate textCenter desc" code="leave_hospital_date">出院日期</th>
+                        <th class="placefileDate textCenter" code="placefile_date">归档日期</th>
                         <th class="diagnose textCenter" code="diagnose">主诊断</th>
                         <th class="doctorName textCenter" code="beh_doctor_name">住院医生</th>
                         <th class="doctorName textCenter" code="doctor_name">主管医生</th>
                         <th class="doctorName textCenter" code="director_doctor_name">主任医生</th>
                         <th class="deptName textCenter" code="beh_dept_name">科室</th>
-                        <th class="recordLevel textCenter" code="level">病历等级</th>
-                        <th class="recordScore textCenter" code="score_res">病历得分</th>
                         <th class="scoreTime textCenter" code="grade_time">评分时间</th>
                     </thead>
                     <tbody>

+ 4 - 3
src/html/qcListPerson.html

@@ -67,7 +67,7 @@
                 <table>
                     <thead>
                         <tr>
-                            <td colspan="18" style="background: #fff">
+                            <td colspan="19" style="background: #fff">
                                 <div class="tabFoot">
                                     <span class="scoreOpera" data-selectAll=false><img class="iconCheck" src="../images/icon_unchecked.png" alt="checkbox">全选</span>
                                     <span class="recordScoreBtn">评分</span>
@@ -76,6 +76,8 @@
                         </tr>
                         <th class="textCenter" ></th>
                         <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th>
+                        <th class="recordLevel textCenter" code="level">病历等级</th>
+                        <th class="recordScore textCenter" code="score_res">病历得分</th>
                         <th class="beHospitalId textCenter" code="behospital_code">病人住院序号</th>
                         <th class="patientNo textCenter" code="file_code">病案号</th>
                         <th class="patientName textCenter" code="name" style="width: 100px;">病人姓名</th>
@@ -84,13 +86,12 @@
                         <th class="bedNum textCenter" code="bed_code">床号</th>
                         <th class="inHospitalDate textCenter" code="behospital_date">入院日期</th>
                         <th class="outHospitalDate textCenter desc" code="leave_hospital_date">出院日期</th>
+                        <th class="placefileDate textCenter" code="placefile_date">归档日期</th>
                         <th class="diagnose textCenter" code="diagnose">主诊断</th>
                         <th class="doctorName textCenter" code="beh_doctor_name">住院医生</th>
                         <th class="doctorName textCenter" code="doctor_name">主管医生</th>
                         <th class="doctorName textCenter" code="director_doctor_name">主任医生</th>
                         <th class="deptName textCenter" code="beh_dept_name">科室</th>
-                        <th class="recordLevel textCenter" code="level">病历等级</th>
-                        <th class="recordScore textCenter" code="score_res">病历得分</th>
                         <th class="scoreTime textCenter" code="grade_time">评分时间</th>    
                     </thead>
                     <tbody>

+ 3 - 2
src/js/qcList.js

@@ -214,6 +214,8 @@ function renderTab(data,hisId){
             <tr  data-index=${i}>
                 <td class="scoreOperaItem textCenter">${item.hasSelect ? `<img class="iconCheck" src=${iconCheck} />`:`<img class="iconCheck" src=${iconUnCheck} />`}</td>
                 <td  class="recordScoreOperaBtn textCenter" style="opacity:${hasData('FUNC000017')?'1':'0.5'}">评分</td>
+                <td  class="textCenter">${item.level || "-"}</td>
+                <td  class="textCenter">${item.scoreRes || "-"}</td>
                 <td >${item.behospitalCode || "-"}</td>
                 <td>${item.fileCode || "-"}</td>
                 <td  class="textCenter"><span data-index=${i} class="patientNameSpan">${item.name || "-"}<span></td>
@@ -222,13 +224,12 @@ function renderTab(data,hisId){
                 <td  class="textCenter">${item.bedCode || "-"}</td>
                 <td  class="textCenter">${item.behospitalDate&&item.behospitalDate.slice(0,10) || "-"}</td>
                 <td  class="textCenter">${item.leaveHospitalDate&&item.leaveHospitalDate.slice(0,10)|| "-"}</td>
+                <td  class="textCenter">${item.placefileDate&&item.placefileDate.slice(0,10)|| "-"}</td>
                 <td  class="textCenter">${item.diagnose|| "-"}</td>
                 <td  class="textCenter">${item.behDoctorName   || "-"}</td>
                 <td  class="textCenter">${item.doctorName || "-"}</td>
                 <td  class="textCenter">${item.directorDoctorName || "-"}</td>
                 <td  class="textCenter">${item.behDeptName || "-"}</td>
-                <td  class="textCenter">${item.level || "-"}</td>
-                <td  class="textCenter">${item.scoreRes || "-"}</td>
                 <td  class="textCenter">${item.gradeTime&&item.gradeTime.slice(0,10) || "-"}</td>
             </tr>
         `

+ 3 - 2
src/js/qcListDept.js

@@ -231,6 +231,8 @@ function renderTab(data){
             <tr  data-index=${i}>
                 <td class="scoreOperaItem textCenter">${item.hasSelect ? `<img class="iconCheck" src=${iconCheck} />`:`<img class="iconCheck" src=${iconUnCheck} />`}</td>
                 <td  class="recordScoreOperaBtn textCenter" style="opacity:${hasData('FUNC000017')?'1':'0.5'}">评分</td>
+                <td  class="textCenter">${item.level || "-"}</td>
+                <td  class="textCenter">${item.scoreRes || "-"}</td>
                 <td >${item.behospitalCode || "-"}</td>
                 <td>${item.fileCode || "-"}</td>
                 <td  class="textCenter"><span  data-index=${i} class="patientNameSpan">${item.name || "-"}<span></td>
@@ -239,13 +241,12 @@ function renderTab(data){
                 <td  class="textCenter">${item.bedCode || "-"}</td>
                 <td  class="textCenter">${item.behospitalDate&&item.behospitalDate.slice(0,10) || "-"}</td>
                 <td  class="textCenter">${item.leaveHospitalDate&&item.leaveHospitalDate.slice(0,10)|| "-"}</td>
+                <td  class="textCenter">${item.placefileDate&&item.placefileDate.slice(0,10)|| "-"}</td>
                 <td  class="textCenter">${item.diagnose|| "-"}</td>
                 <td  class="textCenter">${item.behDoctorName   || "-"}</td>
                 <td  class="textCenter">${item.doctorName || "-"}</td>
                 <td  class="textCenter">${item.directorDoctorName || "-"}</td>
                 <td  class="textCenter">${item.behDeptName || "-"}</td>
-                <td  class="textCenter">${item.level || "-"}</td>
-                <td  class="textCenter">${item.scoreRes || "-"}</td>
                 <td  class="textCenter">${item.gradeTime&&item.gradeTime.slice(0,10) || "-"}</td>
             </tr>
         `

+ 3 - 2
src/js/qcListPerson.js

@@ -230,6 +230,8 @@ function renderTab(data){
             <tr  data-index=${i}>
                 <td class="scoreOperaItem textCenter">${item.hasSelect ? `<img class="iconCheck" src=${iconCheck} />`:`<img class="iconCheck" src=${iconUnCheck} />`}</td>
                 <td  class="recordScoreOperaBtn textCenter" style="opacity:${hasData('FUNC000017')?'1':'0.5'}">评分</td>
+                <td  class="textCenter">${item.level || "-"}</td>
+                <td  class="textCenter">${item.scoreRes || "-"}</td>
                 <td >${item.behospitalCode || "-"}</td>
                 <td>${item.fileCode || "-"}</td>
                 <td  class="textCenter"><span  data-index=${i} class="patientNameSpan">${item.name || "-"}<span></td>
@@ -238,13 +240,12 @@ function renderTab(data){
                 <td  class="textCenter">${item.bedCode || "-"}</td>
                 <td  class="textCenter">${item.behospitalDate&&item.behospitalDate.slice(0,10) || "-"}</td>
                 <td  class="textCenter">${item.leaveHospitalDate&&item.leaveHospitalDate.slice(0,10)|| "-"}</td>
+                <td  class="textCenter">${item.placefileDate&&item.placefileDate.slice(0,10)|| "-"}</td>
                 <td  class="textCenter">${item.diagnose|| "-"}</td>
                 <td  class="textCenter">${item.behDoctorName   || "-"}</td>
                 <td  class="textCenter">${item.doctorName || "-"}</td>
                 <td  class="textCenter">${item.directorDoctorName || "-"}</td>
                 <td  class="textCenter">${item.behDeptName || "-"}</td>
-                <td  class="textCenter">${item.level || "-"}</td>
-                <td  class="textCenter">${item.scoreRes || "-"}</td>
                 <td  class="textCenter">${item.gradeTime&&item.gradeTime.slice(0,10) || "-"}</td>
             </tr>
         `

+ 75 - 2
src/js/utils.js

@@ -276,7 +276,7 @@ function focusMenuItem(code){
   ele.click();
 }
 function emptyBox(name){
-  let str = `<tr><td colspan="18" style="text-align: center;color: #aaa">
+  let str = `<tr><td colspan="19" style="text-align: center;color: #aaa">
   <img style="margin-top:50px;width:100px;" src="${require('../images/empty1.png')}" />
   <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">${name||'暂无数据~'}</p>
   </td></tr>`
@@ -296,6 +296,77 @@ function setTitleTxt(dom,from){
     $(dom?dom:".partTitle").find("a").remove()
   }
 }
+
+//mode=1:本月,mode=2:本年 startDateDefault:mode不等于1和2开始日期,endDateDefault:mode不等于1和2结束日期
+function setDatePicker(picker1,picker2,mode,startDateDefault,endDateDefault){
+  $.datepicker.regional['zh-CN'] = {
+    clearText: '清除',
+    clearStatus: '清除已选e799bee5baa6e59b9ee7ad9431333361303131日期',
+    closeText: '关闭',
+    closeStatus: '不改变当前选择',
+    prevText: '<上月',
+    prevStatus: '显示上月',
+    prevBigText: '<<',
+    prevBigStatus: '显示上一年',
+    nextText: '下月>',
+    nextStatus: '显示下月',
+    nextBigText: '>>',
+    nextBigStatus: '显示下一年',
+    currentText: '今天',
+    currentStatus: '显示本月',
+    monthNames: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
+    monthNamesShort: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
+    yearNamesShort: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
+    monthStatus: '选择月份',
+    yearStatus: '选择年份',
+    weekHeader: '周',
+    weekStatus: '年内周次',
+    dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
+    dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
+    dayNamesMin: ['日','一','二','三','四','五','六'],
+    dayStatus: '设置 DD 为一周起始',
+    dateStatus: '选择 m月 d日, DD',
+    dateFormat: 'yy-mm-dd',
+    firstDay: 1,
+    initStatus: '请选择日期',
+    isRTL: false};
+    $.datepicker.setDefaults($.datepicker.regional['zh-CN']);
+    let startDate = "", endDate=new Date()
+    let year = new Date().getFullYear()
+    let month = new Date().getMonth() + 1
+    if(mode == '1'){
+        startDate = new Date(`${year}-${month}-01`)
+    }else if(mode == '2'){
+        startDate = new Date(`${year}-01-01`)
+    } else {
+        startDate = startDateDefault || new Date()
+        endDate = endDateDefault || new Date()
+    }
+    picker1.datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd",
+    }).datepicker( "setDate", startDate);
+    picker2.datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate",endDate);
+}
+
+  //mode=1获取开始时间,mode=1获取结束时间
+function getPickerDate(picker,mode){
+  if(!picker){
+    return
+  }
+  const date = picker.val().trim()
+
+  if(mode == 1){
+    return date.replace(/\//g,'-') + ' 00:00:00'
+  }else if(mode == 2){
+    return data.replace(/\//g,'-') + ' 23:59:59'
+  }
+}
 module.exports = {
   pageMap,
   post,
@@ -312,5 +383,7 @@ module.exports = {
   picEmptyData,
   setTitleTxt,
   downloadExportedData,
-  expJson
+  expJson,
+  setDatePicker,
+  getPickerDate
 };