diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties
index 772f5af..32a14b3 100644
--- a/src/main/resources/config/config.properties
+++ b/src/main/resources/config/config.properties
@@ -1,6 +1,6 @@
power\u6743\u9650\u7CFB\u7EDFIP\u548C\u7AEF\u53E3
-POWER_IP = 172.16.11.90
-POWER_PORT = 8081
+POWER_IP = localhost
+POWER_PORT = 8085
#POWER_IP = 172.16.11.90
#POWER_PORT = 8081
@@ -62,7 +62,7 @@ overDateSet = 2021-05-01
export_pdf_path=D://export//
-#\u5bfc\u51fa\u4fe1\u606f\u683c\u5f0f\u9700\u8981\u4e3aunicode\u683c\u5f0f\u4e0d\u7136\u4f1a\u4e71\u7801
-export_pdf_hospital_info = \u5e7f\u4e1c\u7701_\u6f6e\u5dde\u5e02\u4eba\u6c11\u533b\u9662
+#\u5BFC\u51FA\u4FE1\u606F\u683C\u5F0F\u9700\u8981\u4E3Aunicode\u683C\u5F0F\u4E0D\u7136\u4F1A\u4E71\u7801
+export_pdf_hospital_info = \u5E7F\u4E1C\u7701_\u6F6E\u5DDE\u5E02\u4EBA\u6C11\u533B\u9662
diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties
index 3d02fdd..4f6c75f 100644
--- a/src/main/resources/config/jdbc.properties
+++ b/src/main/resources/config/jdbc.properties
@@ -8,9 +8,9 @@
\u6570\u636E\u5E93IP
dataBaseIp=localhost
#\u6570\u636E\u5E93\u540D\u79F0
-dataBaseName=emr_record
+dataBaseName=gm_record
#\u6570\u636E\u5E93\u5BC6\u7801
-dataBasePassword=docus@702
+dataBasePassword=admin123
jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
jdbc.url=jdbc\:sqlserver\://${dataBaseIp}:1433;databaseName=${dataBaseName}
diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml
index 3064045..1a7cd1e 100644
--- a/src/main/resources/mapper/Archive_MasterMapper.xml
+++ b/src/main/resources/mapper/Archive_MasterMapper.xml
@@ -727,8 +727,8 @@
END printStatus
from archive_master m
LEFT JOIN
- archive_other_ext
- ON m.patient_id = archive_other_ext.jzh
+ archive_other_ext
+ ON m.patient_id = archive_other_ext.jzh
LEFT JOIN ( SELECT MasterID FROM archive_detail WHERE Source = '扫描上传' AND archive_detail.flag = '0' GROUP BY MasterID ) archive_detail ON m.id = archive_detail.MasterID
LEFT JOIN printInfoTable ON printInfoTable.patient_id = m.patient_id
where 1=1 and ArchiveState in ('64','1024')
@@ -1787,7 +1787,7 @@
INNER JOIN archive_master ON archive_master.id = archive_detail.MasterID
LEFT JOIN archive_master b ON archive_master.patient_id = b.ID_NO
WHERE
- Source = '扫描上传'
+ archive_detail.Source = '扫描上传'
AND archive_detail.flag = '0'
AND b.id IS NOT NULL
GROUP BY
diff --git a/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js b/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js
index f0f802d..d2c1c3a 100644
--- a/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js
+++ b/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js
@@ -232,7 +232,7 @@ function initTable() {
title: "操作",
align: 'left',
valign: 'middle',
- width: 100, // 定义列的宽度，单位为像素px
+ width: 200, // 宽度适当调大，容纳新按钮
formatter: function (value, row, index) {
var html = "";
if (selectPower == 1) {
@@ -247,30 +247,30 @@ function initTable() {
if (showFlowPower == 1) {
html += ''
}
+ // 新增：采集器重新采集按钮
+ html += '';
return html;
},
events: {
+ // 原有事件保持不变
'click .returnInfo': function (e, value, row, index) {
$("#backArchiveId").val(row.id);
$("#status").val(row.archivestate);
backSetValue();
$('#returnModal').modal({
- backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
- keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
- show: true//弹出对话框
+ backdrop: 'static',
+ keyboard: false,
+ show: true
});
},
'click .verifyInfo': function (e, value, row, index) {
- //调用审批diag
callApproveDiag(row.id,1,row.patientId);
},
'click .selInfo': function (e, value, row, index) {
- //查询是否医生或护士是否提交
- //selectHis(row);
$('#selModal').modal({
- backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
- keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
- show: true//弹出对话框
+ backdrop: 'static',
+ keyboard: false,
+ show: true
});
if (row.archivestate != '复审退回') {
$("#recallDiv").hide();
@@ -282,20 +282,13 @@ function initTable() {
} else {
$("#firstDiv").hide();
}
-
- //删除缓存
- //删除病历清单分段树选中
$("#assortId").html(0);
- //删除病历清单查看单个pdf复选框选中信息
idArr = [];
-
- //同步
$("#idLab").html(row.id);
$("#nameLab").html(row.name);
$("#inDateLab").html(operDisTime(row.admissionDateTime));
$("#chargeLab").html(row.doctorInCharge);
$("#deptToLab").html(row.deptAdmissionTo);
- //出院
if(row.dischargeDateTime!=null&& row.dischargeDateTime!='') {
$("#inDateLab1").html(operDisTime(row.dischargeDateTime));
}
@@ -305,7 +298,6 @@ function initTable() {
$("#inTimeLab").html(row.visitId);
$("#wzContent").html(row.lockinfo);
$("#masterId").val(row.id);
- //入/出院年+出院月+住院号+住院次数
var outDate = "";
if (row.dischargeDateTime != null && row.dischargeDateTime != "") {
outDate = row.dischargeDateTime.split("-");
@@ -314,15 +306,13 @@ function initTable() {
}
$("#outDateLab").val(outDate[0] + "" + outDate[1] + "" + row.inpNo.trim() + "" + row.visitId + "");
initTree(row.id);
- // backSetValue1(e, value, row)
getSource();
},
- //查看流程
'click .showFlowInfo': function (e, value, row) {
$('#showFlowInfo').modal({
- backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
- keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
- show: true//弹出对话框
+ backdrop: 'static',
+ keyboard: false,
+ show: true
});
var masterId = row.id;
var name = encodeURI(row.name);
@@ -330,11 +320,39 @@ function initTable() {
var visitId = row.visitId;
var dischargeDateTime = row.dischargeDateTime;
$("#showFlowInfoIframe").prop("src",path+"/beHosp/toShowFlowInfo?id="+masterId+"&name="+name+"&inpNo="+inpNo+"&visitId="+visitId+"&dischargeDateTime="+dischargeDateTime+"&role="+$("#checker").val());
+ },
+ // 新增：重新采集按钮点击事件
+ 'click .reCollectBtn': function (e, value, row, index) {
+ // 二次确认，避免误操作
+ if(!confirm(`确认要对患者【${row.name}（住院号：${row.inpNo}）】发起重新采集吗？`)) {
+ return;
+ }
+ // 调用 /task/repairTask 接口，入参 masterId = row.id
+ $.ajax({
+ url: "http://localhost:8004/task/repairTask", // 接口路径，与 Knife4j 一致
+ type: "POST",
+ // x-www-form-urlencoded 格式，直接传对象即可
+ data: {
+ masterId: row.id // 入参为当前行的 id（即 masterId）
+ },
+ dataType: 'json',
+ success: function (result) {
+ if (result.code == 100) {
+ toastr.success("重新采集任务已发起！");
+ // 可选：刷新表格数据
+ $("#table").bootstrapTable("refresh");
+ } else {
+ toastr.error("重新采集失败：" + (result.msg || "未知错误"));
+ }
+ },
+ error: function (xhr, status, error) {
+ toastr.error("接口调用异常：" + error);
+ }
+ });
}
},
cellStyle: function (value, row, index) {
return {classes: 'success'}
-
}
}
],