From 33e17487c3e3e8c39aac32489cb665e5c708d3b8 Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Tue, 8 Jul 2025 15:35:34 +0800 Subject: [PATCH] 111 --- .../service/MedicalRecordService.java | 1 + .../service/CaseplatformCaseService.java | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/service/MedicalRecordService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/service/MedicalRecordService.java index 5cfadd8..fcebd38 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/service/MedicalRecordService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/service/MedicalRecordService.java @@ -328,6 +328,7 @@ public class MedicalRecordService { dp.setDpmasImg(item.getDpmasImg()); dp.setCaseId(medicalRecord.getId()); dp.setTreatTime(item.getTreatTime()); + dp.setContent(item.getContent()); int res = medicalRecorDpmasDao.insert(dp); if (res <= 0){ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformCaseService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformCaseService.java index a428ea1..4a654cd 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformCaseService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformCaseService.java @@ -236,13 +236,25 @@ public class CaseplatformCaseService { Sheet sheet = workbook.getSheetAt(0); + // 获取最后一行的行号(从 0 开始) + int lastRowNum = sheet.getLastRowNum(); + // 从第 1 行开始读取(跳过标题行) int rowNum = 0; for (Iterator it = sheet.rowIterator(); it.hasNext();) { Row row = it.next(); // 跳过第一行/二行 - if (rowNum++ <= 1) continue; + if (rowNum <= 1) { + rowNum++; + continue; + } + + // 跳过最后一行 + if (rowNum == lastRowNum) { + rowNum++; + continue; + } // 判断整行是否为空 boolean isEmptyRow = true;