diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/domain/MedicalRecordQueryForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/domain/MedicalRecordQueryForm.java
index f4e6d10..036aac5 100644
--- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/domain/MedicalRecordQueryForm.java
+++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/domain/MedicalRecordQueryForm.java
@@ -8,6 +8,8 @@ import net.lab1024.sa.common.common.domain.PageParam;
import net.lab1024.sa.common.common.swagger.ApiModelPropertyEnum;
import net.lab1024.sa.common.common.validator.enumeration.CheckEnum;
+import javax.validation.constraints.NotNull;
+
/**
* 前端请求列表的 from
*/
@@ -17,8 +19,7 @@ public class MedicalRecordQueryForm extends PageParam {
@ApiModelProperty(value = "name")
private String name;
- @ApiModelPropertyEnum(value = CasetypeEnum.class, desc = "病历类型")
- @CheckEnum(value = CasetypeEnum.class, message = "病历类型 错误")
+ @ApiModelProperty(value = "治疗类型", required = true)
private Integer caseType;
@ApiModelPropertyEnum(value = CaseStatusEnum.class, desc = "病例状态(0待审核 1审核通过 2审核不通过)")
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 4a654cd..5821e05 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
@@ -251,7 +251,7 @@ public class CaseplatformCaseService {
}
// 跳过最后一行
- if (rowNum == lastRowNum) {
+ if (lastRowNum == rowNum) {
rowNum++;
continue;
}
@@ -266,6 +266,7 @@ public class CaseplatformCaseService {
}
if (isEmptyRow) {
+ rowNum++;
continue; // 跳过空行
}
@@ -331,6 +332,8 @@ public class CaseplatformCaseService {
caseplatformCase.setUpdateTime(LocalDateTime.now());
caseplatformCaseDao.updateById(caseplatformCase);
}
+
+ rowNum++;
}
} catch (Exception e) {
throw new BusinessException("文件读取失败: " + e.getMessage());
diff --git a/sa-admin/src/main/resources/mapper/app/medicalrecord/MedicalRecordMapper.xml b/sa-admin/src/main/resources/mapper/app/medicalrecord/MedicalRecordMapper.xml
index 7e73c7e..208ff37 100644
--- a/sa-admin/src/main/resources/mapper/app/medicalrecord/MedicalRecordMapper.xml
+++ b/sa-admin/src/main/resources/mapper/app/medicalrecord/MedicalRecordMapper.xml
@@ -17,7 +17,7 @@
- AND t_caseplatform_case.case_type = #{queryForm.caseType}
+ AND t_caseplatform_case.case_type LIKE CONCAT('%', #{queryForm.caseType}, '%')