From 5eb5ed4192b45015648ca458a27d995905e74b54 Mon Sep 17 00:00:00 2001 From: dazer007 Date: Wed, 5 Mar 2025 16:34:29 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9service=E8=B7=AF?= =?UTF-8?q?=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/pom.xml | 8 - .../app/controller/AppUnauthController.java | 3 +- .../controller/AppWebServiceController.java | 20 +- .../neuhis/his/common/config/P6SPYConfig.java | 26 - .../his/controller/ComEmployeeController.java | 4 +- .../controller/ComPatientinfoController.java | 2 +- .../his/domain/entity/winlis/LasRtResult.java | 608 ++++++++++++++++++ .../domain/entity/winlis/LasSapSamplereg.java | 431 +++++++++++++ .../his/mapper/winlis/LasRtResultMapper.java | 62 ++ .../mapper/winlis/LasSapSampleregMapper.java | 118 ++++ .../service/IComPatientinfoMixService.java | 10 - .../{ => his}/IComControlargumentService.java | 2 +- .../{ => his}/IComDepartmentService.java | 2 +- .../{ => his}/IComDictionaryService.java | 2 +- .../{ => his}/IComEmployeeService.java | 2 +- .../his/IComPatientinfoMixService.java | 6 + .../{ => his}/IComPatientinfoService.java | 2 +- .../{ => his}/IDawnCodeInfoService.java | 2 +- .../{ => his}/IFinComExamorderService.java | 2 +- .../{ => his}/IFinComUndruginfoService.java | 2 +- .../{ => his}/IFinComUndrugztinfoService.java | 3 +- .../{ => his}/IFinIpbFeeinfoService.java | 2 +- .../{ => his}/IFinIpbItemlistService.java | 3 +- .../{ => his}/IFinIpbMedicinelistService.java | 2 +- .../{ => his}/IFinIprBabyinfoService.java | 2 +- .../{ => his}/IFinIprInmaininfoService.java | 2 +- .../{ => his}/IFinOpbAccountService.java | 2 +- .../{ => his}/IFinOpbAccountlistService.java | 2 +- .../IFinOpbAccountrecordService.java | 3 +- .../{ => his}/IFinOpbFeedetailService.java | 3 +- .../{ => his}/IFinOprRegisterService.java | 3 +- .../{ => his}/IFinOprSchemaService.java | 2 +- .../service/{ => his}/IMdcDiPathService.java | 2 +- .../{ => his}/IMetCasDiagnoseService.java | 2 +- .../{ => his}/IMetComIcd10Service.java | 2 +- .../IMetComOperationLocalService.java | 2 +- .../{ => his}/IMetIpmBookedService.java | 2 +- .../{ => his}/IMetIpmExecdrugService.java | 2 +- .../{ => his}/IMetIpmExecundrugService.java | 2 +- .../{ => his}/IMetIpmOrderService.java | 2 +- .../service/{ => his}/IMetMrsBaseService.java | 2 +- .../{ => his}/IMetNuiCancelitemService.java | 2 +- .../{ => his}/IMetNuiExerecordService.java | 2 +- .../{ => his}/IMetOpsApplyService.java | 2 +- .../{ => his}/IMetOpsArrangeService.java | 2 +- .../IMetOpsOperationitemService.java | 2 +- .../{ => his}/IMetOrdeApplyTypeService.java | 2 +- .../{ => his}/IMetOrdeBigexampartService.java | 2 +- .../{ => his}/IMetOrdeExampartService.java | 2 +- .../{ => his}/IMetOrdiOrderService.java | 2 +- .../{ => his}/IMetOrdoOrderService.java | 2 +- .../{ => his}/IMetOrdtUndrugtermService.java | 2 +- .../{ => his}/INsrNisRecordDetailService.java | 3 +- .../{ => his}/INsrStandardCodeService.java | 2 +- .../{ => his}/IPdaBloodCircuitService.java | 3 +- .../{ => his}/IPdaPsrRatingRecordService.java | 2 +- .../{ => his}/IPdaPsrRecordService.java | 2 +- .../{ => his}/IPhaComApplyoutService.java | 2 +- .../{ => his}/IPhaComBaseinfoService.java | 2 +- .../service/impl/BizElecAppServiceImpl.java | 1 + .../ComControlargumentServiceImpl.java | 4 +- .../{ => his}/ComDepartmentServiceImpl.java | 4 +- .../{ => his}/ComDictionaryServiceImpl.java | 4 +- .../{ => his}/ComEmployeeServiceImpl.java | 4 +- .../ComPatientinfoMixServiceImpl.java | 14 +- .../{ => his}/ComPatientinfoServiceImpl.java | 8 +- .../{ => his}/DawnCodeInfoServiceImpl.java | 4 +- .../{ => his}/FinComExamorderServiceImpl.java | 4 +- .../FinComUndruginfoServiceImpl.java | 4 +- .../FinComUndrugztinfoServiceImpl.java | 4 +- .../{ => his}/FinIpbFeeinfoServiceImpl.java | 5 +- .../{ => his}/FinIpbItemlistServiceImpl.java | 4 +- .../FinIpbMedicinelistServiceImpl.java | 4 +- .../{ => his}/FinIprBabyinfoServiceImpl.java | 4 +- .../FinIprInmaininfoServiceImpl.java | 4 +- .../{ => his}/FinOpbAccountServiceImpl.java | 4 +- .../FinOpbAccountlistServiceImpl.java | 4 +- .../FinOpbAccountrecordServiceImpl.java | 5 +- .../{ => his}/FinOpbFeedetailServiceImpl.java | 9 +- .../FinOpbInvoiceinfoServiceImpl.java | 3 +- .../{ => his}/FinOprRegisterServiceImpl.java | 4 +- .../{ => his}/FinOprSchemaServiceImpl.java | 4 +- .../impl/{ => his}/MdcDiPathServiceImpl.java | 4 +- .../{ => his}/MetCasDiagnoseServiceImpl.java | 5 +- .../{ => his}/MetComIcd10ServiceImpl.java | 4 +- .../MetComOperationLocalServiceImpl.java | 4 +- .../{ => his}/MetIpmBookedServiceImpl.java | 5 +- .../{ => his}/MetIpmExecdrugServiceImpl.java | 5 +- .../MetIpmExecundrugServiceImpl.java | 4 +- .../{ => his}/MetIpmOrderServiceImpl.java | 4 +- .../impl/{ => his}/MetMrsBaseServiceImpl.java | 4 +- .../MetNuiCancelitemServiceImpl.java | 4 +- .../{ => his}/MetNuiExerecordServiceImpl.java | 4 +- .../{ => his}/MetOpsApplyServiceImpl.java | 4 +- .../{ => his}/MetOpsArrangeServiceImpl.java | 4 +- .../MetOpsOperationitemServiceImpl.java | 4 +- .../MetOrdeApplyTypeServiceImpl.java | 4 +- .../MetOrdeBigexampartServiceImpl.java | 4 +- .../{ => his}/MetOrdeExampartServiceImpl.java | 4 +- .../{ => his}/MetOrdiOrderServiceImpl.java | 4 +- .../{ => his}/MetOrdoOrderServiceImpl.java | 4 +- .../MetOrdtUndrugtermServiceImpl.java | 4 +- .../NsrNisRecordDetailServiceImpl.java | 4 +- .../{ => his}/NsrStandardCodeServiceImpl.java | 4 +- .../{ => his}/PdaBloodCircuitServiceImpl.java | 4 +- .../PdaPsrRatingRecordServiceImpl.java | 4 +- .../{ => his}/PdaPsrRecordServiceImpl.java | 4 +- .../{ => his}/PhaComApplyoutServiceImpl.java | 4 +- .../{ => his}/PhaComBaseinfoServiceImpl.java | 4 +- .../impl/winlis/LasRtResultServiceImpl.java | 98 +++ .../winlis/LasSapSampleregServiceImpl.java | 158 +++++ .../impl/winlis/WinLisServiceImpl.java | 4 +- .../service/winlis/ILasRtResultService.java | 62 ++ .../winlis/ILasSapSampleregService.java | 122 ++++ .../{lis => winlis}/IWinLisService.java | 2 +- .../mapper/winlis/LasRtResultMapper.xml | 239 +++++++ .../mapper/winlis/LasSapSampleregMapper.xml | 530 +++++++++++++++ 117 files changed, 2591 insertions(+), 243 deletions(-) delete mode 100644 ruoyi-admin/src/main/java/com/neuhis/his/common/config/P6SPYConfig.java create mode 100644 ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/winlis/LasRtResult.java create mode 100644 ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/winlis/LasSapSamplereg.java create mode 100644 ruoyi-admin/src/main/java/com/neuhis/his/mapper/winlis/LasRtResultMapper.java create mode 100644 ruoyi-admin/src/main/java/com/neuhis/his/mapper/winlis/LasSapSampleregMapper.java delete mode 100644 ruoyi-admin/src/main/java/com/neuhis/his/service/IComPatientinfoMixService.java rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IComControlargumentService.java (92%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IComDepartmentService.java (94%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IComDictionaryService.java (96%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IComEmployeeService.java (94%) create mode 100644 ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComPatientinfoMixService.java rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IComPatientinfoService.java (97%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IDawnCodeInfoService.java (87%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IFinComExamorderService.java (94%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IFinComUndruginfoService.java (94%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IFinComUndrugztinfoService.java (90%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IFinIpbFeeinfoService.java (93%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IFinIpbItemlistService.java (89%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IFinIpbMedicinelistService.java (95%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IFinIprBabyinfoService.java (92%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IFinIprInmaininfoService.java (94%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IFinOpbAccountService.java (92%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IFinOpbAccountlistService.java (84%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IFinOpbAccountrecordService.java (86%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IFinOpbFeedetailService.java (89%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IFinOprRegisterService.java (88%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IFinOprSchemaService.java (91%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IMdcDiPathService.java (94%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IMetCasDiagnoseService.java (93%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IMetComIcd10Service.java (91%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IMetComOperationLocalService.java (85%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IMetIpmBookedService.java (91%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IMetIpmExecdrugService.java (91%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IMetIpmExecundrugService.java (93%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IMetIpmOrderService.java (92%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IMetMrsBaseService.java (91%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IMetNuiCancelitemService.java (92%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IMetNuiExerecordService.java (94%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IMetOpsApplyService.java (91%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IMetOpsArrangeService.java (93%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IMetOpsOperationitemService.java (94%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IMetOrdeApplyTypeService.java (93%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IMetOrdeBigexampartService.java (93%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IMetOrdeExampartService.java (93%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IMetOrdiOrderService.java (92%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IMetOrdoOrderService.java (92%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IMetOrdtUndrugtermService.java (93%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/INsrNisRecordDetailService.java (87%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/INsrStandardCodeService.java (91%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IPdaBloodCircuitService.java (77%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IPdaPsrRatingRecordService.java (97%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IPdaPsrRecordService.java (91%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IPhaComApplyoutService.java (91%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/{ => his}/IPhaComBaseinfoService.java (94%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/ComControlargumentServiceImpl.java (93%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/ComDepartmentServiceImpl.java (97%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/ComDictionaryServiceImpl.java (98%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/ComEmployeeServiceImpl.java (96%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/ComPatientinfoMixServiceImpl.java (83%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/ComPatientinfoServiceImpl.java (98%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/DawnCodeInfoServiceImpl.java (90%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/FinComExamorderServiceImpl.java (95%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/FinComUndruginfoServiceImpl.java (95%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/FinComUndrugztinfoServiceImpl.java (95%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/FinIpbFeeinfoServiceImpl.java (90%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/FinIpbItemlistServiceImpl.java (96%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/FinIpbMedicinelistServiceImpl.java (96%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/FinIprBabyinfoServiceImpl.java (93%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/FinIprInmaininfoServiceImpl.java (96%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/FinOpbAccountServiceImpl.java (93%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/FinOpbAccountlistServiceImpl.java (88%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/FinOpbAccountrecordServiceImpl.java (91%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/FinOpbFeedetailServiceImpl.java (86%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/FinOpbInvoiceinfoServiceImpl.java (94%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/FinOprRegisterServiceImpl.java (96%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/FinOprSchemaServiceImpl.java (93%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/MdcDiPathServiceImpl.java (96%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/MetCasDiagnoseServiceImpl.java (92%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/MetComIcd10ServiceImpl.java (92%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/MetComOperationLocalServiceImpl.java (86%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/MetIpmBookedServiceImpl.java (89%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/MetIpmExecdrugServiceImpl.java (89%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/MetIpmExecundrugServiceImpl.java (94%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/MetIpmOrderServiceImpl.java (95%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/MetMrsBaseServiceImpl.java (93%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/MetNuiCancelitemServiceImpl.java (93%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/MetNuiExerecordServiceImpl.java (94%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/MetOpsApplyServiceImpl.java (93%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/MetOpsArrangeServiceImpl.java (94%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/MetOpsOperationitemServiceImpl.java (94%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/MetOrdeApplyTypeServiceImpl.java (94%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/MetOrdeBigexampartServiceImpl.java (94%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/MetOrdeExampartServiceImpl.java (94%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/MetOrdiOrderServiceImpl.java (95%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/MetOrdoOrderServiceImpl.java (95%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/MetOrdtUndrugtermServiceImpl.java (94%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/NsrNisRecordDetailServiceImpl.java (96%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/NsrStandardCodeServiceImpl.java (93%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/PdaBloodCircuitServiceImpl.java (91%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/PdaPsrRatingRecordServiceImpl.java (96%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/PdaPsrRecordServiceImpl.java (93%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/PhaComApplyoutServiceImpl.java (93%) rename ruoyi-admin/src/main/java/com/neuhis/his/service/impl/{ => his}/PhaComBaseinfoServiceImpl.java (96%) create mode 100644 ruoyi-admin/src/main/java/com/neuhis/his/service/impl/winlis/LasRtResultServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/neuhis/his/service/impl/winlis/LasSapSampleregServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/neuhis/his/service/winlis/ILasRtResultService.java create mode 100644 ruoyi-admin/src/main/java/com/neuhis/his/service/winlis/ILasSapSampleregService.java rename ruoyi-admin/src/main/java/com/neuhis/his/service/{lis => winlis}/IWinLisService.java (90%) create mode 100644 ruoyi-admin/src/main/resources/mapper/winlis/LasRtResultMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/winlis/LasSapSampleregMapper.xml diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 20ec40bac..d1e594f22 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -119,14 +119,6 @@ gson 2.11.0 - - - - - p6spy - p6spy - 3.9.1 - diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/app/controller/AppUnauthController.java b/ruoyi-admin/src/main/java/com/neuhis/his/app/controller/AppUnauthController.java index 119f571e4..c0e6a1ad0 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/app/controller/AppUnauthController.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/app/controller/AppUnauthController.java @@ -3,6 +3,8 @@ package com.neuhis.his.app.controller; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.json.JSONUtil; +import com.neuhis.his.service.his.IComDictionaryService; +import com.neuhis.his.service.his.IPhaComBaseinfoService; import com.neuhis.quartz.task.common.JobService; import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.core.controller.BaseController; @@ -20,7 +22,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; import java.io.UnsupportedEncodingException; import java.util.List; import java.util.Map; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/app/controller/AppWebServiceController.java b/ruoyi-admin/src/main/java/com/neuhis/his/app/controller/AppWebServiceController.java index 7d7385dee..ffb0dddfe 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/app/controller/AppWebServiceController.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/app/controller/AppWebServiceController.java @@ -1,29 +1,13 @@ package com.neuhis.his.app.controller; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.IdcardUtil; -import cn.hutool.json.JSONUtil; -import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.StringUtils; -import com.neuhis.his.common.ComDictionaryTypeEnum; -import com.neuhis.his.domain.entity.ComEmployee; -import com.neuhis.his.domain.entity.ComPatientinfo; -import com.neuhis.his.domain.vo.EmployeeVO; -import com.neuhis.his.domain.vo.FeeConfirmVO; -import com.neuhis.his.domain.vo.JZComPatientInfoVO; -import com.neuhis.his.service.IComDictionaryService; -import com.neuhis.his.service.IComEmployeeService; -import com.neuhis.his.service.IComPatientinfoService; +import com.neuhis.his.service.his.IComDictionaryService; +import com.neuhis.his.service.his.IComPatientinfoService; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; - /** * 存储过程Controller * diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/common/config/P6SPYConfig.java b/ruoyi-admin/src/main/java/com/neuhis/his/common/config/P6SPYConfig.java deleted file mode 100644 index b416a54dc..000000000 --- a/ruoyi-admin/src/main/java/com/neuhis/his/common/config/P6SPYConfig.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.neuhis.his.common.config; - -import com.alibaba.fastjson.JSONObject; -import com.p6spy.engine.spy.appender.MessageFormattingStrategy; - -import java.util.LinkedHashMap; -import java.util.Map; - -/** - * P6Spy有内置的SQL输出格式，如上配置文件。这里我们使用自定义SQL日志打印 - * - * @author dazer - * @date 2025/3/5 14:46 - **/ -public class P6SPYConfig implements MessageFormattingStrategy { - @Override - public String formatMessage(int connectionId, String now, long elapsed, String category, String prepared, String sql, String url) { - Map message = new LinkedHashMap<>(8); - String newPrepared = prepared.replace(" ", "").replace("\n", " "); - message.put("prepared", newPrepared); - String newSql = sql.replace(" ", "").replace("\n", " "); - message.put("sql", newSql); - return JSONObject.toJSONString(message, true); - } - -} diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/controller/ComEmployeeController.java b/ruoyi-admin/src/main/java/com/neuhis/his/controller/ComEmployeeController.java index daa664d78..6fa33cb15 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/controller/ComEmployeeController.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/controller/ComEmployeeController.java @@ -5,9 +5,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.utils.StringUtils; import com.neuhis.his.domain.entity.ComEmployee; -import com.neuhis.his.domain.entity.ComPatientinfo; -import com.neuhis.his.service.IComEmployeeService; -import com.neuhis.his.service.IComPatientinfoService; +import com.neuhis.his.service.his.IComEmployeeService; import com.neuhis.utils.IdcardUtil; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/controller/ComPatientinfoController.java b/ruoyi-admin/src/main/java/com/neuhis/his/controller/ComPatientinfoController.java index 6426f2d4e..d458db146 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/controller/ComPatientinfoController.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/controller/ComPatientinfoController.java @@ -5,7 +5,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.utils.StringUtils; import com.neuhis.his.domain.entity.ComPatientinfo; -import com.neuhis.his.service.IComPatientinfoService; +import com.neuhis.his.service.his.IComPatientinfoService; import com.neuhis.utils.IdcardUtil; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/winlis/LasRtResult.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/winlis/LasRtResult.java new file mode 100644 index 000000000..3e25c8162 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/winlis/LasRtResult.java @@ -0,0 +1,608 @@ +package com.neuhis.his.domain.entity.winlis; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 常规检验结果对象 las_rt_result + * + * @author ruoyi + * @date 2025-03-05 + */ +public class LasRtResult extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 检验日期 */ + private String testdate; + + /** 仪器ID */ + private String machineid; + + /** 样本号 */ + private String sampleid; + + /** 项目编码 */ + private String itemid; + + /** 项目标准编码 */ + @Excel(name = "项目标准编码") + private String loincid; + + /** 英文编码 */ + @Excel(name = "英文编码") + private String engname; + + /** 项目名称 */ + @Excel(name = "项目名称") + private String itemname; + + /** 打印顺序 */ + @Excel(name = "打印顺序") + private Long printseq; + + /** 条码号 */ + @Excel(name = "条码号") + private String barcode; + + /** 测试时间 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @Excel(name = "测试时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date testtime; + + /** 报告结果 */ + @Excel(name = "报告结果") + private String reportvalue; + + /** 重做结果 */ + @Excel(name = "重做结果") + private String rerunvalue; + + /** 描述结果 */ + @Excel(name = "描述结果") + private String descvalue; + + /** 结果列表 */ + @Excel(name = "结果列表") + private String resultlist; + + /** 原始结果 */ + @Excel(name = "原始结果") + private String orgvalue; + + /** 结果来源(见位标识表达) */ + @Excel(name = "结果来源(见位标识表达)") + private String valuesrc; + + /** 复查标识(1:复查,0:原始) */ + @Excel(name = "复查标识(1:复查,0:原始)") + private String rerunflag; + + /** 参考范围 */ + @Excel(name = "参考范围") + private String rangeinfo; + + /** 检验单位 */ + @Excel(name = "检验单位") + private String unit; + + /** 结果标识:高低,正常等. */ + @Excel(name = "结果标识:高低,正常等.") + private String resultflag; + + /** 患者ID */ + @Excel(name = "患者ID") + private String patientid; + + /** 患者类型 */ + @Excel(name = "患者类型") + private String patienttype; + + /** 样本类型 */ + @Excel(name = "样本类型") + private String sampletype; + + /** 测试仪器ID */ + @Excel(name = "测试仪器ID") + private String testmachineid; + + /** 架号位置号 */ + @Excel(name = "架号位置号") + private String rackcup; + + /** 收费项目编码 */ + @Excel(name = "收费项目编码") + private String hisitemid; + + /** 项目打印行数(默认为1) */ + @Excel(name = "项目打印行数(默认为1)") + private Long printrow; + + /** 危急值处理标识(1:已发送,2:已忽略,3:已反馈,4:已完成,5:已发现,空:未处理) */ + @Excel(name = "危急值处理标识(1:已发送,2:已忽略,3:已反馈,4:已完成,5:已发现,空:未处理)") + private String alertflag; + + /** 危急值范围 */ + @Excel(name = "危急值范围") + private String rangelimit; + + /** 检验中状态(对原始数据解析内容) */ + @Excel(name = "检验中状态(对原始数据解析内容)") + private String checkstate; + + /** 结果传输时间 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @Excel(name = "结果传输时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date commtime; + + /** 检验方法 */ + @Excel(name = "检验方法") + private String method; + + /** Cutoff值(酶标) */ + @Excel(name = "Cutoff值(酶标)") + private String cutoff; + + /** SCO值(酶标) */ + @Excel(name = "SCO值(酶标)") + private String sco; + + /** OD值(酶标) */ + @Excel(name = "OD值(酶标)") + private String odvalue; + + /** 备用结果列 */ + @Excel(name = "备用结果列") + private String memovalue; + + /** 结果属性 */ + @Excel(name = "结果属性") + private String valuepro; + + /** 自动审核标记（流水线）(0:未做审核,1:审核通过,2:审核未通过) */ + @Excel(name = "自动审核标记", readConverterExp = "流=水线") + private String autoconfirmsign; + + /** 自动审核信息（流水线） */ + @Excel(name = "自动审核信息", readConverterExp = "流=水线") + private String autoconfirminfo; + + public void setTestdate(String testdate) + { + this.testdate = testdate; + } + + public String getTestdate() + { + return testdate; + } + + public void setMachineid(String machineid) + { + this.machineid = machineid; + } + + public String getMachineid() + { + return machineid; + } + + public void setSampleid(String sampleid) + { + this.sampleid = sampleid; + } + + public String getSampleid() + { + return sampleid; + } + + public void setItemid(String itemid) + { + this.itemid = itemid; + } + + public String getItemid() + { + return itemid; + } + + public void setLoincid(String loincid) + { + this.loincid = loincid; + } + + public String getLoincid() + { + return loincid; + } + + public void setEngname(String engname) + { + this.engname = engname; + } + + public String getEngname() + { + return engname; + } + + public void setItemname(String itemname) + { + this.itemname = itemname; + } + + public String getItemname() + { + return itemname; + } + + public void setPrintseq(Long printseq) + { + this.printseq = printseq; + } + + public Long getPrintseq() + { + return printseq; + } + + public void setBarcode(String barcode) + { + this.barcode = barcode; + } + + public String getBarcode() + { + return barcode; + } + + public void setTesttime(Date testtime) + { + this.testtime = testtime; + } + + public Date getTesttime() + { + return testtime; + } + + public void setReportvalue(String reportvalue) + { + this.reportvalue = reportvalue; + } + + public String getReportvalue() + { + return reportvalue; + } + + public void setRerunvalue(String rerunvalue) + { + this.rerunvalue = rerunvalue; + } + + public String getRerunvalue() + { + return rerunvalue; + } + + public void setDescvalue(String descvalue) + { + this.descvalue = descvalue; + } + + public String getDescvalue() + { + return descvalue; + } + + public void setResultlist(String resultlist) + { + this.resultlist = resultlist; + } + + public String getResultlist() + { + return resultlist; + } + + public void setOrgvalue(String orgvalue) + { + this.orgvalue = orgvalue; + } + + public String getOrgvalue() + { + return orgvalue; + } + + public void setValuesrc(String valuesrc) + { + this.valuesrc = valuesrc; + } + + public String getValuesrc() + { + return valuesrc; + } + + public void setRerunflag(String rerunflag) + { + this.rerunflag = rerunflag; + } + + public String getRerunflag() + { + return rerunflag; + } + + public void setRangeinfo(String rangeinfo) + { + this.rangeinfo = rangeinfo; + } + + public String getRangeinfo() + { + return rangeinfo; + } + + public void setUnit(String unit) + { + this.unit = unit; + } + + public String getUnit() + { + return unit; + } + + public void setResultflag(String resultflag) + { + this.resultflag = resultflag; + } + + public String getResultflag() + { + return resultflag; + } + + public void setPatientid(String patientid) + { + this.patientid = patientid; + } + + public String getPatientid() + { + return patientid; + } + + public void setPatienttype(String patienttype) + { + this.patienttype = patienttype; + } + + public String getPatienttype() + { + return patienttype; + } + + public void setSampletype(String sampletype) + { + this.sampletype = sampletype; + } + + public String getSampletype() + { + return sampletype; + } + + public void setTestmachineid(String testmachineid) + { + this.testmachineid = testmachineid; + } + + public String getTestmachineid() + { + return testmachineid; + } + + public void setRackcup(String rackcup) + { + this.rackcup = rackcup; + } + + public String getRackcup() + { + return rackcup; + } + + public void setHisitemid(String hisitemid) + { + this.hisitemid = hisitemid; + } + + public String getHisitemid() + { + return hisitemid; + } + + public void setPrintrow(Long printrow) + { + this.printrow = printrow; + } + + public Long getPrintrow() + { + return printrow; + } + + public void setAlertflag(String alertflag) + { + this.alertflag = alertflag; + } + + public String getAlertflag() + { + return alertflag; + } + + public void setRangelimit(String rangelimit) + { + this.rangelimit = rangelimit; + } + + public String getRangelimit() + { + return rangelimit; + } + + public void setCheckstate(String checkstate) + { + this.checkstate = checkstate; + } + + public String getCheckstate() + { + return checkstate; + } + + public void setCommtime(Date commtime) + { + this.commtime = commtime; + } + + public Date getCommtime() + { + return commtime; + } + + public void setMethod(String method) + { + this.method = method; + } + + public String getMethod() + { + return method; + } + + public void setCutoff(String cutoff) + { + this.cutoff = cutoff; + } + + public String getCutoff() + { + return cutoff; + } + + public void setSco(String sco) + { + this.sco = sco; + } + + public String getSco() + { + return sco; + } + + public void setOdvalue(String odvalue) + { + this.odvalue = odvalue; + } + + public String getOdvalue() + { + return odvalue; + } + + public void setMemovalue(String memovalue) + { + this.memovalue = memovalue; + } + + public String getMemovalue() + { + return memovalue; + } + + public void setValuepro(String valuepro) + { + this.valuepro = valuepro; + } + + public String getValuepro() + { + return valuepro; + } + + public void setAutoconfirmsign(String autoconfirmsign) + { + this.autoconfirmsign = autoconfirmsign; + } + + public String getAutoconfirmsign() + { + return autoconfirmsign; + } + + public void setAutoconfirminfo(String autoconfirminfo) + { + this.autoconfirminfo = autoconfirminfo; + } + + public String getAutoconfirminfo() + { + return autoconfirminfo; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("testdate", getTestdate()) + .append("machineid", getMachineid()) + .append("sampleid", getSampleid()) + .append("itemid", getItemid()) + .append("loincid", getLoincid()) + .append("engname", getEngname()) + .append("itemname", getItemname()) + .append("printseq", getPrintseq()) + .append("barcode", getBarcode()) + .append("testtime", getTesttime()) + .append("reportvalue", getReportvalue()) + .append("rerunvalue", getRerunvalue()) + .append("descvalue", getDescvalue()) + .append("resultlist", getResultlist()) + .append("orgvalue", getOrgvalue()) + .append("valuesrc", getValuesrc()) + .append("rerunflag", getRerunflag()) + .append("rangeinfo", getRangeinfo()) + .append("unit", getUnit()) + .append("resultflag", getResultflag()) + .append("patientid", getPatientid()) + .append("patienttype", getPatienttype()) + .append("sampletype", getSampletype()) + .append("testmachineid", getTestmachineid()) + .append("rackcup", getRackcup()) + .append("hisitemid", getHisitemid()) + .append("printrow", getPrintrow()) + .append("alertflag", getAlertflag()) + .append("rangelimit", getRangelimit()) + .append("checkstate", getCheckstate()) + .append("commtime", getCommtime()) + .append("method", getMethod()) + .append("cutoff", getCutoff()) + .append("sco", getSco()) + .append("odvalue", getOdvalue()) + .append("memovalue", getMemovalue()) + .append("valuepro", getValuepro()) + .append("autoconfirmsign", getAutoconfirmsign()) + .append("autoconfirminfo", getAutoconfirminfo()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/winlis/LasSapSamplereg.java b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/winlis/LasSapSamplereg.java new file mode 100644 index 000000000..d8cc6fffe --- /dev/null +++ b/ruoyi-admin/src/main/java/com/neuhis/his/domain/entity/winlis/LasSapSamplereg.java @@ -0,0 +1,431 @@ +package com.neuhis.his.domain.entity.winlis; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) +对象 las_sap_samplereg + * + * @author ruoyi + * @date 2025-03-05 + */ +@Getter +@Setter +@NoArgsConstructor +public class LasSapSamplereg extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 检验日期 */ + private String testdate; + + /** 仪器ID */ + private String machineid; + + /** 样本号 */ + private String sampleid; + + /** 条码号 */ + @Excel(name = "条码号") + private String barcode; + + /** 患者类别 */ + @Excel(name = "患者类别") + private String patienttype; + + /** 患者编码 */ + @Excel(name = "患者编码") + private String patientid; + + /** 患者流水号 */ + @Excel(name = "患者流水号") + private String patientseq; + + /** 患者姓名 */ + @Excel(name = "患者姓名") + private String patientname; + + /** 患者性别 + */ + @Excel(name = "患者性别") + private String patientsex; + + /** 患者年龄 */ + @Excel(name = "患者年龄") + private String patientage; + + /** 年龄单位 */ + @Excel(name = "年龄单位") + private String patientageunit; + + /** 患者电话 */ + @Excel(name = "患者电话") + private String patienttel; + + /** 患者床位号 */ + @Excel(name = "患者床位号") + private String patientbedno; + + /** 患者身份证 */ + @Excel(name = "患者身份证") + private String patientidenno; + + /** 患者民族 */ + @Excel(name = "患者民族") + private String patientrace; + + /** 患者居住地 */ + @Excel(name = "患者居住地") + private String patientsite; + + /** 执行单号 */ + @Excel(name = "执行单号") + private String execsqn; + + /** 急诊标识 0普通 1加急 2抢救 3即复 */ + @Excel(name = "急诊标识 0普通 1加急 2抢救 3即复") + private String emc; + + /** 收费项目编码(15,171,F0001) */ + @Excel(name = "收费项目编码(15,171,F0001)") + private String hisitemidlist; + + /** 收费项目名称列表 */ + @Excel(name = "收费项目名称列表") + private String hisitemnamelist; + + /** 收费项目价格 */ + @Excel(name = "收费项目价格") + private Long hisitemprice; + + /** 开立医生编码 */ + @Excel(name = "开立医生编码") + private String doctorid; + + /** 开立医生姓名 */ + @Excel(name = "开立医生姓名") + private String doctorname; + + /** 开立科室编码 */ + @Excel(name = "开立科室编码") + private String deptid; + + /** 开立科室名称 */ + @Excel(name = "开立科室名称") + private String deptname; + + /** 开立时间 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @Excel(name = "开立时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date ordertime; + + /** 执行科室编码 */ + @Excel(name = "执行科室编码") + private String execdeptid; + + /** 执行科室名称 */ + @Excel(name = "执行科室名称") + private String execdeptname; + + /** 患者病区编码 */ + @Excel(name = "患者病区编码") + private String wardid; + + /** 患者病区名称 */ + @Excel(name = "患者病区名称") + private String wardname; + + /** 样本类型 */ + @Excel(name = "样本类型") + private String sampletype; + + /** 24小时尿量 */ + @Excel(name = "24小时尿量") + private String urineqty; + + /** 标本状态 */ + @Excel(name = "标本状态") + private String samplestate; + + /** 标本采集部位 */ + @Excel(name = "标本采集部位") + private String sampleposition; + + /** 医生诊断 */ + @Excel(name = "医生诊断") + private String diagnosis; + + /** 核准标识.0:未核准,1:核准,2:取消核准,3:待查.4.初审.5:封存 */ + @Excel(name = "核准标识.0:未核准,1:核准,2:取消核准,3:待查.4.初审.5:封存") + private String confirmstate; + + /** 打印标识:0:未打印,1:已打印 */ + @Excel(name = "打印标识:0:未打印,1:已打印") + private String printstate; + + /** 危急值状态:0:否,1:是 */ + @Excel(name = "危急值状态:0:否,1:是") + private String alertstate; + + /** 1 患者信息来源.2 费用状态 +.3 是否为智能核准(自动核准) +.4 信息发送标识(可以考虑为短信平台提供). +5 双向系统复查标识.6 条码是否人工组合.7 外部系统数据已处理标识 */ + @Excel(name = "1 患者信息来源.2 费用状态 .3 是否为智能核准(自动核准) .4 信息发送标识(可以考虑为短信平台提供). 5 双向系统复查标识.6 条码是否人工组合.7 外部系统数据已处理标识") + private String state; + + /** 检验类型 */ + @Excel(name = "检验类型") + private String testtype; + + /** 小组编码 */ + @Excel(name = "小组编码") + private String groupid; + + /** 条码打印人编码 */ + @Excel(name = "条码打印人编码") + private String nurseid; + + /** 条码打印人名称 */ + @Excel(name = "条码打印人名称") + private String nursename; + + /** 采样时间 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @Excel(name = "采样时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date sampletime; + + /** 送检员编码 */ + @Excel(name = "送检员编码") + private String senderid; + + /** 送检员名称 */ + @Excel(name = "送检员名称") + private String sendername; + + /** 送检员接收时间 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @Excel(name = "送检员接收时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date sendtime; + + /** 送检单编码 */ + @Excel(name = "送检单编码") + private String sendformid; + + /** 检验科接收人编码 */ + @Excel(name = "检验科接收人编码") + private String inceptorid; + + /** 检验科接收人姓名 */ + @Excel(name = "检验科接收人姓名") + private String inceptorname; + + /** 检验科接收时间 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @Excel(name = "检验科接收时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date incepttime; + + /** 标本核收者编码 */ + @Excel(name = "标本核收者编码") + private String accepterid; + + /** 标本核收者名称 */ + @Excel(name = "标本核收者名称") + private String acceptername; + + /** 标本核收时间 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @Excel(name = "标本核收时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date accepttime; + + /** 标本核准者编码 */ + @Excel(name = "标本核准者编码") + private String approverid; + + /** 标本核准者姓名 */ + @Excel(name = "标本核准者姓名") + private String approvername; + + /** 标本核准时间 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @Excel(name = "标本核准时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date approvetime; + + /** 备注 */ + @Excel(name = "备注") + private String memo; + + /** 样本位置信息 */ + @Excel(name = "样本位置信息") + private String rackcup; + + /** 检验单打印时间 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @Excel(name = "检验单打印时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date printedtime; + + /** 检验单打印者编码 */ + @Excel(name = "检验单打印者编码") + private String printerid; + + /** 检验单打印者姓名 */ + @Excel(name = "检验单打印者姓名") + private String printername; + + /** 测试时间(后台更新) */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @Excel(name = "测试时间(后台更新)", width = 30, dateFormat = "yyyy-MM-dd") + private Date checktime; + + /** 结果时间(后台更新) */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @Excel(name = "结果时间(后台更新)", width = 30, dateFormat = "yyyy-MM-dd") + private Date resulttime; + + /** 医院编码(名称) */ + @Excel(name = "医院编码(名称)") + private String hospitalid; + + /** 第二样本号 */ + @Excel(name = "第二样本号") + private String sampleid2; + + /** LIS备注信息 */ + @Excel(name = "LIS备注信息") + private String lismemo; + + /** 出生日期(YYYY-MM-DD) */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @Excel(name = "出生日期(YYYY-MM-DD)", width = 30, dateFormat = "yyyy-MM-dd") + private Date birthday; + + /** 高级患者信息(唐氏相关信息) */ + @Excel(name = "高级患者信息(唐氏相关信息)") + private String extrainfo; + + /** 应测项目数量 */ + @Excel(name = "应测项目数量") + private Long planitemcount; + + /** 实测项目数量 */ + @Excel(name = "实测项目数量") + private Long actualitemcount; + + /** 已经测试项目数量 */ + @Excel(name = "已经测试项目数量") + private Long testeditemcount; + + /** 是否高危患者 */ + @Excel(name = "是否高危患者") + private String ishighrisk; + + /** 是否药物临床试验(0:否,1:是) */ + @Excel(name = "是否药物临床试验(0:否,1:是)") + private String isgcp; + + /** 原始条码 */ + @Excel(name = "原始条码") + private String barcode2; + + /** 条码打印时间 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @Excel(name = "条码打印时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date barprinttime; + + /** 归档时间(初审时间) */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @Excel(name = "归档时间(初审时间)", width = 30, dateFormat = "yyyy-MM-dd") + private Date documenttime; + + /** 归档人ID */ + @Excel(name = "归档人ID") + private String documentid; + + /** 归档人姓名 */ + @Excel(name = "归档人姓名") + private String documentname; + + /** 预计报告时间 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @Excel(name = "预计报告时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date reporttime; + + /** 采样人名称 */ + @Excel(name = "采样人名称") + private String samplegetname; + + /** 采样人编码 */ + @Excel(name = "采样人编码") + private String samplegetid; + + /** 位标识2 */ + @Excel(name = "位标识2") + private String state2; + + /** LSP检验单上传 */ + @Excel(name = "LSP检验单上传") + private String lsptestform; + + /** 执行单号2 */ + @Excel(name = "执行单号2") + private String execsqn2; + + /** 诊断编码 */ + @Excel(name = "诊断编码") + private String diagnosisid; + + /** 患者编码2 */ + @Excel(name = "患者编码2") + private String patientid2; + + /** 患者编码3 */ + @Excel(name = "患者编码3") + private String patientid3; + + /** 患者更多信息 */ + @Excel(name = "患者更多信息") + private String patientinfo; + + /** 自动审核信息（流水线） */ + @Excel(name = "自动审核信息", readConverterExp = "流=水线") + private String autoconfirminfo; + + /** 条码备注 */ + @Excel(name = "条码备注") + private String barcodememo; + + /** 第三方体检读取结果标识,las_com_sqllocal表中增加本地sql */ + @Excel(name = "第三方体检读取结果标识,las_com_sqllocal表中增加本地sql") + private String tjflag; + + /** 生理周期 */ + @Excel(name = "生理周期") + private String menstrualcycle; + + /** 译文信息 */ + @Excel(name = "译文信息") + private String translationinfo; + + /** 混样单号 */ + @Excel(name = "混样单号") + private String mixcode; + + /** 护照号 */ + @Excel(name = "护照号") + private String passportno; + + /** 患者英文姓名 */ + @Excel(name = "患者英文姓名") + private String patientnameen; +} diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/winlis/LasRtResultMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/winlis/LasRtResultMapper.java new file mode 100644 index 000000000..b290289b2 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/winlis/LasRtResultMapper.java @@ -0,0 +1,62 @@ +package com.neuhis.his.mapper.winlis; + +import com.neuhis.his.domain.entity.winlis.LasRtResult; + +import java.util.List; + +/** + * 常规检验结果Mapper接口 + * + * @author ruoyi + * @date 2025-03-05 + */ +public interface LasRtResultMapper +{ + /** + * 查询常规检验结果 + * + * @param testdate 常规检验结果主键 + * @return 常规检验结果 + */ + public LasRtResult selectLasRtResultByTestdate(String testdate); + + /** + * 查询常规检验结果列表 + * + * @param lasRtResult 常规检验结果 + * @return 常规检验结果集合 + */ + public List selectLasRtResultList(LasRtResult lasRtResult); + + /** + * 新增常规检验结果 + * + * @param lasRtResult 常规检验结果 + * @return 结果 + */ + public int insertLasRtResult(LasRtResult lasRtResult); + + /** + * 修改常规检验结果 + * + * @param lasRtResult 常规检验结果 + * @return 结果 + */ + public int updateLasRtResult(LasRtResult lasRtResult); + + /** + * 删除常规检验结果 + * + * @param testdate 常规检验结果主键 + * @return 结果 + */ + public int deleteLasRtResultByTestdate(String testdate); + + /** + * 批量删除常规检验结果 + * + * @param testdates 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteLasRtResultByTestdates(String[] testdates); +} diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/mapper/winlis/LasSapSampleregMapper.java b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/winlis/LasSapSampleregMapper.java new file mode 100644 index 000000000..13831df52 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/neuhis/his/mapper/winlis/LasSapSampleregMapper.java @@ -0,0 +1,118 @@ +package com.neuhis.his.mapper.winlis; + +import com.neuhis.his.domain.entity.winlis.LasSapSamplereg; + +import java.util.List; + +/** + * 样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) +Mapper接口 + * + * @author ruoyi + * @date 2025-03-05 + */ +public interface LasSapSampleregMapper +{ + /** + * 查询样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + + * + * @param testdate 样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) +主键 + * @return 样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + + */ + public LasSapSamplereg selectLasSapSampleregByTestdate(String testdate); + + /** + * 查询样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) +列表 + * + * @param lasSapSamplereg 样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + + * @return 样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) +集合 + */ + public List selectLasSapSampleregList(LasSapSamplereg lasSapSamplereg); + + /** + * 新增样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + + * + * @param lasSapSamplereg 样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + + * @return 结果 + */ + public int insertLasSapSamplereg(LasSapSamplereg lasSapSamplereg); + + /** + * 修改样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + + * + * @param lasSapSamplereg 样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + + * @return 结果 + */ + public int updateLasSapSamplereg(LasSapSamplereg lasSapSamplereg); + + /** + * 删除样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + + * + * @param testdate 样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) +主键 + * @return 结果 + */ + public int deleteLasSapSampleregByTestdate(String testdate); + + /** + * 批量删除样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + + * + * @param testdates 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteLasSapSampleregByTestdates(String[] testdates); +} diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IComPatientinfoMixService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/IComPatientinfoMixService.java deleted file mode 100644 index a2e896b78..000000000 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IComPatientinfoMixService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.neuhis.his.service; - -import com.neuhis.his.domain.entity.ComPatientinfo; - -import java.util.List; - -public interface IComPatientinfoMixService { - - boolean updateSexComPatientinfo(); -} diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IComControlargumentService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComControlargumentService.java similarity index 92% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IComControlargumentService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComControlargumentService.java index a00109b6f..72f494a20 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IComControlargumentService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComControlargumentService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.ComControlargument; public interface IComControlargumentService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IComDepartmentService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComDepartmentService.java similarity index 94% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IComDepartmentService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComDepartmentService.java index 5fd061eb3..604d56684 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IComDepartmentService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComDepartmentService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.ComDepartment; public interface IComDepartmentService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IComDictionaryService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComDictionaryService.java similarity index 96% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IComDictionaryService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComDictionaryService.java index 294b91104..864e1d893 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IComDictionaryService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComDictionaryService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.common.ComDictionaryTypeEnum; import com.neuhis.his.domain.entity.ComDictionary; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IComEmployeeService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComEmployeeService.java similarity index 94% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IComEmployeeService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComEmployeeService.java index 7df0743e6..0fcb650c0 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IComEmployeeService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComEmployeeService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.ComEmployee; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComPatientinfoMixService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComPatientinfoMixService.java new file mode 100644 index 000000000..dffb889b5 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComPatientinfoMixService.java @@ -0,0 +1,6 @@ +package com.neuhis.his.service.his; + +public interface IComPatientinfoMixService { + + boolean updateSexComPatientinfo(); +} diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IComPatientinfoService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComPatientinfoService.java similarity index 97% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IComPatientinfoService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComPatientinfoService.java index 3f63f355a..50c8ac570 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IComPatientinfoService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IComPatientinfoService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.*; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IDawnCodeInfoService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IDawnCodeInfoService.java similarity index 87% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IDawnCodeInfoService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IDawnCodeInfoService.java index 546dade91..855bb8029 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IDawnCodeInfoService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IDawnCodeInfoService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.DawnCodeInfo; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IFinComExamorderService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinComExamorderService.java similarity index 94% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IFinComExamorderService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinComExamorderService.java index 3e1768faf..6079d0a36 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IFinComExamorderService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinComExamorderService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.FinComExamorder; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IFinComUndruginfoService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinComUndruginfoService.java similarity index 94% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IFinComUndruginfoService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinComUndruginfoService.java index 5f763663d..1802f771f 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IFinComUndruginfoService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinComUndruginfoService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.FinComUndruginfo; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IFinComUndrugztinfoService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinComUndrugztinfoService.java similarity index 90% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IFinComUndrugztinfoService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinComUndrugztinfoService.java index ce781f117..766df6629 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IFinComUndrugztinfoService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinComUndrugztinfoService.java @@ -1,8 +1,7 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.dto.ComUndrugZtFeeGroupItem; import com.neuhis.his.domain.entity.FinComUndrugztinfo; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IFinIpbFeeinfoService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIpbFeeinfoService.java similarity index 93% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IFinIpbFeeinfoService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIpbFeeinfoService.java index df2f8527f..cd62a8e29 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IFinIpbFeeinfoService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIpbFeeinfoService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.FinIpbFeeinfo; public interface IFinIpbFeeinfoService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IFinIpbItemlistService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIpbItemlistService.java similarity index 89% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IFinIpbItemlistService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIpbItemlistService.java index 26c047f02..7bb582d43 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IFinIpbItemlistService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIpbItemlistService.java @@ -1,7 +1,6 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.FinIpbItemlist; -import com.neuhis.his.domain.entity.FinOpbFeedetail; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IFinIpbMedicinelistService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIpbMedicinelistService.java similarity index 95% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IFinIpbMedicinelistService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIpbMedicinelistService.java index 1fcfd1dab..f0c41aefb 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IFinIpbMedicinelistService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIpbMedicinelistService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.FinIpbMedicinelist; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IFinIprBabyinfoService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIprBabyinfoService.java similarity index 92% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IFinIprBabyinfoService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIprBabyinfoService.java index 1914a5b1e..87f7fedb1 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IFinIprBabyinfoService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIprBabyinfoService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.FinIprBabyinfo; public interface IFinIprBabyinfoService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IFinIprInmaininfoService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIprInmaininfoService.java similarity index 94% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IFinIprInmaininfoService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIprInmaininfoService.java index bbdd24fea..7c7ec816d 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IFinIprInmaininfoService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinIprInmaininfoService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.FinIprInmaininfo; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IFinOpbAccountService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOpbAccountService.java similarity index 92% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IFinOpbAccountService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOpbAccountService.java index 086dc1c29..298ad77e3 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IFinOpbAccountService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOpbAccountService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.FinOpbAccount; public interface IFinOpbAccountService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IFinOpbAccountlistService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOpbAccountlistService.java similarity index 84% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IFinOpbAccountlistService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOpbAccountlistService.java index 70b150311..6cbb67b08 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IFinOpbAccountlistService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOpbAccountlistService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.FinOpbAccountlist; public interface IFinOpbAccountlistService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IFinOpbAccountrecordService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOpbAccountrecordService.java similarity index 86% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IFinOpbAccountrecordService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOpbAccountrecordService.java index f4d7c3351..b45be9e9c 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IFinOpbAccountrecordService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOpbAccountrecordService.java @@ -1,6 +1,5 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.ComPatientinfo; import com.neuhis.his.domain.entity.FinOpbAccountrecord; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IFinOpbFeedetailService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOpbFeedetailService.java similarity index 89% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IFinOpbFeedetailService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOpbFeedetailService.java index ae4416fee..9776b5098 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IFinOpbFeedetailService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOpbFeedetailService.java @@ -1,7 +1,6 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.FinOpbFeedetail; -import com.neuhis.his.domain.entity.Hl7MessageRecord; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IFinOprRegisterService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOprRegisterService.java similarity index 88% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IFinOprRegisterService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOprRegisterService.java index 028c2b9e7..5c238b6ec 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IFinOprRegisterService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOprRegisterService.java @@ -1,6 +1,5 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.FinOpbFeedetail; import com.neuhis.his.domain.entity.FinOprRegister; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IFinOprSchemaService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOprSchemaService.java similarity index 91% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IFinOprSchemaService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOprSchemaService.java index 05e0b451f..76f57f907 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IFinOprSchemaService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IFinOprSchemaService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.FinOprSchema; public interface IFinOprSchemaService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMdcDiPathService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMdcDiPathService.java similarity index 94% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IMdcDiPathService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMdcDiPathService.java index de80aa23c..b2c98fc3e 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMdcDiPathService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMdcDiPathService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.FinIprInmaininfo; import com.neuhis.his.domain.entity.FinOprRegister; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetCasDiagnoseService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetCasDiagnoseService.java similarity index 93% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IMetCasDiagnoseService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetCasDiagnoseService.java index 22f148aa4..91357a9d5 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetCasDiagnoseService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetCasDiagnoseService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.MetCasDiagnose; public interface IMetCasDiagnoseService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetComIcd10Service.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetComIcd10Service.java similarity index 91% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IMetComIcd10Service.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetComIcd10Service.java index 3000bce31..ffb0af0b6 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetComIcd10Service.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetComIcd10Service.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.MetComIcd10; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetComOperationLocalService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetComOperationLocalService.java similarity index 85% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IMetComOperationLocalService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetComOperationLocalService.java index 79e241678..2208a8f6d 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetComOperationLocalService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetComOperationLocalService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.MetComOperationLocal; public interface IMetComOperationLocalService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetIpmBookedService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetIpmBookedService.java similarity index 91% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IMetIpmBookedService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetIpmBookedService.java index fe90853c1..d12012beb 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetIpmBookedService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetIpmBookedService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.MetIpmBooked; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetIpmExecdrugService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetIpmExecdrugService.java similarity index 91% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IMetIpmExecdrugService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetIpmExecdrugService.java index 8d7080202..9cb865320 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetIpmExecdrugService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetIpmExecdrugService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.MetIpmExecdrug; public interface IMetIpmExecdrugService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetIpmExecundrugService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetIpmExecundrugService.java similarity index 93% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IMetIpmExecundrugService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetIpmExecundrugService.java index edd183583..7047325e0 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetIpmExecundrugService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetIpmExecundrugService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.MetIpmExecundrug; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetIpmOrderService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetIpmOrderService.java similarity index 92% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IMetIpmOrderService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetIpmOrderService.java index be2e0f824..7dc01ded9 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetIpmOrderService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetIpmOrderService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.MetIpmOrder; public interface IMetIpmOrderService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetMrsBaseService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetMrsBaseService.java similarity index 91% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IMetMrsBaseService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetMrsBaseService.java index 1949efa23..4a05dda72 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetMrsBaseService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetMrsBaseService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.MetMrsBase; public interface IMetMrsBaseService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetNuiCancelitemService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetNuiCancelitemService.java similarity index 92% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IMetNuiCancelitemService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetNuiCancelitemService.java index ae146e53d..3a922a583 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetNuiCancelitemService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetNuiCancelitemService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.MetNuiCancelitem; public interface IMetNuiCancelitemService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetNuiExerecordService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetNuiExerecordService.java similarity index 94% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IMetNuiExerecordService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetNuiExerecordService.java index 61f19f3d7..9d51d9ad7 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetNuiExerecordService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetNuiExerecordService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.MetNuiExerecord; import io.lettuce.core.dynamic.annotation.Param; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetOpsApplyService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOpsApplyService.java similarity index 91% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IMetOpsApplyService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOpsApplyService.java index e715ea9f7..379325b50 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetOpsApplyService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOpsApplyService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.MetOpsApply; public interface IMetOpsApplyService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetOpsArrangeService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOpsArrangeService.java similarity index 93% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IMetOpsArrangeService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOpsArrangeService.java index 339afaf83..c48e5c903 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetOpsArrangeService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOpsArrangeService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.MetOpsArrange; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetOpsOperationitemService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOpsOperationitemService.java similarity index 94% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IMetOpsOperationitemService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOpsOperationitemService.java index f3db4a366..c95d1c4ad 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetOpsOperationitemService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOpsOperationitemService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.MetOpsOperationitem; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetOrdeApplyTypeService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdeApplyTypeService.java similarity index 93% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IMetOrdeApplyTypeService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdeApplyTypeService.java index a84f1dfd2..ab7fb1816 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetOrdeApplyTypeService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdeApplyTypeService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.MetOrdeApplyType; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetOrdeBigexampartService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdeBigexampartService.java similarity index 93% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IMetOrdeBigexampartService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdeBigexampartService.java index cfd9683ce..308a18d62 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetOrdeBigexampartService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdeBigexampartService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.MetOrdeBigexampart; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetOrdeExampartService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdeExampartService.java similarity index 93% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IMetOrdeExampartService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdeExampartService.java index d14484056..829587ab5 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetOrdeExampartService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdeExampartService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.MetOrdeExampart; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetOrdiOrderService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdiOrderService.java similarity index 92% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IMetOrdiOrderService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdiOrderService.java index b22ab035b..0872b9bd4 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetOrdiOrderService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdiOrderService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.MetOrdiOrder; public interface IMetOrdiOrderService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetOrdoOrderService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdoOrderService.java similarity index 92% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IMetOrdoOrderService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdoOrderService.java index 98e8e7f9e..d62f46907 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetOrdoOrderService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdoOrderService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.MetOrdoOrder; public interface IMetOrdoOrderService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetOrdtUndrugtermService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdtUndrugtermService.java similarity index 93% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IMetOrdtUndrugtermService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdtUndrugtermService.java index edb2109ac..f8440421c 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IMetOrdtUndrugtermService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IMetOrdtUndrugtermService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.MetOrdtUndrugterm; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/INsrNisRecordDetailService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/INsrNisRecordDetailService.java similarity index 87% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/INsrNisRecordDetailService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/INsrNisRecordDetailService.java index 04cadbe82..d673f6378 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/INsrNisRecordDetailService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/INsrNisRecordDetailService.java @@ -1,6 +1,5 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; -import com.neuhis.his.domain.entity.ComEmployee; import com.neuhis.his.domain.entity.NsrNisRecordDetail; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/INsrStandardCodeService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/INsrStandardCodeService.java similarity index 91% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/INsrStandardCodeService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/INsrStandardCodeService.java index 00e180344..f6bc58466 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/INsrStandardCodeService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/INsrStandardCodeService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.NsrStandardCode; public interface INsrStandardCodeService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IPdaBloodCircuitService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPdaBloodCircuitService.java similarity index 77% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IPdaBloodCircuitService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPdaBloodCircuitService.java index cf2eb1763..7c4b09631 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IPdaBloodCircuitService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPdaBloodCircuitService.java @@ -1,7 +1,6 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.PdaBloodCircuit; -import io.lettuce.core.dynamic.annotation.Param; public interface IPdaBloodCircuitService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IPdaPsrRatingRecordService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPdaPsrRatingRecordService.java similarity index 97% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IPdaPsrRatingRecordService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPdaPsrRatingRecordService.java index e6cf1bfca..08817ee52 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IPdaPsrRatingRecordService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPdaPsrRatingRecordService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import java.util.List; import com.neuhis.his.domain.entity.HisPdaPsrRatingRecord; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IPdaPsrRecordService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPdaPsrRecordService.java similarity index 91% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IPdaPsrRecordService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPdaPsrRecordService.java index ee2d83bd1..c6ebd5ae4 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IPdaPsrRecordService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPdaPsrRecordService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.PdaPsrRecord; public interface IPdaPsrRecordService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IPhaComApplyoutService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPhaComApplyoutService.java similarity index 91% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IPhaComApplyoutService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPhaComApplyoutService.java index 31bbbcadd..6d8039a1f 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IPhaComApplyoutService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPhaComApplyoutService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.PhaComApplyout; public interface IPhaComApplyoutService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/IPhaComBaseinfoService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPhaComBaseinfoService.java similarity index 94% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/IPhaComBaseinfoService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPhaComBaseinfoService.java index 155ab14c0..6fa630835 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/IPhaComBaseinfoService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/his/IPhaComBaseinfoService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service; +package com.neuhis.his.service.his; import com.neuhis.his.domain.entity.PhaComBaseinfo; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/BizElecAppServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/BizElecAppServiceImpl.java index 67e64c7aa..8f78dce9b 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/BizElecAppServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/BizElecAppServiceImpl.java @@ -5,6 +5,7 @@ import java.util.*; import cn.hutool.core.util.NumberUtil; import cn.hutool.extra.pinyin.PinyinUtil; +import com.neuhis.his.service.his.*; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/ComControlargumentServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComControlargumentServiceImpl.java similarity index 93% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/ComControlargumentServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComControlargumentServiceImpl.java index 7f980d0c7..fdc0cf033 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/ComControlargumentServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComControlargumentServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -6,7 +6,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.neuhis.his.mapper.ComControlargumentMapper; import com.neuhis.his.domain.entity.ComControlargument; -import com.neuhis.his.service.IComControlargumentService; +import com.neuhis.his.service.his.IComControlargumentService; @Service @DataSource(value = DataSourceType.SLAVE) diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/ComDepartmentServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComDepartmentServiceImpl.java similarity index 97% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/ComDepartmentServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComDepartmentServiceImpl.java index 83a924b87..f4893fa13 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/ComDepartmentServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComDepartmentServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.neuhis.his.domain.entity.ComDepartment; import com.neuhis.his.mapper.ComDepartmentMapper; -import com.neuhis.his.service.IComDepartmentService; +import com.neuhis.his.service.his.IComDepartmentService; import org.springframework.transaction.annotation.Transactional; @Service diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/ComDictionaryServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComDictionaryServiceImpl.java similarity index 98% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/ComDictionaryServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComDictionaryServiceImpl.java index 89c605eaa..283a752b8 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/ComDictionaryServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComDictionaryServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -14,7 +14,7 @@ import javax.annotation.Resource; import com.neuhis.his.domain.entity.ComDictionary; import com.neuhis.his.mapper.ComDictionaryMapper; -import com.neuhis.his.service.IComDictionaryService; +import com.neuhis.his.service.his.IComDictionaryService; import org.springframework.transaction.annotation.Transactional; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/ComEmployeeServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComEmployeeServiceImpl.java similarity index 96% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/ComEmployeeServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComEmployeeServiceImpl.java index c678e28fb..3765098cd 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/ComEmployeeServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComEmployeeServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.neuhis.his.mapper.ComEmployeeMapper; import com.neuhis.his.domain.entity.ComEmployee; -import com.neuhis.his.service.IComEmployeeService; +import com.neuhis.his.service.his.IComEmployeeService; import org.springframework.transaction.annotation.Transactional; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/ComPatientinfoMixServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComPatientinfoMixServiceImpl.java similarity index 83% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/ComPatientinfoMixServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComPatientinfoMixServiceImpl.java index 0877efd3c..a10fe9425 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/ComPatientinfoMixServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComPatientinfoMixServiceImpl.java @@ -1,24 +1,16 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import cn.hutool.core.date.DateUtil; import cn.hutool.json.JSONUtil; -import com.ruoyi.common.annotation.DataSource; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.DataSourceType; import com.ruoyi.common.utils.StringUtils; import com.neuhis.his.domain.entity.*; -import com.neuhis.his.mapper.ComPatientinfoMapper; -import com.neuhis.his.mapper.FinIprInmaininfoMapper; -import com.neuhis.his.mapper.MetMrsBaseMapper; import com.neuhis.his.service.IBizHandleRecordService; -import com.neuhis.his.service.IComPatientinfoMixService; -import com.neuhis.his.service.IComPatientinfoService; +import com.neuhis.his.service.his.IComPatientinfoMixService; +import com.neuhis.his.service.his.IComPatientinfoService; import com.neuhis.utils.IdcardUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; import java.util.Comparator; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/ComPatientinfoServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComPatientinfoServiceImpl.java similarity index 98% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/ComPatientinfoServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComPatientinfoServiceImpl.java index 3cb8a86b5..0b450cab8 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/ComPatientinfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/ComPatientinfoServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import cn.hutool.json.JSONUtil; import com.ruoyi.common.annotation.DataSource; @@ -10,14 +10,14 @@ import com.neuhis.his.domain.entity.*; import com.neuhis.his.domain.entity.items.PVisit; import com.neuhis.his.mapper.*; import com.neuhis.his.service.IBizHandleRecordService; -import com.neuhis.his.service.IFinOpbAccountService; -import com.neuhis.his.service.IMdcDiPathService; +import com.neuhis.his.service.his.IFinOpbAccountService; +import com.neuhis.his.service.his.IMdcDiPathService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import com.neuhis.his.service.IComPatientinfoService; +import com.neuhis.his.service.his.IComPatientinfoService; import org.springframework.transaction.annotation.Transactional; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/DawnCodeInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/DawnCodeInfoServiceImpl.java similarity index 90% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/DawnCodeInfoServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/DawnCodeInfoServiceImpl.java index d7ed7f84a..c5cbe7dda 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/DawnCodeInfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/DawnCodeInfoServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.domain.entity.DawnCodeInfo; import com.neuhis.his.mapper.DawnCodeInfoMapper; -import com.neuhis.his.service.IDawnCodeInfoService; +import com.neuhis.his.service.his.IDawnCodeInfoService; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinComExamorderServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinComExamorderServiceImpl.java similarity index 95% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinComExamorderServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinComExamorderServiceImpl.java index 5ea9658a6..a649f95ba 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinComExamorderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinComExamorderServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.mapper.FinComExamorderMapper; import com.neuhis.his.domain.entity.FinComExamorder; -import com.neuhis.his.service.IFinComExamorderService; +import com.neuhis.his.service.his.IFinComExamorderService; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinComUndruginfoServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinComUndruginfoServiceImpl.java similarity index 95% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinComUndruginfoServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinComUndruginfoServiceImpl.java index 18c43f9d5..f092aad7c 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinComUndruginfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinComUndruginfoServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.neuhis.his.mapper.FinComUndruginfoMapper; import com.neuhis.his.domain.entity.FinComUndruginfo; -import com.neuhis.his.service.IFinComUndruginfoService; +import com.neuhis.his.service.his.IFinComUndruginfoService; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinComUndrugztinfoServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinComUndrugztinfoServiceImpl.java similarity index 95% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinComUndrugztinfoServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinComUndrugztinfoServiceImpl.java index 1c6d84e2d..e9b72a0e5 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinComUndrugztinfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinComUndrugztinfoServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -10,7 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.domain.entity.FinComUndrugztinfo; import com.neuhis.his.mapper.FinComUndrugztinfoMapper; -import com.neuhis.his.service.IFinComUndrugztinfoService; +import com.neuhis.his.service.his.IFinComUndrugztinfoService; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinIpbFeeinfoServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIpbFeeinfoServiceImpl.java similarity index 90% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinIpbFeeinfoServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIpbFeeinfoServiceImpl.java index b06ecea8a..ecfd08741 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinIpbFeeinfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIpbFeeinfoServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -9,8 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.domain.entity.FinIpbFeeinfo; import com.neuhis.his.mapper.FinIpbFeeinfoMapper; -import com.neuhis.his.service.IFinIpbFeeinfoService; -import org.springframework.transaction.annotation.Transactional; +import com.neuhis.his.service.his.IFinIpbFeeinfoService; @Service @DataSource(value = DataSourceType.SLAVE) diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinIpbItemlistServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIpbItemlistServiceImpl.java similarity index 96% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinIpbItemlistServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIpbItemlistServiceImpl.java index 045989f3b..fdab1f54f 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinIpbItemlistServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIpbItemlistServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.neuhis.his.mapper.FinIpbItemlistMapper; import com.neuhis.his.domain.entity.FinIpbItemlist; -import com.neuhis.his.service.IFinIpbItemlistService; +import com.neuhis.his.service.his.IFinIpbItemlistService; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinIpbMedicinelistServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIpbMedicinelistServiceImpl.java similarity index 96% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinIpbMedicinelistServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIpbMedicinelistServiceImpl.java index b568ddfc0..5ee076a1a 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinIpbMedicinelistServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIpbMedicinelistServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.neuhis.his.mapper.FinIpbMedicinelistMapper; import com.neuhis.his.domain.entity.FinIpbMedicinelist; -import com.neuhis.his.service.IFinIpbMedicinelistService; +import com.neuhis.his.service.his.IFinIpbMedicinelistService; import org.springframework.transaction.annotation.Transactional; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinIprBabyinfoServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIprBabyinfoServiceImpl.java similarity index 93% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinIprBabyinfoServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIprBabyinfoServiceImpl.java index d45f09770..77f5d18f0 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinIprBabyinfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIprBabyinfoServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.mapper.FinIprBabyinfoMapper; import com.neuhis.his.domain.entity.FinIprBabyinfo; -import com.neuhis.his.service.IFinIprBabyinfoService; +import com.neuhis.his.service.his.IFinIprBabyinfoService; @Service @DataSource(value = DataSourceType.SLAVE) @Slf4j diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinIprInmaininfoServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIprInmaininfoServiceImpl.java similarity index 96% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinIprInmaininfoServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIprInmaininfoServiceImpl.java index 15dfd54fa..d7ee93c6b 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinIprInmaininfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinIprInmaininfoServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.neuhis.his.domain.entity.FinIprInmaininfo; import com.neuhis.his.mapper.FinIprInmaininfoMapper; -import com.neuhis.his.service.IFinIprInmaininfoService; +import com.neuhis.his.service.his.IFinIprInmaininfoService; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinOpbAccountServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbAccountServiceImpl.java similarity index 93% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinOpbAccountServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbAccountServiceImpl.java index 5ab0ec293..8951deefe 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinOpbAccountServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbAccountServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -6,7 +6,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.neuhis.his.mapper.FinOpbAccountMapper; import com.neuhis.his.domain.entity.FinOpbAccount; -import com.neuhis.his.service.IFinOpbAccountService; +import com.neuhis.his.service.his.IFinOpbAccountService; @DataSource(value = DataSourceType.SLAVE) @Service diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinOpbAccountlistServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbAccountlistServiceImpl.java similarity index 88% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinOpbAccountlistServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbAccountlistServiceImpl.java index a5a21c1fd..891c4adca 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinOpbAccountlistServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbAccountlistServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -6,7 +6,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.neuhis.his.mapper.FinOpbAccountlistMapper; import com.neuhis.his.domain.entity.FinOpbAccountlist; -import com.neuhis.his.service.IFinOpbAccountlistService; +import com.neuhis.his.service.his.IFinOpbAccountlistService; @DataSource(value = DataSourceType.SLAVE) @Service diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinOpbAccountrecordServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbAccountrecordServiceImpl.java similarity index 91% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinOpbAccountrecordServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbAccountrecordServiceImpl.java index 607d3c654..2aa64c093 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinOpbAccountrecordServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbAccountrecordServiceImpl.java @@ -1,13 +1,12 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; -import com.neuhis.his.domain.entity.ComPatientinfo; import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.neuhis.his.domain.entity.FinOpbAccountrecord; import com.neuhis.his.mapper.FinOpbAccountrecordMapper; -import com.neuhis.his.service.IFinOpbAccountrecordService; +import com.neuhis.his.service.his.IFinOpbAccountrecordService; import org.springframework.transaction.annotation.Transactional; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinOpbFeedetailServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbFeedetailServiceImpl.java similarity index 86% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinOpbFeedetailServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbFeedetailServiceImpl.java index 6a8154c47..94ee04a26 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinOpbFeedetailServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbFeedetailServiceImpl.java @@ -1,20 +1,15 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; -import cn.hutool.core.codec.Base64; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; -import com.neuhis.his.domain.entity.Hl7MessageRecord; -import com.neuhis.utils.InvoiceUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.neuhis.his.domain.entity.FinOpbFeedetail; import com.neuhis.his.mapper.FinOpbFeedetailMapper; -import com.neuhis.his.service.IFinOpbFeedetailService; -import org.springframework.transaction.annotation.Transactional; +import com.neuhis.his.service.his.IFinOpbFeedetailService; -import java.rmi.RemoteException; import java.util.List; @Service diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinOpbInvoiceinfoServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbInvoiceinfoServiceImpl.java similarity index 94% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinOpbInvoiceinfoServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbInvoiceinfoServiceImpl.java index 9867fd155..2cc1b18db 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinOpbInvoiceinfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOpbInvoiceinfoServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -10,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.domain.entity.FinOpbInvoiceinfo; import com.neuhis.his.mapper.FinOpbInvoiceinfoMapper; import com.neuhis.his.service.FinOpbInvoiceinfoService; -import org.springframework.transaction.annotation.Transactional; @Service @DataSource(value = DataSourceType.SLAVE) diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinOprRegisterServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOprRegisterServiceImpl.java similarity index 96% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinOprRegisterServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOprRegisterServiceImpl.java index 61f27568f..f2b01d3bd 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinOprRegisterServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOprRegisterServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -10,7 +10,7 @@ import javax.annotation.Resource; import com.neuhis.his.domain.entity.FinOprRegister; import com.neuhis.his.mapper.FinOprRegisterMapper; -import com.neuhis.his.service.IFinOprRegisterService; +import com.neuhis.his.service.his.IFinOprRegisterService; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinOprSchemaServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOprSchemaServiceImpl.java similarity index 93% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinOprSchemaServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOprSchemaServiceImpl.java index d6064c63d..00531ea45 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/FinOprSchemaServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/FinOprSchemaServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.domain.entity.FinOprSchema; import com.neuhis.his.mapper.FinOprSchemaMapper; -import com.neuhis.his.service.IFinOprSchemaService; +import com.neuhis.his.service.his.IFinOprSchemaService; @DataSource(value = DataSourceType.SLAVE) @Service diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MdcDiPathServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MdcDiPathServiceImpl.java similarity index 96% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MdcDiPathServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MdcDiPathServiceImpl.java index 924799292..80d20f52b 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MdcDiPathServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MdcDiPathServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.mapper.MdcDiPathMapper; import com.neuhis.his.domain.entity.MdcDiPath; -import com.neuhis.his.service.IMdcDiPathService; +import com.neuhis.his.service.his.IMdcDiPathService; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetCasDiagnoseServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetCasDiagnoseServiceImpl.java similarity index 92% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetCasDiagnoseServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetCasDiagnoseServiceImpl.java index 6a421a02e..f0ef0edd7 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetCasDiagnoseServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetCasDiagnoseServiceImpl.java @@ -1,13 +1,12 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; -import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.neuhis.his.domain.entity.MetCasDiagnose; import com.neuhis.his.mapper.MetCasDiagnoseMapper; -import com.neuhis.his.service.IMetCasDiagnoseService; +import com.neuhis.his.service.his.IMetCasDiagnoseService; @Service @DataSource(value = DataSourceType.SLAVE) diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetComIcd10ServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetComIcd10ServiceImpl.java similarity index 92% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetComIcd10ServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetComIcd10ServiceImpl.java index f14290437..38b94b85b 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetComIcd10ServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetComIcd10ServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import org.springframework.stereotype.Service; @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.domain.entity.MetComIcd10; import com.neuhis.his.mapper.MetComIcd10Mapper; -import com.neuhis.his.service.IMetComIcd10Service; +import com.neuhis.his.service.his.IMetComIcd10Service; @Service public class MetComIcd10ServiceImpl implements IMetComIcd10Service { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetComOperationLocalServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetComOperationLocalServiceImpl.java similarity index 86% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetComOperationLocalServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetComOperationLocalServiceImpl.java index 672cc687a..2759f1b6f 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetComOperationLocalServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetComOperationLocalServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import org.springframework.stereotype.Service; @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.domain.entity.MetComOperationLocal; import com.neuhis.his.mapper.MetComOperationLocalMapper; -import com.neuhis.his.service.IMetComOperationLocalService; +import com.neuhis.his.service.his.IMetComOperationLocalService; @Service public class MetComOperationLocalServiceImpl implements IMetComOperationLocalService { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetIpmBookedServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetIpmBookedServiceImpl.java similarity index 89% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetIpmBookedServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetIpmBookedServiceImpl.java index f0d27e7fe..6b4e47fae 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetIpmBookedServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetIpmBookedServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -9,8 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.mapper.MetIpmBookedMapper; import com.neuhis.his.domain.entity.MetIpmBooked; -import com.neuhis.his.service.IMetIpmBookedService; -import org.springframework.transaction.annotation.Transactional; +import com.neuhis.his.service.his.IMetIpmBookedService; @Service @DataSource(value = DataSourceType.SLAVE) diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetIpmExecdrugServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetIpmExecdrugServiceImpl.java similarity index 89% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetIpmExecdrugServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetIpmExecdrugServiceImpl.java index 8680faaf5..0032598a9 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetIpmExecdrugServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetIpmExecdrugServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -7,8 +7,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.neuhis.his.domain.entity.MetIpmExecdrug; import com.neuhis.his.mapper.MetIpmExecdrugMapper; -import com.neuhis.his.service.IMetIpmExecdrugService; -import org.springframework.transaction.annotation.Transactional; +import com.neuhis.his.service.his.IMetIpmExecdrugService; @Service @DataSource(value = DataSourceType.SLAVE) diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetIpmExecundrugServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetIpmExecundrugServiceImpl.java similarity index 94% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetIpmExecundrugServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetIpmExecundrugServiceImpl.java index 7886da4b7..4ddd2b6e8 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetIpmExecundrugServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetIpmExecundrugServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.neuhis.his.domain.entity.MetIpmExecundrug; import com.neuhis.his.mapper.MetIpmExecundrugMapper; -import com.neuhis.his.service.IMetIpmExecundrugService; +import com.neuhis.his.service.his.IMetIpmExecundrugService; import org.springframework.transaction.annotation.Transactional; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetIpmOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetIpmOrderServiceImpl.java similarity index 95% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetIpmOrderServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetIpmOrderServiceImpl.java index d175c954c..390811dc7 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetIpmOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetIpmOrderServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.neuhis.his.domain.entity.MetIpmOrder; import com.neuhis.his.mapper.MetIpmOrderMapper; -import com.neuhis.his.service.IMetIpmOrderService; +import com.neuhis.his.service.his.IMetIpmOrderService; @DataSource(value = DataSourceType.SLAVE) @Service diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetMrsBaseServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetMrsBaseServiceImpl.java similarity index 93% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetMrsBaseServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetMrsBaseServiceImpl.java index 5dad0b408..ce902b21a 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetMrsBaseServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetMrsBaseServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -6,7 +6,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.neuhis.his.domain.entity.MetMrsBase; import com.neuhis.his.mapper.MetMrsBaseMapper; -import com.neuhis.his.service.IMetMrsBaseService; +import com.neuhis.his.service.his.IMetMrsBaseService; @Service @DataSource(value = DataSourceType.SLAVE) diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetNuiCancelitemServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetNuiCancelitemServiceImpl.java similarity index 93% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetNuiCancelitemServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetNuiCancelitemServiceImpl.java index 13c705163..dbc4814ae 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetNuiCancelitemServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetNuiCancelitemServiceImpl.java @@ -1,8 +1,8 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; -import com.neuhis.his.service.IMetNuiCancelitemService; +import com.neuhis.his.service.his.IMetNuiCancelitemService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetNuiExerecordServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetNuiExerecordServiceImpl.java similarity index 94% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetNuiExerecordServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetNuiExerecordServiceImpl.java index ce4014ed4..019f68988 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetNuiExerecordServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetNuiExerecordServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.domain.entity.MetNuiExerecord; import com.neuhis.his.mapper.MetNuiExerecordMapper; -import com.neuhis.his.service.IMetNuiExerecordService; +import com.neuhis.his.service.his.IMetNuiExerecordService; @DataSource(value = DataSourceType.SLAVE) @Service diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetOpsApplyServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOpsApplyServiceImpl.java similarity index 93% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetOpsApplyServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOpsApplyServiceImpl.java index 7e99e3ac8..022845667 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetOpsApplyServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOpsApplyServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.domain.entity.MetOpsApply; import com.neuhis.his.mapper.MetOpsApplyMapper; -import com.neuhis.his.service.IMetOpsApplyService; +import com.neuhis.his.service.his.IMetOpsApplyService; @DataSource(value = DataSourceType.SLAVE) @Service @Slf4j diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetOpsArrangeServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOpsArrangeServiceImpl.java similarity index 94% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetOpsArrangeServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOpsArrangeServiceImpl.java index 3def3f6a6..5f5ebb9f9 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetOpsArrangeServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOpsArrangeServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.mapper.MetOpsArrangeMapper; import com.neuhis.his.domain.entity.MetOpsArrange; -import com.neuhis.his.service.IMetOpsArrangeService; +import com.neuhis.his.service.his.IMetOpsArrangeService; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetOpsOperationitemServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOpsOperationitemServiceImpl.java similarity index 94% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetOpsOperationitemServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOpsOperationitemServiceImpl.java index a75d75979..3763a3ff3 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetOpsOperationitemServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOpsOperationitemServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.domain.entity.MetOpsOperationitem; import com.neuhis.his.mapper.MetOpsOperationitemMapper; -import com.neuhis.his.service.IMetOpsOperationitemService; +import com.neuhis.his.service.his.IMetOpsOperationitemService; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetOrdeApplyTypeServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdeApplyTypeServiceImpl.java similarity index 94% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetOrdeApplyTypeServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdeApplyTypeServiceImpl.java index 961143782..4167eede5 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetOrdeApplyTypeServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdeApplyTypeServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.domain.entity.MetOrdeApplyType; import com.neuhis.his.mapper.MetOrdeApplyTypeMapper; -import com.neuhis.his.service.IMetOrdeApplyTypeService; +import com.neuhis.his.service.his.IMetOrdeApplyTypeService; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetOrdeBigexampartServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdeBigexampartServiceImpl.java similarity index 94% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetOrdeBigexampartServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdeBigexampartServiceImpl.java index 2abdd0a96..a9acf18da 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetOrdeBigexampartServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdeBigexampartServiceImpl.java @@ -1,9 +1,9 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; import com.ruoyi.common.utils.StringUtils; -import com.neuhis.his.service.IMetOrdeBigexampartService; +import com.neuhis.his.service.his.IMetOrdeBigexampartService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetOrdeExampartServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdeExampartServiceImpl.java similarity index 94% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetOrdeExampartServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdeExampartServiceImpl.java index 6e22dfc3d..6bd23b5bd 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetOrdeExampartServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdeExampartServiceImpl.java @@ -1,9 +1,9 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; import com.ruoyi.common.utils.StringUtils; -import com.neuhis.his.service.IMetOrdeExampartService; +import com.neuhis.his.service.his.IMetOrdeExampartService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetOrdiOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdiOrderServiceImpl.java similarity index 95% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetOrdiOrderServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdiOrderServiceImpl.java index ad48a9247..a6561a192 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetOrdiOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdiOrderServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.neuhis.his.mapper.MetOrdiOrderMapper; import com.neuhis.his.domain.entity.MetOrdiOrder; -import com.neuhis.his.service.IMetOrdiOrderService; +import com.neuhis.his.service.his.IMetOrdiOrderService; @Service @DataSource(value = DataSourceType.SLAVE) diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetOrdoOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdoOrderServiceImpl.java similarity index 95% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetOrdoOrderServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdoOrderServiceImpl.java index 80284d0f6..69ab062ab 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetOrdoOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdoOrderServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.neuhis.his.mapper.MetOrdoOrderMapper; import com.neuhis.his.domain.entity.MetOrdoOrder; -import com.neuhis.his.service.IMetOrdoOrderService; +import com.neuhis.his.service.his.IMetOrdoOrderService; import org.springframework.transaction.annotation.Transactional; @Service diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetOrdtUndrugtermServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdtUndrugtermServiceImpl.java similarity index 94% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetOrdtUndrugtermServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdtUndrugtermServiceImpl.java index 371857261..3dc692ba6 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/MetOrdtUndrugtermServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/MetOrdtUndrugtermServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.mapper.MetOrdtUndrugtermMapper; import com.neuhis.his.domain.entity.MetOrdtUndrugterm; -import com.neuhis.his.service.IMetOrdtUndrugtermService; +import com.neuhis.his.service.his.IMetOrdtUndrugtermService; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/NsrNisRecordDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/NsrNisRecordDetailServiceImpl.java similarity index 96% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/NsrNisRecordDetailServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/NsrNisRecordDetailServiceImpl.java index 160c4eff2..dbc9e7b4e 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/NsrNisRecordDetailServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/NsrNisRecordDetailServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.domain.entity.NsrNisRecordDetail; import com.neuhis.his.mapper.NsrNisRecordDetailMapper; -import com.neuhis.his.service.INsrNisRecordDetailService; +import com.neuhis.his.service.his.INsrNisRecordDetailService; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/NsrStandardCodeServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/NsrStandardCodeServiceImpl.java similarity index 93% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/NsrStandardCodeServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/NsrStandardCodeServiceImpl.java index 2d3dde936..44ef9da3d 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/NsrStandardCodeServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/NsrStandardCodeServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.domain.entity.NsrStandardCode; import com.neuhis.his.mapper.NsrStandardCodeMapper; -import com.neuhis.his.service.INsrStandardCodeService; +import com.neuhis.his.service.his.INsrStandardCodeService; import org.springframework.transaction.annotation.Transactional; @Service diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/PdaBloodCircuitServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PdaBloodCircuitServiceImpl.java similarity index 91% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/PdaBloodCircuitServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PdaBloodCircuitServiceImpl.java index 0b140ebef..b76dc60a6 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/PdaBloodCircuitServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PdaBloodCircuitServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.mapper.PdaBloodCircuitMapper; import com.neuhis.his.domain.entity.PdaBloodCircuit; -import com.neuhis.his.service.IPdaBloodCircuitService; +import com.neuhis.his.service.his.IPdaBloodCircuitService; @DataSource(value = DataSourceType.SLAVE) @Service diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/PdaPsrRatingRecordServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PdaPsrRatingRecordServiceImpl.java similarity index 96% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/PdaPsrRatingRecordServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PdaPsrRatingRecordServiceImpl.java index c9aa5228f..4e23947ec 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/PdaPsrRatingRecordServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PdaPsrRatingRecordServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import java.util.List; @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.neuhis.his.mapper.PdaPsrRatingRecordMapper; import com.neuhis.his.domain.entity.HisPdaPsrRatingRecord; -import com.neuhis.his.service.IPdaPsrRatingRecordService; +import com.neuhis.his.service.his.IPdaPsrRatingRecordService; import com.ruoyi.common.core.text.Convert; /** diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/PdaPsrRecordServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PdaPsrRecordServiceImpl.java similarity index 93% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/PdaPsrRecordServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PdaPsrRecordServiceImpl.java index 56e96e55d..b7957749f 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/PdaPsrRecordServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PdaPsrRecordServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.neuhis.his.domain.entity.PdaPsrRecord; import com.neuhis.his.mapper.PdaPsrRecordMapper; -import com.neuhis.his.service.IPdaPsrRecordService; +import com.neuhis.his.service.his.IPdaPsrRecordService; @DataSource(value = DataSourceType.SLAVE) @Service diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/PhaComApplyoutServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PhaComApplyoutServiceImpl.java similarity index 93% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/PhaComApplyoutServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PhaComApplyoutServiceImpl.java index 8ef06fd4f..043b9106d 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/PhaComApplyoutServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PhaComApplyoutServiceImpl.java @@ -1,8 +1,8 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; -import com.neuhis.his.service.IPhaComApplyoutService; +import com.neuhis.his.service.his.IPhaComApplyoutService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/PhaComBaseinfoServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PhaComBaseinfoServiceImpl.java similarity index 96% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/impl/PhaComBaseinfoServiceImpl.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PhaComBaseinfoServiceImpl.java index 4d4a7523f..73b8419c3 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/PhaComBaseinfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/his/PhaComBaseinfoServiceImpl.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.impl; +package com.neuhis.his.service.impl.his; import com.neuhis.utils.RedisUtils; import com.ruoyi.common.annotation.DataSource; @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.neuhis.his.domain.entity.PhaComBaseinfo; import com.neuhis.his.mapper.PhaComBaseinfoMapper; -import com.neuhis.his.service.IPhaComBaseinfoService; +import com.neuhis.his.service.his.IPhaComBaseinfoService; import java.util.List; import java.util.Map; diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/winlis/LasRtResultServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/winlis/LasRtResultServiceImpl.java new file mode 100644 index 000000000..d1325e34a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/winlis/LasRtResultServiceImpl.java @@ -0,0 +1,98 @@ +package com.neuhis.his.service.impl.winlis; + +import java.util.List; + +import com.neuhis.his.domain.entity.winlis.LasRtResult; +import com.neuhis.his.mapper.winlis.LasRtResultMapper; +import com.neuhis.his.service.winlis.ILasRtResultService; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.enums.DataSourceType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.common.core.text.Convert; + +/** + * 常规检验结果Service业务层处理 + * + * @author ruoyi + * @date 2025-03-05 + */ +@Service +@DataSource(value = DataSourceType.WINLIS) +public class LasRtResultServiceImpl implements ILasRtResultService +{ + @Autowired + private LasRtResultMapper lasRtResultMapper; + + /** + * 查询常规检验结果 + * + * @param testdate 常规检验结果主键 + * @return 常规检验结果 + */ + @Override + public LasRtResult selectLasRtResultByTestdate(String testdate) + { + return lasRtResultMapper.selectLasRtResultByTestdate(testdate); + } + + /** + * 查询常规检验结果列表 + * + * @param lasRtResult 常规检验结果 + * @return 常规检验结果 + */ + @Override + public List selectLasRtResultList(LasRtResult lasRtResult) + { + return lasRtResultMapper.selectLasRtResultList(lasRtResult); + } + + /** + * 新增常规检验结果 + * + * @param lasRtResult 常规检验结果 + * @return 结果 + */ + @Override + public int insertLasRtResult(LasRtResult lasRtResult) + { + return lasRtResultMapper.insertLasRtResult(lasRtResult); + } + + /** + * 修改常规检验结果 + * + * @param lasRtResult 常规检验结果 + * @return 结果 + */ + @Override + public int updateLasRtResult(LasRtResult lasRtResult) + { + return lasRtResultMapper.updateLasRtResult(lasRtResult); + } + + /** + * 批量删除常规检验结果 + * + * @param testdates 需要删除的常规检验结果主键 + * @return 结果 + */ + @Override + public int deleteLasRtResultByTestdates(String testdates) + { + return lasRtResultMapper.deleteLasRtResultByTestdates(Convert.toStrArray(testdates)); + } + + /** + * 删除常规检验结果信息 + * + * @param testdate 常规检验结果主键 + * @return 结果 + */ + @Override + public int deleteLasRtResultByTestdate(String testdate) + { + return lasRtResultMapper.deleteLasRtResultByTestdate(testdate); + } +} diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/winlis/LasSapSampleregServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/winlis/LasSapSampleregServiceImpl.java new file mode 100644 index 000000000..7a1548675 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/winlis/LasSapSampleregServiceImpl.java @@ -0,0 +1,158 @@ +package com.neuhis.his.service.impl.winlis; + +import java.util.List; + +import com.neuhis.his.domain.entity.winlis.LasSapSamplereg; +import com.neuhis.his.mapper.winlis.LasSapSampleregMapper; +import com.neuhis.his.service.winlis.ILasSapSampleregService; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.enums.DataSourceType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.common.core.text.Convert; + +/** + * 样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) +Service业务层处理 + * + * @author ruoyi + * @date 2025-03-05 + */ +@DataSource(value = DataSourceType.WINLIS) +@Service +public class LasSapSampleregServiceImpl implements ILasSapSampleregService +{ + @Autowired + private LasSapSampleregMapper lasSapSampleregMapper; + + /** + * 查询样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + + * + * @param testdate 样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) +主键 + * @return 样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + + */ + @Override + public LasSapSamplereg selectLasSapSampleregByTestdate(String testdate) + { + return lasSapSampleregMapper.selectLasSapSampleregByTestdate(testdate); + } + + /** + * 查询样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) +列表 + * + * @param lasSapSamplereg 样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + + * @return 样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + + */ + @Override + public List selectLasSapSampleregList(LasSapSamplereg lasSapSamplereg) + { + return lasSapSampleregMapper.selectLasSapSampleregList(lasSapSamplereg); + } + + /** + * 新增样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + + * + * @param lasSapSamplereg 样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + + * @return 结果 + */ + @Override + public int insertLasSapSamplereg(LasSapSamplereg lasSapSamplereg) + { + return lasSapSampleregMapper.insertLasSapSamplereg(lasSapSamplereg); + } + + /** + * 修改样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + + * + * @param lasSapSamplereg 样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + + * @return 结果 + */ + @Override + public int updateLasSapSamplereg(LasSapSamplereg lasSapSamplereg) + { + return lasSapSampleregMapper.updateLasSapSamplereg(lasSapSamplereg); + } + + /** + * 批量删除样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + + * + * @param testdates 需要删除的样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) +主键 + * @return 结果 + */ + @Override + public int deleteLasSapSampleregByTestdates(String testdates) + { + return lasSapSampleregMapper.deleteLasSapSampleregByTestdates(Convert.toStrArray(testdates)); + } + + /** + * 删除样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) +信息 + * + * @param testdate 样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) +主键 + * @return 结果 + */ + @Override + public int deleteLasSapSampleregByTestdate(String testdate) + { + return lasSapSampleregMapper.deleteLasSapSampleregByTestdate(testdate); + } +} diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/winlis/WinLisServiceImpl.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/winlis/WinLisServiceImpl.java index 7f0783242..0750a8cd6 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/winlis/WinLisServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/impl/winlis/WinLisServiceImpl.java @@ -1,6 +1,6 @@ package com.neuhis.his.service.impl.winlis; -import com.neuhis.his.service.lis.IWinLisService; +import com.neuhis.his.service.winlis.IWinLisService; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; import org.springframework.stereotype.Service; @@ -12,7 +12,7 @@ import org.springframework.stereotype.Service; * @date 2025/3/4 17:38 **/ @Service -@DataSource(value = DataSourceType.DB2) +@DataSource(value = DataSourceType.WINLIS) public class WinLisServiceImpl implements IWinLisService { @Override public String getLisCaOriginText(String testdate, String barcode, String machineid) { diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/winlis/ILasRtResultService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/winlis/ILasRtResultService.java new file mode 100644 index 000000000..58d794bb5 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/winlis/ILasRtResultService.java @@ -0,0 +1,62 @@ +package com.neuhis.his.service.winlis; + +import com.neuhis.his.domain.entity.winlis.LasRtResult; + +import java.util.List; + +/** + * 常规检验结果Service接口 + * + * @author ruoyi + * @date 2025-03-05 + */ +public interface ILasRtResultService +{ + /** + * 查询常规检验结果 + * + * @param testdate 常规检验结果主键 + * @return 常规检验结果 + */ + public LasRtResult selectLasRtResultByTestdate(String testdate); + + /** + * 查询常规检验结果列表 + * + * @param lasRtResult 常规检验结果 + * @return 常规检验结果集合 + */ + public List selectLasRtResultList(LasRtResult lasRtResult); + + /** + * 新增常规检验结果 + * + * @param lasRtResult 常规检验结果 + * @return 结果 + */ + public int insertLasRtResult(LasRtResult lasRtResult); + + /** + * 修改常规检验结果 + * + * @param lasRtResult 常规检验结果 + * @return 结果 + */ + public int updateLasRtResult(LasRtResult lasRtResult); + + /** + * 批量删除常规检验结果 + * + * @param testdates 需要删除的常规检验结果主键集合 + * @return 结果 + */ + public int deleteLasRtResultByTestdates(String testdates); + + /** + * 删除常规检验结果信息 + * + * @param testdate 常规检验结果主键 + * @return 结果 + */ + public int deleteLasRtResultByTestdate(String testdate); +} diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/winlis/ILasSapSampleregService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/winlis/ILasSapSampleregService.java new file mode 100644 index 000000000..21ea4cf87 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/winlis/ILasSapSampleregService.java @@ -0,0 +1,122 @@ +package com.neuhis.his.service.winlis; + +import com.neuhis.his.domain.entity.winlis.LasSapSamplereg; + +import java.util.List; + +/** + * 样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) +Service接口 + * + * @author ruoyi + * @date 2025-03-05 + */ +public interface ILasSapSampleregService +{ + /** + * 查询样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + + * + * @param testdate 样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) +主键 + * @return 样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + + */ + public LasSapSamplereg selectLasSapSampleregByTestdate(String testdate); + + /** + * 查询样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) +列表 + * + * @param lasSapSamplereg 样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + + * @return 样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) +集合 + */ + public List selectLasSapSampleregList(LasSapSamplereg lasSapSamplereg); + + /** + * 新增样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + + * + * @param lasSapSamplereg 样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + + * @return 结果 + */ + public int insertLasSapSamplereg(LasSapSamplereg lasSapSamplereg); + + /** + * 修改样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + + * + * @param lasSapSamplereg 样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + + * @return 结果 + */ + public int updateLasSapSamplereg(LasSapSamplereg lasSapSamplereg); + + /** + * 批量删除样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) + + * + * @param testdates 需要删除的样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) +主键集合 + * @return 结果 + */ + public int deleteLasSapSampleregByTestdates(String testdates); + + /** + * 删除样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) +信息 + * + * @param testdate 样本核收过程： + 1、样本基本信息插入此中 + 2、项目核收信息插入LAS_COM_SAMPLEITEM中 + 3、将要收费项目信息插入LAS_SAP_ITEMCHARGE(如果没登记,就向该插入) +主键 + * @return 结果 + */ + public int deleteLasSapSampleregByTestdate(String testdate); +} diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/service/lis/IWinLisService.java b/ruoyi-admin/src/main/java/com/neuhis/his/service/winlis/IWinLisService.java similarity index 90% rename from ruoyi-admin/src/main/java/com/neuhis/his/service/lis/IWinLisService.java rename to ruoyi-admin/src/main/java/com/neuhis/his/service/winlis/IWinLisService.java index 50c401993..10e3c0b01 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/his/service/lis/IWinLisService.java +++ b/ruoyi-admin/src/main/java/com/neuhis/his/service/winlis/IWinLisService.java @@ -1,4 +1,4 @@ -package com.neuhis.his.service.lis; +package com.neuhis.his.service.winlis; /** * Winlis相关 diff --git a/ruoyi-admin/src/main/resources/mapper/winlis/LasRtResultMapper.xml b/ruoyi-admin/src/main/resources/mapper/winlis/LasRtResultMapper.xml new file mode 100644 index 000000000..4d2a71687 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/winlis/LasRtResultMapper.xml @@ -0,0 +1,239 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select testdate, machineid, sampleid, itemid, loincid, engname, itemname, printseq, barcode, testtime, reportvalue, rerunvalue, descvalue, resultlist, orgvalue, valuesrc, rerunflag, rangeinfo, unit, resultflag, patientid, patienttype, sampletype, testmachineid, rackcup, hisitemid, printrow, alertflag, rangelimit, checkstate, commtime, method, cutoff, sco, odvalue, memovalue, valuepro, autoconfirmsign, autoconfirminfo from las_rt_result + + + + + + + + insert into las_rt_result + + machineid, + sampleid, + itemid, + loincid, + engname, + itemname, + printseq, + barcode, + testtime, + reportvalue, + rerunvalue, + descvalue, + resultlist, + orgvalue, + valuesrc, + rerunflag, + rangeinfo, + unit, + resultflag, + patientid, + patienttype, + sampletype, + testmachineid, + rackcup, + hisitemid, + printrow, + alertflag, + rangelimit, + checkstate, + commtime, + method, + cutoff, + sco, + odvalue, + memovalue, + valuepro, + autoconfirmsign, + autoconfirminfo, + + + #{machineid}, + #{sampleid}, + #{itemid}, + #{loincid}, + #{engname}, + #{itemname}, + #{printseq}, + #{barcode}, + #{testtime}, + #{reportvalue}, + #{rerunvalue}, + #{descvalue}, + #{resultlist}, + #{orgvalue}, + #{valuesrc}, + #{rerunflag}, + #{rangeinfo}, + #{unit}, + #{resultflag}, + #{patientid}, + #{patienttype}, + #{sampletype}, + #{testmachineid}, + #{rackcup}, + #{hisitemid}, + #{printrow}, + #{alertflag}, + #{rangelimit}, + #{checkstate}, + #{commtime}, + #{method}, + #{cutoff}, + #{sco}, + #{odvalue}, + #{memovalue}, + #{valuepro}, + #{autoconfirmsign}, + #{autoconfirminfo}, + + + + + update las_rt_result + + machineid = #{machineid}, + sampleid = #{sampleid}, + itemid = #{itemid}, + loincid = #{loincid}, + engname = #{engname}, + itemname = #{itemname}, + printseq = #{printseq}, + barcode = #{barcode}, + testtime = #{testtime}, + reportvalue = #{reportvalue}, + rerunvalue = #{rerunvalue}, + descvalue = #{descvalue}, + resultlist = #{resultlist}, + orgvalue = #{orgvalue}, + valuesrc = #{valuesrc}, + rerunflag = #{rerunflag}, + rangeinfo = #{rangeinfo}, + unit = #{unit}, + resultflag = #{resultflag}, + patientid = #{patientid}, + patienttype = #{patienttype}, + sampletype = #{sampletype}, + testmachineid = #{testmachineid}, + rackcup = #{rackcup}, + hisitemid = #{hisitemid}, + printrow = #{printrow}, + alertflag = #{alertflag}, + rangelimit = #{rangelimit}, + checkstate = #{checkstate}, + commtime = #{commtime}, + method = #{method}, + cutoff = #{cutoff}, + sco = #{sco}, + odvalue = #{odvalue}, + memovalue = #{memovalue}, + valuepro = #{valuepro}, + autoconfirmsign = #{autoconfirmsign}, + autoconfirminfo = #{autoconfirminfo}, + + where testdate = #{testdate} + + + + delete from las_rt_result where testdate = #{testdate} + + + + delete from las_rt_result where testdate in + + #{testdate} + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/winlis/LasSapSampleregMapper.xml b/ruoyi-admin/src/main/resources/mapper/winlis/LasSapSampleregMapper.xml new file mode 100644 index 000000000..805db4218 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/winlis/LasSapSampleregMapper.xml @@ -0,0 +1,530 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select testdate, machineid, sampleid, barcode, patienttype, patientid, patientseq, patientname, patientsex, patientage, patientageunit, patienttel, patientbedno, patientidenno, patientrace, patientsite, execsqn, emc, hisitemidlist, hisitemnamelist, hisitemprice, doctorid, doctorname, deptid, deptname, ordertime, execdeptid, execdeptname, wardid, wardname, sampletype, urineqty, samplestate, sampleposition, diagnosis, confirmstate, printstate, alertstate, state, testtype, groupid, nurseid, nursename, sampletime, senderid, sendername, sendtime, sendformid, inceptorid, inceptorname, incepttime, accepterid, acceptername, accepttime, approverid, approvername, approvetime, memo, rackcup, printedtime, printerid, printername, checktime, resulttime, hospitalid, sampleid2, lismemo, birthday, extrainfo, planitemcount, actualitemcount, testeditemcount, ishighrisk, isgcp, barcode2, barprinttime, documenttime, documentid, documentname, reporttime, samplegetname, samplegetid, state2, lsptestform, execsqn2, diagnosisid, patientid2, patientid3, patientinfo, autoconfirminfo, barcodememo, tjflag, menstrualcycle, translationinfo, mixcode, passportno, patientnameen from las_sap_samplereg + + + + + + + + insert into las_sap_samplereg + + machineid, + sampleid, + barcode, + patienttype, + patientid, + patientseq, + patientname, + patientsex, + patientage, + patientageunit, + patienttel, + patientbedno, + patientidenno, + patientrace, + patientsite, + execsqn, + emc, + hisitemidlist, + hisitemnamelist, + hisitemprice, + doctorid, + doctorname, + deptid, + deptname, + ordertime, + execdeptid, + execdeptname, + wardid, + wardname, + sampletype, + urineqty, + samplestate, + sampleposition, + diagnosis, + confirmstate, + printstate, + alertstate, + state, + testtype, + groupid, + nurseid, + nursename, + sampletime, + senderid, + sendername, + sendtime, + sendformid, + inceptorid, + inceptorname, + incepttime, + accepterid, + acceptername, + accepttime, + approverid, + approvername, + approvetime, + memo, + rackcup, + printedtime, + printerid, + printername, + checktime, + resulttime, + hospitalid, + sampleid2, + lismemo, + birthday, + extrainfo, + planitemcount, + actualitemcount, + testeditemcount, + ishighrisk, + isgcp, + barcode2, + barprinttime, + documenttime, + documentid, + documentname, + reporttime, + samplegetname, + samplegetid, + state2, + lsptestform, + execsqn2, + diagnosisid, + patientid2, + patientid3, + patientinfo, + autoconfirminfo, + barcodememo, + tjflag, + menstrualcycle, + translationinfo, + mixcode, + passportno, + patientnameen, + + + #{machineid}, + #{sampleid}, + #{barcode}, + #{patienttype}, + #{patientid}, + #{patientseq}, + #{patientname}, + #{patientsex}, + #{patientage}, + #{patientageunit}, + #{patienttel}, + #{patientbedno}, + #{patientidenno}, + #{patientrace}, + #{patientsite}, + #{execsqn}, + #{emc}, + #{hisitemidlist}, + #{hisitemnamelist}, + #{hisitemprice}, + #{doctorid}, + #{doctorname}, + #{deptid}, + #{deptname}, + #{ordertime}, + #{execdeptid}, + #{execdeptname}, + #{wardid}, + #{wardname}, + #{sampletype}, + #{urineqty}, + #{samplestate}, + #{sampleposition}, + #{diagnosis}, + #{confirmstate}, + #{printstate}, + #{alertstate}, + #{state}, + #{testtype}, + #{groupid}, + #{nurseid}, + #{nursename}, + #{sampletime}, + #{senderid}, + #{sendername}, + #{sendtime}, + #{sendformid}, + #{inceptorid}, + #{inceptorname}, + #{incepttime}, + #{accepterid}, + #{acceptername}, + #{accepttime}, + #{approverid}, + #{approvername}, + #{approvetime}, + #{memo}, + #{rackcup}, + #{printedtime}, + #{printerid}, + #{printername}, + #{checktime}, + #{resulttime}, + #{hospitalid}, + #{sampleid2}, + #{lismemo}, + #{birthday}, + #{extrainfo}, + #{planitemcount}, + #{actualitemcount}, + #{testeditemcount}, + #{ishighrisk}, + #{isgcp}, + #{barcode2}, + #{barprinttime}, + #{documenttime}, + #{documentid}, + #{documentname}, + #{reporttime}, + #{samplegetname}, + #{samplegetid}, + #{state2}, + #{lsptestform}, + #{execsqn2}, + #{diagnosisid}, + #{patientid2}, + #{patientid3}, + #{patientinfo}, + #{autoconfirminfo}, + #{barcodememo}, + #{tjflag}, + #{menstrualcycle}, + #{translationinfo}, + #{mixcode}, + #{passportno}, + #{patientnameen}, + + + + + update las_sap_samplereg + + machineid = #{machineid}, + sampleid = #{sampleid}, + barcode = #{barcode}, + patienttype = #{patienttype}, + patientid = #{patientid}, + patientseq = #{patientseq}, + patientname = #{patientname}, + patientsex = #{patientsex}, + patientage = #{patientage}, + patientageunit = #{patientageunit}, + patienttel = #{patienttel}, + patientbedno = #{patientbedno}, + patientidenno = #{patientidenno}, + patientrace = #{patientrace}, + patientsite = #{patientsite}, + execsqn = #{execsqn}, + emc = #{emc}, + hisitemidlist = #{hisitemidlist}, + hisitemnamelist = #{hisitemnamelist}, + hisitemprice = #{hisitemprice}, + doctorid = #{doctorid}, + doctorname = #{doctorname}, + deptid = #{deptid}, + deptname = #{deptname}, + ordertime = #{ordertime}, + execdeptid = #{execdeptid}, + execdeptname = #{execdeptname}, + wardid = #{wardid}, + wardname = #{wardname}, + sampletype = #{sampletype}, + urineqty = #{urineqty}, + samplestate = #{samplestate}, + sampleposition = #{sampleposition}, + diagnosis = #{diagnosis}, + confirmstate = #{confirmstate}, + printstate = #{printstate}, + alertstate = #{alertstate}, + state = #{state}, + testtype = #{testtype}, + groupid = #{groupid}, + nurseid = #{nurseid}, + nursename = #{nursename}, + sampletime = #{sampletime}, + senderid = #{senderid}, + sendername = #{sendername}, + sendtime = #{sendtime}, + sendformid = #{sendformid}, + inceptorid = #{inceptorid}, + inceptorname = #{inceptorname}, + incepttime = #{incepttime}, + accepterid = #{accepterid}, + acceptername = #{acceptername}, + accepttime = #{accepttime}, + approverid = #{approverid}, + approvername = #{approvername}, + approvetime = #{approvetime}, + memo = #{memo}, + rackcup = #{rackcup}, + printedtime = #{printedtime}, + printerid = #{printerid}, + printername = #{printername}, + checktime = #{checktime}, + resulttime = #{resulttime}, + hospitalid = #{hospitalid}, + sampleid2 = #{sampleid2}, + lismemo = #{lismemo}, + birthday = #{birthday}, + extrainfo = #{extrainfo}, + planitemcount = #{planitemcount}, + actualitemcount = #{actualitemcount}, + testeditemcount = #{testeditemcount}, + ishighrisk = #{ishighrisk}, + isgcp = #{isgcp}, + barcode2 = #{barcode2}, + barprinttime = #{barprinttime}, + documenttime = #{documenttime}, + documentid = #{documentid}, + documentname = #{documentname}, + reporttime = #{reporttime}, + samplegetname = #{samplegetname}, + samplegetid = #{samplegetid}, + state2 = #{state2}, + lsptestform = #{lsptestform}, + execsqn2 = #{execsqn2}, + diagnosisid = #{diagnosisid}, + patientid2 = #{patientid2}, + patientid3 = #{patientid3}, + patientinfo = #{patientinfo}, + autoconfirminfo = #{autoconfirminfo}, + barcodememo = #{barcodememo}, + tjflag = #{tjflag}, + menstrualcycle = #{menstrualcycle}, + translationinfo = #{translationinfo}, + mixcode = #{mixcode}, + passportno = #{passportno}, + patientnameen = #{patientnameen}, + + where testdate = #{testdate} + + + + delete from las_sap_samplereg where testdate = #{testdate} + + + + delete from las_sap_samplereg where testdate in + + #{testdate} + + + + \ No newline at end of file