delete from Export_Task
diff --git a/src/main/resources/mapper/Zd_AssortMapper.xml b/src/main/resources/mapper/Zd_AssortMapper.xml
index fbb5d73..4b29432 100644
--- a/src/main/resources/mapper/Zd_AssortMapper.xml
+++ b/src/main/resources/mapper/Zd_AssortMapper.xml
@@ -75,7 +75,7 @@
SELECT
dbo.zd_assort.assort_id,
dbo.zd_assort.assort_name,
- dbo.emr_type_related.id printFlag
+ dbo.emr_type_related.id print_flag
FROM
dbo.zd_assort
LEFT OUTER JOIN
@@ -116,7 +116,7 @@
DISTINCT
assort_id,
assort_name,
- emr_user_reader.record_id printFlag,
+ emr_user_reader.record_id print_flag,
assort_sort
FROM
zd_assort
diff --git a/src/main/webapp/WEB-INF/dispatcherServlet-servlet.xml b/src/main/webapp/WEB-INF/dispatcherServlet-servlet.xml
index 14e6db1..60e7678 100644
--- a/src/main/webapp/WEB-INF/dispatcherServlet-servlet.xml
+++ b/src/main/webapp/WEB-INF/dispatcherServlet-servlet.xml
@@ -57,6 +57,7 @@
+
diff --git a/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/inspectionRecords.jsp b/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/inspectionRecords.jsp
index 9c4aedb..dc79bc8 100644
--- a/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/inspectionRecords.jsp
+++ b/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/inspectionRecords.jsp
@@ -162,7 +162,7 @@
-
+
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 a373470..e4b2d51 100644
--- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp
+++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp
@@ -216,6 +216,8 @@
+
+
@@ -616,6 +618,17 @@
+
+ <%--
+
+
--%>
@@ -1017,6 +1033,14 @@
+
+
+
病案信息管理系统')
}else{
diff --git a/src/main/webapp/static/css/comm.css b/src/main/webapp/static/css/comm.css
index 38c1882..b601414 100644
--- a/src/main/webapp/static/css/comm.css
+++ b/src/main/webapp/static/css/comm.css
@@ -15,7 +15,7 @@
*/
.main{
width:100%;
- /* height:100%;*/
+ height:94%;
background-color: #c1d7e3;
}
/*
diff --git a/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js b/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js
index 1a806bf..00f25b8 100644
--- a/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js
+++ b/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js
@@ -112,9 +112,10 @@ function initQueryCondition(){
$("#directorDiv").css('display','');
$("#admissDoctorDiv").css('display','');
$("#memoDiv").css('display','');
+ $("#phDiv").css('display','');
$("#isOperDiv").css('display','');
- $("#inpatientNoEditDiv,#nameEditDiv,#admissTimesEditDiv,#disDateEditDiv,#disDeptEditDiv,#disDiagEditDiv").css('display','');
+ $("#inpatientNoEditDiv,#nameEditDiv,#admissTimesEditDiv,#admissDateEditDiv,#disDateEditDiv,#disDeptEditDiv,#disDiagEditDiv").css('display','');
}
}
@@ -654,6 +655,11 @@ function getSql() {
name = 'medical_no';
whereNames += commomtable + "." + name + " LIKE '%" + $("#" + name).val() + "%' AND ";
}
+ //盘号
+ if (!isEmpty($("#ph").val())) {
+ name = 'ph';
+ whereNames += commomtable + "." + name + " LIKE '%" + $("#" + name).val() + "%' AND ";
+ }
//女方姓名
if (!isEmpty($("#female_name").val())) {
name = 'female_name';
diff --git a/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBlood.js b/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBlood.js
index b613696..9e34739 100644
--- a/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBlood.js
+++ b/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBlood.js
@@ -126,7 +126,7 @@ function onClick(e, treeId, treeNode) {
};
//打印分类变更事件
$("#typeId").change(function () {
-
+ menu.loadMenuTree();
})
//按原件排序
@@ -147,6 +147,55 @@ function onloadPdfMethod() {
//加载pdf按钮功能
function onloadPdf(scanPages, sources) {
+ /*var batchSize = 10; // 每批处理10个PDF文件
+ var scanPagesArray = scanPages.split(',');
+ var sourcesArray = sources.split(',');
+ var totalFiles = scanPagesArray.length;
+ var batches = Math.ceil(totalFiles / batchSize);
+ function processBatch(batchIndex){
+ var start = batchIndex * batchSize;
+ var end = Math.min(start + batchSize, totalFiles);
+ var batchScanPages = scanPagesArray.slice(start, end) + "";
+ var batchSources = sourcesArray.slice(start, end) + "";
+
+ $("#iframeLoad").val("");
+ $("#printPicLoaded").val("");
+ var patientId = $("#patientId").val();
+ //根目录字段识别名称
+ var flag = parent.$("#flag").val();
+ $.ajax({
+ type: 'post',
+ url: path + "/commom/showRecordContentBlood",
+ data: {
+ patientId: patientId,
+ scanPages: batchScanPages,
+ flag: flag,
+ sources: batchSources,
+ batchIndex: batchIndex
+ },
+ datType: 'json',
+ success: function (data) {
+ if (data.code == 0) {
+ var str = path + "/commom/getRecordContentBlood?patientId=" + patientId + "&batchIndex=" + batchIndex;
+ if (sources.includes("99") ||sources.includes("服务") ||sources.includes("null")||sources.includes("pacs")||sources.includes("扫描上传")) {
+ $("#iframe1").attr("src", path + "/static/pdfjs/web/viewer.html?file=" + encodeURIComponent(str))
+ } else {
+ $("#iframe1").attr("src", path + "/static/pdfjs/web/viewer2.html?file=" + encodeURIComponent(str))
+ var rootPaths = parent.$("#rootPaths").val();
+ var print = $("#print").val();
+ if (print == 1) {
+ selectPrintPic(patientId, rootPaths, scanPages, sources);
+ }
+ }
+ }
+ }
+ })
+ }
+ // 处理每个批次
+ for (var i = 0; i < batches; i++) {
+ processBatch(i);
+ }*/
+
$("#iframeLoad").val("");
$("#printPicLoaded").val("");
var patientId = $("#patientId").val();
@@ -180,22 +229,6 @@ function onloadPdf(scanPages, sources) {
})
}
-/*function onloadPdf(scanPages, sources) {
- $("#iframeLoad").val("");
- $("#printPicLoaded").val("");
- var patientId = $("#patientId").val();
- //根目录字段识别名称
- var flag = parent.$("#flag").val();
- var str = path + "/commom/showRecordContentBlood?patientId=" + patientId + "&scanPages=" + scanPages + "&sources=" + sources + "&flag=" + flag;
- $("#iframe1").attr("src", path + "/static/pdfjs/web/viewer1.html?file=" + encodeURIComponent(str));
- var rootPaths = parent.$("#rootPaths").val();
- //加载的图片
- var print = $("#print").val();
- if (scanPages != '' && print == 1) {
- selectPrintPic(patientId, rootPaths, scanPages, sources);
- }
-}*/
-
var iframe = document.getElementById("iframe1");
/**
@@ -223,41 +256,20 @@ function selectPrintPic(patientId, rootPaths, scanPages, sources) {
}
var interval = setInterval(function () {
if ($("#iframeLoad").val() == 1) {
+ //initImage();
iframe.contentDocument.getElementById("printContainer1").innerHTML = img;
- initImage();
$("#printPicLoaded").val(1);
iframe.contentDocument.getElementById("printLoading").style.display = 'none';
iframe.contentDocument.getElementById("print").style.display = 'block';
clearInterval(interval);
}
- }, 200);
+ }, 100);
}
} else {
toastr.error(data.msg);
}
}
})
- //查询进度定时器
- // var interval1 = setInterval(function () {
- // $.ajax({
- // type: 'get',
- // url: path + "/commom/getPrintPicLoading",
- // data: {patientId: $("#patientId").val()},
- // dataType: 'json',
- // success: function (data) {
- // if (data.code == 0) {
- // var value = data.data;
- // $("#loading").val(value + "%");
- // if (value == 100) {
- // //杀死进度定时器
- // clearInterval(interval1);
- // }
- // } else {
- // toastr.error(data.msg);
- // }
- // }
- // })
- // }, 100);
}
function initImage(){
diff --git a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js
index 730d894..93307f1 100644
--- a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js
+++ b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js
@@ -252,6 +252,7 @@ function freshTable(){
onCheck:function(row){
var checks = $("#checks").val();
$("#checks").val(checks+="'"+row.patientId + "',");
+ $("#megerPatientId").val(row.patientId);
},
onUncheck: function (row, $element) {
chosenGroupId = "";
@@ -263,6 +264,7 @@ function freshTable(){
var checks = $("#checks").val();
checks = checks.replace("'"+row.patientId + "',","");
$("#checks").val(checks);
+ $("#megerPatientId").val("");
},
//全选
onCheckAll:function(rows){
@@ -277,6 +279,7 @@ function freshTable(){
//全不选
onUncheckAll: function (rows) {
$("#checks").val("");
+ $("#megerPatientId").val("");
},
//双击事件
@@ -496,6 +499,13 @@ function getUpdateCommomInfo(patientId) {
/**
* 初始化时间框
*/
+ //入院时间
+ $('#admissDate').datepicker({
+ language: "zh-CN",
+ format: "yyyy-mm-dd",
+ autoclose: true,//选中之后自动隐藏日期选择框
+ })
+
//出院时间
$('#disDate').datepicker({
language: "zh-CN",
@@ -533,6 +543,8 @@ function getUpdateCommomInfo(patientId) {
$("#inpatientNo").val(data.inpatientNo);
$("#updateName").val(data.name);
$("#admissTimes").val(data.admissTimes);
+ var admissDate = formatTime(data.admissDate,'yyyy-MM-dd')
+ $("#admissDate").val(admissDate);
var disDate = formatTime(data.disDate,'yyyy-MM-dd')
$("#disDate").val(disDate);
loadDeptDefault(data.disDept);
@@ -566,7 +578,7 @@ function updateCommomInfo() {
$.ajax({
type:'post',
url:path+'/commom/updateCommomInfo',
- data:$("#form").serialize(),
+ data: $("#form").serialize(),
dataType:'json',
success:function(data){
if(data!=null && data.code == 0){
@@ -1301,6 +1313,19 @@ function powerPotient(patientIds,flag,typeId){
}
return patientIds;
}
+
+/**
+ * 合并PDF
+ */
+function mergePDF(){
+ var patientId = $("#megerPatientId").val();
+ if(patientId == '' || patientId == null){
+ return toastr.warning("请选择一条数据");
+ }
+ var mergeUrl = path + '/commom/showMegerPDFView?patientId='+ patientId +'&dataSource=';
+ window.open(mergeUrl, "_blank")
+}
+
/*********************************************************工具*************************************************************/
//格式化时间
function formatTime(datetime, fmt) {
diff --git a/src/main/webapp/static/pdfjs/Print.js b/src/main/webapp/static/pdfjs/Print.js
index f80941b..b52ee15 100644
--- a/src/main/webapp/static/pdfjs/Print.js
+++ b/src/main/webapp/static/pdfjs/Print.js
@@ -112,6 +112,7 @@
w.focus();
typeof _this.options.onStart === 'function' && _this.options.onStart();
if (!w.document.execCommand('print', false, null)) {
+ alert("打印失败")
w.print();
}
typeof _this.options.onEnd === 'function' && _this.options.onEnd();
diff --git a/src/main/webapp/static/pdfjs/web/viewer.css b/src/main/webapp/static/pdfjs/web/viewer.css
index 3caf2ee..5c59938 100644
--- a/src/main/webapp/static/pdfjs/web/viewer.css
+++ b/src/main/webapp/static/pdfjs/web/viewer.css
@@ -405,6 +405,7 @@ html[dir='rtl'] #sidebarContent {
bottom: 0;
left: 0;
outline: none;
+ height: 91%;
}
html[dir='ltr'] #viewerContainer {
box-shadow: inset 1px 0 0 hsla(0,0%,100%,.05);
diff --git a/src/main/webapp/static/pdfjs/web/viewer2.html b/src/main/webapp/static/pdfjs/web/viewer2.html
index 3a7e65e..316a0b6 100644
--- a/src/main/webapp/static/pdfjs/web/viewer2.html
+++ b/src/main/webapp/static/pdfjs/web/viewer2.html
@@ -97,10 +97,33 @@ http://sourceforge.net/adobe/cmap/wiki/License/
opacity: 1;
}
- .a4-image {
- max-width: 850px;
- max-height: 1190px;
- object-fit: contain;
+ /* 设置打印时的样式 */
+ @media print {
+ body {
+ margin: 0;
+ padding: 0;
+ }
+
+ .a4-paper {
+ width: 210mm; /* A4 纸张宽度 */
+ height: 297mm; /* A4 纸张高度 */
+ margin: 0 auto; /* 居中对齐 */
+ padding: 0; /* 内边距 */
+ box-sizing: border-box;
+ }
+
+ .a4-image {
+ max-width: 100%; /* 图像最大宽度为容器宽度 */
+ max-height: 100%; /* 图像最大高度为容器高度 */
+ height: auto; /* 保持图像比例 */
+ width: auto; /* 保持图像比例 */
+ }
+ }
+
+ /* 设置 A4 纸张大小和边距 */
+ @page {
+ size: A4;
+ margin: 0; /* 移除默认页边距 */
}
@@ -446,7 +469,7 @@ http://sourceforge.net/adobe/cmap/wiki/License/