更新版本20210113

master
zengwh 5 years ago
parent e1f93a0033
commit 4fe3f48627

@ -8,12 +8,14 @@ package com.emr.service.ipml;
import com.emr.dao.Archive_DetailMapper;
import com.emr.dao.Emr_Commom_SetMapper;
import com.emr.entity.*;
import com.emr.entity.Archive_Detail;
import com.emr.entity.Archive_Detail_Vo;
import com.emr.entity.Emr_Commom_Set;
import com.emr.entity.OffsetLimitPage;
import com.emr.service.Archive_DetailService;
import com.emr.util.Jpg2PdfUtil;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.lowagie.text.pdf.PdfReader;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.util.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -21,8 +23,6 @@ import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.io.File;
import java.io.FileInputStream;
import java.util.ArrayList;
import java.util.List;

@ -753,7 +753,6 @@ $(function () {
loadDoctorInCharge();
var url = window.location.href;
var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
console.log(index)
if (index != null && index != "" && index.indexOf("excel") != -1) {
$("#excelBtn").show();
$("#toolbar").show();

@ -8,7 +8,7 @@ $(function(){
//$("#endDateTo1").val(getBeforeYesterDay());
initDateInput('startDate','endDate');
initDateInput('startDateTo','endDateTo');
initDateInput('startDateTo','endDateTo1');
initDateInput('startDateTo1','endDateTo1');
//加载时段
loadTimeInterval();
})

Loading…
Cancel
Save