diff --git a/src/main/java/com/emr/dao/CommomMapper.java b/src/main/java/com/emr/dao/CommomMapper.java index d5a9c04..3130d0d 100644 --- a/src/main/java/com/emr/dao/CommomMapper.java +++ b/src/main/java/com/emr/dao/CommomMapper.java @@ -1,11 +1,13 @@ package com.emr.dao; +import com.alibaba.fastjson.JSONObject; import com.emr.vo.commomSearch.CommomTree; import com.emr.vo.commomSearch.CommomVo; import com.emr.vo.FontVo.FontCommom; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; public interface CommomMapper { /** @@ -149,5 +151,4 @@ public interface CommomMapper { * @return */ CommomVo getCommomTableList(@Param("inpatientNo") String inpatientNo, @Param("disDate") String disDate); - } \ No newline at end of file diff --git a/src/main/java/com/emr/service/CommomService.java b/src/main/java/com/emr/service/CommomService.java index 3f4ad11..ae10872 100644 --- a/src/main/java/com/emr/service/CommomService.java +++ b/src/main/java/com/emr/service/CommomService.java @@ -705,19 +705,23 @@ public class CommomService { root = selectRootByNotWater(WATERTIFTOJPGPATH); outSrc = EMRRECORDJSP + File.separator + root + "/jiashi/tifToJpgLoad/" + format1 + ".jpg"; } else { - srcPath = srcPath.replaceAll("\\\\","/"); - if(srcPath.startsWith("/")){ + String driveLetterPath = srcPath.replaceAll("\\\\", "/"); + if(driveLetterPath.startsWith("/")){ //截取字符串为磁盘路径 - int thirdBackslashIndex = srcPath.indexOf('/', srcPath.indexOf('/', srcPath.indexOf('/') + 1) + 1); + int thirdBackslashIndex = driveLetterPath.indexOf('/', driveLetterPath.indexOf('/', driveLetterPath.indexOf('/') + 1) + 1); if (thirdBackslashIndex != -1) { - srcPath = srcPath.substring(thirdBackslashIndex+1); + driveLetterPath = driveLetterPath.substring(thirdBackslashIndex+1); } //将原图片地址转换成映射地址 //获取盘符并转换映射地址的头部地址 - root = selectRootByNotWater(srcPath); - //获取盘符后面的地址 - picPath = srcPath.substring(srcPath.indexOf('/')); - outSrc = EMRRECORDJSP + File.separator + root + File.separator + picPath; + root = selectRootByNotWater(driveLetterPath); + if(root == null){ + outSrc = srcPath; + }else{ + //获取盘符后面的地址 + picPath = driveLetterPath.substring(driveLetterPath.indexOf('/')); + outSrc = EMRRECORDJSP + File.separator + root + picPath; + } }else{ root = selectRootByNotWater(srcPath); //获取盘符后面的地址 diff --git a/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList174.jsp b/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList174.jsp index 6d6d016..4fda212 100644 --- a/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList174.jsp +++ b/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList174.jsp @@ -104,6 +104,7 @@ +
diff --git a/src/main/webapp/static/js/approveManage/approveManageList/approveManageList174.js b/src/main/webapp/static/js/approveManage/approveManageList/approveManageList174.js index f35bb39..c97246b 100644 --- a/src/main/webapp/static/js/approveManage/approveManageList/approveManageList174.js +++ b/src/main/webapp/static/js/approveManage/approveManageList/approveManageList174.js @@ -54,7 +54,7 @@ $('#mytab').bootstrapTable({ fixedNumber: 4, pageNumber: 1, //初始化加载第一页，默认第一页 pageSize: 5, //每页的记录行数（*） - pageList: [5,10,15,20,30,50],//可供选择的每页的行数（*） + pageList: [5,10,20,50,100,500,1000],//可供选择的每页的行数（*） height: $(window).height()-134, //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度 columns:[ { @@ -207,9 +207,11 @@ $('#mytab').bootstrapTable({ nres.push({total:res.total,rows:res.list}); return nres[0]; }, - onLoadSuccess:function(){ + onLoadSuccess:function(res){ $(".page-list").show(); $(".fixed-table-body").css("overflow","auto"); + //赋值总数 + $("#rows").val(res.total); }, //监听分页点击事件 onPageChange: function(num, type) { @@ -475,23 +477,27 @@ function moreAdd(flag){ //导出excel功能 function exportExcel(){ var checks = $("#checks").val(); - if(checks != '') { - checks = checks.substring(0, checks.length - 1); - var url = path+"/approve/exportExcelApproveList?checks="+checks; - window.location.href = url; - }else{ - Common.confirm({ - title: "提示", - message: "没有选中，您确定要按搜索栏条件导出?", - operate: function (reselt) { - if (reselt) { - var url = path+"/approve/exportExcelApproveList?startTime1="+$("#startTime1").val()+"&endTime1="+$("#endTime1").val()+"&startTime2="+$("#startTime2").val()+"&endTime2="+$("#endTime2").val()+"&name="+$("#searchName").val()+"&effeDays="+$("#effeDaysSearch").val()+"&applyer="+$("#applyerSearch").val()+"&approveState="+$("#searchApproveState").val()+"&approver="+$("#approver").val(); - window.location.href = url; + var total = $("#rows").val(); + if (total > 5000 && checks == '') { + toastr.warning("数据量大,暂提供5000条以内数据导出!"); + } else { + if(checks != '') { + checks = checks.substring(0, checks.length - 1); + var url = path+"/approve/exportExcelApproveList?checks="+checks; + window.location.href = url; + }else{ + Common.confirm({ + title: "提示", + message: "没有选中，您确定要按搜索栏条件导出?", + operate: function (reselt) { + if (reselt) { + var url = path+"/approve/exportExcelApproveList?startTime1="+$("#startTime1").val()+"&endTime1="+$("#endTime1").val()+"&startTime2="+$("#startTime2").val()+"&endTime2="+$("#endTime2").val()+"&name="+$("#searchName").val()+"&effeDays="+$("#effeDaysSearch").val()+"&applyer="+$("#applyerSearch").val()+"&approveState="+$("#searchApproveState").val()+"&approver="+$("#approver").val(); + window.location.href = url; + } } - } - }) + }) + } } - } $(function () { diff --git a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js index c954ede..fd78d82 100644 --- a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js +++ b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js @@ -327,9 +327,9 @@ function freshTable(){ function exportExcel() { getChecked(); var checks = $("#checks").val(); - // if ($("#rows").val() > 5000 && checks == '') { - // toastr.warning("数据量大,暂提供5000条以内数据导出!"); - // } else { + if ($("#rows").val() > 5000 && checks == '') { + toastr.warning("数据量大,暂提供5000条以内数据导出!"); + } else { getSql(); var tableThNames = $("#tableThNames").val(); var fieldCns = $("#fieldCns").val(); @@ -365,6 +365,7 @@ function exportExcel() { } }) } + } } function btn(){ var url = path + "/printInfoList/pageUI174"; diff --git a/src/main/webapp/static/pdfjs/Print.js b/src/main/webapp/static/pdfjs/Print.js index 6f7161b..a29191a 100644 --- a/src/main/webapp/static/pdfjs/Print.js +++ b/src/main/webapp/static/pdfjs/Print.js @@ -4,6 +4,7 @@ */ (function (window, document) { var Print = function (dom, options) { + dom.innerHTML = ''; if (!(this instanceof Print)) return new Print(dom, options); this.options = this.extend({ @@ -25,7 +26,6 @@ Print.prototype = { init: function () { var content = this.getStyle() + this.getHtml(); - console.log("------------------------------32131232132132131------------------------------", this.getHtml()) this.writeIframe(content); }, extend: function (obj, obj2) {