From a23a674856cb27ac6909710340068ac4ed075394 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Fri, 10 Apr 2020 17:14:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B0=B4=E5=8D=B0=E5=88=86?=
=?UTF-8?q?=E9=A2=84=E8=A7=88=E5=92=8C=E4=B8=8B=E8=BD=BD=E5=90=AF=E7=94=A8?=
=?UTF-8?q?=E5=BC=80=E5=85=B3=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=B0?=
=?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../commomSearch/CommomSearchController.java | 1 -
.../PrintOrDownLoadInfoController.java | 51 +-
.../TemplateSearchController.java | 3 +
.../entity/emrPdfWaterSet/EmrPdfWaterSet.java | 22 +
.../EmrPrintDownloadInfo.java | 11 +
.../PrintOrDownLoadInfoService.java | 85 +-
.../java/com/emr/util/ExportExcelUtil.java | 6 +-
src/main/java/com/emr/util/Jpg2PdfUtil.java | 18 +-
src/main/java/com/emr/util/img2PdfUtil.java | 6 +-
.../EmrPrintOrDownLoadInfoVo.java | 2 +-
.../emrPdfWaterSet/EmrPdfWaterSetMapper.xml | 59 +-
.../EmrPrintDownloadInfoMapper.xml | 15 +-
.../views/otherManage/downloadInfoList174.jsp | 7 +
.../views/otherManage/pdfWaterSetList.jsp | 54 +-
.../views/otherManage/printInfoList174.jsp | 7 +
.../commomSearch/commomListqf.jsp | 12 +-
.../js/otherManage/downloadInfoCommomJs174.js | 32 +-
.../recordManage/commomSearch/commomListqf.js | 6 +-
src/main/webapp/static/pdfjs/web/261页.pdf | 109020 ---------------
19 files changed, 298 insertions(+), 109119 deletions(-)
delete mode 100644 src/main/webapp/static/pdfjs/web/261页.pdf
diff --git a/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java b/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java
index def02fb..ae1b8c2 100644
--- a/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java
+++ b/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java
@@ -1068,7 +1068,6 @@ public class CommomSearchController {
}else{
commomVo = commomMapper.selectByPrimaryKey(patientId);
}
-
String[] scanPaths = assortIds.split(",");
//组织图片地址集合
List filePaths = new ArrayList<>();
diff --git a/src/main/java/com/emr/controller/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoController.java b/src/main/java/com/emr/controller/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoController.java
index a52a0ce..bb23b81 100644
--- a/src/main/java/com/emr/controller/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoController.java
+++ b/src/main/java/com/emr/controller/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoController.java
@@ -9,6 +9,7 @@ import com.emr.vo.EmrPrintOrDownLoadInfo.EmrPrintOrDownLoadInfoVo;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import org.apache.commons.collections.list.AbstractLinkedList;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
@@ -69,12 +70,22 @@ public class PrintOrDownLoadInfoController {
@ResponseBody
public String getPrintInfoList(Integer page, Integer limit, EmrPrintOrDownLoadInfoVo emrPrintOrDownLoadInfoVo,String flag){
try{
- if(null != page && null != limit){
- PageHelper.startPage(page, limit);
- }
//查询
List list = printOrDownLoadInfoService.selectAll(emrPrintOrDownLoadInfoVo,flag);
- PageInfo pageInfo = new PageInfo<>(list);
+ Long size = (long) list.size();
+ List updateList = new ArrayList<>();
+ if (size > 0) {
+ int pageCount = (int) ((size / limit) + ((size % limit > 0) ? 1 : 0));
+ int start = (page - 1) * limit;
+ int end = (int) (page == pageCount ? size : page * limit);
+ if (end < size) {
+ updateList = list.subList(start, end);
+ } else {
+ updateList = list.subList(start, size.intValue());
+ }
+ }
+ PageInfo pageInfo = new PageInfo<>(updateList);
+ pageInfo.setTotal(size);
ObjectMapper mapper = new ObjectMapper();
String json = mapper.writeValueAsString(pageInfo);
return json;
@@ -125,8 +136,8 @@ public class PrintOrDownLoadInfoController {
@OptionalLog(module = "导出excel",methods = "打印记录列表")
@RequestMapping(value="/printInfoList/export",produces = {"text/json;charset=UTF-8"})
@ResponseBody
- public void exportExcel(HttpServletResponse response,EmrPrintOrDownLoadInfoVo printOrDownLoadInfoVo, HttpServletRequest request, String checks,String flag){
- Export(response, printOrDownLoadInfoVo, request, checks,flag);
+ public void exportExcel(HttpServletResponse response,EmrPrintOrDownLoadInfoVo printOrDownLoadInfoVo,String checks,String flag){
+ Export(response, printOrDownLoadInfoVo, checks,flag);
}
/**
@@ -145,15 +156,15 @@ public class PrintOrDownLoadInfoController {
@OptionalLog(module = "导出excel",methods = "下载记录列表")
@RequestMapping(value="/downloadInfoList/export",produces = {"text/json;charset=UTF-8"})
@ResponseBody
- public void exportExcel1(HttpServletResponse response,EmrPrintOrDownLoadInfoVo printOrDownLoadInfoVo, HttpServletRequest request, String checks,String flag){
- Export(response, printOrDownLoadInfoVo, request, checks,flag);
+ public void exportExcel1(HttpServletResponse response,EmrPrintOrDownLoadInfoVo printOrDownLoadInfoVo,String checks,String flag){
+ Export(response, printOrDownLoadInfoVo,checks,flag);
}
@RequiresPermissions("/printInfoList/export")
@OptionalLog(module = "导出excel",methods = "打印记录列表")
@RequestMapping(value="/printInfoList/export174",produces = {"text/json;charset=UTF-8"})
@ResponseBody
- public void export174(HttpServletResponse response,EmrPrintOrDownLoadInfoVo printOrDownLoadInfoVo, HttpServletRequest request, String checks,String flag){
- Export174(response, printOrDownLoadInfoVo, request, checks,flag);
+ public void export174(HttpServletResponse response,EmrPrintOrDownLoadInfoVo printOrDownLoadInfoVo,String checks,String flag,Integer operType){
+ Export174(response, printOrDownLoadInfoVo,checks,flag,operType);
}
/**
@@ -172,11 +183,11 @@ public class PrintOrDownLoadInfoController {
@OptionalLog(module = "导出excel",methods = "下载记录列表")
@RequestMapping(value="/downloadInfoList/export174",produces = {"text/json;charset=UTF-8"})
@ResponseBody
- public void export1741(HttpServletResponse response,EmrPrintOrDownLoadInfoVo printOrDownLoadInfoVo, HttpServletRequest request, String checks,String flag){
- Export174(response, printOrDownLoadInfoVo, request, checks,flag);
+ public void export1741(HttpServletResponse response,EmrPrintOrDownLoadInfoVo printOrDownLoadInfoVo, String checks,String flag,Integer operType){
+ Export174(response, printOrDownLoadInfoVo,checks,flag,operType);
}
- public void Export(HttpServletResponse response,EmrPrintOrDownLoadInfoVo printOrDownLoadInfoVo, HttpServletRequest request, String checks,String flag){
+ public void Export(HttpServletResponse response,EmrPrintOrDownLoadInfoVo printOrDownLoadInfoVo,String checks,String flag){
String tableThNames = "操作人,产妇姓名,脐血编号,类别,文件名,用途,操作时间";
String fieldCns = "creater,name,inpatientNo,assortName,scanAddr,typeName,createTime";
//构造excel的数据
@@ -198,9 +209,9 @@ public class PrintOrDownLoadInfoController {
e.printStackTrace();
}
}
- public void Export174(HttpServletResponse response,EmrPrintOrDownLoadInfoVo printOrDownLoadInfoVo, HttpServletRequest request, String checks,String flag){
- String tableThNames = "操作人,姓名,病案号,住院次数,类别,文件名,用途,操作时间";
- String fieldCns = "creater,name,inpatientNo,admissTimes,assortName,scanAddr,typeName,createTime";
+ public void Export174(HttpServletResponse response,EmrPrintOrDownLoadInfoVo printOrDownLoadInfoVo,String checks,String flag,Integer operType){
+ String tableThNames = "操作人,姓名,病案号,住院次数,类别,文件名,页数,用途,操作时间,ip地址";
+ String fieldCns = "creater,name,inpatientNo,admissTimes,assortName,scanPage,printCount,typeName,createTime,ip";
//构造excel的数据
try{
List list = new ArrayList<>();
@@ -210,8 +221,14 @@ public class PrintOrDownLoadInfoController {
//查询
list = printOrDownLoadInfoService.selectAll(printOrDownLoadInfoVo,flag);
}
+ String fileName = "";
+ if(operType == 1){
+ fileName = "打印";
+ }else{
+ fileName = "下载";
+ }
//文件名
- String fileName = "打印记录列表导出数据(" + new SimpleDateFormat("yyyy-MM-dd HH_mm_ss").format(new Date()) + ").xls";
+ fileName += "记录列表导出数据(" + new SimpleDateFormat("yyyy-MM-dd HH_mm_ss").format(new Date()) + ").xls";
//ExportExcelUtil
ExportExcelUtil exportExcelUtil = new ExportExcelUtil();
//导出excel的操作
diff --git a/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java b/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java
index e7f15c0..ea7c2f5 100644
--- a/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java
+++ b/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java
@@ -1377,6 +1377,9 @@ public class TemplateSearchController {
disDate = fmt.format(vo.getDisDate());
}
String pdfName = vo.getInpatientNo() + "_" + vo.getName() + "_" + disDate + "("+fmt.format(new Date())+")";//每个文件名
+ //emrPdfWaterSet设置启用下载的状态
+ emrPdfWaterSet.setEffective(emrPdfWaterSet.getDownloadEffective());
+ emrPdfWaterSet.setIsImg(emrPdfWaterSet.getDownloadIsImg());
img2PdfUtil.imageToPdf(response,filePaths,pdfName,emrPdfWaterSet);
}
}catch (Exception e){
diff --git a/src/main/java/com/emr/entity/emrPdfWaterSet/EmrPdfWaterSet.java b/src/main/java/com/emr/entity/emrPdfWaterSet/EmrPdfWaterSet.java
index 9a13f93..8ed42b4 100644
--- a/src/main/java/com/emr/entity/emrPdfWaterSet/EmrPdfWaterSet.java
+++ b/src/main/java/com/emr/entity/emrPdfWaterSet/EmrPdfWaterSet.java
@@ -7,6 +7,8 @@ public class EmrPdfWaterSet implements Serializable {
private Short effective;
+ private Short downloadEffective;
+
private Short upOrUnder;
private Float transparent;
@@ -25,6 +27,8 @@ public class EmrPdfWaterSet implements Serializable {
private Short isImg;
+ private Short downloadIsImg;
+
private String imgFile;
private Integer imgWidth;
@@ -55,6 +59,14 @@ public class EmrPdfWaterSet implements Serializable {
this.effective = effective;
}
+ public Short getDownloadEffective() {
+ return downloadEffective;
+ }
+
+ public void setDownloadEffective(Short downloadEffective) {
+ this.downloadEffective = downloadEffective;
+ }
+
public Short getUpOrUnder() {
return upOrUnder;
}
@@ -127,6 +139,14 @@ public class EmrPdfWaterSet implements Serializable {
this.isImg = isImg;
}
+ public Short getDownloadIsImg() {
+ return downloadIsImg;
+ }
+
+ public void setDownloadIsImg(Short downloadIsImg) {
+ this.downloadIsImg = downloadIsImg;
+ }
+
public String getImgFile() {
return imgFile;
}
@@ -183,6 +203,7 @@ public class EmrPdfWaterSet implements Serializable {
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", effective=").append(effective);
+ sb.append(", downloadEffective=").append(downloadEffective);
sb.append(", upOrUnder=").append(upOrUnder);
sb.append(", transparent=").append(transparent);
sb.append(", text=").append(text);
@@ -192,6 +213,7 @@ public class EmrPdfWaterSet implements Serializable {
sb.append(", textSize=").append(textSize);
sb.append(", textRotation=").append(textRotation);
sb.append(", isImg=").append(isImg);
+ sb.append(", downloadIsImg=").append(downloadIsImg);
sb.append(", imgFile=").append(imgFile);
sb.append(", imgWidth=").append(imgWidth);
sb.append(", imgHeight=").append(imgHeight);
diff --git a/src/main/java/com/emr/entity/emrPrintAndDownLoad/EmrPrintDownloadInfo.java b/src/main/java/com/emr/entity/emrPrintAndDownLoad/EmrPrintDownloadInfo.java
index 30a1b13..bd372d3 100644
--- a/src/main/java/com/emr/entity/emrPrintAndDownLoad/EmrPrintDownloadInfo.java
+++ b/src/main/java/com/emr/entity/emrPrintAndDownLoad/EmrPrintDownloadInfo.java
@@ -19,6 +19,8 @@ public class EmrPrintDownloadInfo implements Serializable {
private String creater;
+ private String ip;
+
private static final long serialVersionUID = 1L;
public Integer getId() {
@@ -85,6 +87,14 @@ public class EmrPrintDownloadInfo implements Serializable {
this.creater = creater == null ? null : creater.trim();
}
+ public String getIp() {
+ return ip;
+ }
+
+ public void setIp(String ip) {
+ this.ip = ip == null ? null : ip.trim();
+ }
+
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
@@ -99,6 +109,7 @@ public class EmrPrintDownloadInfo implements Serializable {
sb.append(", operType=").append(operType);
sb.append(", createTime=").append(createTime);
sb.append(", creater=").append(creater);
+ sb.append(", ip=").append(ip);
sb.append("]");
return sb.toString();
}
diff --git a/src/main/java/com/emr/service/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoService.java b/src/main/java/com/emr/service/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoService.java
index e339554..a95f1b9 100644
--- a/src/main/java/com/emr/service/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoService.java
+++ b/src/main/java/com/emr/service/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoService.java
@@ -13,10 +13,11 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
+import javax.servlet.http.HttpServletRequest;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
@Service
@Transactional
@@ -49,6 +50,7 @@ public class PrintOrDownLoadInfoService {
obj.setOperType(operType);
obj.setCreater(user.getUserName());
obj.setCreateTime(fmt.format(new Date()));
+ obj.setIp(getOperIp());
list.add(obj);
//是180的倍数或最后一个
if(null != list && (list.size()%simpleInsertCount == 0 || i == scanPathVos.size() - 1)) {
@@ -58,19 +60,92 @@ public class PrintOrDownLoadInfoService {
}
}
+
+ //获取操作人ip
+ private String getOperIp(){
+ HttpServletRequest request = ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest();
+ // 获取访问真实IP
+ String ipAddress = request.getHeader("x-forwarded-for");
+ if(ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+ ipAddress = request.getHeader("Proxy-Client-IP");
+ }
+ if(ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+ ipAddress = request.getHeader("WL-Proxy-Client-IP");
+ }
+ if(ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+ ipAddress = request.getRemoteAddr();
+ if(ipAddress.equals("127.0.0.1") || ipAddress.equals("0:0:0:0:0:0:0:1")){
+ //根据网卡取本机配置的IP
+ InetAddress inet=null;
+ try {
+ inet = InetAddress.getLocalHost();
+ } catch (UnknownHostException e) {
+ e.printStackTrace();
+ }
+ ipAddress= inet.getHostAddress();
+ }
+ }
+ //对于通过多个代理的情况,第一个IP为客户端真实IP,多个IP按照','分割
+ if(ipAddress!=null && ipAddress.length()>15){ //"***.***.***.***".length() = 15
+ if(ipAddress.indexOf(",")>0){
+ ipAddress = ipAddress.substring(0,ipAddress.indexOf(","));
+ }
+ }
+ return ipAddress;
+ }
/**
*按条件查询
* */
public List selectAll(EmrPrintOrDownLoadInfoVo emrPrintOrDownLoadInfoVo,String flag){
List list = printDownloadInfoMapper.selectAll(emrPrintOrDownLoadInfoVo,flag);
- return list;
+ return getReturnList(list);
+ }
+ //组织数据
+ private List getReturnList(List list){
+ List returnList = new ArrayList<>();
+ if(null != list && !list.isEmpty()){
+ Map map = new LinkedHashMap<>();
+ for(EmrPrintOrDownLoadInfoVo vo : list){
+ String key = vo.getPatientId() + "," + vo.getCreateTime() + "," + vo.getCreateTime();
+ map.put(key,vo);
+ }
+ for(Map.Entry obj : map.entrySet()){
+ String ids = "";
+ String assortNames = "";
+ String scanPages = "";
+ int printCount = 0;
+ Set assortNameSet = new LinkedHashSet<>();
+ for(EmrPrintOrDownLoadInfoVo vo : list){
+ String key = vo.getPatientId() + "," + vo.getCreateTime() + "," + vo.getCreateTime();
+ if(key.equals(obj.getKey())){
+ ids += vo.getId() + ",";
+ scanPages += vo.getScanPage() + ",";
+ assortNameSet.add(vo.getAssortName());
+ printCount++;
+ }
+ }
+ for(String assortName : assortNameSet){
+ assortNames += assortName + ",";
+ }
+ ids = ids.substring(0,ids.length() - 1);
+ assortNames = assortNames.substring(0,assortNames.length() - 1);
+ scanPages = scanPages.substring(0,scanPages.length() - 1);
+ EmrPrintOrDownLoadInfoVo emrPrintOrDownLoadInfoVo = obj.getValue();
+ emrPrintOrDownLoadInfoVo.setIds(ids);
+ emrPrintOrDownLoadInfoVo.setAssortName(assortNames);
+ emrPrintOrDownLoadInfoVo.setScanPage(scanPages);
+ emrPrintOrDownLoadInfoVo.setPrintCount(printCount);
+ returnList.add(emrPrintOrDownLoadInfoVo);
+ }
+ }
+ return returnList;
}
/**
*按复选框选中查询
* */
public List selectAllByIds(String ids,String flag){
List list = printDownloadInfoMapper.selectAllByIds(ids,flag);
- return list;
+ return getReturnList(list);
}
/**
diff --git a/src/main/java/com/emr/util/ExportExcelUtil.java b/src/main/java/com/emr/util/ExportExcelUtil.java
index 4470e07..ce84072 100644
--- a/src/main/java/com/emr/util/ExportExcelUtil.java
+++ b/src/main/java/com/emr/util/ExportExcelUtil.java
@@ -86,7 +86,6 @@ public class ExportExcelUtil {
for (int i = 1; i <= sheetNum; i++) {
HSSFSheet sheet = workBook.createSheet("Sheet " + i);
HSSFRow headRow = sheet.createRow((short) 0);
-
HSSFCellStyle cellStyle = workBook.createCellStyle();
cellStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER);
cellStyle.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);
@@ -130,7 +129,10 @@ public class ExportExcelUtil {
//设置自动列宽
for (int j = 0; j < rows; j++) {
sheet.autoSizeColumn(j);
- sheet.setColumnWidth(j,sheet.getColumnWidth(j)*17/10);
+ int width = sheet.getColumnWidth(j)*2;
+ if(width < 3000){
+ sheet.setColumnWidth(j,sheet.getColumnWidth(j)*17/10);
+ }
}
//冻结表头
sheet.createFreezePane( 0, 1, 0, 1 );
diff --git a/src/main/java/com/emr/util/Jpg2PdfUtil.java b/src/main/java/com/emr/util/Jpg2PdfUtil.java
index eb8d629..812a0c8 100644
--- a/src/main/java/com/emr/util/Jpg2PdfUtil.java
+++ b/src/main/java/com/emr/util/Jpg2PdfUtil.java
@@ -1,6 +1,5 @@
package com.emr.util;
-import com.emr.entity.emrPdfWaterSet.EmrPdfWaterSet;
import com.lowagie.text.*;
import com.lowagie.text.Font;
import com.lowagie.text.Image;
@@ -199,34 +198,21 @@ public class Jpg2PdfUtil {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
for (int i = 0; i < files.size(); i++) {
//判断是否加水印
- long start1 = System.currentTimeMillis();
if(StringUtils.isNotBlank(waterMarkName)){
setWatermark(bos,files.get(i), waterMarkName, null);
}
- long end1 = System.currentTimeMillis();
- System.out.println("第"+(i+1)+"pdf加水印的时间:"+(end1-start1)/1000.0+"s");
-
- long start2 = System.currentTimeMillis();
PdfReader reader = new PdfReader(files.get(i));
- long end2 = System.currentTimeMillis();
- System.out.println("PdfReader第"+(i+1)+"pdf时间:"+(end2-start2)/1000.0+"s");
int n = reader.getNumberOfPages();
- long start3 = System.currentTimeMillis();
for (int j = 1; j <= n; j++) {
document.newPage();
PdfImportedPage page = null;
- long start4 = System.currentTimeMillis();
if(StringUtils.isNotBlank(waterMarkName)){
page = copy.getImportedPage(new PdfReader(bos.toByteArray()), j);
}else{
page = copy.getImportedPage(reader, j);
}
- long end4 = System.currentTimeMillis();
- System.out.println("getImportedPage PdfReader生成水印后第"+(i+1)+"pdf时间:"+(end4-start4)/1000.0+"s");
copy.addPage(page);
}
- long end3 = System.currentTimeMillis();
- System.out.println("copy pdf时间:"+(end3-start3)/1000.0+"s");
}
}catch (Exception e){
e.printStackTrace();
@@ -252,8 +238,8 @@ public class Jpg2PdfUtil {
content = stamper.getUnderContent(i);
//加文字水印
if(StringUtils.isNotBlank(waterMarkName)) {
- gs.setFillOpacity(0.3f);
- gs.setStrokeOpacity(0.3f);
+ gs.setFillOpacity(0.2f);
+ gs.setStrokeOpacity(0.2f);
content.beginText();
content.setColorFill(Color.LIGHT_GRAY);
content.setFontAndSize(base, 50);
diff --git a/src/main/java/com/emr/util/img2PdfUtil.java b/src/main/java/com/emr/util/img2PdfUtil.java
index 1cf6cf1..0672673 100644
--- a/src/main/java/com/emr/util/img2PdfUtil.java
+++ b/src/main/java/com/emr/util/img2PdfUtil.java
@@ -76,13 +76,13 @@ public class img2PdfUtil {
//图片合成pdf
imgToPdf(document,filePaths);
//是否启用水印
- Short effective = pdfWaterSet.getEffective();
- Short isImg = pdfWaterSet.getIsImg();
+ Short effective = pdfWaterSet.getDownloadEffective();
+ Short isImg = pdfWaterSet.getDownloadIsImg();
if(effective == 1 || isImg == 1) {
addWaterMark(bos, null, pdfWaterSet.getUpOrUnder(), pdfWaterSet.getTransparent(),
pdfWaterSet.getText(), pdfWaterSet.getTextX(), pdfWaterSet.getTextY(),
pdfWaterSet.getTextColor(), pdfWaterSet.getTextSize(), pdfWaterSet.getTextRotation(),
- pdfWaterSet.getEffective(),pdfWaterSet.getIsImg(),pdfWaterSet.getImgFile(), pdfWaterSet.getImgWidth(),
+ effective,isImg,pdfWaterSet.getImgFile(), pdfWaterSet.getImgWidth(),
pdfWaterSet.getImgHeight(), pdfWaterSet.getImgX(), pdfWaterSet.getImgY());
}
}
diff --git a/src/main/java/com/emr/vo/EmrPrintOrDownLoadInfo/EmrPrintOrDownLoadInfoVo.java b/src/main/java/com/emr/vo/EmrPrintOrDownLoadInfo/EmrPrintOrDownLoadInfoVo.java
index ab1461a..d5b434a 100644
--- a/src/main/java/com/emr/vo/EmrPrintOrDownLoadInfo/EmrPrintOrDownLoadInfoVo.java
+++ b/src/main/java/com/emr/vo/EmrPrintOrDownLoadInfo/EmrPrintOrDownLoadInfoVo.java
@@ -5,7 +5,7 @@ import lombok.Data;
@Data
public class EmrPrintOrDownLoadInfoVo extends EmrPrintDownloadInfo {
- private String scanAddr;
+ private String ids;
private String name;
diff --git a/src/main/resources/mapper/emrPdfWaterSet/EmrPdfWaterSetMapper.xml b/src/main/resources/mapper/emrPdfWaterSet/EmrPdfWaterSetMapper.xml
index c32d563..750916e 100644
--- a/src/main/resources/mapper/emrPdfWaterSet/EmrPdfWaterSetMapper.xml
+++ b/src/main/resources/mapper/emrPdfWaterSet/EmrPdfWaterSetMapper.xml
@@ -4,6 +4,7 @@
+
@@ -13,6 +14,7 @@
+
@@ -21,11 +23,12 @@
- id, effective, up_or_under, transparent, text, text_x, text_y, text_color, text_size,
- text_rotation, is_img, img_file, img_width, img_height, img_x, img_y, unique_id
+ id, effective, download_effective, up_or_under, transparent, text, text_x, text_y,
+ text_color, text_size, text_rotation, is_img, download_is_img, img_file, img_width,
+ img_height, img_x, img_y, unique_id
diff --git a/src/main/webapp/WEB-INF/views/otherManage/downloadInfoList174.jsp b/src/main/webapp/WEB-INF/views/otherManage/downloadInfoList174.jsp
index a006188..be82fd8 100644
--- a/src/main/webapp/WEB-INF/views/otherManage/downloadInfoList174.jsp
+++ b/src/main/webapp/WEB-INF/views/otherManage/downloadInfoList174.jsp
@@ -74,6 +74,13 @@
/**表格div*/
.tableDiv{
margin-left: 1%;
+ margin-right: 1%;
+ }
+ .hidden-xs{
+ max-width: 250px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
diff --git a/src/main/webapp/WEB-INF/views/otherManage/pdfWaterSetList.jsp b/src/main/webapp/WEB-INF/views/otherManage/pdfWaterSetList.jsp
index 42197f2..c30fac9 100644
--- a/src/main/webapp/WEB-INF/views/otherManage/pdfWaterSetList.jsp
+++ b/src/main/webapp/WEB-INF/views/otherManage/pdfWaterSetList.jsp
@@ -62,10 +62,25 @@
'
+ return value;
+}
//查询按钮
function refreshTable(){
$("#checks").val("");
@@ -168,9 +187,10 @@ function refreshTable(){
//导出excel功能
function exportExcelCommom(reqUrl){
var checks = $("#checks").val();
+ var operType = $("#operType").val();
if(checks != '') {
checks = checks.substring(0, checks.length - 1);
- var url = path+reqUrl+"?checks="+checks+"&flag="+$("#flag").val();
+ var url = path+reqUrl+"?checks="+checks+"&flag="+$("#flag").val()+"&operType="+operType;
window.location.href = url;
}else{
Common.confirm({
@@ -181,7 +201,7 @@ function exportExcelCommom(reqUrl){
var url = path+reqUrl+"?startTime="+$("#startTime1").val()+"&endTime="+$("#endTime1").val()
+"&creater="+$("#creater").val()+"&name="+$("#name").val()
+"&operType="+$("#operType").val()+"&assortId="+$("#assortId").val()
- +"&inpatientNo="+$("#inpatientNo").val()+"&flag="+$("#flag").val();
+ +"&inpatientNo="+$("#inpatientNo").val()+"&flag="+$("#flag").val()+"&operType="+operType;
window.open(url);
}
}
diff --git a/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js b/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js
index ae96649..4997987 100644
--- a/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js
+++ b/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js
@@ -20,7 +20,7 @@ $(function () {
//加载手术字典
loadOperate();
//加载inpatientNo
- loadInpatientNo();
+ //loadInpatientNo();
});
//加载性别
function loadSex() {
@@ -126,9 +126,9 @@ function loadDiag() {
url: path + '/commom/getIcdCodeList',
dataType: 'json',
success: function (data) {
- $("#diag_code").empty();
- $("#diag_name").empty();
if (data != null) {
+ $("#diag_code").empty();
+ $("#diag_name").empty();
var codeHtml = '';
var nameHtml = '';
for (var i = 0; i < data.length; i++) {
diff --git a/src/main/webapp/static/pdfjs/web/261页.pdf b/src/main/webapp/static/pdfjs/web/261页.pdf
deleted file mode 100644
index 78218f0..0000000
--- a/src/main/webapp/static/pdfjs/web/261页.pdf
+++ /dev/null
@@ -1,109020 +0,0 @@
-%PDF-1.4
-%
-1 0 obj
-<>>>/Contents 265 0 R/Parent 262 0 R>>
-endobj
-2 0 obj
-<>>>/Contents 268 0 R/Parent 262 0 R>>
-endobj
-3 0 obj
-<>>>/Contents 271 0 R/Parent 262 0 R>>
-endobj
-4 0 obj
-<>>>/Contents 274 0 R/Parent 262 0 R>>
-endobj
-5 0 obj
-<>>>/Contents 277 0 R/Parent 262 0 R>>
-endobj
-6 0 obj
-<>>>/Contents 280 0 R/Parent 262 0 R>>
-endobj
-7 0 obj
-<>>>/Contents 283 0 R/Parent 262 0 R>>
-endobj
-8 0 obj
-<>>>/Contents 286 0 R/Parent 262 0 R>>
-endobj
-9 0 obj
-<>>>/Contents 289 0 R/Parent 262 0 R>>
-endobj
-10 0 obj
-<>>>/Contents 292 0 R/Parent 262 0 R>>
-endobj
-11 0 obj
-<>>>/Contents 296 0 R/Parent 293 0 R>>
-endobj
-12 0 obj
-<>>>/Contents 299 0 R/Parent 293 0 R>>
-endobj
-13 0 obj
-<>>>/Contents 302 0 R/Parent 293 0 R>>
-endobj
-14 0 obj
-<>>>/Contents 305 0 R/Parent 293 0 R>>
-endobj
-15 0 obj
-<>>>/Contents 308 0 R/Parent 293 0 R>>
-endobj
-16 0 obj
-<>>>/Contents 311 0 R/Parent 293 0 R>>
-endobj
-17 0 obj
-<>>>/Contents 314 0 R/Parent 293 0 R>>
-endobj
-18 0 obj
-<>>>/Contents 317 0 R/Parent 293 0 R>>
-endobj
-19 0 obj
-<>>>/Contents 320 0 R/Parent 293 0 R>>
-endobj
-20 0 obj
-<>>>/Contents 323 0 R/Parent 293 0 R>>
-endobj
-21 0 obj
-<>>>/Contents 327 0 R/Parent 324 0 R>>
-endobj
-22 0 obj
-<>>>/Contents 330 0 R/Parent 324 0 R>>
-endobj
-23 0 obj
-<>>>/Contents 333 0 R/Parent 324 0 R>>
-endobj
-24 0 obj
-<>>>/Contents 336 0 R/Parent 324 0 R>>
-endobj
-25 0 obj
-<>>>/Contents 339 0 R/Parent 324 0 R>>
-endobj
-26 0 obj
-<>>>/Contents 342 0 R/Parent 324 0 R>>
-endobj
-27 0 obj
-<>>>/Contents 345 0 R/Parent 324 0 R>>
-endobj
-28 0 obj
-<>>>/Contents 348 0 R/Parent 324 0 R>>
-endobj
-29 0 obj
-<>>>/Contents 351 0 R/Parent 324 0 R>>
-endobj
-30 0 obj
-<>>>/Contents 354 0 R/Parent 324 0 R>>
-endobj
-31 0 obj
-<>>>/Contents 358 0 R/Parent 355 0 R>>
-endobj
-32 0 obj
-<>>>/Contents 361 0 R/Parent 355 0 R>>
-endobj
-33 0 obj
-<>>>/Contents 364 0 R/Parent 355 0 R>>
-endobj
-34 0 obj
-<>>>/Contents 367 0 R/Parent 355 0 R>>
-endobj
-35 0 obj
-<>>>/Contents 370 0 R/Parent 355 0 R>>
-endobj
-36 0 obj
-<>>>/Contents 373 0 R/Parent 355 0 R>>
-endobj
-37 0 obj
-<>>>/Contents 376 0 R/Parent 355 0 R>>
-endobj
-38 0 obj
-<>>>/Contents 379 0 R/Parent 355 0 R>>
-endobj
-39 0 obj
-<>>>/Contents 382 0 R/Parent 355 0 R>>
-endobj
-40 0 obj
-<>>>/Contents 385 0 R/Parent 355 0 R>>
-endobj
-41 0 obj
-<>>>/Contents 389 0 R/Parent 386 0 R>>
-endobj
-42 0 obj
-<>>>/Contents 392 0 R/Parent 386 0 R>>
-endobj
-43 0 obj
-<>>>/Contents 395 0 R/Parent 386 0 R>>
-endobj
-44 0 obj
-<>>>/Contents 398 0 R/Parent 386 0 R>>
-endobj
-45 0 obj
-<>>>/Contents 401 0 R/Parent 386 0 R>>
-endobj
-46 0 obj
-<>>>/Contents 404 0 R/Parent 386 0 R>>
-endobj
-47 0 obj
-<>>>/Contents 407 0 R/Parent 386 0 R>>
-endobj
-48 0 obj
-<>>>/Contents 410 0 R/Parent 386 0 R>>
-endobj
-49 0 obj
-<>>>/Contents 413 0 R/Parent 386 0 R>>
-endobj
-50 0 obj
-<>>>/Contents 416 0 R/Parent 386 0 R>>
-endobj
-51 0 obj
-<>>>/Contents 420 0 R/Parent 417 0 R>>
-endobj
-52 0 obj
-<>>>/Contents 423 0 R/Parent 417 0 R>>
-endobj
-53 0 obj
-<>>>/Contents 426 0 R/Parent 417 0 R>>
-endobj
-54 0 obj
-<>>>/Contents 429 0 R/Parent 417 0 R>>
-endobj
-55 0 obj
-<>>>/Contents 432 0 R/Parent 417 0 R>>
-endobj
-56 0 obj
-<>>>/Contents 435 0 R/Parent 417 0 R>>
-endobj
-57 0 obj
-<>>>/Contents 438 0 R/Parent 417 0 R>>
-endobj
-58 0 obj
-<>>>/Contents 441 0 R/Parent 417 0 R>>
-endobj
-59 0 obj
-<>>>/Contents 444 0 R/Parent 417 0 R>>
-endobj
-60 0 obj
-<>>>/Contents 447 0 R/Parent 417 0 R>>
-endobj
-61 0 obj
-<>>>/Contents 451 0 R/Parent 448 0 R>>
-endobj
-62 0 obj
-<>>>/Contents 454 0 R/Parent 448 0 R>>
-endobj
-63 0 obj
-<>>>/Contents 457 0 R/Parent 448 0 R>>
-endobj
-64 0 obj
-<>>>/Contents 460 0 R/Parent 448 0 R>>
-endobj
-65 0 obj
-<>>>/Contents 463 0 R/Parent 448 0 R>>
-endobj
-66 0 obj
-<>>>/Contents 466 0 R/Parent 448 0 R>>
-endobj
-67 0 obj
-<>>>/Contents 469 0 R/Parent 448 0 R>>
-endobj
-68 0 obj
-<>>>/Contents 472 0 R/Parent 448 0 R>>
-endobj
-69 0 obj
-<>>>/Contents 475 0 R/Parent 448 0 R>>
-endobj
-70 0 obj
-<>>>/Contents 478 0 R/Parent 448 0 R>>
-endobj
-71 0 obj
-<>>>/Contents 482 0 R/Parent 479 0 R>>
-endobj
-72 0 obj
-<>>>/Contents 485 0 R/Parent 479 0 R>>
-endobj
-73 0 obj
-<>>>/Contents 488 0 R/Parent 479 0 R>>
-endobj
-74 0 obj
-<>>>/Contents 491 0 R/Parent 479 0 R>>
-endobj
-75 0 obj
-<>>>/Contents 494 0 R/Parent 479 0 R>>
-endobj
-76 0 obj
-<>>>/Contents 497 0 R/Parent 479 0 R>>
-endobj
-77 0 obj
-<>>>/Contents 500 0 R/Parent 479 0 R>>
-endobj
-78 0 obj
-<>>>/Contents 503 0 R/Parent 479 0 R>>
-endobj
-79 0 obj
-<>>>/Contents 506 0 R/Parent 479 0 R>>
-endobj
-80 0 obj
-<>>>/Contents 509 0 R/Parent 479 0 R>>
-endobj
-81 0 obj
-<>>>/Contents 513 0 R/Parent 510 0 R>>
-endobj
-82 0 obj
-<>>>/Contents 516 0 R/Parent 510 0 R>>
-endobj
-83 0 obj
-<>>>/Contents 519 0 R/Parent 510 0 R>>
-endobj
-84 0 obj
-<>>>/Contents 522 0 R/Parent 510 0 R>>
-endobj
-85 0 obj
-<>>>/Contents 525 0 R/Parent 510 0 R>>
-endobj
-86 0 obj
-<>>>/Contents 528 0 R/Parent 510 0 R>>
-endobj
-87 0 obj
-<>>>/Contents 531 0 R/Parent 510 0 R>>
-endobj
-88 0 obj
-<>>>/Contents 534 0 R/Parent 510 0 R>>
-endobj
-89 0 obj
-<>>>/Contents 537 0 R/Parent 510 0 R>>
-endobj
-90 0 obj
-<>>>/Contents 540 0 R/Parent 510 0 R>>
-endobj
-91 0 obj
-<>>>/Contents 544 0 R/Parent 541 0 R>>
-endobj
-92 0 obj
-<>>>/Contents 547 0 R/Parent 541 0 R>>
-endobj
-93 0 obj
-<>>>/Contents 550 0 R/Parent 541 0 R>>
-endobj
-94 0 obj
-<>>>/Contents 553 0 R/Parent 541 0 R>>
-endobj
-95 0 obj
-<>>>/Contents 556 0 R/Parent 541 0 R>>
-endobj
-96 0 obj
-<>>>/Contents 559 0 R/Parent 541 0 R>>
-endobj
-97 0 obj
-<>>>/Contents 562 0 R/Parent 541 0 R>>
-endobj
-98 0 obj
-<>>>/Contents 565 0 R/Parent 541 0 R>>
-endobj
-99 0 obj
-<>>>/Contents 568 0 R/Parent 541 0 R>>
-endobj
-100 0 obj
-<>>>/Contents 571 0 R/Parent 541 0 R>>
-endobj
-101 0 obj
-<>>>/Contents 575 0 R/Parent 572 0 R>>
-endobj
-102 0 obj
-<>>>/Contents 578 0 R/Parent 572 0 R>>
-endobj
-103 0 obj
-<>>>/Contents 581 0 R/Parent 572 0 R>>
-endobj
-104 0 obj
-<>>>/Contents 584 0 R/Parent 572 0 R>>
-endobj
-105 0 obj
-<>>>/Contents 587 0 R/Parent 572 0 R>>
-endobj
-106 0 obj
-<>>>/Contents 590 0 R/Parent 572 0 R>>
-endobj
-107 0 obj
-<>>>/Contents 593 0 R/Parent 572 0 R>>
-endobj
-108 0 obj
-<>>>/Contents 596 0 R/Parent 572 0 R>>
-endobj
-109 0 obj
-<>>>/Contents 599 0 R/Parent 572 0 R>>
-endobj
-110 0 obj
-<>>>/Contents 602 0 R/Parent 572 0 R>>
-endobj
-111 0 obj
-<>>>/Contents 606 0 R/Parent 603 0 R>>
-endobj
-112 0 obj
-<>>>/Contents 609 0 R/Parent 603 0 R>>
-endobj
-113 0 obj
-<>>>/Contents 612 0 R/Parent 603 0 R>>
-endobj
-114 0 obj
-<>>>/Contents 615 0 R/Parent 603 0 R>>
-endobj
-115 0 obj
-<>>>/Contents 618 0 R/Parent 603 0 R>>
-endobj
-116 0 obj
-<>>>/Contents 621 0 R/Parent 603 0 R>>
-endobj
-117 0 obj
-<>>>/Contents 624 0 R/Parent 603 0 R>>
-endobj
-118 0 obj
-<>>>/Contents 627 0 R/Parent 603 0 R>>
-endobj
-119 0 obj
-<>>>/Contents 630 0 R/Parent 603 0 R>>
-endobj
-120 0 obj
-<>>>/Contents 633 0 R/Parent 603 0 R>>
-endobj
-121 0 obj
-<>>>/Contents 637 0 R/Parent 634 0 R>>
-endobj
-122 0 obj
-<>>>/Contents 640 0 R/Parent 634 0 R>>
-endobj
-123 0 obj
-<>>>/Contents 643 0 R/Parent 634 0 R>>
-endobj
-124 0 obj
-<>>>/Contents 646 0 R/Parent 634 0 R>>
-endobj
-125 0 obj
-<>>>/Contents 649 0 R/Parent 634 0 R>>
-endobj
-126 0 obj
-<>>>/Contents 652 0 R/Parent 634 0 R>>
-endobj
-127 0 obj
-<>>>/Contents 655 0 R/Parent 634 0 R>>
-endobj
-128 0 obj
-<>>>/Contents 658 0 R/Parent 634 0 R>>
-endobj
-129 0 obj
-<>>>/Contents 661 0 R/Parent 634 0 R>>
-endobj
-130 0 obj
-<>>>/Contents 664 0 R/Parent 634 0 R>>
-endobj
-131 0 obj
-<>>>/Contents 668 0 R/Parent 665 0 R>>
-endobj
-132 0 obj
-<>>>/Contents 671 0 R/Parent 665 0 R>>
-endobj
-133 0 obj
-<>>>/Contents 674 0 R/Parent 665 0 R>>
-endobj
-134 0 obj
-<>>>/Contents 677 0 R/Parent 665 0 R>>
-endobj
-135 0 obj
-<>>>/Contents 680 0 R/Parent 665 0 R>>
-endobj
-136 0 obj
-<>>>/Contents 683 0 R/Parent 665 0 R>>
-endobj
-137 0 obj
-<>>>/Contents 686 0 R/Parent 665 0 R>>
-endobj
-138 0 obj
-<>>>/Contents 689 0 R/Parent 665 0 R>>
-endobj
-139 0 obj
-<>>>/Contents 692 0 R/Parent 665 0 R>>
-endobj
-140 0 obj
-<>>>/Contents 695 0 R/Parent 665 0 R>>
-endobj
-141 0 obj
-<>>>/Contents 699 0 R/Parent 696 0 R>>
-endobj
-142 0 obj
-<>>>/Contents 702 0 R/Parent 696 0 R>>
-endobj
-143 0 obj
-<>>>/Contents 705 0 R/Parent 696 0 R>>
-endobj
-144 0 obj
-<>>>/Contents 708 0 R/Parent 696 0 R>>
-endobj
-145 0 obj
-<>>>/Contents 711 0 R/Parent 696 0 R>>
-endobj
-146 0 obj
-<>>>/Contents 714 0 R/Parent 696 0 R>>
-endobj
-147 0 obj
-<>>>/Contents 717 0 R/Parent 696 0 R>>
-endobj
-148 0 obj
-<>>>/Contents 720 0 R/Parent 696 0 R>>
-endobj
-149 0 obj
-<>>>/Contents 723 0 R/Parent 696 0 R>>
-endobj
-150 0 obj
-<>>>/Contents 726 0 R/Parent 696 0 R>>
-endobj
-151 0 obj
-<>>>/Contents 730 0 R/Parent 727 0 R>>
-endobj
-152 0 obj
-<>>>/Contents 733 0 R/Parent 727 0 R>>
-endobj
-153 0 obj
-<>>>/Contents 736 0 R/Parent 727 0 R>>
-endobj
-154 0 obj
-<>>>/Contents 739 0 R/Parent 727 0 R>>
-endobj
-155 0 obj
-<>>>/Contents 742 0 R/Parent 727 0 R>>
-endobj
-156 0 obj
-<>>>/Contents 745 0 R/Parent 727 0 R>>
-endobj
-157 0 obj
-<>>>/Contents 748 0 R/Parent 727 0 R>>
-endobj
-158 0 obj
-<>>>/Contents 751 0 R/Parent 727 0 R>>
-endobj
-159 0 obj
-<>>>/Contents 754 0 R/Parent 727 0 R>>
-endobj
-160 0 obj
-<>>>/Contents 757 0 R/Parent 727 0 R>>
-endobj
-161 0 obj
-<>>>/Contents 761 0 R/Parent 758 0 R>>
-endobj
-162 0 obj
-<>>>/Contents 764 0 R/Parent 758 0 R>>
-endobj
-163 0 obj
-<>>>/Contents 767 0 R/Parent 758 0 R>>
-endobj
-164 0 obj
-<>>>/Contents 770 0 R/Parent 758 0 R>>
-endobj
-165 0 obj
-<>>>/Contents 773 0 R/Parent 758 0 R>>
-endobj
-166 0 obj
-<>>>/Contents 776 0 R/Parent 758 0 R>>
-endobj
-167 0 obj
-<>>>/Contents 779 0 R/Parent 758 0 R>>
-endobj
-168 0 obj
-<>>>/Contents 782 0 R/Parent 758 0 R>>
-endobj
-169 0 obj
-<>>>/Contents 785 0 R/Parent 758 0 R>>
-endobj
-170 0 obj
-<>>>/Contents 788 0 R/Parent 758 0 R>>
-endobj
-171 0 obj
-<>>>/Contents 792 0 R/Parent 789 0 R>>
-endobj
-172 0 obj
-<>>>/Contents 795 0 R/Parent 789 0 R>>
-endobj
-173 0 obj
-<>>>/Contents 798 0 R/Parent 789 0 R>>
-endobj
-174 0 obj
-<>>>/Contents 801 0 R/Parent 789 0 R>>
-endobj
-175 0 obj
-<>>>/Contents 804 0 R/Parent 789 0 R>>
-endobj
-176 0 obj
-<>>>/Contents 807 0 R/Parent 789 0 R>>
-endobj
-177 0 obj
-<>>>/Contents 810 0 R/Parent 789 0 R>>
-endobj
-178 0 obj
-<>>>/Contents 813 0 R/Parent 789 0 R>>
-endobj
-179 0 obj
-<>>>/Contents 816 0 R/Parent 789 0 R>>
-endobj
-180 0 obj
-<>>>/Contents 819 0 R/Parent 789 0 R>>
-endobj
-181 0 obj
-<>>>/Contents 823 0 R/Parent 820 0 R>>
-endobj
-182 0 obj
-<>>>/Contents 826 0 R/Parent 820 0 R>>
-endobj
-183 0 obj
-<>>>/Contents 829 0 R/Parent 820 0 R>>
-endobj
-184 0 obj
-<>>>/Contents 832 0 R/Parent 820 0 R>>
-endobj
-185 0 obj
-<>>>/Contents 835 0 R/Parent 820 0 R>>
-endobj
-186 0 obj
-<>>>/Contents 838 0 R/Parent 820 0 R>>
-endobj
-187 0 obj
-<>>>/Contents 841 0 R/Parent 820 0 R>>
-endobj
-188 0 obj
-<>>>/Contents 844 0 R/Parent 820 0 R>>
-endobj
-189 0 obj
-<>>>/Contents 847 0 R/Parent 820 0 R>>
-endobj
-190 0 obj
-<>>>/Contents 850 0 R/Parent 820 0 R>>
-endobj
-191 0 obj
-<>>>/Contents 854 0 R/Parent 851 0 R>>
-endobj
-192 0 obj
-<>>>/Contents 857 0 R/Parent 851 0 R>>
-endobj
-193 0 obj
-<>>>/Contents 860 0 R/Parent 851 0 R>>
-endobj
-194 0 obj
-<>>>/Contents 863 0 R/Parent 851 0 R>>
-endobj
-195 0 obj
-<>>>/Contents 866 0 R/Parent 851 0 R>>
-endobj
-196 0 obj
-<>>>/Contents 869 0 R/Parent 851 0 R>>
-endobj
-197 0 obj
-<>>>/Contents 872 0 R/Parent 851 0 R>>
-endobj
-198 0 obj
-<>>>/Contents 875 0 R/Parent 851 0 R>>
-endobj
-199 0 obj
-<>>>/Contents 878 0 R/Parent 851 0 R>>
-endobj
-200 0 obj
-<>>>/Contents 881 0 R/Parent 851 0 R>>
-endobj
-201 0 obj
-<>>>/Contents 885 0 R/Parent 882 0 R>>
-endobj
-202 0 obj
-<>>>/Contents 888 0 R/Parent 882 0 R>>
-endobj
-203 0 obj
-<>>>/Contents 891 0 R/Parent 882 0 R>>
-endobj
-204 0 obj
-<>>>/Contents 894 0 R/Parent 882 0 R>>
-endobj
-205 0 obj
-<>>>/Contents 897 0 R/Parent 882 0 R>>
-endobj
-206 0 obj
-<>>>/Contents 900 0 R/Parent 882 0 R>>
-endobj
-207 0 obj
-<>>>/Contents 903 0 R/Parent 882 0 R>>
-endobj
-208 0 obj
-<>>>/Contents 906 0 R/Parent 882 0 R>>
-endobj
-209 0 obj
-<>>>/Contents 909 0 R/Parent 882 0 R>>
-endobj
-210 0 obj
-<>>>/Contents 912 0 R/Parent 882 0 R>>
-endobj
-211 0 obj
-<>>>/Contents 916 0 R/Parent 913 0 R>>
-endobj
-212 0 obj
-<>>>/Contents 919 0 R/Parent 913 0 R>>
-endobj
-213 0 obj
-<>>>/Contents 922 0 R/Parent 913 0 R>>
-endobj
-214 0 obj
-<>>>/Contents 925 0 R/Parent 913 0 R>>
-endobj
-215 0 obj
-<>>>/Contents 928 0 R/Parent 913 0 R>>
-endobj
-216 0 obj
-<>>>/Contents 931 0 R/Parent 913 0 R>>
-endobj
-217 0 obj
-<>>>/Contents 934 0 R/Parent 913 0 R>>
-endobj
-218 0 obj
-<>>>/Contents 937 0 R/Parent 913 0 R>>
-endobj
-219 0 obj
-<>>>/Contents 940 0 R/Parent 913 0 R>>
-endobj
-220 0 obj
-<>>>/Contents 943 0 R/Parent 913 0 R>>
-endobj
-221 0 obj
-<>>>/Contents 947 0 R/Parent 944 0 R>>
-endobj
-222 0 obj
-<>>>/Contents 950 0 R/Parent 944 0 R>>
-endobj
-223 0 obj
-<>>>/Contents 953 0 R/Parent 944 0 R>>
-endobj
-224 0 obj
-<>>>/Contents 956 0 R/Parent 944 0 R>>
-endobj
-225 0 obj
-<>>>/Contents 959 0 R/Parent 944 0 R>>
-endobj
-226 0 obj
-<>>>/Contents 962 0 R/Parent 944 0 R>>
-endobj
-227 0 obj
-<>>>/Contents 965 0 R/Parent 944 0 R>>
-endobj
-228 0 obj
-<>>>/Contents 968 0 R/Parent 944 0 R>>
-endobj
-229 0 obj
-<>>>/Contents 971 0 R/Parent 944 0 R>>
-endobj
-230 0 obj
-<>>>/Contents 974 0 R/Parent 944 0 R>>
-endobj
-231 0 obj
-<>>>/Contents 978 0 R/Parent 975 0 R>>
-endobj
-232 0 obj
-<>>>/Contents 981 0 R/Parent 975 0 R>>
-endobj
-233 0 obj
-<>>>/Contents 984 0 R/Parent 975 0 R>>
-endobj
-234 0 obj
-<>>>/Contents 987 0 R/Parent 975 0 R>>
-endobj
-235 0 obj
-<>>>/Contents 990 0 R/Parent 975 0 R>>
-endobj
-236 0 obj
-<>>>/Contents 993 0 R/Parent 975 0 R>>
-endobj
-237 0 obj
-<>>>/Contents 996 0 R/Parent 975 0 R>>
-endobj
-238 0 obj
-<>>>/Contents 999 0 R/Parent 975 0 R>>
-endobj
-239 0 obj
-<>>>/Contents 1002 0 R/Parent 975 0 R>>
-endobj
-240 0 obj
-<>>>/Contents 1005 0 R/Parent 975 0 R>>
-endobj
-241 0 obj
-<>>>/Contents 1009 0 R/Parent 1006 0 R>>
-endobj
-242 0 obj
-<>>>/Contents 1012 0 R/Parent 1006 0 R>>
-endobj
-243 0 obj
-<>>>/Contents 1015 0 R/Parent 1006 0 R>>
-endobj
-244 0 obj
-<>>>/Contents 1018 0 R/Parent 1006 0 R>>
-endobj
-245 0 obj
-<>>>/Contents 1021 0 R/Parent 1006 0 R>>
-endobj
-246 0 obj
-<>>>/Contents 1024 0 R/Parent 1006 0 R>>
-endobj
-247 0 obj
-<>>>/Contents 1027 0 R/Parent 1006 0 R>>
-endobj
-248 0 obj
-<>>>/Contents 1030 0 R/Parent 1006 0 R>>
-endobj
-249 0 obj
-<>>>/Contents 1033 0 R/Parent 1006 0 R>>
-endobj
-250 0 obj
-<>>>/Contents 1036 0 R/Parent 1006 0 R>>
-endobj
-251 0 obj
-<>>>/Contents 1040 0 R/Parent 1037 0 R>>
-endobj
-252 0 obj
-<>>>/Contents 1043 0 R/Parent 1037 0 R>>
-endobj
-253 0 obj
-<>>>/Contents 1046 0 R/Parent 1037 0 R>>
-endobj
-254 0 obj
-<>>>/Contents 1049 0 R/Parent 1037 0 R>>
-endobj
-255 0 obj
-<>>>/Contents 1052 0 R/Parent 1037 0 R>>
-endobj
-256 0 obj
-<>>>/Contents 1055 0 R/Parent 1037 0 R>>
-endobj
-257 0 obj
-<>>>/Contents 1058 0 R/Parent 1037 0 R>>
-endobj
-258 0 obj
-<>>>/Contents 1061 0 R/Parent 1037 0 R>>
-endobj
-259 0 obj
-<>>>/Contents 1064 0 R/Parent 1037 0 R>>
-endobj
-260 0 obj
-<>>>/Contents 1067 0 R/Parent 1037 0 R>>
-endobj
-263 0 obj
-<>>>/BBox[0 0 1199.76 1703.52]/FormType 1/Matrix[1 0 0 1 0 0]/Length 43/Filter/FlateDecode>>stream
-x+T0437S0 BCsc=S#0;9WA?37@%_!
-endstream
-endobj
-264 0 obj
-<>>>stream
-*@.U}붆wo|28/8a:~h C^a}mA >CAw
ZH=˯M1Nv!Ϣ>3ۊ&=AbBNÌv>!o\.+Mm@+ݭA\!co3;a,.ۗڠKbPB]H%ܺ qK72E%oF@|L@.@|V l'GE֓ 8\z42*KA(R@|IRI(r
;PˆdH -+Tpk$JN,YǨJ1$Nt;<2*Ji2:;BC$#AB0E:8Q#"\
-dtj? >zB@|8
->@|) {|$%o0hbv:üY:H2OkLg=E;tDYFGW[)kxJ.lA6GB,Kw#q&49c >k)i ,g]= 3AmM w2;#tSF< 0:C-#F "+#"!Z
-.E C/b"CtArC;
-$A|
-Zc8dsC
@ >aɎ@@|LX\}t1=@|
-8Dt8eď}gPD&bMЂ#9A(Rrtq&8dpl܀
-F8iq8y; HXӈ;p"~Tt.8uc!p !NB!h+!a
->8R7.1DiC8b4MH.8ADt:",cq(nq ;wLDw!
C(e^0THr=x":@|Ԍ!FZ8DuWPA]Gzt#[RpÍG pGㅂPCн0!8S+D$?|LpIX[XMoeXE$Gyic >8UҠEշ l"*aԀ
-,%E@l
R(#CLX+5iм:C0l"@em AJ0.L(@!d$hB)gȓ;n(9dMETi!apʤ+>CM4DÇpӳ輛r6d =d
J#'iAvE9̎
A0ql3ao/28mP7w\DD]9L(2h6öJÃj&eD6C9iBAz[iފBrqIPg{
zvZxVkg0ii|e(;~U]kvYm UI&TzJjFˆJD4mE"MW*,cAW]ށK;J7}aM,'Qm2զ?A[s''H3{S]=/9DF[*p^ޕ,aGe =ZiRnץAQ_H %x0286%il3R#3AJMVHF%*EQ
^mC(pL粑ّUIU,'H:6E' '!<iދ
]*!&Őhv@CB@jsNP_~T[NHZǪd
-rv@9+bZnS!6r?/M L{+k^O$$l"4oC@W#aJ3q3l˂DDuv
}OIhB## xrARmXZW$)ئ@rvPg!75ߥVZzKI\r$xd4A|UzЈmD6w dI7yx>Έ (<jDtNRL{E8aG
jDEȎ#}-umUT}jܷ!S~V;Ճl:2%PrP8={JsQ 2DmB; F9#w"9CfJgׄZVq[D]DD|~頄a5ڋWI">a_s.켄DXI]/nMG۫^B""0~cUDWW@?|LpAW~>B!UeliSX}_]G>K_{ww][ xKl$M}C>Wk&`]xKKN_@ XD̖Y؈ o }r$43)#`ﭫp0xbl)tZu+֟0B?_Inv/T7u
3{'~{izad4.Aj2gO}L<5Aׇ |]DpdKھa-OaDFՊ^kׯ֘Smn餘}Wp[dAM7L%I!,("_o[ n}/Kag%@#v
R~_A~/=>W &[v ޗ]P+aۑޓ{=C\$ޗu on톁dmW*
WC7~^~}ߺMoP?]KaSiuO+
*ڥ/v)}P]Fi4L:w@z[qNߪOtIR '[
Vw DaA7XAmm4h,&~M$zM-ZiSzM~ zZ~~յ_tzA]Km=+L<AwKat 7xI[uI7߃I7h&&m?A+oa&t@'To[kwI0~ۭX0L"zQoW HfT$Z&W[iY]7_%u`Zon3w$L=\v:=9ЭP#A2՜鎬6&VWA?i;q -$X V$vP$M-Hk98-ATҦ6R"d6BQL ]5`2e'P]G-"=*zrh48֢vR ]֒L+i&Sˤ 2tGt"fWICkT)PA6U=PAZPBqP`a0z
-?a=+; >5xxvېLGa*@52Q8763(L&;]cAq0]~mgqYF,@^REك:`L&"@rCNΆ^ Qal!DI
ZXoArh
8D
Ut
a^0ﲫd82T&נAjmy܉:A:5#M-Q& aBxd" _Cz,VBΘ T X/U ^U!CS5Mh֝'":.W*)TCO7"ͪh&eBtM{xAZ3`)JqD\" U'ABxr܋.~uA
-H0}
Uccӆ2 e:.DztaKUV_~Xe:""#3h?wֻ,uO~#*N^tZozW^Ko-D[H3{!}U44tI?LgEkV50]wK.Z^rd&a.?BKݵZWDIr4hm2
<$B_$_m/I}7VWO-<̋$B8p"hL]_UZICKZ}48v}Èn-V[t/mokTZk;vz~?$?zUz~uu{jr\ʂm;=VR''Iu K~?O~m-%aO `so.fJh9/ǧBKҺW'DyO#ںz: rMݭuUT5#j:VKʲk>Vժ||!l4h.7IZ
Y@]d%h!꾿ҥu
-%l4i*75Tr@˃Jz~KZ{jKzpL05a(TW8BjAVXKO맚I¤]aӤq!!)Jl }4""4I,s9ޕ~2(!tm*KM}:Uz~&Z\q܄h?U4G
7mz
hΰ4w!i/H
^i4d i%45_'K7X.=C
a3<aƽ+G%9(RCJSnj\5u5( 6ɄHFL2HJJ#f]IBWO"CZzOa~Aj.F>p5# ZƨRg 09Z!qE^C0A25^CDEČ}? /X:.2=鿢Mޕ$Git!%;]7L=.~ #
/i}t{MTүT!O/zWVӤH7Kv*-ͬKV
__jA`OxDvDvA$Xj89"".(֡3k2; U]V#uE>TC:.АǺjb>{qD[ TOM
~--'PߧI{G#IW]h Ib"/_h_JO-AT@[Ćko#iA-.
-_j9* hWJ=Piz_iHk-/H6{[Y
_"=rVh)%47T"U?
-/!}z鑍$[I5nnִVl!DYzZORXEij k"[W 76
t/9S+U|;!?i^ҨNMh5Mv*ʠ**GZ_I.
=tzndQU_6?d싯҃
-Вk)f\5[)V_%^;! !rNP{UOjA0z"qn_Մª]"2)dץg@{_KzInz#
}ty+b_$D@i{vTݥxH:]H1yd(u&~A˥KI"T"ֿ~}!ޑZUP3KM-}tyjzV@$ ]օ&'JK)]LpMch}tU
-r [пA*[
-G}}AeEJӬ?"AxRv=;:PDAWAC%ZאXӲ
譌gs j!{#_o""_j=6@QQTAf EVUT"XJ̈́v|0Ho!zi6/i0ՆD`Bж*UAuա_--> xVjpa0 CI 0i-L_~GKj/u?uWҫC)Z[tv$ `8{!AAb+iR9
"; VnH/Yi{>uƙK=MpQGA!
-9^#DV.TJ}.%蓱OKK'ߕ>~M@gC2 d!n._a6}{M[dw`@@BBH2qeaG8y[/<&BWO@th2/hYD.fJo&́G_{-"z^V'KO+A*lda_z,fz_%~}ujԉޭ&GZdt"6,"ưU|8Q4P/Miub7`#@;~ B"9''Yr_m֞Ú&
-}ImzL@[[kPPaI1q |RHs܊9B(rboP_k֭I6ޢI"#IRצ-B"/#Vc+}2ׯimGA'-`$GFTaDv^'ml?K^A|#hEфl|Rp}z_ aZ|'@iZWa?nCI'xOֿnC<4iGB6$<UF'[vnNץ 黵a$%@ԧ؆#bVSpѪ[zy6פFKNzaVu6GFt`h +Xai~7mt[m