From 5c617084373625bf17b45c38cc39c64a314b1bee Mon Sep 17 00:00:00 2001 From: zhuangyuanke Date: Tue, 31 Dec 2024 09:59:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=82=A3=E8=80=85=EF=BC=8C?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=B0=B1=E8=AF=8A=E7=B1=BB=E5=9E=8B=E5=B1=9E?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/patientinfoimport/PatientInfoImport.java | 10 ++++++++++ .../manage/service/aiob/impl/AIOBServiceImpl.java | 1 + .../patientinfo/impl/PatientInfoServiceImpl.java | 5 +++++ .../mapper/manage/patientinfo/PatientInfoMapper.xml | 2 ++ .../xinelu/quartz/task/UploadRobotPublishTask.java | 11 +++++++++-- 5 files changed, 27 insertions(+), 2 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfoimport/PatientInfoImport.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfoimport/PatientInfoImport.java index 4b757b8a..9edd83ca 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfoimport/PatientInfoImport.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfoimport/PatientInfoImport.java @@ -89,6 +89,16 @@ public class PatientInfoImport extends BaseEntity { @Excel(name = "诊断") private String mainDiagnosis; + + + /** + * 患者类型 + */ + @ApiModelProperty(value = "患者类型") + @Excel(name = "患者类型") + private String patientType; + + /** * 患者电话 */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/aiob/impl/AIOBServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/aiob/impl/AIOBServiceImpl.java index 27e6b713..6e62d009 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/aiob/impl/AIOBServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/aiob/impl/AIOBServiceImpl.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.aliyuncs.exceptions.ClientException; +import com.sun.media.jfxmedia.logging.Logger; import com.xinelu.common.config.AliYunSmsTwoConfig; import com.xinelu.common.config.SystemBusinessConfig; import com.xinelu.common.constant.*; 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 eded23e0..1326c9f0 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 @@ -7,6 +7,7 @@ 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.enums.PatientTypeEnum; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.BaseUtil; import com.xinelu.common.utils.SecurityUtils; @@ -507,6 +508,8 @@ public class PatientInfoServiceImpl implements IPatientInfoService { } //endregion + //设置为门诊患者 + patientInfoImportList.forEach(item -> item.setPatientType(PatientTypeEnum.OUTPATIENT.getInfo())); //新增患者表 int i = patientInfoMapper.insertPatientInfoList(patientInfoImportList); if (i <= 0) { @@ -633,6 +636,8 @@ public class PatientInfoServiceImpl implements IPatientInfoService { return AjaxResult.error("已完成数据导入！导入成功0条记录；失败" + patientInfoImportVO.getCount() + "条记录。"); } patientInfoImports.forEach(item -> item.setResidentId(item.getId())); + //设置为门诊患者 + patientInfoImports.forEach(item -> item.setPatientType(PatientTypeEnum.OUTPATIENT.getInfo())); //新增患者表 int i = patientInfoMapper.insertPatientInfoList(patientInfoImports); if (i <= 0) { diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml index af8e959d..3fcf4da9 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml @@ -892,6 +892,7 @@ card_no, age, main_diagnosis, + patient_type, patient_phone, department_id, department_name, @@ -912,6 +913,7 @@ #{PatientInfoImport.cardNo}, #{PatientInfoImport.age}, #{PatientInfoImport.mainDiagnosis}, + #{PatientInfoImport.patientType}, #{PatientInfoImport.patientPhone}, #{PatientInfoImport.departmentId}, #{PatientInfoImport.departmentName}, diff --git a/postdischarge-quartz/src/main/java/com/xinelu/quartz/task/UploadRobotPublishTask.java b/postdischarge-quartz/src/main/java/com/xinelu/quartz/task/UploadRobotPublishTask.java index aec7fe90..23277447 100644 --- a/postdischarge-quartz/src/main/java/com/xinelu/quartz/task/UploadRobotPublishTask.java +++ b/postdischarge-quartz/src/main/java/com/xinelu/quartz/task/UploadRobotPublishTask.java @@ -31,6 +31,7 @@ import com.xinelu.manage.vo.labelfieldcontent.LabelFieldInfoContentVo; import java.time.LocalDate; import java.time.LocalDateTime; +import java.time.LocalTime; import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -108,7 +109,10 @@ public class UploadRobotPublishTask { } //只处理 流水号不为空的 if (node.getSn() != null && - node.getScriptInfoId() != null && (executeTime.toLocalDate().isBefore(LocalDate.now()) || executeTime.toLocalDate().isEqual(LocalDate.now()))) { + //精确到秒 + node.getScriptInfoId() != null && (executeTime.isBefore(LocalDateTime.now()) || executeTime.isEqual(LocalDateTime.now()))) { + //精确到天 + // node.getScriptInfoId() != null && (executeTime.toLocalDate().isBefore(LocalDate.now()) || executeTime.toLocalDate().isEqual(LocalDate.now()))) { executeNodeList.add(node); } }); @@ -278,7 +282,10 @@ public class UploadRobotPublishTask { PatientVisitRecord patientVisitRecord = patientVisitRecordMapper.selectPatientVisitRecordById(signPatientRecord.getPatientVisitRecordId()); executeTime = signPatientManageRouteNodeService.getExecuteTime(node.getExecuteTime(), node.getRouteNodeName(), node.getRouteNodeDay(), patientVisitRecord); } - if (node.getScriptInfoId() != null && (executeTime.toLocalDate().isBefore(LocalDate.now()) || executeTime.toLocalDate().isEqual(LocalDate.now()))) { + //精确到天 + // if (node.getScriptInfoId() != null && (executeTime.toLocalDate().isBefore(LocalDate.now()) || executeTime.toLocalDate().isEqual(LocalDate.now()))) { + //精确到秒 + if (node.getScriptInfoId() != null && (executeTime.isBefore(LocalDateTime.now()) || executeTime.isEqual(LocalDateTime.now()))) { executeNodeList.add(node); } });