From 86576c789c81bb7b238022ef8346530bef662b31 Mon Sep 17 00:00:00 2001 From: "jian.wang" <824612544@qq.com> Date: Mon, 29 Jul 2024 15:23:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E5=B9=BF=E6=80=BB?= =?UTF-8?q?=E8=A1=80=E9=80=8F=E9=9C=80=E6=B1=82=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commomSearch/CommomSearchController.java | 65 +++++++ .../emrApprove/ApproveController.java | 4 +- src/main/java/com/emr/dao/CommomMapper.java | 11 ++ .../emr/entity/approve/Emr_Apply_Approve.java | 10 ++ .../ImportExcel/ImportExcelJudgeMethod.java | 10 +- .../service/ImportExcel/ImportExcelUtil.java | 166 +++++++++++++++++- .../com/emr/vo/commomSearch/CommomVo.java | 8 + src/main/resources/mapper/CommomMapper.xml | 55 ++++++ .../commomSearch/commomListqf.jsp | 8 +- src/main/webapp/index.jsp | 2 +- .../recordManage/commomSearch/commomListqf.js | 31 ++-- .../commomSearch/showRecordIframeBloodFont.js | 53 +++--- .../static/js/template/借阅申请模板.xls | Bin 18944 -> 0 bytes src/main/webapp/static/pdfjs/build/pdf.js | 22 +++ 14 files changed, 396 insertions(+), 49 deletions(-) delete mode 100644 src/main/webapp/static/js/template/借阅申请模板.xls diff --git a/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java b/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java index ea8bc5d..bac59d7 100644 --- a/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java +++ b/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java @@ -27,6 +27,8 @@ import com.emr.vo.EmrPrintOrDownLoadInfo.EmrPrintOrDownLoadInfoVo; import com.emr.vo.FontVo.ScanAssortVo; import com.emr.vo.browseRecords; import com.emr.vo.commomSearch.*; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.util.CollectionUtils; @@ -47,6 +49,7 @@ import java.net.InetAddress; import java.net.UnknownHostException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * @ProjectName:CommomSearchController @@ -128,6 +131,68 @@ public class CommomSearchController { return "recordManage/commomSearch/commomListqf"; } + @RequiresPermissions("/commom/imgStatisticsList") + @OptionalLog(module = "查看", methods = "常用查询页面") + @RequestMapping("imgStatisticsList") + public String imgStatisticsList(Model model, HttpServletRequest request) { + return "recordManage/commomSearch/imgStatisticsList"; + } + + /** + * @Description:根据期数统计 条数 图像数量 + * @param page + * @param limit + * @param commomVo + * @return + */ + @RequestMapping("queryImgStatistics") + @ResponseBody + public String queryImgStatistics(Integer page, Integer limit,CommomVo commomVo){ + if(null != page && null != limit){ + PageHelper.startPage(page, limit); + } + try{ + double totalImgSum = 0; + double totalPeriodsSum = 0; + //查询期数对应的图像数量 + List> dataImgMap = commomMapper.queryImgStatistics(commomVo); + //查询期数对应的条数 + List> dataCountMap = commomMapper.queryPeriodsStatistics(commomVo); + + //合并 + for(Map imgMap : dataImgMap){ + for(Map countMap : dataCountMap){ + if(imgMap.get("periods").equals(countMap.get("periods"))){ + imgMap.put("periodsNum",countMap.get("periodsNum")); + break; + } + } + } + //计算图像数量总和 + if(!CollectionUtils.isEmpty(dataImgMap)){ + for(Map map : dataImgMap){ + double imgNum = ObjectUtils.isEmpty(map.get("imgNum")) ? 0 : Double.parseDouble(map.get("imgNum").toString()); + double periodsNum = ObjectUtils.isEmpty(map.get("periodsNum")) ? 0 : Double.parseDouble(map.get("periodsNum").toString()); + + totalImgSum += imgNum; + totalPeriodsSum += periodsNum; + } + } + Map totalMap = new HashMap<>(); + totalMap.put("periods",0); + totalMap.put("imgNum",totalImgSum); + totalMap.put("periodsNum",totalPeriodsSum); + dataImgMap.add(totalMap); + + PageInfo pageInfo = new PageInfo<>(dataImgMap); + return JSON.toJSONString(pageInfo); + }catch (Exception e){ + ExceptionPrintUtil.printException(e); + e.printStackTrace(); + return null; + } + } + /** * @description: 加载是否初始化标识 * @params: Initialization diff --git a/src/main/java/com/emr/controller/emrApprove/ApproveController.java b/src/main/java/com/emr/controller/emrApprove/ApproveController.java index af7d1a7..7ae0470 100644 --- a/src/main/java/com/emr/controller/emrApprove/ApproveController.java +++ b/src/main/java/com/emr/controller/emrApprove/ApproveController.java @@ -1032,9 +1032,9 @@ public class ApproveController { String applyType = request.getParameter("applyType"); String applyReason = request.getParameter("applyReason"); //属性名 - String[] fieldNames = {"inpatientNo","name","admissTimes"}; + String[] fieldNames = {"inpatientNo","name","admissTimes","disDate","bornDate"}; //判断集中类中的方法名 - String[] judgeMethods = {"judgeInpatientNo1","judgeName","judgeAdmissTimes"}; + String[] judgeMethods = {"judgeInpatientNo1","judgeName","judgeAdmissTimes",null,null}; Emr_Apply_Approve applyApprove = new Emr_Apply_Approve(); SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); diff --git a/src/main/java/com/emr/dao/CommomMapper.java b/src/main/java/com/emr/dao/CommomMapper.java index 3a39819..d258fcd 100644 --- a/src/main/java/com/emr/dao/CommomMapper.java +++ b/src/main/java/com/emr/dao/CommomMapper.java @@ -29,6 +29,13 @@ public interface CommomMapper { List selectPatientIdByAdmissTimesAndInpatientNoAndName( @Param("admissTimes") Short admissTimes,@Param("inpatientNo") String inpatientNo, @Param("name")String name,@Param("startTime2")String startTime2,@Param("endTime2")String endTime2); + + /** + * 根据 姓名、住院次数、病案号、出院日期、出生日期 查询patientId + * */ + List selectRecordInfo( + @Param("admissTimes") Short admissTimes,@Param("inpatientNo") String inpatientNo, + @Param("name")String name,@Param("disDate")String disDate,@Param("bornDate")String bornDate); /** * 根据patientId查询病案分类个数 * */ @@ -153,4 +160,8 @@ public interface CommomMapper { CommomVo getCommomTableList(@Param("inpatientNo") String inpatientNo, @Param("disDate") String disDate); Map queryTableConfig(String dataSource); + + List> queryImgStatistics(CommomVo commomVo); + + List> queryPeriodsStatistics(CommomVo commomVo); } \ No newline at end of file diff --git a/src/main/java/com/emr/entity/approve/Emr_Apply_Approve.java b/src/main/java/com/emr/entity/approve/Emr_Apply_Approve.java index d2d45f9..a13377b 100644 --- a/src/main/java/com/emr/entity/approve/Emr_Apply_Approve.java +++ b/src/main/java/com/emr/entity/approve/Emr_Apply_Approve.java @@ -65,6 +65,16 @@ public class Emr_Apply_Approve { private String deptName; + private Date bornDate; + + public Date getBornDate() { + return bornDate; + } + + public void setBornDate(Date bornDate) { + this.bornDate = bornDate; + } + public String getDeptName() { return deptName; } diff --git a/src/main/java/com/emr/service/ImportExcel/ImportExcelJudgeMethod.java b/src/main/java/com/emr/service/ImportExcel/ImportExcelJudgeMethod.java index 3d1b97d..6f71999 100644 --- a/src/main/java/com/emr/service/ImportExcel/ImportExcelJudgeMethod.java +++ b/src/main/java/com/emr/service/ImportExcel/ImportExcelJudgeMethod.java @@ -4,6 +4,7 @@ import com.emr.dao.CommomMapper; import com.emr.dao.ExportTaskDetailsMapper; import com.emr.dao.ExportTaskMapper; import com.emr.dao.approve.Emr_Apply_ApproveMapper; +import com.emr.dao.bloodPurification.BloodPurificationMapper; import com.emr.entity.ExportTask; import com.emr.entity.ExportTaskDetails; import com.emr.entity.Power_User; @@ -53,12 +54,12 @@ public class ImportExcelJudgeMethod { private CommomMapper commomMapper; @Autowired private Emr_Apply_ApproveMapper applyApproveMapper; - @Autowired private ExportTaskMapper exportTaskMapper; - @Autowired private ExportTaskDetailsMapper exportTaskDetailsMapper; + @Autowired + private BloodPurificationMapper bloodPurificationMapper; /****************************************导入公共判断******************************************************/ /** @@ -149,7 +150,10 @@ public class ImportExcelJudgeMethod { /****************************************自定义验证记录合法******************************************************/ public String judgeRecord(String fieldName, String value, Field f, Object object, String head)throws Exception{ Emr_Apply_Approve applyApprove = (Emr_Apply_Approve)object; - List patientIdList = commomMapper.selectPatientIdByAdmissTimesAndInpatientNoAndName(applyApprove.getAdmissTimes(), applyApprove.getInpatientNo(), applyApprove.getName(),null,null); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String disDate = ObjectUtils.isEmpty(applyApprove.getDisDate()) ? null : dateFormat.format(applyApprove.getDisDate()); + String bornDate = ObjectUtils.isEmpty(applyApprove.getBornDate()) ? null : dateFormat.format(applyApprove.getBornDate()); + List patientIdList = commomMapper.selectRecordInfo(applyApprove.getAdmissTimes(), applyApprove.getInpatientNo(), applyApprove.getName(),disDate, bornDate); if(null != patientIdList && !patientIdList.isEmpty()){ if(patientIdList.size() == 1){ HttpServletRequest request = ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest(); diff --git a/src/main/java/com/emr/service/ImportExcel/ImportExcelUtil.java b/src/main/java/com/emr/service/ImportExcel/ImportExcelUtil.java index bcf10b2..b7eac86 100644 --- a/src/main/java/com/emr/service/ImportExcel/ImportExcelUtil.java +++ b/src/main/java/com/emr/service/ImportExcel/ImportExcelUtil.java @@ -6,6 +6,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.hssf.util.HSSFColor; import org.apache.poi.ss.usermodel.*; +import org.springframework.util.ObjectUtils; import org.springframework.web.context.ContextLoader; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.multipart.MultipartFile; @@ -14,6 +15,8 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; import java.util.*; /** @@ -254,6 +257,163 @@ public class ImportExcelUtil { excelEntity.setWorkBookKey(workBookKey); return excelEntity; } + + public static ImportExcelEntity fileImportByBloodPurification(MultipartFile multipartFile, String[] fieldNames, String[] judgeMethods, String jedgeMethod) { + Workbook workbook = null; + int successCount = 0; + int wrongCount = 0; + String workBookKey = ""; + //正确行数下角标 + List wrongRowIndex = new ArrayList<>(); + try { + /*把文件流copy读取到文件中*/ + workbook = WorkbookFactory.create(multipartFile.getInputStream()); + /*遍历sheet页*/ + for (int i = 0; i < workbook.getNumberOfSheets(); i++) { + Sheet sheet = workbook.getSheetAt(i); + if (sheet == null) { + continue; + } + //获取表头行 + //Row head = sheet.getRow(0); + //处理多级表头 + //Map headerMap = handleRow(sheet); + String[] head = {"序号","检查日期","患者姓名","透析日期","记录填写不完整","医嘱执行签名不规范","医护未签名","未做宣教","宣教填写不完整体","护患未签名","医生未签名","患者家属关系缺项","通路名称不规范","其他","责任护士","整改日期","整改签名","备注"}; + + List list = new ArrayList<>(); + for (int j = 4; j < sheet.getPhysicalNumberOfRows(); j++) { + Row row = sheet.getRow(j); + boolean flag = isRowEmpty(row); + if (!flag) { + if (row.getPhysicalNumberOfCells() != 0) { + StringBuilder wrongStr = new StringBuilder(); + for (int k = 0; k < fieldNames.length; k++) { + //对象赋值后返回错误对象 + wrongStr.append(getValueByField(object, fieldNames[k], getCellValue(row.getCell(k)), head[k], null)); + } + //有错误信息在行尾创建cell，并标红提示文字 + if (StringUtils.isBlank(wrongStr)) { + Constructor constructor = ObjectClass.getDeclaredConstructor(); + Object obj = (Object) constructor.newInstance(); + //判断是否有自定义条件 + if (StringUtils.isNotBlank(jedgeMethod)) { + //判断是否有报错信息，有报错信息添加到报错信息 + String valueByField = judgeMethod(jedgeMethod); + if (StringUtils.isNotBlank(valueByField)) { + wrongStr.append(valueByField); + } else { + successCount++; + wrongRowIndex.add(j); + //复制 + copy(object, obj); + list.add(obj); + } + } else { + successCount++; + wrongRowIndex.add(j); + //复制 + copy(object, obj); + list.add(obj); + } + } + if (StringUtils.isNotBlank(wrongStr)) { + //设置错误信息字体为红色加粗 + Font font = workbook.createFont(); + font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD); + font.setColor(HSSFColor.RED.index); + CellStyle cellStyle = workbook.createCellStyle(); + cellStyle.setFont(font); + Cell cell = row.createCell(fieldNames.length); + cell.setCellStyle(cellStyle); + cell.setCellType(HSSFCell.CELL_TYPE_STRING); + wrongStr = new StringBuilder(wrongStr.substring(0, wrongStr.length() - 1)); + cell.setCellValue(wrongStr.toString()); + wrongCount++; + } + } + } + } + //批量新增成功记录 + SimpleInsert(list); + //删除正确行 + if (!wrongRowIndex.isEmpty()) { + //定义删除次数，对应后方下角标都要减去删除次数 + int deleteCount = 0; + //递归删除 + removeSheet(sheet, deleteCount, wrongRowIndex); + } + } + } catch (Exception e) { + e.printStackTrace(); + throw new RuntimeException(); + } + //错误excel加入缓存 + if (wrongCount != 0) { + workBookKey = UUIDUtils.getUUID(); + workBookMap.put(workBookKey, workbook); + } + ImportExcelEntity excelEntity = new ImportExcelEntity(); + excelEntity.setSuccessCount(successCount); + excelEntity.setWrongCount(wrongCount); + excelEntity.setWorkBookKey(workBookKey); + return excelEntity; + } + + private static Map handleRow(Sheet sheet) { + // 创建一个Map来存储表头信息 + Map headerMap = new HashMap<>(); + //读取真实行数 + int physicalNumberOfRows = readExcelValueRows(sheet); + for (int i = 0; i <= physicalNumberOfRows - 1; i++) { + List fieldNames = new ArrayList<>(); + // 获取第表头 + Row headerRow = sheet.getRow(i); + int physicalNumberOfCells = headerRow.getPhysicalNumberOfCells(); + for (int j = 0; j < physicalNumberOfCells; j++) { + // 获取表头 + Cell cell = headerRow.getCell(j); + // 获取表头值 + String value = getCellValue(cell); + if(!ObjectUtils.isEmpty(value)){ + fieldNames.add(value); + } + } + // 存储表头信息 + headerMap.put("head" + i, fieldNames); + } + return headerMap; + } + + /** + * 用来得到真实行数 + * @param sheet 需要读取的Excel表格（excel文件的工作簿的名称） + * @return + * + */ + public static int readExcelValueRows(Sheet sheet) { + int realRow = 0;// 返回的真实行数 + for (int i = 1; i <= sheet.getLastRowNum(); i++) { + //i从1开始，不判断第一行标题行 + Row row = sheet.getRow(i); + if (row == null){ + continue; + } + for (Cell cell : row) { + if (cell == null){ + continue; + } + String value = getCellValue(cell); + if (value == null || "".equals(value)){ + continue; + } else{ + realRow++; + break; + } + } + } + return realRow; + } + //批量新增成功数据方法 private static int SimpleInsert(List list)throws Exception{ if(null != list && !list.isEmpty()){ @@ -348,11 +508,15 @@ public class ImportExcelUtil { String typeName = filedType.getName(); if("java.lang.Integer".equals(typeName)){ f.set(object,Integer.valueOf(value)); - }if("java.lang.Short".equals(typeName)){ + }else if("java.lang.Short".equals(typeName)){ f.set(object,Short.valueOf(value)); + }else if("java.util.Date".equals(typeName)){ + f.set(object,new SimpleDateFormat("yyyy-MM-dd").parse(value)); }else{ f.set(object,value); } + }else{ + f.set(object,value); } } break; diff --git a/src/main/java/com/emr/vo/commomSearch/CommomVo.java b/src/main/java/com/emr/vo/commomSearch/CommomVo.java index 262468e..f6a794b 100644 --- a/src/main/java/com/emr/vo/commomSearch/CommomVo.java +++ b/src/main/java/com/emr/vo/commomSearch/CommomVo.java @@ -467,8 +467,16 @@ public class CommomVo { private String radiotherapyNo; + private String periods; private String dataSource; + public String getPeriods() { + return periods; + } + + public void setPeriods(String periods) { + this.periods = periods; + } public String getRadiotherapyNo() { return radiotherapyNo; diff --git a/src/main/resources/mapper/CommomMapper.xml b/src/main/resources/mapper/CommomMapper.xml index ea39e8c..25817c4 100644 --- a/src/main/resources/mapper/CommomMapper.xml +++ b/src/main/resources/mapper/CommomMapper.xml @@ -81,6 +81,29 @@ AND dis_date between #{startTime2} + ' 00:00:00' and #{endTime2} + ' 23:59:59' + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp index 36496e9..b93a5f2 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp @@ -27,13 +27,13 @@ overflow-y:scroll; }*/ .labelDiv { - padding-top: 2%; + padding: 1%; padding-right: 0; text-align: right; } .radioDiv { - padding-top: 2%; + padding: 1%; } /*搜索区域*/ @@ -176,7 +176,7 @@
- 血透查询 + 常用查询
@@ -620,7 +620,7 @@
-
diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 07f7db5..72edc69 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -104,7 +104,7 @@
  • - + 0 diff --git a/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js b/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js index f8b9a70..a2624ce 100644 --- a/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js +++ b/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js @@ -344,11 +344,17 @@ function getSql() { $("#fromTableSql").val(''); var dataSource = $("#dataSource").val(); var inputValue = getInputValue(); + //from语句字符串 + var fromTableNames = ''; + //where语句字符串 + var whereNames = ' where '; + //拼接where语句 + var name = ''; + if(!isEmpty(dataSource)){ + name = 'data_source'; + whereNames += commomtable + "." + name + " = '" + dataSource + "' AND "; + } if (inputValue != '') { - //from语句字符串 - var fromTableNames = ''; - //where语句字符串 - var whereNames = ' where '; //判断是否多表 var tables = false; $('.otherTable').each(function () { @@ -357,12 +363,6 @@ function getSql() { return false; } }) - //拼接where语句 - var name = ''; - if(!isEmpty(dataSource)){ - name = 'data_source'; - whereNames += commomtable + "." + name + " = '" + dataSource + "' AND "; - } //姓名 var searchName = $("#name").val(); if (!isEmpty(searchName)) { @@ -737,12 +737,11 @@ function getSql() { name = 'outpatient_no'; whereNames += commomtable + "." + name + " LIKE '%" + $("#" + name).val() + "%' AND "; } - - if (whereNames != ' where ') { - whereNames = whereNames.substring(0, whereNames.length - 4); - $("#whereSql").val(whereNames); - $("#fromTableSql").val(fromTableNames); - } + } + if (whereNames != ' where ') { + whereNames = whereNames.substring(0, whereNames.length - 4); + $("#whereSql").val(whereNames); + $("#fromTableSql").val(fromTableNames); } } diff --git a/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBloodFont.js b/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBloodFont.js index 7006053..cf87a6c 100644 --- a/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBloodFont.js +++ b/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBloodFont.js @@ -32,31 +32,40 @@ var menu = { success: function (data) { $("#assortIds").val(""); if (data != null) { - //图片相对路径集合 - var scanPages = ''; - //图片来源集合 - var sources = ''; - for (var i = 0; i < data.length; i++) { - if (data[i].parentId != null && data[i].parentId != 1 && data[i].checked == 'true') { - scanPages += data[i].assortName + ","; - sources += data[i].source + ","; + let scanPages = ''; + let sources = ''; + $.fn.zTree.init($("#ztree"), menu.setting, data); + const zTree = $.fn.zTree.getZTreeObj("ztree"); + zTree.checkAllNodes(false);// 取消选中所有复选框 + + // 获取节点，注意增加了对nodes是否存在的检查 + const nodes = zTree.getNodes(); + if (nodes && nodes.length > 0) { + for (let i = 0; i < nodes.length; i++) { // 设置节点展开 + zTree.expandNode(nodes[i], true, false, true); } + + // 选择父节点的第一个子节点，增加了对子节点数组是否存在的检查 + if (nodes[0].children && nodes[0].children.length > 0) { + zTree.checkNode(nodes[0].children[0], true, true); + const selectNodes = nodes[0].children[0].children; + + // 使用数组和join来提高性能和代码可读性 + scanPages += selectNodes.map(node => node.assortName).join(','); + sources += selectNodes.map(node => node.source).join(','); + $("#assortIds").val(scanPages); + $("#sources").val(sources); + } + } else { + console.error("No nodes found in zTree."); } - //去掉后面逗号 - if (scanPages != '') { - scanPages = scanPages.substring(0, scanPages.length - 1); - $("#assortIds").val(scanPages); - sources = sources.substring(0, sources.length - 1); - $("#sources").val(sources); - } - $.fn.zTree.init($("#ztree"), menu.setting, data); - zTree = $.fn.zTree.getZTreeObj("ztree"); - var nodes = zTree.getNodes(); - for (var i = 0; i < nodes.length; i++) { //设置节点展开 - zTree.expandNode(nodes[i], true, false, true); + + // 加载pdf，此处假设onloadPdf已经具备基本的错误处理 + try { + onloadPdf(scanPages, sources); + } catch (error) { + console.error("Failed to load PDF:", error); } - //加载pdf - onloadPdf(scanPages, sources); } } }) diff --git a/src/main/webapp/static/js/template/借阅申请模板.xls b/src/main/webapp/static/js/template/借阅申请模板.xls deleted file mode 100644 index 704f68f987f54044bd2d76eda925d4496385e393..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18944 zcmeHP30zI-`+x84RyRax(W1KTY167Ox|J9dp=?7UZbD>=)QqMqjiC_DSR3nP-*>Wv zNMsO^F@q$^&W}m9`+uHuI``i0J?H-7H~;_VKmY%{xA!d1`@G-xd7k%q*Kpht)mT;TmjsZ>f634zOh!r#aOA3#}w(TCU?q5(uhh(-{NA+~{N0?`zr8ANl4Z6R7f zw1kL0gV7qUZ58hSMyC5eA!>h;0KdsZM7oiQa84wtP#aAT#^5oGA^4C@B*Y^jh18LB zr%w&X9|qjB7hL0s@D?2n!XPL;k&GuXlpNz};wKzi6F!eAAJ0w6iV}u(q&d5hNYFe5 zG!G#o;W)A>017;YP(Jp7*mjy)K4uT5%|v>WB+#5GI|3v?dq|L_Nx=+y;D4)sgWU;p zRzTJfLMztNBn7$`v`=L4h!!;dO2Q{Q1t;K0$X$rT$Rud@ydW}~Odw;yO~!)I=qhM1 z6j$`uhhR#Ekvx>45DeUfrv;kwp`S9PF|1h2gH+PI8Fv*j{-xZ6u$$PkmgdzP1AK$Pz{Ly^yt7sN1SG?IDF{0 zRkcTcE*wLOpQj>^9tVyN2VKk}r>h$Ix$Gch!HH9Y(}F{O0}eR@IOzHubYD(-V=u52 zxImX^KzKH!8U|!r;tJ80c#zJ7rVJx)3RFvhFAUQrZ0tixfAE{pB#I-WAB^p$su|s( zEUwb%G)qAcxSu6=R`n$_AY+L$@glrvB5DxO8Ls5|BE2(doZ47-HVzxGjt!NI&KpQw zTM7n|cJQML<0=N}Tm@hn7j!CAQ73LaXm#0SZCn^PA6>8*ItDokqt_VX0$l=&UdnK) z+Oct{E2=&82}XoBjMz1*rFKwD!-x|^MfxzXwxysWcqR-?jgz7wsWXxL2v_FL;GO2m znHizkOQlokvb#aaB6Zo-NgxNh)6na`mf|dz356o0^Wc`EziJvCyL&c%E;^#J@&8|@ z^QhGXYKVchGl8Chvcnsi%FuCbLecjU5-1835rGa>FSzEQ=s)V~FKND{IT5s{=mc6S z8x8@FWTUI%8&f#A?rB`ETLZoeD-N!a8uQaQxJIJr;6If7GJSPead6GW#*gbRik_#h zZ`|A%^fja8Q7xCY1FqlLaBzLcM#p&%8y(kzY;;@;QuM0?Y9$bse{?XQF*wYz>34b zXZocEx@>5m>0JD{pQ4O2O=w7_p(Dyd2$>zY=3<&Kh@>^5W2@4D^`#*kC9#Ob1YL@T z*z(X4W|90f;X)-4>?*WjGY6KdaFw2(E?X!!W1(rY(1a{B6bkXArORY^C=}Af;$#`E zK`3R-upeYJD-CO+X38MgcxVtxlHy-wr81J_5iJ>wLlUfDMiMV?Hc5a%78*d@lx&RM z0Us91wEnmqz~tb_fO}%{3>hRtIYXLK3All#C9B2VyLZbnFtw;iV`@>6#?+!BO;(H2 zQW+kHopAR~Zl{JV97;>Z7pa?u1BcqU{YR^fn~oTnz>&cU(&csn8I{FUt_hJWLlaA| zmSs?G9vp_Sfeae38p1|NZ~nlE3XCCG^ipy0%0W4#^M@+8cCEpDo4m7@2JFLv8=8c7gwY)F0M#pTwIaHxcJML zFJ*Wr6x~tD%V;oW!D4sbaafKw>rKxctgQubni;V{;b+~Q- zA^?9>ZRYBleiKx5r=(-t^2{^UQ499`WD;|z*uD{n^iiHH1LNCyl79>0Ap^nbh2qSE zF?JKw@l*g|?+$@M7C6-L0tTkqC9!OsP!lBaRsbmt`%DlY1rSLr+c4JzNqiMRO2a-A zq=Nzo{a_9VRA6d{xyLhyVf`S9F)aOLkID22ApQyU35BDGmEfxBo%`#LJrvgpmx-9JSL$0fc_u%4GV4+6hnqDGmF~epjpj;^oZ- z!bpba26dd2y39aG;>l*g&?Ct@r8J>3Z}2DZc5TG#?d>hY&E-Qg&mhu8LNl^Rp%UP^ zoRm-ehZoI(tOU9AGPI?+d~0}U-IDOUV7uF%h+yMbL^?%lWY3li8k)B>afXO^1B_Q= zD1n2tCG1*r=b($wfz={BSIS)=>8BzM-w>q16h<0@3;{?3V?c%$C6y6M<)fwyRjC|7 zDs?&NqO{?OJdg06MlBMWG**jeF6EJ@QH(@wGBhYjOi+>zpCpMBNTMzWQ-o=TkW$(# zLz6n2XXwCL2i^?;yVb;>Tc~QcW?(l=p&_i{6#})=Va+Mmo}F6haNt1)(S?T_0>aad zTe?&PW?dw-Y-}wJ11U@f8d8}ou-imhisASr%{jNwaRiMoYAh1pSE@5Nb|ay>j*^w5*(fdekvn}QNLwr)J9aJe%sKfb>M*r)a{zACEu#lE#DYeF@;8L1)I-Mw}o-lV+KTY?e|68 zBB65Kwt>2pr_a&fOJtVA0bH^i-FFhBks{N$-%Lty)saO=7g|bC0R4mFg z1#74{wbHS*GE246$)UXwntS|UgSG-_bvYQD`ly#0-AcJN+NhP9aWQM+t6pk0Xj`>X zGtfpbf~iy&c0bD1Wv^0QOgCgi{8S;Z>rsYirvkxrH`c^oz3td~GH126lS6k@Z#y<< z7qzxyppD>JxQgwtV&R1r zixpCk);Cl`fKM3-nce4ZAfB0kd+n3sBoidz4Lzc1oldSedqFYR(P6Q3X!jVs@Y3UhpUBnr9YNyt-`F z&Fj@wGyQ(OZCJh{RCkDLp0@5>$p!Zx4m_Xcy1{(oZ#~+cc8#wrHo9M%Vp6hqp26*& zXOsG+*_P*IZrk^V=-NJ)a_eWVe+)llH?B+8mxF4q)U~_Y?U9Q^Grs=^9x5moJIrG7 zrJJxTAcDsRXgn3MJyGB%LwYBe`{^BRQyX?!q}SZGo1(@o z(Vu!q)UNYkqmo^L)7Or@96J5hH%`B4^~e}r7G2e$+X{YtbBn}5F8$YzD?V%O787mv zbVX%V>2uvfhZA3q3_d!lRCDCm;vG?&-&*$3Fka;I@XgdOXD)Dmw=%~`S6|ZZ>6;|i z_gf0AzMG`^1>lR($0NXiw)1?Po~VUn^xV={$7pXy~Ez! z1GaT=(XrX|EZ>QD;DCcc>k;WwEBA+=nChHqCUmlL-jHHp-e-I>>-%d%4^7REE1qo{ zoa}Y7RsOSnc6MLXyczJ}!Jy*= zZM4S5Va2b9euzCj)+e4B0MofCJOR`=D>C(ASa-Y4w%`quc3 z>CJZp9g@B^`_7{#*wF2WR`r`RX2*snOqlY>c=*i3X-T@bH$Q#-&<(ge?Q19NMosWJ zP>@x=I7erlcAu1jepY+;H+v9j7}<45)VR4iq1EfZ3caLpMw|2voNL#!OUH}P1)6=2 zM}?FuHF%a2vMch+YK!db2lahL*S^1+y;A63GP?NqO6v;!&>cIX-@kc#+WXn-tPL9$ ztXviFw))kJsw-cL9~^T%rSW6;^_5$m9e?xgX86(LE7R&8mJFJB#N)+r>8l$F$G@x9 zIvMbl*EjXAuZUNQ)9NogNdNe}h(E9+QN#`7fX*XJMGlH zXm_CJo8*H}&sXqo<=H+w`D9e*lsf+&KQvF7@Mq!OPTBQgt&2`VBPisbnY*<9t0$3}=lVo<`a0F(e9W7T$zEY2DsATPomaf< z{j9SoChJ=CdFC74aZX5Or`E&I2!1zvz4OX}lUIf$7M*;5ZOE2Q=CSUU{F3UFef{R2 zniq7xCU$&kuJa$`_b)v5!d>We)6aTjSZr=Za!#C^)_|N>AIxUl7p)oe=fJ^xEnMAQ z>arrY?IPnO1MkebcjD0ID!+##_}wQ>2sWJU9G<$l&5iPsX)Bi9G7Q_o-~7D)x{Vo< z^*84}I#a!=ygEO5e%MgE?8H4iYtGhKI>Z>>UE8U=CN=KJ*zGsZ|M=CbNT<1jO?G`^g%;90G?FuPS_E5#V5Yb$(yRp&_;@^+r8bCcMdV z3O$qg*joPq@A}%@EkVI{_bu&v77se#{z_oPHtXd>Co~sS{%n6;Ye?$#vq5D~?5aux z+GSw{o@;G>PS?!5xbI|rZt;cm%?Z9eORlP_GKarpa}Ux(~5F|s&q_^-Cx^N;+p?)Xoh9>4R|gXNI28y4N3vI~d$e+$waL}RxkIiRR!uP-xI8NRx1*zW6?$*{c|%W= z&9{dgjG8m_hHc)J6L&H@i7U1ZbZgPu_(3m=u^&!l);HHM7n2t?CklQy{mG_{Q1`bF z+T7zEj)~EUlK3QQOq359`PVi)I1FhWV5b$|!J&EFku!6_#c`)RTFicyd35IGw0>o$ zOze}}=jU{7zb=hbI;F?inBO#ibThnIt670?)-TWMHg);9J*&R*#|I+g<(sum-R&wq zA6J>&<#_sxlFVN=*b9fIO!|J^w>S4iAL)B}-4_=;&GUQg_xP!Gs~>KJAL+k6c=Y8G zy|P~2Zu-R7rEggHb@X+sr7KPEbO^ih+PMF9zY*IPY%G!PIptBhGWKl7DzZ-vS}To;Y$nmYoU>{N@R@^2@X?{-C`$7y zPXQXt)w|hA55rk?Go}g?60RK9Tj=n|50|!G)tGh9SGR-MuHWM)y4zia?z2Z8TQ;^} z$*XgV9DF=Ku)lGiIX60w-Z^5%`~<%zMq?I+I`ww2>+j_5 zxiqn*W3Sx2OLHUZGq(G$TQKmR&ARnLXA3U%sGE|u`o#*~w9|G+WAwf)C#H-0E|>24 z;BPi(OnWQisE_@El5S*bI;}lZddGIf<}kszp@$C_-EKT{5N)+9djq<*g$G;ss?pG{ z2@@wvCQgoyOr0c2io$8bwuR^Wobu4?R@dYG%xbq@dAkFJ_O&yL=NGS?R(N)qopDLU z?hOOp)rFNs25%G@$GhIBI`klA*!H@r)yXEg|B9>~Fgz}EbXwKMEwA3)Z&y(6?Acdi zrsLLEyxif}m$a$AujkROc70^+%8tLA=Eg6u{pELUyG?ro<`?ds_p{Cj@#?NgQHFkJ zzKOB>HRar;DfJm{@!A6yeA_W#c}Uwu1M7;j47QZ%oxJ0^bLnym-`h?%g3snB9n1Zu zP1#RzaY>6k27IUGnzqAhd5u|Qf?mC5_sbrx3yO9;a+Y>^l)W`!=$KtEk~^Ohz3lk% z-do4}-Z|OcA6upBbk6%{ zVor87m75;sr)?X`nxC~H(n85AOnFu;2i1fYt|%0BP0f*&F_aesatz$@QNd7H9`p^> zq$*hl-mwuw>x!csAsarC$yQp>%oh$O^A%`0fUFO{NO)`;1D|e42!6_wN?rA)UdJCx zroh)TUZgL4(2)#Z%}iF{2m{&}5(hL-SaFWv;S=jjaN}M+D7zLf0@5V#!*rw%qt;-G zbT5j26`%Aq;`b)YVb6cLf}~(ZD&V8hY}jQT2)`3NAw)vv`S8hmc*`4K_Mjv0^pqZP zbrGYNQufdQUcsVV z7dPi1Cm+63XhmJ?!x6tI6q5IwUX=BY=_`(==*|?~g*wilC>g-R1bck+Lo9gHA>{gXWjt`R#bTsz6GpNrcmT(2QEQ2C=lI{cwbFxKuL0e^SI%$Y~>V0E7- z7lYzrKMVj2AxWdGL`a}P5Znu>d$2c;=mbGF(1DNd7UNq^7|`@WKDI=>wxDV(gBM8A z@P?rgUMuo}vORoHMsd@3Jh($X`i>8Gh|A;S7gU6FCD%csVQ^&#d&vR(*5nw}3dja= zG+samqEOKSD3b-&5iJ^;1h1CiQD=;>4H=_g2B=hgM?@n;ok!4mVJR5UBmTd615?|y z1@MTqu%EgOgd>@2 z@DTj67#yUq;Z=+O=`)BT>-p}$C6vGN0ezOynVzvBoiJx*I%K2uV0u#ep2EYlJM=wX zs?%2w+X%?PoSA&e_l%s%XNI3SGxB!~ZC#a9`o~K6VY|b8|I4};SHiPLHnDbJ&MjQ-?gLt^kfRHg74wye4BGU01+g>R6UpTahMDT*q;02?= z=Yrup7C1-4(o_N|7?jJ#_Jnf}e67V7j&86t_JnssFnU1j2vkpalkcCP-U9yxFzY=f diff --git a/src/main/webapp/static/pdfjs/build/pdf.js b/src/main/webapp/static/pdfjs/build/pdf.js index ea43eed..e8f4d2e 100644 --- a/src/main/webapp/static/pdfjs/build/pdf.js +++ b/src/main/webapp/static/pdfjs/build/pdf.js @@ -56,6 +56,28 @@ document.onkeydown = function(e) { HandTool.toggle() } } + +/** + * 监听鼠标滚轮事件 + */ +document.addEventListener('wheel', function(e) { + // 鼠标滚轮向上滚动时放大图片 + if (e.deltaY < 0) { + PDFViewerApplication.zoomIn(); + } + // 鼠标滚轮向下滚动时缩小图片 + else if (e.deltaY > 0) { + PDFViewerApplication.zoomOut(); + } +}, {passive: true}); + +/** + * 监听鼠标按下事件 + */ +document.addEventListener('mousedown', function(e) { + HandTool.toggle() +}); + /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */ /* Copyright 2012 Mozilla Foundation