diff --git a/src/main/java/com/docus/server/AppRunBootstrap.java b/src/main/java/com/docus/server/AppRunBootstrap.java index 87ab35c..76613b9 100644 --- a/src/main/java/com/docus/server/AppRunBootstrap.java +++ b/src/main/java/com/docus/server/AppRunBootstrap.java @@ -1,8 +1,6 @@ package com.docus.server; -import com.docus.infrastructure.core.utils.SpringUtil; -import com.docus.server.message.dao.TrInpatientOutpatientDao; import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; diff --git a/src/main/java/com/docus/server/message/busservice/impl/SdBusinessServiceImpl.java b/src/main/java/com/docus/server/message/busservice/impl/SdBusinessServiceImpl.java index 7077c72..2c91486 100644 --- a/src/main/java/com/docus/server/message/busservice/impl/SdBusinessServiceImpl.java +++ b/src/main/java/com/docus/server/message/busservice/impl/SdBusinessServiceImpl.java @@ -5,6 +5,7 @@ import com.docus.core.util.FileUtil; import com.docus.core.util.Func; import com.docus.core.util.ObjectUtil; import com.docus.infrastructure.core.exception.BaseException; +import com.docus.infrastructure.core.utils.SpringUtil; import com.docus.infrastructure.web.api.CommonResult; import com.docus.infrastructure.web.api.ResultCode; import com.docus.server.message.busservice.SdBusinessService; @@ -91,7 +92,7 @@ public class SdBusinessServiceImpl implements SdBusinessService { nodeLogAddDTO.setCreaterName("电子病历提交"); hospitalSubmitNodeServiceApi.addLog(nodeLogAddDTO); - trInpatientOutPatient(patientIds.get(0)); + SpringUtil.getBean(SdBusinessService.class).trInpatientOutPatient(patientIds.get(0)); if (!isDischargeAndUpdDisDate(patientIds.get(0), recordSubmitDto.getInHospIndexNo(), recordSubmitDto.getVisitNo())) { throw new BaseException("此患者未出院!"); @@ -171,6 +172,8 @@ public class SdBusinessServiceImpl implements SdBusinessService { nodeLogAddDTO.setCreaterName("护理提交"); hospitalSubmitNodeServiceApi.addLog(nodeLogAddDTO); + SpringUtil.getBean(SdBusinessService.class).trInpatientOutPatient(patientIds.get(0)); + if (!isDischargeAndUpdDisDate(patientIds.get(0), inHospIndexNo, visitNo)) { throw new BaseException("此患者未出院!"); }