lxd/inspect-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加生成时间间隔

Browse Source
This commit is contained in:
Euni4U 2025-04-10 12:20:06 +08:00
parent 11ee7c5b9f
commit f31ea91315
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/InspectPatientController.java
View File

@ -439,7 +439,19 @@ public class InspectPatientController {
} else { } else {
// 如果未打印，生成新的条码 // 如果未打印，生成新的条码
checkBarCode1 = DateUtils.generateUniqueCode(); checkBarCode1 = DateUtils.generateUniqueCode();
try {
// 等待2毫秒，确保时间戳不同
Thread.sleep(2);
} catch (InterruptedException e) {
// 忽略中断异常
}
checkBarCode2 = DateUtils.generateUniqueCode(); checkBarCode2 = DateUtils.generateUniqueCode();
try {
// 等待2毫秒，确保时间戳不同
Thread.sleep(2);
} catch (InterruptedException e) {
// 忽略中断异常
}
checkBarCode3 = DateUtils.generateUniqueCode(); checkBarCode3 = DateUtils.generateUniqueCode();
} }
@ -1386,6 +1398,12 @@ public class InspectPatientController {
String reportDate = ""; String reportDate = "";
String medicalSn = patientDO.getMedicalSn(); String medicalSn = patientDO.getMedicalSn();
// 使用medicalDateTime字段获取日期
LocalDateTime medicalDateTime = patientDO.getMedicalDateTime();
if (medicalDateTime != null) {
reportDate = medicalDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
} else {
// 如果medicalDateTime为空，则使用medicalSn中的日期作为备选
if (medicalSn != null && medicalSn.length() >= 8) { if (medicalSn != null && medicalSn.length() >= 8) {
// 提取前8位作为日期 // 提取前8位作为日期
reportDate = medicalSn.substring(0, 8); reportDate = medicalSn.substring(0, 8);
@ -1393,22 +1411,6 @@ public class InspectPatientController {
if (reportDate.length() == 8) { if (reportDate.length() == 8) {
reportDate = reportDate.substring(0, 4) + "-" + reportDate.substring(4, 6) + "-" + reportDate.substring(6, 8); reportDate = reportDate.substring(0, 4) + "-" + reportDate.substring(4, 6) + "-" + reportDate.substring(6, 8);
} }
} else {
// 尝试从URL中提取体检编号
int lastSlashIndex = pdfUrl.lastIndexOf('/');
if (lastSlashIndex != -1) {
String fileName = pdfUrl.substring(lastSlashIndex + 1);
int dashIndex = fileName.indexOf('-');
if (dashIndex != -1) {
String examNo = fileName.substring(0, dashIndex);
if (examNo.length() >= 8) {
reportDate = examNo.substring(0, 8);
// 转换为yyyy-MM-dd格式
if (reportDate.length() == 8) {
reportDate = reportDate.substring(0, 4) + "-" + reportDate.substring(4, 6) + "-" + reportDate.substring(6, 8);
}
}
}
} }
} }