bug：修改pdf打印空白和图像预览界面上新增扫描图像上传报错

bug：查询列表把盘号放病案号前
bug：下载启用文本水印设置为否，但是下载的pdf还是有水印，该设置无效
bug:姓名查询:不能默认模糊查询，需要自选，前中后均可模糊查询
bug:病案信息修改功能:病案号 姓名 次数 出院日期 主要诊断名称需要可修改，修改权限根据权限系统配置
bug:病例图像超过300多页就不能下载成功

src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java

@@ -1085,6 +1085,7 @@ public class TemplateSearchController {
             ExportExcelUtil exportExcelUtil = new ExportExcelUtil();
             //导出excel的操作
             exportExcelUtil.expordExcel(tableThNames, fieldCns, list, fileName, response);
+            //CommonExcelExportUtil.exportExcel(list);
         } catch (Exception e) {
             ExceptionPrintUtil.printException(e);
             e.printStackTrace();
@@ -1335,7 +1336,8 @@ public class TemplateSearchController {
                 }
                 List<String> scanPathList = vo.getScanPathList();
                 //每个文件名
-                String fileName = vo.getInpatientNo().trim() + "-" + vo.getName().trim() + "-" + disDate.trim() + "_" + fmt.format(new Date());
+                String name = java.net.URLEncoder.encode(vo.getName(), "UTF-8");
+                String fileName = vo.getInpatientNo().trim() + "-" + name.trim() + "-" + disDate.trim() + "_" + fmt.format(new Date());
                 zos.putNextEntry(new ZipEntry(fileName + ".pdf"));
                 //合成pdf
                 out = new ByteArrayOutputStream();

src/main/java/com/emr/service/CommomService.java

@@ -661,7 +661,8 @@ public class CommomService {
                     } else {
                         //需要水印
                         //组织加水印后图片存放目录
-                        String waterPicRoot = WATERPICPATH + patientId + File.separator + sourceList[i] + File.separator;
+                        String waterPicRoot = WATERPICPATH + patientId + File.separator + sourceList[i] + File.separator;//D:/jiashi/reload/patientId/1/
+
                         //目录不存在则创建
                         if (!new File(waterPicRoot).isDirectory()) {
                             new File(waterPicRoot).mkdirs();
@@ -680,6 +681,7 @@ public class CommomService {
                         //组织输出地址
                         String root = selectRootByNotWater(WATERPICPATH);
                         outSrc = EMRRECORDJSP + File.separator + root + "/jiashi/reload/" + patientId + File.separator + sourceList[i] + File.separator + nameList[i];
+                        //http://192.168.199.124:8080/emr_record/reloadD\/jiashi/reload/patientId/1/
                     }
                 } else {
                     //不需要水印
@@ -707,11 +709,12 @@ public class CommomService {
                     } else {
                         //将原图片地址转换成映射地址
                         //获取盘符并转换映射地址的头部地址
-                        root = selectRootByNotWater(srcPath);
+                        //root = selectRootByNotWater(srcPath);
                         //获取盘符后面的地址
-                        String str1 = srcPath.substring(0, srcPath.indexOf(File.separator));
+                       // String str1 = srcPath.substring(0, srcPath.indexOf(File.separator));
-                        picPath = srcPath.substring(str1.length() + 1, srcPath.length());
+                        //picPath = srcPath.substring(str1.length() + 1, srcPath.length());
-                        outSrc = EMRRECORDJSP + File.separator + root + picPath;
+                        //outSrc = EMRRECORDJSP + File.separator + root + picPath;
+                        outSrc = "\\"+ picPath;
                     }
                 }
                 outs.add(outSrc);

src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp

@@ -229,7 +229,7 @@
                                value="盘号,病案号,ID号,住院次数,姓名,性别,年龄_岁,年龄_月,入院日期,出院日期,出院科室,联系地址,主诊ICD码,主诊名称,主诊转归,住院天数,主治医生,其他诊断,病理诊断,损伤中毒,是否有手术,病案备注">
                         <!--查询字段-->
                         <input type="hidden" id="englishFields"
-                               value="commomtable.inpatient_no,commomtable.admiss_id,commomtable.admiss_times,commomtable.name,commomtable.sex,commomtable.age,commomtable.age_month,commomtable.admiss_date,commomtable.dis_date,commomtable.dis_dept,commomtable.home_addr,commomtable.main_diag_code,commomtable.main_diag_name,commomtable.main_dis_thing,commomtable.admiss_days,commomtable.attending,commomtable.other_diag_name,commomtable.pathology_name,commomtable.poisoning_name,commomtable.is_oper,memo,commomtable.file_source,commomtable.ph">
+                               value="commomtable.ph,commomtable.inpatient_no,commomtable.admiss_id,commomtable.admiss_times,commomtable.name,commomtable.sex,commomtable.age,commomtable.age_month,commomtable.admiss_date,commomtable.dis_date,commomtable.dis_dept,commomtable.home_addr,commomtable.main_diag_code,commomtable.main_diag_name,commomtable.main_dis_thing,commomtable.admiss_days,commomtable.attending,commomtable.other_diag_name,commomtable.pathology_name,commomtable.poisoning_name,commomtable.is_oper,memo,commomtable.file_source">
                         <!--数据字段-->
                         <input type="hidden" id="fields"
                                value="ph,inpatientNo,admissId,admissTimes,name,sex,age,ageMonth,admissDate,disDate,disDept,homeAddr,mainDiagCode,mainDiagName,mainDisThing,admissDays,attending,otherDiagName,pathologyName,poisoningName,isOper,memo">

src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBlood.js

@@ -51,6 +51,7 @@ var menu = {
                     }else{
                         if(data[1] != undefined ){
                             scanPages = data[1].assortName;
+                            $("#sources").val('1');
                         }
                     }
                     $.fn.zTree.init($("#ztree"), menu.setting, data);

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 == '') {
+	// if ($("#rows").val() > 5000 && checks == '') {
-		toastr.warning("数据量大,暂提供5000条以内数据导出!");
+	// 	toastr.warning("数据量大,暂提供5000条以内数据导出!");
-	} else {
+	// } else {
 		getSql();
 		var tableThNames = $("#tableThNames").val();
 		var fieldCns = $("#fieldCns").val();
@@ -365,7 +365,6 @@ function exportExcel() {
 				}
 			})
 		}
-	}
 }
 function btn(){
 	var url = path + "/printInfoList/pageUI174";