diff --git a/postdischarge-common/src/main/java/com/xinelu/common/enums/ImportStatusEnum.java b/postdischarge-common/src/main/java/com/xinelu/common/enums/ImportStatusEnum.java
new file mode 100644
index 00000000..85abf5ab
--- /dev/null
+++ b/postdischarge-common/src/main/java/com/xinelu/common/enums/ImportStatusEnum.java
@@ -0,0 +1,29 @@
+package com.xinelu.common.enums;
+
+import lombok.Getter;
+
+/**
+ * @Description 患者导入完成情况
+ * @Author zh
+ * @Date 2024-03-19
+ */
+@Getter
+public enum ImportStatusEnum {
+
+ /**
+ * 已完成
+ */
+ FINISHED("FINISHED"),
+
+ /**
+ * 未完成
+ */
+ UNFINISHED("UNFINISHED"),
+ ;
+
+ final private String info;
+
+ ImportStatusEnum(String info) {
+ this.info = info;
+ }
+}
\ No newline at end of file
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfoimportmain/PatientInfoImportMain.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfoimportmain/PatientInfoImportMain.java
index c89a934d..bd374c8d 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfoimportmain/PatientInfoImportMain.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfoimportmain/PatientInfoImportMain.java
@@ -72,6 +72,12 @@ public class PatientInfoImportMain extends BaseEntity {
@Excel(name = "已随访人数")
private Long followupCount;
+ /**
+ * 患者导入情况:FINISHED:已完成;UNFINISHED:未完成;NULL表示未完成
+ */
+ @ApiModelProperty(value = "患者导入情况")
+ @Excel(name = "患者导入情况")
+ private String importStatus;
@Override
public String toString() {
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientinfoimportmain/PatientInfoImportMainMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientinfoimportmain/PatientInfoImportMainMapper.java
index 0594aa3b..c23f10b5 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientinfoimportmain/PatientInfoImportMainMapper.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientinfoimportmain/PatientInfoImportMainMapper.java
@@ -66,4 +66,12 @@ public interface PatientInfoImportMainMapper {
* @return 结果
*/
int deletePatientInfoImportMainByIds(Long[] ids);
+
+ /**
+ * 根据修改患者导入记录
+ *
+ * @param patientInfoImportMain 患者导入记录
+ * @return 结果
+ */
+ int updatePatientInfoImportMainImportStatus(PatientInfoImportMain patientInfoImportMain);
}
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java
index 624b51a0..18d9cf20 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java
@@ -5,6 +5,7 @@ import com.xinelu.common.constant.HttpStatus;
import com.xinelu.common.constant.SignRecordServiceStatusConstants;
import com.xinelu.common.core.domain.AjaxResult;
import com.xinelu.common.core.domain.entity.SysUser;
+import com.xinelu.common.enums.ImportStatusEnum;
import com.xinelu.common.enums.PatientSourceEnum;
import com.xinelu.common.exception.ServiceException;
import com.xinelu.common.utils.BaseUtil;
@@ -345,7 +346,6 @@ public class PatientInfoServiceImpl implements IPatientInfoService {
if (Objects.isNull(agency) || StringUtils.isEmpty(agency.getNodeType())) {
return AjaxResult.error("该账号无所属医院信息,请先配置该账号所属的医院信息!");
}
-
//如果要导入的数据列表为空,直接返回
if (CollectionUtils.isEmpty(list) || list.size() == 0) {
return AjaxResult.error("导入数据列表不能为空!" );
@@ -468,6 +468,7 @@ public class PatientInfoServiceImpl implements IPatientInfoService {
patientInfoImportMain.setHospitalAgencyId(agency.getId());
patientInfoImportMain.setFileName(fileName);
patientInfoImportMain.setHospitalAgencyName(agency.getAgencyName());
+ patientInfoImportMain.setImportStatus(ImportStatusEnum.UNFINISHED.getInfo());
patientInfoImportMainMapper.insertPatientInfoImportMain(patientInfoImportMain);
//endregion
@@ -549,6 +550,10 @@ public class PatientInfoServiceImpl implements IPatientInfoService {
//endregion
}
+ PatientInfoImportMain patientInfoImportMainSn = new PatientInfoImportMain();
+ patientInfoImportMainSn.setSn(sn);
+ patientInfoImportMainSn.setImportStatus(ImportStatusEnum.FINISHED.getInfo());
+ patientInfoImportMainMapper.updatePatientInfoImportMain(patientInfoImportMainSn);
String msg = "已完成数据导入!导入成功" + patientInfoImportList.size() + "条记录,失败0条记录";
if (list.size() != patientInfoImportList.size()) {
int i = list.size() - patientInfoImportList.size();
@@ -650,6 +655,10 @@ public class PatientInfoServiceImpl implements IPatientInfoService {
if (patientVisitRecordCount <= 0) {
return AjaxResult.error("已完成数据导入!导入成功0条记录;失败" + patientInfoImportVO.getCount() + "条记录。");
}
+ PatientInfoImportMain patientInfoImportMainSn = new PatientInfoImportMain();
+ patientInfoImportMainSn.setSn(patientInfoImportVO.getSn());
+ patientInfoImportMainSn.setImportStatus(ImportStatusEnum.FINISHED.getInfo());
+ patientInfoImportMainMapper.updatePatientInfoImportMain(patientInfoImportMainSn);
String msg = "已完成数据导入!导入成功" + patientInfoImports.size() + "条记录;失败0条记录";
if (patientInfoImportVO.getCount() != patientInfoImports.size()) {
int minus = patientInfoImportVO.getCount() - patientInfoImports.size();
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientinfoimportmain/PatientInfoImportMainVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientinfoimportmain/PatientInfoImportMainVO.java
index 340d544a..eed0db73 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientinfoimportmain/PatientInfoImportMainVO.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientinfoimportmain/PatientInfoImportMainVO.java
@@ -2,6 +2,7 @@ package com.xinelu.manage.vo.patientinfoimportmain;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xinelu.common.annotation.Excel;
import com.xinelu.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -68,4 +69,10 @@ public class PatientInfoImportMainVO extends BaseEntity {
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate importTimeEnd;
+ /**
+ * 患者导入情况:FINISHED:已完成;UNFINISHED:未完成;NULL表示未完成
+ */
+ @ApiModelProperty(value = "患者导入情况")
+ @Excel(name = "患者导入情况")
+ private String importStatus;
}
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientinfoimportmain/PatientInfoImportMainMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientinfoimportmain/PatientInfoImportMainMapper.xml
index a5900911..103df8f4 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/patientinfoimportmain/PatientInfoImportMainMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/patientinfoimportmain/PatientInfoImportMainMapper.xml
@@ -14,6 +14,7 @@
+
@@ -25,9 +26,10 @@
+
- select id, sn, create_time, create_by, hospital_agency_id, hospital_agency_name, file_name, followup_status, followup_count from patient_info_import_main
+ select id, sn, create_time, create_by, hospital_agency_id, hospital_agency_name, file_name, followup_status, followup_count, import_status from patient_info_import_main