Преглед изворни кода

Merge branch 'px0908' into referMaster

wyq пре 3 година
родитељ
комит
3b35146e9d

+ 57 - 1
src/css/login.less

@@ -28,6 +28,13 @@ body {
     border-radius:4px;
     margin: 20px auto 0;
   }
+  .bg2{
+    width: 100%;
+    height: 100%;
+    text-align: center;
+    background: url("../images/bg.png") center center no-repeat;
+    background-size: 100% 100%;
+  }
 }
 p.title {
   font-size: 30px;
@@ -104,7 +111,56 @@ p.title {
       -moz-box-shadow: @activeColor  0px 0px 2px;
       box-shadow: @activeColor  0px 0px 2px;
   }
-
+.login-info{
+  width: 100%;
+  position: absolute;
+  bottom: 31px;
+  padding: 0 110px;
+  .info-perPub{
+    float: left;
+    width: 35%;
+    & p{
+      float: left;
+      line-height: 50px;
+      margin-right: 7px;
+      font-size: 24px;
+      color: #fff;
+    }
+    .info-iptWrap{
+      float: left;
+      box-sizing: border-box;
+      width: 213px;
+      height: 50px;
+      line-height: 38px;
+      border-radius: 6px;
+      & input {
+        display: inline-block;
+        width: 100%;
+        height: 100%;
+        border-radius: 6px;
+        padding-left: 10px;
+        font-size: 22px;
+      }
+    }
+    
+  }
+  .waring {
+    display: inline-block;
+    position: absolute;
+    top: -44px;
+  }
+  .sureLogin{
+    float: left;
+    width: 213px;
+    height: 50px;
+    line-height: 50px;
+    background: #0363D1;
+    box-shadow: 0px 2px 6px 0px #1C4473;
+    border-radius: 6px;
+    margin: 0;
+    font-size: 24px;
+  }
+}
 .alertModal {
   .modalBg {
     position: fixed;

+ 15 - 15
src/html/checkTaskList.html

@@ -82,21 +82,21 @@
              <table class="qctable">
                  <thead>
                  <tr class="tabTitle">
-                     <th class="textCenter" valCode="behospitalCode">病人住院序号</th>
-                     <th class="scoreTime textCenter" valCode="jobTypeName">任务来源</th>
-                     <th class="scoreTime textCenter" valCode="month">任务月份</th>
-                     <th class="doctorName textCenter" valCode="status" >病历核查状态</th>
-                     <th class="deptName textCenter" valCode="behDeptName">科室</th>
-                     <th class="patientName textCenter" valCode="name"  style="width: 100px;">病人姓名</th>
-                     <th class="patientNo textCenter" valCode="fileCode" >病案号</th>
-                     <th class="doctorName textCenter" valCode="doctorName">主管医生</th>
-                     <th class="outHospitalDate textCenter" valCode="leaveHospitalDate" >出院日期</th>
-                     <th class="inHospitalDate textCenter desc" valCode="jobDistributionTime"  code="jobDistributionTime">分配日期</th>
-                     <th class="patientSex textCenter" valCode="checkTime" code="checkTime">核查日期</th>
-                     <th class="patientage textCenter" valCode="checkName">核查员</th>
-                     <th class="bedNum textCenter" valCode="casesEntryNum" code="casesEntryNum">缺陷数</th>
-                     <th class="recordLevel textCenter" valCode="level" >病历等级</th>
-                     <th class="recordScore textCenter" valCode="scoreRes" >病历得分</th>
+                     <th class="textCenter" code="behospitalCode">病人住院序号</th>
+                     <th class="scoreTime textCenter" code="jobTypeName">任务来源</th>
+                     <th class="scoreTime textCenter" code="jobCreateTime">任务月份</th>
+                     <th class="doctorName textCenter" code="status" >病历核查状态</th>
+                     <th class="deptName textCenter" code="behDeptName">科室</th>
+                     <th class="patientName textCenter" code="name"  style="width: 100px;">病人姓名</th>
+                     <th class="patientNo textCenter" code="fileCode" >病案号</th>
+                     <th class="doctorName textCenter" code="doctorName">主管医生</th>
+                     <th class="outHospitalDate textCenter" code="leaveHospitalDate" >出院日期</th>
+                     <th class="inHospitalDate textCenter desc" code="jobDistributionTime"  code="jobDistributionTime">分配日期</th>
+                     <th class="patientSex textCenter" code="checkTime" >核查日期</th>
+                     <th class="patientage textCenter" code="checkName">核查员</th>
+                     <th class="bedNum textCenter" code="casesEntryNum" >缺陷数</th>
+                     <th class="recordLevel textCenter" code="level" >病历等级</th>
+                     <th class="recordScore textCenter" code="scoreRes" >病历得分</th>
                      <!-- <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th> -->
                  </tr>
                  </thead>

+ 15 - 15
src/html/creatCheckTask.html

@@ -105,21 +105,21 @@
                     <thead>
                     <tr class="tabTitle">
                         <th class="allCheck textCenter" style="width: 65px;"><img code="" src="../images/icon_dis.png" alt=""></th>
-                        <th class="beHospitalId textCenter" valCode="behospitalCode">病人住院序号</th>
-                        <th class="patientName textCenter" valCode="name" style="width: 100px;">病人姓名</th>
-                        <th class="patientNo textCenter" valCode="fileCode">病案号</th>
-                        <th class="patientSex textCenter" valCode="sex">性别</th>
-                        <th class="patientage textCenter" valCode="age">年龄</th>
-                        <th class="bedNum textCenter" valCode="behDeptName">科室</th>
-                        <th class="outHospitalDate textCenter desc" valCode="leaveHospitalDate">出院日期</th>
-                        <th class="inHospitalDate textCenter" valCode="behospitalDayNum">住院天数</th>
-                        <th class="doctorName textCenter" valCode="doctorName">主管医生</th>
-                        <th class="recordLevel textCenter" valCode="level">病历等级</th>
-                        <th class="diagnose textCenter" valCode="diagnose">主诊断</th>
-                        <th class="doctorName textCenter" valCode="score" code="score">筛选分值</th>
-                        <th class="doctorName textCenter" valCode="creatStatus">生成状态</th>
-                        <th class="doctorName textCenter" valCode="jobCreatorName">生成人</th>
-                        <th class="deptName textCenter" valCode="jobCreateTime" code="jobCreateTime">生成日期</th>
+                        <th class="beHospitalId textCenter" code="behospitalCode">病人住院序号</th>
+                        <th class="patientName textCenter" code="name" style="width: 100px;">病人姓名</th>
+                        <th class="patientNo textCenter" code="fileCode">病案号</th>
+                        <th class="patientSex textCenter" code="sex">性别</th>
+                        <th class="patientage textCenter" code="age">年龄</th>
+                        <th class="bedNum textCenter" code="behDeptName">科室</th>
+                        <th class="outHospitalDate textCenter desc" code="leaveHospitalDate">出院日期</th>
+                        <th class="inHospitalDate textCenter" code="behospitalDayNum">住院天数</th>
+                        <th class="doctorName textCenter" code="doctorName">主管医生</th>
+                        <th class="recordLevel textCenter" code="level">病历等级</th>
+                        <th class="diagnose textCenter" code="diagnose">主诊断</th>
+                        <th class="doctorName textCenter" code="score">筛选分值</th>
+                        <th class="doctorName textCenter" code="creatStatus">生成状态</th>
+                        <th class="doctorName textCenter" code="jobCreatorName">生成人</th>
+                        <th class="deptName textCenter" code="jobCreateTime">生成日期</th>
                         <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th>
                     </tr>
                     </thead>

+ 6 - 4
src/html/login.html

@@ -7,17 +7,19 @@
   <title>登录页</title>
 </head>
 <body>
+  <div id="mainBox"></div>
   <div class="login clearfix">
+    
     <!--<div class="logoTop">
       <img src="../images/lantone.png" alt="">
       <span></span>
       <i>AI病案质控平台</i>
     </div>-->
-    <div class="bg fl">
+    <!-- <div class="bg fl">
       <p class="title">AI病案质控平台</p>
-    </div>
+    </div> -->
     <!--<div class="loginForm clearfix">-->
-      <div class="message fr">
+      <!-- <div class="message fr">
         <div class="inner">
           <p class="welcome">欢迎使用!</p>
           <div class="perPub">
@@ -39,7 +41,7 @@
           <div class="sureLogin">登录</div>
         </div>
         <div class="copy-right">由杭州朗通信息技术有限公司提供技术支持</div>
-      </div>
+      </div> -->
     <!--</div>-->
   </div>
 </body>

BIN
src/images/bg.png


+ 3 - 0
src/js/allotCheckTask.js

@@ -185,6 +185,9 @@ $(function() {
             $.alerModal({"message":'出院日期开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             return
         }
+        data_desc = ["jobCreateTime"];
+        $("th[code]").removeClass("asc desc")
+        $("th[code='jobCreateTime']").addClass('desc');
         getTabData(1)
     })
 //重置

+ 35 - 34
src/js/api.js

@@ -1,4 +1,5 @@
 const api = {
+  getHospitalMark: '/sys/user/getHospitalMark', //登录标识
   getMenu: '/sys/user/getUserOrgMenu', //获取菜单
   midifyPassword: '/sys/user/midifyPassword', //修改密码
   getSubMenu: '/qc/mode/getMenu', //获取质控评分菜单
@@ -16,8 +17,8 @@ const api = {
   qcListByDept: '/qc/behospitalInfo/page_dept',
   qcListByPerson: '/qc/behospitalInfo/page_person',
   qcListByDoc: '/qc/behospitalInfo/page_group', //质控评分(医疗组)
-  qcListYw:'/console/qualityControl',  //病历质控报表-义乌全院
-  qcListByDeptYw:'/consoleByDept/qualityControlByDept',//病历质控报表-义乌科室
+  qcListYw: '/console/qualityControl',  //病历质控报表-义乌全院
+  qcListByDeptYw: '/consoleByDept/qualityControlByDept',//病历质控报表-义乌科室
   saveQcCases: '/qc/cases/saveQcCases',
   recordScore: '/qc/behospitalInfo/analyze',
   getInfoModule: '/qc/module/getById',
@@ -125,8 +126,8 @@ const api = {
   qcCheckMRPageExport: '/console/export/qcCheckMRPageExport', //质控核查质控评分页导出
   hmImproveMRPageExport: '/console/export/hmImproveMRPageExport', //病案首页改善率质控评分页导出
   badLevelPagePageExport: '/console/export/badLevelPagePageExport', //病案首页不合格数病历详情页导出
-  qualityControlExport:'/console/export/qualityControlExport',//病历质控报表导出
-  qualityControlExportByDept:'/print/export/qualityControlExportByDept',//病历质控报表(科室)导出
+  qualityControlExport: '/console/export/qualityControlExport',//病历质控报表导出
+  qualityControlExportByDept: '/print/export/qualityControlExportByDept',//病历质控报表(科室)导出
 
   casesEntryStatisticsById: '/console/casesEntryStatisticsById', //入院记录24小时未完成
   beHosCount: '/console/beHosCount', //入院人数
@@ -158,41 +159,41 @@ const api = {
 
   exportQcresultByPerson: '/qc/behospitalInfo/exportQcresultByPerson', //个人质控导出
 
-    beHosCountByDept:'/consoleByDept/beHosCountByDept',//入院记录(科室首页,运行)
-    casesEntryStatisticsByDept:'/consoleByDept/casesEntryStatisticsByDept',//24h(科室首页,运行)
-    homePageOrGoodLevelByDept:'/consoleByDept/homePageOrGoodLevelByDept',//(科室病案首页,终末)
-    homePageLevelExportByDept:'/print/export/homePageLevelExportByDept',//(科室病案首页合格率导出,终末)
-    entryGroupExportByDeptEntry:'/print/export/entryGroupExportByDeptEntry',//(科室病案首页合格率/缺陷列表导出,终末)
-    qcResultShortExportByDeptPage:'/print/export/qcResultShortExportByDeptPage',//(科室病案首页合格率/缺陷列表导出/病历列表,终末)
-    entryGroupExportByDeptCase:'/print/export/entryGroupExportByDeptCase',//(条目缺陷占比,终末)
-    entryStatisticsByDept:'/consoleByDept/entryStatisticsByDept',//(关键条目缺陷占比,终末)
-    entryStatisticsExportByDept:'/print/export/entryStatisticsExportByDept',//(关键条目缺陷占比导出,终末)
-    levelExportByDept:'/print/export/levelExportByDept',//(科室缺陷占比导出,终末)
-    entryGroupExportByDeptPage:'/print/export/entryGroupExportByDeptPage',//(科室缺陷占比/缺陷列表导出,终末)
-    leaveHosMRPageByDept:'/consoleByDept/leaveHosMRPageByDept',//出院人数,终末)
-    leaveHosMrPageExportByDept:'/print/export/leaveHosMrPageExportByDept',//出院人数导出,终末)
-    homePageOrLevelExportByDept:'/print/export/homePageOrLevelExportByDept',//控制台(科室) / 病案首页合格率占比 / 病历列表导出,终末)
-    
-    getMedQualityCoList:'/qc/behospitalInfo/getMedQualityCoList',//病案指标列表
-    medicalRecordIndicator:'/console/medicalRecordIndicator',//病案指标
-    getListDoctor:'/bas/doctor/getList',//(科室医生列表)
+  beHosCountByDept: '/consoleByDept/beHosCountByDept',//入院记录(科室首页,运行)
+  casesEntryStatisticsByDept: '/consoleByDept/casesEntryStatisticsByDept',//24h(科室首页,运行)
+  homePageOrGoodLevelByDept: '/consoleByDept/homePageOrGoodLevelByDept',//(科室病案首页,终末)
+  homePageLevelExportByDept: '/print/export/homePageLevelExportByDept',//(科室病案首页合格率导出,终末)
+  entryGroupExportByDeptEntry: '/print/export/entryGroupExportByDeptEntry',//(科室病案首页合格率/缺陷列表导出,终末)
+  qcResultShortExportByDeptPage: '/print/export/qcResultShortExportByDeptPage',//(科室病案首页合格率/缺陷列表导出/病历列表,终末)
+  entryGroupExportByDeptCase: '/print/export/entryGroupExportByDeptCase',//(条目缺陷占比,终末)
+  entryStatisticsByDept: '/consoleByDept/entryStatisticsByDept',//(关键条目缺陷占比,终末)
+  entryStatisticsExportByDept: '/print/export/entryStatisticsExportByDept',//(关键条目缺陷占比导出,终末)
+  levelExportByDept: '/print/export/levelExportByDept',//(科室缺陷占比导出,终末)
+  entryGroupExportByDeptPage: '/print/export/entryGroupExportByDeptPage',//(科室缺陷占比/缺陷列表导出,终末)
+  leaveHosMRPageByDept: '/consoleByDept/leaveHosMRPageByDept',//出院人数,终末)
+  leaveHosMrPageExportByDept: '/print/export/leaveHosMrPageExportByDept',//出院人数导出,终末)
+  homePageOrLevelExportByDept: '/print/export/homePageOrLevelExportByDept',//控制台(科室) / 病案首页合格率占比 / 病历列表导出,终末)
+
+  getMedQualityCoList: '/qc/behospitalInfo/getMedQualityCoList',//病案指标列表
+  medicalRecordIndicator: '/console/medicalRecordIndicator',//病案指标
+  getListDoctor: '/bas/doctor/getList',//(科室医生列表)
 
 }
 const ywCheckApi = {
-    addMedCheckInfo:'/qc/medCheckInfo/addMedCheckInfo',   //核查
-    getAllotCheckList:'/qc/medCheckInfo/getCheckList', //分配核查任务列表
-    getCheckUserMap:'/qc/medCheckInfo/getCheckUserMap',  //核查人员列表
-    addCheck:'/qc/medCheckWork/addCheckWork', //生成核查任务
-    getTaskList:'/qc/medCheckWork/getUserList', //核查任务列表
-    getTaskByUserId:'/qc/medCheckInfo/getCheckListByUserId',//质控员名下的任务列表
-    allotTask:'/qc/medCheckInfo/updateDistributionCheck',//分配或取消任务
-    getUserList: '/qc/recCheck/checkedRecordList', //获取患者病历列表
-    recordCheck:'/qc/recCheck/recordCheck',//义乌病历核查
-    getCheckType:'/qc/recCheck/getCheckType',//义乌病历核查
+  addMedCheckInfo: '/qc/medCheckInfo/addMedCheckInfo',   //核查
+  getAllotCheckList: '/qc/medCheckInfo/getCheckList', //分配核查任务列表
+  getCheckUserMap: '/qc/medCheckInfo/getCheckUserMap',  //核查人员列表
+  addCheck: '/qc/medCheckWork/addCheckWork', //生成核查任务
+  getTaskList: '/qc/medCheckWork/getUserList', //核查任务列表
+  getTaskByUserId: '/qc/medCheckInfo/getCheckListByUserId',//质控员名下的任务列表
+  allotTask: '/qc/medCheckInfo/updateDistributionCheck',//分配或取消任务
+  getUserList: '/qc/recCheck/checkedRecordList', //获取患者病历列表
+  recordCheck: '/qc/recCheck/recordCheck',//义乌病历核查
+  getCheckType: '/qc/recCheck/getCheckType',//义乌病历核查
 };
 const editApi = {
-    getDataEdit:'/qc/dataEdit/getDataEdit',
-    saveDataEdit:'/qc/dataEdit/saveDataEdit'
+  getDataEdit: '/qc/dataEdit/getDataEdit',
+  saveDataEdit: '/qc/dataEdit/saveDataEdit'
 }
 module.exports = {
   api,

+ 5 - 2
src/js/checkTaskList.js

@@ -144,6 +144,9 @@ $(function(){
             $.alerModal({ "message": '生成日期开始时间不能大于结束时间~', type: "tip", time: '1000', isFather: true, fatherWrapper: $("#mainBox", parent.document) });
             return
         }
+        data_desc = ["jobDistributionTime"];
+        $("th[code]").removeClass("asc desc")
+        $("th[code='jobDistributionTime']").addClass('desc');
         getTabData(1)
     })
 
@@ -335,14 +338,14 @@ function renderTab(data) {
         $('.tbody').html(emptyBox(null, 15))
         return;
     }
-    const titles = $(".tabTitle th[valCode]");
+    const titles = $(".tabTitle th[code]");
     for(let i = 0; i < data.length; i++){
         const item = data[i]
 
         str += `
             <tr  data-index=${i}>`;
         for(let i=0;i<titles.length;i++){
-            code=$(titles[i]).attr('valCode');
+            code = $(titles[i]).attr('code');
             str +=  `<td class="${code=='name'?'beHospitalId':''} textCenter"><span data-index=${i}>${ item[code] || "-"}<span></td>`
         }
         str += "</tr>"

+ 296 - 270
src/js/creatCheckTask.js

@@ -1,29 +1,29 @@
 const $ = require('jquery');
 require("../css/creatCheckTask.less");
 require('./modal.js');
-const {api,ywCheckApi} = require('./api.js')
-const {post,getCookie,emptyBox,listenScroll,getScoreTabList} = require('./utils.js')
+const { api, ywCheckApi } = require('./api.js')
+const { post, getCookie, emptyBox, listenScroll, getScoreTabList } = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
-const iconCheck= require("./../images/icon_check.png")
+const iconCheck = require("./../images/icon_check.png")
 const iconUnCheck = require("./../images/icon_unchecked.png")
 const iconDisCheck = require("./../images/icon_dis.png")
-const  iconCalenBlue= require("./../images/icon_calen_blue.png")
-const  iconCalenGrey= require("./../images/icon_calen_grey.png")
-const iconDown= require("./../images/arrow_down.png")
+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 arrowLeft = require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 
 listenScroll()
-let tabList = [],  global_level="",global_status="0",
-    global_deptId=[],global_deptName="",global_score='',
-  data_desc=["leaveHospitalDate"],data_asc=[],global_taskList=[],global_delOrAdd=1;//1生成0取消
+let tabList = [], global_level = "", global_status = "0",
+    global_deptId = [], global_deptName = "", global_score = '',
+    data_desc = ["leaveHospitalDate"], data_asc = [], global_taskList = [], global_delOrAdd = 1;//1生成0取消
 let global_activeTabCode = '0';    //激活的tab  code
-let isPlacefile = getCookie('isPlacefile')||1
+let isPlacefile = getCookie('isPlacefile') || 1
 
-$(function() {
+$(function () {
     $(window.parent.document).find(".modaltip").hide();//切换页面过快时toast隐藏
     const checkAuth = getCookie('checkAuth');
     /*if(!checkAuth){
@@ -31,79 +31,83 @@ $(function() {
         toast("没有质控核查权限!");
         return
     }*/
-    const tabs = checkAuth.replace(/[^456]/g,'');
-    if(tabs.length===0){
+    const tabs = checkAuth.replace(/[^456]/g, '');
+    if (tabs.length === 0) {
         //$(".tabs").hide();
         toast("没有质控核查权限!");
         return;
-    }else if(tabs.length>1){
+    } else if (tabs.length > 1) {
         //多于一个权限,显示tab切换
         $(".tabs").show();
-        const last = "456".replace(tabs,'');
-        $(".tabs [data-code="+(last-4)+"]").parent().hide();
+        const last = "456".replace(tabs, '');
+        $(".tabs [data-code=" + (last - 4) + "]").parent().hide();
     }
-    global_activeTabCode=tabs.substr(0,1)-4;
+    global_activeTabCode = tabs.substr(0, 1) - 4;
     //获取科室列表
-    if(global_activeTabCode=="0"){
+    if (global_activeTabCode == "0") {
         getSubDeptList();
-    }else{
+    } else {
         getDeptList();
     }
-    $(".tabs [data-code="+global_activeTabCode+"]").addClass("active");
+    $(".tabs [data-code=" + global_activeTabCode + "]").addClass("active");
     $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
-    $('.iconCalen').on("mouseenter", function(e){
+    $('.iconCalen').on("mouseenter", function (e) {
         $(this).attr("src", iconCalenBlue)
     })
-    $('.iconCalen').on("mouseleave", function(e){
+    $('.iconCalen').on("mouseleave", function (e) {
         $(this).attr("src", iconCalenGrey)
     })
-    $('.iconCalen').on("click", function(e){
+    $('.iconCalen').on("click", function (e) {
         $(this).parent().find("input").focus()
     })
 
     $(".menu .page", parent.document).removeClass("active")
     $(parent.document).find(".menu .page[code=YH-ZKHC-SCHCRW]").addClass("active")
 
-    $(".filter").on("click", function(e){
-        global_taskList=[];
-        const isCreated = (global_status=="1");
-        const text = isCreated?'取消':'生成';
-        $(".modal-body p").text("确定要"+text+"这些任务吗?");
-        if(isCreated){
+    $(".filter").on("click", function (e) {
+        global_taskList = [];
+        const isCreated = (global_status == "1");
+        const text = isCreated ? '取消' : '生成';
+        $(".modal-body p").text("确定要" + text + "这些任务吗?");
+        $("th[code]").removeClass("asc desc");
+        if (isCreated) {
             $(".creatTask").addClass("disabled");
             $(".cancelTask").removeClass("disabled");
-        }else{
+        } else {
             $(".creatTask").removeClass("disabled");
             $(".cancelTask").addClass("disabled");
         }
+
         //已生成筛选时按生成日期倒序筛选
-        if(isCreated){
-            global_delOrAdd=0;
-            data_desc=["jobCreateTime"];
+        if (isCreated) {
+            global_delOrAdd = 0;
+            data_desc = ["jobCreateTime"];
             $("th[code=jobCreateTime]").addClass("desc");
-        }else{
-            global_delOrAdd=1;
-            data_desc=["leaveHospitalDate"];
+            $("th[code=leaveHospitalDate]").removeClass("desc");
+        } else {
+            global_delOrAdd = 1;
+            data_desc = ["leaveHospitalDate"];
+            $("th[code=leaveHospitalDate]").addClass("desc");
             $("th[code=jobCreateTime]").removeClass("desc");
         }
         getTabData(1)
     })
-    $(".abnormalClear").on("click", function(e){
+    $(".abnormalClear").on("click", function (e) {
         clearFilter();
         getTabData(1)
     })
     //切换tab
-    $(".tabBox .tabs button").on("click",(e)=>{
+    $(".tabBox .tabs button").on("click", (e) => {
         const me = e.target;
         $('.selectDept i').text('全部')
         $(".deptItem.active").removeClass("active");
         $(".deptList").css("display", "none")
-        global_deptId=[];
-        global_deptName="";
+        global_deptId = [];
+        global_deptName = "";
         global_activeTabCode = $(me).attr("data-code");
-        if(global_activeTabCode=="0"){
+        if (global_activeTabCode == "0") {
             getSubDeptList();
-        }else{
+        } else {
             getDeptList();
         }
         $(".tabBox .tabs button").removeClass("active");
@@ -111,65 +115,65 @@ $(function() {
         //更新列表并重置筛选条件
         $(".filter").click();
     });
-//选择生成状态
-    $('.selectStatus').on("click", function(e){
+    //选择生成状态
+    $('.selectStatus').on("click", function (e) {
         e.stopPropagation()
-        const showList =  $(".statusList ").css("display")
-        if(showList == "none" ||!showList){
+        const showList = $(".statusList ").css("display")
+        if (showList == "none" || !showList) {
             $(".levelList ").css("display", "none")
             $(".deptList ").css("display", "none")
             $(".scoreList ").css("display", "none")
-            $(".statusList ").css("display","block")
-        }else{
+            $(".statusList ").css("display", "block")
+        } else {
             $(".statusList ").css("display", "none")
         }
     })
-//选择病历等级
-    $('.selectLevel').on("click", function(e){
+    //选择病历等级
+    $('.selectLevel').on("click", function (e) {
         e.stopPropagation()
         $(".deptList ").css("display", "none")
-        const showList =  $(".levelList ").css("display")
-        if(showList == "none" ||!showList){
+        const showList = $(".levelList ").css("display")
+        if (showList == "none" || !showList) {
             $(".deptList ").css("display", "none")
             $(".statusList ").css("display", "none")
             $(".scoreList ").css("display", "none")
-            $(".levelList ").css("display","block")
-        }else{
+            $(".levelList ").css("display", "block")
+        } else {
             $(".levelList ").css("display", "none")
         }
     })
     //科室选择
-    $('.selectDept').on("click", function(e){
+    $('.selectDept').on("click", function (e) {
         e.stopPropagation();
         $(".levelList ").css("display", "none")
         $(".statusList ").css("display", "none")
         $(".scoreList ").css("display", "none")
-        $(".deptList ").css("display","block")
+        $(".deptList ").css("display", "block")
     })
 
     //筛选分值选择
-    $('.selectScore').on("click", function(e){
+    $('.selectScore').on("click", function (e) {
         e.stopPropagation();
         $(".levelList ").css("display", "none")
         $(".deptList ").css("display", "none")
         $(".statusList ").css("display", "none")
-        $(".scoreList ").css("display","block")
+        $(".scoreList ").css("display", "block")
     })
 
-    $(".creatTask,.cancelTask").click(function(){
-        if($(this).is(".disabled")){
+    $(".creatTask,.cancelTask").click(function () {
+        if ($(this).is(".disabled")) {
             return;
         }
-        if(!global_taskList.join("").length){
+        if (!global_taskList.join("").length) {
             toast("至少勾选一个任务");
             return;
         }
         $(".modal-container").show();
     });
-    $(".modal-container .confirm").click(function(){
+    $(".modal-container .confirm").click(function () {
         creatTask(global_delOrAdd)
     });
-    $(".modal-container .cancel,.modal-container .close").click(function(){
+    $(".modal-container .cancel,.modal-container .close").click(function () {
         /*if(global_delOrAdd==0){
             global_taskList=[];
         }*/
@@ -192,44 +196,45 @@ $(function() {
         nextBigStatus: '显示下一年',
         currentText: '今天',
         currentStatus: '显示本月',
-        monthNames: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
-        monthNamesShort: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
-        yearNamesShort: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
+        monthNames: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+        monthNamesShort: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+        yearNamesShort: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
         monthStatus: '选择月份',
         yearStatus: '选择年份',
         weekHeader: '周',
         weekStatus: '年内周次',
-        dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
-        dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
-        dayNamesMin: ['日','一','二','三','四','五','六'],
+        dayNames: ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'],
+        dayNamesShort: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
+        dayNamesMin: ['日', '一', '二', '三', '四', '五', '六'],
         dayStatus: '设置 DD 为一周起始',
         dateStatus: '选择 m月 d日, DD',
         dateFormat: 'yy-mm-dd',
         firstDay: 1,
         initStatus: '请选择日期',
-        isRTL: false};
-    const days = new Date().getDate()-1;
-    let startDate = "-"+days+"d",endDate=new Date();
+        isRTL: false
+    };
+    const days = new Date().getDate() - 1;
+    let startDate = "-" + days + "d", endDate = new Date();
     $.datepicker.setDefaults($.datepicker.regional['zh-CN']);
-    $( "#datepicker" ).datepicker({
+    $("#datepicker").datepicker({
         changeMonth: true,
         changeYear: true,
-        dateFormat:"yy-mm-dd",
-    }).datepicker( "setDate", startDate);
-    $( "#datepicker2" ).datepicker({
+        dateFormat: "yy-mm-dd",
+    }).datepicker("setDate", startDate);
+    $("#datepicker2").datepicker({
         changeMonth: true,
         changeYear: true,
-        dateFormat:"yy-mm-dd"
-    }).datepicker( "setDate",endDate);
-    getScoreTabList((data)=>{rendeScoreList(data)})
-//获取列表数据
+        dateFormat: "yy-mm-dd"
+    }).datepicker("setDate", endDate);
+    getScoreTabList((data) => { rendeScoreList(data) })
+    //获取列表数据
     getTabData(1)
     //状态选择
     bindStatusSelect()
     //等级选择
     bindLeveldSelect()
     //关闭下拉
-    $(document).on("click", function(){
+    $(document).on("click", function () {
         $(".levelList ").css("display", "none")
         $(".deptList ").css("display", "none")
         $(".statusList ").css("display", "none")
@@ -237,60 +242,81 @@ $(function() {
     })
 });
 //判断有无某一权限
-  function hasData(data){
+function hasData(data) {
     let trdObj = JSON.parse(getCookie("trdObj"))
     let lis = trdObj['YH-ZKHC-SCRW']
-    if(!lis){
-      return false
+    if (!lis) {
+        return false
     }
-    if(lis.indexOf(data)>-1){//有权限
+    if (lis.indexOf(data) > -1) {//有权限
         return true
     }
     return false;
 }
 
-function rendeScoreList(list){
-    if(list.length == 0){
+function rendeScoreList(list) {
+    if (list.length == 0) {
         $('.scoreList').html("")
         return
     }
     let str = `<li class="scoreItem ellipsis" data-id=" " data-name="全部">全部</li>`;
-    for(let i = 0; i < list.length; i++){
+    for (let i = 0; i < list.length; i++) {
         str += `<li class="scoreItem ellipsis" data-id=${list[i]} data-name=${list[i]}> ${list[i]}</li>`
     }
     $('.scoreList').html(str)
     bindScoreSelect()
 }
-function bindScoreSelect(){
-    $('.scoreItem').on("click",function(){
+function bindScoreSelect() {
+    $('.scoreItem').on("click", function () {
         const scoreItemName = $(this).attr("data-name")
         const scoreItemItemId = $(this).attr("data-id")
-        global_score =scoreItemItemId;
+        global_score = scoreItemItemId;
         $('.selectScore i').html(scoreItemName)
         $(".scoreList").css("display", "none")
     })
 }
 //排序事件
-function bindOrder(){
+function bindOrder() {
     $("th[code]").off("click").on("click", function (e) {
         const code = $(this).attr("code");
-        if (data_asc[0] === code) {
-            data_desc = [code];
-            data_asc = [];
-            $("th[code]").removeClass("asc desc");
-            $(this).addClass("desc");
+        if (data_asc[0] === 'age') {
+
         } else {
-            data_desc = [];
-            data_asc = [code];
-            $("th[code]").removeClass("asc desc");
-            $(this).addClass("asc");
+
         }
+        if ((data_asc[0] === code && code !== 'age') || (data_desc[0] === 'birthday' && code == 'age')) {
+            if (code == 'age') {
+                $("th[code]").removeClass("asc desc");
+                $(this).addClass("desc");
+                data_desc = [];
+                data_asc = ['birthday'];
+            } else {
+                $("th[code]").removeClass("asc desc");
+                $(this).addClass("desc");
+                data_desc = [code];
+                data_asc = [];
+            }
+        } else {
+            if (code == 'age') {
+                $("th[code]").removeClass("asc desc");
+                $(this).addClass("asc");
+                data_desc = ['birthday'];
+                data_asc = [];
+            } else {
+                $("th[code]").removeClass("asc desc");
+                $(this).addClass("asc");
+                data_desc = [];
+                data_asc = [code];
+            }
+
+        }
+
         getTabData(1);
     });
 }
-function bindCancelTaskEvent(){
-    $(".taskCancel").unbind("click").click(function(){
-        global_delOrAdd=0;
+function bindCancelTaskEvent() {
+    $(".taskCancel").unbind("click").click(function () {
+        global_delOrAdd = 0;
         global_taskList = [$(this).attr("code")];
         $(".modal-container .modal-body p").text("确定要取消该任务吗?");
         $(".modal-container").show();
@@ -298,148 +324,148 @@ function bindCancelTaskEvent(){
 }
 
 //生成任务
-function creatTask(){
-      const param={
-          behospitalCodeList:global_taskList,
-          jobType:global_activeTabCode,
-          checkStatus:global_delOrAdd,
-      };
-    post(ywCheckApi.addCheck,param).then(res =>{
-        if(res.data.code == '0'){
-            global_taskList=[];
+function creatTask() {
+    const param = {
+        behospitalCodeList: global_taskList,
+        jobType: global_activeTabCode,
+        checkStatus: global_delOrAdd,
+    };
+    post(ywCheckApi.addCheck, param).then(res => {
+        if (res.data.code == '0') {
+            global_taskList = [];
             $(".modal-container").hide();
             toast("操作成功!");
             getTabData(1)
-        }else{
+        } else {
             toast(res.data.msg);
         }
-    }).catch((e) =>{
+    }).catch((e) => {
 
     })
 }
 
-function getTabData(activePage){
+function getTabData(activePage) {
     const filterData = getFilterData();
-    const {smallDay,bigDay,startDate,endDate} = filterData;
-    if(+smallDay>+bigDay){
+    const { smallDay, bigDay, startDate, endDate } = filterData;
+    if (+smallDay > +bigDay) {
         toast("住院天数区间有误~");
         return;
     }
-    if(new Date(startDate).getTime()>new Date(endDate).getTime()){
+    if (new Date(startDate).getTime() > new Date(endDate).getTime()) {
         toast("出院日期开始时间不能大于结束时间~");
         return;
     }
     const param = {
-        jobType:global_activeTabCode,     //科室/质控科/院级
-        creatStatus:global_status,
-        current:activePage,
-        hospitalId:'',
-        level:global_level,//病历等级
-        values:global_score.trim()?[global_score]:[],
+        jobType: global_activeTabCode,     //科室/质控科/院级
+        creatStatus: global_status,
+        current: activePage,
+        hospitalId: '',
+        level: global_level,//病历等级
+        values: global_score.trim() ? [global_score] : [],
         department: global_deptId,
-        asc:data_asc,     //升序
-        desc:data_desc,       //降序
+        asc: data_asc,     //升序
+        desc: data_desc,       //降序
         size: 15,
         ...filterData,
-        startDate:filterData.startDate+" 00:00:00",
-        endDate:filterData.endDate+" 23:59:59",
+        startDate: filterData.startDate + " 00:00:00",
+        endDate: filterData.endDate + " 23:59:59",
     }
     $('.pagination').html("")
-    $('.tbody').html(emptyBox('努力加载中...','',17))
-    return post(ywCheckApi.getTaskList,param).then(res =>{
-        if(res.data.code == '0'){
+    $('.tbody').html(emptyBox('努力加载中...', '', 17))
+    return post(ywCheckApi.getTaskList, param).then(res => {
+        if (res.data.code == '0') {
             const data = res.data.data;
             tabList = data.records;
             const totalPage = data.pages;
             const totalNum = data.total;
-            renderTab(tabList,data.hospitalId);
-            renderPagination(totalPage,Number(activePage),totalNum)
-            if(totalPage > 0){
-                renderPagination(totalPage,Number(activePage),totalNum)
-            } else{
+            renderTab(tabList, data.hospitalId);
+            renderPagination(totalPage, Number(activePage), totalNum)
+            if (totalPage > 0) {
+                renderPagination(totalPage, Number(activePage), totalNum)
+            } else {
                 $('.pagination').html("")
             }
-        }else{
+        } else {
             toast(res.data.msg);
         }
-    }).catch((e) =>{
-    
+    }).catch((e) => {
+
     })
 }
 
-function toast(msg){
-    $.alerModal({"message":msg,type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+function toast(msg) {
+    $.alerModal({ "message": msg, type: "tip", time: '1000', isFather: true, fatherWrapper: $("#mainBox", parent.document) });
 }
 
-function renderTab(data){
-    let str = ``,code="";
+function renderTab(data) {
+    let str = ``, code = "";
     let hasSelectAll = true;
-    if(data.length===0){
-      $('.tbody').html(emptyBox(null,17))
-    //   initScroll("qcList","YX",1)
-      return;
+    if (data.length === 0) {
+        $('.tbody').html(emptyBox(null, 17))
+        //   initScroll("qcList","YX",1)
+        return;
     }
-    const titles = $(".tabTitle th[valCode]");
-    for(let i = 0; i < data.length; i++){
+    const titles = $(".tabTitle th[code]");
+    for (let i = 0; i < data.length; i++) {
         const item = data[i]
 
         str += `
             <tr  data-index=${i}>
                 <td class="operaItem taskCheck textCenter"><img code="${item.behospitalCode}" src="${iconUnCheck}" alt=""></td>`;
-        for(let i=0;i<titles.length;i++){
-            code=$(titles[i]).attr('valCode');
-            str +=  `<td class="textCenter"><span data-index=${i}>${ item[code] || "-"}<span></td>`
+        for (let i = 0; i < titles.length; i++) {
+            code = $(titles[i]).attr('code');
+            str += `<td class="textCenter"><span data-index=${i}>${item[code] || "-"}<span></td>`
         }
-        str += `<td class="operaItem textCenter ${(item.creatStatus=='已生成'&&item.delFlag)?'taskCancel':'disable'}" code="${item.behospitalCode}">取消</td></tr>`
+        str += `<td class="operaItem textCenter ${(item.creatStatus == '已生成' && item.delFlag) ? 'taskCancel' : 'disable'}" code="${item.behospitalCode}">取消</td></tr>`
     }
 
-    if(data.length === 0){
+    if (data.length === 0) {
         hasSelectAll = false
     }
-    if(hasSelectAll){
-        $('.scoreOpera img').attr("src" ,iconCheck)
-        $('.scoreOpera').attr("data-selectall",true)
-    }else{
-        $('.scoreOpera img').attr("src" ,iconUnCheck)
-        $('.scoreOpera').attr("data-selectall",false)
+    if (hasSelectAll) {
+        $('.scoreOpera img').attr("src", iconCheck)
+        $('.scoreOpera').attr("data-selectall", true)
+    } else {
+        $('.scoreOpera img').attr("src", iconUnCheck)
+        $('.scoreOpera').attr("data-selectall", false)
     }
     $('.tbody').html(str)
-    $(".allCheck  img").attr("src",iconUnCheck);    //全选改为可用状态
+    $(".allCheck  img").attr("src", iconUnCheck);    //全选改为可用状态
     bindOrder();
     bindTaskCheckEvent();
     bindCancelTaskEvent();
 }
 
-function bindTaskCheckEvent(){
-      $(".taskCheck img").unbind("click").click(function(){
-          const code = $(this).attr("code");
-            if($(this).is(".active")){
-                let str = global_taskList.join(",")+",";
-                str = str.replace(code+",","").replace(/^,|,$/,'');
-                global_taskList = str.split(",");
-                $(".allCheck img").attr('src',iconUnCheck).removeClass("active");
-                $(this).attr('src',iconUnCheck).removeClass("active");
-            }else{
-                global_taskList.push(code);
-                $(this).attr('src',iconCheck).addClass("active");
-            }
+function bindTaskCheckEvent() {
+    $(".taskCheck img").unbind("click").click(function () {
+        const code = $(this).attr("code");
+        if ($(this).is(".active")) {
+            let str = global_taskList.join(",") + ",";
+            str = str.replace(code + ",", "").replace(/^,|,$/, '');
+            global_taskList = str.split(",");
+            $(".allCheck img").attr('src', iconUnCheck).removeClass("active");
+            $(this).attr('src', iconUnCheck).removeClass("active");
+        } else {
+            global_taskList.push(code);
+            $(this).attr('src', iconCheck).addClass("active");
+        }
 
-      });
+    });
     //全选
-    $(".allCheck img").unbind("click").click(function(){
+    $(".allCheck img").unbind("click").click(function () {
         const checks = $(".taskCheck img");
-        if($(this).is(".active")){
-            $(this).attr("src",iconUnCheck).removeClass("active");
-            checks.attr("src",iconUnCheck).removeClass("active");
-            global_taskList=[];
-        }else{
-            $(this).attr("src",iconCheck).addClass("active");
-            checks.attr("src",iconCheck).addClass("active");
+        if ($(this).is(".active")) {
+            $(this).attr("src", iconUnCheck).removeClass("active");
+            checks.attr("src", iconUnCheck).removeClass("active");
+            global_taskList = [];
+        } else {
+            $(this).attr("src", iconCheck).addClass("active");
+            checks.attr("src", iconCheck).addClass("active");
             let codes = [];
-            checks.map((i)=>{
+            checks.map((i) => {
                 codes.push($(checks[i]).attr("code"));
             });
-            global_taskList=codes;
+            global_taskList = codes;
         }
         console.log(global_taskList)
 
@@ -447,17 +473,17 @@ function bindTaskCheckEvent(){
 }
 
 //列表获取筛选值
-function getFilterData(){
+function getFilterData() {
     const obj = {};
-    $(".filterBox input[code]").map((i,it)=>{
-        obj[$(it).attr("code")]=$(it).val()
+    $(".filterBox input[code]").map((i, it) => {
+        obj[$(it).attr("code")] = $(it).val()
     })
     return obj;
 }
 
 //生成状态选择
-function bindStatusSelect(){
-    $('.statusItem').on("click",function(){
+function bindStatusSelect() {
+    $('.statusItem').on("click", function () {
         const statusItemName = $(this).attr("data-name")
         global_status = $(this).attr("data-id")
         $('.selectStatus i').html(statusItemName)
@@ -467,80 +493,80 @@ function bindStatusSelect(){
 }
 
 //病历等级选择
-function bindLeveldSelect(){
-    $('.levelItem').on("click",function(){
+function bindLeveldSelect() {
+    $('.levelItem').on("click", function () {
         const levelItemName = $(this).attr("data-name")
         const levelItemItemId = $(this).attr("data-id")
-        global_level =levelItemItemId
+        global_level = levelItemItemId
         $('.selectLevel i').html(levelItemName)
         $(".levelList").css("display", "none")
         //$(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     })
 }
 //获取科室任务对应的列表
-function getSubDeptList(){
-    post(api.getDept,{}).then(res =>{
-        if(res.data.code == '0'){
-            const  deptList = res.data.data||[]
+function getSubDeptList() {
+    post(api.getDept, {}).then(res => {
+        if (res.data.code == '0') {
+            const deptList = res.data.data || []
             rendeDeptList(deptList)
-        }else{rendeDeptList([])}
-    }).catch((e) =>{
+        } else { rendeDeptList([]) }
+    }).catch((e) => {
 
     })
 }
 //科室列表
-function getDeptList(){
-    post(api.getDeptList,{}).then(res =>{
-        if(res.data.code == '0'){
-           const  deptList = res.data.data||[]
-           rendeDeptList(deptList)
-        }else{rendeDeptList([])}
-    }).catch((e) =>{
+function getDeptList() {
+    post(api.getDeptList, {}).then(res => {
+        if (res.data.code == '0') {
+            const deptList = res.data.data || []
+            rendeDeptList(deptList)
+        } else { rendeDeptList([]) }
+    }).catch((e) => {
 
     })
 }
-function rendeDeptList(deptList){
-    if(deptList.length == 0){
-      $('.deptList').html("")
-      return
+function rendeDeptList(deptList) {
+    if (deptList.length == 0) {
+        $('.deptList').html("")
+        return
     }
     let str = `<li class="deptItem ellipsis" data-id=" " data-name="全部">全部</li>`;
-    for(let i = 0; i < deptList.length; i++){
+    for (let i = 0; i < deptList.length; i++) {
         str += `<li class="deptItem ellipsis" title=${deptList[i].deptName} data-id=${deptList[i].deptId} data-name=${deptList[i].deptName}> ${deptList[i].deptName}</li>`
     }
     $('.deptList').html(str)
     bindDeptSelect()
 }
 //科室选择
-function bindDeptSelect(){
-    $('.deptItem').on("click",function(e){
+function bindDeptSelect() {
+    $('.deptItem').on("click", function (e) {
         e.stopPropagation();
         const deptItemName = $(this).attr("data-name");
-        let str = global_deptId.join(",")+",";
-        const code=$(this).attr("data-id")
-        if(!code.trim()){
+        let str = global_deptId.join(",") + ",";
+        const code = $(this).attr("data-id")
+        if (!code.trim()) {
             $(".deptItem").removeClass("active");
             global_deptId = [];
-            global_deptName="";
+            global_deptName = "";
             $('.selectDept i').text('全部')
-            $('.selectDept').attr('title','全部')
+            $('.selectDept').attr('title', '全部')
             return;
         }
-        if($(this).is(".active")){
-            global_deptName = global_deptName.replace(deptItemName+",",'');
-            str = str.replace(code+",","").replace(/^,|,$/,'');
+        if ($(this).is(".active")) {
+            global_deptName = global_deptName.replace(deptItemName + ",", '');
+            str = str.replace(code + ",", "").replace(/^,|,$/, '');
             global_deptId = str.split(",");
-        }else{
-            global_deptName = global_deptName+deptItemName+",";
+        } else {
+            global_deptName = global_deptName + deptItemName + ",";
             global_deptId.push(code);
         }
         $(this).toggleClass("active");
-        const name = global_deptName.replace(/,$/,'');
+        const name = global_deptName.replace(/,$/, '');
         $('.selectDept i').text(name)
-        $('.selectDept').attr('title',name)
+        $('.selectDept').attr('title', name)
     })
 }
-function loading(){
+function loading() {
     const str = `
     <div class="loadingBox">
             <div class="mask"></div>
@@ -549,101 +575,101 @@ function loading(){
     `
     $("#mainBox", parent.document).append(str)
 }
-function hideLoading(){
+function hideLoading() {
     $("#mainBox .loadingBox", parent.document).remove()
 }
-function clearFilter(){
-    const days = new Date().getDate()-1;
-    let startDate = "-"+days+"d",endDate=new Date();
+function clearFilter() {
+    const days = new Date().getDate() - 1;
+    let startDate = "-" + days + "d", endDate = new Date();
     $(".creatTask").removeClass("disabled");
     $(".cancelTask").addClass("disabled");
     $(".filterBox input").val("");
-    data_desc=["leaveHospitalDate"];
+    data_desc = ["leaveHospitalDate"];
     //默认日期为本月
-    $( "#datepicker" ).datepicker({
+    $("#datepicker").datepicker({
         changeMonth: true,
         changeYear: true,
-        dateFormat:"yy-mm-dd",
-    }).datepicker( "setDate", startDate);
-    $( "#datepicker2" ).datepicker({
+        dateFormat: "yy-mm-dd",
+    }).datepicker("setDate", startDate);
+    $("#datepicker2").datepicker({
         changeMonth: true,
         changeYear: true,
-        dateFormat:"yy-mm-dd"
-    }).datepicker( "setDate",endDate);
+        dateFormat: "yy-mm-dd"
+    }).datepicker("setDate", endDate);
     $('.selectDept i').text('全部')
     $(".deptItem.active").removeClass("active");
     $(".deptList").css("display", "none")
-    global_deptId=[];
-    global_deptName="";
+    global_deptId = [];
+    global_deptName = "";
     $('.selectLevel i').html('全部')
     $(".levelList").css("display", "none")
-    global_level="";
+    global_level = "";
     $('.selectStatus i').html('未生成')
     $(".statusList").css("display", "none")
     $('.selectScore i').html('全部')
     $(".scoreList").css("display", "none")
-    global_score='';
-    global_status='0'
+    global_score = '';
+    global_status = '0'
     $("th[code]").removeClass("asc desc")
 }
 
 //分页渲染
-function renderPagination(totalPage,activePage,totalNum){
+function renderPagination(totalPage, activePage, totalNum) {
     let str = `<span class="totalSum">共${totalPage}页/${totalNum}条数据</span><span class="prePage"><img class="arrowPage" src=${arrowLeft} /></span>`
-    if(totalPage <= 6){
-        for(let i = 1; i <= totalPage; i++){
-          
-            str += `<span class="pageNum ${'page'+i}" data-page=${i}>${i}</span>`
+    if (totalPage <= 6) {
+        for (let i = 1; i <= totalPage; i++) {
+
+            str += `<span class="pageNum ${'page' + i}" data-page=${i}>${i}</span>`
         }
-    }else{
-        if(activePage <= 3){ //选中页数小于4
-            for(let i = 1; i <= 4; i++){
-                str += `<span class="pageNum ${'page'+i}" data-page=${i}>${i}</span>`
+    } else {
+        if (activePage <= 3) { //选中页数小于4
+            for (let i = 1; i <= 4; i++) {
+                str += `<span class="pageNum ${'page' + i}" data-page=${i}>${i}</span>`
             }
             str += `<span class="more" >...</span>`
-        str += `<span class="pageNum ${'page'+totalPage}" data-page=${totalPage}>${totalPage}</span>`
+            str += `<span class="pageNum ${'page' + totalPage}" data-page=${totalPage}>${totalPage}</span>`
 
-        } else if(activePage > totalPage -3){
+        } else if (activePage > totalPage - 3) {
             str += `<span class="pageNum page1" data-page=1>1</span>`
             str += `<span class="more" >...</span>`
-            str += `<span class="pageNum ${'page'+(totalPage-3)}" data-page=${totalPage -3}>${totalPage -3}</span>`
-            str += `<span class="pageNum ${'page'+(totalPage-2)}" data-page=${totalPage -2}>${totalPage -2}</span>`
-            str += `<span class="pageNum ${'page'+(totalPage-1)}" data-page=${totalPage -1}>${totalPage -1}</span>`
-            str += `<span class="pageNum ${'page'+totalPage}" data-page=${totalPage}>${totalPage}</span>`
+            str += `<span class="pageNum ${'page' + (totalPage - 3)}" data-page=${totalPage - 3}>${totalPage - 3}</span>`
+            str += `<span class="pageNum ${'page' + (totalPage - 2)}" data-page=${totalPage - 2}>${totalPage - 2}</span>`
+            str += `<span class="pageNum ${'page' + (totalPage - 1)}" data-page=${totalPage - 1}>${totalPage - 1}</span>`
+            str += `<span class="pageNum ${'page' + totalPage}" data-page=${totalPage}>${totalPage}</span>`
         } else {
             str += `<span class="pageNum page1" data-page=1>1</span>`
             str += `<span class="more" >...</span>`
-            str += `<span class="pageNum ${'page'+(activePage -1)}" data-page=${activePage -1}>${activePage -1}</span>`
-            str += `<span class="pageNum ${'page'+activePage}" data-page=${activePage}>${activePage}</span>`
-            str += `<span class="pageNum ${'page'+(activePage +1)}" data-page=${activePage +1}>${activePage +1}</span>`
+            str += `<span class="pageNum ${'page' + (activePage - 1)}" data-page=${activePage - 1}>${activePage - 1}</span>`
+            str += `<span class="pageNum ${'page' + activePage}" data-page=${activePage}>${activePage}</span>`
+            str += `<span class="pageNum ${'page' + (activePage + 1)}" data-page=${activePage + 1}>${activePage + 1}</span>`
             str += `<span class="more" >...</span>`
-            str += `<span class="pageNum ${'page'+totalPage}" data-page=${totalPage}>${totalPage}</span>`
+            str += `<span class="pageNum ${'page' + totalPage}" data-page=${totalPage}>${totalPage}</span>`
         }
-       
+
     }
     str += `<span class="nextPage"><img class="arrowPage" src=${arrowRight} /></span>`
     $('.pagination').html(str)
     $('.page' + activePage).addClass('activePage')
-    $(".pageNum").on("click", function(e){
+    $(".pageNum").on("click", function (e) {
         const activePageNow = Number($(this).attr('data-page'))
         getTabData(activePageNow)
         // renderPagination(totalPage,activePageNow,totalNum)
     })
-    $(".prePage").on("click", function(e){
+    $(".prePage").on("click", function (e) {
         let activePageNow = Number($(".activePage").attr('data-page'))
-        if(activePageNow > 1){
+        if (activePageNow > 1) {
             activePageNow--
             getTabData(activePageNow)
             // renderPagination(totalPage,activePageNow,totalNum)
         }
     })
-    $(".nextPage").on("click", function(e){
+    $(".nextPage").on("click", function (e) {
         let activePageNow = Number($(".activePage").attr('data-page'))
-        if(activePageNow < totalPage){
+        if (activePageNow < totalPage) {
             activePageNow++
             getTabData(activePageNow)
             // renderPagination(totalPage,activePageNow,totalNum)
         }
     })
-    
+
 }

+ 1 - 1
src/js/index.js

@@ -22,7 +22,7 @@ const modalDom = `
       <div class="modalAction">
         <p><span class="label"><i>*</i>原密码:</span><input type="password" readonly placeholder="请输入原密码" class="oldword" id="oldWord" autocomplete="off"><img class="eye" src=${closeEye} /><p class="oldWaring warning"><img src=${warnIcon} /><b>原密码错误</b></p></p>
         <p><span class="label"><i>*</i>新密码:</span><input type="password" disabled readonly placeholder="请输入新密码" class="newword" id="newWord" autocomplete="off"><img class="eye" src=${closeEye} /><p class="newword warning"><img src=${warnIcon} /><b>密码最多12位</b></p></p>
-        <p><span class="label"><i>*</i>确认新密码:</span><input type="password" disabled readonly placeholder="请输入确认新密码" class="sureword" id="sureWord" autocomplete="off"><img class="eye" src=${closeEye} /><p class="sureword warning"><img src=${warnIcon} /><b>两次密码输入不一致</b></p></p>
+        <p><span class="label"><i>*</i>确认新密码:</span><input type="password" disabled readonly placeholder="请确认新密码" class="sureword" id="sureWord" autocomplete="off"><img class="eye" src=${closeEye} /><p class="sureword warning"><img src=${warnIcon} /><b>两次密码输入不一致</b></p></p>
       </div>
     `;
 const psdChecker = `<div class="psd-checkbox">

+ 109 - 50
src/js/login.js

@@ -3,86 +3,145 @@ require("../css/reset.less")
 require("../css/login.less")
 require("./modal.js")
 
-const {api} = require('./api.js')
+const { api } = require('./api.js')
 
-const {post,setCookie,delCookie,getUrlArgObject} = require('../js/utils.js');
+const { post, setCookie, delCookie, getUrlArgObject, toast } = require('../js/utils.js');
 const md5 = require('js-md5');
 const hideLogo = getUrlArgObject("hideLg");
 const otherLogo = getUrlArgObject("adLg");
-$(function(){
-  if(hideLogo||otherLogo){
+let type
+$(function () {
+  getHospitalMark()
+  if (hideLogo || otherLogo) {
     $(".copy-right").text("");
   }
   delCookie('accessToken')
-  $(document).keyup(function(event){  
-    if(event.keyCode ==13){  
+  $(document).keyup(function (event) {
+    if (event.keyCode == 13) {
       sureLogin()
-    }  
-  }); 
-  $(".sureLogin").click(()=>{
-    sureLogin()
-  })
-  $("#password").focus(function(){
-    $(this).attr("type","password")
-  })
-  $(".iptWrap input").focus(function(){
-    $(this).parent().addClass('inputFocus')
-  })
-  $(".iptWrap input").blur(function(){
-    $(this).parent().removeClass('inputFocus')
-  })
-  $("body").on('input','#username,#password',function(){
-    if($(this).val().trim() != ''){
-      $(".login .waring").html('')
     }
-  })
+  });
+  
+  
 });
-function sureLogin(){
+
+function getHospitalMark() {
+  post(api.getHospitalMark).then((res) => {
+    const data = res.data;
+    if (data.code == 0) {
+      type = parseInt(data.data)
+      if (parseInt(data.data) == 1) {
+        str = '<div class="bg2"></div>'
+        str += '<div class="login-info">'
+        str += '<div class="info-perPub">'
+        str += ' <p> 用户名:</p>'
+        str += '<div class="info-iptWrap">'
+        str += '<input type="text" placeholder="请输入用户名" id="username" value="" autocomplete="off">'
+        str += '</div></div>'
+        str += '<div class="info-perPub">'
+        str += ' <p> 密码:</p>'
+        str += '<div class="info-iptWrap">'
+        str += '<input type="text" placeholder="请输入密码" id="password" value="" autocomplete="off">'
+        str += '</div></div>'
+        str += '<p class="waring"></p><div class="sureLogin">登录</div>'
+        $('.login').html(str)
+      } else {
+        str = '<div class="bg fl"><p class="title">AI病案质控平台</p></div>'
+        str += '<div class="message fr"><div class="inner"><p class="welcome">欢迎使用!</p>'
+        str += '<div class="perPub">'
+        str += ' <p> 用户名:</p>'
+        str += '<div class="iptWrap">'
+        str += '<input type="text" placeholder="请输入用户名" id="username" value="" autocomplete="off">'
+        str += '</div></div><br>'
+        str += '<div class="perPub">'
+        str += ' <p> 密码:</p>'
+        str += '<div class="iptWrap">'
+        str += '<input type="text" placeholder="请输入密码" id="password" value="" autocomplete="off">'
+        str += '</div></div>'
+        str += '<p class="waring"></p><div class="sureLogin">登录</div></div><div class="copy-right">由杭州朗通信息技术有限公司提供技术支持</div></div>',
+        $('.login').html(str)
+      }
+      $(".sureLogin").click(() => {
+        sureLogin()
+      })
+      $("#password").focus(function () {
+        $(this).attr("type", "password")
+      })
+      $(".iptWrap input").focus(function () {
+        $(this).parent().addClass('inputFocus')
+      })
+      $(".iptWrap input").blur(function () {
+        $(this).parent().removeClass('inputFocus')
+      })
+      $("body").on('input', '#username,#password', function () {
+        if ($(this).val().trim() != '') {
+          $(".login .waring").html('')
+        }
+      })
+    }
+  }).catch(() => {
+
+  })
+}
+function sureLogin() {
   $(".login .waring").html('')
   localStorage.removeItem('accessToken')
   let username = $("#username").val().trim();
   let password = $("#password").val().trim();
-  if(!username){
-    $(".login .waring").css('display','block').html('请输入用户名')
+  if (!username) { 
+    if(type == 1){
+      toast("请输入用户名!");
+    }else{
+      $(".login .waring").css('visibility', 'visible').html('请输入用户名')
+    }
     return
-  }else if(!password){
-    $(".login .waring").css('display','block').html('请输入密码')
+  } else if (!password) {
+    if (type == 1) {
+      toast("请输入密码!");
+    } else {
+      $(".login .waring").css('visibility', 'visible').html('请输入密码')
+    }
     return
   }
-  $.alerModal({type:"loading"});
-  post(api.getJwt,{
-    username:username,
-    password:password
-  }).then((res)=>{
+  $.alerModal({ type: "loading" });
+  post(api.getJwt, {
+    username: username,
+    password: password
+  }).then((res) => {
     const data = res.data;
-    if(data.code == 0){
-      setCookie('accessToken',data.data.accessToken)
-      setCookie('isPlacefile',1)
+    if (data.code == 0) {
+      setCookie('accessToken', data.data.accessToken)
+      setCookie('isPlacefile', 1)
       setCookie('passwordComplexity', data.data.passwordComplexity)
       //setCookie('mmps',password);
-      localStorage.setItem('accessToken',data.data.accessToken)
+      localStorage.setItem('accessToken', data.data.accessToken)
       $(".divModal").remove()
-      $.alerModal({"message":"登录成功",type:"tip",time:'1000',win:true});
+      $.alerModal({ "message": "登录成功", type: "tip", time: '1000', win: true });
       setTimeout(() => {
-          cacheCheckDatas(data.data.selRoles);
-         const otherLogoPm = otherLogo?'?adLg=1':'';
-         const hideLgPm=hideLogo?'?hideLg=1':'';
-        window.location.href = 'index.html'+hideLgPm+otherLogoPm;
+        cacheCheckDatas(data.data.selRoles);
+        const otherLogoPm = otherLogo ? '?adLg=1' : '';
+        const hideLgPm = hideLogo ? '?hideLg=1' : '';
+        window.location.href = 'index.html' + hideLgPm + otherLogoPm;
       }, 600);
-    }else{
+    } else {
       $(".divModal").remove()
-      $(".login .waring").css('display','block').html(data.msg)
+      if (type == 1) {
+        toast(data.msg);
+      } else {
+        $(".login .waring").css('visibility', 'visible').html(data.msg)
+      }
+      
     }
-  }).catch(()=>{
+  }).catch(() => {
     $(".divModal").remove()
   })
 }
 
 //核查权限数据保存
-function cacheCheckDatas(data){
+function cacheCheckDatas(data) {
   delCookie("checkAuth");
-  const arr = data&&data.map((it)=>{
+  const arr = data && data.map((it) => {
     return it.id;
-  })||[];
-  setCookie("checkAuth",arr.join(","));
+  }) || [];
+  setCookie("checkAuth", arr.join(","));
 }

+ 6 - 2
src/js/utils.js

@@ -4,7 +4,7 @@ const axios = require('axios');
 var Utils = require('./rePromise');
 const {ywCheckApi} = require('./api.js')
 require('./scrollBar.js');
-const baseUrl = 'http://192.168.2.236:5858';
+const baseUrl = 'http://192.168.2.241:1488';
 //页面映射
 const pageMap = {
   'YH-KZT': 'console.html',
@@ -560,6 +560,9 @@ function getLogoParam() {
     const hideLogoPm = hideLogo ? '&hideLg=1' : '';
     return otherLogoPm+hideLogoPm;
 }
+function toast(msg) {
+  return $.alerModal({ "message": msg, type: "tip", time: '1000', isFather: true, fatherWrapper: $("#mainBox", parent.document) });
+}
 const explainTitle = {
   科室编码: 'deptId',
   科室: 'deptName',
@@ -612,5 +615,6 @@ module.exports = {
   listenScroll,
   explainTitle,
   getScoreTabList,
-  getLogoParam
+  getLogoParam,
+  toast
 };