refactor: rename openhis → healthlink-his (complete rebranding)
- Maven modules: openhis-* → healthlink-his-* - Java packages: com.openhis → com.healthlink.his (3,278 files) - Configuration: context-path, DB schema, logger, package scan - Frontend: API paths /openhis/ → /healthlink-his/ (30 files) - Database: healthlink_his schema with 188 tables (copied from hisdev) - Verified: 18/18 API tests passed, 10-concurrent smoke test passed
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
package com.openhis.tool;
|
||||
package com.healthlink.his.tool;
|
||||
|
||||
import java.sql.Connection;
|
||||
import java.sql.DriverManager;
|
||||
@@ -3,8 +3,8 @@
|
||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<groupId>com.openhis</groupId>
|
||||
<artifactId>openhis-server</artifactId>
|
||||
<groupId>com.healthlink.his</groupId>
|
||||
<artifactId>healthlink-his-server</artifactId>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<groupId>com.openhis</groupId>
|
||||
<artifactId>openhis-server</artifactId>
|
||||
<groupId>com.healthlink.his</groupId>
|
||||
<artifactId>healthlink-his-server</artifactId>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@@ -163,7 +163,7 @@ public class Constants {
|
||||
/**
|
||||
* 定时任务白名单配置(仅允许访问的包名,如其他需要可以自行添加)
|
||||
*/
|
||||
public static final String[] JOB_WHITELIST_STR = {"com.openhis.quartz.task"};
|
||||
public static final String[] JOB_WHITELIST_STR = {"com.healthlink.his.quartz.task"};
|
||||
|
||||
/**
|
||||
* 定时任务违规的字符
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<groupId>com.openhis</groupId>
|
||||
<artifactId>openhis-server</artifactId>
|
||||
<groupId>com.healthlink.his</groupId>
|
||||
<artifactId>healthlink-his-server</artifactId>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
<groupId>com.openhis</groupId>
|
||||
<artifactId>openhis-server</artifactId>
|
||||
<groupId>com.healthlink.his</groupId>
|
||||
<artifactId>healthlink-his-server</artifactId>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ import java.util.TimeZone;
|
||||
// 表示通过aop框架暴露该代理对象,AopContext能够访问
|
||||
@EnableAspectJAutoProxy(exposeProxy = true)
|
||||
// 指定要扫描的Mapper类的包的路径
|
||||
@MapperScan({"com.core.**.mapper", "com.openhis.**.mapper"})
|
||||
@MapperScan({"com.core.**.mapper", "com.healthlink.his.**.mapper"})
|
||||
public class ApplicationConfig {
|
||||
private static final Logger log = LoggerFactory.getLogger(ApplicationConfig.class);
|
||||
|
||||
|
||||
@@ -176,7 +176,7 @@ public class MybatisPlusConfig {
|
||||
sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
|
||||
.getResources("classpath*:mapper/**/*Mapper.xml"));
|
||||
// 设置 typeAliases 包路径
|
||||
sessionFactory.setTypeAliasesPackage("com.core.**.domain,com.openhis.**.domain");
|
||||
sessionFactory.setTypeAliasesPackage("com.core.**.domain,com.healthlink.his.**.domain");
|
||||
|
||||
// 配置 MyBatis-Plus
|
||||
MybatisConfiguration configuration = new MybatisConfiguration();
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<groupId>com.openhis</groupId>
|
||||
<artifactId>openhis-server</artifactId>
|
||||
<groupId>com.healthlink.his</groupId>
|
||||
<artifactId>healthlink-his-server</artifactId>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@@ -3,7 +3,7 @@ gen:
|
||||
# 作者
|
||||
author: system
|
||||
# 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
|
||||
packageName: com.openhis
|
||||
packageName: com.healthlink.his
|
||||
# 自动去除表前缀,默认是false
|
||||
autoRemovePre: true
|
||||
# 表前缀(生成类名不会包含表前缀,多个用逗号分隔)
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<groupId>com.openhis</groupId>
|
||||
<artifactId>openhis-server</artifactId>
|
||||
<groupId>com.healthlink.his</groupId>
|
||||
<artifactId>healthlink-his-server</artifactId>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<groupId>com.openhis</groupId>
|
||||
<artifactId>openhis-server</artifactId>
|
||||
<groupId>com.healthlink.his</groupId>
|
||||
<artifactId>healthlink-his-server</artifactId>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<groupId>com.openhis</groupId>
|
||||
<artifactId>openhis-server</artifactId>
|
||||
<groupId>com.healthlink.his</groupId>
|
||||
<artifactId>healthlink-his-server</artifactId>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>openhis-application</artifactId>
|
||||
<artifactId>healthlink-his-application</artifactId>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
|
||||
<description>
|
||||
@@ -56,8 +56,8 @@
|
||||
|
||||
<!-- 领域-->
|
||||
<dependency>
|
||||
<groupId>com.openhis</groupId>
|
||||
<artifactId>openhis-domain</artifactId>
|
||||
<groupId>com.healthlink.his</groupId>
|
||||
<artifactId>healthlink-his-domain</artifactId>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
</dependency>
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.openhis;
|
||||
package com.healthlink.his;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import com.openhis.web.ybmanage.config.YbServiceConfig;
|
||||
import com.healthlink.his.web.ybmanage.config.YbServiceConfig;
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.boot.flyway.autoconfigure.FlywayAutoConfiguration;
|
||||
@@ -19,7 +19,7 @@ import java.net.UnknownHostException;
|
||||
@SpringBootApplication(exclude = {
|
||||
DataSourceAutoConfiguration.class,
|
||||
FlywayAutoConfiguration.class
|
||||
}, scanBasePackages = {"com.core", "com.openhis"})
|
||||
}, scanBasePackages = {"com.core", "com.healthlink.his"})
|
||||
@EnableConfigurationProperties(YbServiceConfig.class)
|
||||
@EnableAsync
|
||||
public class OpenHisApplication {
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.config;
|
||||
package com.healthlink.his.config;
|
||||
|
||||
import com.alibaba.druid.pool.DruidDataSource;
|
||||
import org.flywaydb.core.Flyway;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.config;
|
||||
package com.healthlink.his.config;
|
||||
|
||||
import lombok.Data;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.quartz.controller;
|
||||
package com.healthlink.his.quartz.controller;
|
||||
|
||||
import com.core.common.annotation.Log;
|
||||
import com.core.common.constant.Constants;
|
||||
@@ -11,8 +11,8 @@ import com.core.common.utils.StringUtils;
|
||||
import com.core.common.utils.poi.ExcelUtil;
|
||||
import com.core.quartz.domain.SysJob;
|
||||
import com.core.quartz.util.CronUtils;
|
||||
import com.openhis.quartz.service.ISysJobService;
|
||||
import com.openhis.quartz.util.ScheduleUtils;
|
||||
import com.healthlink.his.quartz.service.ISysJobService;
|
||||
import com.healthlink.his.quartz.util.ScheduleUtils;
|
||||
import org.quartz.SchedulerException;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.quartz.controller;
|
||||
package com.healthlink.his.quartz.controller;
|
||||
|
||||
import com.core.common.annotation.Log;
|
||||
import com.core.common.core.controller.BaseController;
|
||||
@@ -7,7 +7,7 @@ import com.core.common.core.page.TableDataInfo;
|
||||
import com.core.common.enums.BusinessType;
|
||||
import com.core.common.utils.poi.ExcelUtil;
|
||||
import com.core.quartz.domain.SysJobLog;
|
||||
import com.openhis.quartz.service.ISysJobLogService;
|
||||
import com.healthlink.his.quartz.service.ISysJobLogService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.quartz.service;
|
||||
package com.healthlink.his.quartz.service;
|
||||
|
||||
import com.core.quartz.domain.SysJobLog;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.quartz.service;
|
||||
package com.healthlink.his.quartz.service;
|
||||
|
||||
import com.core.common.exception.job.TaskException;
|
||||
import com.core.quartz.domain.SysJob;
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.openhis.quartz.service.impl;
|
||||
package com.healthlink.his.quartz.service.impl;
|
||||
|
||||
import com.core.quartz.domain.SysJobLog;
|
||||
import com.core.quartz.mapper.SysJobLogMapper;
|
||||
import com.openhis.quartz.service.ISysJobLogService;
|
||||
import com.healthlink.his.quartz.service.ISysJobLogService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package com.openhis.quartz.service.impl;
|
||||
package com.healthlink.his.quartz.service.impl;
|
||||
|
||||
import com.core.common.constant.ScheduleConstants;
|
||||
import com.core.common.exception.job.TaskException;
|
||||
import com.core.quartz.domain.SysJob;
|
||||
import com.core.quartz.mapper.SysJobMapper;
|
||||
import com.core.quartz.util.CronUtils;
|
||||
import com.openhis.quartz.service.ISysJobService;
|
||||
import com.openhis.quartz.util.ScheduleUtils;
|
||||
import com.healthlink.his.quartz.service.ISysJobService;
|
||||
import com.healthlink.his.quartz.util.ScheduleUtils;
|
||||
import org.quartz.JobDataMap;
|
||||
import org.quartz.JobKey;
|
||||
import org.quartz.Scheduler;
|
||||
@@ -1,10 +1,10 @@
|
||||
/*
|
||||
* Copyright ©2023 CJB-CNIT Team. All rights reserved
|
||||
*/
|
||||
package com.openhis.quartz.task;
|
||||
package com.healthlink.his.quartz.task;
|
||||
|
||||
import com.core.framework.config.TenantContext;
|
||||
import com.openhis.web.inhospitalnursestation.appservice.IEncounterAutoRollAppService;
|
||||
import com.healthlink.his.web.inhospitalnursestation.appservice.IEncounterAutoRollAppService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.openhis.quartz.task;
|
||||
package com.healthlink.his.quartz.task;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.core.common.utils.DateUtils;
|
||||
import com.openhis.web.basedatamanage.appservice.IOrganizationAppService;
|
||||
import com.healthlink.his.web.basedatamanage.appservice.IOrganizationAppService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* Copyright ©2023 CJB-CNIT Team. All rights reserved
|
||||
*/
|
||||
package com.openhis.quartz.task;
|
||||
package com.healthlink.his.quartz.task;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
@@ -9,12 +9,12 @@ import com.core.common.enums.DelFlag;
|
||||
import com.core.common.utils.AssignSeqUtil;
|
||||
import com.core.common.utils.DateUtils;
|
||||
import com.core.framework.config.TenantContext;
|
||||
import com.openhis.common.enums.AssignSeqEnum;
|
||||
import com.openhis.document.domain.DocInventoryItemStatic;
|
||||
import com.openhis.document.service.IDocInventoryItemStaticService;
|
||||
import com.openhis.web.inventorymanage.appservice.IProductDetailAppService;
|
||||
import com.openhis.web.inventorymanage.dto.ProductDetailPageDto;
|
||||
import com.openhis.web.inventorymanage.dto.ProductDetailSearchParam;
|
||||
import com.healthlink.his.common.enums.AssignSeqEnum;
|
||||
import com.healthlink.his.document.domain.DocInventoryItemStatic;
|
||||
import com.healthlink.his.document.service.IDocInventoryItemStaticService;
|
||||
import com.healthlink.his.web.inventorymanage.appservice.IProductDetailAppService;
|
||||
import com.healthlink.his.web.inventorymanage.dto.ProductDetailPageDto;
|
||||
import com.healthlink.his.web.inventorymanage.dto.ProductDetailSearchParam;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@@ -1,12 +1,12 @@
|
||||
package com.openhis.quartz.task;
|
||||
package com.healthlink.his.quartz.task;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import com.core.common.utils.StringUtils;
|
||||
import com.core.framework.config.TenantContext;
|
||||
import com.openhis.administration.domain.Location;
|
||||
import com.openhis.administration.service.ILocationService;
|
||||
import com.healthlink.his.administration.domain.Location;
|
||||
import com.healthlink.his.administration.service.ILocationService;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.quartz.util;
|
||||
package com.healthlink.his.quartz.util;
|
||||
|
||||
import com.core.common.constant.Constants;
|
||||
import com.core.common.constant.ScheduleConstants;
|
||||
@@ -8,7 +8,7 @@ import com.core.common.utils.bean.BeanUtils;
|
||||
import com.core.common.utils.spring.SpringUtils;
|
||||
import com.core.quartz.domain.SysJob;
|
||||
import com.core.quartz.domain.SysJobLog;
|
||||
import com.openhis.quartz.service.ISysJobLogService;
|
||||
import com.healthlink.his.quartz.service.ISysJobLogService;
|
||||
import org.quartz.Job;
|
||||
import org.quartz.JobExecutionContext;
|
||||
import org.quartz.JobExecutionException;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.quartz.util;
|
||||
package com.healthlink.his.quartz.util;
|
||||
|
||||
import com.core.quartz.domain.SysJob;
|
||||
import com.core.quartz.util.JobInvokeUtil;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.quartz.util;
|
||||
package com.healthlink.his.quartz.util;
|
||||
|
||||
import com.core.quartz.domain.SysJob;
|
||||
import com.core.quartz.util.JobInvokeUtil;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.quartz.util;
|
||||
package com.healthlink.his.quartz.util;
|
||||
|
||||
import com.core.common.constant.Constants;
|
||||
import com.core.common.constant.ScheduleConstants;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.rule.component;
|
||||
package com.healthlink.his.rule.component;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.rule.component;
|
||||
package com.healthlink.his.rule.component;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.rule.component;
|
||||
package com.healthlink.his.rule.component;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.openhis.web.Inspection.appservice;
|
||||
package com.healthlink.his.web.Inspection.appservice;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.administration.domain.Instrument;
|
||||
import com.openhis.web.Inspection.dto.InstrumentSelParam;
|
||||
import com.healthlink.his.administration.domain.Instrument;
|
||||
import com.healthlink.his.web.Inspection.dto.InstrumentSelParam;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.openhis.web.Inspection.appservice;
|
||||
package com.healthlink.his.web.Inspection.appservice;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.web.Inspection.dto.ReportResultManageDto;
|
||||
import com.healthlink.his.web.Inspection.dto.ReportResultManageDto;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.openhis.web.Inspection.appservice;
|
||||
package com.healthlink.his.web.Inspection.appservice;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.web.Inspection.dto.LisConfigManageDto;
|
||||
import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam;
|
||||
import com.healthlink.his.web.Inspection.dto.LisConfigManageDto;
|
||||
import com.healthlink.his.web.datadictionary.dto.DiagnosisTreatmentSelParam;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.openhis.web.Inspection.appservice;
|
||||
package com.healthlink.his.web.Inspection.appservice;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.administration.domain.ObservationDefinition;
|
||||
import com.openhis.web.Inspection.dto.ObservationDefSelParam;
|
||||
import com.healthlink.his.administration.domain.ObservationDefinition;
|
||||
import com.healthlink.his.web.Inspection.dto.ObservationDefSelParam;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.openhis.web.Inspection.appservice;
|
||||
package com.healthlink.his.web.Inspection.appservice;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.web.Inspection.dto.SampleCollectManageDto;
|
||||
import com.openhis.web.Inspection.dto.SampleCollectStatusRequest;
|
||||
import com.healthlink.his.web.Inspection.dto.SampleCollectManageDto;
|
||||
import com.healthlink.his.web.Inspection.dto.SampleCollectStatusRequest;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.openhis.web.Inspection.appservice;
|
||||
package com.healthlink.his.web.Inspection.appservice;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.administration.domain.SpecimenDefinition;
|
||||
import com.openhis.web.Inspection.dto.SpecimenDefSelParam;
|
||||
import com.healthlink.his.administration.domain.SpecimenDefinition;
|
||||
import com.healthlink.his.web.Inspection.dto.SpecimenDefSelParam;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
@@ -1,22 +1,22 @@
|
||||
package com.openhis.web.Inspection.appservice.impl;
|
||||
package com.healthlink.his.web.Inspection.appservice.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.core.common.core.domain.R;
|
||||
import com.core.common.utils.MessageUtils;
|
||||
import com.openhis.administration.domain.Instrument;
|
||||
import com.openhis.administration.mapper.InstrumentMapper;
|
||||
import com.openhis.administration.service.IInstrumentService;
|
||||
import com.openhis.common.constant.PromptMsgConstant;
|
||||
import com.openhis.common.enums.InstrumentCategory;
|
||||
import com.openhis.common.enums.PublicationStatus;
|
||||
import com.openhis.common.utils.EnumUtils;
|
||||
import com.openhis.common.utils.HisPageUtils;
|
||||
import com.openhis.common.utils.HisQueryUtils;
|
||||
import com.openhis.web.Inspection.appservice.IInstrumentManageAppService;
|
||||
import com.openhis.web.Inspection.dto.InstrumentManageDto;
|
||||
import com.openhis.web.Inspection.dto.InstrumentManageInitDto;
|
||||
import com.openhis.web.Inspection.dto.InstrumentSelParam;
|
||||
import com.healthlink.his.administration.domain.Instrument;
|
||||
import com.healthlink.his.administration.mapper.InstrumentMapper;
|
||||
import com.healthlink.his.administration.service.IInstrumentService;
|
||||
import com.healthlink.his.common.constant.PromptMsgConstant;
|
||||
import com.healthlink.his.common.enums.InstrumentCategory;
|
||||
import com.healthlink.his.common.enums.PublicationStatus;
|
||||
import com.healthlink.his.common.utils.EnumUtils;
|
||||
import com.healthlink.his.common.utils.HisPageUtils;
|
||||
import com.healthlink.his.common.utils.HisQueryUtils;
|
||||
import com.healthlink.his.web.Inspection.appservice.IInstrumentManageAppService;
|
||||
import com.healthlink.his.web.Inspection.dto.InstrumentManageDto;
|
||||
import com.healthlink.his.web.Inspection.dto.InstrumentManageInitDto;
|
||||
import com.healthlink.his.web.Inspection.dto.InstrumentSelParam;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
@@ -51,12 +51,12 @@ public class InstrumentManageAppServiceImpl implements IInstrumentManageAppServi
|
||||
.collect(Collectors.toList());
|
||||
instrumentManageInitDto.setStatusFlagOptions(statusEnumOptions);
|
||||
// 获取仪器种类
|
||||
List<InstrumentManageInitDto.InstrumentType> typeList = Stream.of(com.openhis.common.enums.InstrumentCategory.values())
|
||||
List<InstrumentManageInitDto.InstrumentType> typeList = Stream.of(com.healthlink.his.common.enums.InstrumentCategory.values())
|
||||
.map(status -> new InstrumentManageInitDto.InstrumentType(status.getValue(), status.getInfo()))
|
||||
.collect(Collectors.toList());
|
||||
instrumentManageInitDto.setInstrumentTypeList(typeList);
|
||||
// 获取仪器状态
|
||||
List<InstrumentManageInitDto.InstrumentStatusEnumOption> InstrumentStatusEnumOptions = Stream.of(com.openhis.common.enums.InstrumentStatus.values())
|
||||
List<InstrumentManageInitDto.InstrumentStatusEnumOption> InstrumentStatusEnumOptions = Stream.of(com.healthlink.his.common.enums.InstrumentStatus.values())
|
||||
.map(status -> new InstrumentManageInitDto.InstrumentStatusEnumOption(status.getValue(), status.getInfo()))
|
||||
.collect(Collectors.toList());
|
||||
instrumentManageInitDto.setInstrumentStatusEnumList(InstrumentStatusEnumOptions);
|
||||
@@ -1,15 +1,15 @@
|
||||
package com.openhis.web.Inspection.appservice.impl;
|
||||
package com.healthlink.his.web.Inspection.appservice.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.common.enums.AdministrativeGender;
|
||||
import com.openhis.common.utils.EnumUtils;
|
||||
import com.openhis.common.utils.HisQueryUtils;
|
||||
import com.openhis.web.Inspection.appservice.ILaboratoryManageAppService;
|
||||
import com.openhis.web.Inspection.dto.ReportResultManageDto;
|
||||
import com.openhis.web.Inspection.mapper.LisReportMapper;
|
||||
import com.healthlink.his.common.enums.AdministrativeGender;
|
||||
import com.healthlink.his.common.utils.EnumUtils;
|
||||
import com.healthlink.his.common.utils.HisQueryUtils;
|
||||
import com.healthlink.his.web.Inspection.appservice.ILaboratoryManageAppService;
|
||||
import com.healthlink.his.web.Inspection.dto.ReportResultManageDto;
|
||||
import com.healthlink.his.web.Inspection.mapper.LisReportMapper;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@@ -1,32 +1,32 @@
|
||||
package com.openhis.web.Inspection.appservice.impl;
|
||||
package com.healthlink.his.web.Inspection.appservice.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.core.common.core.domain.R;
|
||||
import com.core.common.utils.SecurityUtils;
|
||||
import com.openhis.administration.domain.Device;
|
||||
import com.openhis.administration.domain.DeviceDefinition;
|
||||
import com.openhis.administration.domain.ObservationDefinition;
|
||||
import com.openhis.administration.domain.SpecimenDefinition;
|
||||
import com.openhis.administration.service.IDeviceDefinitionService;
|
||||
import com.openhis.administration.service.IDeviceService;
|
||||
import com.openhis.administration.service.IObservationDefinitionService;
|
||||
import com.openhis.administration.service.ISpecimenDefinitionService;
|
||||
import com.openhis.common.enums.SpecCollectStatus;
|
||||
import com.openhis.common.utils.HisQueryUtils;
|
||||
import com.openhis.lab.domain.*;
|
||||
import com.openhis.lab.mapper.ActivityDefDeviceDefMapper;
|
||||
import com.openhis.lab.mapper.ActivityDefObservationDefMapper;
|
||||
import com.openhis.lab.mapper.ActivityDefSpecimenDefMapper;
|
||||
import com.openhis.lab.service.IObservationService;
|
||||
import com.openhis.lab.service.ISpecimenService;
|
||||
import com.openhis.web.Inspection.appservice.ILisConfigManageAppService;
|
||||
import com.openhis.web.Inspection.dto.LisConfigManageDto;
|
||||
import com.openhis.web.Inspection.dto.LisConfigManageInitDto;
|
||||
import com.openhis.web.datadictionary.dto.DiagnosisTreatmentDto;
|
||||
import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam;
|
||||
import com.openhis.web.datadictionary.mapper.ActivityDefinitionManageMapper;
|
||||
import com.healthlink.his.administration.domain.Device;
|
||||
import com.healthlink.his.administration.domain.DeviceDefinition;
|
||||
import com.healthlink.his.administration.domain.ObservationDefinition;
|
||||
import com.healthlink.his.administration.domain.SpecimenDefinition;
|
||||
import com.healthlink.his.administration.service.IDeviceDefinitionService;
|
||||
import com.healthlink.his.administration.service.IDeviceService;
|
||||
import com.healthlink.his.administration.service.IObservationDefinitionService;
|
||||
import com.healthlink.his.administration.service.ISpecimenDefinitionService;
|
||||
import com.healthlink.his.common.enums.SpecCollectStatus;
|
||||
import com.healthlink.his.common.utils.HisQueryUtils;
|
||||
import com.healthlink.his.lab.domain.*;
|
||||
import com.healthlink.his.lab.mapper.ActivityDefDeviceDefMapper;
|
||||
import com.healthlink.his.lab.mapper.ActivityDefObservationDefMapper;
|
||||
import com.healthlink.his.lab.mapper.ActivityDefSpecimenDefMapper;
|
||||
import com.healthlink.his.lab.service.IObservationService;
|
||||
import com.healthlink.his.lab.service.ISpecimenService;
|
||||
import com.healthlink.his.web.Inspection.appservice.ILisConfigManageAppService;
|
||||
import com.healthlink.his.web.Inspection.dto.LisConfigManageDto;
|
||||
import com.healthlink.his.web.Inspection.dto.LisConfigManageInitDto;
|
||||
import com.healthlink.his.web.datadictionary.dto.DiagnosisTreatmentDto;
|
||||
import com.healthlink.his.web.datadictionary.dto.DiagnosisTreatmentSelParam;
|
||||
import com.healthlink.his.web.datadictionary.mapper.ActivityDefinitionManageMapper;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.web.Inspection.appservice.impl;
|
||||
package com.healthlink.his.web.Inspection.appservice.impl;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
@@ -7,20 +7,20 @@ import com.core.common.core.domain.R;
|
||||
import com.core.common.enums.DelFlag;
|
||||
import com.core.common.utils.MessageUtils;
|
||||
import com.core.common.utils.bean.BeanUtils;
|
||||
import com.openhis.administration.domain.ObservationDefinition;
|
||||
import com.openhis.administration.mapper.ObservationDefinitionMapper;
|
||||
import com.openhis.administration.service.IInstrumentService;
|
||||
import com.openhis.administration.service.IObservationDefinitionService;
|
||||
import com.openhis.common.constant.PromptMsgConstant;
|
||||
import com.openhis.common.enums.ObservationType;
|
||||
import com.openhis.common.enums.PublicationStatus;
|
||||
import com.openhis.common.utils.EnumUtils;
|
||||
import com.openhis.common.utils.HisPageUtils;
|
||||
import com.openhis.common.utils.HisQueryUtils;
|
||||
import com.openhis.web.Inspection.appservice.IObservationManageAppService;
|
||||
import com.openhis.web.Inspection.dto.ObservationDefManageDto;
|
||||
import com.openhis.web.Inspection.dto.ObservationDefManageInitDto;
|
||||
import com.openhis.web.Inspection.dto.ObservationDefSelParam;
|
||||
import com.healthlink.his.administration.domain.ObservationDefinition;
|
||||
import com.healthlink.his.administration.mapper.ObservationDefinitionMapper;
|
||||
import com.healthlink.his.administration.service.IInstrumentService;
|
||||
import com.healthlink.his.administration.service.IObservationDefinitionService;
|
||||
import com.healthlink.his.common.constant.PromptMsgConstant;
|
||||
import com.healthlink.his.common.enums.ObservationType;
|
||||
import com.healthlink.his.common.enums.PublicationStatus;
|
||||
import com.healthlink.his.common.utils.EnumUtils;
|
||||
import com.healthlink.his.common.utils.HisPageUtils;
|
||||
import com.healthlink.his.common.utils.HisQueryUtils;
|
||||
import com.healthlink.his.web.Inspection.appservice.IObservationManageAppService;
|
||||
import com.healthlink.his.web.Inspection.dto.ObservationDefManageDto;
|
||||
import com.healthlink.his.web.Inspection.dto.ObservationDefManageInitDto;
|
||||
import com.healthlink.his.web.Inspection.dto.ObservationDefSelParam;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@@ -63,7 +63,7 @@ public class ObservationManageAppServiceImpl implements IObservationManageAppSer
|
||||
.collect(Collectors.toList());
|
||||
observationDefManageInitDto.setStatusFlagOptions(statusEnumOptions);
|
||||
//观测类型
|
||||
List<ObservationDefManageInitDto.ObservationTypeEnumOption> ObservationTypeEnumOptions = Stream.of(com.openhis.common.enums.ObservationType.values())
|
||||
List<ObservationDefManageInitDto.ObservationTypeEnumOption> ObservationTypeEnumOptions = Stream.of(com.healthlink.his.common.enums.ObservationType.values())
|
||||
.map(status -> new ObservationDefManageInitDto.ObservationTypeEnumOption(status.getValue(), status.getInfo()))
|
||||
.collect(Collectors.toList());
|
||||
observationDefManageInitDto.setObservationTypeList(ObservationTypeEnumOptions);
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.web.Inspection.appservice.impl;
|
||||
package com.healthlink.his.web.Inspection.appservice.impl;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@@ -8,16 +8,16 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.common.enums.AdministrativeGender;
|
||||
import com.openhis.common.enums.SpecCollectStatus;
|
||||
import com.openhis.common.utils.EnumUtils;
|
||||
import com.openhis.common.utils.HisQueryUtils;
|
||||
import com.openhis.lab.domain.Specimen;
|
||||
import com.openhis.lab.service.ISpecimenService;
|
||||
import com.openhis.web.Inspection.appservice.ISampleCollectAppManageAppService;
|
||||
import com.openhis.web.Inspection.dto.SampleCollectManageDto;
|
||||
import com.openhis.web.Inspection.dto.SampleCollectStatusRequest;
|
||||
import com.openhis.web.Inspection.mapper.SampleCollectMapper;
|
||||
import com.healthlink.his.common.enums.AdministrativeGender;
|
||||
import com.healthlink.his.common.enums.SpecCollectStatus;
|
||||
import com.healthlink.his.common.utils.EnumUtils;
|
||||
import com.healthlink.his.common.utils.HisQueryUtils;
|
||||
import com.healthlink.his.lab.domain.Specimen;
|
||||
import com.healthlink.his.lab.service.ISpecimenService;
|
||||
import com.healthlink.his.web.Inspection.appservice.ISampleCollectAppManageAppService;
|
||||
import com.healthlink.his.web.Inspection.dto.SampleCollectManageDto;
|
||||
import com.healthlink.his.web.Inspection.dto.SampleCollectStatusRequest;
|
||||
import com.healthlink.his.web.Inspection.mapper.SampleCollectMapper;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
package com.openhis.web.Inspection.appservice.impl;
|
||||
package com.healthlink.his.web.Inspection.appservice.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.core.common.core.domain.R;
|
||||
import com.core.common.utils.MessageUtils;
|
||||
import com.openhis.administration.domain.SpecimenDefinition;
|
||||
import com.openhis.administration.mapper.SpecimenDefinitionMapper;
|
||||
import com.openhis.administration.service.ISpecimenDefinitionService;
|
||||
import com.openhis.common.constant.PromptMsgConstant;
|
||||
import com.openhis.common.enums.PublicationStatus;
|
||||
import com.openhis.common.enums.SpecimenType;
|
||||
import com.openhis.common.utils.EnumUtils;
|
||||
import com.openhis.common.utils.HisPageUtils;
|
||||
import com.openhis.common.utils.HisQueryUtils;
|
||||
import com.openhis.web.Inspection.appservice.ISpecimenManageAppService;
|
||||
import com.openhis.web.Inspection.dto.SpecimenDefManageDto;
|
||||
import com.openhis.web.Inspection.dto.SpecimenDefManageInitDto;
|
||||
import com.openhis.web.Inspection.dto.SpecimenDefSelParam;
|
||||
import com.healthlink.his.administration.domain.SpecimenDefinition;
|
||||
import com.healthlink.his.administration.mapper.SpecimenDefinitionMapper;
|
||||
import com.healthlink.his.administration.service.ISpecimenDefinitionService;
|
||||
import com.healthlink.his.common.constant.PromptMsgConstant;
|
||||
import com.healthlink.his.common.enums.PublicationStatus;
|
||||
import com.healthlink.his.common.enums.SpecimenType;
|
||||
import com.healthlink.his.common.utils.EnumUtils;
|
||||
import com.healthlink.his.common.utils.HisPageUtils;
|
||||
import com.healthlink.his.common.utils.HisQueryUtils;
|
||||
import com.healthlink.his.web.Inspection.appservice.ISpecimenManageAppService;
|
||||
import com.healthlink.his.web.Inspection.dto.SpecimenDefManageDto;
|
||||
import com.healthlink.his.web.Inspection.dto.SpecimenDefManageInitDto;
|
||||
import com.healthlink.his.web.Inspection.dto.SpecimenDefSelParam;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package com.openhis.web.Inspection.controller;
|
||||
package com.healthlink.his.web.Inspection.controller;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.core.common.enums.DelFlag;
|
||||
import com.openhis.administration.domain.Instrument;
|
||||
import com.openhis.common.enums.PublicationStatus;
|
||||
import com.openhis.web.Inspection.appservice.IInstrumentManageAppService;
|
||||
import com.openhis.web.Inspection.dto.InstrumentSelParam;
|
||||
import com.openhis.web.Inspection.dto.InstrumentStatusRequest;
|
||||
import com.healthlink.his.administration.domain.Instrument;
|
||||
import com.healthlink.his.common.enums.PublicationStatus;
|
||||
import com.healthlink.his.web.Inspection.appservice.IInstrumentManageAppService;
|
||||
import com.healthlink.his.web.Inspection.dto.InstrumentSelParam;
|
||||
import com.healthlink.his.web.Inspection.dto.InstrumentStatusRequest;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.openhis.web.Inspection.controller;
|
||||
package com.healthlink.his.web.Inspection.controller;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.web.Inspection.appservice.ILaboratoryManageAppService;
|
||||
import com.openhis.web.Inspection.dto.ReportResultManageDto;
|
||||
import com.healthlink.his.web.Inspection.appservice.ILaboratoryManageAppService;
|
||||
import com.healthlink.his.web.Inspection.dto.ReportResultManageDto;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.openhis.web.Inspection.controller;
|
||||
package com.healthlink.his.web.Inspection.controller;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.web.Inspection.appservice.ILisConfigManageAppService;
|
||||
import com.openhis.web.Inspection.dto.LisConfigManageDto;
|
||||
import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam;
|
||||
import com.healthlink.his.web.Inspection.appservice.ILisConfigManageAppService;
|
||||
import com.healthlink.his.web.Inspection.dto.LisConfigManageDto;
|
||||
import com.healthlink.his.web.datadictionary.dto.DiagnosisTreatmentSelParam;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
@@ -1,12 +1,12 @@
|
||||
package com.openhis.web.Inspection.controller;
|
||||
package com.healthlink.his.web.Inspection.controller;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.core.common.enums.DelFlag;
|
||||
import com.openhis.administration.domain.ObservationDefinition;
|
||||
import com.openhis.common.enums.PublicationStatus;
|
||||
import com.openhis.web.Inspection.appservice.IObservationManageAppService;
|
||||
import com.openhis.web.Inspection.dto.ObservationDefSelParam;
|
||||
import com.openhis.web.Inspection.dto.ObservationDefStatusRequest;
|
||||
import com.healthlink.his.administration.domain.ObservationDefinition;
|
||||
import com.healthlink.his.common.enums.PublicationStatus;
|
||||
import com.healthlink.his.web.Inspection.appservice.IObservationManageAppService;
|
||||
import com.healthlink.his.web.Inspection.dto.ObservationDefSelParam;
|
||||
import com.healthlink.his.web.Inspection.dto.ObservationDefStatusRequest;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.openhis.web.Inspection.controller;
|
||||
package com.healthlink.his.web.Inspection.controller;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.web.Inspection.appservice.ISampleCollectAppManageAppService;
|
||||
import com.openhis.web.Inspection.dto.SampleCollectManageDto;
|
||||
import com.openhis.web.Inspection.dto.SampleCollectStatusRequest;
|
||||
import com.healthlink.his.web.Inspection.appservice.ISampleCollectAppManageAppService;
|
||||
import com.healthlink.his.web.Inspection.dto.SampleCollectManageDto;
|
||||
import com.healthlink.his.web.Inspection.dto.SampleCollectStatusRequest;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
@@ -1,12 +1,12 @@
|
||||
package com.openhis.web.Inspection.controller;
|
||||
package com.healthlink.his.web.Inspection.controller;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.core.common.enums.DelFlag;
|
||||
import com.openhis.administration.domain.SpecimenDefinition;
|
||||
import com.openhis.common.enums.PublicationStatus;
|
||||
import com.openhis.web.Inspection.appservice.ISpecimenManageAppService;
|
||||
import com.openhis.web.Inspection.dto.SpecimenDefSelParam;
|
||||
import com.openhis.web.Inspection.dto.SpecimenDefStatusRequest;
|
||||
import com.healthlink.his.administration.domain.SpecimenDefinition;
|
||||
import com.healthlink.his.common.enums.PublicationStatus;
|
||||
import com.healthlink.his.web.Inspection.appservice.ISpecimenManageAppService;
|
||||
import com.healthlink.his.web.Inspection.dto.SpecimenDefSelParam;
|
||||
import com.healthlink.his.web.Inspection.dto.SpecimenDefStatusRequest;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
package com.healthlink.his.web.Inspection.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import com.openhis.common.annotation.Dict;
|
||||
import com.healthlink.his.common.annotation.Dict;
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
package com.healthlink.his.web.Inspection.dto;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
package com.healthlink.his.web.Inspection.dto;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
package com.healthlink.his.web.Inspection.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
package com.healthlink.his.web.Inspection.dto;
|
||||
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import com.openhis.lab.domain.ActivityDefDeviceDef;
|
||||
import com.openhis.lab.domain.ActivityDefObservationDef;
|
||||
import com.openhis.lab.domain.ActivityDefSpecimenDef;
|
||||
import com.healthlink.his.lab.domain.ActivityDefDeviceDef;
|
||||
import com.healthlink.his.lab.domain.ActivityDefObservationDef;
|
||||
import com.healthlink.his.lab.domain.ActivityDefSpecimenDef;
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
package com.healthlink.his.web.Inspection.dto;
|
||||
|
||||
import com.openhis.administration.domain.DeviceDefinition;
|
||||
import com.openhis.administration.domain.ObservationDefinition;
|
||||
import com.openhis.administration.domain.SpecimenDefinition;
|
||||
import com.healthlink.his.administration.domain.DeviceDefinition;
|
||||
import com.healthlink.his.administration.domain.ObservationDefinition;
|
||||
import com.healthlink.his.administration.domain.SpecimenDefinition;
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
package com.healthlink.his.web.Inspection.dto;
|
||||
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import com.openhis.common.annotation.Dict;
|
||||
import com.healthlink.his.common.annotation.Dict;
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
package com.healthlink.his.web.Inspection.dto;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
package com.healthlink.his.web.Inspection.dto;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
package com.healthlink.his.web.Inspection.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
package com.healthlink.his.web.Inspection.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
package com.healthlink.his.web.Inspection.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
package com.healthlink.his.web.Inspection.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
package com.healthlink.his.web.Inspection.dto;
|
||||
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
package com.healthlink.his.web.Inspection.dto;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
package com.healthlink.his.web.Inspection.dto;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
package com.healthlink.his.web.Inspection.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.web.Inspection.mapper;
|
||||
package com.healthlink.his.web.Inspection.mapper;
|
||||
|
||||
/**
|
||||
* @Description TODO
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.openhis.web.Inspection.mapper;
|
||||
package com.healthlink.his.web.Inspection.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Constants;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.openhis.web.Inspection.dto.ReportResultManageDto;
|
||||
import com.healthlink.his.web.Inspection.dto.ReportResultManageDto;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.openhis.web.Inspection.mapper;
|
||||
package com.healthlink.his.web.Inspection.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Constants;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.openhis.web.Inspection.dto.SampleCollectManageDto;
|
||||
import com.healthlink.his.web.Inspection.dto.SampleCollectManageDto;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.openhis.web.adjustprice.appservice;
|
||||
package com.healthlink.his.web.adjustprice.appservice;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.web.adjustprice.dto.AdjustPriceDataVo;
|
||||
import com.openhis.web.adjustprice.dto.AdjustPriceManagerSearchParam;
|
||||
import com.healthlink.his.web.adjustprice.dto.AdjustPriceDataVo;
|
||||
import com.healthlink.his.web.adjustprice.dto.AdjustPriceManagerSearchParam;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.web.adjustprice.appservice.impl;
|
||||
package com.healthlink.his.web.adjustprice.appservice.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
@@ -9,30 +9,30 @@ import com.core.common.utils.AssignSeqUtil;
|
||||
import com.core.common.utils.MessageUtils;
|
||||
import com.core.common.utils.SecurityUtils;
|
||||
import com.core.system.service.ISysDictDataService;
|
||||
import com.openhis.administration.domain.ChangePriceRecord;
|
||||
import com.openhis.administration.dto.ChangePriceDataDto;
|
||||
import com.openhis.administration.dto.ChargeItemDefDetailPriceDto;
|
||||
import com.openhis.administration.dto.HealthcareDto;
|
||||
import com.openhis.administration.dto.OrgDataDto;
|
||||
import com.openhis.administration.service.*;
|
||||
import com.openhis.common.constant.CommonConstants;
|
||||
import com.openhis.common.constant.PromptMsgConstant;
|
||||
import com.openhis.common.enums.*;
|
||||
import com.openhis.common.utils.EnumUtils;
|
||||
import com.openhis.common.utils.HisQueryUtils;
|
||||
import com.openhis.common.utils.RedisKeys;
|
||||
import com.openhis.common.utils.RedisUtil;
|
||||
import com.openhis.medication.service.IMedicationService;
|
||||
import com.openhis.web.adjustprice.appservice.IAdjustPriceService;
|
||||
import com.openhis.web.adjustprice.dto.AdjustPriceDataVo;
|
||||
import com.openhis.web.adjustprice.dto.AdjustPriceManagerSearchParam;
|
||||
import com.openhis.web.adjustprice.dto.ChangePricePageDto;
|
||||
import com.openhis.web.adjustprice.mapper.AdjustPriceMapper;
|
||||
import com.openhis.web.inventorymanage.dto.InventorySearchParam;
|
||||
import com.openhis.workflow.dto.ActivityDto;
|
||||
import com.openhis.workflow.dto.AdjustPriceDto;
|
||||
import com.openhis.workflow.service.IActivityDefinitionService;
|
||||
import com.openhis.workflow.service.IInventoryItemService;
|
||||
import com.healthlink.his.administration.domain.ChangePriceRecord;
|
||||
import com.healthlink.his.administration.dto.ChangePriceDataDto;
|
||||
import com.healthlink.his.administration.dto.ChargeItemDefDetailPriceDto;
|
||||
import com.healthlink.his.administration.dto.HealthcareDto;
|
||||
import com.healthlink.his.administration.dto.OrgDataDto;
|
||||
import com.healthlink.his.administration.service.*;
|
||||
import com.healthlink.his.common.constant.CommonConstants;
|
||||
import com.healthlink.his.common.constant.PromptMsgConstant;
|
||||
import com.healthlink.his.common.enums.*;
|
||||
import com.healthlink.his.common.utils.EnumUtils;
|
||||
import com.healthlink.his.common.utils.HisQueryUtils;
|
||||
import com.healthlink.his.common.utils.RedisKeys;
|
||||
import com.healthlink.his.common.utils.RedisUtil;
|
||||
import com.healthlink.his.medication.service.IMedicationService;
|
||||
import com.healthlink.his.web.adjustprice.appservice.IAdjustPriceService;
|
||||
import com.healthlink.his.web.adjustprice.dto.AdjustPriceDataVo;
|
||||
import com.healthlink.his.web.adjustprice.dto.AdjustPriceManagerSearchParam;
|
||||
import com.healthlink.his.web.adjustprice.dto.ChangePricePageDto;
|
||||
import com.healthlink.his.web.adjustprice.mapper.AdjustPriceMapper;
|
||||
import com.healthlink.his.web.inventorymanage.dto.InventorySearchParam;
|
||||
import com.healthlink.his.workflow.dto.ActivityDto;
|
||||
import com.healthlink.his.workflow.dto.AdjustPriceDto;
|
||||
import com.healthlink.his.workflow.service.IActivityDefinitionService;
|
||||
import com.healthlink.his.workflow.service.IInventoryItemService;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
@@ -475,7 +475,7 @@ public class AdjustPriceServiceImpl implements IAdjustPriceService {
|
||||
* @param itemList
|
||||
* @Author raymond
|
||||
* @Date 09:35 2025/10/18
|
||||
* @return java.util.List<com.openhis.workflow.domain.ChangePriceRecord>
|
||||
* @return java.util.List<com.healthlink.his.workflow.domain.ChangePriceRecord>
|
||||
**/
|
||||
public List<ChangePriceRecord> executeChangePriceData(String busNo, Long curUserId,
|
||||
List<AdjustPriceDataVo> itemList, Integer statusEnum, Integer categoryEnum) {
|
||||
@@ -580,7 +580,7 @@ public class AdjustPriceServiceImpl implements IAdjustPriceService {
|
||||
* @param dataVoList
|
||||
* @Author raymond
|
||||
* @Date 10:28 2025/11/5
|
||||
* @return java.util.Map<java.lang.Long,com.openhis.web.adjustprice.dto.AdjustPriceDataVo>
|
||||
* @return java.util.Map<java.lang.Long,com.healthlink.his.web.adjustprice.dto.AdjustPriceDataVo>
|
||||
**/
|
||||
public Map<Long, AdjustPriceDataVo> executeMap(List<AdjustPriceDataVo> dataVoList) {
|
||||
Map<Long, AdjustPriceDataVo> map = new ConcurrentHashMap<>();
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.openhis.web.adjustprice.controller;
|
||||
package com.healthlink.his.web.adjustprice.controller;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.core.common.enums.TenantOptionDict;
|
||||
import com.core.web.util.TenantOptionUtil;
|
||||
import com.openhis.common.enums.OrderPricingSource;
|
||||
import com.openhis.web.adjustprice.appservice.IAdjustPriceService;
|
||||
import com.openhis.web.adjustprice.dto.AdjustPriceDataVo;
|
||||
import com.healthlink.his.common.enums.OrderPricingSource;
|
||||
import com.healthlink.his.web.adjustprice.appservice.IAdjustPriceService;
|
||||
import com.healthlink.his.web.adjustprice.dto.AdjustPriceDataVo;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.openhis.web.adjustprice.controller;
|
||||
package com.healthlink.his.web.adjustprice.controller;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.core.common.utils.StringUtils;
|
||||
import com.openhis.web.adjustprice.appservice.IAdjustPriceService;
|
||||
import com.openhis.web.adjustprice.dto.AdjustPriceDataVo;
|
||||
import com.openhis.web.adjustprice.dto.AdjustPriceManagerSearchParam;
|
||||
import com.healthlink.his.web.adjustprice.appservice.IAdjustPriceService;
|
||||
import com.healthlink.his.web.adjustprice.dto.AdjustPriceDataVo;
|
||||
import com.healthlink.his.web.adjustprice.dto.AdjustPriceManagerSearchParam;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.web.adjustprice.dto;
|
||||
package com.healthlink.his.web.adjustprice.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.web.adjustprice.dto;
|
||||
package com.healthlink.his.web.adjustprice.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.web.adjustprice.dto;
|
||||
package com.healthlink.his.web.adjustprice.dto;
|
||||
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.openhis.web.adjustprice.dto;
|
||||
package com.healthlink.his.web.adjustprice.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.openhis.common.annotation.Dict;
|
||||
import com.healthlink.his.common.annotation.Dict;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package com.openhis.web.adjustprice.mapper;
|
||||
package com.healthlink.his.web.adjustprice.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Constants;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.openhis.web.adjustprice.dto.ChangePriceDataDto;
|
||||
import com.openhis.web.adjustprice.dto.ChangePricePageDto;
|
||||
import com.openhis.web.inventorymanage.dto.InventorySearchParam;
|
||||
import com.openhis.web.inventorymanage.dto.ReceiptPageDto;
|
||||
import com.healthlink.his.web.adjustprice.dto.ChangePriceDataDto;
|
||||
import com.healthlink.his.web.adjustprice.dto.ChangePricePageDto;
|
||||
import com.healthlink.his.web.inventorymanage.dto.InventorySearchParam;
|
||||
import com.healthlink.his.web.inventorymanage.dto.ReceiptPageDto;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@@ -32,7 +32,7 @@ public interface AdjustPriceMapper {
|
||||
* @param healthTypeEnum
|
||||
* @Author raymond
|
||||
* @Date 16:01 2025/10/24
|
||||
* @return com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.openhis.web.inventorymanage.dto.ReceiptPageDto>
|
||||
* @return com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.healthlink.his.web.inventorymanage.dto.ReceiptPageDto>
|
||||
**/
|
||||
Page<ReceiptPageDto> selectInventoryReceiptPage(@Param("page") Page<ReceiptPageDto> page,
|
||||
@Param(Constants.WRAPPER) QueryWrapper<InventorySearchParam> queryWrapper,
|
||||
@@ -51,7 +51,7 @@ public interface AdjustPriceMapper {
|
||||
* @param applicantId
|
||||
* @Author raymond
|
||||
* @Date 00:59 2025/11/2
|
||||
* @return com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.openhis.web.adjustprice.dto.ChangePricePageDto>
|
||||
* @return com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.healthlink.his.web.adjustprice.dto.ChangePricePageDto>
|
||||
**/
|
||||
Page<ChangePricePageDto> searchChangePriceDataToPage(@Param("page") Page<ReceiptPageDto> page,
|
||||
@Param(Constants.WRAPPER) QueryWrapper<InventorySearchParam> queryWrapper,
|
||||
@@ -66,7 +66,7 @@ public interface AdjustPriceMapper {
|
||||
* @param statusEnum
|
||||
* @Author raymond
|
||||
* @Date 09:46 2025/11/2
|
||||
* @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
|
||||
* @return java.util.List<com.healthlink.his.administration.dto.ChangePriceDataDto>
|
||||
**/
|
||||
List<ChangePriceDataDto> searchMedChangePriceByBusNo(@Param("busNo") String busNo, @Param("categoryEnum") Integer categoryEnum, @Param("statusEnum") Integer statusEnum);
|
||||
/**
|
||||
@@ -76,7 +76,7 @@ public interface AdjustPriceMapper {
|
||||
* @param statusEnum
|
||||
* @Author raymond
|
||||
* @Date 07:34 2025/11/4
|
||||
* @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
|
||||
* @return java.util.List<com.healthlink.his.administration.dto.ChangePriceDataDto>
|
||||
**/
|
||||
List<ChangePriceDataDto> searchMedChangePriceByItemId(@Param("itemId") Long itemId,@Param("categoryEnum") Integer categoryEnum,@Param("statusEnum") Integer statusEnum);
|
||||
/**
|
||||
@@ -86,7 +86,7 @@ public interface AdjustPriceMapper {
|
||||
* @param statusEnum
|
||||
* @Author raymond
|
||||
* @Date 09:46 2025/11/2
|
||||
* @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
|
||||
* @return java.util.List<com.healthlink.his.administration.dto.ChangePriceDataDto>
|
||||
**/
|
||||
List<ChangePriceDataDto> searchDeviceChangePriceByBusNo(@Param("busNo") String busNo,@Param("categoryEnum") Integer categoryEnum,@Param("statusEnum") Integer statusEnum);
|
||||
/**
|
||||
@@ -96,7 +96,7 @@ public interface AdjustPriceMapper {
|
||||
* @param statusEnum
|
||||
* @Author raymond
|
||||
* @Date 07:33 2025/11/4
|
||||
* @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
|
||||
* @return java.util.List<com.healthlink.his.administration.dto.ChangePriceDataDto>
|
||||
**/
|
||||
List<ChangePriceDataDto> searchDeviceChangePriceByItemId(@Param("itemId") Long itemId,@Param("categoryEnum") Integer categoryEnum,@Param("statusEnum") Integer statusEnum);
|
||||
|
||||
@@ -107,7 +107,7 @@ public interface AdjustPriceMapper {
|
||||
* @param statusEnum
|
||||
* @Author raymond
|
||||
* @Date 09:46 2025/11/2
|
||||
* @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
|
||||
* @return java.util.List<com.healthlink.his.administration.dto.ChangePriceDataDto>
|
||||
**/
|
||||
List<ChangePriceDataDto> searchActivityChangePriceByBusNo(@Param("busNo") String busNo,@Param("categoryEnum") Integer categoryEnum,@Param("statusEnum") Integer statusEnum);
|
||||
/**
|
||||
@@ -117,7 +117,7 @@ public interface AdjustPriceMapper {
|
||||
* @param statusEnum
|
||||
* @Author raymond
|
||||
* @Date 07:32 2025/11/4
|
||||
* @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
|
||||
* @return java.util.List<com.healthlink.his.administration.dto.ChangePriceDataDto>
|
||||
**/
|
||||
List<ChangePriceDataDto> searchActivityChangePriceByItemId(@Param("itemId") Long itemId,@Param("categoryEnum") Integer categoryEnum,@Param("statusEnum") Integer statusEnum);
|
||||
|
||||
@@ -128,7 +128,7 @@ public interface AdjustPriceMapper {
|
||||
* @param statusEnum
|
||||
* @Author raymond
|
||||
* @Date 09:46 2025/11/2
|
||||
* @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
|
||||
* @return java.util.List<com.healthlink.his.administration.dto.ChangePriceDataDto>
|
||||
**/
|
||||
List<ChangePriceDataDto> searchHealthChangePriceByBusNo(@Param("busNo") String busNo,@Param("categoryEnum") Integer categoryEnum,@Param("statusEnum") Integer statusEnum);
|
||||
/**
|
||||
@@ -138,7 +138,7 @@ public interface AdjustPriceMapper {
|
||||
* @param statusEnum
|
||||
* @Author raymond
|
||||
* @Date 07:31 2025/11/4
|
||||
* @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
|
||||
* @return java.util.List<com.healthlink.his.administration.dto.ChangePriceDataDto>
|
||||
**/
|
||||
List<ChangePriceDataDto> searchHealthChangePriceByItemId(@Param("itemId") Long itemId,@Param("categoryEnum") Integer categoryEnum,@Param("statusEnum") Integer statusEnum);
|
||||
/**
|
||||
@@ -147,7 +147,7 @@ public interface AdjustPriceMapper {
|
||||
* @param statusEnum
|
||||
* @Author raymond
|
||||
* @Date 10:36 2025/11/2
|
||||
* @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
|
||||
* @return java.util.List<com.healthlink.his.administration.dto.ChangePriceDataDto>
|
||||
**/
|
||||
List<ChangePriceDataDto> searchChangePriceRecordDataByBusNo(@Param("busNo") String busNo,@Param("statusEnum") Integer statusEnum);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.web.administration.controller;
|
||||
package com.healthlink.his.web.administration.controller;
|
||||
|
||||
import com.core.common.annotation.Log;
|
||||
import com.core.common.core.controller.BaseController;
|
||||
@@ -6,9 +6,9 @@ import com.core.common.core.domain.AjaxResult;
|
||||
import com.core.common.core.page.TableDataInfo;
|
||||
import com.core.common.enums.BusinessType;
|
||||
import com.core.common.utils.poi.ExcelUtil;
|
||||
import com.openhis.administration.domain.PractitionerPatient;
|
||||
import com.openhis.administration.service.IPractitionerPatientService;
|
||||
import com.openhis.administration.dto.PractitionerPatientDto;
|
||||
import com.healthlink.his.administration.domain.PractitionerPatient;
|
||||
import com.healthlink.his.administration.service.IPractitionerPatientService;
|
||||
import com.healthlink.his.administration.dto.PractitionerPatientDto;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.openhis.web.appointmentmanage.appservice;
|
||||
package com.healthlink.his.web.appointmentmanage.appservice;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.appointmentmanage.domain.AppointmentConfig;
|
||||
import com.healthlink.his.appointmentmanage.domain.AppointmentConfig;
|
||||
|
||||
/**
|
||||
* 预约配置AppService接口
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.openhis.web.appointmentmanage.appservice;
|
||||
package com.healthlink.his.web.appointmentmanage.appservice;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.appointmentmanage.domain.ClinicRoom;
|
||||
import com.healthlink.his.appointmentmanage.domain.ClinicRoom;
|
||||
|
||||
public interface IClinicRoomAppService {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.openhis.web.appointmentmanage.appservice;
|
||||
package com.healthlink.his.web.appointmentmanage.appservice;
|
||||
import com.core.common.core.domain.R;
|
||||
public interface IDeptAppService {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.openhis.web.appointmentmanage.appservice;
|
||||
package com.healthlink.his.web.appointmentmanage.appservice;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.appointmentmanage.domain.DeptAppointmentHours;
|
||||
import com.healthlink.his.appointmentmanage.domain.DeptAppointmentHours;
|
||||
|
||||
public interface IDeptAppointmentHoursAppService {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.openhis.web.appointmentmanage.appservice;
|
||||
package com.healthlink.his.web.appointmentmanage.appservice;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.appointmentmanage.domain.DoctorSchedule;
|
||||
import com.healthlink.his.appointmentmanage.domain.DoctorSchedule;
|
||||
|
||||
public interface IDoctorScheduleAppService {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.openhis.web.appointmentmanage.appservice;
|
||||
package com.healthlink.his.web.appointmentmanage.appservice;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.web.appointmentmanage.dto.SchedulePoolDto;
|
||||
import com.healthlink.his.web.appointmentmanage.dto.SchedulePoolDto;
|
||||
|
||||
public interface ISchedulePoolAppService {
|
||||
R<?> addSchedulePool(SchedulePoolDto schedulePoolDto);
|
||||
@@ -0,0 +1,4 @@
|
||||
package com.healthlink.his.web.appointmentmanage.appservice;
|
||||
|
||||
public interface IScheduleSlotAppService {
|
||||
}
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.openhis.web.appointmentmanage.appservice;
|
||||
package com.healthlink.his.web.appointmentmanage.appservice;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.appointmentmanage.dto.TicketQueryDTO;
|
||||
import com.openhis.web.appointmentmanage.dto.TicketDto;
|
||||
import com.openhis.appointmentmanage.dto.TicketQueryDTO;
|
||||
import com.healthlink.his.appointmentmanage.dto.TicketQueryDTO;
|
||||
import com.healthlink.his.web.appointmentmanage.dto.TicketDto;
|
||||
import com.healthlink.his.appointmentmanage.dto.TicketQueryDTO;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
@@ -37,7 +37,7 @@ public interface ITicketAppService {
|
||||
* @param dto 预约参数
|
||||
* @return 结果
|
||||
*/
|
||||
R<?> bookTicket(com.openhis.appointmentmanage.domain.AppointmentBookDTO dto);
|
||||
R<?> bookTicket(com.healthlink.his.appointmentmanage.domain.AppointmentBookDTO dto);
|
||||
|
||||
/**
|
||||
* 取消预约
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.openhis.web.appointmentmanage.appservice.impl;
|
||||
package com.healthlink.his.web.appointmentmanage.appservice.impl;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.core.common.utils.SecurityUtils;
|
||||
import com.openhis.appointmentmanage.domain.AppointmentConfig;
|
||||
import com.openhis.appointmentmanage.service.IAppointmentConfigService;
|
||||
import com.openhis.web.appointmentmanage.appservice.IAppointmentConfigAppService;
|
||||
import com.healthlink.his.appointmentmanage.domain.AppointmentConfig;
|
||||
import com.healthlink.his.appointmentmanage.service.IAppointmentConfigService;
|
||||
import com.healthlink.his.web.appointmentmanage.appservice.IAppointmentConfigAppService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.openhis.web.appointmentmanage.appservice.impl;
|
||||
package com.healthlink.his.web.appointmentmanage.appservice.impl;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.appointmentmanage.domain.ClinicRoom;
|
||||
import com.openhis.appointmentmanage.service.IClinicRoomService;
|
||||
import com.openhis.web.appointmentmanage.appservice.IClinicRoomAppService;
|
||||
import com.healthlink.his.appointmentmanage.domain.ClinicRoom;
|
||||
import com.healthlink.his.appointmentmanage.service.IClinicRoomService;
|
||||
import com.healthlink.his.web.appointmentmanage.appservice.IClinicRoomAppService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.openhis.web.appointmentmanage.appservice.impl;
|
||||
package com.healthlink.his.web.appointmentmanage.appservice.impl;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.appointmentmanage.domain.Dept;
|
||||
import com.openhis.appointmentmanage.service.IDeptService;
|
||||
import com.openhis.web.appointmentmanage.appservice.IDeptAppService;
|
||||
import com.healthlink.his.appointmentmanage.domain.Dept;
|
||||
import com.healthlink.his.appointmentmanage.service.IDeptService;
|
||||
import com.healthlink.his.web.appointmentmanage.appservice.IDeptAppService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
@@ -1,14 +1,14 @@
|
||||
package com.openhis.web.appointmentmanage.appservice.impl;
|
||||
package com.healthlink.his.web.appointmentmanage.appservice.impl;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.appointmentmanage.domain.DeptAppointmentHours;
|
||||
import com.openhis.appointmentmanage.mapper.DeptAppointmentHoursMapper;
|
||||
import com.openhis.appointmentmanage.service.IDeptAppointmentHoursService;
|
||||
import com.openhis.web.appointmentmanage.appservice.IDeptAppointmentHoursAppService;
|
||||
import com.healthlink.his.appointmentmanage.domain.DeptAppointmentHours;
|
||||
import com.healthlink.his.appointmentmanage.mapper.DeptAppointmentHoursMapper;
|
||||
import com.healthlink.his.appointmentmanage.service.IDeptAppointmentHoursService;
|
||||
import com.healthlink.his.web.appointmentmanage.appservice.IDeptAppointmentHoursAppService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
@@ -1,19 +1,19 @@
|
||||
package com.openhis.web.appointmentmanage.appservice.impl;
|
||||
package com.healthlink.his.web.appointmentmanage.appservice.impl;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.core.common.core.domain.R;
|
||||
import com.core.common.utils.SecurityUtils;
|
||||
import com.openhis.common.enums.SlotStatus;
|
||||
import com.openhis.appointmentmanage.domain.DoctorSchedule;
|
||||
import com.openhis.appointmentmanage.domain.DoctorScheduleWithDateDto;
|
||||
import com.openhis.appointmentmanage.domain.SchedulePool;
|
||||
import com.openhis.appointmentmanage.domain.ScheduleSlot;
|
||||
import com.openhis.appointmentmanage.mapper.DoctorScheduleMapper;
|
||||
import com.openhis.appointmentmanage.service.IDoctorScheduleService;
|
||||
import com.openhis.appointmentmanage.service.ISchedulePoolService;
|
||||
import com.openhis.appointmentmanage.service.IScheduleSlotService;
|
||||
import com.openhis.web.appointmentmanage.appservice.IDoctorScheduleAppService;
|
||||
import com.healthlink.his.common.enums.SlotStatus;
|
||||
import com.healthlink.his.appointmentmanage.domain.DoctorSchedule;
|
||||
import com.healthlink.his.appointmentmanage.domain.DoctorScheduleWithDateDto;
|
||||
import com.healthlink.his.appointmentmanage.domain.SchedulePool;
|
||||
import com.healthlink.his.appointmentmanage.domain.ScheduleSlot;
|
||||
import com.healthlink.his.appointmentmanage.mapper.DoctorScheduleMapper;
|
||||
import com.healthlink.his.appointmentmanage.service.IDoctorScheduleService;
|
||||
import com.healthlink.his.appointmentmanage.service.ISchedulePoolService;
|
||||
import com.healthlink.his.appointmentmanage.service.IScheduleSlotService;
|
||||
import com.healthlink.his.web.appointmentmanage.appservice.IDoctorScheduleAppService;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.openhis.web.appointmentmanage.appservice.impl;
|
||||
package com.healthlink.his.web.appointmentmanage.appservice.impl;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.appointmentmanage.domain.SchedulePool;
|
||||
import com.openhis.appointmentmanage.service.ISchedulePoolService;
|
||||
import com.openhis.web.appointmentmanage.appservice.ISchedulePoolAppService;
|
||||
import com.openhis.web.appointmentmanage.dto.SchedulePoolDto;
|
||||
import com.healthlink.his.appointmentmanage.domain.SchedulePool;
|
||||
import com.healthlink.his.appointmentmanage.service.ISchedulePoolService;
|
||||
import com.healthlink.his.web.appointmentmanage.appservice.ISchedulePoolAppService;
|
||||
import com.healthlink.his.web.appointmentmanage.dto.SchedulePoolDto;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
@@ -0,0 +1,8 @@
|
||||
package com.healthlink.his.web.appointmentmanage.appservice.impl;
|
||||
|
||||
import com.healthlink.his.web.appointmentmanage.appservice.IScheduleSlotAppService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
public class ScheduleSlotAppServiceImpl implements IScheduleSlotAppService {
|
||||
}
|
||||
@@ -1,16 +1,16 @@
|
||||
package com.openhis.web.appointmentmanage.appservice.impl;
|
||||
package com.healthlink.his.web.appointmentmanage.appservice.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.administration.domain.Patient;
|
||||
import com.openhis.administration.service.IPatientService;
|
||||
import com.openhis.appointmentmanage.mapper.ScheduleSlotMapper;
|
||||
import com.openhis.clinical.domain.Ticket;
|
||||
import com.openhis.clinical.service.ITicketService;
|
||||
import com.openhis.web.appointmentmanage.appservice.ITicketAppService;
|
||||
import com.openhis.web.appointmentmanage.dto.TicketDto;
|
||||
import com.openhis.common.enums.SlotStatus;
|
||||
import com.openhis.common.enums.OrderStatus;
|
||||
import com.healthlink.his.administration.domain.Patient;
|
||||
import com.healthlink.his.administration.service.IPatientService;
|
||||
import com.healthlink.his.appointmentmanage.mapper.ScheduleSlotMapper;
|
||||
import com.healthlink.his.clinical.domain.Ticket;
|
||||
import com.healthlink.his.clinical.service.ITicketService;
|
||||
import com.healthlink.his.web.appointmentmanage.appservice.ITicketAppService;
|
||||
import com.healthlink.his.web.appointmentmanage.dto.TicketDto;
|
||||
import com.healthlink.his.common.enums.SlotStatus;
|
||||
import com.healthlink.his.common.enums.OrderStatus;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
@@ -44,7 +44,7 @@ public class TicketAppServiceImpl implements ITicketAppService {
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public R<?> bookTicket(com.openhis.appointmentmanage.domain.AppointmentBookDTO dto) {
|
||||
public R<?> bookTicket(com.healthlink.his.appointmentmanage.domain.AppointmentBookDTO dto) {
|
||||
Long slotId = dto.getSlotId();
|
||||
if (slotId == null) {
|
||||
return R.fail("参数校验失败:缺少排班槽位唯一标识");
|
||||
@@ -119,25 +119,25 @@ public class TicketAppServiceImpl implements ITicketAppService {
|
||||
}
|
||||
|
||||
@Override
|
||||
public R<?> listTicket(com.openhis.appointmentmanage.dto.TicketQueryDTO query) {
|
||||
public R<?> listTicket(com.healthlink.his.appointmentmanage.dto.TicketQueryDTO query) {
|
||||
// 1. 防空指针处理
|
||||
if (query == null) {
|
||||
query = new com.openhis.appointmentmanage.dto.TicketQueryDTO();
|
||||
query = new com.healthlink.his.appointmentmanage.dto.TicketQueryDTO();
|
||||
}
|
||||
normalizeQueryStatus(query);
|
||||
|
||||
// 2. 构造 MyBatis 的分页对象 (传入前端给的当前页和每页条数)
|
||||
com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.openhis.appointmentmanage.domain.TicketSlotDTO> pageParam = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(
|
||||
com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.healthlink.his.appointmentmanage.domain.TicketSlotDTO> pageParam = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(
|
||||
query.getPage(), query.getLimit());
|
||||
|
||||
// 3. 调用刚才写的底层动态 SQL 查询!
|
||||
com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.openhis.appointmentmanage.domain.TicketSlotDTO> rawPage = scheduleSlotMapper
|
||||
com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.healthlink.his.appointmentmanage.domain.TicketSlotDTO> rawPage = scheduleSlotMapper
|
||||
.selectTicketSlotsPage(pageParam, query);
|
||||
|
||||
// 4. 将查出来的数据翻译为前端可以直接渲染的结构
|
||||
java.util.List<TicketDto> tickets = new java.util.ArrayList<>();
|
||||
if (rawPage.getRecords() != null) {
|
||||
for (com.openhis.appointmentmanage.domain.TicketSlotDTO raw : rawPage.getRecords()) {
|
||||
for (com.healthlink.his.appointmentmanage.domain.TicketSlotDTO raw : rawPage.getRecords()) {
|
||||
TicketDto dto = new TicketDto();
|
||||
|
||||
// 基础字段映射
|
||||
@@ -246,7 +246,7 @@ public class TicketAppServiceImpl implements ITicketAppService {
|
||||
* 规范前端传入的状态查询参数,映射到 SQL 的 slotStatusNormExpr 值。
|
||||
* 数值映射: 0=待约 1=已约(签到后) 2=锁定(预约后) 3=已签到 4=已停诊 5=已退号
|
||||
*/
|
||||
private void normalizeQueryStatus(com.openhis.appointmentmanage.dto.TicketQueryDTO query) {
|
||||
private void normalizeQueryStatus(com.healthlink.his.appointmentmanage.dto.TicketQueryDTO query) {
|
||||
String rawStatus = query.getStatus();
|
||||
if (rawStatus == null) {
|
||||
return;
|
||||
@@ -303,16 +303,16 @@ public class TicketAppServiceImpl implements ITicketAppService {
|
||||
}
|
||||
|
||||
@Override
|
||||
public R<?> listDoctorAvailability(com.openhis.appointmentmanage.dto.TicketQueryDTO query) {
|
||||
public R<?> listDoctorAvailability(com.healthlink.his.appointmentmanage.dto.TicketQueryDTO query) {
|
||||
if (query == null) {
|
||||
query = new com.openhis.appointmentmanage.dto.TicketQueryDTO();
|
||||
query = new com.healthlink.his.appointmentmanage.dto.TicketQueryDTO();
|
||||
}
|
||||
|
||||
java.util.List<com.openhis.appointmentmanage.domain.DoctorAvailabilityDTO> rawList = scheduleSlotMapper
|
||||
java.util.List<com.healthlink.his.appointmentmanage.domain.DoctorAvailabilityDTO> rawList = scheduleSlotMapper
|
||||
.selectDoctorAvailabilitySummary(query);
|
||||
java.util.List<java.util.Map<String, Object>> doctors = new java.util.ArrayList<>();
|
||||
if (rawList != null) {
|
||||
for (com.openhis.appointmentmanage.domain.DoctorAvailabilityDTO item : rawList) {
|
||||
for (com.healthlink.his.appointmentmanage.domain.DoctorAvailabilityDTO item : rawList) {
|
||||
java.util.Map<String, Object> row = new java.util.HashMap<>();
|
||||
String doctorName = item.getDoctorName();
|
||||
Long doctorId = item.getDoctorId();
|
||||
@@ -329,13 +329,13 @@ public class TicketAppServiceImpl implements ITicketAppService {
|
||||
@Override
|
||||
public R<?> listAllTickets() {
|
||||
// 1. 调用最新的 Mapper,直接从数据库抽出我们半成品的 DTO(强类型!)
|
||||
List<com.openhis.appointmentmanage.domain.TicketSlotDTO> rawDtos = scheduleSlotMapper.selectAllTicketSlots();
|
||||
List<com.healthlink.his.appointmentmanage.domain.TicketSlotDTO> rawDtos = scheduleSlotMapper.selectAllTicketSlots();
|
||||
|
||||
// 这是真正要发给前端展示的包裹外卖盒
|
||||
List<TicketDto> tickets = new ArrayList<>();
|
||||
|
||||
if (rawDtos != null) {
|
||||
for (com.openhis.appointmentmanage.domain.TicketSlotDTO raw : rawDtos) {
|
||||
for (com.healthlink.his.appointmentmanage.domain.TicketSlotDTO raw : rawDtos) {
|
||||
TicketDto dto = new TicketDto();
|
||||
|
||||
// --- 基础字段处理 ---
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.openhis.web.appointmentmanage.controller;
|
||||
package com.healthlink.his.web.appointmentmanage.controller;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.appointmentmanage.domain.ClinicRoom;
|
||||
import com.openhis.web.appointmentmanage.appservice.IClinicRoomAppService;
|
||||
import com.healthlink.his.appointmentmanage.domain.ClinicRoom;
|
||||
import com.healthlink.his.web.appointmentmanage.appservice.IClinicRoomAppService;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import jakarta.annotation.Resource;
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user