diff --git a/openhis-server-new/com/openhis/tool/DatabaseFieldAdder.java b/openhis-server-new/com/healthlink/his/tool/DatabaseFieldAdder.java
similarity index 98%
rename from openhis-server-new/com/openhis/tool/DatabaseFieldAdder.java
rename to openhis-server-new/com/healthlink/his/tool/DatabaseFieldAdder.java
index 069b459ed..d66a110d6 100755
--- a/openhis-server-new/com/openhis/tool/DatabaseFieldAdder.java
+++ b/openhis-server-new/com/healthlink/his/tool/DatabaseFieldAdder.java
@@ -1,4 +1,4 @@
-package com.openhis.tool;
+package com.healthlink.his.tool;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
diff --git a/openhis-server-new/core-admin/pom.xml b/openhis-server-new/core-admin/pom.xml
index 466e7e436..21dc01cda 100755
--- a/openhis-server-new/core-admin/pom.xml
+++ b/openhis-server-new/core-admin/pom.xml
@@ -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>
diff --git a/openhis-server-new/core-common/pom.xml b/openhis-server-new/core-common/pom.xml
index cc4bbf2c2..8146e67e3 100755
--- a/openhis-server-new/core-common/pom.xml
+++ b/openhis-server-new/core-common/pom.xml
@@ -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>
diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/constant/Constants.java b/openhis-server-new/core-common/src/main/java/com/core/common/constant/Constants.java
index e63a05c30..7c894b79a 100755
--- a/openhis-server-new/core-common/src/main/java/com/core/common/constant/Constants.java
+++ b/openhis-server-new/core-common/src/main/java/com/core/common/constant/Constants.java
@@ -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"};
 
     /**
      * 定时任务违规的字符
diff --git a/openhis-server-new/core-flowable/pom.xml b/openhis-server-new/core-flowable/pom.xml
index ee48a2b6a..c5077f9f7 100755
--- a/openhis-server-new/core-flowable/pom.xml
+++ b/openhis-server-new/core-flowable/pom.xml
@@ -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>
diff --git a/openhis-server-new/core-framework/pom.xml b/openhis-server-new/core-framework/pom.xml
index 2a5109c5a..736466e6b 100755
--- a/openhis-server-new/core-framework/pom.xml
+++ b/openhis-server-new/core-framework/pom.xml
@@ -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>
 
diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/ApplicationConfig.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/ApplicationConfig.java
index 453bf3000..5af5ebeb3 100755
--- a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/ApplicationConfig.java
+++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/ApplicationConfig.java
@@ -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);
 
diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java
index 5cbdf05fb..11d4b29d4 100755
--- a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java
+++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java
@@ -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();
diff --git a/openhis-server-new/core-generator/pom.xml b/openhis-server-new/core-generator/pom.xml
index a1f0435bb..d9030781b 100755
--- a/openhis-server-new/core-generator/pom.xml
+++ b/openhis-server-new/core-generator/pom.xml
@@ -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>
diff --git a/openhis-server-new/core-generator/src/main/resources/generator.yml b/openhis-server-new/core-generator/src/main/resources/generator.yml
index 5ca5c560c..83d1b7f8a 100755
--- a/openhis-server-new/core-generator/src/main/resources/generator.yml
+++ b/openhis-server-new/core-generator/src/main/resources/generator.yml
@@ -3,7 +3,7 @@ gen:
   # 作者
   author: system
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
-  packageName: com.openhis
+  packageName: com.healthlink.his
   # 自动去除表前缀，默认是false
   autoRemovePre: true
   # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
diff --git a/openhis-server-new/core-quartz/pom.xml b/openhis-server-new/core-quartz/pom.xml
index fc8c5fce7..0241d895c 100755
--- a/openhis-server-new/core-quartz/pom.xml
+++ b/openhis-server-new/core-quartz/pom.xml
@@ -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>
diff --git a/openhis-server-new/core-system/pom.xml b/openhis-server-new/core-system/pom.xml
index a04910bbd..f50af0b26 100755
--- a/openhis-server-new/core-system/pom.xml
+++ b/openhis-server-new/core-system/pom.xml
@@ -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>
diff --git a/openhis-server-new/openhis-application/pom.xml b/openhis-server-new/healthlink-his-application/pom.xml
similarity index 94%
rename from openhis-server-new/openhis-application/pom.xml
rename to openhis-server-new/healthlink-his-application/pom.xml
index a3f84fc31..0bdf4253c 100755
--- a/openhis-server-new/openhis-application/pom.xml
+++ b/openhis-server-new/healthlink-his-application/pom.xml
@@ -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>
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/OpenHisApplication.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/OpenHisApplication.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/OpenHisApplication.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/OpenHisApplication.java
index 7656b038a..005dd7051 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/OpenHisApplication.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/OpenHisApplication.java
@@ -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 {
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/config/FlywayConfig.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/config/FlywayConfig.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/config/FlywayConfig.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/config/FlywayConfig.java
index 6a57c0203..601e9b9eb 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/config/FlywayConfig.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/config/FlywayConfig.java
@@ -1,4 +1,4 @@
-package com.openhis.config;
+package com.healthlink.his.config;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import org.flywaydb.core.Flyway;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/config/HttpConfig.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/config/HttpConfig.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/config/HttpConfig.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/config/HttpConfig.java
index b4d2ecbfe..259ff1542 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/config/HttpConfig.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/config/HttpConfig.java
@@ -1,4 +1,4 @@
-package com.openhis.config;
+package com.healthlink.his.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/controller/SysJobController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/controller/SysJobController.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/controller/SysJobController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/controller/SysJobController.java
index d7347d9c3..49eed887a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/controller/SysJobController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/controller/SysJobController.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/controller/SysJobLogController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/controller/SysJobLogController.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/controller/SysJobLogController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/controller/SysJobLogController.java
index 18111e029..e4b98d9d4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/controller/SysJobLogController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/controller/SysJobLogController.java
@@ -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.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/ISysJobLogService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/service/ISysJobLogService.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/ISysJobLogService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/service/ISysJobLogService.java
index 8a01512d5..bc31672ed 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/ISysJobLogService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/service/ISysJobLogService.java
@@ -1,4 +1,4 @@
-package com.openhis.quartz.service;
+package com.healthlink.his.quartz.service;
 
 import com.core.quartz.domain.SysJobLog;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/ISysJobService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/service/ISysJobService.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/ISysJobService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/service/ISysJobService.java
index b95a201dc..231cedec1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/ISysJobService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/service/ISysJobService.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/impl/SysJobLogServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/service/impl/SysJobLogServiceImpl.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/impl/SysJobLogServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/service/impl/SysJobLogServiceImpl.java
index af8bb6761..002575724 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/impl/SysJobLogServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/service/impl/SysJobLogServiceImpl.java
@@ -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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/impl/SysJobServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/service/impl/SysJobServiceImpl.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/impl/SysJobServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/service/impl/SysJobServiceImpl.java
index b38d462eb..72f9668d0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/impl/SysJobServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/service/impl/SysJobServiceImpl.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/AutoRollTask.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/task/AutoRollTask.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/AutoRollTask.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/task/AutoRollTask.java
index 47e4b477b..57d1ca26e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/AutoRollTask.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/task/AutoRollTask.java
@@ -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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/ExampleTask.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/task/ExampleTask.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/ExampleTask.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/task/ExampleTask.java
index a425cfb13..3be65d0f7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/ExampleTask.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/task/ExampleTask.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/InventoryBackupTask.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/task/InventoryBackupTask.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/InventoryBackupTask.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/task/InventoryBackupTask.java
index 28f5ba4f9..00244af36 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/InventoryBackupTask.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/task/InventoryBackupTask.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/RyTask.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/task/RyTask.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/RyTask.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/task/RyTask.java
index afc990e45..3800e922a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/RyTask.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/task/RyTask.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/AbstractQuartzJob.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/util/AbstractQuartzJob.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/AbstractQuartzJob.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/util/AbstractQuartzJob.java
index 793af2d6b..5b1b12bba 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/AbstractQuartzJob.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/util/AbstractQuartzJob.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/QuartzDisallowConcurrentExecution.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/util/QuartzDisallowConcurrentExecution.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/QuartzDisallowConcurrentExecution.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/util/QuartzDisallowConcurrentExecution.java
index cfda80a51..e8c449c63 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/QuartzDisallowConcurrentExecution.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/util/QuartzDisallowConcurrentExecution.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/QuartzJobExecution.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/util/QuartzJobExecution.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/QuartzJobExecution.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/util/QuartzJobExecution.java
index f47ac8cf9..a197ac757 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/QuartzJobExecution.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/util/QuartzJobExecution.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/ScheduleUtils.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/util/ScheduleUtils.java
similarity index 99%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/ScheduleUtils.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/util/ScheduleUtils.java
index f1897a3ed..78ce59b5c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/ScheduleUtils.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/quartz/util/ScheduleUtils.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/ACmp.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/rule/component/ACmp.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/ACmp.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/rule/component/ACmp.java
index 2dbc66bd3..041e7dce3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/ACmp.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/rule/component/ACmp.java
@@ -1,4 +1,4 @@
-package com.openhis.rule.component;
+package com.healthlink.his.rule.component;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/BCmp.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/rule/component/BCmp.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/BCmp.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/rule/component/BCmp.java
index fe994e266..1db318f34 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/BCmp.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/rule/component/BCmp.java
@@ -1,4 +1,4 @@
-package com.openhis.rule.component;
+package com.healthlink.his.rule.component;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/CCmp.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/rule/component/CCmp.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/CCmp.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/rule/component/CCmp.java
index d2a19f5dd..6f5bd2fff 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/CCmp.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/rule/component/CCmp.java
@@ -1,4 +1,4 @@
-package com.openhis.rule.component;
+package com.healthlink.his.rule.component;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/AGENTS.md b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/AGENTS.md
similarity index 100%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/AGENTS.md
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/AGENTS.md
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/IInstrumentManageAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/IInstrumentManageAppService.java
similarity index 76%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/IInstrumentManageAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/IInstrumentManageAppService.java
index a945aefe5..04069aa2f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/IInstrumentManageAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/IInstrumentManageAppService.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ILaboratoryManageAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/ILaboratoryManageAppService.java
similarity index 76%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ILaboratoryManageAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/ILaboratoryManageAppService.java
index faf49d073..3d1ca9c03 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ILaboratoryManageAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/ILaboratoryManageAppService.java
@@ -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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ILisConfigManageAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/ILisConfigManageAppService.java
similarity index 79%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ILisConfigManageAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/ILisConfigManageAppService.java
index 99fe6f7a7..bab3cf882 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ILisConfigManageAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/ILisConfigManageAppService.java
@@ -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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/IObservationManageAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/IObservationManageAppService.java
similarity index 76%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/IObservationManageAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/IObservationManageAppService.java
index 4aaf442de..1b8f0c67c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/IObservationManageAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/IObservationManageAppService.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ISampleCollectAppManageAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/ISampleCollectAppManageAppService.java
similarity index 69%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ISampleCollectAppManageAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/ISampleCollectAppManageAppService.java
index cd29e30e9..8cde78feb 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ISampleCollectAppManageAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/ISampleCollectAppManageAppService.java
@@ -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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ISpecimenManageAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/ISpecimenManageAppService.java
similarity index 75%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ISpecimenManageAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/ISpecimenManageAppService.java
index 4aba69779..86e95e05c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ISpecimenManageAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/ISpecimenManageAppService.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/InstrumentManageAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/impl/InstrumentManageAppServiceImpl.java
similarity index 79%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/InstrumentManageAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/impl/InstrumentManageAppServiceImpl.java
index 0b1317e67..c20d886cd 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/InstrumentManageAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/impl/InstrumentManageAppServiceImpl.java
@@ -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);
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/LaboratoryManageAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/impl/LaboratoryManageAppService.java
similarity index 81%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/LaboratoryManageAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/impl/LaboratoryManageAppService.java
index 300698f08..1a0b7397d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/LaboratoryManageAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/impl/LaboratoryManageAppService.java
@@ -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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/LisConfigManageAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/impl/LisConfigManageAppServiceImpl.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/LisConfigManageAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/impl/LisConfigManageAppServiceImpl.java
index 889fac85a..e07e8503b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/LisConfigManageAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/impl/LisConfigManageAppServiceImpl.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/ObservationManageAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/impl/ObservationManageAppServiceImpl.java
similarity index 83%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/ObservationManageAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/impl/ObservationManageAppServiceImpl.java
index cedf7c615..9b732b550 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/ObservationManageAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/impl/ObservationManageAppServiceImpl.java
@@ -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);
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/SampleCollectManageAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/impl/SampleCollectManageAppService.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/SampleCollectManageAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/impl/SampleCollectManageAppService.java
index 555305dba..98ade7c66 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/SampleCollectManageAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/impl/SampleCollectManageAppService.java
@@ -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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/SpecimenManageAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/impl/SpecimenManageAppServiceImpl.java
similarity index 82%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/SpecimenManageAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/impl/SpecimenManageAppServiceImpl.java
index 0fefdfb8d..1846a927d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/SpecimenManageAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/appservice/impl/SpecimenManageAppServiceImpl.java
@@ -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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/InstrumentController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/controller/InstrumentController.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/InstrumentController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/controller/InstrumentController.java
index f90bef333..1e9fdb498 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/InstrumentController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/controller/InstrumentController.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/LaboratoryController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/controller/LaboratoryController.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/LaboratoryController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/controller/LaboratoryController.java
index eb2f2f724..95a53d8bf 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/LaboratoryController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/controller/LaboratoryController.java
@@ -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.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/LisConfigController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/controller/LisConfigController.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/LisConfigController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/controller/LisConfigController.java
index bdfbc9008..b98c63c9c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/LisConfigController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/controller/LisConfigController.java
@@ -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.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/ObservationDefController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/controller/ObservationDefController.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/ObservationDefController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/controller/ObservationDefController.java
index a75e8daa2..c7c3e178c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/ObservationDefController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/controller/ObservationDefController.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/SampleCollectController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/controller/SampleCollectController.java
similarity index 81%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/SampleCollectController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/controller/SampleCollectController.java
index 61199d1da..0d761d877 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/SampleCollectController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/controller/SampleCollectController.java
@@ -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.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/SpecimenDefController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/controller/SpecimenDefController.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/SpecimenDefController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/controller/SpecimenDefController.java
index 63d5ee3e3..78326c368 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/SpecimenDefController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/controller/SpecimenDefController.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentManageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/InstrumentManageDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentManageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/InstrumentManageDto.java
index dda4ce5ef..cfde7c27d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentManageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/InstrumentManageDto.java
@@ -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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentManageInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/InstrumentManageInitDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentManageInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/InstrumentManageInitDto.java
index a84045564..f3272b0b5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentManageInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/InstrumentManageInitDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.Inspection.dto;
+package com.healthlink.his.web.Inspection.dto;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentSelParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/InstrumentSelParam.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentSelParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/InstrumentSelParam.java
index 40729b333..9b708d4e9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentSelParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/InstrumentSelParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.Inspection.dto;
+package com.healthlink.his.web.Inspection.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentStatusRequest.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/InstrumentStatusRequest.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentStatusRequest.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/InstrumentStatusRequest.java
index 78715ce8a..f0c678f32 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentStatusRequest.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/InstrumentStatusRequest.java
@@ -1,4 +1,4 @@
-package com.openhis.web.Inspection.dto;
+package com.healthlink.his.web.Inspection.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/LisConfigManageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/LisConfigManageDto.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/LisConfigManageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/LisConfigManageDto.java
index 98c9fafc1..6cefbda1e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/LisConfigManageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/LisConfigManageDto.java
@@ -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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/LisConfigManageInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/LisConfigManageInitDto.java
similarity index 75%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/LisConfigManageInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/LisConfigManageInitDto.java
index d37c0f989..1137eac5e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/LisConfigManageInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/LisConfigManageInitDto.java
@@ -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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ObservationDefManageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/ObservationDefManageDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ObservationDefManageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/ObservationDefManageDto.java
index 27500493f..38ba11b4c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ObservationDefManageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/ObservationDefManageDto.java
@@ -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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ObservationDefManageInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/ObservationDefManageInitDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ObservationDefManageInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/ObservationDefManageInitDto.java
index dd38a56e1..4fb1650f1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ObservationDefManageInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/ObservationDefManageInitDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.Inspection.dto;
+package com.healthlink.his.web.Inspection.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ObservationDefSelParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/ObservationDefSelParam.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ObservationDefSelParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/ObservationDefSelParam.java
index a5e2e3e3c..2d3bb5a3e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ObservationDefSelParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/ObservationDefSelParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.Inspection.dto;
+package com.healthlink.his.web.Inspection.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ObservationDefStatusRequest.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/ObservationDefStatusRequest.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ObservationDefStatusRequest.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/ObservationDefStatusRequest.java
index e3b0a487f..c6edf9e06 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ObservationDefStatusRequest.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/ObservationDefStatusRequest.java
@@ -1,4 +1,4 @@
-package com.openhis.web.Inspection.dto;
+package com.healthlink.his.web.Inspection.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ReportResultManageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/ReportResultManageDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ReportResultManageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/ReportResultManageDto.java
index cf0813f6e..8b27f2682 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ReportResultManageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/ReportResultManageDto.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SampleCollectManageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/SampleCollectManageDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SampleCollectManageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/SampleCollectManageDto.java
index 45921310b..a4f94a608 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SampleCollectManageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/SampleCollectManageDto.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SampleCollectStatusRequest.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/SampleCollectStatusRequest.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SampleCollectStatusRequest.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/SampleCollectStatusRequest.java
index f57813de0..f22498747 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SampleCollectStatusRequest.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/SampleCollectStatusRequest.java
@@ -1,4 +1,4 @@
-package com.openhis.web.Inspection.dto;
+package com.healthlink.his.web.Inspection.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SpecimenDefManageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/SpecimenDefManageDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SpecimenDefManageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/SpecimenDefManageDto.java
index 055d5d0c1..ed9a6b743 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SpecimenDefManageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/SpecimenDefManageDto.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SpecimenDefManageInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/SpecimenDefManageInitDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SpecimenDefManageInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/SpecimenDefManageInitDto.java
index 446ecdb5c..4ca11c2fb 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SpecimenDefManageInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/SpecimenDefManageInitDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.Inspection.dto;
+package com.healthlink.his.web.Inspection.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SpecimenDefSelParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/SpecimenDefSelParam.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SpecimenDefSelParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/SpecimenDefSelParam.java
index ab3935040..7829d1e8d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SpecimenDefSelParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/SpecimenDefSelParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.Inspection.dto;
+package com.healthlink.his.web.Inspection.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SpecimenDefStatusRequest.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/SpecimenDefStatusRequest.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SpecimenDefStatusRequest.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/SpecimenDefStatusRequest.java
index f136a89e2..52bb969d9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SpecimenDefStatusRequest.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/SpecimenDefStatusRequest.java
@@ -1,4 +1,4 @@
-package com.openhis.web.Inspection.dto;
+package com.healthlink.his.web.Inspection.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/mapper/GroupRecMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/mapper/GroupRecMapper.java
similarity index 67%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/mapper/GroupRecMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/mapper/GroupRecMapper.java
index 6105f52a4..87414cffa 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/mapper/GroupRecMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/mapper/GroupRecMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.Inspection.mapper;
+package com.healthlink.his.web.Inspection.mapper;
 
 /**
  * @Description TODO
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/mapper/LisReportMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/mapper/LisReportMapper.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/mapper/LisReportMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/mapper/LisReportMapper.java
index 8010b25c2..a8908bb06 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/mapper/LisReportMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/mapper/LisReportMapper.java
@@ -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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/mapper/SampleCollectMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/mapper/SampleCollectMapper.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/mapper/SampleCollectMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/mapper/SampleCollectMapper.java
index e680eb568..d3e8065e1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/mapper/SampleCollectMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/mapper/SampleCollectMapper.java
@@ -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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/appservice/IAdjustPriceService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/appservice/IAdjustPriceService.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/appservice/IAdjustPriceService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/appservice/IAdjustPriceService.java
index 0f5abe6ac..41f5230dd 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/appservice/IAdjustPriceService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/appservice/IAdjustPriceService.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/appservice/impl/AdjustPriceServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/appservice/impl/AdjustPriceServiceImpl.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/appservice/impl/AdjustPriceServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/appservice/impl/AdjustPriceServiceImpl.java
index 75c3fcb85..975e9861b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/appservice/impl/AdjustPriceServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/appservice/impl/AdjustPriceServiceImpl.java
@@ -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<>();
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/controller/ChangePriceController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/controller/ChangePriceController.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/controller/ChangePriceController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/controller/ChangePriceController.java
index 899f6018e..4d046a750 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/controller/ChangePriceController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/controller/ChangePriceController.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/controller/ChangePriceDataListPageController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/controller/ChangePriceDataListPageController.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/controller/ChangePriceDataListPageController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/controller/ChangePriceDataListPageController.java
index c27e20b18..cd16fee82 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/controller/ChangePriceDataListPageController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/controller/ChangePriceDataListPageController.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/AdjustPriceDataVo.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/dto/AdjustPriceDataVo.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/AdjustPriceDataVo.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/dto/AdjustPriceDataVo.java
index 67286cd43..7c2ba51c1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/AdjustPriceDataVo.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/dto/AdjustPriceDataVo.java
@@ -1,4 +1,4 @@
-package com.openhis.web.adjustprice.dto;
+package com.healthlink.his.web.adjustprice.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/AdjustPriceManagerSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/dto/AdjustPriceManagerSearchParam.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/AdjustPriceManagerSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/dto/AdjustPriceManagerSearchParam.java
index 6735637ab..930da6d1a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/AdjustPriceManagerSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/dto/AdjustPriceManagerSearchParam.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/ChangePriceDataDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/dto/ChangePriceDataDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/ChangePriceDataDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/dto/ChangePriceDataDto.java
index 410234c79..287835805 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/ChangePriceDataDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/dto/ChangePriceDataDto.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/ChangePricePageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/dto/ChangePricePageDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/ChangePricePageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/dto/ChangePricePageDto.java
index 59c3e7970..4f38350c6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/ChangePricePageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/dto/ChangePricePageDto.java
@@ -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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/mapper/AdjustPriceMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/mapper/AdjustPriceMapper.java
similarity index 80%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/mapper/AdjustPriceMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/mapper/AdjustPriceMapper.java
index 3cae0122f..b3e642c56 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/mapper/AdjustPriceMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/mapper/AdjustPriceMapper.java
@@ -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);
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/sseservice/SseService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/sseservice/SseService.java
similarity index 100%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/sseservice/SseService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/sseservice/SseService.java
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/administration/controller/PractitionerPatientController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/administration/controller/PractitionerPatientController.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/administration/controller/PractitionerPatientController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/administration/controller/PractitionerPatientController.java
index 43bab66ab..96d3227fe 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/administration/controller/PractitionerPatientController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/administration/controller/PractitionerPatientController.java
@@ -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.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IAppointmentConfigAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/IAppointmentConfigAppService.java
similarity index 78%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IAppointmentConfigAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/IAppointmentConfigAppService.java
index 8680e9c6a..41ac08539 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IAppointmentConfigAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/IAppointmentConfigAppService.java
@@ -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接口
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IClinicRoomAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/IClinicRoomAppService.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IClinicRoomAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/IClinicRoomAppService.java
index 4fdbfc2f4..193c5c349 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IClinicRoomAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/IClinicRoomAppService.java
@@ -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 {
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IDeptAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/IDeptAppService.java
similarity index 75%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IDeptAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/IDeptAppService.java
index 41812d06a..3965887c3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IDeptAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/IDeptAppService.java
@@ -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 {
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IDeptAppointmentHoursAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/IDeptAppointmentHoursAppService.java
similarity index 76%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IDeptAppointmentHoursAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/IDeptAppointmentHoursAppService.java
index e970708a0..760d05583 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IDeptAppointmentHoursAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/IDeptAppointmentHoursAppService.java
@@ -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 {
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IDoctorScheduleAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/IDoctorScheduleAppService.java
similarity index 82%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IDoctorScheduleAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/IDoctorScheduleAppService.java
index b8d9e2dfe..1f27f82d0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IDoctorScheduleAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/IDoctorScheduleAppService.java
@@ -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 {
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/ISchedulePoolAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/ISchedulePoolAppService.java
similarity index 59%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/ISchedulePoolAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/ISchedulePoolAppService.java
index fa066194d..e363a732b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/ISchedulePoolAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/ISchedulePoolAppService.java
@@ -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);
diff --git a/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/IScheduleSlotAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/IScheduleSlotAppService.java
new file mode 100755
index 000000000..17839eecc
--- /dev/null
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/IScheduleSlotAppService.java
@@ -0,0 +1,4 @@
+package com.healthlink.his.web.appointmentmanage.appservice;
+
+public interface IScheduleSlotAppService {
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/ITicketAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/ITicketAppService.java
similarity index 78%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/ITicketAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/ITicketAppService.java
index 9891c12e8..175f05c4e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/ITicketAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/ITicketAppService.java
@@ -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);
 
     /**
      * 取消预约
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/AppointmentConfigAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/impl/AppointmentConfigAppServiceImpl.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/AppointmentConfigAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/impl/AppointmentConfigAppServiceImpl.java
index 8467b74f4..4e28f2b1c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/AppointmentConfigAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/impl/AppointmentConfigAppServiceImpl.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/ClinicRoomAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/impl/ClinicRoomAppServiceImpl.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/ClinicRoomAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/impl/ClinicRoomAppServiceImpl.java
index 2492c17d5..63dbcd2ed 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/ClinicRoomAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/impl/ClinicRoomAppServiceImpl.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DeptAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/impl/DeptAppServiceImpl.java
similarity index 79%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DeptAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/impl/DeptAppServiceImpl.java
index fbca6ad03..f6d1a7ef7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DeptAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/impl/DeptAppServiceImpl.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DeptAppointmentHoursAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/impl/DeptAppointmentHoursAppServiceImpl.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DeptAppointmentHoursAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/impl/DeptAppointmentHoursAppServiceImpl.java
index 14e499499..aebf94054 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DeptAppointmentHoursAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/impl/DeptAppointmentHoursAppServiceImpl.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DoctorScheduleAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/impl/DoctorScheduleAppServiceImpl.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DoctorScheduleAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/impl/DoctorScheduleAppServiceImpl.java
index 535de419c..522de7824 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DoctorScheduleAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/impl/DoctorScheduleAppServiceImpl.java
@@ -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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/SchedulePoolAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/impl/SchedulePoolAppServiceImpl.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/SchedulePoolAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/impl/SchedulePoolAppServiceImpl.java
index 564fffaee..5698e6009 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/SchedulePoolAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/impl/SchedulePoolAppServiceImpl.java
@@ -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;
diff --git a/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/impl/ScheduleSlotAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/impl/ScheduleSlotAppServiceImpl.java
new file mode 100755
index 000000000..5941fe5fe
--- /dev/null
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/impl/ScheduleSlotAppServiceImpl.java
@@ -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 {
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java
index ae58eb11e..21d6421b2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java
@@ -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();
 
                 // --- 基础字段处理 ---
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/ClinicRoomController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/controller/ClinicRoomController.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/ClinicRoomController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/controller/ClinicRoomController.java
index b66bd165d..54b68c3ad 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/ClinicRoomController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/controller/ClinicRoomController.java
@@ -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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DeptAppthoursController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/controller/DeptAppthoursController.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DeptAppthoursController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/controller/DeptAppthoursController.java
index 1c32af324..7e53f43b7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DeptAppthoursController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/controller/DeptAppthoursController.java
@@ -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.DeptAppointmentHours;
-import com.openhis.web.appointmentmanage.appservice.IDeptAppointmentHoursAppService;
+import com.healthlink.his.appointmentmanage.domain.DeptAppointmentHours;
+import com.healthlink.his.web.appointmentmanage.appservice.IDeptAppointmentHoursAppService;
 import org.springframework.web.bind.annotation.*;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DeptController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/controller/DeptController.java
similarity index 82%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DeptController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/controller/DeptController.java
index 162e617f6..4afe14c5b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DeptController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/controller/DeptController.java
@@ -1,9 +1,9 @@
-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.AppointmentConfig;
-import com.openhis.web.appointmentmanage.appservice.IAppointmentConfigAppService;
-import com.openhis.web.appointmentmanage.appservice.IDeptAppService;
+import com.healthlink.his.appointmentmanage.domain.AppointmentConfig;
+import com.healthlink.his.web.appointmentmanage.appservice.IAppointmentConfigAppService;
+import com.healthlink.his.web.appointmentmanage.appservice.IDeptAppService;
 import org.springframework.web.bind.annotation.*;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DoctorScheduleController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/controller/DoctorScheduleController.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DoctorScheduleController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/controller/DoctorScheduleController.java
index cd1548560..3e5a96c2d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DoctorScheduleController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/controller/DoctorScheduleController.java
@@ -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.DoctorSchedule;
-import com.openhis.web.appointmentmanage.appservice.IDoctorScheduleAppService;
+import com.healthlink.his.appointmentmanage.domain.DoctorSchedule;
+import com.healthlink.his.web.appointmentmanage.appservice.IDoctorScheduleAppService;
 import org.springframework.web.bind.annotation.*;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/SchedulePoolController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/controller/SchedulePoolController.java
similarity index 76%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/SchedulePoolController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/controller/SchedulePoolController.java
index 19335a237..102d817d3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/SchedulePoolController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/controller/SchedulePoolController.java
@@ -1,9 +1,9 @@
-package com.openhis.web.appointmentmanage.controller;
+package com.healthlink.his.web.appointmentmanage.controller;
 
 
 import com.core.common.core.domain.R;
-import com.openhis.web.appointmentmanage.appservice.ISchedulePoolAppService;
-import com.openhis.web.appointmentmanage.dto.SchedulePoolDto;
+import com.healthlink.his.web.appointmentmanage.appservice.ISchedulePoolAppService;
+import com.healthlink.his.web.appointmentmanage.dto.SchedulePoolDto;
 import org.springframework.web.bind.annotation.*;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/ScheduleSlotController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/controller/ScheduleSlotController.java
similarity index 78%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/ScheduleSlotController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/controller/ScheduleSlotController.java
index 3e644ef69..d4d9a933b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/ScheduleSlotController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/controller/ScheduleSlotController.java
@@ -1,4 +1,4 @@
-package com.openhis.web.appointmentmanage.controller;
+package com.healthlink.his.web.appointmentmanage.controller;
 
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/TicketController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/controller/TicketController.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/TicketController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/controller/TicketController.java
index d089345ff..066f3e1a5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/TicketController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/controller/TicketController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.appointmentmanage.controller;
+package com.healthlink.his.web.appointmentmanage.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.annotation.Anonymous;
 import com.core.common.core.domain.R;
-import com.openhis.appointmentmanage.domain.AppointmentBookDTO;
-import com.openhis.appointmentmanage.dto.TicketQueryDTO;
-import com.openhis.web.appointmentmanage.appservice.ITicketAppService;
-import com.openhis.web.appointmentmanage.dto.TicketDto;
+import com.healthlink.his.appointmentmanage.domain.AppointmentBookDTO;
+import com.healthlink.his.appointmentmanage.dto.TicketQueryDTO;
+import com.healthlink.his.web.appointmentmanage.appservice.ITicketAppService;
+import com.healthlink.his.web.appointmentmanage.dto.TicketDto;
 
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/dto/SchedulePoolDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/dto/SchedulePoolDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/dto/SchedulePoolDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/dto/SchedulePoolDto.java
index 1e440b546..dda9f6ad0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/dto/SchedulePoolDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/dto/SchedulePoolDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.appointmentmanage.dto;
+package com.healthlink.his.web.appointmentmanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/dto/TicketDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/dto/TicketDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/dto/TicketDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/dto/TicketDto.java
index 6d3bba6ca..2b604a77b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/dto/TicketDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/dto/TicketDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.appointmentmanage.dto;
+package com.healthlink.his.web.appointmentmanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/mapper/DeptAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/mapper/DeptAppMapper.java
similarity index 63%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/mapper/DeptAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/mapper/DeptAppMapper.java
index ab5737309..284f5d18b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/mapper/DeptAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/mapper/DeptAppMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.appointmentmanage.mapper;
+package com.healthlink.his.web.appointmentmanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/mapper/DoctorScheduleAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/mapper/DoctorScheduleAppMapper.java
similarity index 65%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/mapper/DoctorScheduleAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/mapper/DoctorScheduleAppMapper.java
index 8531440f7..7aaf2d473 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/mapper/DoctorScheduleAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/mapper/DoctorScheduleAppMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.appointmentmanage.mapper;
+package com.healthlink.his.web.appointmentmanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/mapper/SchedulePoolAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/mapper/SchedulePoolAppMapper.java
similarity index 65%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/mapper/SchedulePoolAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/mapper/SchedulePoolAppMapper.java
index c686ddc84..9b5e8ef5b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/mapper/SchedulePoolAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/mapper/SchedulePoolAppMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.appointmentmanage.mapper;
+package com.healthlink.his.web.appointmentmanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/mapper/ScheduleSlotAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/mapper/ScheduleSlotAppMapper.java
similarity index 65%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/mapper/ScheduleSlotAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/mapper/ScheduleSlotAppMapper.java
index faa143071..2b04c4128 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/mapper/ScheduleSlotAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/mapper/ScheduleSlotAppMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.appointmentmanage.mapper;
+package com.healthlink.his.web.appointmentmanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IBodyStructureAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/IBodyStructureAppService.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IBodyStructureAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/IBodyStructureAppService.java
index 6dd8dad34..94f37e6f3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IBodyStructureAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/IBodyStructureAppService.java
@@ -1,8 +1,8 @@
-package com.openhis.web.basedatamanage.appservice;
+package com.healthlink.his.web.basedatamanage.appservice;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
-import com.openhis.web.basedatamanage.dto.BodyStructureDto;
+import com.healthlink.his.web.basedatamanage.dto.BodyStructureDto;
 
 import jakarta.servlet.http.HttpServletRequest;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/ILocationAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/ILocationAppService.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/ILocationAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/ILocationAppService.java
index a2e1bb21c..82c70ef3e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/ILocationAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/ILocationAppService.java
@@ -1,8 +1,8 @@
-package com.openhis.web.basedatamanage.appservice;
+package com.healthlink.his.web.basedatamanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.basedatamanage.dto.LocationAddOrEditDto;
-import com.openhis.web.basedatamanage.dto.LocationPageParam;
+import com.healthlink.his.web.basedatamanage.dto.LocationAddOrEditDto;
+import com.healthlink.his.web.basedatamanage.dto.LocationPageParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOperatingRoomAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/IOperatingRoomAppService.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOperatingRoomAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/IOperatingRoomAppService.java
index 317bf1dd5..69b1ebff1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOperatingRoomAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/IOperatingRoomAppService.java
@@ -1,8 +1,8 @@
-package com.openhis.web.basedatamanage.appservice;
+package com.healthlink.his.web.basedatamanage.appservice;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.web.basedatamanage.dto.OperatingRoomDto;
+import com.healthlink.his.web.basedatamanage.dto.OperatingRoomDto;
 import org.springframework.validation.annotation.Validated;
 
 import jakarta.servlet.http.HttpServletRequest;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOrganizationAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/IOrganizationAppService.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOrganizationAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/IOrganizationAppService.java
index c64bd27a1..88acae0a4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOrganizationAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/IOrganizationAppService.java
@@ -1,8 +1,8 @@
-package com.openhis.web.basedatamanage.appservice;
+package com.healthlink.his.web.basedatamanage.appservice;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
-import com.openhis.web.basedatamanage.dto.OrganizationDto;
+import com.healthlink.his.web.basedatamanage.dto.OrganizationDto;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOrganizationLocationAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/IOrganizationLocationAppService.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOrganizationLocationAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/IOrganizationLocationAppService.java
index cf5786d17..279e517b5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOrganizationLocationAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/IOrganizationLocationAppService.java
@@ -1,8 +1,8 @@
-package com.openhis.web.basedatamanage.appservice;
+package com.healthlink.his.web.basedatamanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.basedatamanage.dto.OrgLocQueryDto;
-import com.openhis.web.basedatamanage.dto.OrgLocQueryParam;
+import com.healthlink.his.web.basedatamanage.dto.OrgLocQueryDto;
+import com.healthlink.his.web.basedatamanage.dto.OrgLocQueryParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IPractitionerAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/IPractitionerAppService.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IPractitionerAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/IPractitionerAppService.java
index f9e56bce7..7ddf0c805 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IPractitionerAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/IPractitionerAppService.java
@@ -1,9 +1,9 @@
-package com.openhis.web.basedatamanage.appservice;
+package com.healthlink.his.web.basedatamanage.appservice;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.web.basedatamanage.dto.SelectableOrgDto;
-import com.openhis.web.basedatamanage.dto.UserAndPractitionerDto;
+import com.healthlink.his.web.basedatamanage.dto.SelectableOrgDto;
+import com.healthlink.his.web.basedatamanage.dto.UserAndPractitionerDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IPractitionerRoleAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/IPractitionerRoleAppService.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IPractitionerRoleAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/IPractitionerRoleAppService.java
index b6a67bcef..ad6b5c730 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IPractitionerRoleAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/IPractitionerRoleAppService.java
@@ -1,8 +1,8 @@
-package com.openhis.web.basedatamanage.appservice;
+package com.healthlink.his.web.basedatamanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.basedatamanage.dto.PractRoleSearchParam;
-import com.openhis.web.basedatamanage.dto.PractitionerRoleDto;
+import com.healthlink.his.web.basedatamanage.dto.PractRoleSearchParam;
+import com.healthlink.his.web.basedatamanage.dto.PractitionerRoleDto;
 
 import jakarta.servlet.http.HttpServletRequest;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/BodyStructureAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/BodyStructureAppServiceImpl.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/BodyStructureAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/BodyStructureAppServiceImpl.java
index 1d0dcaa11..f1468d107 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/BodyStructureAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/BodyStructureAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.basedatamanage.appservice.impl;
+package com.healthlink.his.web.basedatamanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
@@ -6,15 +6,15 @@ import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.ChineseConvertUtils;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.StringUtils;
-import com.openhis.administration.domain.BodyStructure;
-import com.openhis.administration.service.IBodyStructureService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.AssignSeqEnum;
-import com.openhis.common.enums.PublicationStatus;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.web.basedatamanage.appservice.IBodyStructureAppService;
-import com.openhis.web.basedatamanage.dto.BodyStructureDto;
+import com.healthlink.his.administration.domain.BodyStructure;
+import com.healthlink.his.administration.service.IBodyStructureService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.AssignSeqEnum;
+import com.healthlink.his.common.enums.PublicationStatus;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.web.basedatamanage.appservice.IBodyStructureAppService;
+import com.healthlink.his.web.basedatamanage.dto.BodyStructureDto;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/LocationAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/LocationAppServiceImpl.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/LocationAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/LocationAppServiceImpl.java
index 1d580a511..3d5709847 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/LocationAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/LocationAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.basedatamanage.appservice.impl;
+package com.healthlink.his.web.basedatamanage.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -6,21 +6,21 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.enums.DelFlag;
 import com.core.common.utils.*;
-import com.openhis.administration.domain.EncounterLocation;
-import com.openhis.administration.domain.Location;
-import com.openhis.administration.mapper.LocationMapper;
-import com.openhis.administration.service.IEncounterLocationService;
-import com.openhis.administration.service.ILocationService;
-import com.openhis.administration.service.IPractitionerRoleService;
-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.HisPageUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.basedatamanage.appservice.ILocationAppService;
-import com.openhis.web.basedatamanage.dto.*;
-import com.openhis.web.common.appservice.ICommonService;
+import com.healthlink.his.administration.domain.EncounterLocation;
+import com.healthlink.his.administration.domain.Location;
+import com.healthlink.his.administration.mapper.LocationMapper;
+import com.healthlink.his.administration.service.IEncounterLocationService;
+import com.healthlink.his.administration.service.ILocationService;
+import com.healthlink.his.administration.service.IPractitionerRoleService;
+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.HisPageUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.basedatamanage.appservice.ILocationAppService;
+import com.healthlink.his.web.basedatamanage.dto.*;
+import com.healthlink.his.web.common.appservice.ICommonService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -130,14 +130,14 @@ public class LocationAppServiceImpl implements ILocationAppService {
                     }
                 } else if (LocationForm.HOUSE.getValue().equals(location.getFormEnum())) {
                     // 检查病房下是否有启用的病床
-                    List<com.openhis.web.common.dto.LocationDto> activeBeds =
+                    List<com.healthlink.his.web.common.dto.LocationDto> activeBeds =
                         commonService.getChildLocation(location.getId(), LocationForm.BED.getValue());
                     if ((activeBeds != null && !activeBeds.isEmpty())) {
                         return R.fail("病房下有启用或被占用的床位，不可停用");
                     }
                 } else if (LocationForm.WARD.getValue().equals(location.getFormEnum())) {
                     // 检查病区下是否有启用的病房
-                    List<com.openhis.web.common.dto.LocationDto> activeHouses =
+                    List<com.healthlink.his.web.common.dto.LocationDto> activeHouses =
                         commonService.getChildLocation(location.getId(), LocationForm.HOUSE.getValue());
                     if ((activeHouses != null && !activeHouses.isEmpty())) {
                         return R.fail("病区下有启用或被占用的病房，不可停用");
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OperatingRoomAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/OperatingRoomAppServiceImpl.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OperatingRoomAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/OperatingRoomAppServiceImpl.java
index e67e472de..82c619111 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OperatingRoomAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/OperatingRoomAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.basedatamanage.appservice.impl;
+package com.healthlink.his.web.basedatamanage.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -8,17 +8,17 @@ import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.ChineseConvertUtils;
 import com.core.common.utils.DictUtils;
 import com.core.common.utils.StringUtils;
-import com.openhis.administration.domain.OperatingRoom;
-import com.openhis.administration.mapper.OperatingRoomMapper;
-import com.openhis.administration.service.IOperatingRoomService;
+import com.healthlink.his.administration.domain.OperatingRoom;
+import com.healthlink.his.administration.mapper.OperatingRoomMapper;
+import com.healthlink.his.administration.service.IOperatingRoomService;
 import org.springframework.beans.BeanUtils;
-import com.openhis.common.enums.AssignSeqEnum;
-import com.openhis.common.enums.LocationStatus;
-import com.openhis.common.utils.HisPageUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.basedatamanage.appservice.IOperatingRoomAppService;
-import com.openhis.web.basedatamanage.dto.OperatingRoomDto;
-import com.openhis.web.common.appservice.ICommonService;
+import com.healthlink.his.common.enums.AssignSeqEnum;
+import com.healthlink.his.common.enums.LocationStatus;
+import com.healthlink.his.common.utils.HisPageUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.basedatamanage.appservice.IOperatingRoomAppService;
+import com.healthlink.his.web.basedatamanage.dto.OperatingRoomDto;
+import com.healthlink.his.web.common.appservice.ICommonService;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/OrganizationAppServiceImpl.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/OrganizationAppServiceImpl.java
index 35bdb0b6f..6721b45ff 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/OrganizationAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.basedatamanage.appservice.impl;
+package com.healthlink.his.web.basedatamanage.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,18 +7,18 @@ import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.StringUtils;
-import com.openhis.administration.domain.Organization;
-import com.openhis.administration.mapper.OrganizationMapper;
-import com.openhis.administration.service.IOrganizationService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.AccountStatus;
-import com.openhis.common.enums.AssignSeqEnum;
-import com.openhis.common.enums.OrganizationClass;
-import com.openhis.common.enums.OrganizationType;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.web.basedatamanage.appservice.IOrganizationAppService;
-import com.openhis.web.basedatamanage.dto.OrganizationDto;
+import com.healthlink.his.administration.domain.Organization;
+import com.healthlink.his.administration.mapper.OrganizationMapper;
+import com.healthlink.his.administration.service.IOrganizationService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.AccountStatus;
+import com.healthlink.his.common.enums.AssignSeqEnum;
+import com.healthlink.his.common.enums.OrganizationClass;
+import com.healthlink.his.common.enums.OrganizationType;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.web.basedatamanage.appservice.IOrganizationAppService;
+import com.healthlink.his.web.basedatamanage.dto.OrganizationDto;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java
index 5d702232d..272ce3cd1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java
@@ -1,29 +1,29 @@
-package com.openhis.web.basedatamanage.appservice.impl;
+package com.healthlink.his.web.basedatamanage.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.Location;
-import com.openhis.administration.domain.Organization;
-import com.openhis.administration.domain.OrganizationLocation;
-import com.openhis.workflow.domain.ActivityDefinition;
-import com.openhis.administration.mapper.OrganizationLocationMapper;
-import com.openhis.administration.service.ILocationService;
-import com.openhis.administration.service.IOrganizationLocationService;
-import com.openhis.administration.service.IOrganizationService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.LocationForm;
-import com.openhis.common.enums.OrganizationType;
-import com.openhis.common.utils.DateTimeUtils;
-import com.openhis.common.utils.HisPageUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.basedatamanage.appservice.IOrganizationLocationAppService;
-import com.openhis.web.basedatamanage.dto.OrgLocInitDto;
-import com.openhis.web.basedatamanage.dto.OrgLocQueryDto;
-import com.openhis.web.basedatamanage.dto.OrgLocQueryParam;
-import com.openhis.workflow.mapper.ActivityDefinitionMapper;
+import com.healthlink.his.administration.domain.Location;
+import com.healthlink.his.administration.domain.Organization;
+import com.healthlink.his.administration.domain.OrganizationLocation;
+import com.healthlink.his.workflow.domain.ActivityDefinition;
+import com.healthlink.his.administration.mapper.OrganizationLocationMapper;
+import com.healthlink.his.administration.service.ILocationService;
+import com.healthlink.his.administration.service.IOrganizationLocationService;
+import com.healthlink.his.administration.service.IOrganizationService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.LocationForm;
+import com.healthlink.his.common.enums.OrganizationType;
+import com.healthlink.his.common.utils.DateTimeUtils;
+import com.healthlink.his.common.utils.HisPageUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.basedatamanage.appservice.IOrganizationLocationAppService;
+import com.healthlink.his.web.basedatamanage.dto.OrgLocInitDto;
+import com.healthlink.his.web.basedatamanage.dto.OrgLocQueryDto;
+import com.healthlink.his.web.basedatamanage.dto.OrgLocQueryParam;
+import com.healthlink.his.workflow.mapper.ActivityDefinitionMapper;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/PractitionerAppServiceImpl.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/PractitionerAppServiceImpl.java
index f84509ae3..7ea64c371 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/PractitionerAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.basedatamanage.appservice.impl;
+package com.healthlink.his.web.basedatamanage.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -14,26 +14,26 @@ import com.core.framework.web.service.TokenService;
 import com.core.common.core.domain.model.LoginUserExtend;
 import com.core.system.service.ISysTenantService;
 import com.core.system.service.ISysUserService;
-import com.openhis.administration.domain.BizUser;
-import com.openhis.administration.domain.BizUserRole;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.domain.PractitionerRole;
-import com.openhis.administration.service.IBizUserRoleService;
-import com.openhis.administration.service.IBizUserService;
-import com.openhis.administration.service.IPractitionerRoleService;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.AccountStatus;
-import com.openhis.common.enums.AdministrativeGender;
-import com.openhis.common.enums.AssignSeqEnum;
-import com.openhis.common.enums.PractitionerRoles;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.basedatamanage.appservice.IPractitionerAppService;
-import com.openhis.web.basedatamanage.dto.PractitionerOrgAndLocationDto;
-import com.openhis.web.basedatamanage.dto.PractitionerRolesDto;
-import com.openhis.web.basedatamanage.dto.SelectableOrgDto;
-import com.openhis.web.basedatamanage.dto.UserAndPractitionerDto;
-import com.openhis.web.basedatamanage.mapper.PractitionerAppAppMapper;
+import com.healthlink.his.administration.domain.BizUser;
+import com.healthlink.his.administration.domain.BizUserRole;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.domain.PractitionerRole;
+import com.healthlink.his.administration.service.IBizUserRoleService;
+import com.healthlink.his.administration.service.IBizUserService;
+import com.healthlink.his.administration.service.IPractitionerRoleService;
+import com.healthlink.his.administration.service.IPractitionerService;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.AccountStatus;
+import com.healthlink.his.common.enums.AdministrativeGender;
+import com.healthlink.his.common.enums.AssignSeqEnum;
+import com.healthlink.his.common.enums.PractitionerRoles;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.basedatamanage.appservice.IPractitionerAppService;
+import com.healthlink.his.web.basedatamanage.dto.PractitionerOrgAndLocationDto;
+import com.healthlink.his.web.basedatamanage.dto.PractitionerRolesDto;
+import com.healthlink.his.web.basedatamanage.dto.SelectableOrgDto;
+import com.healthlink.his.web.basedatamanage.dto.UserAndPractitionerDto;
+import com.healthlink.his.web.basedatamanage.mapper.PractitionerAppAppMapper;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerRoleAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/PractitionerRoleAppServiceImpl.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerRoleAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/PractitionerRoleAppServiceImpl.java
index d5cdc31e7..4b1a2337d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerRoleAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/PractitionerRoleAppServiceImpl.java
@@ -1,18 +1,18 @@
-package com.openhis.web.basedatamanage.appservice.impl;
+package com.healthlink.his.web.basedatamanage.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.PractitionerRole;
-import com.openhis.administration.mapper.PractitionerRoleMapper;
-import com.openhis.administration.service.IPractitionerRoleService;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.utils.HisPageUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.basedatamanage.appservice.IPractitionerRoleAppService;
-import com.openhis.web.basedatamanage.dto.PractRoleSearchParam;
-import com.openhis.web.basedatamanage.dto.PractitionerRoleDto;
+import com.healthlink.his.administration.domain.PractitionerRole;
+import com.healthlink.his.administration.mapper.PractitionerRoleMapper;
+import com.healthlink.his.administration.service.IPractitionerRoleService;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.utils.HisPageUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.basedatamanage.appservice.IPractitionerRoleAppService;
+import com.healthlink.his.web.basedatamanage.dto.PractRoleSearchParam;
+import com.healthlink.his.web.basedatamanage.dto.PractitionerRoleDto;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/BodyStructureController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/controller/BodyStructureController.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/BodyStructureController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/controller/BodyStructureController.java
index 38ec7cd13..0af78c385 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/BodyStructureController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/controller/BodyStructureController.java
@@ -1,14 +1,14 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.basedatamanage.controller;
+package com.healthlink.his.web.basedatamanage.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.MessageUtils;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.web.basedatamanage.appservice.IBodyStructureAppService;
-import com.openhis.web.basedatamanage.dto.BodyStructureDto;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.web.basedatamanage.appservice.IBodyStructureAppService;
+import com.healthlink.his.web.basedatamanage.dto.BodyStructureDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/FrequencyController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/controller/FrequencyController.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/FrequencyController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/controller/FrequencyController.java
index 1c961d6a3..769a14109 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/FrequencyController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/controller/FrequencyController.java
@@ -1,16 +1,16 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.basedatamanage.controller;
+package com.healthlink.his.web.basedatamanage.controller;
 
 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.core.common.utils.MessageUtils;
-import com.openhis.administration.domain.Frequency;
-import com.openhis.administration.service.IFrequencyService;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.web.basedatamanage.dto.FrequencyDto;
+import com.healthlink.his.administration.domain.Frequency;
+import com.healthlink.his.administration.service.IFrequencyService;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.web.basedatamanage.dto.FrequencyDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/LocationController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/controller/LocationController.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/LocationController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/controller/LocationController.java
index 7e25c5385..57c93a5f9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/LocationController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/controller/LocationController.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.basedatamanage.controller;
+package com.healthlink.his.web.basedatamanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.basedatamanage.appservice.ILocationAppService;
-import com.openhis.web.basedatamanage.dto.LocationAddOrEditDto;
-import com.openhis.web.basedatamanage.dto.LocationPageParam;
+import com.healthlink.his.web.basedatamanage.appservice.ILocationAppService;
+import com.healthlink.his.web.basedatamanage.dto.LocationAddOrEditDto;
+import com.healthlink.his.web.basedatamanage.dto.LocationPageParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OperatingRoomController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/controller/OperatingRoomController.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OperatingRoomController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/controller/OperatingRoomController.java
index dbbc6ff63..766811e71 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OperatingRoomController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/controller/OperatingRoomController.java
@@ -1,8 +1,8 @@
-package com.openhis.web.basedatamanage.controller;
+package com.healthlink.his.web.basedatamanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.basedatamanage.appservice.IOperatingRoomAppService;
-import com.openhis.web.basedatamanage.dto.OperatingRoomDto;
+import com.healthlink.his.web.basedatamanage.appservice.IOperatingRoomAppService;
+import com.healthlink.his.web.basedatamanage.dto.OperatingRoomDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/controller/OrganizationController.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/controller/OrganizationController.java
index 3c66a53cc..598aad6aa 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/controller/OrganizationController.java
@@ -1,16 +1,16 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.basedatamanage.controller;
+package com.healthlink.his.web.basedatamanage.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.StringUtils;
 import com.core.common.utils.MessageUtils;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.web.basedatamanage.appservice.IOrganizationAppService;
-import com.openhis.web.basedatamanage.dto.OrganizationDto;
-import com.openhis.web.basedatamanage.dto.OrganizationInitDto;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.web.basedatamanage.appservice.IOrganizationAppService;
+import com.healthlink.his.web.basedatamanage.dto.OrganizationDto;
+import com.healthlink.his.web.basedatamanage.dto.OrganizationInitDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationLocationController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/controller/OrganizationLocationController.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationLocationController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/controller/OrganizationLocationController.java
index ae88a4e1a..9ab694c39 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationLocationController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/controller/OrganizationLocationController.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.basedatamanage.controller;
+package com.healthlink.his.web.basedatamanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.basedatamanage.appservice.IOrganizationLocationAppService;
-import com.openhis.web.basedatamanage.dto.OrgLocQueryDto;
-import com.openhis.web.basedatamanage.dto.OrgLocQueryParam;
+import com.healthlink.his.web.basedatamanage.appservice.IOrganizationLocationAppService;
+import com.healthlink.his.web.basedatamanage.dto.OrgLocQueryDto;
+import com.healthlink.his.web.basedatamanage.dto.OrgLocQueryParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/controller/PractitionerController.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/controller/PractitionerController.java
index 1df22754a..c22541c9a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/controller/PractitionerController.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.basedatamanage.controller;
+package com.healthlink.his.web.basedatamanage.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.web.basedatamanage.appservice.IPractitionerAppService;
-import com.openhis.web.basedatamanage.dto.UserAndPractitionerDto;
+import com.healthlink.his.web.basedatamanage.appservice.IPractitionerAppService;
+import com.healthlink.his.web.basedatamanage.dto.UserAndPractitionerDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerRoleController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/controller/PractitionerRoleController.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerRoleController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/controller/PractitionerRoleController.java
index 9440fb966..b2d5aaec7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerRoleController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/controller/PractitionerRoleController.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.basedatamanage.controller;
+package com.healthlink.his.web.basedatamanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.basedatamanage.appservice.IPractitionerRoleAppService;
-import com.openhis.web.basedatamanage.dto.PractRoleSearchParam;
-import com.openhis.web.basedatamanage.dto.PractitionerRoleDto;
+import com.healthlink.his.web.basedatamanage.appservice.IPractitionerRoleAppService;
+import com.healthlink.his.web.basedatamanage.dto.PractRoleSearchParam;
+import com.healthlink.his.web.basedatamanage.dto.PractitionerRoleDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/BodyStructureDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/BodyStructureDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/BodyStructureDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/BodyStructureDto.java
index fee592da3..99d98a0e6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/BodyStructureDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/BodyStructureDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.basedatamanage.dto;
+package com.healthlink.his.web.basedatamanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/FrequencyDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/FrequencyDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/FrequencyDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/FrequencyDto.java
index 1cb03d516..14e4820d0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/FrequencyDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/FrequencyDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.basedatamanage.dto;
+package com.healthlink.his.web.basedatamanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationAddOrEditDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/LocationAddOrEditDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationAddOrEditDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/LocationAddOrEditDto.java
index 64cef00c3..9f8c58ce0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationAddOrEditDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/LocationAddOrEditDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.basedatamanage.dto;
+package com.healthlink.his.web.basedatamanage.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/LocationDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/LocationDto.java
index 7305d7695..ede15df23 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/LocationDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.basedatamanage.dto;
+package com.healthlink.his.web.basedatamanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/LocationInfoDto.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/LocationInfoDto.java
index bd52fee8e..3fb20e0d2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/LocationInfoDto.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.basedatamanage.dto;
+package com.healthlink.his.web.basedatamanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/LocationInitDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/LocationInitDto.java
index c49ea3daa..0ae779e1e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/LocationInitDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.basedatamanage.dto;
+package com.healthlink.his.web.basedatamanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationPageParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/LocationPageParam.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationPageParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/LocationPageParam.java
index 148100d42..339d59006 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationPageParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/LocationPageParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.basedatamanage.dto;
+package com.healthlink.his.web.basedatamanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OperatingRoomDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/OperatingRoomDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OperatingRoomDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/OperatingRoomDto.java
index 8c85f92ef..6de70f7e0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OperatingRoomDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/OperatingRoomDto.java
@@ -1,8 +1,8 @@
-package com.openhis.web.basedatamanage.dto;
+package com.healthlink.his.web.basedatamanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/OrgLocInitDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/OrgLocInitDto.java
index 99979806e..0531ff80b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/OrgLocInitDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.basedatamanage.dto;
+package com.healthlink.his.web.basedatamanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/OrgLocQueryDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/OrgLocQueryDto.java
index 8d8583026..a3d0af5cc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/OrgLocQueryDto.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.basedatamanage.dto;
+package com.healthlink.his.web.basedatamanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/OrgLocQueryParam.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/OrgLocQueryParam.java
index 0d8da67af..51082d01c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/OrgLocQueryParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.basedatamanage.dto;
+package com.healthlink.his.web.basedatamanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/OrganizationDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/OrganizationDto.java
index 43ef819c5..b5ca387c0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/OrganizationDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.basedatamanage.dto;
+package com.healthlink.his.web.basedatamanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/OrganizationInitDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/OrganizationInitDto.java
index 95d6871cb..ede583804 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/OrganizationInitDto.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.basedatamanage.dto;
+package com.healthlink.his.web.basedatamanage.dto;
 
-import com.openhis.common.enums.OrganizationClass;
-import com.openhis.common.enums.OrganizationType;
+import com.healthlink.his.common.enums.OrganizationClass;
+import com.healthlink.his.common.enums.OrganizationType;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractRoleSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/PractRoleSearchParam.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractRoleSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/PractRoleSearchParam.java
index 0c795217f..60ea5f12e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractRoleSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/PractRoleSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.basedatamanage.dto;
+package com.healthlink.his.web.basedatamanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/PractSearchParam.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/PractSearchParam.java
index 0e2ed7c4a..469d58553 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/PractSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.basedatamanage.dto;
+package com.healthlink.his.web.basedatamanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/PractitionerDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/PractitionerDto.java
index f89b43440..085f80d32 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/PractitionerDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.basedatamanage.dto;
+package com.healthlink.his.web.basedatamanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerOrgAndLocationDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/PractitionerOrgAndLocationDto.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerOrgAndLocationDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/PractitionerOrgAndLocationDto.java
index 057c41acd..fd2b4fd84 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerOrgAndLocationDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/PractitionerOrgAndLocationDto.java
@@ -1,8 +1,8 @@
-package com.openhis.web.basedatamanage.dto;
+package com.healthlink.his.web.basedatamanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRoleDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/PractitionerRoleDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRoleDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/PractitionerRoleDto.java
index a245534c4..aaa66e548 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRoleDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/PractitionerRoleDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.basedatamanage.dto;
+package com.healthlink.his.web.basedatamanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRolesDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/PractitionerRolesDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRolesDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/PractitionerRolesDto.java
index 1a87bd87d..13b6423f2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRolesDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/PractitionerRolesDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.basedatamanage.dto;
+package com.healthlink.his.web.basedatamanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/SelectableOrgDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/SelectableOrgDto.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/SelectableOrgDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/SelectableOrgDto.java
index b8175a0ed..945f2db57 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/SelectableOrgDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/SelectableOrgDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.basedatamanage.dto;
+package com.healthlink.his.web.basedatamanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/UserAndPractitionerDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/UserAndPractitionerDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/UserAndPractitionerDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/UserAndPractitionerDto.java
index ae6bf421c..f258b9970 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/UserAndPractitionerDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/UserAndPractitionerDto.java
@@ -1,8 +1,8 @@
-package com.openhis.web.basedatamanage.dto;
+package com.healthlink.his.web.basedatamanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/mapper/PractitionerAppAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/mapper/PractitionerAppAppMapper.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/mapper/PractitionerAppAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/mapper/PractitionerAppAppMapper.java
index 3245fea58..bece40f10 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/mapper/PractitionerAppAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/mapper/PractitionerAppAppMapper.java
@@ -1,13 +1,13 @@
-package com.openhis.web.basedatamanage.mapper;
+package com.healthlink.his.web.basedatamanage.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.basedatamanage.dto.PractitionerOrgAndLocationDto;
-import com.openhis.web.basedatamanage.dto.PractitionerRolesDto;
-import com.openhis.web.basedatamanage.dto.SelectableOrgDto;
-import com.openhis.web.basedatamanage.dto.UserAndPractitionerDto;
+import com.healthlink.his.web.basedatamanage.dto.PractitionerOrgAndLocationDto;
+import com.healthlink.his.web.basedatamanage.dto.PractitionerRolesDto;
+import com.healthlink.his.web.basedatamanage.dto.SelectableOrgDto;
+import com.healthlink.his.web.basedatamanage.dto.UserAndPractitionerDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/controller/InvoiceController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicmanage/controller/InvoiceController.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/controller/InvoiceController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicmanage/controller/InvoiceController.java
index ab19b311b..6cbbcf249 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/controller/InvoiceController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicmanage/controller/InvoiceController.java
@@ -1,11 +1,11 @@
-package com.openhis.web.basicmanage.controller;
+package com.healthlink.his.web.basicmanage.controller;
 
 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.Invoice;
-import com.openhis.administration.service.IInvoiceService;
+import com.healthlink.his.administration.domain.Invoice;
+import com.healthlink.his.administration.service.IInvoiceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/controller/InvoiceSegmentController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicmanage/controller/InvoiceSegmentController.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/controller/InvoiceSegmentController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicmanage/controller/InvoiceSegmentController.java
index 421b1e9aa..99b705399 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/controller/InvoiceSegmentController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicmanage/controller/InvoiceSegmentController.java
@@ -1,11 +1,11 @@
-package com.openhis.web.basicmanage.controller;
+package com.healthlink.his.web.basicmanage.controller;
 
 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.InvoiceSegment;
-import com.openhis.administration.service.IInvoiceSegmentService;
-import com.openhis.web.basicmanage.domain.InvoiceSegmentDeleteRequest;
+import com.healthlink.his.administration.domain.InvoiceSegment;
+import com.healthlink.his.administration.service.IInvoiceSegmentService;
+import com.healthlink.his.web.basicmanage.domain.InvoiceSegmentDeleteRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/controller/OutpatientNoSegmentController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicmanage/controller/OutpatientNoSegmentController.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/controller/OutpatientNoSegmentController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicmanage/controller/OutpatientNoSegmentController.java
index 6c4f19bfb..a5c1e6e83 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/controller/OutpatientNoSegmentController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicmanage/controller/OutpatientNoSegmentController.java
@@ -1,4 +1,4 @@
-package com.openhis.web.basicmanage.controller;
+package com.healthlink.his.web.basicmanage.controller;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -9,8 +9,8 @@ import com.core.common.core.domain.R;
 import com.core.common.enums.BusinessType;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
-import com.openhis.administration.domain.OutpatientNoSegment;
-import com.openhis.administration.service.IOutpatientNoSegmentService;
+import com.healthlink.his.administration.domain.OutpatientNoSegment;
+import com.healthlink.his.administration.service.IOutpatientNoSegmentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/domain/InvoiceSegmentDeleteRequest.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicmanage/domain/InvoiceSegmentDeleteRequest.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/domain/InvoiceSegmentDeleteRequest.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicmanage/domain/InvoiceSegmentDeleteRequest.java
index a90de02aa..450bb75c1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/domain/InvoiceSegmentDeleteRequest.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicmanage/domain/InvoiceSegmentDeleteRequest.java
@@ -1,4 +1,4 @@
-package com.openhis.web.basicmanage.domain;
+package com.healthlink.his.web.basicmanage.domain;
 
 import java.io.Serializable;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicservice/controller/HealthcareServiceController.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicservice/controller/HealthcareServiceController.java
index 8a8aa5ac1..5084d07d2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicservice/controller/HealthcareServiceController.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.basicservice.controller;
+package com.healthlink.his.web.basicservice.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -13,20 +13,20 @@ import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.administration.domain.ChargeItemDefinition;
-import com.openhis.administration.domain.HealthcareService;
-import com.openhis.administration.service.IChargeItemDefinitionService;
-import com.openhis.administration.service.IHealthcareServiceService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.AccountStatus;
-import com.openhis.common.enums.PublicationStatus;
-import com.openhis.common.enums.Whether;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.basicservice.dto.*;
-import com.openhis.web.basicservice.mapper.HealthcareServiceBizMapper;
-import com.openhis.yb.service.YbManager;
+import com.healthlink.his.administration.domain.ChargeItemDefinition;
+import com.healthlink.his.administration.domain.HealthcareService;
+import com.healthlink.his.administration.service.IChargeItemDefinitionService;
+import com.healthlink.his.administration.service.IHealthcareServiceService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.AccountStatus;
+import com.healthlink.his.common.enums.PublicationStatus;
+import com.healthlink.his.common.enums.Whether;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.basicservice.dto.*;
+import com.healthlink.his.web.basicservice.mapper.HealthcareServiceBizMapper;
+import com.healthlink.his.yb.service.YbManager;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/ChargeItemDefinitionFormData.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicservice/dto/ChargeItemDefinitionFormData.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/ChargeItemDefinitionFormData.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicservice/dto/ChargeItemDefinitionFormData.java
index d6fa42819..9828691bc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/ChargeItemDefinitionFormData.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicservice/dto/ChargeItemDefinitionFormData.java
@@ -1,4 +1,4 @@
-package com.openhis.web.basicservice.dto;
+package com.healthlink.his.web.basicservice.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceAddOrUpdateParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicservice/dto/HealthcareServiceAddOrUpdateParam.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceAddOrUpdateParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicservice/dto/HealthcareServiceAddOrUpdateParam.java
index aca33c3ff..3e92b3852 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceAddOrUpdateParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicservice/dto/HealthcareServiceAddOrUpdateParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.basicservice.dto;
+package com.healthlink.his.web.basicservice.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicservice/dto/HealthcareServiceDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicservice/dto/HealthcareServiceDto.java
index ba10bcbf3..902d5b485 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicservice/dto/HealthcareServiceDto.java
@@ -1,8 +1,8 @@
-package com.openhis.web.basicservice.dto;
+package com.healthlink.his.web.basicservice.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceFormData.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicservice/dto/HealthcareServiceFormData.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceFormData.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicservice/dto/HealthcareServiceFormData.java
index c1f08db5e..f944719fd 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceFormData.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicservice/dto/HealthcareServiceFormData.java
@@ -1,4 +1,4 @@
-package com.openhis.web.basicservice.dto;
+package com.healthlink.his.web.basicservice.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicservice/dto/HealthcareServiceInitDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicservice/dto/HealthcareServiceInitDto.java
index bf6b20fb2..fa1b4c169 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicservice/dto/HealthcareServiceInitDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.basicservice.dto;
+package com.healthlink.his.web.basicservice.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/mapper/HealthcareServiceBizMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicservice/mapper/HealthcareServiceBizMapper.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/mapper/HealthcareServiceBizMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicservice/mapper/HealthcareServiceBizMapper.java
index 1e0147640..7b61c5a25 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/mapper/HealthcareServiceBizMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/basicservice/mapper/HealthcareServiceBizMapper.java
@@ -1,10 +1,10 @@
-package com.openhis.web.basicservice.mapper;
+package com.healthlink.his.web.basicservice.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.basicservice.dto.HealthcareServiceDto;
+import com.healthlink.his.web.basicservice.dto.HealthcareServiceDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/appservice/ICardManageAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/appservice/ICardManageAppService.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/appservice/ICardManageAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/appservice/ICardManageAppService.java
index b9b5e0b69..9ccac343c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/appservice/ICardManageAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/appservice/ICardManageAppService.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2026 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.cardmanagement.appservice;
+package com.healthlink.his.web.cardmanagement.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.cardmanagement.dto.*;
+import com.healthlink.his.web.cardmanagement.dto.*;
 import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/appservice/impl/CardManageAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/appservice/impl/CardManageAppServiceImpl.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/appservice/impl/CardManageAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/appservice/impl/CardManageAppServiceImpl.java
index affeff02d..4e7a65e1f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/appservice/impl/CardManageAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/appservice/impl/CardManageAppServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2026 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.cardmanagement.appservice.impl;
+package com.healthlink.his.web.cardmanagement.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -10,14 +10,14 @@ import com.core.common.core.domain.R;
 import com.core.common.core.domain.model.LoginUser;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.core.domain.model.LoginUser;
-import com.openhis.infectious.domain.InfectiousAudit;
-import com.openhis.infectious.domain.InfectiousCard;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.web.cardmanagement.appservice.ICardManageAppService;
-import com.openhis.web.cardmanagement.dto.*;
-import com.openhis.web.cardmanagement.mapper.InfectiousAuditMapper;
-import com.openhis.web.cardmanagement.mapper.InfectiousCardMapper;
+import com.healthlink.his.infectious.domain.InfectiousAudit;
+import com.healthlink.his.infectious.domain.InfectiousCard;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.service.IPractitionerService;
+import com.healthlink.his.web.cardmanagement.appservice.ICardManageAppService;
+import com.healthlink.his.web.cardmanagement.dto.*;
+import com.healthlink.his.web.cardmanagement.mapper.InfectiousAuditMapper;
+import com.healthlink.his.web.cardmanagement.mapper.InfectiousCardMapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/controller/CardManageController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/controller/CardManageController.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/controller/CardManageController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/controller/CardManageController.java
index 37d16f0cf..4e7166957 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/controller/CardManageController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/controller/CardManageController.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2026 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.cardmanagement.controller;
+package com.healthlink.his.web.cardmanagement.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.cardmanagement.appservice.ICardManageAppService;
-import com.openhis.web.cardmanagement.dto.*;
+import com.healthlink.his.web.cardmanagement.appservice.ICardManageAppService;
+import com.healthlink.his.web.cardmanagement.dto.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/AuditRecordDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/AuditRecordDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/AuditRecordDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/AuditRecordDto.java
index e6e70a1e6..7e8f7009a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/AuditRecordDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/AuditRecordDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.cardmanagement.dto;
+package com.healthlink.his.web.cardmanagement.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/BatchAuditDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/BatchAuditDto.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/BatchAuditDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/BatchAuditDto.java
index d3a4e6710..3d49849a7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/BatchAuditDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/BatchAuditDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.cardmanagement.dto;
+package com.healthlink.his.web.cardmanagement.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/BatchReturnDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/BatchReturnDto.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/BatchReturnDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/BatchReturnDto.java
index 1c8c788c9..092b52b6d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/BatchReturnDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/BatchReturnDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.cardmanagement.dto;
+package com.healthlink.his.web.cardmanagement.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/CardQueryDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/CardQueryDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/CardQueryDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/CardQueryDto.java
index afb9167ec..bdf7b8350 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/CardQueryDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/CardQueryDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.cardmanagement.dto;
+package com.healthlink.his.web.cardmanagement.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/CardStatisticsDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/CardStatisticsDto.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/CardStatisticsDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/CardStatisticsDto.java
index f891b3a46..fefea888f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/CardStatisticsDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/CardStatisticsDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.cardmanagement.dto;
+package com.healthlink.his.web.cardmanagement.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/DoctorCardListDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/DoctorCardListDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/DoctorCardListDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/DoctorCardListDto.java
index d65a7310e..0e6f3a999 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/DoctorCardListDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/DoctorCardListDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2026 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.cardmanagement.dto;
+package com.healthlink.his.web.cardmanagement.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/DoctorCardQueryDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/DoctorCardQueryDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/DoctorCardQueryDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/DoctorCardQueryDto.java
index 88afa60cb..a1c053d8d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/DoctorCardQueryDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/DoctorCardQueryDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2026 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.cardmanagement.dto;
+package com.healthlink.his.web.cardmanagement.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/DoctorCardStatisticsDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/DoctorCardStatisticsDto.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/DoctorCardStatisticsDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/DoctorCardStatisticsDto.java
index e7e357dc9..41c4348cf 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/DoctorCardStatisticsDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/DoctorCardStatisticsDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2026 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.cardmanagement.dto;
+package com.healthlink.his.web.cardmanagement.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/DoctorCardUpdateDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/DoctorCardUpdateDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/DoctorCardUpdateDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/DoctorCardUpdateDto.java
index 582984da3..efbd75dda 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/DoctorCardUpdateDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/DoctorCardUpdateDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.cardmanagement.dto;
+package com.healthlink.his.web.cardmanagement.dto;
 
 import lombok.Data;
 import jakarta.validation.constraints.NotBlank;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/InfectiousCardDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/InfectiousCardDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/InfectiousCardDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/InfectiousCardDto.java
index a38d4325a..ef79298f4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/InfectiousCardDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/InfectiousCardDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.cardmanagement.dto;
+package com.healthlink.his.web.cardmanagement.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/SingleAuditDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/SingleAuditDto.java
similarity index 82%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/SingleAuditDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/SingleAuditDto.java
index 1ad6f2545..b2d04ce61 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/SingleAuditDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/SingleAuditDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.cardmanagement.dto;
+package com.healthlink.his.web.cardmanagement.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/SingleReturnDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/SingleReturnDto.java
similarity index 82%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/SingleReturnDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/SingleReturnDto.java
index 5e7e60bd9..b75265f1f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/SingleReturnDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/SingleReturnDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.cardmanagement.dto;
+package com.healthlink.his.web.cardmanagement.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/mapper/InfectiousAuditMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/mapper/InfectiousAuditMapper.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/mapper/InfectiousAuditMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/mapper/InfectiousAuditMapper.java
index 153d67f27..4b7f9ed45 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/mapper/InfectiousAuditMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/mapper/InfectiousAuditMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.web.cardmanagement.mapper;
+package com.healthlink.his.web.cardmanagement.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.infectious.domain.InfectiousAudit;
+import com.healthlink.his.infectious.domain.InfectiousAudit;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/mapper/InfectiousCardMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/mapper/InfectiousCardMapper.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/mapper/InfectiousCardMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/mapper/InfectiousCardMapper.java
index d51a1c51d..b16a7cb8d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/mapper/InfectiousCardMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/mapper/InfectiousCardMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.web.cardmanagement.mapper;
+package com.healthlink.his.web.cardmanagement.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.infectious.domain.InfectiousCard;
+import com.healthlink.his.infectious.domain.InfectiousCard;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/appservice/ICatalogService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/catalogmanage/appservice/ICatalogService.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/appservice/ICatalogService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/catalogmanage/appservice/ICatalogService.java
index 5e0395fde..1ca0b91bf 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/appservice/ICatalogService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/catalogmanage/appservice/ICatalogService.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.catalogmanage.appservice;
+package com.healthlink.his.web.catalogmanage.appservice;
 
 import com.core.common.core.domain.R;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/appservice/impl/CatalogServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/catalogmanage/appservice/impl/CatalogServiceImpl.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/appservice/impl/CatalogServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/catalogmanage/appservice/impl/CatalogServiceImpl.java
index b9657528d..b753d9ac8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/appservice/impl/CatalogServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/catalogmanage/appservice/impl/CatalogServiceImpl.java
@@ -1,21 +1,21 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.catalogmanage.appservice.impl;
+package com.healthlink.his.web.catalogmanage.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.core.common.utils.SecurityUtils;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.common.enums.CatalogType;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.catalogmanage.appservice.ICatalogService;
-import com.openhis.web.catalogmanage.mapper.CatalogMapper;
-import com.openhis.ybcatalog.domain.*;
-import com.openhis.ybcatalog.service.*;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.constant.YbCommonConstants;
+import com.healthlink.his.common.enums.CatalogType;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.catalogmanage.appservice.ICatalogService;
+import com.healthlink.his.web.catalogmanage.mapper.CatalogMapper;
+import com.healthlink.his.ybcatalog.domain.*;
+import com.healthlink.his.ybcatalog.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/controller/CatalogController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/catalogmanage/controller/CatalogController.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/controller/CatalogController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/catalogmanage/controller/CatalogController.java
index ba1ef9177..6fd5f3ff8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/controller/CatalogController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/catalogmanage/controller/CatalogController.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.catalogmanage.controller;
+package com.healthlink.his.web.catalogmanage.controller;
 
 import com.core.common.annotation.Anonymous;
 import com.core.common.core.domain.R;
-import com.openhis.web.catalogmanage.appservice.ICatalogService;
-import com.openhis.web.ybmanage.config.YbServiceConfig;
+import com.healthlink.his.web.catalogmanage.appservice.ICatalogService;
+import com.healthlink.his.web.ybmanage.config.YbServiceConfig;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/mapper/CatalogMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/catalogmanage/mapper/CatalogMapper.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/mapper/CatalogMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/catalogmanage/mapper/CatalogMapper.java
index 6526141c8..4a6d87b2e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/mapper/CatalogMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/catalogmanage/mapper/CatalogMapper.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.catalogmanage.mapper;
+package com.healthlink.his.web.catalogmanage.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.ybcatalog.domain.*;
+import com.healthlink.his.ybcatalog.domain.*;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/charge/patientcardrenewal/PatientCardRenewalController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/charge/patientcardrenewal/PatientCardRenewalController.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/charge/patientcardrenewal/PatientCardRenewalController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/charge/patientcardrenewal/PatientCardRenewalController.java
index 18e9d9a1f..ee0571d42 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/charge/patientcardrenewal/PatientCardRenewalController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/charge/patientcardrenewal/PatientCardRenewalController.java
@@ -1,4 +1,4 @@
-package com.openhis.web.charge.patientcardrenewal;
+package com.healthlink.his.web.charge.patientcardrenewal;
 
 import com.core.common.core.domain.R;
 import lombok.extern.slf4j.Slf4j;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/charge/patientcardrenewal/PatientCardRenewalService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/charge/patientcardrenewal/PatientCardRenewalService.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/charge/patientcardrenewal/PatientCardRenewalService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/charge/patientcardrenewal/PatientCardRenewalService.java
index 4f84a634f..2fcca1fbf 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/charge/patientcardrenewal/PatientCardRenewalService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/charge/patientcardrenewal/PatientCardRenewalService.java
@@ -1,4 +1,4 @@
-package com.openhis.web.charge.patientcardrenewal;
+package com.healthlink.his.web.charge.patientcardrenewal;
 
 /**
  * 患者换卡服务接口
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/charge/patientcardrenewal/PatientCardRenewalServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/charge/patientcardrenewal/PatientCardRenewalServiceImpl.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/charge/patientcardrenewal/PatientCardRenewalServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/charge/patientcardrenewal/PatientCardRenewalServiceImpl.java
index 0ba7517d6..dd07ac6a3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/charge/patientcardrenewal/PatientCardRenewalServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/charge/patientcardrenewal/PatientCardRenewalServiceImpl.java
@@ -1,8 +1,8 @@
-package com.openhis.web.charge.patientcardrenewal;
+package com.healthlink.his.web.charge.patientcardrenewal;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.openhis.administration.domain.PatientIdentifier;
-import com.openhis.administration.service.IPatientIdentifierService;
+import com.healthlink.his.administration.domain.PatientIdentifier;
+import com.healthlink.his.administration.service.IPatientIdentifierService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/charge/patientcardrenewal/RenewalRequest.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/charge/patientcardrenewal/RenewalRequest.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/charge/patientcardrenewal/RenewalRequest.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/charge/patientcardrenewal/RenewalRequest.java
index 5c18d765b..e52e04455 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/charge/patientcardrenewal/RenewalRequest.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/charge/patientcardrenewal/RenewalRequest.java
@@ -1,4 +1,4 @@
-package com.openhis.web.charge.patientcardrenewal;
+package com.healthlink.his.web.charge.patientcardrenewal;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IInpatientChargeAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/IInpatientChargeAppService.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IInpatientChargeAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/IInpatientChargeAppService.java
index 5ea8478ab..12ed7f9a2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IInpatientChargeAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/IInpatientChargeAppService.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.chargemanage.appservice;
+package com.healthlink.his.web.chargemanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.chargemanage.dto.EncounterPatientPageParam;
-import com.openhis.web.chargemanage.dto.EncounterPatientPrescriptionDto;
+import com.healthlink.his.web.chargemanage.dto.EncounterPatientPageParam;
+import com.healthlink.his.web.chargemanage.dto.EncounterPatientPrescriptionDto;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientChargeAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/IOutpatientChargeAppService.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientChargeAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/IOutpatientChargeAppService.java
index 0fa95a6aa..84687919a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientChargeAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/IOutpatientChargeAppService.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.chargemanage.appservice;
+package com.healthlink.his.web.chargemanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.chargemanage.dto.EncounterPatientPageParam;
-import com.openhis.web.chargemanage.dto.EncounterPatientPrescriptionDto;
+import com.healthlink.his.web.chargemanage.dto.EncounterPatientPageParam;
+import com.healthlink.his.web.chargemanage.dto.EncounterPatientPrescriptionDto;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientPricingAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/IOutpatientPricingAppService.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientPricingAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/IOutpatientPricingAppService.java
index 489b341a0..aabeb5257 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientPricingAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/IOutpatientPricingAppService.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.chargemanage.appservice;
+package com.healthlink.his.web.chargemanage.appservice;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.openhis.web.doctorstation.dto.AdviceBaseDto;
-import com.openhis.web.doctorstation.dto.PatientInfoDto;
+import com.healthlink.his.web.doctorstation.dto.AdviceBaseDto;
+import com.healthlink.his.web.doctorstation.dto.PatientInfoDto;
 
 import jakarta.servlet.http.HttpServletRequest;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRefundAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/IOutpatientRefundAppService.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRefundAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/IOutpatientRefundAppService.java
index 25294e180..f5cbaf5d3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRefundAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/IOutpatientRefundAppService.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.chargemanage.appservice;
+package com.healthlink.his.web.chargemanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.chargemanage.dto.EncounterPatientPageParam;
-import com.openhis.web.chargemanage.dto.RefundItemParam;
+import com.healthlink.his.web.chargemanage.dto.EncounterPatientPageParam;
+import com.healthlink.his.web.chargemanage.dto.RefundItemParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/IOutpatientRegistrationAppService.java
similarity index 82%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/IOutpatientRegistrationAppService.java
index 96ecae170..bd12df875 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/IOutpatientRegistrationAppService.java
@@ -1,15 +1,15 @@
-package com.openhis.web.chargemanage.appservice;
+package com.healthlink.his.web.chargemanage.appservice;
 
 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.web.basicservice.dto.HealthcareServiceDto;
-import com.openhis.web.chargemanage.dto.CurrentDayEncounterDto;
-import com.openhis.web.chargemanage.dto.OrgMetadata;
-import com.openhis.web.chargemanage.dto.PatientMetadata;
-import com.openhis.web.chargemanage.dto.PractitionerMetadata;
-import com.openhis.web.chargemanage.dto.ReprintRegistrationDto;
-import com.openhis.web.paymentmanage.dto.CancelRegPaymentDto;
+import com.healthlink.his.web.basicservice.dto.HealthcareServiceDto;
+import com.healthlink.his.web.chargemanage.dto.CurrentDayEncounterDto;
+import com.healthlink.his.web.chargemanage.dto.OrgMetadata;
+import com.healthlink.his.web.chargemanage.dto.PatientMetadata;
+import com.healthlink.his.web.chargemanage.dto.PractitionerMetadata;
+import com.healthlink.his.web.chargemanage.dto.ReprintRegistrationDto;
+import com.healthlink.his.web.paymentmanage.dto.CancelRegPaymentDto;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/InpatientChargeAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/impl/InpatientChargeAppServiceImpl.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/InpatientChargeAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/impl/InpatientChargeAppServiceImpl.java
index a6c82d9e6..903ba62b0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/InpatientChargeAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/impl/InpatientChargeAppServiceImpl.java
@@ -1,26 +1,26 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.chargemanage.appservice.impl;
+package com.healthlink.his.web.chargemanage.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.AgeCalculatorUtil;
 import com.core.common.utils.MessageUtils;
-import com.openhis.administration.service.IAccountService;
-import com.openhis.administration.service.IChargeItemService;
-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.web.chargemanage.appservice.IInpatientChargeAppService;
-import com.openhis.web.chargemanage.dto.EncounterPatientPageDto;
-import com.openhis.web.chargemanage.dto.EncounterPatientPageParam;
-import com.openhis.web.chargemanage.dto.EncounterPatientPrescriptionDto;
-import com.openhis.web.chargemanage.dto.OutpatientInitDto;
-import com.openhis.web.chargemanage.mapper.InpatientChargeAppMapper;
+import com.healthlink.his.administration.service.IAccountService;
+import com.healthlink.his.administration.service.IChargeItemService;
+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.web.chargemanage.appservice.IInpatientChargeAppService;
+import com.healthlink.his.web.chargemanage.dto.EncounterPatientPageDto;
+import com.healthlink.his.web.chargemanage.dto.EncounterPatientPageParam;
+import com.healthlink.his.web.chargemanage.dto.EncounterPatientPrescriptionDto;
+import com.healthlink.his.web.chargemanage.dto.OutpatientInitDto;
+import com.healthlink.his.web.chargemanage.mapper.InpatientChargeAppMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientChargeAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/impl/OutpatientChargeAppServiceImpl.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientChargeAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/impl/OutpatientChargeAppServiceImpl.java
index 0ef327942..fb4d2a38c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientChargeAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/impl/OutpatientChargeAppServiceImpl.java
@@ -1,30 +1,30 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.chargemanage.appservice.impl;
+package com.healthlink.his.web.chargemanage.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.AgeCalculatorUtil;
 import com.core.common.utils.MessageUtils;
-import com.openhis.administration.service.IAccountService;
-import com.openhis.administration.service.IChargeItemService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.AdministrativeGender;
-import com.openhis.common.enums.ChargeItemContext;
-import com.openhis.common.enums.ChargeItemStatus;
-import com.openhis.common.enums.EncounterClass;
-import com.openhis.common.enums.ybenums.YbPayment;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.chargemanage.appservice.IOutpatientChargeAppService;
-import com.openhis.web.chargemanage.dto.EncounterPatientPageDto;
-import com.openhis.web.chargemanage.dto.EncounterPatientPageParam;
-import com.openhis.web.chargemanage.dto.EncounterPatientPrescriptionDto;
-import com.openhis.web.chargemanage.dto.OutpatientInitDto;
-import com.openhis.web.chargemanage.mapper.OutpatientChargeAppMapper;
+import com.healthlink.his.administration.service.IAccountService;
+import com.healthlink.his.administration.service.IChargeItemService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.AdministrativeGender;
+import com.healthlink.his.common.enums.ChargeItemContext;
+import com.healthlink.his.common.enums.ChargeItemStatus;
+import com.healthlink.his.common.enums.EncounterClass;
+import com.healthlink.his.common.enums.ybenums.YbPayment;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.chargemanage.appservice.IOutpatientChargeAppService;
+import com.healthlink.his.web.chargemanage.dto.EncounterPatientPageDto;
+import com.healthlink.his.web.chargemanage.dto.EncounterPatientPageParam;
+import com.healthlink.his.web.chargemanage.dto.EncounterPatientPrescriptionDto;
+import com.healthlink.his.web.chargemanage.dto.OutpatientInitDto;
+import com.healthlink.his.web.chargemanage.mapper.OutpatientChargeAppMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java
similarity index 82%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java
index 52a0540e3..57c6f96d9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java
@@ -1,16 +1,16 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.chargemanage.appservice.impl;
+package com.healthlink.his.web.chargemanage.appservice.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.openhis.common.enums.Whether;
-import com.openhis.web.chargemanage.appservice.IOutpatientPricingAppService;
-import com.openhis.web.chargemanage.mapper.OutpatientPricingAppMapper;
-import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService;
-import com.openhis.web.doctorstation.appservice.IDoctorStationMainAppService;
-import com.openhis.web.doctorstation.dto.AdviceBaseDto;
-import com.openhis.web.doctorstation.dto.PatientInfoDto;
+import com.healthlink.his.common.enums.Whether;
+import com.healthlink.his.web.chargemanage.appservice.IOutpatientPricingAppService;
+import com.healthlink.his.web.chargemanage.mapper.OutpatientPricingAppMapper;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationAdviceAppService;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationMainAppService;
+import com.healthlink.his.web.doctorstation.dto.AdviceBaseDto;
+import com.healthlink.his.web.doctorstation.dto.PatientInfoDto;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRefundAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/impl/OutpatientRefundAppServiceImpl.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRefundAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/impl/OutpatientRefundAppServiceImpl.java
index b4300ee31..3badd5015 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRefundAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/impl/OutpatientRefundAppServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.chargemanage.appservice.impl;
+package com.healthlink.his.web.chargemanage.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -13,27 +13,27 @@ import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.administration.domain.ChargeItem;
-import com.openhis.administration.service.IChargeItemService;
-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.financial.service.IPaymentReconciliationService;
-import com.openhis.medication.domain.MedicationDispense;
-import com.openhis.medication.domain.MedicationRequest;
-import com.openhis.medication.service.IMedicationDispenseService;
-import com.openhis.medication.service.IMedicationRequestService;
-import com.openhis.web.chargemanage.appservice.IOutpatientRefundAppService;
-import com.openhis.web.chargemanage.dto.*;
-import com.openhis.web.chargemanage.mapper.OutpatientRefundAppMapper;
-import com.openhis.workflow.domain.DeviceDispense;
-import com.openhis.workflow.domain.DeviceRequest;
-import com.openhis.workflow.domain.ServiceRequest;
-import com.openhis.workflow.service.IDeviceDispenseService;
-import com.openhis.workflow.service.IDeviceRequestService;
-import com.openhis.workflow.service.IServiceRequestService;
+import com.healthlink.his.administration.domain.ChargeItem;
+import com.healthlink.his.administration.service.IChargeItemService;
+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.financial.service.IPaymentReconciliationService;
+import com.healthlink.his.medication.domain.MedicationDispense;
+import com.healthlink.his.medication.domain.MedicationRequest;
+import com.healthlink.his.medication.service.IMedicationDispenseService;
+import com.healthlink.his.medication.service.IMedicationRequestService;
+import com.healthlink.his.web.chargemanage.appservice.IOutpatientRefundAppService;
+import com.healthlink.his.web.chargemanage.dto.*;
+import com.healthlink.his.web.chargemanage.mapper.OutpatientRefundAppMapper;
+import com.healthlink.his.workflow.domain.DeviceDispense;
+import com.healthlink.his.workflow.domain.DeviceRequest;
+import com.healthlink.his.workflow.domain.ServiceRequest;
+import com.healthlink.his.workflow.service.IDeviceDispenseService;
+import com.healthlink.his.workflow.service.IDeviceRequestService;
+import com.healthlink.his.workflow.service.IServiceRequestService;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java
index d9a834d3c..35ef52010 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.chargemanage.appservice.impl;
+package com.healthlink.his.web.chargemanage.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -13,44 +13,44 @@ import com.core.common.utils.StringUtils;
 import com.core.common.utils.bean.BeanUtils;
 import com.core.common.core.domain.entity.SysRole;
 import com.core.common.core.domain.model.LoginUser;
-import com.openhis.administration.domain.*;
-import com.openhis.administration.mapper.PatientMapper;
-import com.openhis.administration.service.*;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.SlotStatus;
-import com.openhis.common.enums.*;
-import com.openhis.common.enums.ybenums.YbPayment;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisPageUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.appointmentmanage.domain.SchedulePool;
-import com.openhis.appointmentmanage.domain.ScheduleSlot;
-import com.openhis.appointmentmanage.mapper.SchedulePoolMapper;
-import com.openhis.appointmentmanage.mapper.ScheduleSlotMapper;
-import com.openhis.clinical.domain.Order;
-import com.openhis.clinical.service.IOrderService;
-import com.openhis.financial.domain.PaymentReconciliation;
-import com.openhis.financial.domain.RefundLog;
-import com.openhis.financial.service.IRefundLogService;
-import com.openhis.web.basicservice.dto.HealthcareServiceDto;
-import com.openhis.web.basicservice.mapper.HealthcareServiceBizMapper;
-import com.openhis.web.chargemanage.appservice.IOutpatientRegistrationAppService;
-import com.openhis.web.chargemanage.dto.CurrentDayEncounterDto;
-import com.openhis.web.chargemanage.dto.OrgMetadata;
-import com.openhis.web.chargemanage.dto.PatientMetadata;
-import com.openhis.web.chargemanage.dto.PractitionerMetadata;
-import com.openhis.web.chargemanage.dto.ReprintRegistrationDto;
-import com.openhis.web.chargemanage.mapper.OutpatientRegistrationAppMapper;
-import com.openhis.triageandqueuemanage.domain.DivLog;
-import com.openhis.triageandqueuemanage.domain.TriageCandidateExclusion;
-import com.openhis.triageandqueuemanage.service.DivLogService;
-import com.openhis.triageandqueuemanage.service.TriageCandidateExclusionService;
-import com.openhis.web.paymentmanage.appservice.IPaymentRecService;
-import com.openhis.web.paymentmanage.dto.CancelPaymentDto;
-import com.openhis.web.paymentmanage.dto.CancelRegPaymentDto;
-import com.openhis.yb.model.CancelRegPaymentModel;
-import com.openhis.yb.service.YbManager;
+import com.healthlink.his.administration.domain.*;
+import com.healthlink.his.administration.mapper.PatientMapper;
+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.SlotStatus;
+import com.healthlink.his.common.enums.*;
+import com.healthlink.his.common.enums.ybenums.YbPayment;
+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.appointmentmanage.domain.SchedulePool;
+import com.healthlink.his.appointmentmanage.domain.ScheduleSlot;
+import com.healthlink.his.appointmentmanage.mapper.SchedulePoolMapper;
+import com.healthlink.his.appointmentmanage.mapper.ScheduleSlotMapper;
+import com.healthlink.his.clinical.domain.Order;
+import com.healthlink.his.clinical.service.IOrderService;
+import com.healthlink.his.financial.domain.PaymentReconciliation;
+import com.healthlink.his.financial.domain.RefundLog;
+import com.healthlink.his.financial.service.IRefundLogService;
+import com.healthlink.his.web.basicservice.dto.HealthcareServiceDto;
+import com.healthlink.his.web.basicservice.mapper.HealthcareServiceBizMapper;
+import com.healthlink.his.web.chargemanage.appservice.IOutpatientRegistrationAppService;
+import com.healthlink.his.web.chargemanage.dto.CurrentDayEncounterDto;
+import com.healthlink.his.web.chargemanage.dto.OrgMetadata;
+import com.healthlink.his.web.chargemanage.dto.PatientMetadata;
+import com.healthlink.his.web.chargemanage.dto.PractitionerMetadata;
+import com.healthlink.his.web.chargemanage.dto.ReprintRegistrationDto;
+import com.healthlink.his.web.chargemanage.mapper.OutpatientRegistrationAppMapper;
+import com.healthlink.his.triageandqueuemanage.domain.DivLog;
+import com.healthlink.his.triageandqueuemanage.domain.TriageCandidateExclusion;
+import com.healthlink.his.triageandqueuemanage.service.DivLogService;
+import com.healthlink.his.triageandqueuemanage.service.TriageCandidateExclusionService;
+import com.healthlink.his.web.paymentmanage.appservice.IPaymentRecService;
+import com.healthlink.his.web.paymentmanage.dto.CancelPaymentDto;
+import com.healthlink.his.web.paymentmanage.dto.CancelRegPaymentDto;
+import com.healthlink.his.yb.model.CancelRegPaymentModel;
+import com.healthlink.his.yb.service.YbManager;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
@@ -113,7 +113,7 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
     IOrderService orderService;
 
     @Resource
-    com.openhis.triageandqueuemanage.service.TriageQueueItemService triageQueueItemService;
+    com.healthlink.his.triageandqueuemanage.service.TriageQueueItemService triageQueueItemService;
 
     @Resource
     DivLogService divLogService;
@@ -125,7 +125,7 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
     SchedulePoolMapper schedulePoolMapper;
 
     @Resource
-    com.openhis.document.service.IEmrService iEmrService;
+    com.healthlink.his.document.service.IEmrService iEmrService;
 
     /**
      * 门诊挂号 - 查询患者信息
@@ -380,18 +380,18 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
         // 1. 检查是否有当日病历记录（医生已写病历则不能退号）
         // 只检查当天的病历，避免误判历史数据
         // 条件：(recordTime在当天范围内) OR (recordTime为空 AND createTime在当天范围内)
-        long emrCount = iEmrService.count(new LambdaQueryWrapper<com.openhis.document.domain.Emr>()
-            .eq(com.openhis.document.domain.Emr::getEncounterId, encounterId)
+        long emrCount = iEmrService.count(new LambdaQueryWrapper<com.healthlink.his.document.domain.Emr>()
+            .eq(com.healthlink.his.document.domain.Emr::getEncounterId, encounterId)
             .and(wrapper -> wrapper
                 .and(w -> w
-                    .ge(com.openhis.document.domain.Emr::getRecordTime, todayStartDate)
-                    .lt(com.openhis.document.domain.Emr::getRecordTime, tomorrowStartDate)
+                    .ge(com.healthlink.his.document.domain.Emr::getRecordTime, todayStartDate)
+                    .lt(com.healthlink.his.document.domain.Emr::getRecordTime, tomorrowStartDate)
                 )
                 .or()
                 .and(w -> w
-                    .isNull(com.openhis.document.domain.Emr::getRecordTime)
-                    .ge(com.openhis.document.domain.Emr::getCreateTime, todayStartDate)
-                    .lt(com.openhis.document.domain.Emr::getCreateTime, tomorrowStartDate)
+                    .isNull(com.healthlink.his.document.domain.Emr::getRecordTime)
+                    .ge(com.healthlink.his.document.domain.Emr::getCreateTime, todayStartDate)
+                    .lt(com.healthlink.his.document.domain.Emr::getCreateTime, tomorrowStartDate)
                 )
             ));
         if (emrCount > 0) {
@@ -856,10 +856,10 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
             return;
         }
         // 1. 移除分诊队列中的记录（必须成功，否则回滚事务）
-        com.openhis.triageandqueuemanage.domain.TriageQueueItem queueItem = triageQueueItemService.getOne(
-            new LambdaQueryWrapper<com.openhis.triageandqueuemanage.domain.TriageQueueItem>()
-                .eq(com.openhis.triageandqueuemanage.domain.TriageQueueItem::getEncounterId, encounterId)
-                .eq(com.openhis.triageandqueuemanage.domain.TriageQueueItem::getDeleteFlag, "0")
+        com.healthlink.his.triageandqueuemanage.domain.TriageQueueItem queueItem = triageQueueItemService.getOne(
+            new LambdaQueryWrapper<com.healthlink.his.triageandqueuemanage.domain.TriageQueueItem>()
+                .eq(com.healthlink.his.triageandqueuemanage.domain.TriageQueueItem::getEncounterId, encounterId)
+                .eq(com.healthlink.his.triageandqueuemanage.domain.TriageQueueItem::getDeleteFlag, "0")
         );
 
         if (queueItem != null) {
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/InpatientChargeController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/controller/InpatientChargeController.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/InpatientChargeController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/controller/InpatientChargeController.java
index e86fc5098..d30a05405 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/InpatientChargeController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/controller/InpatientChargeController.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.chargemanage.controller;
+package com.healthlink.his.web.chargemanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.chargemanage.appservice.IInpatientChargeAppService;
-import com.openhis.web.chargemanage.dto.EncounterPatientPageParam;
+import com.healthlink.his.web.chargemanage.appservice.IInpatientChargeAppService;
+import com.healthlink.his.web.chargemanage.dto.EncounterPatientPageParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientChargeController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/controller/OutpatientChargeController.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientChargeController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/controller/OutpatientChargeController.java
index fc5d1fd70..6b87dfcfc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientChargeController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/controller/OutpatientChargeController.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.chargemanage.controller;
+package com.healthlink.his.web.chargemanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.chargemanage.appservice.IOutpatientChargeAppService;
-import com.openhis.web.chargemanage.dto.EncounterPatientPageParam;
+import com.healthlink.his.web.chargemanage.appservice.IOutpatientChargeAppService;
+import com.healthlink.his.web.chargemanage.dto.EncounterPatientPageParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientPricingController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/controller/OutpatientPricingController.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientPricingController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/controller/OutpatientPricingController.java
index 57ef07f6b..9cd98a4ea 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientPricingController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/controller/OutpatientPricingController.java
@@ -1,9 +1,9 @@
-package com.openhis.web.chargemanage.controller;
+package com.healthlink.his.web.chargemanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.chargemanage.appservice.IOutpatientPricingAppService;
-import com.openhis.web.doctorstation.dto.AdviceBaseDto;
-import com.openhis.web.doctorstation.dto.PatientInfoDto;
+import com.healthlink.his.web.chargemanage.appservice.IOutpatientPricingAppService;
+import com.healthlink.his.web.doctorstation.dto.AdviceBaseDto;
+import com.healthlink.his.web.doctorstation.dto.PatientInfoDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRefundController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/controller/OutpatientRefundController.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRefundController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/controller/OutpatientRefundController.java
index 43766d255..5d75880f2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRefundController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/controller/OutpatientRefundController.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.chargemanage.controller;
+package com.healthlink.his.web.chargemanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.chargemanage.appservice.IOutpatientRefundAppService;
-import com.openhis.web.chargemanage.dto.EncounterPatientPageParam;
-import com.openhis.web.chargemanage.dto.RefundItemParam;
+import com.healthlink.his.web.chargemanage.appservice.IOutpatientRefundAppService;
+import com.healthlink.his.web.chargemanage.dto.EncounterPatientPageParam;
+import com.healthlink.his.web.chargemanage.dto.RefundItemParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/controller/OutpatientRegistrationController.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/controller/OutpatientRegistrationController.java
index a4a145a7f..129249bf4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/controller/OutpatientRegistrationController.java
@@ -1,16 +1,16 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.chargemanage.controller;
+package com.healthlink.his.web.chargemanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.PriorityLevel;
-import com.openhis.financial.domain.PaymentReconciliation;
-import com.openhis.web.chargemanage.appservice.IOutpatientRegistrationAppService;
-import com.openhis.web.chargemanage.dto.OutpatientRegistrationInitDto;
-import com.openhis.web.chargemanage.dto.ReprintRegistrationDto;
-import com.openhis.web.paymentmanage.appservice.IEleInvoiceService;
-import com.openhis.web.paymentmanage.dto.CancelRegPaymentDto;
+import com.healthlink.his.common.enums.PriorityLevel;
+import com.healthlink.his.financial.domain.PaymentReconciliation;
+import com.healthlink.his.web.chargemanage.appservice.IOutpatientRegistrationAppService;
+import com.healthlink.his.web.chargemanage.dto.OutpatientRegistrationInitDto;
+import com.healthlink.his.web.chargemanage.dto.ReprintRegistrationDto;
+import com.healthlink.his.web.paymentmanage.appservice.IEleInvoiceService;
+import com.healthlink.his.web.paymentmanage.dto.CancelRegPaymentDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/AccountFormData.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/AccountFormData.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/AccountFormData.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/AccountFormData.java
index a149c44a2..813342522 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/AccountFormData.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/AccountFormData.java
@@ -1,10 +1,10 @@
-package com.openhis.web.chargemanage.dto;
+package com.healthlink.his.web.chargemanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.AccountBillingStatus;
-import com.openhis.common.enums.AccountStatus;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.enums.AccountBillingStatus;
+import com.healthlink.his.common.enums.AccountStatus;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ChargeItemFormData.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/ChargeItemFormData.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ChargeItemFormData.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/ChargeItemFormData.java
index 6b4ba0c03..15586b810 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ChargeItemFormData.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/ChargeItemFormData.java
@@ -1,11 +1,11 @@
-package com.openhis.web.chargemanage.dto;
+package com.healthlink.his.web.chargemanage.dto;
 
 import com.core.common.utils.SecurityUtils;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.ChargeItemContext;
-import com.openhis.common.enums.ChargeItemStatus;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.enums.ChargeItemContext;
+import com.healthlink.his.common.enums.ChargeItemStatus;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ContractMetadata.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/ContractMetadata.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ContractMetadata.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/ContractMetadata.java
index d3fb66f2e..77eef6c22 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ContractMetadata.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/ContractMetadata.java
@@ -1,4 +1,4 @@
-package com.openhis.web.chargemanage.dto;
+package com.healthlink.his.web.chargemanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/CurrentDayEncounterDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/CurrentDayEncounterDto.java
index 6756cc096..a2585eb53 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/CurrentDayEncounterDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.chargemanage.dto;
+package com.healthlink.his.web.chargemanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterDiagnosisFormData.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterDiagnosisFormData.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterDiagnosisFormData.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterDiagnosisFormData.java
index a513694ce..3fe89c9c5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterDiagnosisFormData.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterDiagnosisFormData.java
@@ -1,4 +1,4 @@
-package com.openhis.web.chargemanage.dto;
+package com.healthlink.his.web.chargemanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterFormData.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterFormData.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterFormData.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterFormData.java
index 0f22e6231..0991be802 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterFormData.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterFormData.java
@@ -1,8 +1,8 @@
-package com.openhis.web.chargemanage.dto;
+package com.healthlink.his.web.chargemanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.common.enums.*;
+import com.healthlink.his.common.enums.*;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterLocationFormData.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterLocationFormData.java
similarity index 82%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterLocationFormData.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterLocationFormData.java
index 5ae3dd85e..33c9c718f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterLocationFormData.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterLocationFormData.java
@@ -1,9 +1,9 @@
-package com.openhis.web.chargemanage.dto;
+package com.healthlink.his.web.chargemanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.common.enums.EncounterActivityStatus;
-import com.openhis.common.enums.LocationForm;
+import com.healthlink.his.common.enums.EncounterActivityStatus;
+import com.healthlink.his.common.enums.LocationForm;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterParticipantFormData.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterParticipantFormData.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterParticipantFormData.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterParticipantFormData.java
index b88f7dad9..629d57eea 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterParticipantFormData.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterParticipantFormData.java
@@ -1,8 +1,8 @@
-package com.openhis.web.chargemanage.dto;
+package com.healthlink.his.web.chargemanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.common.enums.ParticipantType;
+import com.healthlink.his.common.enums.ParticipantType;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterPatientPageDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterPatientPageDto.java
index eafeae802..f8dbd6fe7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterPatientPageDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.chargemanage.dto;
+package com.healthlink.his.web.chargemanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterPatientPageParam.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterPatientPageParam.java
index 00b16daf3..0474ac241 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterPatientPageParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.chargemanage.dto;
+package com.healthlink.his.web.chargemanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPaymentDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterPatientPaymentDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPaymentDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterPatientPaymentDto.java
index 9c647452e..c2cb8567a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPaymentDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterPatientPaymentDto.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.chargemanage.dto;
+package com.healthlink.his.web.chargemanage.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPrescriptionDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterPatientPrescriptionDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPrescriptionDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterPatientPrescriptionDto.java
index 005bd353d..0f3b0dda5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPrescriptionDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterPatientPrescriptionDto.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.chargemanage.dto;
+package com.healthlink.his.web.chargemanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientRefundDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterPatientRefundDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientRefundDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterPatientRefundDto.java
index f4b596af4..1c66ac05a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientRefundDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterPatientRefundDto.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.chargemanage.dto;
+package com.healthlink.his.web.chargemanage.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.openhis.yb.dto.PaymentDetailDto;
+import com.healthlink.his.common.annotation.Dict;
+import com.healthlink.his.yb.dto.PaymentDetailDto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OrgMetadata.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/OrgMetadata.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OrgMetadata.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/OrgMetadata.java
index 476e3d04c..0591d5243 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OrgMetadata.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/OrgMetadata.java
@@ -1,4 +1,4 @@
-package com.openhis.web.chargemanage.dto;
+package com.healthlink.his.web.chargemanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/OutpatientInitDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/OutpatientInitDto.java
index e8b3874fc..543778bd7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/OutpatientInitDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.chargemanage.dto;
+package com.healthlink.his.web.chargemanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientPricingInventoryDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/OutpatientPricingInventoryDto.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientPricingInventoryDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/OutpatientPricingInventoryDto.java
index a85472b2c..c922110ae 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientPricingInventoryDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/OutpatientPricingInventoryDto.java
@@ -1,8 +1,8 @@
-package com.openhis.web.chargemanage.dto;
+package com.healthlink.his.web.chargemanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientPricingPriceDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/OutpatientPricingPriceDto.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientPricingPriceDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/OutpatientPricingPriceDto.java
index f150b26a9..a1536b345 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientPricingPriceDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/OutpatientPricingPriceDto.java
@@ -1,8 +1,8 @@
-package com.openhis.web.chargemanage.dto;
+package com.healthlink.his.web.chargemanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationAddParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/OutpatientRegistrationAddParam.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationAddParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/OutpatientRegistrationAddParam.java
index c3858b76e..72bd061c9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationAddParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/OutpatientRegistrationAddParam.java
@@ -1,6 +1,6 @@
-package com.openhis.web.chargemanage.dto;
+package com.healthlink.his.web.chargemanage.dto;
 
-import com.openhis.yb.dto.Info5301SpecialConditionResult;
+import com.healthlink.his.yb.dto.Info5301SpecialConditionResult;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/OutpatientRegistrationInitDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/OutpatientRegistrationInitDto.java
index 246c89608..78e036c36 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/OutpatientRegistrationInitDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.chargemanage.dto;
+package com.healthlink.his.web.chargemanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationSettleParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/OutpatientRegistrationSettleParam.java
similarity index 79%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationSettleParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/OutpatientRegistrationSettleParam.java
index 852853600..13d8b0dc7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationSettleParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/OutpatientRegistrationSettleParam.java
@@ -1,6 +1,6 @@
-package com.openhis.web.chargemanage.dto;
+package com.healthlink.his.web.chargemanage.dto;
 
-import com.openhis.yb.dto.PaymentDetailDto;
+import com.healthlink.his.yb.dto.PaymentDetailDto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PatientMetadata.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/PatientMetadata.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PatientMetadata.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/PatientMetadata.java
index 50928598c..6ff918fd4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PatientMetadata.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/PatientMetadata.java
@@ -1,4 +1,4 @@
-package com.openhis.web.chargemanage.dto;
+package com.healthlink.his.web.chargemanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PractitionerMetadata.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/PractitionerMetadata.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PractitionerMetadata.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/PractitionerMetadata.java
index fb50dc344..4b41989fc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PractitionerMetadata.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/PractitionerMetadata.java
@@ -1,4 +1,4 @@
-package com.openhis.web.chargemanage.dto;
+package com.healthlink.his.web.chargemanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PricingProjectDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/PricingProjectDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PricingProjectDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/PricingProjectDto.java
index 80b0bf3ed..e2e14d183 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PricingProjectDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/PricingProjectDto.java
@@ -1,14 +1,14 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.chargemanage.dto;
+package com.healthlink.his.web.chargemanage.dto;
 
 import com.core.common.utils.SecurityUtils;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.common.enums.EncounterClass;
-import com.openhis.common.enums.RequestStatus;
-import com.openhis.common.enums.TherapyTimeType;
+import com.healthlink.his.common.enums.EncounterClass;
+import com.healthlink.his.common.enums.RequestStatus;
+import com.healthlink.his.common.enums.TherapyTimeType;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/RefundItemDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/RefundItemDto.java
index ade0312bd..13a19bcf3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/RefundItemDto.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.chargemanage.dto;
+package com.healthlink.his.web.chargemanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/RefundItemParam.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/RefundItemParam.java
index 0dc60cca0..3da5ad655 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/RefundItemParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.chargemanage.dto;
+package com.healthlink.his.web.chargemanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ReprintRegistrationDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/ReprintRegistrationDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ReprintRegistrationDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/ReprintRegistrationDto.java
index 7d36003db..4e55d1d03 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ReprintRegistrationDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/ReprintRegistrationDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.chargemanage.dto;
+package com.healthlink.his.web.chargemanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/InpatientChargeAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/mapper/InpatientChargeAppMapper.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/InpatientChargeAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/mapper/InpatientChargeAppMapper.java
index fc5e46398..190d62815 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/InpatientChargeAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/mapper/InpatientChargeAppMapper.java
@@ -1,14 +1,14 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.chargemanage.mapper;
+package com.healthlink.his.web.chargemanage.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.chargemanage.dto.EncounterPatientPageDto;
-import com.openhis.web.chargemanage.dto.EncounterPatientPageParam;
-import com.openhis.web.chargemanage.dto.EncounterPatientPrescriptionDto;
+import com.healthlink.his.web.chargemanage.dto.EncounterPatientPageDto;
+import com.healthlink.his.web.chargemanage.dto.EncounterPatientPageParam;
+import com.healthlink.his.web.chargemanage.dto.EncounterPatientPrescriptionDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientChargeAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/mapper/OutpatientChargeAppMapper.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientChargeAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/mapper/OutpatientChargeAppMapper.java
index 9039cdba8..463982b01 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientChargeAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/mapper/OutpatientChargeAppMapper.java
@@ -1,14 +1,14 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.chargemanage.mapper;
+package com.healthlink.his.web.chargemanage.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.chargemanage.dto.EncounterPatientPageDto;
-import com.openhis.web.chargemanage.dto.EncounterPatientPageParam;
-import com.openhis.web.chargemanage.dto.EncounterPatientPrescriptionDto;
+import com.healthlink.his.web.chargemanage.dto.EncounterPatientPageDto;
+import com.healthlink.his.web.chargemanage.dto.EncounterPatientPageParam;
+import com.healthlink.his.web.chargemanage.dto.EncounterPatientPrescriptionDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientPricingAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/mapper/OutpatientPricingAppMapper.java
similarity index 82%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientPricingAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/mapper/OutpatientPricingAppMapper.java
index 6d17f2aea..8d46d05f6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientPricingAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/mapper/OutpatientPricingAppMapper.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.chargemanage.mapper;
+package com.healthlink.his.web.chargemanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRefundAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/mapper/OutpatientRefundAppMapper.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRefundAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/mapper/OutpatientRefundAppMapper.java
index 2f9bb4113..66322ca09 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRefundAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/mapper/OutpatientRefundAppMapper.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.chargemanage.mapper;
+package com.healthlink.his.web.chargemanage.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.chargemanage.dto.*;
+import com.healthlink.his.web.chargemanage.dto.*;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRegistrationAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/mapper/OutpatientRegistrationAppMapper.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRegistrationAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/mapper/OutpatientRegistrationAppMapper.java
index 7f4d23b74..bae16d09c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRegistrationAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/mapper/OutpatientRegistrationAppMapper.java
@@ -1,12 +1,12 @@
-package com.openhis.web.chargemanage.mapper;
+package com.healthlink.his.web.chargemanage.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.chargemanage.dto.CurrentDayEncounterDto;
-import com.openhis.web.chargemanage.dto.PractitionerMetadata;
-import com.openhis.web.personalization.dto.ActivityDeviceDto;
+import com.healthlink.his.web.chargemanage.dto.CurrentDayEncounterDto;
+import com.healthlink.his.web.chargemanage.dto.PractitionerMetadata;
+import com.healthlink.his.web.personalization.dto.ActivityDeviceDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckMethodAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/appservice/ICheckMethodAppService.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckMethodAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/appservice/ICheckMethodAppService.java
index 316704a9f..42e2de2fe 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckMethodAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/appservice/ICheckMethodAppService.java
@@ -1,8 +1,8 @@
-package com.openhis.web.check.appservice;
+package com.healthlink.his.web.check.appservice;
 
 
 import com.core.common.core.domain.R;
-import com.openhis.check.domain.CheckMethod;
+import com.healthlink.his.check.domain.CheckMethod;
 
 import jakarta.servlet.http.HttpServletResponse;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckPackageAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/appservice/ICheckPackageAppService.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckPackageAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/appservice/ICheckPackageAppService.java
index 1edad70b6..a8244f108 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckPackageAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/appservice/ICheckPackageAppService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.check.appservice;
+package com.healthlink.his.web.check.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.check.dto.CheckPackageDto;
+import com.healthlink.his.web.check.dto.CheckPackageDto;
 
 /**
  * 检查套餐AppService接口
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckPartAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/appservice/ICheckPartAppService.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckPartAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/appservice/ICheckPartAppService.java
index 6b92e4c2b..78cdd667c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckPartAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/appservice/ICheckPartAppService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.check.appservice;
+package com.healthlink.his.web.check.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.check.domain.CheckPart;
+import com.healthlink.his.check.domain.CheckPart;
 
 import jakarta.servlet.http.HttpServletResponse;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ILisGroupInfoAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/appservice/ILisGroupInfoAppService.java
similarity index 73%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ILisGroupInfoAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/appservice/ILisGroupInfoAppService.java
index 2d89e8a02..93902fd83 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ILisGroupInfoAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/appservice/ILisGroupInfoAppService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.check.appservice;
+package com.healthlink.his.web.check.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.check.domain.LisGroupInfo;
+import com.healthlink.his.check.domain.LisGroupInfo;
 
 public interface ILisGroupInfoAppService {
     R<?> getLisGroupInfoList(Integer pageNum, Integer pageSize);
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckMethodAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/appservice/impl/CheckMethodAppServiceImpl.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckMethodAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/appservice/impl/CheckMethodAppServiceImpl.java
index 7cea43018..cab291eb6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckMethodAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/appservice/impl/CheckMethodAppServiceImpl.java
@@ -1,15 +1,15 @@
-package com.openhis.web.check.appservice.impl;
+package com.healthlink.his.web.check.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.check.domain.CheckMethod;
-import com.openhis.check.domain.CheckPackage;
-import com.openhis.check.service.ICheckMethodService;
-import com.openhis.check.service.ICheckPackageService;
-import com.openhis.web.check.appservice.ICheckMethodAppService;
-import com.openhis.web.check.dto.CheckMethodDto;
-import com.openhis.web.reportmanage.utils.ExcelFillerUtil;
+import com.healthlink.his.check.domain.CheckMethod;
+import com.healthlink.his.check.domain.CheckPackage;
+import com.healthlink.his.check.service.ICheckMethodService;
+import com.healthlink.his.check.service.ICheckPackageService;
+import com.healthlink.his.web.check.appservice.ICheckMethodAppService;
+import com.healthlink.his.web.check.dto.CheckMethodDto;
+import com.healthlink.his.web.reportmanage.utils.ExcelFillerUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckPackageAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/appservice/impl/CheckPackageAppServiceImpl.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckPackageAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/appservice/impl/CheckPackageAppServiceImpl.java
index a13da5aa5..574a50f89 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckPackageAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/appservice/impl/CheckPackageAppServiceImpl.java
@@ -1,16 +1,16 @@
-package com.openhis.web.check.appservice.impl;
+package com.healthlink.his.web.check.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.core.common.core.domain.R;
-import com.openhis.check.domain.CheckPackage;
-import com.openhis.check.domain.CheckPackageDetail;
-import com.openhis.check.domain.CheckPart;
-import com.openhis.check.service.ICheckPackageDetailService;
-import com.openhis.check.service.ICheckPackageService;
-import com.openhis.check.service.ICheckPartService;
-import com.openhis.web.check.appservice.ICheckPackageAppService;
-import com.openhis.web.check.dto.CheckPackageDetailDto;
-import com.openhis.web.check.dto.CheckPackageDto;
+import com.healthlink.his.check.domain.CheckPackage;
+import com.healthlink.his.check.domain.CheckPackageDetail;
+import com.healthlink.his.check.domain.CheckPart;
+import com.healthlink.his.check.service.ICheckPackageDetailService;
+import com.healthlink.his.check.service.ICheckPackageService;
+import com.healthlink.his.check.service.ICheckPartService;
+import com.healthlink.his.web.check.appservice.ICheckPackageAppService;
+import com.healthlink.his.web.check.dto.CheckPackageDetailDto;
+import com.healthlink.his.web.check.dto.CheckPackageDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckPartAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/appservice/impl/CheckPartAppServiceImpl.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckPartAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/appservice/impl/CheckPartAppServiceImpl.java
index b5fbcee8b..3f5893b1e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckPartAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/appservice/impl/CheckPartAppServiceImpl.java
@@ -1,12 +1,12 @@
-package com.openhis.web.check.appservice.impl;
+package com.healthlink.his.web.check.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.check.domain.CheckPart;
-import com.openhis.check.service.ICheckPartService;
-import com.openhis.web.check.appservice.ICheckPartAppService;
-import com.openhis.web.reportmanage.utils.ExcelFillerUtil;
+import com.healthlink.his.check.domain.CheckPart;
+import com.healthlink.his.check.service.ICheckPartService;
+import com.healthlink.his.web.check.appservice.ICheckPartAppService;
+import com.healthlink.his.web.reportmanage.utils.ExcelFillerUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/LisGroupInfoAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/appservice/impl/LisGroupInfoAppServiceImpl.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/LisGroupInfoAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/appservice/impl/LisGroupInfoAppServiceImpl.java
index 515e521f7..4ba91d20a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/LisGroupInfoAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/appservice/impl/LisGroupInfoAppServiceImpl.java
@@ -1,11 +1,11 @@
-package com.openhis.web.check.appservice.impl;
+package com.healthlink.his.web.check.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.check.domain.LisGroupInfo;
-import com.openhis.check.service.ILisGroupInfoService;
-import com.openhis.web.check.appservice.ILisGroupInfoAppService;
+import com.healthlink.his.check.domain.LisGroupInfo;
+import com.healthlink.his.check.service.ILisGroupInfoService;
+import com.healthlink.his.web.check.appservice.ILisGroupInfoAppService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckMethodController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/controller/CheckMethodController.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckMethodController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/controller/CheckMethodController.java
index c61f0e48e..c03fd99e1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckMethodController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/controller/CheckMethodController.java
@@ -1,8 +1,8 @@
-package com.openhis.web.check.controller;
+package com.healthlink.his.web.check.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.check.domain.CheckMethod;
-import com.openhis.web.check.appservice.ICheckMethodAppService;
+import com.healthlink.his.check.domain.CheckMethod;
+import com.healthlink.his.web.check.appservice.ICheckMethodAppService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckPartController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/controller/CheckPartController.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckPartController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/controller/CheckPartController.java
index 8b29be1a4..ebb333fb1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckPartController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/controller/CheckPartController.java
@@ -1,8 +1,8 @@
-package com.openhis.web.check.controller;
+package com.healthlink.his.web.check.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.check.domain.CheckPart;
-import com.openhis.web.check.appservice.ICheckPartAppService;
+import com.healthlink.his.check.domain.CheckPart;
+import com.healthlink.his.web.check.appservice.ICheckPartAppService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckTypeController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/controller/CheckTypeController.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckTypeController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/controller/CheckTypeController.java
index f37d8b316..4d3a98ec1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckTypeController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/controller/CheckTypeController.java
@@ -1,4 +1,4 @@
-package com.openhis.web.check.controller;
+package com.healthlink.his.web.check.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -7,18 +7,18 @@ import com.core.common.core.controller.BaseController;
 import com.core.common.core.domain.AjaxResult;
 import com.core.common.core.domain.R;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.check.domain.CheckMethod;
-import com.openhis.check.domain.CheckPackage;
-import com.openhis.check.domain.CheckPackageDetail;
-import com.openhis.check.domain.CheckPart;
-import com.openhis.check.domain.CheckType;
-import com.openhis.check.service.ICheckMethodService;
-import com.openhis.check.service.ICheckPackageDetailService;
-import com.openhis.check.service.ICheckPackageService;
-import com.openhis.check.service.ICheckPartService;
-import com.openhis.check.service.ICheckTypeService;
-import com.openhis.web.check.appservice.ICheckPackageAppService;
-import com.openhis.web.check.dto.CheckPackageDto;
+import com.healthlink.his.check.domain.CheckMethod;
+import com.healthlink.his.check.domain.CheckPackage;
+import com.healthlink.his.check.domain.CheckPackageDetail;
+import com.healthlink.his.check.domain.CheckPart;
+import com.healthlink.his.check.domain.CheckType;
+import com.healthlink.his.check.service.ICheckMethodService;
+import com.healthlink.his.check.service.ICheckPackageDetailService;
+import com.healthlink.his.check.service.ICheckPackageService;
+import com.healthlink.his.check.service.ICheckPartService;
+import com.healthlink.his.check.service.ICheckTypeService;
+import com.healthlink.his.web.check.appservice.ICheckPackageAppService;
+import com.healthlink.his.web.check.dto.CheckPackageDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/ExamApplyController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/controller/ExamApplyController.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/ExamApplyController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/controller/ExamApplyController.java
index 824f49893..1894e0da5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/ExamApplyController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/controller/ExamApplyController.java
@@ -1,4 +1,4 @@
-package com.openhis.web.check.controller;
+package com.healthlink.his.web.check.controller;
 
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -8,26 +8,26 @@ import com.core.common.core.page.TableDataInfo;
 import com.core.common.exception.ServiceException;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.Account;
-import com.openhis.administration.domain.ChargeItem;
-import com.openhis.administration.service.IAccountService;
-import com.openhis.administration.service.IChargeItemService;
-import com.openhis.check.domain.ExamApply;
-import com.openhis.check.domain.ExamApplyItem;
-import com.openhis.check.service.IExamApplyItemService;
-import com.openhis.check.service.IExamApplyService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.AssignSeqEnum;
-import com.openhis.common.enums.ChargeItemStatus;
-import com.openhis.common.enums.GenerateSource;
-import com.openhis.common.enums.ItemType;
-import com.openhis.common.enums.RequestStatus;
-import com.openhis.administration.domain.Organization;
-import com.openhis.administration.service.IOrganizationService;
-import com.openhis.web.check.dto.ExamApplyDto;
-import com.openhis.web.check.dto.ExamApplyItemDto;
-import com.openhis.workflow.domain.ServiceRequest;
-import com.openhis.workflow.service.IServiceRequestService;
+import com.healthlink.his.administration.domain.Account;
+import com.healthlink.his.administration.domain.ChargeItem;
+import com.healthlink.his.administration.service.IAccountService;
+import com.healthlink.his.administration.service.IChargeItemService;
+import com.healthlink.his.check.domain.ExamApply;
+import com.healthlink.his.check.domain.ExamApplyItem;
+import com.healthlink.his.check.service.IExamApplyItemService;
+import com.healthlink.his.check.service.IExamApplyService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.enums.AssignSeqEnum;
+import com.healthlink.his.common.enums.ChargeItemStatus;
+import com.healthlink.his.common.enums.GenerateSource;
+import com.healthlink.his.common.enums.ItemType;
+import com.healthlink.his.common.enums.RequestStatus;
+import com.healthlink.his.administration.domain.Organization;
+import com.healthlink.his.administration.service.IOrganizationService;
+import com.healthlink.his.web.check.dto.ExamApplyDto;
+import com.healthlink.his.web.check.dto.ExamApplyItemDto;
+import com.healthlink.his.workflow.domain.ServiceRequest;
+import com.healthlink.his.workflow.service.IServiceRequestService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/LisGroupInfoController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/controller/LisGroupInfoController.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/LisGroupInfoController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/controller/LisGroupInfoController.java
index f2faa0bc4..6b83555ce 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/LisGroupInfoController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/controller/LisGroupInfoController.java
@@ -1,8 +1,8 @@
-package com.openhis.web.check.controller;
+package com.healthlink.his.web.check.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.check.domain.LisGroupInfo;
-import com.openhis.web.check.appservice.ILisGroupInfoAppService;
+import com.healthlink.his.check.domain.LisGroupInfo;
+import com.healthlink.his.web.check.appservice.ILisGroupInfoAppService;
 import org.springframework.web.bind.annotation.*;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckMethodDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/dto/CheckMethodDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckMethodDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/dto/CheckMethodDto.java
index 4859dbaa3..83fabaed7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckMethodDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/dto/CheckMethodDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.check.dto;
+package com.healthlink.his.web.check.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckPackageDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/dto/CheckPackageDetailDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckPackageDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/dto/CheckPackageDetailDto.java
index 2d21cf4ad..400d195b9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckPackageDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/dto/CheckPackageDetailDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.check.dto;
+package com.healthlink.his.web.check.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckPackageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/dto/CheckPackageDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckPackageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/dto/CheckPackageDto.java
index fa5746ea7..a9b537e6b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckPackageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/dto/CheckPackageDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.check.dto;
+package com.healthlink.his.web.check.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckPartDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/dto/CheckPartDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckPartDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/dto/CheckPartDto.java
index 75b8ed82e..6c15fb3bb 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckPartDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/dto/CheckPartDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.check.dto;
+package com.healthlink.his.web.check.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/ExamApplyDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/dto/ExamApplyDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/ExamApplyDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/dto/ExamApplyDto.java
index c6390dc71..2bc7770b0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/ExamApplyDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/dto/ExamApplyDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.check.dto;
+package com.healthlink.his.web.check.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/ExamApplyItemDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/dto/ExamApplyItemDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/ExamApplyItemDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/dto/ExamApplyItemDto.java
index a063740b7..e74bcdb2f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/ExamApplyItemDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/dto/ExamApplyItemDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.check.dto;
+package com.healthlink.his.web.check.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/mapper/CheckMethodAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/mapper/CheckMethodAppMapper.java
similarity index 70%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/mapper/CheckMethodAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/mapper/CheckMethodAppMapper.java
index f6ca47b34..d1228b4b1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/mapper/CheckMethodAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/mapper/CheckMethodAppMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.check.mapper;
+package com.healthlink.his.web.check.mapper;
 
 
 import org.springframework.stereotype.Repository;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/mapper/CheckPartAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/mapper/CheckPartAppMapper.java
similarity index 69%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/mapper/CheckPartAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/mapper/CheckPartAppMapper.java
index 007bdcc2b..a289f2841 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/mapper/CheckPartAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/mapper/CheckPartAppMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.check.mapper;
+package com.healthlink.his.web.check.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/mapper/LisGroupInfoAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/mapper/LisGroupInfoAppMapper.java
similarity index 70%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/mapper/LisGroupInfoAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/mapper/LisGroupInfoAppMapper.java
index 2f004b2dc..7f84f1f4f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/mapper/LisGroupInfoAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/check/mapper/LisGroupInfoAppMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.check.mapper;
+package com.healthlink.his.web.check.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/ISurgeryAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/appservice/ISurgeryAppService.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/ISurgeryAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/appservice/ISurgeryAppService.java
index a55549171..818818ef6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/ISurgeryAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/appservice/ISurgeryAppService.java
@@ -1,9 +1,9 @@
-package com.openhis.web.clinicalmanage.appservice;
+package com.healthlink.his.web.clinicalmanage.appservice;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.administration.domain.Encounter;
-import com.openhis.web.clinicalmanage.dto.SurgeryDto;
+import com.healthlink.his.administration.domain.Encounter;
+import com.healthlink.his.web.clinicalmanage.dto.SurgeryDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/ISurgicalScheduleAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/appservice/ISurgicalScheduleAppService.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/ISurgicalScheduleAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/appservice/ISurgicalScheduleAppService.java
index 31c8b69a5..3500a009b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/ISurgicalScheduleAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/appservice/ISurgicalScheduleAppService.java
@@ -1,9 +1,9 @@
-package com.openhis.web.clinicalmanage.appservice;
+package com.healthlink.his.web.clinicalmanage.appservice;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.web.clinicalmanage.dto.OpCreateScheduleDto;
-import com.openhis.web.clinicalmanage.dto.OpScheduleDto;
+import com.healthlink.his.web.clinicalmanage.dto.OpCreateScheduleDto;
+import com.healthlink.his.web.clinicalmanage.dto.OpScheduleDto;
 
 import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java
index db440ffc7..15dfb3e48 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.clinicalmanage.appservice.impl;
+package com.healthlink.his.web.clinicalmanage.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -11,37 +11,37 @@ import com.core.common.utils.SecurityUtils;
 import com.core.system.service.ISysUserService;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.openhis.administration.domain.ChargeItem;
-import com.openhis.administration.domain.Encounter;
-import com.openhis.administration.domain.OperatingRoom;
-import com.openhis.administration.domain.Organization;
-import com.openhis.administration.domain.Patient;
-import com.openhis.administration.service.IAccountService;
-import com.openhis.administration.service.IChargeItemService;
-import com.openhis.administration.service.IEncounterService;
-import com.openhis.administration.service.IOrganizationService;
-import com.openhis.administration.service.IOperatingRoomService;
-import com.openhis.administration.service.IPatientService;
-import com.openhis.clinical.domain.Surgery;
-import com.openhis.clinical.service.ISurgeryService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.ChargeItemStatus;
-import com.openhis.common.enums.GenerateSource;
-import com.openhis.common.enums.RequestStatus;
-import com.openhis.common.enums.TherapyTimeType;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.common.utils.RedisKeys;
+import com.healthlink.his.administration.domain.ChargeItem;
+import com.healthlink.his.administration.domain.Encounter;
+import com.healthlink.his.administration.domain.OperatingRoom;
+import com.healthlink.his.administration.domain.Organization;
+import com.healthlink.his.administration.domain.Patient;
+import com.healthlink.his.administration.service.IAccountService;
+import com.healthlink.his.administration.service.IChargeItemService;
+import com.healthlink.his.administration.service.IEncounterService;
+import com.healthlink.his.administration.service.IOrganizationService;
+import com.healthlink.his.administration.service.IOperatingRoomService;
+import com.healthlink.his.administration.service.IPatientService;
+import com.healthlink.his.clinical.domain.Surgery;
+import com.healthlink.his.clinical.service.ISurgeryService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.ChargeItemStatus;
+import com.healthlink.his.common.enums.GenerateSource;
+import com.healthlink.his.common.enums.RequestStatus;
+import com.healthlink.his.common.enums.TherapyTimeType;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.common.utils.RedisKeys;
 import com.core.common.core.redis.RedisCache;
-import com.openhis.document.domain.RequestForm;
-import com.openhis.document.service.IRequestFormService;
-import com.openhis.web.clinicalmanage.appservice.ISurgeryAppService;
-import com.openhis.web.clinicalmanage.dto.SurgeryDto;
-import com.openhis.web.clinicalmanage.mapper.SurgeryAppMapper;
-import com.openhis.workflow.domain.ServiceRequest;
-import com.openhis.workflow.domain.ActivityDefinition;
-import com.openhis.workflow.service.IActivityDefinitionService;
-import com.openhis.workflow.service.IServiceRequestService;
+import com.healthlink.his.document.domain.RequestForm;
+import com.healthlink.his.document.service.IRequestFormService;
+import com.healthlink.his.web.clinicalmanage.appservice.ISurgeryAppService;
+import com.healthlink.his.web.clinicalmanage.dto.SurgeryDto;
+import com.healthlink.his.web.clinicalmanage.mapper.SurgeryAppMapper;
+import com.healthlink.his.workflow.domain.ServiceRequest;
+import com.healthlink.his.workflow.domain.ActivityDefinition;
+import com.healthlink.his.workflow.service.IActivityDefinitionService;
+import com.healthlink.his.workflow.service.IServiceRequestService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -94,7 +94,7 @@ public class SurgeryAppServiceImpl implements ISurgeryAppService {
     private IOperatingRoomService operatingRoomService;
 
     @Resource
-    private com.openhis.administration.service.IPractitionerService practitionerService;
+    private com.healthlink.his.administration.service.IPractitionerService practitionerService;
 
     @Resource
     private RedisCache redisCache;
@@ -666,8 +666,8 @@ public class SurgeryAppServiceImpl implements ISurgeryAppService {
         // 批量查询Practitioner
         if (!practitionerIds.isEmpty()) {
             try {
-                List<com.openhis.administration.domain.Practitioner> practitioners = practitionerService.listByIds(practitionerIds);
-                for (com.openhis.administration.domain.Practitioner p : practitioners) {
+                List<com.healthlink.his.administration.domain.Practitioner> practitioners = practitionerService.listByIds(practitionerIds);
+                for (com.healthlink.his.administration.domain.Practitioner p : practitioners) {
                     if (p.getName() != null && !p.getName().isEmpty()) {
                         practitionerNameMap.put(p.getId(), p.getName());
                     }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgicalScheduleAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/appservice/impl/SurgicalScheduleAppServiceImpl.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgicalScheduleAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/appservice/impl/SurgicalScheduleAppServiceImpl.java
index 0387d9eea..779316785 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgicalScheduleAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/appservice/impl/SurgicalScheduleAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.clinicalmanage.appservice.impl;
+package com.healthlink.his.web.clinicalmanage.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -6,20 +6,20 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.core.domain.model.LoginUser;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.Patient;
-import com.openhis.administration.service.IPatientService;
-import com.openhis.clinical.domain.Surgery;
-import com.openhis.clinical.service.ISurgeryService;
-import com.openhis.common.enums.SurgeryAppStatusEnum;
-import com.openhis.surgicalschedule.domain.OpSchedule;
-import com.openhis.surgicalschedule.service.IOpScheduleService;
-import com.openhis.workflow.domain.ServiceRequest;
-import com.openhis.workflow.service.IServiceRequestService;
-import com.openhis.web.clinicalmanage.appservice.ISurgicalScheduleAppService;
-import com.openhis.web.clinicalmanage.dto.OpCreateScheduleDto;
-import com.openhis.web.clinicalmanage.dto.OpScheduleDto;
-import com.openhis.web.clinicalmanage.mapper.SurgicalScheduleAppMapper;
-import com.openhis.web.regdoctorstation.mapper.RequestFormManageAppMapper;
+import com.healthlink.his.administration.domain.Patient;
+import com.healthlink.his.administration.service.IPatientService;
+import com.healthlink.his.clinical.domain.Surgery;
+import com.healthlink.his.clinical.service.ISurgeryService;
+import com.healthlink.his.common.enums.SurgeryAppStatusEnum;
+import com.healthlink.his.surgicalschedule.domain.OpSchedule;
+import com.healthlink.his.surgicalschedule.service.IOpScheduleService;
+import com.healthlink.his.workflow.domain.ServiceRequest;
+import com.healthlink.his.workflow.service.IServiceRequestService;
+import com.healthlink.his.web.clinicalmanage.appservice.ISurgicalScheduleAppService;
+import com.healthlink.his.web.clinicalmanage.dto.OpCreateScheduleDto;
+import com.healthlink.his.web.clinicalmanage.dto.OpScheduleDto;
+import com.healthlink.his.web.clinicalmanage.mapper.SurgicalScheduleAppMapper;
+import com.healthlink.his.web.regdoctorstation.mapper.RequestFormManageAppMapper;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -58,7 +58,7 @@ public class SurgicalScheduleAppServiceImpl implements ISurgicalScheduleAppServi
     private ISurgeryService surgeryService;
 
     @Resource
-    private com.openhis.administration.service.IOrganizationService organizationService;
+    private com.healthlink.his.administration.service.IOrganizationService organizationService;
 
     @Resource
     private com.core.system.service.ISysUserService sysUserService;
@@ -214,10 +214,10 @@ public class SurgicalScheduleAppServiceImpl implements ISurgicalScheduleAppServi
         if (opCreateScheduleDto.getApplyId() != null) {
             try {
                 // 通过手术单号查找手术申请记录并更新状态
-                LambdaQueryWrapper<com.openhis.clinical.domain.Surgery> queryWrapper = new LambdaQueryWrapper<>();
-                queryWrapper.eq(com.openhis.clinical.domain.Surgery::getSurgeryNo, opSchedule.getOperCode())
-                           .eq(com.openhis.clinical.domain.Surgery::getDeleteFlag, "0");
-                com.openhis.clinical.domain.Surgery surgery = surgeryService.getOne(queryWrapper);
+                LambdaQueryWrapper<com.healthlink.his.clinical.domain.Surgery> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(com.healthlink.his.clinical.domain.Surgery::getSurgeryNo, opSchedule.getOperCode())
+                           .eq(com.healthlink.his.clinical.domain.Surgery::getDeleteFlag, "0");
+                com.healthlink.his.clinical.domain.Surgery surgery = surgeryService.getOne(queryWrapper);
                 if (surgery != null) {
                     surgery.setStatusEnum(1); // 1 = 已排期
                     surgery.setUpdateTime(new Date());
@@ -490,12 +490,12 @@ public class SurgicalScheduleAppServiceImpl implements ISurgicalScheduleAppServi
      *
      * @param surgery 手术申请对象
      */
-    private void fillSurgeryMissingNames(com.openhis.clinical.domain.Surgery surgery) {
+    private void fillSurgeryMissingNames(com.healthlink.his.clinical.domain.Surgery surgery) {
         // 填充申请科室名称
         if ((surgery.getApplyDeptName() == null || surgery.getApplyDeptName().isEmpty()) 
                 && surgery.getApplyDeptId() != null) {
             try {
-                com.openhis.administration.domain.Organization org = organizationService.getById(surgery.getApplyDeptId());
+                com.healthlink.his.administration.domain.Organization org = organizationService.getById(surgery.getApplyDeptId());
                 if (org != null && org.getName() != null) {
                     surgery.setApplyDeptName(org.getName());
                     log.info("填充申请科室名称 - surgeryId: {}, deptId: {}, deptName: {}", 
@@ -548,7 +548,7 @@ public class SurgicalScheduleAppServiceImpl implements ISurgicalScheduleAppServi
         if ((surgery.getOrgName() == null || surgery.getOrgName().isEmpty()) 
                 && surgery.getOrgId() != null) {
             try {
-                com.openhis.administration.domain.Organization org = organizationService.getById(surgery.getOrgId());
+                com.healthlink.his.administration.domain.Organization org = organizationService.getById(surgery.getOrgId());
                 if (org != null && org.getName() != null) {
                     surgery.setOrgName(org.getName());
                 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/controller/SurgeryController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/controller/SurgeryController.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/controller/SurgeryController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/controller/SurgeryController.java
index b20ed8ebb..c782cbc98 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/controller/SurgeryController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/controller/SurgeryController.java
@@ -1,10 +1,10 @@
-package com.openhis.web.clinicalmanage.controller;
+package com.healthlink.his.web.clinicalmanage.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.administration.domain.Encounter;
-import com.openhis.web.clinicalmanage.appservice.ISurgeryAppService;
-import com.openhis.web.clinicalmanage.dto.SurgeryDto;
+import com.healthlink.his.administration.domain.Encounter;
+import com.healthlink.his.web.clinicalmanage.appservice.ISurgeryAppService;
+import com.healthlink.his.web.clinicalmanage.dto.SurgeryDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/controller/SurgicalScheduleController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/controller/SurgicalScheduleController.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/controller/SurgicalScheduleController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/controller/SurgicalScheduleController.java
index 77d2e13c1..2bad0ba54 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/controller/SurgicalScheduleController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/controller/SurgicalScheduleController.java
@@ -1,14 +1,14 @@
-package com.openhis.web.clinicalmanage.controller;
+package com.healthlink.his.web.clinicalmanage.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.ActivityDefCategory;
-import com.openhis.web.clinicalmanage.appservice.ISurgicalScheduleAppService;
-import com.openhis.web.clinicalmanage.dto.OpCreateScheduleDto;
-import com.openhis.web.clinicalmanage.dto.OpScheduleDto;
-import com.openhis.web.regdoctorstation.appservice.IRequestFormManageAppService;
-import com.openhis.web.regdoctorstation.dto.RequestFormDto;
-import com.openhis.web.regdoctorstation.dto.RequestFormPageDto;
+import com.healthlink.his.common.enums.ActivityDefCategory;
+import com.healthlink.his.web.clinicalmanage.appservice.ISurgicalScheduleAppService;
+import com.healthlink.his.web.clinicalmanage.dto.OpCreateScheduleDto;
+import com.healthlink.his.web.clinicalmanage.dto.OpScheduleDto;
+import com.healthlink.his.web.regdoctorstation.appservice.IRequestFormManageAppService;
+import com.healthlink.his.web.regdoctorstation.dto.RequestFormDto;
+import com.healthlink.his.web.regdoctorstation.dto.RequestFormPageDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpCreateScheduleDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/dto/OpCreateScheduleDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpCreateScheduleDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/dto/OpCreateScheduleDto.java
index fcc854712..95c09cf66 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpCreateScheduleDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/dto/OpCreateScheduleDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.clinicalmanage.dto;
+package com.healthlink.his.web.clinicalmanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpScheduleDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/dto/OpScheduleDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpScheduleDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/dto/OpScheduleDto.java
index ac243f385..a90205d13 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpScheduleDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/dto/OpScheduleDto.java
@@ -1,7 +1,7 @@
-package com.openhis.web.clinicalmanage.dto;
+package com.healthlink.his.web.clinicalmanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.surgicalschedule.domain.OpSchedule;
+import com.healthlink.his.surgicalschedule.domain.OpSchedule;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/SurgeryDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/dto/SurgeryDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/SurgeryDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/dto/SurgeryDto.java
index 508268977..c7a5fd9e9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/SurgeryDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/dto/SurgeryDto.java
@@ -1,9 +1,9 @@
-package com.openhis.web.clinicalmanage.dto;
+package com.healthlink.his.web.clinicalmanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/mapper/SurgeryAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/mapper/SurgeryAppMapper.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/mapper/SurgeryAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/mapper/SurgeryAppMapper.java
index 87b3e38ec..4a3fda121 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/mapper/SurgeryAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/mapper/SurgeryAppMapper.java
@@ -1,11 +1,11 @@
-package com.openhis.web.clinicalmanage.mapper;
+package com.healthlink.his.web.clinicalmanage.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.clinicalmanage.dto.SurgeryDto;
+import com.healthlink.his.web.clinicalmanage.dto.SurgeryDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/mapper/SurgicalScheduleAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/mapper/SurgicalScheduleAppMapper.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/mapper/SurgicalScheduleAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/mapper/SurgicalScheduleAppMapper.java
index e8de099ea..20059144f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/mapper/SurgicalScheduleAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/mapper/SurgicalScheduleAppMapper.java
@@ -1,9 +1,9 @@
-package com.openhis.web.clinicalmanage.mapper;
+package com.healthlink.his.web.clinicalmanage.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.openhis.web.clinicalmanage.dto.OpScheduleDto;
+import com.healthlink.his.web.clinicalmanage.dto.OpScheduleDto;
 import org.apache.ibatis.annotations.Param;
 
 import java.time.LocalDateTime;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/ICommonService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/appservice/ICommonService.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/ICommonService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/appservice/ICommonService.java
index b436d532c..430321bb9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/ICommonService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/appservice/ICommonService.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.common.appservice;
+package com.healthlink.his.web.common.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.administration.domain.Organization;
-import com.openhis.web.common.dto.InventoryItemParam;
-import com.openhis.web.common.dto.LocationDto;
-import com.openhis.web.common.dto.SearchTraceNoParam;
+import com.healthlink.his.administration.domain.Organization;
+import com.healthlink.his.web.common.dto.InventoryItemParam;
+import com.healthlink.his.web.common.dto.LocationDto;
+import com.healthlink.his.web.common.dto.SearchTraceNoParam;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/impl/CommonServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/appservice/impl/CommonServiceImpl.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/impl/CommonServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/appservice/impl/CommonServiceImpl.java
index c238a28b4..be0c35e68 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/impl/CommonServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/appservice/impl/CommonServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.common.appservice.impl;
+package com.healthlink.his.web.common.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -14,34 +14,34 @@ import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.administration.domain.Location;
-import com.openhis.administration.domain.Organization;
-import com.openhis.administration.domain.Supplier;
-import com.openhis.administration.domain.TraceNoManage;
-import com.openhis.administration.mapper.TraceNoManageMapper;
-import com.openhis.administration.service.ILocationService;
-import com.openhis.administration.service.IOrganizationService;
-import com.openhis.administration.service.IPractitionerRoleService;
-import com.openhis.administration.service.ISupplierService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.*;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.document.domain.DocInventoryItemStatic;
-import com.openhis.document.service.IDocInventoryItemStaticService;
-import com.openhis.financial.domain.Contract;
-import com.openhis.financial.mapper.ContractMapper;
-import com.openhis.medication.domain.MedicationDispense;
-import com.openhis.medication.service.IMedicationDispenseService;
-import com.openhis.web.chargemanage.dto.ContractMetadata;
-import com.openhis.web.common.appservice.ICommonService;
-import com.openhis.web.common.dto.*;
-import com.openhis.web.common.mapper.CommonAppMapper;
-import com.openhis.web.pharmacymanage.dto.InventoryDetailDto;
-import com.openhis.workflow.domain.DeviceDispense;
-import com.openhis.workflow.domain.InventoryItem;
-import com.openhis.workflow.service.IDeviceDispenseService;
-import com.openhis.workflow.service.IInventoryItemService;
+import com.healthlink.his.administration.domain.Location;
+import com.healthlink.his.administration.domain.Organization;
+import com.healthlink.his.administration.domain.Supplier;
+import com.healthlink.his.administration.domain.TraceNoManage;
+import com.healthlink.his.administration.mapper.TraceNoManageMapper;
+import com.healthlink.his.administration.service.ILocationService;
+import com.healthlink.his.administration.service.IOrganizationService;
+import com.healthlink.his.administration.service.IPractitionerRoleService;
+import com.healthlink.his.administration.service.ISupplierService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.enums.*;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.document.domain.DocInventoryItemStatic;
+import com.healthlink.his.document.service.IDocInventoryItemStaticService;
+import com.healthlink.his.financial.domain.Contract;
+import com.healthlink.his.financial.mapper.ContractMapper;
+import com.healthlink.his.medication.domain.MedicationDispense;
+import com.healthlink.his.medication.service.IMedicationDispenseService;
+import com.healthlink.his.web.chargemanage.dto.ContractMetadata;
+import com.healthlink.his.web.common.appservice.ICommonService;
+import com.healthlink.his.web.common.dto.*;
+import com.healthlink.his.web.common.mapper.CommonAppMapper;
+import com.healthlink.his.web.pharmacymanage.dto.InventoryDetailDto;
+import com.healthlink.his.workflow.domain.DeviceDispense;
+import com.healthlink.his.workflow.domain.InventoryItem;
+import com.healthlink.his.workflow.service.IDeviceDispenseService;
+import com.healthlink.his.workflow.service.IInventoryItemService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/controller/CommonAppController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/controller/CommonAppController.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/controller/CommonAppController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/controller/CommonAppController.java
index 32221d1c0..1edce41cc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/controller/CommonAppController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/controller/CommonAppController.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.common.controller;
+package com.healthlink.his.web.common.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.common.appservice.ICommonService;
-import com.openhis.web.common.dto.InventoryItemParam;
-import com.openhis.web.common.dto.LocationDto;
-import com.openhis.web.common.dto.SearchTraceNoParam;
+import com.healthlink.his.web.common.appservice.ICommonService;
+import com.healthlink.his.web.common.dto.InventoryItemParam;
+import com.healthlink.his.web.common.dto.LocationDto;
+import com.healthlink.his.web.common.dto.SearchTraceNoParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/ActivityDefinitionDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/ActivityDefinitionDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/ActivityDefinitionDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/ActivityDefinitionDto.java
index 2b0b76384..f17511bac 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/ActivityDefinitionDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/ActivityDefinitionDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.common.dto;
+package com.healthlink.his.web.common.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/AdviceItemPrintInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/AdviceItemPrintInfoDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/AdviceItemPrintInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/AdviceItemPrintInfoDto.java
index 50bfa6b0c..30fca622f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/AdviceItemPrintInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/AdviceItemPrintInfoDto.java
@@ -1,9 +1,9 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.common.dto;
+package com.healthlink.his.web.common.dto;
 
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/AdvicePrintInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/AdvicePrintInfoDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/AdvicePrintInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/AdvicePrintInfoDto.java
index 350bffb7d..ab729c831 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/AdvicePrintInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/AdvicePrintInfoDto.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.common.dto;
+package com.healthlink.his.web.common.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/InventoryItemDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/InventoryItemDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/InventoryItemDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/InventoryItemDto.java
index ab7df4d1d..16419476b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/InventoryItemDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/InventoryItemDto.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.common.dto;
+package com.healthlink.his.web.common.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/InventoryItemParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/InventoryItemParam.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/InventoryItemParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/InventoryItemParam.java
index 767854ab6..1fde9a8e0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/InventoryItemParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/InventoryItemParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.common.dto;
+package com.healthlink.his.web.common.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/LocationDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/LocationDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/LocationDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/LocationDto.java
index 576177dd5..c67f8d17c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/LocationDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/LocationDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.common.dto;
+package com.healthlink.his.web.common.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/LocationInventoryDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/LocationInventoryDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/LocationInventoryDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/LocationInventoryDto.java
index e1662c0dc..2a4d607ca 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/LocationInventoryDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/LocationInventoryDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.common.dto;
+package com.healthlink.his.web.common.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/PerformInfoDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/PerformInfoDto.java
index 0b3e9d3d4..edb889275 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/PerformInfoDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.common.dto;
+package com.healthlink.his.web.common.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformRecordDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/PerformRecordDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformRecordDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/PerformRecordDto.java
index 9a13c38f4..bde3e6c01 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformRecordDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/PerformRecordDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.common.dto;
+package com.healthlink.his.web.common.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PractitionerInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/PractitionerInfoDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PractitionerInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/PractitionerInfoDto.java
index c6aa5ce5f..862d6d9c3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PractitionerInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/PractitionerInfoDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.common.dto;
+package com.healthlink.his.web.common.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/SearchTraceNoParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/SearchTraceNoParam.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/SearchTraceNoParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/SearchTraceNoParam.java
index c1ff23b1f..68b8690b9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/SearchTraceNoParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/SearchTraceNoParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.common.dto;
+package com.healthlink.his.web.common.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/UnitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/UnitDto.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/UnitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/UnitDto.java
index 1bafa463a..bbc5860e9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/UnitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/UnitDto.java
@@ -1,9 +1,9 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.common.dto;
+package com.healthlink.his.web.common.dto;
 
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/UnitQuantityDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/UnitQuantityDto.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/UnitQuantityDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/UnitQuantityDto.java
index 2373e6276..e330466a1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/UnitQuantityDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/UnitQuantityDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.common.dto;
+package com.healthlink.his.web.common.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/mapper/CommonAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/mapper/CommonAppMapper.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/mapper/CommonAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/mapper/CommonAppMapper.java
index 9ec03aa86..99a31d717 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/mapper/CommonAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/common/mapper/CommonAppMapper.java
@@ -1,15 +1,15 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.common.mapper;
+package com.healthlink.his.web.common.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.administration.domain.TraceNoManage;
-import com.openhis.web.common.dto.*;
-import com.openhis.web.pharmacymanage.dto.InventoryDetailDto;
+import com.healthlink.his.administration.domain.TraceNoManage;
+import com.healthlink.his.web.common.dto.*;
+import com.healthlink.his.web.pharmacymanage.dto.InventoryDetailDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/appservice/IConsultationAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/appservice/IConsultationAppService.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/appservice/IConsultationAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/appservice/IConsultationAppService.java
index 1117e2d65..ff67c8d0b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/appservice/IConsultationAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/appservice/IConsultationAppService.java
@@ -1,6 +1,6 @@
-package com.openhis.web.consultation.appservice;
+package com.healthlink.his.web.consultation.appservice;
 
-import com.openhis.web.consultation.dto.*;
+import com.healthlink.his.web.consultation.dto.*;
 
 import java.util.List;
 import java.util.Map;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/appservice/impl/ConsultationAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/appservice/impl/ConsultationAppServiceImpl.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/appservice/impl/ConsultationAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/appservice/impl/ConsultationAppServiceImpl.java
index 73d75dd0f..7ae92b33b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/appservice/impl/ConsultationAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/appservice/impl/ConsultationAppServiceImpl.java
@@ -1,53 +1,53 @@
-package com.openhis.web.consultation.appservice.impl;
+package com.healthlink.his.web.consultation.appservice.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.Encounter;
-import com.openhis.administration.domain.EncounterDiagnosis;
-import com.openhis.administration.domain.Organization;
-import com.openhis.administration.domain.Patient;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.mapper.EncounterDiagnosisMapper;
-import com.openhis.administration.mapper.EncounterMapper;
-import com.openhis.administration.mapper.OrganizationMapper;
-import com.openhis.administration.mapper.PatientMapper;
-import com.openhis.administration.mapper.PractitionerMapper;
-import com.openhis.clinical.domain.Condition;
-import com.openhis.clinical.mapper.ConditionMapper;
-import com.openhis.web.consultation.mapper.ConsultationRequestMapper;
-import com.openhis.workflow.domain.ServiceRequest;
-import com.openhis.workflow.service.IServiceRequestService;
-import com.openhis.common.enums.RequestStatus;
-import com.openhis.common.enums.GenerateSource;
-import com.openhis.common.enums.ItemType;
+import com.healthlink.his.administration.domain.Encounter;
+import com.healthlink.his.administration.domain.EncounterDiagnosis;
+import com.healthlink.his.administration.domain.Organization;
+import com.healthlink.his.administration.domain.Patient;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.mapper.EncounterDiagnosisMapper;
+import com.healthlink.his.administration.mapper.EncounterMapper;
+import com.healthlink.his.administration.mapper.OrganizationMapper;
+import com.healthlink.his.administration.mapper.PatientMapper;
+import com.healthlink.his.administration.mapper.PractitionerMapper;
+import com.healthlink.his.clinical.domain.Condition;
+import com.healthlink.his.clinical.mapper.ConditionMapper;
+import com.healthlink.his.web.consultation.mapper.ConsultationRequestMapper;
+import com.healthlink.his.workflow.domain.ServiceRequest;
+import com.healthlink.his.workflow.service.IServiceRequestService;
+import com.healthlink.his.common.enums.RequestStatus;
+import com.healthlink.his.common.enums.GenerateSource;
+import com.healthlink.his.common.enums.ItemType;
 import com.core.common.utils.AssignSeqUtil;
-import com.openhis.common.enums.AssignSeqEnum;
-import com.openhis.web.consultation.appservice.IConsultationAppService;
-import com.openhis.web.consultation.dto.ConsultationActivityDto;
-import com.openhis.web.consultation.dto.ConsultationConfirmationDto;
-import com.openhis.web.consultation.dto.ConsultationOpinionDto;
-import com.openhis.web.consultation.dto.ConsultationRequestDto;
-import com.openhis.web.consultation.dto.DepartmentTreeDto;
-import com.openhis.web.consultation.dto.InvitedObjectDto;
-import com.openhis.web.consultation.dto.PhysicianNodeDto;
+import com.healthlink.his.common.enums.AssignSeqEnum;
+import com.healthlink.his.web.consultation.appservice.IConsultationAppService;
+import com.healthlink.his.web.consultation.dto.ConsultationActivityDto;
+import com.healthlink.his.web.consultation.dto.ConsultationConfirmationDto;
+import com.healthlink.his.web.consultation.dto.ConsultationOpinionDto;
+import com.healthlink.his.web.consultation.dto.ConsultationRequestDto;
+import com.healthlink.his.web.consultation.dto.DepartmentTreeDto;
+import com.healthlink.his.web.consultation.dto.InvitedObjectDto;
+import com.healthlink.his.web.consultation.dto.PhysicianNodeDto;
 
-import com.openhis.web.consultation.mapper.ConsultationInvitedMapper;
-import com.openhis.web.consultation.mapper.ConsultationConfirmationMapper;
-import com.openhis.web.consultation.domain.ConsultationRequest;
-import com.openhis.web.consultation.domain.ConsultationInvited;
-import com.openhis.web.consultation.domain.ConsultationConfirmation;
-import com.openhis.web.consultation.enums.ConsultationStatusEnum;
-import com.openhis.web.consultation.enums.ConsultationUrgencyEnum;
-import com.openhis.workflow.domain.ActivityDefinition;
-import com.openhis.workflow.mapper.ActivityDefinitionMapper;
-import com.openhis.administration.domain.ChargeItemDefinition;
-import com.openhis.administration.mapper.ChargeItemDefinitionMapper;
-import com.openhis.administration.domain.ChargeItem;
-import com.openhis.administration.service.IChargeItemService;
-import com.openhis.common.enums.ChargeItemStatus;
-import com.openhis.web.doctorstation.mapper.DoctorStationAdviceAppMapper;
+import com.healthlink.his.web.consultation.mapper.ConsultationInvitedMapper;
+import com.healthlink.his.web.consultation.mapper.ConsultationConfirmationMapper;
+import com.healthlink.his.web.consultation.domain.ConsultationRequest;
+import com.healthlink.his.web.consultation.domain.ConsultationInvited;
+import com.healthlink.his.web.consultation.domain.ConsultationConfirmation;
+import com.healthlink.his.web.consultation.enums.ConsultationStatusEnum;
+import com.healthlink.his.web.consultation.enums.ConsultationUrgencyEnum;
+import com.healthlink.his.workflow.domain.ActivityDefinition;
+import com.healthlink.his.workflow.mapper.ActivityDefinitionMapper;
+import com.healthlink.his.administration.domain.ChargeItemDefinition;
+import com.healthlink.his.administration.mapper.ChargeItemDefinitionMapper;
+import com.healthlink.his.administration.domain.ChargeItem;
+import com.healthlink.his.administration.service.IChargeItemService;
+import com.healthlink.his.common.enums.ChargeItemStatus;
+import com.healthlink.his.web.doctorstation.mapper.DoctorStationAdviceAppMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -61,7 +61,7 @@ import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
-import static com.openhis.web.consultation.enums.ConsultationStatusEnum.CANCELLED;
+import static com.healthlink.his.web.consultation.enums.ConsultationStatusEnum.CANCELLED;
 
 /**
  * 会诊管理AppService实现类
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/controller/ConsultationController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/controller/ConsultationController.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/controller/ConsultationController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/controller/ConsultationController.java
index 51ce74659..4b96a0579 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/controller/ConsultationController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/controller/ConsultationController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.consultation.controller;
+package com.healthlink.his.web.consultation.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.consultation.appservice.IConsultationAppService;
-import com.openhis.web.consultation.dto.ConsultationActivityDto;
-import com.openhis.web.consultation.dto.ConsultationConfirmationDto;
-import com.openhis.web.consultation.dto.ConsultationOpinionDto;
-import com.openhis.web.consultation.dto.ConsultationRequestDto;
-import com.openhis.web.consultation.dto.DepartmentTreeDto;
+import com.healthlink.his.web.consultation.appservice.IConsultationAppService;
+import com.healthlink.his.web.consultation.dto.ConsultationActivityDto;
+import com.healthlink.his.web.consultation.dto.ConsultationConfirmationDto;
+import com.healthlink.his.web.consultation.dto.ConsultationOpinionDto;
+import com.healthlink.his.web.consultation.dto.ConsultationRequestDto;
+import com.healthlink.his.web.consultation.dto.DepartmentTreeDto;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameters;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/domain/ConsultationConfirmation.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/domain/ConsultationConfirmation.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/domain/ConsultationConfirmation.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/domain/ConsultationConfirmation.java
index 054c6b06f..fab2f1000 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/domain/ConsultationConfirmation.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/domain/ConsultationConfirmation.java
@@ -1,4 +1,4 @@
-package com.openhis.web.consultation.domain;
+package com.healthlink.his.web.consultation.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/domain/ConsultationInvited.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/domain/ConsultationInvited.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/domain/ConsultationInvited.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/domain/ConsultationInvited.java
index c1d7402d7..cc88e6918 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/domain/ConsultationInvited.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/domain/ConsultationInvited.java
@@ -1,4 +1,4 @@
-package com.openhis.web.consultation.domain;
+package com.healthlink.his.web.consultation.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/domain/ConsultationRequest.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/domain/ConsultationRequest.java
similarity index 99%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/domain/ConsultationRequest.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/domain/ConsultationRequest.java
index 4165d204f..799d728c8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/domain/ConsultationRequest.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/domain/ConsultationRequest.java
@@ -1,4 +1,4 @@
-package com.openhis.web.consultation.domain;
+package com.healthlink.his.web.consultation.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/ConsultationActivityDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/dto/ConsultationActivityDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/ConsultationActivityDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/dto/ConsultationActivityDto.java
index ab8e3870b..7f3ab7b62 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/ConsultationActivityDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/dto/ConsultationActivityDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.consultation.dto;
+package com.healthlink.his.web.consultation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/ConsultationConfirmationDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/dto/ConsultationConfirmationDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/ConsultationConfirmationDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/dto/ConsultationConfirmationDto.java
index c3289978c..cd39a7cfd 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/ConsultationConfirmationDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/dto/ConsultationConfirmationDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.consultation.dto;
+package com.healthlink.his.web.consultation.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/ConsultationOpinionDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/dto/ConsultationOpinionDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/ConsultationOpinionDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/dto/ConsultationOpinionDto.java
index d9cabd852..8bac0d5ae 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/ConsultationOpinionDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/dto/ConsultationOpinionDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.consultation.dto;
+package com.healthlink.his.web.consultation.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/ConsultationRequestDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/dto/ConsultationRequestDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/ConsultationRequestDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/dto/ConsultationRequestDto.java
index c292c3d16..9bd5bb980 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/ConsultationRequestDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/dto/ConsultationRequestDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.consultation.dto;
+package com.healthlink.his.web.consultation.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/DepartmentTreeDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/dto/DepartmentTreeDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/DepartmentTreeDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/dto/DepartmentTreeDto.java
index 18abc3ab9..d7a455e3c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/DepartmentTreeDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/dto/DepartmentTreeDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.consultation.dto;
+package com.healthlink.his.web.consultation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/InvitedObjectDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/dto/InvitedObjectDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/InvitedObjectDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/dto/InvitedObjectDto.java
index 918dadc34..dd9b95ce4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/InvitedObjectDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/dto/InvitedObjectDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.consultation.dto;
+package com.healthlink.his.web.consultation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/PhysicianNodeDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/dto/PhysicianNodeDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/PhysicianNodeDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/dto/PhysicianNodeDto.java
index 54cfb9d87..2d95eb1cc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/PhysicianNodeDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/dto/PhysicianNodeDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.consultation.dto;
+package com.healthlink.his.web.consultation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/enums/ConsultationStatusEnum.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/enums/ConsultationStatusEnum.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/enums/ConsultationStatusEnum.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/enums/ConsultationStatusEnum.java
index 8aded5d1c..69c56d3a3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/enums/ConsultationStatusEnum.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/enums/ConsultationStatusEnum.java
@@ -1,4 +1,4 @@
-package com.openhis.web.consultation.enums;
+package com.healthlink.his.web.consultation.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/enums/ConsultationUrgencyEnum.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/enums/ConsultationUrgencyEnum.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/enums/ConsultationUrgencyEnum.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/enums/ConsultationUrgencyEnum.java
index a18ce3cbd..c5acb00d1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/enums/ConsultationUrgencyEnum.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/enums/ConsultationUrgencyEnum.java
@@ -1,4 +1,4 @@
-package com.openhis.web.consultation.enums;
+package com.healthlink.his.web.consultation.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/enums/InvitedStatusEnum.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/enums/InvitedStatusEnum.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/enums/InvitedStatusEnum.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/enums/InvitedStatusEnum.java
index 349c0f697..a06b7a65a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/enums/InvitedStatusEnum.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/enums/InvitedStatusEnum.java
@@ -1,4 +1,4 @@
-package com.openhis.web.consultation.enums;
+package com.healthlink.his.web.consultation.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/mapper/ConsultationConfirmationMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/mapper/ConsultationConfirmationMapper.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/mapper/ConsultationConfirmationMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/mapper/ConsultationConfirmationMapper.java
index 49ea8d56b..64bb7bf9c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/mapper/ConsultationConfirmationMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/mapper/ConsultationConfirmationMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.web.consultation.mapper;
+package com.healthlink.his.web.consultation.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.web.consultation.domain.ConsultationConfirmation;
+import com.healthlink.his.web.consultation.domain.ConsultationConfirmation;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/mapper/ConsultationInvitedMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/mapper/ConsultationInvitedMapper.java
similarity index 69%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/mapper/ConsultationInvitedMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/mapper/ConsultationInvitedMapper.java
index fd3931482..e3a1a1a7b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/mapper/ConsultationInvitedMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/mapper/ConsultationInvitedMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.web.consultation.mapper;
+package com.healthlink.his.web.consultation.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.web.consultation.domain.ConsultationInvited;
+import com.healthlink.his.web.consultation.domain.ConsultationInvited;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/mapper/ConsultationRequestMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/mapper/ConsultationRequestMapper.java
similarity index 69%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/mapper/ConsultationRequestMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/mapper/ConsultationRequestMapper.java
index cb7aaaa59..3e427e432 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/mapper/ConsultationRequestMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/mapper/ConsultationRequestMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.web.consultation.mapper;
+package com.healthlink.his.web.consultation.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.web.consultation.domain.ConsultationRequest;
+import com.healthlink.his.web.consultation.domain.ConsultationRequest;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/controller/HomeStatisticsController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/controller/HomeStatisticsController.java
similarity index 81%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/controller/HomeStatisticsController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/controller/HomeStatisticsController.java
index b4c2ee67b..4e5350544 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/controller/HomeStatisticsController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/controller/HomeStatisticsController.java
@@ -1,10 +1,10 @@
-package com.openhis.web.controller;
+package com.healthlink.his.web.controller;
 
 import com.core.common.core.controller.BaseController;
 import com.core.common.core.domain.AjaxResult;
-import com.openhis.administration.domain.Encounter;
-import com.openhis.web.dto.HomeStatisticsDto;
-import com.openhis.web.service.IHomeStatisticsService;
+import com.healthlink.his.administration.domain.Encounter;
+import com.healthlink.his.web.dto.HomeStatisticsDto;
+import com.healthlink.his.web.service.IHomeStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ICDCodeService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/ICDCodeService.java
similarity index 79%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ICDCodeService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/ICDCodeService.java
index 141f5e6ba..eceba9852 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ICDCodeService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/ICDCodeService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.datadictionary.appservice;
+package com.healthlink.his.web.datadictionary.appservice;
 import com.core.common.core.domain.R;
-import com.openhis.web.datadictionary.dto.ICDCodeAddDto;
-import com.openhis.web.datadictionary.dto.ICDCodeUpdateDto;
+import com.healthlink.his.web.datadictionary.dto.ICDCodeAddDto;
+import com.healthlink.his.web.datadictionary.dto.ICDCodeUpdateDto;
 
 public interface ICDCodeService {
     /**
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDeviceManageAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/IDeviceManageAppService.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDeviceManageAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/IDeviceManageAppService.java
index b1ef7781b..138af9792 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDeviceManageAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/IDeviceManageAppService.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.datadictionary.appservice;
+package com.healthlink.his.web.datadictionary.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.datadictionary.dto.DeviceManageSelParam;
-import com.openhis.web.datadictionary.dto.DeviceManageUpDto;
+import com.healthlink.his.web.datadictionary.dto.DeviceManageSelParam;
+import com.healthlink.his.web.datadictionary.dto.DeviceManageUpDto;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiagTreatMAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/IDiagTreatMAppService.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiagTreatMAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/IDiagTreatMAppService.java
index 8a2c63ad1..db07b94a7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiagTreatMAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/IDiagTreatMAppService.java
@@ -1,8 +1,8 @@
-package com.openhis.web.datadictionary.appservice;
+package com.healthlink.his.web.datadictionary.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam;
-import com.openhis.web.datadictionary.dto.DiagnosisTreatmentUpDto;
+import com.healthlink.his.web.datadictionary.dto.DiagnosisTreatmentSelParam;
+import com.healthlink.his.web.datadictionary.dto.DiagnosisTreatmentUpDto;
 import org.springframework.web.multipart.MultipartFile;
 
 import jakarta.servlet.http.HttpServletRequest;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiseaseManageAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/IDiseaseManageAppService.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiseaseManageAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/IDiseaseManageAppService.java
index e34fc5b7d..125496672 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiseaseManageAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/IDiseaseManageAppService.java
@@ -1,8 +1,8 @@
-package com.openhis.web.datadictionary.appservice;
+package com.healthlink.his.web.datadictionary.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.datadictionary.dto.DiseaseManageSelParam;
-import com.openhis.web.datadictionary.dto.DiseaseManageUpDto;
+import com.healthlink.his.web.datadictionary.dto.DiseaseManageSelParam;
+import com.healthlink.his.web.datadictionary.dto.DiseaseManageUpDto;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IItemDefinitionService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/IItemDefinitionService.java
similarity index 80%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IItemDefinitionService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/IItemDefinitionService.java
index 9ab107b4f..cd4d93de4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IItemDefinitionService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/IItemDefinitionService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.datadictionary.appservice;
+package com.healthlink.his.web.datadictionary.appservice;
 
-import com.openhis.administration.domain.ChargeItemDefinition;
-import com.openhis.web.datadictionary.dto.ItemUpFromDirectoryDto;
+import com.healthlink.his.administration.domain.ChargeItemDefinition;
+import com.healthlink.his.web.datadictionary.dto.ItemUpFromDirectoryDto;
 
 import java.math.BigDecimal;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IMedicationManageAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/IMedicationManageAppService.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IMedicationManageAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/IMedicationManageAppService.java
index 21f271492..062398943 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IMedicationManageAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/IMedicationManageAppService.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.datadictionary.appservice;
+package com.healthlink.his.web.datadictionary.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.datadictionary.dto.MedicationManageUpDto;
-import com.openhis.web.datadictionary.dto.MedicationSearchParam;
+import com.healthlink.his.web.datadictionary.dto.MedicationManageUpDto;
+import com.healthlink.his.web.datadictionary.dto.MedicationSearchParam;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ISupplierManagementAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/ISupplierManagementAppService.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ISupplierManagementAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/ISupplierManagementAppService.java
index 9a0c03e8a..2a2d10796 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ISupplierManagementAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/ISupplierManagementAppService.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.datadictionary.appservice;
+package com.healthlink.his.web.datadictionary.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.datadictionary.dto.SupplierSearchParam;
-import com.openhis.web.datadictionary.dto.SupplierUpDto;
+import com.healthlink.his.web.datadictionary.dto.SupplierSearchParam;
+import com.healthlink.his.web.datadictionary.dto.SupplierUpDto;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ItemDefinitionAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/ItemDefinitionAppService.java
similarity index 83%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ItemDefinitionAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/ItemDefinitionAppService.java
index d016b6a15..1611e9e5d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ItemDefinitionAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/ItemDefinitionAppService.java
@@ -1,9 +1,9 @@
-package com.openhis.web.datadictionary.appservice;
+package com.healthlink.his.web.datadictionary.appservice;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.web.datadictionary.dto.ItemDefinitionDetailDto;
-import com.openhis.web.datadictionary.dto.ItemDefinitionDto;
+import com.healthlink.his.web.datadictionary.dto.ItemDefinitionDetailDto;
+import com.healthlink.his.web.datadictionary.dto.ItemDefinitionDto;
 
 import java.math.BigDecimal;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java
index d00bf96f6..7b20a5c34 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.datadictionary.appservice.impl;
+package com.healthlink.his.web.datadictionary.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -14,29 +14,29 @@ import com.core.common.utils.*;
 import com.core.common.utils.bean.BeanUtils;
 import com.core.common.utils.poi.ExcelUtil;
 import com.core.system.service.ISysDictTypeService;
-import com.openhis.administration.domain.ChargeItemDefinition;
-import com.openhis.administration.domain.DeviceDefinition;
-import com.openhis.administration.domain.Location;
-import com.openhis.administration.domain.Supplier;
-import com.openhis.administration.service.IChargeItemDefinitionService;
-import com.openhis.administration.service.IDeviceDefinitionService;
-import com.openhis.administration.service.ILocationService;
-import com.openhis.administration.service.ISupplierService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.*;
-import com.openhis.common.utils.CommonUtil;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.sys.service.IOperationRecordService;
-import com.openhis.web.datadictionary.appservice.IDeviceManageAppService;
-import com.openhis.web.datadictionary.appservice.IItemDefinitionService;
-import com.openhis.web.datadictionary.dto.*;
-import com.openhis.web.datadictionary.mapper.DeviceManageMapper;
-import com.openhis.workflow.domain.DeviceRequest;
-import com.openhis.workflow.service.IDeviceRequestService;
-import com.openhis.workflow.service.ISupplyRequestService;
-import com.openhis.yb.service.YbManager;
+import com.healthlink.his.administration.domain.ChargeItemDefinition;
+import com.healthlink.his.administration.domain.DeviceDefinition;
+import com.healthlink.his.administration.domain.Location;
+import com.healthlink.his.administration.domain.Supplier;
+import com.healthlink.his.administration.service.IChargeItemDefinitionService;
+import com.healthlink.his.administration.service.IDeviceDefinitionService;
+import com.healthlink.his.administration.service.ILocationService;
+import com.healthlink.his.administration.service.ISupplierService;
+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.CommonUtil;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.sys.service.IOperationRecordService;
+import com.healthlink.his.web.datadictionary.appservice.IDeviceManageAppService;
+import com.healthlink.his.web.datadictionary.appservice.IItemDefinitionService;
+import com.healthlink.his.web.datadictionary.dto.*;
+import com.healthlink.his.web.datadictionary.mapper.DeviceManageMapper;
+import com.healthlink.his.workflow.domain.DeviceRequest;
+import com.healthlink.his.workflow.service.IDeviceRequestService;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
+import com.healthlink.his.yb.service.YbManager;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java
index c9ca457e9..045faac98 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.datadictionary.appservice.impl;
+package com.healthlink.his.web.datadictionary.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -11,27 +11,27 @@ import com.core.common.utils.*;
 import com.core.common.utils.bean.BeanUtils;
 import com.core.common.utils.poi.ExcelUtil;
 import com.core.system.service.ISysDictTypeService;
-import com.openhis.administration.domain.ChargeItemDefinition;
-import com.openhis.administration.domain.Organization;
-import com.openhis.administration.service.IChargeItemDefinitionService;
-import com.openhis.administration.service.IOrganizationService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.*;
-import com.openhis.common.utils.CommonUtil;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.sys.service.IOperationRecordService;
-import com.openhis.web.datadictionary.appservice.IDiagTreatMAppService;
-import com.openhis.web.datadictionary.appservice.IItemDefinitionService;
-import com.openhis.web.datadictionary.dto.*;
-import com.openhis.web.datadictionary.mapper.ActivityDefinitionManageMapper;
-import com.openhis.workflow.domain.ActivityDefinition;
-import com.openhis.workflow.domain.ServiceRequest;
-import com.openhis.workflow.mapper.ActivityDefinitionMapper;
-import com.openhis.workflow.service.IActivityDefinitionService;
-import com.openhis.workflow.service.IServiceRequestService;
-import com.openhis.yb.service.YbManager;
+import com.healthlink.his.administration.domain.ChargeItemDefinition;
+import com.healthlink.his.administration.domain.Organization;
+import com.healthlink.his.administration.service.IChargeItemDefinitionService;
+import com.healthlink.his.administration.service.IOrganizationService;
+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.CommonUtil;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.sys.service.IOperationRecordService;
+import com.healthlink.his.web.datadictionary.appservice.IDiagTreatMAppService;
+import com.healthlink.his.web.datadictionary.appservice.IItemDefinitionService;
+import com.healthlink.his.web.datadictionary.dto.*;
+import com.healthlink.his.web.datadictionary.mapper.ActivityDefinitionManageMapper;
+import com.healthlink.his.workflow.domain.ActivityDefinition;
+import com.healthlink.his.workflow.domain.ServiceRequest;
+import com.healthlink.his.workflow.mapper.ActivityDefinitionMapper;
+import com.healthlink.his.workflow.service.IActivityDefinitionService;
+import com.healthlink.his.workflow.service.IServiceRequestService;
+import com.healthlink.his.yb.service.YbManager;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiseaseManageAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/DiseaseManageAppServiceImpl.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiseaseManageAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/DiseaseManageAppServiceImpl.java
index a5863d37c..80f88cdd1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiseaseManageAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/DiseaseManageAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.datadictionary.appservice.impl;
+package com.healthlink.his.web.datadictionary.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,22 +7,22 @@ import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.ChineseConvertUtils;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.clinical.domain.ConditionDefinition;
-import com.openhis.clinical.mapper.ConditionDefinitionMapper;
-import com.openhis.clinical.service.IConditionDefinitionService;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.AssignSeqEnum;
-import com.openhis.common.enums.ConditionDefinitionSource;
-import com.openhis.common.enums.PublicationStatus;
-import com.openhis.common.enums.Whether;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisPageUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.datadictionary.appservice.IDiseaseManageAppService;
-import com.openhis.web.datadictionary.dto.DiseaseManageDto;
-import com.openhis.web.datadictionary.dto.DiseaseManageInitDto;
-import com.openhis.web.datadictionary.dto.DiseaseManageSelParam;
-import com.openhis.web.datadictionary.dto.DiseaseManageUpDto;
+import com.healthlink.his.clinical.domain.ConditionDefinition;
+import com.healthlink.his.clinical.mapper.ConditionDefinitionMapper;
+import com.healthlink.his.clinical.service.IConditionDefinitionService;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.AssignSeqEnum;
+import com.healthlink.his.common.enums.ConditionDefinitionSource;
+import com.healthlink.his.common.enums.PublicationStatus;
+import com.healthlink.his.common.enums.Whether;
+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.datadictionary.appservice.IDiseaseManageAppService;
+import com.healthlink.his.web.datadictionary.dto.DiseaseManageDto;
+import com.healthlink.his.web.datadictionary.dto.DiseaseManageInitDto;
+import com.healthlink.his.web.datadictionary.dto.DiseaseManageSelParam;
+import com.healthlink.his.web.datadictionary.dto.DiseaseManageUpDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ICDCodeServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/ICDCodeServiceImpl.java
similarity index 82%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ICDCodeServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/ICDCodeServiceImpl.java
index 9f1cf3fa1..72494f8df 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ICDCodeServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/ICDCodeServiceImpl.java
@@ -1,20 +1,20 @@
-package com.openhis.web.datadictionary.appservice.impl;
+package com.healthlink.his.web.datadictionary.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.clinical.domain.ConditionNoDefinition;
-import com.openhis.clinical.mapper.ConditionNoDefinitionMapper;
-import com.openhis.clinical.service.IConditionNoDefinitionService;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.utils.HisPageUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.datadictionary.appservice.ICDCodeService;
-import com.openhis.web.datadictionary.dto.ICDCodeAddDto;
-import com.openhis.web.datadictionary.dto.ICDCodeDto;
-import com.openhis.web.datadictionary.dto.ICDCodeUpdateDto;
+import com.healthlink.his.clinical.domain.ConditionNoDefinition;
+import com.healthlink.his.clinical.mapper.ConditionNoDefinitionMapper;
+import com.healthlink.his.clinical.service.IConditionNoDefinitionService;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.utils.HisPageUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.datadictionary.appservice.ICDCodeService;
+import com.healthlink.his.web.datadictionary.dto.ICDCodeAddDto;
+import com.healthlink.his.web.datadictionary.dto.ICDCodeDto;
+import com.healthlink.his.web.datadictionary.dto.ICDCodeUpdateDto;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/ItemDefinitionAppServiceImpl.java
similarity index 79%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/ItemDefinitionAppServiceImpl.java
index 0c77b8062..8933e3699 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/ItemDefinitionAppServiceImpl.java
@@ -1,25 +1,25 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.datadictionary.appservice.impl;
+package com.healthlink.his.web.datadictionary.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.MessageUtils;
-import com.openhis.administration.domain.ChargeItemDefinition;
-import com.openhis.administration.service.IChargeItemDefinitionService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.ConditionCode;
-import com.openhis.common.enums.PublicationStatus;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.datadictionary.appservice.ItemDefinitionAppService;
-import com.openhis.web.datadictionary.dto.ItemDefinitionDetailDto;
-import com.openhis.web.datadictionary.dto.ItemDefinitionDto;
-import com.openhis.web.datadictionary.mapper.ItemDefinitionAppMapper;
+import com.healthlink.his.administration.domain.ChargeItemDefinition;
+import com.healthlink.his.administration.service.IChargeItemDefinitionService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.ConditionCode;
+import com.healthlink.his.common.enums.PublicationStatus;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.datadictionary.appservice.ItemDefinitionAppService;
+import com.healthlink.his.web.datadictionary.dto.ItemDefinitionDetailDto;
+import com.healthlink.his.web.datadictionary.dto.ItemDefinitionDto;
+import com.healthlink.his.web.datadictionary.mapper.ItemDefinitionAppMapper;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java
index 8362ea5e8..a2ea9a406 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java
@@ -1,19 +1,19 @@
-package com.openhis.web.datadictionary.appservice.impl;
+package com.healthlink.his.web.datadictionary.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.core.common.core.domain.model.LoginUser;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.administration.domain.ChargeItemDefDetail;
-import com.openhis.administration.domain.ChargeItemDefinition;
-import com.openhis.administration.mapper.ChargeItemDefinitionMapper;
-import com.openhis.administration.service.IChargeItemDefDetailService;
-import com.openhis.administration.service.IChargeItemDefinitionService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.ConditionCode;
-import com.openhis.web.datadictionary.appservice.IItemDefinitionService;
-import com.openhis.web.datadictionary.dto.ItemUpFromDirectoryDto;
+import com.healthlink.his.administration.domain.ChargeItemDefDetail;
+import com.healthlink.his.administration.domain.ChargeItemDefinition;
+import com.healthlink.his.administration.mapper.ChargeItemDefinitionMapper;
+import com.healthlink.his.administration.service.IChargeItemDefDetailService;
+import com.healthlink.his.administration.service.IChargeItemDefinitionService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.enums.ConditionCode;
+import com.healthlink.his.web.datadictionary.appservice.IItemDefinitionService;
+import com.healthlink.his.web.datadictionary.dto.ItemUpFromDirectoryDto;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java
index c40165419..642a11ac2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.datadictionary.appservice.impl;
+package com.healthlink.his.web.datadictionary.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -14,32 +14,32 @@ import com.core.common.utils.*;
 import com.core.common.utils.bean.BeanUtils;
 import com.core.common.utils.poi.ExcelUtil;
 import com.core.system.service.ISysDictTypeService;
-import com.openhis.administration.domain.ChargeItemDefinition;
-import com.openhis.administration.domain.Location;
-import com.openhis.administration.domain.Supplier;
-import com.openhis.administration.service.IChargeItemDefinitionService;
-import com.openhis.administration.service.ILocationService;
-import com.openhis.administration.service.ISupplierService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.*;
-import com.openhis.common.utils.CommonUtil;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.medication.domain.Medication;
-import com.openhis.medication.domain.MedicationDefinition;
-import com.openhis.medication.domain.MedicationDetail;
-import com.openhis.medication.domain.MedicationRequest;
-import com.openhis.medication.service.IMedicationDefinitionService;
-import com.openhis.medication.service.IMedicationRequestService;
-import com.openhis.medication.service.IMedicationService;
-import com.openhis.sys.service.IOperationRecordService;
-import com.openhis.web.datadictionary.appservice.IItemDefinitionService;
-import com.openhis.web.datadictionary.appservice.IMedicationManageAppService;
-import com.openhis.web.datadictionary.dto.*;
-import com.openhis.web.datadictionary.mapper.MedicationManageSearchMapper;
-import com.openhis.workflow.service.ISupplyRequestService;
-import com.openhis.yb.service.YbManager;
+import com.healthlink.his.administration.domain.ChargeItemDefinition;
+import com.healthlink.his.administration.domain.Location;
+import com.healthlink.his.administration.domain.Supplier;
+import com.healthlink.his.administration.service.IChargeItemDefinitionService;
+import com.healthlink.his.administration.service.ILocationService;
+import com.healthlink.his.administration.service.ISupplierService;
+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.CommonUtil;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.medication.domain.Medication;
+import com.healthlink.his.medication.domain.MedicationDefinition;
+import com.healthlink.his.medication.domain.MedicationDetail;
+import com.healthlink.his.medication.domain.MedicationRequest;
+import com.healthlink.his.medication.service.IMedicationDefinitionService;
+import com.healthlink.his.medication.service.IMedicationRequestService;
+import com.healthlink.his.medication.service.IMedicationService;
+import com.healthlink.his.sys.service.IOperationRecordService;
+import com.healthlink.his.web.datadictionary.appservice.IItemDefinitionService;
+import com.healthlink.his.web.datadictionary.appservice.IMedicationManageAppService;
+import com.healthlink.his.web.datadictionary.dto.*;
+import com.healthlink.his.web.datadictionary.mapper.MedicationManageSearchMapper;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
+import com.healthlink.his.yb.service.YbManager;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/SupplierManagementAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/SupplierManagementAppServiceImpl.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/SupplierManagementAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/SupplierManagementAppServiceImpl.java
index 3cced248c..794cf9588 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/SupplierManagementAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/SupplierManagementAppServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.datadictionary.appservice.impl;
+package com.healthlink.his.web.datadictionary.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -13,22 +13,22 @@ import com.core.common.utils.ChineseConvertUtils;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.StringUtils;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.administration.domain.Supplier;
-import com.openhis.administration.mapper.SupplierMapper;
-import com.openhis.administration.service.ISupplierService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.AssignSeqEnum;
-import com.openhis.common.enums.SupplierType;
-import com.openhis.common.enums.Whether;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisPageUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.datadictionary.appservice.ISupplierManagementAppService;
-import com.openhis.web.datadictionary.dto.SupplierDto;
-import com.openhis.web.datadictionary.dto.SupplierInitDto;
-import com.openhis.web.datadictionary.dto.SupplierSearchParam;
-import com.openhis.web.datadictionary.dto.SupplierUpDto;
+import com.healthlink.his.administration.domain.Supplier;
+import com.healthlink.his.administration.mapper.SupplierMapper;
+import com.healthlink.his.administration.service.ISupplierService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.AssignSeqEnum;
+import com.healthlink.his.common.enums.SupplierType;
+import com.healthlink.his.common.enums.Whether;
+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.datadictionary.appservice.ISupplierManagementAppService;
+import com.healthlink.his.web.datadictionary.dto.SupplierDto;
+import com.healthlink.his.web.datadictionary.dto.SupplierInitDto;
+import com.healthlink.his.web.datadictionary.dto.SupplierSearchParam;
+import com.healthlink.his.web.datadictionary.dto.SupplierUpDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/assembler/ItemDefinitionAssembler.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/assembler/ItemDefinitionAssembler.java
similarity index 99%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/assembler/ItemDefinitionAssembler.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/assembler/ItemDefinitionAssembler.java
index d68f56f8b..03aa49359 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/assembler/ItemDefinitionAssembler.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/assembler/ItemDefinitionAssembler.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.datadictionary.assembler;
+package com.healthlink.his.web.datadictionary.assembler;
 
 /**
  * 费用定价dto转换器
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DeviceManageController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/controller/DeviceManageController.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DeviceManageController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/controller/DeviceManageController.java
index 43d67b91f..31db7d26a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DeviceManageController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/controller/DeviceManageController.java
@@ -1,9 +1,9 @@
-package com.openhis.web.datadictionary.controller;
+package com.healthlink.his.web.datadictionary.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.datadictionary.appservice.IDeviceManageAppService;
-import com.openhis.web.datadictionary.dto.DeviceManageSelParam;
-import com.openhis.web.datadictionary.dto.DeviceManageUpDto;
+import com.healthlink.his.web.datadictionary.appservice.IDeviceManageAppService;
+import com.healthlink.his.web.datadictionary.dto.DeviceManageSelParam;
+import com.healthlink.his.web.datadictionary.dto.DeviceManageUpDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/controller/DiagnosisTreatmentController.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/controller/DiagnosisTreatmentController.java
index 5b9be0b28..e92f9d869 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/controller/DiagnosisTreatmentController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.datadictionary.controller;
+package com.healthlink.his.web.datadictionary.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.core.common.core.domain.R;
-import com.openhis.lab.domain.InspectionType;
-import com.openhis.lab.service.IInspectionTypeService;
-import com.openhis.web.datadictionary.appservice.IDiagTreatMAppService;
-import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam;
-import com.openhis.web.datadictionary.dto.DiagnosisTreatmentUpDto;
+import com.healthlink.his.lab.domain.InspectionType;
+import com.healthlink.his.lab.service.IInspectionTypeService;
+import com.healthlink.his.web.datadictionary.appservice.IDiagTreatMAppService;
+import com.healthlink.his.web.datadictionary.dto.DiagnosisTreatmentSelParam;
+import com.healthlink.his.web.datadictionary.dto.DiagnosisTreatmentUpDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/controller/DiseaseManageController.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/controller/DiseaseManageController.java
index dcced5d7c..0a4bb3cad 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/controller/DiseaseManageController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.datadictionary.controller;
+package com.healthlink.his.web.datadictionary.controller;
 
 import com.core.common.core.domain.R;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.clinical.domain.ConditionDefinition;
-import com.openhis.web.datadictionary.appservice.IDiseaseManageAppService;
-import com.openhis.web.datadictionary.dto.DiseaseManageDto;
-import com.openhis.web.datadictionary.dto.DiseaseManageSelParam;
-import com.openhis.web.datadictionary.dto.DiseaseManageUpDto;
+import com.healthlink.his.clinical.domain.ConditionDefinition;
+import com.healthlink.his.web.datadictionary.appservice.IDiseaseManageAppService;
+import com.healthlink.his.web.datadictionary.dto.DiseaseManageDto;
+import com.healthlink.his.web.datadictionary.dto.DiseaseManageSelParam;
+import com.healthlink.his.web.datadictionary.dto.DiseaseManageUpDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ICDCodeController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/controller/ICDCodeController.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ICDCodeController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/controller/ICDCodeController.java
index 40c5cb553..61615e819 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ICDCodeController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/controller/ICDCodeController.java
@@ -1,9 +1,9 @@
-package com.openhis.web.datadictionary.controller;
+package com.healthlink.his.web.datadictionary.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.datadictionary.appservice.ICDCodeService;
-import com.openhis.web.datadictionary.dto.ICDCodeAddDto;
-import com.openhis.web.datadictionary.dto.ICDCodeUpdateDto;
+import com.healthlink.his.web.datadictionary.appservice.ICDCodeService;
+import com.healthlink.his.web.datadictionary.dto.ICDCodeAddDto;
+import com.healthlink.his.web.datadictionary.dto.ICDCodeUpdateDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/controller/ItemDefinitionController.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/controller/ItemDefinitionController.java
index c5a391020..02cd01fb1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/controller/ItemDefinitionController.java
@@ -1,14 +1,14 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.datadictionary.controller;
+package com.healthlink.his.web.datadictionary.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.ChargeItemContext;
-import com.openhis.common.enums.PublicationStatus;
-import com.openhis.web.datadictionary.appservice.ItemDefinitionAppService;
-import com.openhis.web.datadictionary.dto.ItemDefinitionDto;
-import com.openhis.web.datadictionary.dto.ItemDefinitionInitDto;
+import com.healthlink.his.common.enums.ChargeItemContext;
+import com.healthlink.his.common.enums.PublicationStatus;
+import com.healthlink.his.web.datadictionary.appservice.ItemDefinitionAppService;
+import com.healthlink.his.web.datadictionary.dto.ItemDefinitionDto;
+import com.healthlink.his.web.datadictionary.dto.ItemDefinitionInitDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/MedicationManageController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/controller/MedicationManageController.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/MedicationManageController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/controller/MedicationManageController.java
index 71d0e40f9..abb8e4f26 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/MedicationManageController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/controller/MedicationManageController.java
@@ -1,9 +1,9 @@
-package com.openhis.web.datadictionary.controller;
+package com.healthlink.his.web.datadictionary.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.datadictionary.appservice.IMedicationManageAppService;
-import com.openhis.web.datadictionary.dto.MedicationManageUpDto;
-import com.openhis.web.datadictionary.dto.MedicationSearchParam;
+import com.healthlink.his.web.datadictionary.appservice.IMedicationManageAppService;
+import com.healthlink.his.web.datadictionary.dto.MedicationManageUpDto;
+import com.healthlink.his.web.datadictionary.dto.MedicationSearchParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/controller/SupplierManagementController.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/controller/SupplierManagementController.java
index 7f4b26293..a40c9bdab 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/controller/SupplierManagementController.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.datadictionary.controller;
+package com.healthlink.his.web.datadictionary.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.datadictionary.appservice.ISupplierManagementAppService;
-import com.openhis.web.datadictionary.dto.SupplierSearchParam;
-import com.openhis.web.datadictionary.dto.SupplierUpDto;
+import com.healthlink.his.web.datadictionary.appservice.ISupplierManagementAppService;
+import com.healthlink.his.web.datadictionary.dto.SupplierSearchParam;
+import com.healthlink.his.web.datadictionary.dto.SupplierUpDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ActivityChildJsonDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ActivityChildJsonDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ActivityChildJsonDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ActivityChildJsonDto.java
index 77a25eee9..d1d89e356 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ActivityChildJsonDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ActivityChildJsonDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemDefPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ChargeItemDefPageDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemDefPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ChargeItemDefPageDto.java
index ba1c1bd76..01d671be3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemDefPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ChargeItemDefPageDto.java
@@ -1,9 +1,9 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.dto;
 
-import com.openhis.common.enums.PublicationStatus;
+import com.healthlink.his.common.enums.PublicationStatus;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemOptionDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ChargeItemOptionDto.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemOptionDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ChargeItemOptionDto.java
index ebf067740..57fe7f643 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemOptionDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ChargeItemOptionDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceImportDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DeviceImportDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceImportDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DeviceImportDto.java
index 439ba7424..7445241d9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceImportDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DeviceImportDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.dto;
 
 import com.core.common.annotation.Excel;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DeviceManageDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DeviceManageDto.java
index b643e41b8..2c0e258a8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DeviceManageDto.java
@@ -1,8 +1,8 @@
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DeviceManageInitDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DeviceManageInitDto.java
index e949f6396..edb4c8db8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DeviceManageInitDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageSelParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DeviceManageSelParam.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageSelParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DeviceManageSelParam.java
index 10fbb9a7b..0fb087a6d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageSelParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DeviceManageSelParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DeviceManageUpDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DeviceManageUpDto.java
index 88fc7f471..f8e6dcc40 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DeviceManageUpDto.java
@@ -1,8 +1,8 @@
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DiagnosisTreatmentDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DiagnosisTreatmentDto.java
index dbb37d7fa..144739d24 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DiagnosisTreatmentDto.java
@@ -1,8 +1,8 @@
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentImportDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DiagnosisTreatmentImportDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentImportDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DiagnosisTreatmentImportDto.java
index b9c5718e2..04e5655ca 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentImportDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DiagnosisTreatmentImportDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.dto;
 
 import com.core.common.annotation.Excel;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DiagnosisTreatmentInitDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DiagnosisTreatmentInitDto.java
index 668cdfa95..200aa9b00 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DiagnosisTreatmentInitDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentSelParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DiagnosisTreatmentSelParam.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentSelParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DiagnosisTreatmentSelParam.java
index 5e9878611..7c5b0d7f1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentSelParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DiagnosisTreatmentSelParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentUpDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DiagnosisTreatmentUpDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentUpDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DiagnosisTreatmentUpDto.java
index 37da0e640..68fd5455f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentUpDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DiagnosisTreatmentUpDto.java
@@ -1,9 +1,9 @@
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.dto;
 
 import com.fasterxml.jackson.annotation.JsonAlias;
 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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DiseaseManageDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DiseaseManageDto.java
index 5d064370d..79534caf9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DiseaseManageDto.java
@@ -1,8 +1,8 @@
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DiseaseManageInitDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DiseaseManageInitDto.java
index aa944d29b..e012b20e8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DiseaseManageInitDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageSelParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DiseaseManageSelParam.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageSelParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DiseaseManageSelParam.java
index 40d251cd5..819c8c066 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageSelParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DiseaseManageSelParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageUpDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DiseaseManageUpDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageUpDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DiseaseManageUpDto.java
index 255c7bc4e..5c9c268c6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageUpDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/DiseaseManageUpDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeAddDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ICDCodeAddDto.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeAddDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ICDCodeAddDto.java
index f17ed68d3..fe378daaf 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeAddDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ICDCodeAddDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ICDCodeDto.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ICDCodeDto.java
index 82e3c5fbb..58864aff8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ICDCodeDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeUpdateDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ICDCodeUpdateDto.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeUpdateDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ICDCodeUpdateDto.java
index 7f0fdd4e0..ba4792e1c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeUpdateDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ICDCodeUpdateDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ItemDefSearchParam.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ItemDefSearchParam.java
index a8a999192..aeeb6f27b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ItemDefSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ItemDefinitionDetailDto.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ItemDefinitionDetailDto.java
index 47b8d1c3b..def022ead 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ItemDefinitionDetailDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ItemDefinitionDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ItemDefinitionDto.java
index bbf694156..dddec1fd8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ItemDefinitionDto.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ItemDefinitionInitDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ItemDefinitionInitDto.java
index 6f991368f..e238be84d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ItemDefinitionInitDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemUpFromDirectoryDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ItemUpFromDirectoryDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemUpFromDirectoryDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ItemUpFromDirectoryDto.java
index f903435d9..60885e342 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemUpFromDirectoryDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/ItemUpFromDirectoryDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationImportDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/MedicationImportDto.java
similarity index 99%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationImportDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/MedicationImportDto.java
index 7a45a5ce0..cd04b6681 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationImportDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/MedicationImportDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.dto;
 
 import com.core.common.annotation.Excel;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/MedicationManageDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/MedicationManageDto.java
index 766df1d58..87353aa28 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/MedicationManageDto.java
@@ -1,8 +1,8 @@
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/MedicationManageInitDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/MedicationManageInitDto.java
index 4f74b2c4a..1d4da2494 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/MedicationManageInitDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/MedicationManageUpDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/MedicationManageUpDto.java
index 2311b3764..c30b45963 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/MedicationManageUpDto.java
@@ -1,9 +1,9 @@
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/MedicationSearchParam.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/MedicationSearchParam.java
index a8f2c5d2c..7e6188ec8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/MedicationSearchParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/SupplierDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/SupplierDto.java
index 83f8e9a65..83490bc6e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/SupplierDto.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/SupplierInitDto.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/SupplierInitDto.java
index 2d805f2e3..d17af53e0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/SupplierInitDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/SupplierSearchParam.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/SupplierSearchParam.java
index 6f3b8543a..a80634e23 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/SupplierSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierUpDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/SupplierUpDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierUpDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/SupplierUpDto.java
index 723b959f9..78b115e8b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierUpDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/dto/SupplierUpDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.datadictionary.dto;
+package com.healthlink.his.web.datadictionary.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ActivityDefinitionManageMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/mapper/ActivityDefinitionManageMapper.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ActivityDefinitionManageMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/mapper/ActivityDefinitionManageMapper.java
index eed60d09e..e34ecf112 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ActivityDefinitionManageMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/mapper/ActivityDefinitionManageMapper.java
@@ -1,10 +1,10 @@
-package com.openhis.web.datadictionary.mapper;
+package com.healthlink.his.web.datadictionary.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.datadictionary.dto.DiagnosisTreatmentDto;
+import com.healthlink.his.web.datadictionary.dto.DiagnosisTreatmentDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ChargeItemDefSearchMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/mapper/ChargeItemDefSearchMapper.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ChargeItemDefSearchMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/mapper/ChargeItemDefSearchMapper.java
index eec5b50f5..b3ee3648e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ChargeItemDefSearchMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/mapper/ChargeItemDefSearchMapper.java
@@ -1,12 +1,12 @@
-package com.openhis.web.datadictionary.mapper;
+package com.healthlink.his.web.datadictionary.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.administration.domain.ChargeItemDefinition;
-import com.openhis.web.datadictionary.dto.ChargeItemDefPageDto;
+import com.healthlink.his.administration.domain.ChargeItemDefinition;
+import com.healthlink.his.web.datadictionary.dto.ChargeItemDefPageDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/DeviceManageMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/mapper/DeviceManageMapper.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/DeviceManageMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/mapper/DeviceManageMapper.java
index 157950dd0..eddba71a3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/DeviceManageMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/mapper/DeviceManageMapper.java
@@ -1,10 +1,10 @@
-package com.openhis.web.datadictionary.mapper;
+package com.healthlink.his.web.datadictionary.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.datadictionary.dto.DeviceManageDto;
+import com.healthlink.his.web.datadictionary.dto.DeviceManageDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ICDCodeMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/mapper/ICDCodeMapper.java
similarity index 64%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ICDCodeMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/mapper/ICDCodeMapper.java
index f215aeef1..6649acd48 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ICDCodeMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/mapper/ICDCodeMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.datadictionary.mapper;
+package com.healthlink.his.web.datadictionary.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ItemDefinitionAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/mapper/ItemDefinitionAppMapper.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ItemDefinitionAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/mapper/ItemDefinitionAppMapper.java
index 7aca106f2..e61d6178b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ItemDefinitionAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/mapper/ItemDefinitionAppMapper.java
@@ -1,11 +1,11 @@
-package com.openhis.web.datadictionary.mapper;
+package com.healthlink.his.web.datadictionary.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.datadictionary.dto.ItemDefinitionDetailDto;
-import com.openhis.web.datadictionary.dto.ItemDefinitionDto;
+import com.healthlink.his.web.datadictionary.dto.ItemDefinitionDetailDto;
+import com.healthlink.his.web.datadictionary.dto.ItemDefinitionDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/LabActivityDefinitionManageMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/mapper/LabActivityDefinitionManageMapper.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/LabActivityDefinitionManageMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/mapper/LabActivityDefinitionManageMapper.java
index 4926b0942..579cf261c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/LabActivityDefinitionManageMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/mapper/LabActivityDefinitionManageMapper.java
@@ -1,10 +1,10 @@
-package com.openhis.web.datadictionary.mapper;
+package com.healthlink.his.web.datadictionary.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.datadictionary.dto.DiagnosisTreatmentDto;
+import com.healthlink.his.web.datadictionary.dto.DiagnosisTreatmentDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/MedicationManageSearchMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/mapper/MedicationManageSearchMapper.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/MedicationManageSearchMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/mapper/MedicationManageSearchMapper.java
index 2f9144bbf..abf2bf3dd 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/MedicationManageSearchMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/mapper/MedicationManageSearchMapper.java
@@ -1,12 +1,12 @@
-package com.openhis.web.datadictionary.mapper;
+package com.healthlink.his.web.datadictionary.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.administration.domain.ChargeItemDefinition;
-import com.openhis.web.datadictionary.dto.MedicationManageDto;
+import com.healthlink.his.administration.domain.ChargeItemDefinition;
+import com.healthlink.his.web.datadictionary.dto.MedicationManageDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/debug/DebugController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/debug/DebugController.java
similarity index 83%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/debug/DebugController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/debug/DebugController.java
index 4d57ec8eb..f28065f95 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/debug/DebugController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/debug/DebugController.java
@@ -1,8 +1,8 @@
-package com.openhis.web.debug;
+package com.healthlink.his.web.debug;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.basedatamanage.appservice.IPractitionerAppService;
-import com.openhis.web.basedatamanage.dto.UserAndPractitionerDto;
+import com.healthlink.his.web.basedatamanage.appservice.IPractitionerAppService;
+import com.healthlink.his.web.basedatamanage.dto.UserAndPractitionerDto;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentCommonService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentCommonService.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentCommonService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentCommonService.java
index 799b8012c..ea5d021a6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentCommonService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentCommonService.java
@@ -1,8 +1,8 @@
-package com.openhis.web.departmentmanage.appservice;
+package com.healthlink.his.web.departmentmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.departmentmanage.dto.DepartmentInitDto;
-import com.openhis.web.departmentmanage.dto.DepartmentSearchParam;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentInitDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentSearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentIssuanceOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentIssuanceOrderService.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentIssuanceOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentIssuanceOrderService.java
index 0ec3ed0ff..29a8b83b7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentIssuanceOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentIssuanceOrderService.java
@@ -1,4 +1,4 @@
-package com.openhis.web.departmentmanage.appservice;
+package com.healthlink.his.web.departmentmanage.appservice;
 
 import com.core.common.core.domain.R;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentProfitLossOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentProfitLossOrderService.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentProfitLossOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentProfitLossOrderService.java
index b0b4fb4f2..a70071af3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentProfitLossOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentProfitLossOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.departmentmanage.appservice;
+package com.healthlink.his.web.departmentmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentReceiptApprovalService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentReceiptApprovalService.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentReceiptApprovalService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentReceiptApprovalService.java
index a058eb9c8..1df281e43 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentReceiptApprovalService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentReceiptApprovalService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.departmentmanage.appservice;
+package com.healthlink.his.web.departmentmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
+import com.healthlink.his.web.inventorymanage.dto.SupplyItemDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentRequisitionOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentRequisitionOrderService.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentRequisitionOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentRequisitionOrderService.java
index 57eafd861..78c6c2dc0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentRequisitionOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentRequisitionOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.departmentmanage.appservice;
+package com.healthlink.his.web.departmentmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentReturnToWarehouseOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentReturnToWarehouseOrderService.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentReturnToWarehouseOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentReturnToWarehouseOrderService.java
index a97b8718c..97f950467 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentReturnToWarehouseOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentReturnToWarehouseOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.departmentmanage.appservice;
+package com.healthlink.his.web.departmentmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentStockInOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentStockInOrderService.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentStockInOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentStockInOrderService.java
index 25bb8e339..035942674 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentStockInOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentStockInOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.departmentmanage.appservice;
+package com.healthlink.his.web.departmentmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentStocktakingOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentStocktakingOrderService.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentStocktakingOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentStocktakingOrderService.java
index affcedc10..dcd72be9d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentStocktakingOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentStocktakingOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.departmentmanage.appservice;
+package com.healthlink.his.web.departmentmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentTransferInOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentTransferInOrderService.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentTransferInOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentTransferInOrderService.java
index 0d278a5d1..2815f07c3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentTransferInOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentTransferInOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.departmentmanage.appservice;
+package com.healthlink.his.web.departmentmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentTransferOutOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentTransferOutOrderService.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentTransferOutOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentTransferOutOrderService.java
index 0dc77431a..c94fb4bfc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentTransferOutOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/IDepartmentTransferOutOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.departmentmanage.appservice;
+package com.healthlink.his.web.departmentmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentCommonServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentCommonServiceImpl.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentCommonServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentCommonServiceImpl.java
index a421778f2..057d40eec 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentCommonServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentCommonServiceImpl.java
@@ -1,30 +1,30 @@
-package com.openhis.web.departmentmanage.appservice.impl;
+package com.healthlink.his.web.departmentmanage.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.Organization;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.domain.Supplier;
-import com.openhis.administration.service.IOrganizationService;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.administration.service.ISupplierService;
-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.web.common.appservice.ICommonService;
-import com.openhis.web.common.dto.LocationDto;
-import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService;
-import com.openhis.web.departmentmanage.dto.DepartmentDeviceInfoDto;
-import com.openhis.web.departmentmanage.dto.DepartmentDto;
-import com.openhis.web.departmentmanage.dto.DepartmentInitDto;
-import com.openhis.web.departmentmanage.dto.DepartmentSearchParam;
-import com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+import com.healthlink.his.administration.domain.Organization;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.domain.Supplier;
+import com.healthlink.his.administration.service.IOrganizationService;
+import com.healthlink.his.administration.service.IPractitionerService;
+import com.healthlink.his.administration.service.ISupplierService;
+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.web.common.appservice.ICommonService;
+import com.healthlink.his.web.common.dto.LocationDto;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentDeviceInfoDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentInitDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentSearchParam;
+import com.healthlink.his.web.departmentmanage.mapper.DepartmentCommonMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentIssuanceOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentIssuanceOrderServiceImpl.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentIssuanceOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentIssuanceOrderServiceImpl.java
index 216b996d2..2209cbe48 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentIssuanceOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentIssuanceOrderServiceImpl.java
@@ -1,21 +1,21 @@
-package com.openhis.web.departmentmanage.appservice.impl;
+package com.healthlink.his.web.departmentmanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.*;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService;
-import com.openhis.web.departmentmanage.appservice.IDepartmentIssuanceOrderService;
-import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
-import com.openhis.web.departmentmanage.dto.DepartmentInitDto;
-import com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper;
-import com.openhis.web.departmentmanage.mapper.DepartmentIssuanceOrderMapper;
-import com.openhis.workflow.domain.SupplyDelivery;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyDeliveryService;
-import com.openhis.workflow.service.ISupplyRequestService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.enums.*;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentIssuanceOrderService;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentDetailDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentInitDto;
+import com.healthlink.his.web.departmentmanage.mapper.DepartmentCommonMapper;
+import com.healthlink.his.web.departmentmanage.mapper.DepartmentIssuanceOrderMapper;
+import com.healthlink.his.workflow.domain.SupplyDelivery;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyDeliveryService;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentProfitLossOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentProfitLossOrderServiceImpl.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentProfitLossOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentProfitLossOrderServiceImpl.java
index 214c4c5db..3b70550d5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentProfitLossOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentProfitLossOrderServiceImpl.java
@@ -1,22 +1,22 @@
-package com.openhis.web.departmentmanage.appservice.impl;
+package com.healthlink.his.web.departmentmanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
-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.web.departmentmanage.appservice.IDepartmentCommonService;
-import com.openhis.web.departmentmanage.appservice.IDepartmentProfitLossOrderService;
-import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
-import com.openhis.web.departmentmanage.dto.DepartmentInitDto;
-import com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper;
-import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentProfitLossOrderService;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentDetailDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentInitDto;
+import com.healthlink.his.web.departmentmanage.mapper.DepartmentCommonMapper;
+import com.healthlink.his.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentReceiptApprovalServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentReceiptApprovalServiceImpl.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentReceiptApprovalServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentReceiptApprovalServiceImpl.java
index fd3ed04b4..03d155f6a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentReceiptApprovalServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentReceiptApprovalServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.departmentmanage.appservice.impl;
+package com.healthlink.his.web.departmentmanage.appservice.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -6,36 +6,36 @@ import com.core.common.core.domain.R;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.DispenseStatus;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.common.enums.TraceNoStatus;
-import com.openhis.common.enums.Whether;
-import com.openhis.common.enums.ybenums.YbInvChgType;
-import com.openhis.common.enums.ybenums.YbRxFlag;
-import com.openhis.medication.domain.MedicationDispense;
-import com.openhis.medication.service.IMedicationDispenseService;
-import com.openhis.web.departmentmanage.appservice.IDepartmentReceiptApprovalService;
-import com.openhis.web.inventorymanage.appservice.IReceiptApprovalAppService;
-import com.openhis.web.inventorymanage.appservice.ITraceNoAppService;
-import com.openhis.web.inventorymanage.assembler.InventoryManageAssembler;
-import com.openhis.web.inventorymanage.dto.ItemChargeDetailDto;
-import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
-import com.openhis.web.inventorymanage.mapper.ReceiptApprovalMapper;
-import com.openhis.workflow.domain.DeviceDispense;
-import com.openhis.workflow.domain.InventoryItem;
-import com.openhis.workflow.domain.SupplyDelivery;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.IDeviceDispenseService;
-import com.openhis.workflow.service.IInventoryItemService;
-import com.openhis.workflow.service.ISupplyDeliveryService;
-import com.openhis.workflow.service.ISupplyRequestService;
-import com.openhis.yb.dto.Medical3503Param;
-import com.openhis.yb.dto.MedicalInventory3501Param;
-import com.openhis.yb.dto.MedicalInventory3502Param;
-import com.openhis.yb.dto.MedicalPurchase3504Param;
-import com.openhis.yb.service.YbManager;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.DispenseStatus;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.common.enums.TraceNoStatus;
+import com.healthlink.his.common.enums.Whether;
+import com.healthlink.his.common.enums.ybenums.YbInvChgType;
+import com.healthlink.his.common.enums.ybenums.YbRxFlag;
+import com.healthlink.his.medication.domain.MedicationDispense;
+import com.healthlink.his.medication.service.IMedicationDispenseService;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentReceiptApprovalService;
+import com.healthlink.his.web.inventorymanage.appservice.IReceiptApprovalAppService;
+import com.healthlink.his.web.inventorymanage.appservice.ITraceNoAppService;
+import com.healthlink.his.web.inventorymanage.assembler.InventoryManageAssembler;
+import com.healthlink.his.web.inventorymanage.dto.ItemChargeDetailDto;
+import com.healthlink.his.web.inventorymanage.dto.SupplyItemDetailDto;
+import com.healthlink.his.web.inventorymanage.mapper.ReceiptApprovalMapper;
+import com.healthlink.his.workflow.domain.DeviceDispense;
+import com.healthlink.his.workflow.domain.InventoryItem;
+import com.healthlink.his.workflow.domain.SupplyDelivery;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.IDeviceDispenseService;
+import com.healthlink.his.workflow.service.IInventoryItemService;
+import com.healthlink.his.workflow.service.ISupplyDeliveryService;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
+import com.healthlink.his.yb.dto.Medical3503Param;
+import com.healthlink.his.yb.dto.MedicalInventory3501Param;
+import com.healthlink.his.yb.dto.MedicalInventory3502Param;
+import com.healthlink.his.yb.dto.MedicalPurchase3504Param;
+import com.healthlink.his.yb.service.YbManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentRequisitionOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentRequisitionOrderServiceImpl.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentRequisitionOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentRequisitionOrderServiceImpl.java
index a2ff43bcf..453f90c2e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentRequisitionOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentRequisitionOrderServiceImpl.java
@@ -1,21 +1,21 @@
-package com.openhis.web.departmentmanage.appservice.impl;
+package com.healthlink.his.web.departmentmanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.MessageUtils;
-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.web.departmentmanage.appservice.IDepartmentCommonService;
-import com.openhis.web.departmentmanage.appservice.IDepartmentRequisitionOrderService;
-import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
-import com.openhis.web.departmentmanage.dto.DepartmentInitDto;
-import com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper;
-import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentRequisitionOrderService;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentDetailDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentInitDto;
+import com.healthlink.his.web.departmentmanage.mapper.DepartmentCommonMapper;
+import com.healthlink.his.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentReturnToWarehouseOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentReturnToWarehouseOrderServiceImpl.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentReturnToWarehouseOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentReturnToWarehouseOrderServiceImpl.java
index 5b047251b..6f4913b97 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentReturnToWarehouseOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentReturnToWarehouseOrderServiceImpl.java
@@ -1,22 +1,22 @@
-package com.openhis.web.departmentmanage.appservice.impl;
+package com.healthlink.his.web.departmentmanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
-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.web.departmentmanage.appservice.IDepartmentCommonService;
-import com.openhis.web.departmentmanage.appservice.IDepartmentReturnToWarehouseOrderService;
-import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
-import com.openhis.web.departmentmanage.dto.DepartmentInitDto;
-import com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper;
-import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentReturnToWarehouseOrderService;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentDetailDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentInitDto;
+import com.healthlink.his.web.departmentmanage.mapper.DepartmentCommonMapper;
+import com.healthlink.his.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentStockInOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentStockInOrderServiceImpl.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentStockInOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentStockInOrderServiceImpl.java
index 56eb89da5..6e88f1401 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentStockInOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentStockInOrderServiceImpl.java
@@ -1,22 +1,22 @@
-package com.openhis.web.departmentmanage.appservice.impl;
+package com.healthlink.his.web.departmentmanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
-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.web.departmentmanage.appservice.IDepartmentCommonService;
-import com.openhis.web.departmentmanage.appservice.IDepartmentStockInOrderService;
-import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
-import com.openhis.web.departmentmanage.dto.DepartmentInitDto;
-import com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper;
-import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentStockInOrderService;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentDetailDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentInitDto;
+import com.healthlink.his.web.departmentmanage.mapper.DepartmentCommonMapper;
+import com.healthlink.his.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentStocktakingOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentStocktakingOrderServiceImpl.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentStocktakingOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentStocktakingOrderServiceImpl.java
index d0e6d3558..e1e22b2a3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentStocktakingOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentStocktakingOrderServiceImpl.java
@@ -1,22 +1,22 @@
-package com.openhis.web.departmentmanage.appservice.impl;
+package com.healthlink.his.web.departmentmanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
-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.web.departmentmanage.appservice.IDepartmentCommonService;
-import com.openhis.web.departmentmanage.appservice.IDepartmentStocktakingOrderService;
-import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
-import com.openhis.web.departmentmanage.dto.DepartmentInitDto;
-import com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper;
-import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentStocktakingOrderService;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentDetailDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentInitDto;
+import com.healthlink.his.web.departmentmanage.mapper.DepartmentCommonMapper;
+import com.healthlink.his.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentTransferInOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentTransferInOrderServiceImpl.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentTransferInOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentTransferInOrderServiceImpl.java
index 7dde76e18..f3eaf5c48 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentTransferInOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentTransferInOrderServiceImpl.java
@@ -1,22 +1,22 @@
-package com.openhis.web.departmentmanage.appservice.impl;
+package com.healthlink.his.web.departmentmanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
-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.web.departmentmanage.appservice.IDepartmentCommonService;
-import com.openhis.web.departmentmanage.appservice.IDepartmentTransferInOrderService;
-import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
-import com.openhis.web.departmentmanage.dto.DepartmentInitDto;
-import com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper;
-import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentTransferInOrderService;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentDetailDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentInitDto;
+import com.healthlink.his.web.departmentmanage.mapper.DepartmentCommonMapper;
+import com.healthlink.his.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentTransferOutOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentTransferOutOrderServiceImpl.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentTransferOutOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentTransferOutOrderServiceImpl.java
index 1ac3c6ce2..779d4ff5d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentTransferOutOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentTransferOutOrderServiceImpl.java
@@ -1,22 +1,22 @@
-package com.openhis.web.departmentmanage.appservice.impl;
+package com.healthlink.his.web.departmentmanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
-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.web.departmentmanage.appservice.IDepartmentCommonService;
-import com.openhis.web.departmentmanage.appservice.IDepartmentTransferOutOrderService;
-import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
-import com.openhis.web.departmentmanage.dto.DepartmentInitDto;
-import com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper;
-import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentTransferOutOrderService;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentDetailDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentInitDto;
+import com.healthlink.his.web.departmentmanage.mapper.DepartmentCommonMapper;
+import com.healthlink.his.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentIssuanceOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/controller/DepartmentIssuanceOrderController.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentIssuanceOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/controller/DepartmentIssuanceOrderController.java
index a3e4807ba..bce5318c1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentIssuanceOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/controller/DepartmentIssuanceOrderController.java
@@ -1,11 +1,11 @@
-package com.openhis.web.departmentmanage.controller;
+package com.healthlink.his.web.departmentmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService;
-import com.openhis.web.departmentmanage.appservice.IDepartmentIssuanceOrderService;
-import com.openhis.web.departmentmanage.appservice.IDepartmentReceiptApprovalService;
-import com.openhis.web.departmentmanage.dto.DepartmentSearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentIssuanceOrderService;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentReceiptApprovalService;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentProfitLossOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/controller/DepartmentProfitLossOrderController.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentProfitLossOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/controller/DepartmentProfitLossOrderController.java
index 051861888..c647c8bc5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentProfitLossOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/controller/DepartmentProfitLossOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.departmentmanage.controller;
+package com.healthlink.his.web.departmentmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService;
-import com.openhis.web.departmentmanage.appservice.IDepartmentProfitLossOrderService;
-import com.openhis.web.departmentmanage.appservice.IDepartmentReceiptApprovalService;
-import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
-import com.openhis.web.departmentmanage.dto.DepartmentSearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentProfitLossOrderService;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentReceiptApprovalService;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentDetailDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentRequisitionOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/controller/DepartmentRequisitionOrderController.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentRequisitionOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/controller/DepartmentRequisitionOrderController.java
index 4138ab1d2..f4b8f0165 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentRequisitionOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/controller/DepartmentRequisitionOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.departmentmanage.controller;
+package com.healthlink.his.web.departmentmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService;
-import com.openhis.web.departmentmanage.appservice.IDepartmentReceiptApprovalService;
-import com.openhis.web.departmentmanage.appservice.IDepartmentRequisitionOrderService;
-import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
-import com.openhis.web.departmentmanage.dto.DepartmentSearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentReceiptApprovalService;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentRequisitionOrderService;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentDetailDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentReturnToWarehouseOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/controller/DepartmentReturnToWarehouseOrderController.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentReturnToWarehouseOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/controller/DepartmentReturnToWarehouseOrderController.java
index b09977f0f..a600c4350 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentReturnToWarehouseOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/controller/DepartmentReturnToWarehouseOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.departmentmanage.controller;
+package com.healthlink.his.web.departmentmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService;
-import com.openhis.web.departmentmanage.appservice.IDepartmentReceiptApprovalService;
-import com.openhis.web.departmentmanage.appservice.IDepartmentReturnToWarehouseOrderService;
-import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
-import com.openhis.web.departmentmanage.dto.DepartmentSearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentReceiptApprovalService;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentReturnToWarehouseOrderService;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentDetailDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentStockInOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/controller/DepartmentStockInOrderController.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentStockInOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/controller/DepartmentStockInOrderController.java
index 024e90b3d..318d1e8cd 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentStockInOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/controller/DepartmentStockInOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.departmentmanage.controller;
+package com.healthlink.his.web.departmentmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService;
-import com.openhis.web.departmentmanage.appservice.IDepartmentReceiptApprovalService;
-import com.openhis.web.departmentmanage.appservice.IDepartmentStockInOrderService;
-import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
-import com.openhis.web.departmentmanage.dto.DepartmentSearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentReceiptApprovalService;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentStockInOrderService;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentDetailDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentStocktakingOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/controller/DepartmentStocktakingOrderController.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentStocktakingOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/controller/DepartmentStocktakingOrderController.java
index c88275eb6..d4a621575 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentStocktakingOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/controller/DepartmentStocktakingOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.departmentmanage.controller;
+package com.healthlink.his.web.departmentmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService;
-import com.openhis.web.departmentmanage.appservice.IDepartmentReceiptApprovalService;
-import com.openhis.web.departmentmanage.appservice.IDepartmentStocktakingOrderService;
-import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
-import com.openhis.web.departmentmanage.dto.DepartmentSearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentReceiptApprovalService;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentStocktakingOrderService;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentDetailDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentTransferInOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/controller/DepartmentTransferInOrderController.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentTransferInOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/controller/DepartmentTransferInOrderController.java
index 82218f908..b4681df90 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentTransferInOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/controller/DepartmentTransferInOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.departmentmanage.controller;
+package com.healthlink.his.web.departmentmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService;
-import com.openhis.web.departmentmanage.appservice.IDepartmentReceiptApprovalService;
-import com.openhis.web.departmentmanage.appservice.IDepartmentTransferInOrderService;
-import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
-import com.openhis.web.departmentmanage.dto.DepartmentSearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentReceiptApprovalService;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentTransferInOrderService;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentDetailDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentTransferOutOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/controller/DepartmentTransferOutOrderController.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentTransferOutOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/controller/DepartmentTransferOutOrderController.java
index a018e6bf7..96f2834f1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentTransferOutOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/controller/DepartmentTransferOutOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.departmentmanage.controller;
+package com.healthlink.his.web.departmentmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService;
-import com.openhis.web.departmentmanage.appservice.IDepartmentReceiptApprovalService;
-import com.openhis.web.departmentmanage.appservice.IDepartmentTransferOutOrderService;
-import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
-import com.openhis.web.departmentmanage.dto.DepartmentSearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentCommonService;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentReceiptApprovalService;
+import com.healthlink.his.web.departmentmanage.appservice.IDepartmentTransferOutOrderService;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentDetailDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/dto/DepartmentDetailDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/dto/DepartmentDetailDto.java
index c40cb2bcc..3920e6484 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/dto/DepartmentDetailDto.java
@@ -1,14 +1,14 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.departmentmanage.dto;
+package com.healthlink.his.web.departmentmanage.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDeviceInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/dto/DepartmentDeviceInfoDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDeviceInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/dto/DepartmentDeviceInfoDto.java
index 9ee5b3bb6..951219853 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDeviceInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/dto/DepartmentDeviceInfoDto.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.departmentmanage.dto;
+package com.healthlink.his.web.departmentmanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/dto/DepartmentDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/dto/DepartmentDto.java
index b6ce4b420..b407d189b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/dto/DepartmentDto.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.departmentmanage.dto;
+package com.healthlink.his.web.departmentmanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/dto/DepartmentInitDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/dto/DepartmentInitDto.java
index 09f96d9b6..939874529 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/dto/DepartmentInitDto.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.departmentmanage.dto;
+package com.healthlink.his.web.departmentmanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.administration.domain.Organization;
-import com.openhis.web.common.dto.LocationDto;
+import com.healthlink.his.administration.domain.Organization;
+import com.healthlink.his.web.common.dto.LocationDto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/dto/DepartmentSearchParam.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/dto/DepartmentSearchParam.java
index 8792d81fb..490423b40 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/dto/DepartmentSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.departmentmanage.dto;
+package com.healthlink.his.web.departmentmanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentCommonMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/mapper/DepartmentCommonMapper.java
similarity index 82%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentCommonMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/mapper/DepartmentCommonMapper.java
index 1194ba7c2..d47e01fe4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentCommonMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/mapper/DepartmentCommonMapper.java
@@ -1,12 +1,12 @@
-package com.openhis.web.departmentmanage.mapper;
+package com.healthlink.his.web.departmentmanage.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.departmentmanage.dto.DepartmentDetailDto;
-import com.openhis.web.departmentmanage.dto.DepartmentDeviceInfoDto;
-import com.openhis.web.departmentmanage.dto.DepartmentDto;
-import com.openhis.web.departmentmanage.dto.DepartmentSearchParam;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentDetailDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentDeviceInfoDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentSearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentIssuanceOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/mapper/DepartmentIssuanceOrderMapper.java
similarity index 81%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentIssuanceOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/mapper/DepartmentIssuanceOrderMapper.java
index 856156a05..6ff085e92 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentIssuanceOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/mapper/DepartmentIssuanceOrderMapper.java
@@ -1,6 +1,6 @@
-package com.openhis.web.departmentmanage.mapper;
+package com.healthlink.his.web.departmentmanage.mapper;
 
-import com.openhis.web.departmentmanage.dto.DepartmentDetailDto;
+import com.healthlink.his.web.departmentmanage.dto.DepartmentDetailDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentProfitLossOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/mapper/DepartmentProfitLossOrderMapper.java
similarity index 77%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentProfitLossOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/mapper/DepartmentProfitLossOrderMapper.java
index 6570df0ea..409bff9cb 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentProfitLossOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/mapper/DepartmentProfitLossOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.departmentmanage.mapper;
+package com.healthlink.his.web.departmentmanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentRequisitionOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/mapper/DepartmentRequisitionOrderMapper.java
similarity index 78%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentRequisitionOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/mapper/DepartmentRequisitionOrderMapper.java
index bd781261d..63ceeb154 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentRequisitionOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/mapper/DepartmentRequisitionOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.departmentmanage.mapper;
+package com.healthlink.his.web.departmentmanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentReturnToWarehouseOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/mapper/DepartmentReturnToWarehouseOrderMapper.java
similarity index 78%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentReturnToWarehouseOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/mapper/DepartmentReturnToWarehouseOrderMapper.java
index 7889b3154..f349b2752 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentReturnToWarehouseOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/mapper/DepartmentReturnToWarehouseOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.departmentmanage.mapper;
+package com.healthlink.his.web.departmentmanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentStockInOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/mapper/DepartmentStockInOrderMapper.java
similarity index 77%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentStockInOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/mapper/DepartmentStockInOrderMapper.java
index a279c2a56..ad57ad607 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentStockInOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/mapper/DepartmentStockInOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.departmentmanage.mapper;
+package com.healthlink.his.web.departmentmanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentStocktakingOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/mapper/DepartmentStocktakingOrderMapper.java
similarity index 78%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentStocktakingOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/mapper/DepartmentStocktakingOrderMapper.java
index 69dfd679c..882c222e8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentStocktakingOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/mapper/DepartmentStocktakingOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.departmentmanage.mapper;
+package com.healthlink.his.web.departmentmanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentTransferInOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/mapper/DepartmentTransferInOrderMapper.java
similarity index 77%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentTransferInOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/mapper/DepartmentTransferInOrderMapper.java
index 947ec1c96..a857f58a6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentTransferInOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/mapper/DepartmentTransferInOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.departmentmanage.mapper;
+package com.healthlink.his.web.departmentmanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentTransferOutOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/mapper/DepartmentTransferOutOrderMapper.java
similarity index 78%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentTransferOutOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/mapper/DepartmentTransferOutOrderMapper.java
index 04b69151f..425beb900 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentTransferOutOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/mapper/DepartmentTransferOutOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.departmentmanage.mapper;
+package com.healthlink.his.web.departmentmanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorPhraseAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IDoctorPhraseAppService.java
similarity index 76%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorPhraseAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IDoctorPhraseAppService.java
index efe928c13..0af63b3cd 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorPhraseAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IDoctorPhraseAppService.java
@@ -1,6 +1,6 @@
-package com.openhis.web.doctorstation.appservice;
+package com.healthlink.his.web.doctorstation.appservice;
 
-import com.openhis.template.domain.DoctorPhrase;
+import com.healthlink.his.template.domain.DoctorPhrase;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAdviceAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IDoctorStationAdviceAppService.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAdviceAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IDoctorStationAdviceAppService.java
index f9f0b95ee..4b1f4704a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAdviceAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IDoctorStationAdviceAppService.java
@@ -1,12 +1,12 @@
-package com.openhis.web.doctorstation.appservice;
+package com.healthlink.his.web.doctorstation.appservice;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.web.doctorstation.dto.AdviceBaseDto;
-import com.openhis.web.doctorstation.dto.AdviceSaveParam;
-import com.openhis.web.doctorstation.dto.OrderBindInfoDto;
-import com.openhis.web.doctorstation.dto.SurgeryItemDto;
-import com.openhis.web.doctorstation.dto.UpdateGroupIdParam;
+import com.healthlink.his.web.doctorstation.dto.AdviceBaseDto;
+import com.healthlink.his.web.doctorstation.dto.AdviceSaveParam;
+import com.healthlink.his.web.doctorstation.dto.OrderBindInfoDto;
+import com.healthlink.his.web.doctorstation.dto.SurgeryItemDto;
+import com.healthlink.his.web.doctorstation.dto.UpdateGroupIdParam;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationChineseMedicalAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IDoctorStationChineseMedicalAppService.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationChineseMedicalAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IDoctorStationChineseMedicalAppService.java
index 668c10d2b..84524d270 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationChineseMedicalAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IDoctorStationChineseMedicalAppService.java
@@ -1,12 +1,12 @@
-package com.openhis.web.doctorstation.appservice;
+package com.healthlink.his.web.doctorstation.appservice;
 
 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.web.doctorstation.dto.AdviceBaseDto;
-import com.openhis.web.doctorstation.dto.AdviceSaveParam;
-import com.openhis.web.doctorstation.dto.ConditionDefinitionMetadata;
-import com.openhis.web.doctorstation.dto.SaveDiagnosisParam;
+import com.healthlink.his.web.doctorstation.dto.AdviceBaseDto;
+import com.healthlink.his.web.doctorstation.dto.AdviceSaveParam;
+import com.healthlink.his.web.doctorstation.dto.ConditionDefinitionMetadata;
+import com.healthlink.his.web.doctorstation.dto.SaveDiagnosisParam;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationDiagnosisAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IDoctorStationDiagnosisAppService.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationDiagnosisAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IDoctorStationDiagnosisAppService.java
index a770f8bda..ce1f57629 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationDiagnosisAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IDoctorStationDiagnosisAppService.java
@@ -1,11 +1,11 @@
-package com.openhis.web.doctorstation.appservice;
+package com.healthlink.his.web.doctorstation.appservice;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
-import com.openhis.web.doctorstation.dto.ConditionDefinitionMetadata;
-import com.openhis.web.doctorstation.dto.DiagnosisBelongBindingDto;
-import com.openhis.web.doctorstation.dto.InfectiousDiseaseReportDto;
-import com.openhis.web.doctorstation.dto.SaveDiagnosisParam;
+import com.healthlink.his.web.doctorstation.dto.ConditionDefinitionMetadata;
+import com.healthlink.his.web.doctorstation.dto.DiagnosisBelongBindingDto;
+import com.healthlink.his.web.doctorstation.dto.InfectiousDiseaseReportDto;
+import com.healthlink.his.web.doctorstation.dto.SaveDiagnosisParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationElepPrescriptionService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IDoctorStationElepPrescriptionService.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationElepPrescriptionService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IDoctorStationElepPrescriptionService.java
index 219bdbe43..6cf483b83 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationElepPrescriptionService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IDoctorStationElepPrescriptionService.java
@@ -1,8 +1,8 @@
-package com.openhis.web.doctorstation.appservice;
+package com.healthlink.his.web.doctorstation.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.doctorstation.dto.DeletePrescriptionInfoParam;
-import com.openhis.web.doctorstation.dto.ElepPrescriptionInfoParam;
+import com.healthlink.his.web.doctorstation.dto.DeletePrescriptionInfoParam;
+import com.healthlink.his.web.doctorstation.dto.ElepPrescriptionInfoParam;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationEmrAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IDoctorStationEmrAppService.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationEmrAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IDoctorStationEmrAppService.java
index 6c4d2ccd6..b2d95c1bb 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationEmrAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IDoctorStationEmrAppService.java
@@ -1,8 +1,8 @@
-package com.openhis.web.doctorstation.appservice;
+package com.healthlink.his.web.doctorstation.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.doctorstation.dto.EmrTemplateDto;
-import com.openhis.web.doctorstation.dto.PatientEmrDto;
+import com.healthlink.his.web.doctorstation.dto.EmrTemplateDto;
+import com.healthlink.his.web.doctorstation.dto.PatientEmrDto;
 
 /**
  * 医生站-电子病历 应用Service
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationInspectionLabApplyService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IDoctorStationInspectionLabApplyService.java
similarity index 81%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationInspectionLabApplyService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IDoctorStationInspectionLabApplyService.java
index 7e04abfa7..4a6ba3465 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationInspectionLabApplyService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IDoctorStationInspectionLabApplyService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.doctorstation.appservice;
+package com.healthlink.his.web.doctorstation.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.doctorstation.dto.DoctorStationLabApplyDto;
+import com.healthlink.his.web.doctorstation.dto.DoctorStationLabApplyDto;
 
 /**
  * 门诊医生站-检验服务接口
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationMainAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IDoctorStationMainAppService.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationMainAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IDoctorStationMainAppService.java
index 1f12b2c13..b4025570a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationMainAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IDoctorStationMainAppService.java
@@ -1,11 +1,11 @@
-package com.openhis.web.doctorstation.appservice;
+package com.healthlink.his.web.doctorstation.appservice;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.web.doctorstation.dto.PatientInfoDto;
-import com.openhis.web.doctorstation.dto.PrescriptionInfoBaseDto;
-import com.openhis.web.doctorstation.dto.PrescriptionInfoDetailDto;
-import com.openhis.web.doctorstation.dto.ReceptionStatisticsDto;
+import com.healthlink.his.web.doctorstation.dto.PatientInfoDto;
+import com.healthlink.his.web.doctorstation.dto.PrescriptionInfoBaseDto;
+import com.healthlink.his.web.doctorstation.dto.PrescriptionInfoDetailDto;
+import com.healthlink.his.web.doctorstation.dto.ReceptionStatisticsDto;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationPtDetailsAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IDoctorStationPtDetailsAppService.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationPtDetailsAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IDoctorStationPtDetailsAppService.java
index 2a95abfb5..2a59c0127 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationPtDetailsAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IDoctorStationPtDetailsAppService.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.appservice;
+package com.healthlink.his.web.doctorstation.appservice;
 
 import com.core.common.core.domain.R;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IReservationRecordAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IReservationRecordAppService.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IReservationRecordAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IReservationRecordAppService.java
index f138619fa..b48f48849 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IReservationRecordAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/IReservationRecordAppService.java
@@ -1,8 +1,8 @@
-package com.openhis.web.doctorstation.appservice;
+package com.healthlink.his.web.doctorstation.appservice;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.web.doctorstation.dto.ReservationRecordDto;
+import com.healthlink.his.web.doctorstation.dto.ReservationRecordDto;
 
 import jakarta.servlet.http.HttpServletRequest;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/ITodayOutpatientService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/ITodayOutpatientService.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/ITodayOutpatientService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/ITodayOutpatientService.java
index 149ad5418..85010c162 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/ITodayOutpatientService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/ITodayOutpatientService.java
@@ -1,10 +1,10 @@
-package com.openhis.web.doctorstation.appservice;
+package com.healthlink.his.web.doctorstation.appservice;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.web.doctorstation.dto.TodayOutpatientPatientDto;
-import com.openhis.web.doctorstation.dto.TodayOutpatientQueryParam;
-import com.openhis.web.doctorstation.dto.TodayOutpatientStatsDto;
+import com.healthlink.his.web.doctorstation.dto.TodayOutpatientPatientDto;
+import com.healthlink.his.web.doctorstation.dto.TodayOutpatientQueryParam;
+import com.healthlink.his.web.doctorstation.dto.TodayOutpatientStatsDto;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorPhraseAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorPhraseAppServiceImpl.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorPhraseAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorPhraseAppServiceImpl.java
index b0a0d5917..153e34594 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorPhraseAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorPhraseAppServiceImpl.java
@@ -1,12 +1,12 @@
-package com.openhis.web.doctorstation.appservice.impl;
+package com.healthlink.his.web.doctorstation.appservice.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.common.enums.BindingType;
-import com.openhis.template.domain.DoctorPhrase;
-import com.openhis.template.service.IDoctorPhraseService;
-import com.openhis.web.doctorstation.appservice.IDoctorPhraseAppService;
+import com.healthlink.his.common.enums.BindingType;
+import com.healthlink.his.template.domain.DoctorPhrase;
+import com.healthlink.his.template.service.IDoctorPhraseService;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorPhraseAppService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
index abba50cf7..b64a4dca0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.appservice.impl;
+package com.healthlink.his.web.doctorstation.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -17,48 +17,48 @@ import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.DictUtils;
 import com.core.common.utils.StringUtils;
 import com.core.web.util.TenantOptionUtil;
-import com.openhis.administration.domain.Account;
-import com.openhis.administration.domain.ChargeItem;
-import com.openhis.administration.domain.Encounter;
-import com.openhis.administration.service.IAccountService;
-import com.openhis.administration.service.IChargeItemService;
-import com.openhis.administration.service.IEncounterService;
-import com.openhis.administration.service.IEncounterDiagnosisService;
-import com.openhis.administration.domain.EncounterDiagnosis;
-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.medication.domain.MedicationDispense;
-import com.openhis.medication.domain.MedicationRequest;
-import com.openhis.medication.service.IMedicationDispenseService;
-import com.openhis.medication.service.IMedicationRequestService;
-import com.openhis.web.chargemanage.mapper.OutpatientRegistrationAppMapper;
-import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService;
-import com.openhis.document.service.IRequestFormService;
-import com.openhis.clinical.service.ISurgeryService;
-import com.openhis.clinical.domain.Surgery;
-import com.openhis.web.doctorstation.appservice.IDoctorStationInspectionLabApplyService;
-import com.openhis.web.doctorstation.dto.*;
-import com.openhis.web.doctorstation.mapper.DoctorStationAdviceAppMapper;
-import com.openhis.web.doctorstation.utils.AdviceUtils;
-import com.openhis.web.doctorstation.utils.DoctorStationSendApplyUtil;
-import com.openhis.web.doctorstation.utils.PrescriptionUtils;
-import com.openhis.web.personalization.dto.ActivityDeviceDto;
-import com.openhis.workflow.domain.ActivityDefinition;
-import com.openhis.workflow.domain.DeviceRequest;
-import com.openhis.workflow.domain.InventoryItem;
+import com.healthlink.his.administration.domain.Account;
+import com.healthlink.his.administration.domain.ChargeItem;
+import com.healthlink.his.administration.domain.Encounter;
+import com.healthlink.his.administration.service.IAccountService;
+import com.healthlink.his.administration.service.IChargeItemService;
+import com.healthlink.his.administration.service.IEncounterService;
+import com.healthlink.his.administration.service.IEncounterDiagnosisService;
+import com.healthlink.his.administration.domain.EncounterDiagnosis;
+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.medication.domain.MedicationDispense;
+import com.healthlink.his.medication.domain.MedicationRequest;
+import com.healthlink.his.medication.service.IMedicationDispenseService;
+import com.healthlink.his.medication.service.IMedicationRequestService;
+import com.healthlink.his.web.chargemanage.mapper.OutpatientRegistrationAppMapper;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationAdviceAppService;
+import com.healthlink.his.document.service.IRequestFormService;
+import com.healthlink.his.clinical.service.ISurgeryService;
+import com.healthlink.his.clinical.domain.Surgery;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationInspectionLabApplyService;
+import com.healthlink.his.web.doctorstation.dto.*;
+import com.healthlink.his.web.doctorstation.mapper.DoctorStationAdviceAppMapper;
+import com.healthlink.his.web.doctorstation.utils.AdviceUtils;
+import com.healthlink.his.web.doctorstation.utils.DoctorStationSendApplyUtil;
+import com.healthlink.his.web.doctorstation.utils.PrescriptionUtils;
+import com.healthlink.his.web.personalization.dto.ActivityDeviceDto;
+import com.healthlink.his.workflow.domain.ActivityDefinition;
+import com.healthlink.his.workflow.domain.DeviceRequest;
+import com.healthlink.his.workflow.domain.InventoryItem;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.openhis.workflow.domain.ServiceRequest;
-import com.openhis.workflow.service.*;
+import com.healthlink.his.workflow.domain.ServiceRequest;
+import com.healthlink.his.workflow.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.openhis.document.domain.RequestForm;
+import com.healthlink.his.document.domain.RequestForm;
 
 import jakarta.annotation.Resource;
 import java.math.BigDecimal;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationChineseMedicalAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationChineseMedicalAppServiceImpl.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationChineseMedicalAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationChineseMedicalAppServiceImpl.java
index 60a5b2b82..442110b66 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationChineseMedicalAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationChineseMedicalAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.appservice.impl;
+package com.healthlink.his.web.doctorstation.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -10,31 +10,31 @@ import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
-import com.openhis.administration.domain.Account;
-import com.openhis.administration.domain.ChargeItem;
-import com.openhis.administration.domain.EncounterDiagnosis;
-import com.openhis.administration.service.IAccountService;
-import com.openhis.administration.service.IChargeItemService;
-import com.openhis.administration.service.IEncounterDiagnosisService;
-import com.openhis.clinical.domain.Condition;
-import com.openhis.clinical.domain.ConditionDefinition;
-import com.openhis.clinical.mapper.ConditionDefinitionMapper;
-import com.openhis.clinical.service.IConditionService;
-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.HisPageUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.medication.domain.MedicationRequest;
-import com.openhis.medication.service.IMedicationDispenseService;
-import com.openhis.medication.service.IMedicationRequestService;
-import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService;
-import com.openhis.web.doctorstation.appservice.IDoctorStationChineseMedicalAppService;
-import com.openhis.web.doctorstation.dto.*;
-import com.openhis.web.doctorstation.mapper.DoctorStationChineseMedicalAppMapper;
-import com.openhis.web.doctorstation.utils.AdviceUtils;
-import com.openhis.workflow.service.IActivityDefinitionService;
+import com.healthlink.his.administration.domain.Account;
+import com.healthlink.his.administration.domain.ChargeItem;
+import com.healthlink.his.administration.domain.EncounterDiagnosis;
+import com.healthlink.his.administration.service.IAccountService;
+import com.healthlink.his.administration.service.IChargeItemService;
+import com.healthlink.his.administration.service.IEncounterDiagnosisService;
+import com.healthlink.his.clinical.domain.Condition;
+import com.healthlink.his.clinical.domain.ConditionDefinition;
+import com.healthlink.his.clinical.mapper.ConditionDefinitionMapper;
+import com.healthlink.his.clinical.service.IConditionService;
+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.HisPageUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.medication.domain.MedicationRequest;
+import com.healthlink.his.medication.service.IMedicationDispenseService;
+import com.healthlink.his.medication.service.IMedicationRequestService;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationAdviceAppService;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationChineseMedicalAppService;
+import com.healthlink.his.web.doctorstation.dto.*;
+import com.healthlink.his.web.doctorstation.mapper.DoctorStationChineseMedicalAppMapper;
+import com.healthlink.his.web.doctorstation.utils.AdviceUtils;
+import com.healthlink.his.workflow.service.IActivityDefinitionService;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java
index 45e25323a..8c36be3c5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.appservice.impl;
+package com.healthlink.his.web.doctorstation.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,27 +9,27 @@ import com.core.common.core.domain.R;
 import com.core.common.enums.DelFlag;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.EncounterDiagnosis;
-import com.openhis.administration.domain.InfectiousDiseaseReport;
-import com.openhis.administration.service.IEncounterDiagnosisService;
-import com.openhis.administration.service.IInfectiousDiseaseReportService;
-import com.openhis.clinical.domain.Condition;
-import com.openhis.clinical.domain.ConditionDefinition;
-import com.openhis.clinical.domain.DiagnosisBelongBinding;
-import com.openhis.clinical.mapper.ConditionDefinitionMapper;
-import com.openhis.clinical.service.IConditionDefinitionService;
-import com.openhis.clinical.service.IConditionService;
-import com.openhis.clinical.service.IDiagnosisBelongBindingService;
-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.HisPageUtils;
-import com.openhis.common.utils.HisQueryUtils;
+import com.healthlink.his.administration.domain.EncounterDiagnosis;
+import com.healthlink.his.administration.domain.InfectiousDiseaseReport;
+import com.healthlink.his.administration.service.IEncounterDiagnosisService;
+import com.healthlink.his.administration.service.IInfectiousDiseaseReportService;
+import com.healthlink.his.clinical.domain.Condition;
+import com.healthlink.his.clinical.domain.ConditionDefinition;
+import com.healthlink.his.clinical.domain.DiagnosisBelongBinding;
+import com.healthlink.his.clinical.mapper.ConditionDefinitionMapper;
+import com.healthlink.his.clinical.service.IConditionDefinitionService;
+import com.healthlink.his.clinical.service.IConditionService;
+import com.healthlink.his.clinical.service.IDiagnosisBelongBindingService;
+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.HisPageUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
 import com.core.common.utils.AssignSeqUtil;
-import com.openhis.web.doctorstation.appservice.IDoctorStationDiagnosisAppService;
-import com.openhis.web.doctorstation.dto.*;
-import com.openhis.web.doctorstation.mapper.DoctorStationDiagnosisAppMapper;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationDiagnosisAppService;
+import com.healthlink.his.web.doctorstation.dto.*;
+import com.healthlink.his.web.doctorstation.mapper.DoctorStationDiagnosisAppMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -42,7 +42,7 @@ import java.time.ZoneId;
 import java.util.Date;
 import java.util.*;
 
-import static com.openhis.common.enums.ReportCardStatus.SUBMITTED;
+import static com.healthlink.his.common.enums.ReportCardStatus.SUBMITTED;
 
 /**
  * 医生站-诊断 应用实现类
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationElepPrescriptionServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationElepPrescriptionServiceImpl.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationElepPrescriptionServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationElepPrescriptionServiceImpl.java
index fd5aa71ba..97f2c00da 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationElepPrescriptionServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationElepPrescriptionServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.appservice.impl;
+package com.healthlink.his.web.doctorstation.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -11,24 +11,24 @@ import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.AssignSeqEnum;
-import com.openhis.common.enums.PrescriptionType;
-import com.openhis.common.enums.RequestStatus;
-import com.openhis.common.enums.ybenums.YbRxItemTypeCode;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.doctorstation.appservice.IDoctorStationElepPrescriptionService;
-import com.openhis.web.doctorstation.dto.*;
-import com.openhis.web.doctorstation.mapper.DoctorStationElepPrescriptionMapper;
-import com.openhis.workflow.domain.ElepMedicationRequest;
-import com.openhis.workflow.service.IElepMedicationRequestService;
-import com.openhis.ybcatalog.domain.CatalogDrugInfo;
-import com.openhis.ybcatalog.domain.CatalogDrugInfoUsual;
-import com.openhis.ybcatalog.mapper.CatalogDrugInfoUsualMapper;
-import com.openhis.ybcatalog.service.ICatalogDrugInfoUsualService;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.service.IPractitionerService;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.AssignSeqEnum;
+import com.healthlink.his.common.enums.PrescriptionType;
+import com.healthlink.his.common.enums.RequestStatus;
+import com.healthlink.his.common.enums.ybenums.YbRxItemTypeCode;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationElepPrescriptionService;
+import com.healthlink.his.web.doctorstation.dto.*;
+import com.healthlink.his.web.doctorstation.mapper.DoctorStationElepPrescriptionMapper;
+import com.healthlink.his.workflow.domain.ElepMedicationRequest;
+import com.healthlink.his.workflow.service.IElepMedicationRequestService;
+import com.healthlink.his.ybcatalog.domain.CatalogDrugInfo;
+import com.healthlink.his.ybcatalog.domain.CatalogDrugInfoUsual;
+import com.healthlink.his.ybcatalog.mapper.CatalogDrugInfoUsualMapper;
+import com.healthlink.his.ybcatalog.service.ICatalogDrugInfoUsualService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationEmrAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationEmrAppServiceImpl.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationEmrAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationEmrAppServiceImpl.java
index 6cf654327..d802bd31c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationEmrAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationEmrAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.appservice.impl;
+package com.healthlink.his.web.doctorstation.appservice.impl;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.TypeReference;
@@ -7,28 +7,28 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 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.Encounter;
-import com.openhis.administration.domain.Patient;
-import com.openhis.administration.mapper.EncounterMapper;
-import com.openhis.administration.mapper.PatientMapper;
+import com.healthlink.his.administration.domain.Encounter;
+import com.healthlink.his.administration.domain.Patient;
+import com.healthlink.his.administration.mapper.EncounterMapper;
+import com.healthlink.his.administration.mapper.PatientMapper;
 
 import java.util.Date;
 import java.sql.Timestamp;
-import com.openhis.common.enums.BindingType;
-import com.openhis.common.enums.EncounterStatus;
-import com.openhis.document.domain.DocRecord;
-import com.openhis.document.domain.Emr;
-import com.openhis.document.domain.EmrDetail;
-import com.openhis.document.domain.EmrDict;
-import com.openhis.document.domain.EmrTemplate;
-import com.openhis.document.service.IDocRecordService;
-import com.openhis.document.service.IEmrDetailService;
-import com.openhis.document.service.IEmrDictService;
-import com.openhis.document.service.IEmrService;
-import com.openhis.document.service.IEmrTemplateService;
-import com.openhis.web.doctorstation.appservice.IDoctorStationEmrAppService;
-import com.openhis.web.doctorstation.dto.EmrTemplateDto;
-import com.openhis.web.doctorstation.dto.PatientEmrDto;
+import com.healthlink.his.common.enums.BindingType;
+import com.healthlink.his.common.enums.EncounterStatus;
+import com.healthlink.his.document.domain.DocRecord;
+import com.healthlink.his.document.domain.Emr;
+import com.healthlink.his.document.domain.EmrDetail;
+import com.healthlink.his.document.domain.EmrDict;
+import com.healthlink.his.document.domain.EmrTemplate;
+import com.healthlink.his.document.service.IDocRecordService;
+import com.healthlink.his.document.service.IEmrDetailService;
+import com.healthlink.his.document.service.IEmrDictService;
+import com.healthlink.his.document.service.IEmrService;
+import com.healthlink.his.document.service.IEmrTemplateService;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationEmrAppService;
+import com.healthlink.his.web.doctorstation.dto.EmrTemplateDto;
+import com.healthlink.his.web.doctorstation.dto.PatientEmrDto;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -62,7 +62,7 @@ public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppServi
     IDocRecordService docRecordService;
 
     @Resource
-    private com.openhis.web.doctorstation.mapper.DoctorStationEmrAppMapper doctorStationEmrAppMapper;
+    private com.healthlink.his.web.doctorstation.mapper.DoctorStationEmrAppMapper doctorStationEmrAppMapper;
 
     /**
      * 添加病人病历信息
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationLabApplyServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationLabApplyServiceImpl.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationLabApplyServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationLabApplyServiceImpl.java
index 7f13b7531..aee6e3f33 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationLabApplyServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationLabApplyServiceImpl.java
@@ -1,41 +1,41 @@
-package com.openhis.web.doctorstation.appservice.impl;
+package com.healthlink.his.web.doctorstation.appservice.impl;
 
 import com.core.common.core.domain.R;
 import com.core.common.core.redis.RedisCache;
 import com.core.common.enums.DelFlag;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.common.enums.DbOpType;
-import com.openhis.administration.service.IAccountService;
-import com.openhis.administration.domain.Account;
-import com.openhis.administration.service.IChargeItemService;  // Bug #386修复: 添加 ChargeItemService
-import com.openhis.lab.domain.InspectionLabApply;
-import com.openhis.lab.domain.InspectionLabApplyItem;
-import com.openhis.lab.domain.BarCode;
-import com.openhis.lab.domain.InspectionPackage;
-import com.openhis.lab.domain.LabActivityDefinition;
-import com.openhis.lab.service.IInspectionLabApplyItemService;
-import com.openhis.lab.service.IInspectionLabApplyService;
-import com.openhis.lab.service.IInspectionLabBarCodeService;
-import com.openhis.lab.service.IInspectionPackageService;
-import com.openhis.lab.service.ILabActivityDefinitionService;
-import com.openhis.workflow.domain.ServiceRequest;
-import com.openhis.workflow.service.IServiceRequestService;
-import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService;
-import com.openhis.web.doctorstation.appservice.IDoctorStationInspectionLabApplyService;
-import com.openhis.web.doctorstation.dto.AdviceSaveDto;
-import com.openhis.web.doctorstation.dto.AdviceSaveParam;
-import com.openhis.web.doctorstation.dto.DoctorStationLabApplyDto;
-import com.openhis.web.doctorstation.mapper.DoctorStationLabApplyMapper;
-import com.openhis.administration.service.IOrganizationService;
+import com.healthlink.his.common.enums.DbOpType;
+import com.healthlink.his.administration.service.IAccountService;
+import com.healthlink.his.administration.domain.Account;
+import com.healthlink.his.administration.service.IChargeItemService;  // Bug #386修复: 添加 ChargeItemService
+import com.healthlink.his.lab.domain.InspectionLabApply;
+import com.healthlink.his.lab.domain.InspectionLabApplyItem;
+import com.healthlink.his.lab.domain.BarCode;
+import com.healthlink.his.lab.domain.InspectionPackage;
+import com.healthlink.his.lab.domain.LabActivityDefinition;
+import com.healthlink.his.lab.service.IInspectionLabApplyItemService;
+import com.healthlink.his.lab.service.IInspectionLabApplyService;
+import com.healthlink.his.lab.service.IInspectionLabBarCodeService;
+import com.healthlink.his.lab.service.IInspectionPackageService;
+import com.healthlink.his.lab.service.ILabActivityDefinitionService;
+import com.healthlink.his.workflow.domain.ServiceRequest;
+import com.healthlink.his.workflow.service.IServiceRequestService;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationAdviceAppService;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationInspectionLabApplyService;
+import com.healthlink.his.web.doctorstation.dto.AdviceSaveDto;
+import com.healthlink.his.web.doctorstation.dto.AdviceSaveParam;
+import com.healthlink.his.web.doctorstation.dto.DoctorStationLabApplyDto;
+import com.healthlink.his.web.doctorstation.mapper.DoctorStationLabApplyMapper;
+import com.healthlink.his.administration.service.IOrganizationService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.openhis.web.doctorstation.dto.DoctorStationLabApplyItemDto;
-import com.openhis.workflow.service.IActivityDefinitionService;
-import com.openhis.administration.domain.Organization;
-import com.openhis.workflow.domain.ActivityDefinition;
+import com.healthlink.his.web.doctorstation.dto.DoctorStationLabApplyItemDto;
+import com.healthlink.his.workflow.service.IActivityDefinitionService;
+import com.healthlink.his.administration.domain.Organization;
+import com.healthlink.his.workflow.domain.ActivityDefinition;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.github.pagehelper.PageHelper;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java
index 6cc046967..ad07d9753 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.appservice.impl;
+package com.healthlink.his.web.doctorstation.appservice.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -10,28 +10,28 @@ import com.core.common.core.domain.R;
 import com.core.common.core.domain.model.LoginUser;
 import com.core.common.utils.AgeCalculatorUtil;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.Encounter;
-import com.openhis.administration.domain.EncounterParticipant;
-import com.openhis.administration.mapper.EncounterMapper;
-import com.openhis.administration.service.IEncounterParticipantService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.*;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.appointmentmanage.domain.ScheduleSlot;
-import com.openhis.appointmentmanage.mapper.ScheduleSlotMapper;
-import com.openhis.clinical.domain.Order;
-import com.openhis.clinical.service.IOrderService;
-import com.openhis.triageandqueuemanage.domain.DivLog;
-import com.openhis.triageandqueuemanage.domain.TriageQueueItem;
-import com.openhis.triageandqueuemanage.service.DivLogService;
-import com.openhis.triageandqueuemanage.service.TriageQueueItemService;
-import com.openhis.web.doctorstation.appservice.*;
-import com.openhis.web.doctorstation.dto.PatientInfoDto;
-import com.openhis.web.doctorstation.dto.PrescriptionInfoBaseDto;
-import com.openhis.web.doctorstation.dto.PrescriptionInfoDetailDto;
-import com.openhis.web.doctorstation.dto.ReceptionStatisticsDto;
-import com.openhis.web.doctorstation.mapper.DoctorStationMainAppMapper;
+import com.healthlink.his.administration.domain.Encounter;
+import com.healthlink.his.administration.domain.EncounterParticipant;
+import com.healthlink.his.administration.mapper.EncounterMapper;
+import com.healthlink.his.administration.service.IEncounterParticipantService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.enums.*;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.appointmentmanage.domain.ScheduleSlot;
+import com.healthlink.his.appointmentmanage.mapper.ScheduleSlotMapper;
+import com.healthlink.his.clinical.domain.Order;
+import com.healthlink.his.clinical.service.IOrderService;
+import com.healthlink.his.triageandqueuemanage.domain.DivLog;
+import com.healthlink.his.triageandqueuemanage.domain.TriageQueueItem;
+import com.healthlink.his.triageandqueuemanage.service.DivLogService;
+import com.healthlink.his.triageandqueuemanage.service.TriageQueueItemService;
+import com.healthlink.his.web.doctorstation.appservice.*;
+import com.healthlink.his.web.doctorstation.dto.PatientInfoDto;
+import com.healthlink.his.web.doctorstation.dto.PrescriptionInfoBaseDto;
+import com.healthlink.his.web.doctorstation.dto.PrescriptionInfoDetailDto;
+import com.healthlink.his.web.doctorstation.dto.ReceptionStatisticsDto;
+import com.healthlink.his.web.doctorstation.mapper.DoctorStationMainAppMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationPtDetailsAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationPtDetailsAppServiceImpl.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationPtDetailsAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationPtDetailsAppServiceImpl.java
index 989ce89a0..ce43c3182 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationPtDetailsAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationPtDetailsAppServiceImpl.java
@@ -1,12 +1,12 @@
-package com.openhis.web.doctorstation.appservice.impl;
+package com.healthlink.his.web.doctorstation.appservice.impl;
 
 import com.core.common.core.domain.R;
 import com.core.common.utils.DateUtils;
-import com.openhis.common.enums.*;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.web.doctorstation.appservice.IDoctorStationPtDetailsAppService;
-import com.openhis.web.doctorstation.dto.PatientDetailsDto;
-import com.openhis.web.doctorstation.mapper.DoctorStationPtDetailsAppMapper;
+import com.healthlink.his.common.enums.*;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationPtDetailsAppService;
+import com.healthlink.his.web.doctorstation.dto.PatientDetailsDto;
+import com.healthlink.his.web.doctorstation.mapper.DoctorStationPtDetailsAppMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/ReservationRecordAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/ReservationRecordAppServiceImpl.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/ReservationRecordAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/ReservationRecordAppServiceImpl.java
index a57dc78f8..b9b30cd16 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/ReservationRecordAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/ReservationRecordAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.appservice.impl;
+package com.healthlink.his.web.doctorstation.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -6,13 +6,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.clinical.domain.ReservationRecord;
-import com.openhis.clinical.service.IReservationRecordService;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.doctorstation.appservice.IReservationRecordAppService;
-import com.openhis.web.doctorstation.dto.ReservationRecordDto;
-import com.openhis.web.doctorstation.mapper.ReservationRecordAppMapper;
+import com.healthlink.his.clinical.domain.ReservationRecord;
+import com.healthlink.his.clinical.service.IReservationRecordService;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.doctorstation.appservice.IReservationRecordAppService;
+import com.healthlink.his.web.doctorstation.dto.ReservationRecordDto;
+import com.healthlink.his.web.doctorstation.mapper.ReservationRecordAppMapper;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/TodayOutpatientServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/TodayOutpatientServiceImpl.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/TodayOutpatientServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/TodayOutpatientServiceImpl.java
index 246b02595..eae2d48da 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/TodayOutpatientServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/TodayOutpatientServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.appservice.impl;
+package com.healthlink.his.web.doctorstation.appservice.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -7,16 +7,16 @@ 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.common.constant.CommonConstants;
-import com.openhis.common.enums.*;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.doctorstation.appservice.IDoctorStationMainAppService;
-import com.openhis.web.doctorstation.appservice.ITodayOutpatientService;
-import com.openhis.web.doctorstation.dto.TodayOutpatientPatientDto;
-import com.openhis.web.doctorstation.dto.TodayOutpatientQueryParam;
-import com.openhis.web.doctorstation.dto.TodayOutpatientStatsDto;
-import com.openhis.web.doctorstation.mapper.TodayOutpatientMapper;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.enums.*;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationMainAppService;
+import com.healthlink.his.web.doctorstation.appservice.ITodayOutpatientService;
+import com.healthlink.his.web.doctorstation.dto.TodayOutpatientPatientDto;
+import com.healthlink.his.web.doctorstation.dto.TodayOutpatientQueryParam;
+import com.healthlink.his.web.doctorstation.dto.TodayOutpatientStatsDto;
+import com.healthlink.his.web.doctorstation.mapper.TodayOutpatientMapper;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorPhraseController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/DoctorPhraseController.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorPhraseController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/DoctorPhraseController.java
index cd4d4f14d..97ed9f18d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorPhraseController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/DoctorPhraseController.java
@@ -1,9 +1,9 @@
-package com.openhis.web.doctorstation.controller;
+package com.healthlink.his.web.doctorstation.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.BindingType;
-import com.openhis.template.domain.DoctorPhrase;
-import com.openhis.web.doctorstation.appservice.IDoctorPhraseAppService;
+import com.healthlink.his.common.enums.BindingType;
+import com.healthlink.his.template.domain.DoctorPhrase;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorPhraseAppService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/DoctorStationAdviceController.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/DoctorStationAdviceController.java
index 44b57540a..21719b9c7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/DoctorStationAdviceController.java
@@ -1,16 +1,16 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.doctorstation.controller;
+package com.healthlink.his.web.doctorstation.controller;
 
 import com.core.common.annotation.RepeatSubmit;
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.AdviceOpType;
-import com.openhis.common.enums.Whether;
-import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService;
-import com.openhis.web.doctorstation.dto.AdviceBaseDto;
-import com.openhis.web.doctorstation.dto.AdviceSaveParam;
-import com.openhis.web.doctorstation.dto.UpdateGroupIdParam;
+import com.healthlink.his.common.enums.AdviceOpType;
+import com.healthlink.his.common.enums.Whether;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationAdviceAppService;
+import com.healthlink.his.web.doctorstation.dto.AdviceBaseDto;
+import com.healthlink.his.web.doctorstation.dto.AdviceSaveParam;
+import com.healthlink.his.web.doctorstation.dto.UpdateGroupIdParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationChineseMedicalController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/DoctorStationChineseMedicalController.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationChineseMedicalController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/DoctorStationChineseMedicalController.java
index ac97cfc06..e9d2412ce 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationChineseMedicalController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/DoctorStationChineseMedicalController.java
@@ -1,17 +1,17 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.doctorstation.controller;
+package com.healthlink.his.web.doctorstation.controller;
 
 import com.core.common.core.domain.R;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.common.enums.AdviceOpType;
-import com.openhis.common.enums.Whether;
-import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService;
-import com.openhis.web.doctorstation.appservice.IDoctorStationChineseMedicalAppService;
-import com.openhis.web.doctorstation.dto.AdviceBaseDto;
-import com.openhis.web.doctorstation.dto.AdviceSaveParam;
-import com.openhis.web.doctorstation.dto.SaveDiagnosisParam;
+import com.healthlink.his.common.enums.AdviceOpType;
+import com.healthlink.his.common.enums.Whether;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationAdviceAppService;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationChineseMedicalAppService;
+import com.healthlink.his.web.doctorstation.dto.AdviceBaseDto;
+import com.healthlink.his.web.doctorstation.dto.AdviceSaveParam;
+import com.healthlink.his.web.doctorstation.dto.SaveDiagnosisParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationDiagnosisController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/DoctorStationDiagnosisController.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationDiagnosisController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/DoctorStationDiagnosisController.java
index 990a002c0..fcc07ccfc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationDiagnosisController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/DoctorStationDiagnosisController.java
@@ -1,16 +1,16 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.doctorstation.controller;
+package com.healthlink.his.web.doctorstation.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.BindingType;
-import com.openhis.common.enums.ConditionVerificationStatus;
-import com.openhis.web.doctorstation.appservice.IDoctorStationDiagnosisAppService;
-import com.openhis.web.doctorstation.dto.DiagnosisBelongBindingDto;
-import com.openhis.web.doctorstation.dto.DiagnosisBelongBindingInitDto;
-import com.openhis.web.doctorstation.dto.InfectiousDiseaseReportDto;
-import com.openhis.web.doctorstation.dto.SaveDiagnosisParam;
+import com.healthlink.his.common.enums.BindingType;
+import com.healthlink.his.common.enums.ConditionVerificationStatus;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationDiagnosisAppService;
+import com.healthlink.his.web.doctorstation.dto.DiagnosisBelongBindingDto;
+import com.healthlink.his.web.doctorstation.dto.DiagnosisBelongBindingInitDto;
+import com.healthlink.his.web.doctorstation.dto.InfectiousDiseaseReportDto;
+import com.healthlink.his.web.doctorstation.dto.SaveDiagnosisParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationElepPrescriptionController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/DoctorStationElepPrescriptionController.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationElepPrescriptionController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/DoctorStationElepPrescriptionController.java
index f04dfb5a9..3ef89843d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationElepPrescriptionController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/DoctorStationElepPrescriptionController.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.doctorstation.controller;
+package com.healthlink.his.web.doctorstation.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.doctorstation.appservice.IDoctorStationElepPrescriptionService;
-import com.openhis.web.doctorstation.dto.DeletePrescriptionInfoParam;
-import com.openhis.web.doctorstation.dto.ElepPrescriptionInfoParam;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationElepPrescriptionService;
+import com.healthlink.his.web.doctorstation.dto.DeletePrescriptionInfoParam;
+import com.healthlink.his.web.doctorstation.dto.ElepPrescriptionInfoParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationEmrController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/DoctorStationEmrController.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationEmrController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/DoctorStationEmrController.java
index cf1aabb2b..eac0d56af 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationEmrController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/DoctorStationEmrController.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.doctorstation.controller;
+package com.healthlink.his.web.doctorstation.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.doctorstation.appservice.IDoctorStationEmrAppService;
-import com.openhis.web.doctorstation.dto.EmrTemplateDto;
-import com.openhis.web.doctorstation.dto.PatientEmrDto;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationEmrAppService;
+import com.healthlink.his.web.doctorstation.dto.EmrTemplateDto;
+import com.healthlink.his.web.doctorstation.dto.PatientEmrDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationInspectionLabApplyController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/DoctorStationInspectionLabApplyController.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationInspectionLabApplyController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/DoctorStationInspectionLabApplyController.java
index 806548fb4..7022439eb 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationInspectionLabApplyController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/DoctorStationInspectionLabApplyController.java
@@ -1,8 +1,8 @@
-package com.openhis.web.doctorstation.controller;
+package com.healthlink.his.web.doctorstation.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.doctorstation.appservice.IDoctorStationInspectionLabApplyService;
-import com.openhis.web.doctorstation.dto.DoctorStationLabApplyDto;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationInspectionLabApplyService;
+import com.healthlink.his.web.doctorstation.dto.DoctorStationLabApplyDto;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationMainController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/DoctorStationMainController.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationMainController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/DoctorStationMainController.java
index c6c34051f..16f6dfef8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationMainController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/DoctorStationMainController.java
@@ -1,15 +1,15 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.doctorstation.controller;
+package com.healthlink.his.web.doctorstation.controller;
 
 import com.core.common.core.domain.R;
 import com.core.common.utils.StringUtils;
-import com.openhis.common.enums.Whether;
-import com.openhis.web.doctorstation.appservice.IDoctorStationMainAppService;
-import com.openhis.web.doctorstation.dto.DoctorStationInitDto;
-import com.openhis.web.doctorstation.dto.PatientInfoDto;
-import com.openhis.web.doctorstation.dto.PrescriptionInfoBaseDto;
+import com.healthlink.his.common.enums.Whether;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationMainAppService;
+import com.healthlink.his.web.doctorstation.dto.DoctorStationInitDto;
+import com.healthlink.his.web.doctorstation.dto.PatientInfoDto;
+import com.healthlink.his.web.doctorstation.dto.PrescriptionInfoBaseDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationPtDetailsController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/DoctorStationPtDetailsController.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationPtDetailsController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/DoctorStationPtDetailsController.java
index f63724ec3..c338bab29 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationPtDetailsController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/DoctorStationPtDetailsController.java
@@ -1,7 +1,7 @@
-package com.openhis.web.doctorstation.controller;
+package com.healthlink.his.web.doctorstation.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.doctorstation.appservice.IDoctorStationPtDetailsAppService;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationPtDetailsAppService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/PendingEmrController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/PendingEmrController.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/PendingEmrController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/PendingEmrController.java
index 4a8cb8ba2..3fc4726dc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/PendingEmrController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/PendingEmrController.java
@@ -1,8 +1,8 @@
-package com.openhis.web.doctorstation.controller;
+package com.healthlink.his.web.doctorstation.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.doctorstation.appservice.IDoctorStationEmrAppService;
-import com.openhis.web.doctorstation.dto.PatientEmrDto;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationEmrAppService;
+import com.healthlink.his.web.doctorstation.dto.PatientEmrDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/ReservationRecordController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/ReservationRecordController.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/ReservationRecordController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/ReservationRecordController.java
index 4d3fe2e57..715895c80 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/ReservationRecordController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/ReservationRecordController.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.doctorstation.controller;
+package com.healthlink.his.web.doctorstation.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.doctorstation.appservice.IReservationRecordAppService;
-import com.openhis.web.doctorstation.dto.ReservationRecordDto;
+import com.healthlink.his.web.doctorstation.appservice.IReservationRecordAppService;
+import com.healthlink.his.web.doctorstation.dto.ReservationRecordDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/TodayOutpatientController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/TodayOutpatientController.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/TodayOutpatientController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/TodayOutpatientController.java
index 54eb405d4..bdb0db50a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/TodayOutpatientController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/TodayOutpatientController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.doctorstation.controller;
+package com.healthlink.his.web.doctorstation.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.web.doctorstation.appservice.ITodayOutpatientService;
-import com.openhis.web.doctorstation.dto.TodayOutpatientPatientDto;
-import com.openhis.web.doctorstation.dto.TodayOutpatientQueryParam;
-import com.openhis.web.doctorstation.dto.TodayOutpatientStatsDto;
+import com.healthlink.his.web.doctorstation.appservice.ITodayOutpatientService;
+import com.healthlink.his.web.doctorstation.dto.TodayOutpatientPatientDto;
+import com.healthlink.his.web.doctorstation.dto.TodayOutpatientQueryParam;
+import com.healthlink.his.web.doctorstation.dto.TodayOutpatientStatsDto;
 import org.springframework.web.bind.annotation.*;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ActivityBindDeviceDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ActivityBindDeviceDetailDto.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ActivityBindDeviceDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ActivityBindDeviceDetailDto.java
index d46d23830..f825e7179 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ActivityBindDeviceDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ActivityBindDeviceDetailDto.java
@@ -1,8 +1,8 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ActivityChildrenJsonParams.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ActivityChildrenJsonParams.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ActivityChildrenJsonParams.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ActivityChildrenJsonParams.java
index 26d39d91e..41faac3ab 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ActivityChildrenJsonParams.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ActivityChildrenJsonParams.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/AdviceBaseDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/AdviceBaseDto.java
index 49a4d7533..d0284e68f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/AdviceBaseDto.java
@@ -1,8 +1,8 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceInventoryDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/AdviceInventoryDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceInventoryDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/AdviceInventoryDto.java
index 88557a60d..7224f6b44 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceInventoryDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/AdviceInventoryDto.java
@@ -1,8 +1,8 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdvicePriceDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/AdvicePriceDto.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdvicePriceDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/AdvicePriceDto.java
index 794234833..46045c426 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdvicePriceDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/AdvicePriceDto.java
@@ -1,8 +1,8 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/AdviceSaveDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/AdviceSaveDto.java
index e9ebfed2e..25b563112 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/AdviceSaveDto.java
@@ -1,9 +1,9 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import com.core.common.utils.SecurityUtils;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.common.enums.TherapyTimeType;
+import com.healthlink.his.common.enums.TherapyTimeType;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/AdviceSaveParam.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/AdviceSaveParam.java
index 5421d0ef9..188c26e50 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/AdviceSaveParam.java
@@ -1,8 +1,8 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.common.enums.Whether;
+import com.healthlink.his.common.enums.Whether;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ConditionDefinitionBusinessClass.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ConditionDefinitionBusinessClass.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ConditionDefinitionBusinessClass.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ConditionDefinitionBusinessClass.java
index 3b02924c8..78d14506f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ConditionDefinitionBusinessClass.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ConditionDefinitionBusinessClass.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ConditionDefinitionMetadata.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ConditionDefinitionMetadata.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ConditionDefinitionMetadata.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ConditionDefinitionMetadata.java
index bb6f61c03..03b859eb7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ConditionDefinitionMetadata.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ConditionDefinitionMetadata.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DeletePrescriptionInfoParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/DeletePrescriptionInfoParam.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DeletePrescriptionInfoParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/DeletePrescriptionInfoParam.java
index ff4d0bcbe..c7af256c5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DeletePrescriptionInfoParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/DeletePrescriptionInfoParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisBelongBindingDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/DiagnosisBelongBindingDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisBelongBindingDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/DiagnosisBelongBindingDto.java
index f015b782e..dba4f678a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisBelongBindingDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/DiagnosisBelongBindingDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisBelongBindingInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/DiagnosisBelongBindingInitDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisBelongBindingInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/DiagnosisBelongBindingInitDto.java
index 9985fd5cd..7f23d3b78 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisBelongBindingInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/DiagnosisBelongBindingInitDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisQueryDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/DiagnosisQueryDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisQueryDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/DiagnosisQueryDto.java
index 54663af2b..9aa5e2e6a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisQueryDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/DiagnosisQueryDto.java
@@ -1,8 +1,8 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/DoctorStationInitDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/DoctorStationInitDto.java
index 60b2916ad..3cfce3fa9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/DoctorStationInitDto.java
@@ -1,6 +1,6 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
-import com.openhis.common.enums.EncounterStatus;
+import com.healthlink.his.common.enums.EncounterStatus;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationLabApplyDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/DoctorStationLabApplyDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationLabApplyDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/DoctorStationLabApplyDto.java
index cc87999ee..820b29d39 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationLabApplyDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/DoctorStationLabApplyDto.java
@@ -1,7 +1,7 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationLabApplyItemDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/DoctorStationLabApplyItemDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationLabApplyItemDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/DoctorStationLabApplyItemDto.java
index 85129bdb0..8e31869ca 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationLabApplyItemDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/DoctorStationLabApplyItemDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepMedicationInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ElepMedicationInfoDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepMedicationInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ElepMedicationInfoDto.java
index 28533059f..f7c4f6d3d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepMedicationInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ElepMedicationInfoDto.java
@@ -1,9 +1,9 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ElepPrescriptionInfoDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ElepPrescriptionInfoDto.java
index aa273fecf..28bd2456b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ElepPrescriptionInfoDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInfoParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ElepPrescriptionInfoParam.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInfoParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ElepPrescriptionInfoParam.java
index 6f62cb80a..5a26e0922 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInfoParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ElepPrescriptionInfoParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInitConditionDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ElepPrescriptionInitConditionDto.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInitConditionDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ElepPrescriptionInitConditionDto.java
index 8ff2cda9d..43e3f31ed 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInitConditionDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ElepPrescriptionInitConditionDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ElepPrescriptionInitDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ElepPrescriptionInitDto.java
index 372c15b8d..c591dc656 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ElepPrescriptionInitDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/EmrTemplateDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/EmrTemplateDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/EmrTemplateDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/EmrTemplateDto.java
index 9d4e0cdbd..06c242b76 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/EmrTemplateDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/EmrTemplateDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import com.alibaba.fastjson2.JSONObject;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/EncounterContractDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/EncounterContractDto.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/EncounterContractDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/EncounterContractDto.java
index 6762f0238..885879b11 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/EncounterContractDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/EncounterContractDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/InfectiousDiseaseReportDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/InfectiousDiseaseReportDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/InfectiousDiseaseReportDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/InfectiousDiseaseReportDto.java
index 0634c8f90..75bd25d0a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/InfectiousDiseaseReportDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/InfectiousDiseaseReportDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/OrderBindInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/OrderBindInfoDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/OrderBindInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/OrderBindInfoDto.java
index a35363c25..7682ebd54 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/OrderBindInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/OrderBindInfoDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientDetailsDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/PatientDetailsDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientDetailsDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/PatientDetailsDto.java
index badac96e1..071d83477 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientDetailsDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/PatientDetailsDto.java
@@ -1,9 +1,9 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientEmrDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/PatientEmrDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientEmrDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/PatientEmrDto.java
index e0de291a0..76a90c618 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientEmrDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/PatientEmrDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import com.alibaba.fastjson2.JSONObject;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/PatientInfoDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/PatientInfoDto.java
index b67c4343a..168b997da 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/PatientInfoDto.java
@@ -1,9 +1,9 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PrescriptionInfoBaseDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/PrescriptionInfoBaseDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PrescriptionInfoBaseDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/PrescriptionInfoBaseDto.java
index b2915a9a8..4993b6034 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PrescriptionInfoBaseDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/PrescriptionInfoBaseDto.java
@@ -1,9 +1,9 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.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;
 import org.springframework.format.annotation.DateTimeFormat;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PrescriptionInfoDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/PrescriptionInfoDetailDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PrescriptionInfoDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/PrescriptionInfoDetailDto.java
index e6b9317d5..c31c9132c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PrescriptionInfoDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/PrescriptionInfoDetailDto.java
@@ -1,9 +1,9 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ProofAndTestHistoryDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ProofAndTestHistoryDto.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ProofAndTestHistoryDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ProofAndTestHistoryDto.java
index 8d0c99ac2..a65ae3824 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ProofAndTestHistoryDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ProofAndTestHistoryDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ProofAndTestResultDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ProofAndTestResultDto.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ProofAndTestResultDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ProofAndTestResultDto.java
index 06059fa24..6f72423a4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ProofAndTestResultDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ProofAndTestResultDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ReceptionStatisticsDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ReceptionStatisticsDto.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ReceptionStatisticsDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ReceptionStatisticsDto.java
index 05985a2c1..b3f44aa5b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ReceptionStatisticsDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ReceptionStatisticsDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/RequestBaseDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/RequestBaseDto.java
index 41b1cb525..1424b1ccd 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/RequestBaseDto.java
@@ -1,9 +1,9 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ReservationRecordDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ReservationRecordDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ReservationRecordDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ReservationRecordDto.java
index 64656373e..0388bb4b2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ReservationRecordDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ReservationRecordDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisChildParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/SaveDiagnosisChildParam.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisChildParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/SaveDiagnosisChildParam.java
index 5a4276e4f..017bf92a5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisChildParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/SaveDiagnosisChildParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/SaveDiagnosisParam.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/SaveDiagnosisParam.java
index ac34c78ea..96eadacd4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/SaveDiagnosisParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SurgeryItemDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/SurgeryItemDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SurgeryItemDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/SurgeryItemDto.java
index a71edb932..22f2a839f 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SurgeryItemDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/SurgeryItemDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/TodayOutpatientPatientDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/TodayOutpatientPatientDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/TodayOutpatientPatientDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/TodayOutpatientPatientDto.java
index bf51f4d41..e2b217ba2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/TodayOutpatientPatientDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/TodayOutpatientPatientDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/TodayOutpatientQueryParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/TodayOutpatientQueryParam.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/TodayOutpatientQueryParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/TodayOutpatientQueryParam.java
index 5980a561a..27ba6576f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/TodayOutpatientQueryParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/TodayOutpatientQueryParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/TodayOutpatientStatsDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/TodayOutpatientStatsDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/TodayOutpatientStatsDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/TodayOutpatientStatsDto.java
index 019177385..fe2bff2c3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/TodayOutpatientStatsDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/TodayOutpatientStatsDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/UpdateGroupDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/UpdateGroupDto.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/UpdateGroupDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/UpdateGroupDto.java
index 4c13b4ad0..cca9f38e7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/UpdateGroupDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/UpdateGroupDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/UpdateGroupIdParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/UpdateGroupIdParam.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/UpdateGroupIdParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/UpdateGroupIdParam.java
index 69818d4db..fed125d58 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/UpdateGroupIdParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/UpdateGroupIdParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.dto;
+package com.healthlink.his.web.doctorstation.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorPhraseAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/DoctorPhraseAppMapper.java
similarity index 66%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorPhraseAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/DoctorPhraseAppMapper.java
index d3be4752d..de687616f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorPhraseAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/DoctorPhraseAppMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.mapper;
+package com.healthlink.his.web.doctorstation.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java
index 36b121099..fa7eb6a9f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java
@@ -1,10 +1,10 @@
-package com.openhis.web.doctorstation.mapper;
+package com.healthlink.his.web.doctorstation.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.doctorstation.dto.*;
+import com.healthlink.his.web.doctorstation.dto.*;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationChineseMedicalAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/DoctorStationChineseMedicalAppMapper.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationChineseMedicalAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/DoctorStationChineseMedicalAppMapper.java
index d2726d1c6..3231169c7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationChineseMedicalAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/DoctorStationChineseMedicalAppMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.web.doctorstation.mapper;
+package com.healthlink.his.web.doctorstation.mapper;
 
-import com.openhis.web.doctorstation.dto.DiagnosisQueryDto;
-import com.openhis.web.doctorstation.dto.RequestBaseDto;
+import com.healthlink.his.web.doctorstation.dto.DiagnosisQueryDto;
+import com.healthlink.his.web.doctorstation.dto.RequestBaseDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationDiagnosisAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/DoctorStationDiagnosisAppMapper.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationDiagnosisAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/DoctorStationDiagnosisAppMapper.java
index e27b9f974..329f70c37 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationDiagnosisAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/DoctorStationDiagnosisAppMapper.java
@@ -1,12 +1,12 @@
-package com.openhis.web.doctorstation.mapper;
+package com.healthlink.his.web.doctorstation.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.doctorstation.dto.ConditionDefinitionMetadata;
-import com.openhis.web.doctorstation.dto.DiagnosisBelongBindingDto;
-import com.openhis.web.doctorstation.dto.DiagnosisQueryDto;
+import com.healthlink.his.web.doctorstation.dto.ConditionDefinitionMetadata;
+import com.healthlink.his.web.doctorstation.dto.DiagnosisBelongBindingDto;
+import com.healthlink.his.web.doctorstation.dto.DiagnosisQueryDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationElepPrescriptionMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/DoctorStationElepPrescriptionMapper.java
similarity index 83%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationElepPrescriptionMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/DoctorStationElepPrescriptionMapper.java
index e67f9cfdb..18b2ecbd5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationElepPrescriptionMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/DoctorStationElepPrescriptionMapper.java
@@ -1,13 +1,13 @@
-package com.openhis.web.doctorstation.mapper;
+package com.healthlink.his.web.doctorstation.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.doctorstation.dto.ElepMedicationInfoDto;
-import com.openhis.web.doctorstation.dto.ElepPrescriptionInfoDto;
-import com.openhis.web.doctorstation.dto.ElepPrescriptionInfoParam;
-import com.openhis.web.reportmanage.dto.ChargeReportPageDto;
-import com.openhis.ybcatalog.domain.CatalogDrugInfo;
+import com.healthlink.his.web.doctorstation.dto.ElepMedicationInfoDto;
+import com.healthlink.his.web.doctorstation.dto.ElepPrescriptionInfoDto;
+import com.healthlink.his.web.doctorstation.dto.ElepPrescriptionInfoParam;
+import com.healthlink.his.web.reportmanage.dto.ChargeReportPageDto;
+import com.healthlink.his.ybcatalog.domain.CatalogDrugInfo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationEmrAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/DoctorStationEmrAppMapper.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationEmrAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/DoctorStationEmrAppMapper.java
index 7c375ffb0..1dd8cfbac 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationEmrAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/DoctorStationEmrAppMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.mapper;
+package com.healthlink.his.web.doctorstation.mapper;
 
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationLabApplyMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/DoctorStationLabApplyMapper.java
similarity index 83%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationLabApplyMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/DoctorStationLabApplyMapper.java
index 32505f1fb..1e36f4da6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationLabApplyMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/DoctorStationLabApplyMapper.java
@@ -1,6 +1,6 @@
-package com.openhis.web.doctorstation.mapper;
+package com.healthlink.his.web.doctorstation.mapper;
 
-import com.openhis.web.doctorstation.dto.DoctorStationLabApplyDto;
+import com.healthlink.his.web.doctorstation.dto.DoctorStationLabApplyDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationMainAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/DoctorStationMainAppMapper.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationMainAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/DoctorStationMainAppMapper.java
index ce0aeb1f0..c6742bff0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationMainAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/DoctorStationMainAppMapper.java
@@ -1,13 +1,13 @@
-package com.openhis.web.doctorstation.mapper;
+package com.healthlink.his.web.doctorstation.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.doctorstation.dto.PatientInfoDto;
-import com.openhis.web.doctorstation.dto.PrescriptionInfoBaseDto;
-import com.openhis.web.doctorstation.dto.PrescriptionInfoDetailDto;
-import com.openhis.web.doctorstation.dto.ReceptionStatisticsDto;
+import com.healthlink.his.web.doctorstation.dto.PatientInfoDto;
+import com.healthlink.his.web.doctorstation.dto.PrescriptionInfoBaseDto;
+import com.healthlink.his.web.doctorstation.dto.PrescriptionInfoDetailDto;
+import com.healthlink.his.web.doctorstation.dto.ReceptionStatisticsDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationPtDetailsAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/DoctorStationPtDetailsAppMapper.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationPtDetailsAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/DoctorStationPtDetailsAppMapper.java
index 187c5139b..a3203f281 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationPtDetailsAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/DoctorStationPtDetailsAppMapper.java
@@ -1,6 +1,6 @@
-package com.openhis.web.doctorstation.mapper;
+package com.healthlink.his.web.doctorstation.mapper;
 
-import com.openhis.web.doctorstation.dto.PatientDetailsDto;
+import com.healthlink.his.web.doctorstation.dto.PatientDetailsDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/ReservationRecordAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/ReservationRecordAppMapper.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/ReservationRecordAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/ReservationRecordAppMapper.java
index 3f4f0ce19..cb4c94ee1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/ReservationRecordAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/ReservationRecordAppMapper.java
@@ -1,10 +1,10 @@
-package com.openhis.web.doctorstation.mapper;
+package com.healthlink.his.web.doctorstation.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.doctorstation.dto.ReservationRecordDto;
+import com.healthlink.his.web.doctorstation.dto.ReservationRecordDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/TodayOutpatientMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/TodayOutpatientMapper.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/TodayOutpatientMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/TodayOutpatientMapper.java
index 469634a2a..a6ab79759 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/TodayOutpatientMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/mapper/TodayOutpatientMapper.java
@@ -1,10 +1,10 @@
-package com.openhis.web.doctorstation.mapper;
+package com.healthlink.his.web.doctorstation.mapper;
 
 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.openhis.web.doctorstation.dto.TodayOutpatientPatientDto;
-import com.openhis.web.doctorstation.dto.TodayOutpatientStatsDto;
+import com.healthlink.his.web.doctorstation.dto.TodayOutpatientPatientDto;
+import com.healthlink.his.web.doctorstation.dto.TodayOutpatientStatsDto;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/AdviceUtils.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/utils/AdviceUtils.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/AdviceUtils.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/utils/AdviceUtils.java
index 07bed3b53..8b55de027 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/AdviceUtils.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/utils/AdviceUtils.java
@@ -1,4 +1,4 @@
-package com.openhis.web.doctorstation.utils;
+package com.healthlink.his.web.doctorstation.utils;
 
 import com.core.common.enums.TenantOptionDict;
 import com.core.common.utils.AssignSeqUtil;
@@ -10,23 +10,23 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.openhis.administration.domain.ChargeItem;
-import com.openhis.administration.domain.Account;
-import com.openhis.administration.service.IAccountService;
-import com.openhis.administration.service.IChargeItemService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.*;
-import com.openhis.web.chargemanage.mapper.OutpatientRegistrationAppMapper;
-import com.openhis.web.datadictionary.dto.ActivityChildJsonDto;
-import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService;
-import com.openhis.web.doctorstation.dto.*;
-import com.openhis.web.doctorstation.mapper.DoctorStationAdviceAppMapper;
-import com.openhis.web.inhospitalnursestation.dto.MedicationRequestUseExe;
-import com.openhis.workflow.domain.ServiceRequest;
-import com.openhis.workflow.service.IActivityDefinitionService;
-import com.openhis.workflow.service.IDeviceDispenseService;
-import com.openhis.workflow.service.IDeviceRequestService;
-import com.openhis.workflow.service.IServiceRequestService;
+import com.healthlink.his.administration.domain.ChargeItem;
+import com.healthlink.his.administration.domain.Account;
+import com.healthlink.his.administration.service.IAccountService;
+import com.healthlink.his.administration.service.IChargeItemService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.enums.*;
+import com.healthlink.his.web.chargemanage.mapper.OutpatientRegistrationAppMapper;
+import com.healthlink.his.web.datadictionary.dto.ActivityChildJsonDto;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationAdviceAppService;
+import com.healthlink.his.web.doctorstation.dto.*;
+import com.healthlink.his.web.doctorstation.mapper.DoctorStationAdviceAppMapper;
+import com.healthlink.his.web.inhospitalnursestation.dto.MedicationRequestUseExe;
+import com.healthlink.his.workflow.domain.ServiceRequest;
+import com.healthlink.his.workflow.service.IActivityDefinitionService;
+import com.healthlink.his.workflow.service.IDeviceDispenseService;
+import com.healthlink.his.workflow.service.IDeviceRequestService;
+import com.healthlink.his.workflow.service.IServiceRequestService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/DoctorStationSendApplyUtil.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/utils/DoctorStationSendApplyUtil.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/DoctorStationSendApplyUtil.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/utils/DoctorStationSendApplyUtil.java
index af17c21d7..19639642f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/DoctorStationSendApplyUtil.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/utils/DoctorStationSendApplyUtil.java
@@ -1,25 +1,25 @@
-package com.openhis.web.doctorstation.utils;
+package com.healthlink.his.web.doctorstation.utils;
 
 import com.core.common.exception.ServiceException;
 import com.core.common.utils.AgeCalculatorUtil;
-import com.openhis.administration.domain.Organization;
-import com.openhis.administration.domain.Patient;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.service.IOrganizationService;
-import com.openhis.administration.service.IPatientService;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.common.enums.ActivityType;
-import com.openhis.common.enums.AdministrativeGender;
-import com.openhis.crosssystem.dto.LisApplyDto;
-import com.openhis.crosssystem.dto.LisApplyGroupDto;
-import com.openhis.crosssystem.dto.PacsApplyDto;
-import com.openhis.crosssystem.enums.*;
-import com.openhis.crosssystem.utils.CrossSystemSendApplyUtil;
-import com.openhis.web.doctorstation.dto.AdviceSaveDto;
-import com.openhis.workflow.domain.ActivityDefinition;
-import com.openhis.workflow.domain.ServiceRequest;
-import com.openhis.workflow.service.IActivityDefinitionService;
-import com.openhis.workflow.service.IServiceRequestService;
+import com.healthlink.his.administration.domain.Organization;
+import com.healthlink.his.administration.domain.Patient;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.service.IOrganizationService;
+import com.healthlink.his.administration.service.IPatientService;
+import com.healthlink.his.administration.service.IPractitionerService;
+import com.healthlink.his.common.enums.ActivityType;
+import com.healthlink.his.common.enums.AdministrativeGender;
+import com.healthlink.his.crosssystem.dto.LisApplyDto;
+import com.healthlink.his.crosssystem.dto.LisApplyGroupDto;
+import com.healthlink.his.crosssystem.dto.PacsApplyDto;
+import com.healthlink.his.crosssystem.enums.*;
+import com.healthlink.his.crosssystem.utils.CrossSystemSendApplyUtil;
+import com.healthlink.his.web.doctorstation.dto.AdviceSaveDto;
+import com.healthlink.his.workflow.domain.ActivityDefinition;
+import com.healthlink.his.workflow.domain.ServiceRequest;
+import com.healthlink.his.workflow.service.IActivityDefinitionService;
+import com.healthlink.his.workflow.service.IServiceRequestService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/PrescriptionUtils.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/utils/PrescriptionUtils.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/PrescriptionUtils.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/utils/PrescriptionUtils.java
index 594ecafd9..8ef358898 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/PrescriptionUtils.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/utils/PrescriptionUtils.java
@@ -1,8 +1,8 @@
-package com.openhis.web.doctorstation.utils;
+package com.healthlink.his.web.doctorstation.utils;
 
 import com.core.common.utils.AssignSeqUtil;
-import com.openhis.common.enums.AssignSeqEnum;
-import com.openhis.web.doctorstation.dto.AdviceSaveDto;
+import com.healthlink.his.common.enums.AssignSeqEnum;
+import com.healthlink.his.web.doctorstation.dto.AdviceSaveDto;
 import org.springframework.stereotype.Component;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocDefinitionAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/IDocDefinitionAppService.java
similarity index 83%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocDefinitionAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/IDocDefinitionAppService.java
index dcf07ba96..13a3b1aa4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocDefinitionAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/IDocDefinitionAppService.java
@@ -1,8 +1,8 @@
-package com.openhis.web.document.appservice;
+package com.healthlink.his.web.document.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.document.dto.DocDefinitionDto;
-import com.openhis.web.document.dto.DocDefinitonParam;
+import com.healthlink.his.web.document.dto.DocDefinitionDto;
+import com.healthlink.his.web.document.dto.DocDefinitonParam;
 
 /**
  * 文书定义 应用Service
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocDefinitionOrganizationAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/IDocDefinitionOrganizationAppService.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocDefinitionOrganizationAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/IDocDefinitionOrganizationAppService.java
index c493e41ce..1e6075991 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocDefinitionOrganizationAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/IDocDefinitionOrganizationAppService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.document.appservice;
+package com.healthlink.his.web.document.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.document.dto.DocDefinitionOrganizationDto;
+import com.healthlink.his.web.document.dto.DocDefinitionOrganizationDto;
 
 /**
  * 文书定义 应用Service
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocRecordAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/IDocRecordAppService.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocRecordAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/IDocRecordAppService.java
index ee4bc0dfb..767ee56f5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocRecordAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/IDocRecordAppService.java
@@ -1,9 +1,9 @@
-package com.openhis.web.document.appservice;
+package com.healthlink.his.web.document.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.document.dto.DocRecordDto;
-import com.openhis.web.document.dto.DocRecordPatientQueryParam;
-import com.openhis.web.document.dto.DocRecordQueryParam;
+import com.healthlink.his.web.document.dto.DocRecordDto;
+import com.healthlink.his.web.document.dto.DocRecordPatientQueryParam;
+import com.healthlink.his.web.document.dto.DocRecordQueryParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/IDocStatisticsAppService.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/IDocStatisticsAppService.java
index caad502ce..1e854232b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/IDocStatisticsAppService.java
@@ -1,8 +1,8 @@
-package com.openhis.web.document.appservice;
+package com.healthlink.his.web.document.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.document.dto.DocStatisticsDto;
-import com.openhis.web.document.dto.DocStatisticsQueryParam;
+import com.healthlink.his.web.document.dto.DocStatisticsDto;
+import com.healthlink.his.web.document.dto.DocStatisticsQueryParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsDefinitionAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/IDocStatisticsDefinitionAppService.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsDefinitionAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/IDocStatisticsDefinitionAppService.java
index f4e31a85e..4ac02c60d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsDefinitionAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/IDocStatisticsDefinitionAppService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.document.appservice;
+package com.healthlink.his.web.document.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.document.dto.DocStatisticsDefinitionDto;
+import com.healthlink.his.web.document.dto.DocStatisticsDefinitionDto;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocTemplateAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/IDocTemplateAppService.java
similarity index 82%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocTemplateAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/IDocTemplateAppService.java
index 0ef4357ab..dcd73b948 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocTemplateAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/IDocTemplateAppService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.document.appservice;
+package com.healthlink.his.web.document.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.document.dto.DocTemplateDto;
+import com.healthlink.his.web.document.dto.DocTemplateDto;
 
 import jakarta.servlet.http.HttpServletRequest;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocDefinitionAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/impl/DocDefinitionAppServiceImpl.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocDefinitionAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/impl/DocDefinitionAppServiceImpl.java
index a51d2d868..197384cd8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocDefinitionAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/impl/DocDefinitionAppServiceImpl.java
@@ -1,24 +1,24 @@
-package com.openhis.web.document.appservice.impl;
+package com.healthlink.his.web.document.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.common.enums.AssignSeqEnum;
-import com.openhis.common.enums.DocUseRangeEnum;
-import com.openhis.document.domain.DocDefinition;
-import com.openhis.document.domain.DocDefinitionOrganization;
-import com.openhis.document.service.IDocDefinitionOrganizationService;
-import com.openhis.document.service.IDocDefinitionService;
-import com.openhis.web.document.appservice.IDocDefinitionAppService;
-import com.openhis.web.document.appservice.IDocDefinitionOrganizationAppService;
-import com.openhis.web.document.dto.DirectoryNode;
-import com.openhis.web.document.dto.DocDefinitionDto;
-import com.openhis.web.document.dto.DocDefinitionOrganizationDto;
-import com.openhis.web.document.dto.DocDefinitonParam;
-import com.openhis.web.document.mapper.DocDefinitionAppMapper;
-import com.openhis.web.document.util.DocumentDirectoryProcessor;
+import com.healthlink.his.common.enums.AssignSeqEnum;
+import com.healthlink.his.common.enums.DocUseRangeEnum;
+import com.healthlink.his.document.domain.DocDefinition;
+import com.healthlink.his.document.domain.DocDefinitionOrganization;
+import com.healthlink.his.document.service.IDocDefinitionOrganizationService;
+import com.healthlink.his.document.service.IDocDefinitionService;
+import com.healthlink.his.web.document.appservice.IDocDefinitionAppService;
+import com.healthlink.his.web.document.appservice.IDocDefinitionOrganizationAppService;
+import com.healthlink.his.web.document.dto.DirectoryNode;
+import com.healthlink.his.web.document.dto.DocDefinitionDto;
+import com.healthlink.his.web.document.dto.DocDefinitionOrganizationDto;
+import com.healthlink.his.web.document.dto.DocDefinitonParam;
+import com.healthlink.his.web.document.mapper.DocDefinitionAppMapper;
+import com.healthlink.his.web.document.util.DocumentDirectoryProcessor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocDefinitionOrganizationAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/impl/DocDefinitionOrganizationAppServiceImpl.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocDefinitionOrganizationAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/impl/DocDefinitionOrganizationAppServiceImpl.java
index 60e40607d..a875c1f72 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocDefinitionOrganizationAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/impl/DocDefinitionOrganizationAppServiceImpl.java
@@ -1,11 +1,11 @@
-package com.openhis.web.document.appservice.impl;
+package com.healthlink.his.web.document.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.core.common.core.domain.R;
-import com.openhis.document.domain.DocDefinitionOrganization;
-import com.openhis.document.service.IDocDefinitionOrganizationService;
-import com.openhis.web.document.appservice.IDocDefinitionOrganizationAppService;
-import com.openhis.web.document.dto.DocDefinitionOrganizationDto;
+import com.healthlink.his.document.domain.DocDefinitionOrganization;
+import com.healthlink.his.document.service.IDocDefinitionOrganizationService;
+import com.healthlink.his.web.document.appservice.IDocDefinitionOrganizationAppService;
+import com.healthlink.his.web.document.dto.DocDefinitionOrganizationDto;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocRecordAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/impl/DocRecordAppServiceImpl.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocRecordAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/impl/DocRecordAppServiceImpl.java
index c0a010dc1..35ddec3ee 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocRecordAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/impl/DocRecordAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.document.appservice.impl;
+package com.healthlink.his.web.document.appservice.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -10,22 +10,22 @@ import com.core.common.utils.AgeCalculatorUtil;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.common.enums.*;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.document.domain.DocRecord;
-import com.openhis.document.domain.DocStatistics;
-import com.openhis.document.mapper.DocRecordMapper;
-import com.openhis.document.service.IDocRecordService;
-import com.openhis.document.service.IDocStatisticsService;
-import com.openhis.web.document.appservice.IDocDefinitionAppService;
-import com.openhis.web.document.appservice.IDocRecordAppService;
-import com.openhis.web.document.appservice.IDocStatisticsAppService;
-import com.openhis.web.document.appservice.IDocStatisticsDefinitionAppService;
-import com.openhis.web.document.dto.*;
-import com.openhis.web.document.mapper.DocRecordAppMapper;
-import com.openhis.web.document.util.ConvertToDocStatistics;
-import com.openhis.web.document.util.OperationDayCalculator;
-import com.openhis.web.document.util.PermissionProcessor;
+import com.healthlink.his.common.enums.*;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.document.domain.DocRecord;
+import com.healthlink.his.document.domain.DocStatistics;
+import com.healthlink.his.document.mapper.DocRecordMapper;
+import com.healthlink.his.document.service.IDocRecordService;
+import com.healthlink.his.document.service.IDocStatisticsService;
+import com.healthlink.his.web.document.appservice.IDocDefinitionAppService;
+import com.healthlink.his.web.document.appservice.IDocRecordAppService;
+import com.healthlink.his.web.document.appservice.IDocStatisticsAppService;
+import com.healthlink.his.web.document.appservice.IDocStatisticsDefinitionAppService;
+import com.healthlink.his.web.document.dto.*;
+import com.healthlink.his.web.document.mapper.DocRecordAppMapper;
+import com.healthlink.his.web.document.util.ConvertToDocStatistics;
+import com.healthlink.his.web.document.util.OperationDayCalculator;
+import com.healthlink.his.web.document.util.PermissionProcessor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BatchPreparedStatementSetter;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocStatisticsAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/impl/DocStatisticsAppServiceImpl.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocStatisticsAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/impl/DocStatisticsAppServiceImpl.java
index 079331b05..2ccb527e4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocStatisticsAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/impl/DocStatisticsAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.document.appservice.impl;
+package com.healthlink.his.web.document.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -7,15 +7,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.common.enums.DocDefinitionEnum;
-import com.openhis.common.utils.HisPageUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.document.domain.DocStatistics;
-import com.openhis.document.mapper.DocStatisticsMapper;
-import com.openhis.document.service.IDocStatisticsService;
-import com.openhis.web.document.appservice.IDocStatisticsAppService;
-import com.openhis.web.document.dto.DocStatisticsDto;
-import com.openhis.web.document.dto.DocStatisticsQueryParam;
+import com.healthlink.his.common.enums.DocDefinitionEnum;
+import com.healthlink.his.common.utils.HisPageUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.document.domain.DocStatistics;
+import com.healthlink.his.document.mapper.DocStatisticsMapper;
+import com.healthlink.his.document.service.IDocStatisticsService;
+import com.healthlink.his.web.document.appservice.IDocStatisticsAppService;
+import com.healthlink.his.web.document.dto.DocStatisticsDto;
+import com.healthlink.his.web.document.dto.DocStatisticsQueryParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocStatisticsDefinitionAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/impl/DocStatisticsDefinitionAppServiceImpl.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocStatisticsDefinitionAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/impl/DocStatisticsDefinitionAppServiceImpl.java
index 40f0e389a..f396cf0cf 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocStatisticsDefinitionAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/impl/DocStatisticsDefinitionAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.document.appservice.impl;
+package com.healthlink.his.web.document.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -8,15 +8,15 @@ import com.core.common.core.domain.R;
 import com.core.common.core.domain.entity.SysDictData;
 import com.core.common.core.redis.RedisCache;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.common.utils.HisPageUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.document.domain.DocStatisticsDefinition;
-import com.openhis.document.mapper.DocStatisticsDefinitionMapper;
-import com.openhis.document.service.IDocStatisticsDefinitionService;
-import com.openhis.web.document.appservice.IDocStatisticsDefinitionAppService;
-import com.openhis.web.document.dto.DocStatisticsDefinitionDto;
-import com.openhis.web.document.dto.OptionDto;
-import com.openhis.web.document.mapper.DocStatisticsDefinitionAppMapper;
+import com.healthlink.his.common.utils.HisPageUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.document.domain.DocStatisticsDefinition;
+import com.healthlink.his.document.mapper.DocStatisticsDefinitionMapper;
+import com.healthlink.his.document.service.IDocStatisticsDefinitionService;
+import com.healthlink.his.web.document.appservice.IDocStatisticsDefinitionAppService;
+import com.healthlink.his.web.document.dto.DocStatisticsDefinitionDto;
+import com.healthlink.his.web.document.dto.OptionDto;
+import com.healthlink.his.web.document.mapper.DocStatisticsDefinitionAppMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocTemplateAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/impl/DocTemplateAppServiceImpl.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocTemplateAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/impl/DocTemplateAppServiceImpl.java
index e20b8a2e4..4c101dbb1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocTemplateAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/appservice/impl/DocTemplateAppServiceImpl.java
@@ -1,18 +1,18 @@
-package com.openhis.web.document.appservice.impl;
+package com.healthlink.his.web.document.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.SecurityUtils;
-import com.openhis.common.enums.DocUseRangeEnum;
-import com.openhis.common.utils.HisPageUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.document.domain.DocTemplate;
-import com.openhis.document.mapper.DocTemplateMapper;
-import com.openhis.document.service.IDocTemplateService;
-import com.openhis.web.document.appservice.IDocTemplateAppService;
-import com.openhis.web.document.dto.DocTemplateDto;
+import com.healthlink.his.common.enums.DocUseRangeEnum;
+import com.healthlink.his.common.utils.HisPageUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.document.domain.DocTemplate;
+import com.healthlink.his.document.mapper.DocTemplateMapper;
+import com.healthlink.his.document.service.IDocTemplateService;
+import com.healthlink.his.web.document.appservice.IDocTemplateAppService;
+import com.healthlink.his.web.document.dto.DocTemplateDto;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocDefinitionController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/controller/DocDefinitionController.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocDefinitionController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/controller/DocDefinitionController.java
index da031b303..cbeababa2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocDefinitionController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/controller/DocDefinitionController.java
@@ -1,13 +1,13 @@
-package com.openhis.web.document.controller;
+package com.healthlink.his.web.document.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.DocPermissionEnum;
-import com.openhis.common.enums.DocTypeEnum;
-import com.openhis.common.enums.DocUseRangeEnum;
-import com.openhis.web.document.appservice.IDocDefinitionAppService;
-import com.openhis.web.document.dto.DocDefinitionDto;
-import com.openhis.web.document.dto.DocDefinitonParam;
-import com.openhis.web.document.util.EnumUtil;
+import com.healthlink.his.common.enums.DocPermissionEnum;
+import com.healthlink.his.common.enums.DocTypeEnum;
+import com.healthlink.his.common.enums.DocUseRangeEnum;
+import com.healthlink.his.web.document.appservice.IDocDefinitionAppService;
+import com.healthlink.his.web.document.dto.DocDefinitionDto;
+import com.healthlink.his.web.document.dto.DocDefinitonParam;
+import com.healthlink.his.web.document.util.EnumUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocDefinitionOrganizationController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/controller/DocDefinitionOrganizationController.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocDefinitionOrganizationController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/controller/DocDefinitionOrganizationController.java
index 68ac45fa2..16e83ae6e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocDefinitionOrganizationController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/controller/DocDefinitionOrganizationController.java
@@ -1,8 +1,8 @@
-package com.openhis.web.document.controller;
+package com.healthlink.his.web.document.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.document.appservice.IDocDefinitionOrganizationAppService;
-import com.openhis.web.document.dto.DocDefinitionOrganizationDto;
+import com.healthlink.his.web.document.appservice.IDocDefinitionOrganizationAppService;
+import com.healthlink.his.web.document.dto.DocDefinitionOrganizationDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocRecordController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/controller/DocRecordController.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocRecordController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/controller/DocRecordController.java
index 16b0ff3bc..e0cac5b96 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocRecordController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/controller/DocRecordController.java
@@ -1,13 +1,13 @@
-package com.openhis.web.document.controller;
+package com.healthlink.his.web.document.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.DocStatusEnum;
-import com.openhis.common.enums.DocTypeEnum;
-import com.openhis.web.document.appservice.IDocRecordAppService;
-import com.openhis.web.document.dto.DocRecordDto;
-import com.openhis.web.document.dto.DocRecordPatientQueryParam;
-import com.openhis.web.document.dto.DocRecordQueryParam;
-import com.openhis.web.document.util.EnumUtil;
+import com.healthlink.his.common.enums.DocStatusEnum;
+import com.healthlink.his.common.enums.DocTypeEnum;
+import com.healthlink.his.web.document.appservice.IDocRecordAppService;
+import com.healthlink.his.web.document.dto.DocRecordDto;
+import com.healthlink.his.web.document.dto.DocRecordPatientQueryParam;
+import com.healthlink.his.web.document.dto.DocRecordQueryParam;
+import com.healthlink.his.web.document.util.EnumUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/controller/DocStatisticsController.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/controller/DocStatisticsController.java
index a19cca63e..55ed58442 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/controller/DocStatisticsController.java
@@ -1,9 +1,9 @@
-package com.openhis.web.document.controller;
+package com.healthlink.his.web.document.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.document.appservice.IDocStatisticsAppService;
-import com.openhis.web.document.dto.DocStatisticsDto;
-import com.openhis.web.document.dto.DocStatisticsQueryParam;
+import com.healthlink.his.web.document.appservice.IDocStatisticsAppService;
+import com.healthlink.his.web.document.dto.DocStatisticsDto;
+import com.healthlink.his.web.document.dto.DocStatisticsQueryParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsDefinitionController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/controller/DocStatisticsDefinitionController.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsDefinitionController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/controller/DocStatisticsDefinitionController.java
index 1f44ff7df..fe414a6b3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsDefinitionController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/controller/DocStatisticsDefinitionController.java
@@ -1,10 +1,10 @@
-package com.openhis.web.document.controller;
+package com.healthlink.his.web.document.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.DocStatisticsDefinitionTypeEnum;
-import com.openhis.web.document.appservice.IDocStatisticsDefinitionAppService;
-import com.openhis.web.document.dto.DocStatisticsDefinitionDto;
-import com.openhis.web.document.util.EnumUtil;
+import com.healthlink.his.common.enums.DocStatisticsDefinitionTypeEnum;
+import com.healthlink.his.web.document.appservice.IDocStatisticsDefinitionAppService;
+import com.healthlink.his.web.document.dto.DocStatisticsDefinitionDto;
+import com.healthlink.his.web.document.util.EnumUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocTemplateController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/controller/DocTemplateController.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocTemplateController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/controller/DocTemplateController.java
index 7bb5d646b..c2113e8c8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocTemplateController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/controller/DocTemplateController.java
@@ -1,11 +1,11 @@
-package com.openhis.web.document.controller;
+package com.healthlink.his.web.document.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.DocTypeEnum;
-import com.openhis.common.enums.DocUseRangeEnum;
-import com.openhis.web.document.appservice.IDocTemplateAppService;
-import com.openhis.web.document.dto.DocTemplateDto;
-import com.openhis.web.document.util.EnumUtil;
+import com.healthlink.his.common.enums.DocTypeEnum;
+import com.healthlink.his.common.enums.DocUseRangeEnum;
+import com.healthlink.his.web.document.appservice.IDocTemplateAppService;
+import com.healthlink.his.web.document.dto.DocTemplateDto;
+import com.healthlink.his.web.document.util.EnumUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DirectoryNode.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DirectoryNode.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DirectoryNode.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DirectoryNode.java
index 47d3c319f..f332afedc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DirectoryNode.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DirectoryNode.java
@@ -1,4 +1,4 @@
-package com.openhis.web.document.dto;
+package com.healthlink.his.web.document.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitionDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocDefinitionDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitionDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocDefinitionDto.java
index 42c771ad9..24be4f3b1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitionDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocDefinitionDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.document.dto;
+package com.healthlink.his.web.document.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitionOrganizationDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocDefinitionOrganizationDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitionOrganizationDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocDefinitionOrganizationDto.java
index c70c31849..94a9832dd 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitionOrganizationDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocDefinitionOrganizationDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.document.dto;
+package com.healthlink.his.web.document.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitonParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocDefinitonParam.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitonParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocDefinitonParam.java
index efce05ed3..f2e2e90bd 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitonParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocDefinitonParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.document.dto;
+package com.healthlink.his.web.document.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocRecordDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocRecordDto.java
index 6a199d7b7..9c0e2a125 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocRecordDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.document.dto;
+package com.healthlink.his.web.document.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordPatientDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocRecordPatientDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordPatientDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocRecordPatientDto.java
index 7ba689450..a239e096c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordPatientDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocRecordPatientDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.document.dto;
+package com.healthlink.his.web.document.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordPatientQueryParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocRecordPatientQueryParam.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordPatientQueryParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocRecordPatientQueryParam.java
index 51d67db85..ce619ebee 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordPatientQueryParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocRecordPatientQueryParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.document.dto;
+package com.healthlink.his.web.document.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordQueryParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocRecordQueryParam.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordQueryParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocRecordQueryParam.java
index 9b1b8b09d..b9983530b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordQueryParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocRecordQueryParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.document.dto;
+package com.healthlink.his.web.document.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocStatisticsDefinitionDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocStatisticsDefinitionDto.java
index 88be61c3b..ca5211bc6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocStatisticsDefinitionDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.document.dto;
+package com.healthlink.his.web.document.dto;
 
 import com.core.common.core.domain.entity.SysDictData;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionOptionDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocStatisticsDefinitionOptionDto.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionOptionDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocStatisticsDefinitionOptionDto.java
index 02d975e3d..f55620c2f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionOptionDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocStatisticsDefinitionOptionDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.document.dto;
+package com.healthlink.his.web.document.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionOptionList.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocStatisticsDefinitionOptionList.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionOptionList.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocStatisticsDefinitionOptionList.java
index f2089f728..c4f2b7379 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionOptionList.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocStatisticsDefinitionOptionList.java
@@ -1,4 +1,4 @@
-package com.openhis.web.document.dto;
+package com.healthlink.his.web.document.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocStatisticsDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocStatisticsDto.java
index 73895ef64..db1994141 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocStatisticsDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.document.dto;
+package com.healthlink.his.web.document.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsQueryParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocStatisticsQueryParam.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsQueryParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocStatisticsQueryParam.java
index 9db6c5552..5f61288d8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsQueryParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocStatisticsQueryParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.document.dto;
+package com.healthlink.his.web.document.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocTemplateDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocTemplateDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocTemplateDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocTemplateDto.java
index 414b99242..5ae6f4df2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocTemplateDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocTemplateDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.document.dto;
+package com.healthlink.his.web.document.dto;
 
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocTemplateQueryParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocTemplateQueryParam.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocTemplateQueryParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocTemplateQueryParam.java
index fc8e62159..5bbadc4c6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocTemplateQueryParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/DocTemplateQueryParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.document.dto;
+package com.healthlink.his.web.document.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/OptionDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/OptionDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/OptionDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/OptionDto.java
index dc3390db1..5d911498e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/OptionDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/OptionDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.document.dto;
+package com.healthlink.his.web.document.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/TrendChartsBig.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/TrendChartsBig.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/TrendChartsBig.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/TrendChartsBig.java
index 7aae14a72..0ce5be27b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/TrendChartsBig.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/TrendChartsBig.java
@@ -1,4 +1,4 @@
-package com.openhis.web.document.dto;
+package com.healthlink.his.web.document.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/TrendChartsOutput.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/TrendChartsOutput.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/TrendChartsOutput.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/TrendChartsOutput.java
index 2793ac251..14e192438 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/TrendChartsOutput.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/TrendChartsOutput.java
@@ -1,4 +1,4 @@
-package com.openhis.web.document.dto;
+package com.healthlink.his.web.document.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/TrendChartsSmall.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/TrendChartsSmall.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/TrendChartsSmall.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/TrendChartsSmall.java
index edd009214..945001c64 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/TrendChartsSmall.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/dto/TrendChartsSmall.java
@@ -1,4 +1,4 @@
-package com.openhis.web.document.dto;
+package com.healthlink.his.web.document.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocDefinitionAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/mapper/DocDefinitionAppMapper.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocDefinitionAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/mapper/DocDefinitionAppMapper.java
index e39632db4..5637c02aa 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocDefinitionAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/mapper/DocDefinitionAppMapper.java
@@ -1,6 +1,6 @@
-package com.openhis.web.document.mapper;
+package com.healthlink.his.web.document.mapper;
 
-import com.openhis.web.document.dto.DocDefinitionDto;
+import com.healthlink.his.web.document.dto.DocDefinitionDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocRecordAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/mapper/DocRecordAppMapper.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocRecordAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/mapper/DocRecordAppMapper.java
index 935968f16..66663235f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocRecordAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/mapper/DocRecordAppMapper.java
@@ -1,11 +1,11 @@
-package com.openhis.web.document.mapper;
+package com.healthlink.his.web.document.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.document.dto.DocRecordDto;
-import com.openhis.web.document.dto.DocRecordPatientDto;
+import com.healthlink.his.web.document.dto.DocRecordDto;
+import com.healthlink.his.web.document.dto.DocRecordPatientDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocStatisticsDefinitionAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/mapper/DocStatisticsDefinitionAppMapper.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocStatisticsDefinitionAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/mapper/DocStatisticsDefinitionAppMapper.java
index 029c0915f..8a5bea0b9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocStatisticsDefinitionAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/mapper/DocStatisticsDefinitionAppMapper.java
@@ -1,11 +1,11 @@
-package com.openhis.web.document.mapper;
+package com.healthlink.his.web.document.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.document.dto.DocStatisticsDefinitionDto;
-import com.openhis.web.document.dto.OptionDto;
+import com.healthlink.his.web.document.dto.DocStatisticsDefinitionDto;
+import com.healthlink.his.web.document.dto.OptionDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/ConvertToDocStatistics.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/util/ConvertToDocStatistics.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/ConvertToDocStatistics.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/util/ConvertToDocStatistics.java
index 99fa8cc0d..f1d19e234 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/ConvertToDocStatistics.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/util/ConvertToDocStatistics.java
@@ -1,14 +1,14 @@
-package com.openhis.web.document.util;
+package com.healthlink.his.web.document.util;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.core.common.utils.StringUtils;
-import com.openhis.common.enums.TemperatureChartEnum;
-import com.openhis.web.document.appservice.IDocStatisticsDefinitionAppService;
-import com.openhis.web.document.dto.DocRecordDto;
-import com.openhis.web.document.dto.DocStatisticsDefinitionDto;
-import com.openhis.web.document.dto.DocStatisticsDto;
+import com.healthlink.his.common.enums.TemperatureChartEnum;
+import com.healthlink.his.web.document.appservice.IDocStatisticsDefinitionAppService;
+import com.healthlink.his.web.document.dto.DocRecordDto;
+import com.healthlink.his.web.document.dto.DocStatisticsDefinitionDto;
+import com.healthlink.his.web.document.dto.DocStatisticsDto;
 import org.springframework.stereotype.Component;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/DocumentDirectoryProcessor.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/util/DocumentDirectoryProcessor.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/DocumentDirectoryProcessor.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/util/DocumentDirectoryProcessor.java
index 802963846..96471a54d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/DocumentDirectoryProcessor.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/util/DocumentDirectoryProcessor.java
@@ -1,11 +1,11 @@
-package com.openhis.web.document.util;
+package com.healthlink.his.web.document.util;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.openhis.common.enums.DocTypeEnum;
-import com.openhis.web.document.dto.DirectoryNode;
-import com.openhis.web.document.dto.DocDefinitionDto;
+import com.healthlink.his.common.enums.DocTypeEnum;
+import com.healthlink.his.web.document.dto.DirectoryNode;
+import com.healthlink.his.web.document.dto.DocDefinitionDto;
 
 import java.util.*;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/EnumUtil.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/util/EnumUtil.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/EnumUtil.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/util/EnumUtil.java
index c1ac3aaec..434e7c58e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/EnumUtil.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/util/EnumUtil.java
@@ -1,6 +1,6 @@
-package com.openhis.web.document.util;
+package com.healthlink.his.web.document.util;
 
-import com.openhis.common.enums.HisEnumInterface;
+import com.healthlink.his.common.enums.HisEnumInterface;
 
 import java.util.*;
 import java.util.stream.Collectors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/OperationDayCalculator.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/util/OperationDayCalculator.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/OperationDayCalculator.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/util/OperationDayCalculator.java
index 1f8e0c5ac..055b8a7a3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/OperationDayCalculator.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/util/OperationDayCalculator.java
@@ -1,4 +1,4 @@
-package com.openhis.web.document.util;
+package com.healthlink.his.web.document.util;
 
 import java.time.LocalDate;
 import java.time.temporal.ChronoUnit;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/PermissionProcessor.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/util/PermissionProcessor.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/PermissionProcessor.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/util/PermissionProcessor.java
index f1ca3e07e..bb3887f54 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/PermissionProcessor.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/document/util/PermissionProcessor.java
@@ -1,9 +1,9 @@
-package com.openhis.web.document.util;
+package com.healthlink.his.web.document.util;
 
 import com.core.common.core.domain.entity.SysRole;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.common.enums.DocPermissionEnum;
-import com.openhis.web.document.dto.DocDefinitionDto;
+import com.healthlink.his.common.enums.DocPermissionEnum;
+import com.healthlink.his.web.document.dto.DocDefinitionDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/dto/HomeStatisticsDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/dto/HomeStatisticsDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/dto/HomeStatisticsDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/dto/HomeStatisticsDto.java
index 9e8b35173..c64545078 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/dto/HomeStatisticsDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/dto/HomeStatisticsDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.dto;
+package com.healthlink.his.web.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/IBankPosCloudAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/appservice/IBankPosCloudAppService.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/IBankPosCloudAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/appservice/IBankPosCloudAppService.java
index 462e1b26d..fa5cf13b4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/IBankPosCloudAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/appservice/IBankPosCloudAppService.java
@@ -1,4 +1,4 @@
-package com.openhis.web.externalintegration.appservice;
+package com.healthlink.his.web.externalintegration.appservice;
 
 import com.core.common.core.domain.R;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/IFoodborneAcquisitionAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/appservice/IFoodborneAcquisitionAppService.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/IFoodborneAcquisitionAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/appservice/IFoodborneAcquisitionAppService.java
index e428537e5..3d1da4ebb 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/IFoodborneAcquisitionAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/appservice/IFoodborneAcquisitionAppService.java
@@ -1,4 +1,4 @@
-package com.openhis.web.externalintegration.appservice;
+package com.healthlink.his.web.externalintegration.appservice;
 
 import com.core.common.core.domain.R;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/impl/BankPosCloudAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/appservice/impl/BankPosCloudAppServiceImpl.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/impl/BankPosCloudAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/appservice/impl/BankPosCloudAppServiceImpl.java
index 4b20df2f6..21351b538 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/impl/BankPosCloudAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/appservice/impl/BankPosCloudAppServiceImpl.java
@@ -1,16 +1,16 @@
-package com.openhis.web.externalintegration.appservice.impl;
+package com.healthlink.his.web.externalintegration.appservice.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.core.common.core.domain.R;
 import com.core.common.enums.TenantOptionDict;
 import com.core.web.util.TenantOptionUtil;
-import com.openhis.web.externalintegration.appservice.IBankPosCloudAppService;
-import com.openhis.web.externalintegration.dto.BpcTransactionRequestDto;
-import com.openhis.web.externalintegration.dto.BpcTransactionResponseDto;
-import com.openhis.web.externalintegration.enums.BpcPayType;
-import com.openhis.web.externalintegration.enums.BpcTranType;
-import com.openhis.web.externalintegration.utils.BpcHttpUtil;
-import com.openhis.web.externalintegration.utils.BpcTraceNoGenerator;
+import com.healthlink.his.web.externalintegration.appservice.IBankPosCloudAppService;
+import com.healthlink.his.web.externalintegration.dto.BpcTransactionRequestDto;
+import com.healthlink.his.web.externalintegration.dto.BpcTransactionResponseDto;
+import com.healthlink.his.web.externalintegration.enums.BpcPayType;
+import com.healthlink.his.web.externalintegration.enums.BpcTranType;
+import com.healthlink.his.web.externalintegration.utils.BpcHttpUtil;
+import com.healthlink.his.web.externalintegration.utils.BpcTraceNoGenerator;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/impl/FoodborneAcquisitionAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/appservice/impl/FoodborneAcquisitionAppServiceImpl.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/impl/FoodborneAcquisitionAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/appservice/impl/FoodborneAcquisitionAppServiceImpl.java
index e39c7112d..1c980be91 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/impl/FoodborneAcquisitionAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/appservice/impl/FoodborneAcquisitionAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.externalintegration.appservice.impl;
+package com.healthlink.his.web.externalintegration.appservice.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -6,11 +6,11 @@ import com.core.common.core.domain.R;
 import com.core.common.enums.TenantOptionDict;
 import com.core.common.utils.StringUtils;
 import com.core.web.util.TenantOptionUtil;
-import com.openhis.common.enums.*;
-import com.openhis.common.utils.CommonUtil;
-import com.openhis.web.externalintegration.appservice.IFoodborneAcquisitionAppService;
-import com.openhis.web.externalintegration.dto.FaSimplediseaseAddNopwParam;
-import com.openhis.web.externalintegration.mapper.FoodborneAcquisitionAppMapper;
+import com.healthlink.his.common.enums.*;
+import com.healthlink.his.common.utils.CommonUtil;
+import com.healthlink.his.web.externalintegration.appservice.IFoodborneAcquisitionAppService;
+import com.healthlink.his.web.externalintegration.dto.FaSimplediseaseAddNopwParam;
+import com.healthlink.his.web.externalintegration.mapper.FoodborneAcquisitionAppMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.core5.http.ClassicHttpResponse;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/controller/FoodborneAcquisitionAppController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/controller/FoodborneAcquisitionAppController.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/controller/FoodborneAcquisitionAppController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/controller/FoodborneAcquisitionAppController.java
index 1f09f2560..30132fe63 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/controller/FoodborneAcquisitionAppController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/controller/FoodborneAcquisitionAppController.java
@@ -1,7 +1,7 @@
-package com.openhis.web.externalintegration.controller;
+package com.healthlink.his.web.externalintegration.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.externalintegration.appservice.IFoodborneAcquisitionAppService;
+import com.healthlink.his.web.externalintegration.appservice.IFoodborneAcquisitionAppService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcDataElementDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/dto/BpcDataElementDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcDataElementDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/dto/BpcDataElementDto.java
index 241bb6151..3d90c5e4c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcDataElementDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/dto/BpcDataElementDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.externalintegration.dto;
+package com.healthlink.his.web.externalintegration.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcPaymentScanNotifyDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/dto/BpcPaymentScanNotifyDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcPaymentScanNotifyDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/dto/BpcPaymentScanNotifyDto.java
index ffb9866a4..fb0301fd3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcPaymentScanNotifyDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/dto/BpcPaymentScanNotifyDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.externalintegration.dto;
+package com.healthlink.his.web.externalintegration.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcTransactionRequestDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/dto/BpcTransactionRequestDto.java
similarity index 99%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcTransactionRequestDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/dto/BpcTransactionRequestDto.java
index 46a4edd66..7464abaa5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcTransactionRequestDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/dto/BpcTransactionRequestDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.externalintegration.dto;
+package com.healthlink.his.web.externalintegration.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcTransactionResponseDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/dto/BpcTransactionResponseDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcTransactionResponseDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/dto/BpcTransactionResponseDto.java
index d37dbcfa0..f60e958a5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcTransactionResponseDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/dto/BpcTransactionResponseDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.externalintegration.dto;
+package com.healthlink.his.web.externalintegration.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/FaSimplediseaseAddNopwParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/dto/FaSimplediseaseAddNopwParam.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/FaSimplediseaseAddNopwParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/dto/FaSimplediseaseAddNopwParam.java
index 6a3ef9a78..d5e435257 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/FaSimplediseaseAddNopwParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/dto/FaSimplediseaseAddNopwParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.externalintegration.dto;
+package com.healthlink.his.web.externalintegration.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcPayType.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/enums/BpcPayType.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcPayType.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/enums/BpcPayType.java
index bfc9e2065..bb4bdfd92 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcPayType.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/enums/BpcPayType.java
@@ -1,4 +1,4 @@
-package com.openhis.web.externalintegration.enums;
+package com.healthlink.his.web.externalintegration.enums;
 
 /**
  * 【BPC】支付方式
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcPayerIdType.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/enums/BpcPayerIdType.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcPayerIdType.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/enums/BpcPayerIdType.java
index ef791b122..128563b8b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcPayerIdType.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/enums/BpcPayerIdType.java
@@ -1,4 +1,4 @@
-package com.openhis.web.externalintegration.enums;
+package com.healthlink.his.web.externalintegration.enums;
 
 /**
  * 【BPC】付款人身份证件类型
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcRealNameAuthFlag.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/enums/BpcRealNameAuthFlag.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcRealNameAuthFlag.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/enums/BpcRealNameAuthFlag.java
index 8e8a26d9a..8d53b70ff 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcRealNameAuthFlag.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/enums/BpcRealNameAuthFlag.java
@@ -1,4 +1,4 @@
-package com.openhis.web.externalintegration.enums;
+package com.healthlink.his.web.externalintegration.enums;
 
 /**
  * 【BPC】实名认证标志
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcRespType.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/enums/BpcRespType.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcRespType.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/enums/BpcRespType.java
index 0e6bdbb85..805dc4b2f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcRespType.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/enums/BpcRespType.java
@@ -1,4 +1,4 @@
-package com.openhis.web.externalintegration.enums;
+package com.healthlink.his.web.externalintegration.enums;
 
 /**
  * 【BPC】交易返回应答码
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcTranType.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/enums/BpcTranType.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcTranType.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/enums/BpcTranType.java
index f0ef13296..391c7728f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcTranType.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/enums/BpcTranType.java
@@ -1,4 +1,4 @@
-package com.openhis.web.externalintegration.enums;
+package com.healthlink.his.web.externalintegration.enums;
 
 /**
  * 【BPC】交易类型
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/mapper/FoodborneAcquisitionAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/mapper/FoodborneAcquisitionAppMapper.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/mapper/FoodborneAcquisitionAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/mapper/FoodborneAcquisitionAppMapper.java
index e5f91685c..dd501d40a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/mapper/FoodborneAcquisitionAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/mapper/FoodborneAcquisitionAppMapper.java
@@ -1,6 +1,6 @@
-package com.openhis.web.externalintegration.mapper;
+package com.healthlink.his.web.externalintegration.mapper;
 
-import com.openhis.web.externalintegration.dto.FaSimplediseaseAddNopwParam;
+import com.healthlink.his.web.externalintegration.dto.FaSimplediseaseAddNopwParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/utils/BpcHttpUtil.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/utils/BpcHttpUtil.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/utils/BpcHttpUtil.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/utils/BpcHttpUtil.java
index c290ac6ab..c477ea682 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/utils/BpcHttpUtil.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/utils/BpcHttpUtil.java
@@ -1,4 +1,4 @@
-package com.openhis.web.externalintegration.utils;
+package com.healthlink.his.web.externalintegration.utils;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/utils/BpcTraceNoGenerator.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/utils/BpcTraceNoGenerator.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/utils/BpcTraceNoGenerator.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/utils/BpcTraceNoGenerator.java
index ff7642119..d79283ffb 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/utils/BpcTraceNoGenerator.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/externalintegration/utils/BpcTraceNoGenerator.java
@@ -1,4 +1,4 @@
-package com.openhis.web.externalintegration.utils;
+package com.healthlink.his.web.externalintegration.utils;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/IAdvancePaymentManageAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/IAdvancePaymentManageAppService.java
similarity index 82%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/IAdvancePaymentManageAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/IAdvancePaymentManageAppService.java
index 9eb7b5572..4cf48361a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/IAdvancePaymentManageAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/IAdvancePaymentManageAppService.java
@@ -1,10 +1,10 @@
-package com.openhis.web.inhospitalcharge.appservice;
+package com.healthlink.his.web.inhospitalcharge.appservice;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.web.inhospitalcharge.dto.AdvancePaymentFlowRecordDto;
-import com.openhis.web.inhospitalcharge.dto.AdvancePaymentInAndOutDto;
-import com.openhis.web.inhospitalcharge.dto.AdvancePaymentInfoDto;
+import com.healthlink.his.web.inhospitalcharge.dto.AdvancePaymentFlowRecordDto;
+import com.healthlink.his.web.inhospitalcharge.dto.AdvancePaymentInAndOutDto;
+import com.healthlink.his.web.inhospitalcharge.dto.AdvancePaymentInfoDto;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/IInHospitalRegisterAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/IInHospitalRegisterAppService.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/IInHospitalRegisterAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/IInHospitalRegisterAppService.java
index 8a7e9c9c8..4ac9f5e04 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/IInHospitalRegisterAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/IInHospitalRegisterAppService.java
@@ -1,9 +1,9 @@
-package com.openhis.web.inhospitalcharge.appservice;
+package com.healthlink.his.web.inhospitalcharge.appservice;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.web.common.dto.LocationDto;
-import com.openhis.web.inhospitalcharge.dto.*;
+import com.healthlink.his.web.common.dto.LocationDto;
+import com.healthlink.his.web.inhospitalcharge.dto.*;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.HashMap;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/impl/AdvancePaymentManageAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/AdvancePaymentManageAppServiceImpl.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/impl/AdvancePaymentManageAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/AdvancePaymentManageAppServiceImpl.java
index c5f8cfce2..9dec4140e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/impl/AdvancePaymentManageAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/AdvancePaymentManageAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inhospitalcharge.appservice.impl;
+package com.healthlink.his.web.inhospitalcharge.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -8,23 +8,23 @@ import com.core.common.utils.AgeCalculatorUtil;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.Account;
-import com.openhis.administration.service.IAccountService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.*;
-import com.openhis.common.enums.ybenums.YbPayment;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.financial.domain.PaymentRecDetail;
-import com.openhis.financial.domain.PaymentReconciliation;
-import com.openhis.financial.service.IPaymentRecDetailService;
-import com.openhis.financial.service.IPaymentReconciliationService;
-import com.openhis.web.inhospitalcharge.appservice.IAdvancePaymentManageAppService;
-import com.openhis.web.inhospitalcharge.dto.AdvancePaymentFlowRecordDto;
-import com.openhis.web.inhospitalcharge.dto.AdvancePaymentInAndOutDto;
-import com.openhis.web.inhospitalcharge.dto.AdvancePaymentInfoDto;
-import com.openhis.web.inhospitalcharge.mapper.AdvancePaymentManageAppMapper;
+import com.healthlink.his.administration.domain.Account;
+import com.healthlink.his.administration.service.IAccountService;
+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.enums.ybenums.YbPayment;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.financial.domain.PaymentRecDetail;
+import com.healthlink.his.financial.domain.PaymentReconciliation;
+import com.healthlink.his.financial.service.IPaymentRecDetailService;
+import com.healthlink.his.financial.service.IPaymentReconciliationService;
+import com.healthlink.his.web.inhospitalcharge.appservice.IAdvancePaymentManageAppService;
+import com.healthlink.his.web.inhospitalcharge.dto.AdvancePaymentFlowRecordDto;
+import com.healthlink.his.web.inhospitalcharge.dto.AdvancePaymentInAndOutDto;
+import com.healthlink.his.web.inhospitalcharge.dto.AdvancePaymentInfoDto;
+import com.healthlink.his.web.inhospitalcharge.mapper.AdvancePaymentManageAppMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java
index f3d6438ca..f83f05090 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inhospitalcharge.appservice.impl;
+package com.healthlink.his.web.inhospitalcharge.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -8,28 +8,28 @@ import com.core.common.core.domain.R;
 import com.core.common.exception.ServiceException;
 import com.core.common.utils.*;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.administration.domain.*;
-import com.openhis.administration.service.*;
-import com.openhis.clinical.domain.Condition;
-import com.openhis.clinical.service.IConditionService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.*;
-import com.openhis.common.enums.ybenums.YbIptDiseTypeCode;
-import com.openhis.common.enums.ybenums.YbPayment;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.financial.domain.PaymentRecDetail;
-import com.openhis.financial.domain.PaymentReconciliation;
-import com.openhis.financial.service.IPaymentRecDetailService;
-import com.openhis.financial.service.IPaymentReconciliationService;
-import com.openhis.web.common.dto.LocationDto;
-import com.openhis.web.inhospitalcharge.appservice.IInHospitalRegisterAppService;
-import com.openhis.web.inhospitalcharge.dto.*;
-import com.openhis.web.inhospitalcharge.mapper.InHospitalRegisterAppMapper;
-import com.openhis.web.patientmanage.appservice.IPatientInformationService;
-import com.openhis.web.patientmanage.dto.PatientBaseInfoDto;
-import com.openhis.yb.service.YbManager;
+import com.healthlink.his.administration.domain.*;
+import com.healthlink.his.administration.service.*;
+import com.healthlink.his.clinical.domain.Condition;
+import com.healthlink.his.clinical.service.IConditionService;
+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.enums.ybenums.YbIptDiseTypeCode;
+import com.healthlink.his.common.enums.ybenums.YbPayment;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.financial.domain.PaymentRecDetail;
+import com.healthlink.his.financial.domain.PaymentReconciliation;
+import com.healthlink.his.financial.service.IPaymentRecDetailService;
+import com.healthlink.his.financial.service.IPaymentReconciliationService;
+import com.healthlink.his.web.common.dto.LocationDto;
+import com.healthlink.his.web.inhospitalcharge.appservice.IInHospitalRegisterAppService;
+import com.healthlink.his.web.inhospitalcharge.dto.*;
+import com.healthlink.his.web.inhospitalcharge.mapper.InHospitalRegisterAppMapper;
+import com.healthlink.his.web.patientmanage.appservice.IPatientInformationService;
+import com.healthlink.his.web.patientmanage.dto.PatientBaseInfoDto;
+import com.healthlink.his.yb.service.YbManager;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/controller/AdvancePaymentManageController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/controller/AdvancePaymentManageController.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/controller/AdvancePaymentManageController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/controller/AdvancePaymentManageController.java
index 139909bb3..802217ef3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/controller/AdvancePaymentManageController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/controller/AdvancePaymentManageController.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inhospitalcharge.controller;
+package com.healthlink.his.web.inhospitalcharge.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inhospitalcharge.appservice.IAdvancePaymentManageAppService;
-import com.openhis.web.inhospitalcharge.dto.AdvancePaymentInAndOutDto;
-import com.openhis.web.inhospitalcharge.dto.AdvancePaymentInfoDto;
+import com.healthlink.his.web.inhospitalcharge.appservice.IAdvancePaymentManageAppService;
+import com.healthlink.his.web.inhospitalcharge.dto.AdvancePaymentInAndOutDto;
+import com.healthlink.his.web.inhospitalcharge.dto.AdvancePaymentInfoDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/controller/InHospitalRegisterController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/controller/InHospitalRegisterController.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/controller/InHospitalRegisterController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/controller/InHospitalRegisterController.java
index 021ee1a39..d48b0aa93 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/controller/InHospitalRegisterController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/controller/InHospitalRegisterController.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inhospitalcharge.controller;
+package com.healthlink.his.web.inhospitalcharge.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inhospitalcharge.appservice.IInHospitalRegisterAppService;
-import com.openhis.web.inhospitalcharge.dto.*;
+import com.healthlink.his.web.inhospitalcharge.appservice.IInHospitalRegisterAppService;
+import com.healthlink.his.web.inhospitalcharge.dto.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentFlowRecordDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/AdvancePaymentFlowRecordDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentFlowRecordDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/AdvancePaymentFlowRecordDto.java
index 1a1b760c6..aaf5e5b8b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentFlowRecordDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/AdvancePaymentFlowRecordDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inhospitalcharge.dto;
+package com.healthlink.his.web.inhospitalcharge.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentInAndOutDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/AdvancePaymentInAndOutDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentInAndOutDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/AdvancePaymentInAndOutDto.java
index 2c67315ec..8e135d772 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentInAndOutDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/AdvancePaymentInAndOutDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inhospitalcharge.dto;
+package com.healthlink.his.web.inhospitalcharge.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/AdvancePaymentInfoDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/AdvancePaymentInfoDto.java
index c3daf27cd..7172656a3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/AdvancePaymentInfoDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inhospitalcharge.dto;
+package com.healthlink.his.web.inhospitalcharge.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/InHospitalInfoDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/InHospitalInfoDto.java
index 1a397c632..0a3767be4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/InHospitalInfoDto.java
@@ -1,9 +1,9 @@
-package com.openhis.web.inhospitalcharge.dto;
+package com.healthlink.his.web.inhospitalcharge.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;
 import org.springframework.format.annotation.DateTimeFormat;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalPatientInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/InHospitalPatientInfoDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalPatientInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/InHospitalPatientInfoDto.java
index e0e64117f..0d5a536a9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalPatientInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/InHospitalPatientInfoDto.java
@@ -1,9 +1,9 @@
-package com.openhis.web.inhospitalcharge.dto;
+package com.healthlink.his.web.inhospitalcharge.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;
 import org.springframework.format.annotation.DateTimeFormat;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalRegisterDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/InHospitalRegisterDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalRegisterDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/InHospitalRegisterDto.java
index 6e2d39cae..2f5852fb3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalRegisterDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/InHospitalRegisterDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inhospitalcharge.dto;
+package com.healthlink.his.web.inhospitalcharge.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalRegisterQueryDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/InHospitalRegisterQueryDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalRegisterQueryDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/InHospitalRegisterQueryDto.java
index a8aac2aa3..20d7faf09 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalRegisterQueryDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/InHospitalRegisterQueryDto.java
@@ -1,9 +1,9 @@
-package com.openhis.web.inhospitalcharge.dto;
+package com.healthlink.his.web.inhospitalcharge.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;
 import org.springframework.format.annotation.DateTimeFormat;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/NoFilesRegisterDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/NoFilesRegisterDto.java
similarity index 72%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/NoFilesRegisterDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/NoFilesRegisterDto.java
index 3e5968ed4..86ed30649 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/NoFilesRegisterDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/NoFilesRegisterDto.java
@@ -1,6 +1,6 @@
-package com.openhis.web.inhospitalcharge.dto;
+package com.healthlink.his.web.inhospitalcharge.dto;
 
-import com.openhis.web.patientmanage.dto.PatientBaseInfoDto;
+import com.healthlink.his.web.patientmanage.dto.PatientBaseInfoDto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/PatientUpdateDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/PatientUpdateDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/PatientUpdateDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/PatientUpdateDto.java
index 2f9a24c01..8f8ee90a5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/PatientUpdateDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/PatientUpdateDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inhospitalcharge.dto;
+package com.healthlink.his.web.inhospitalcharge.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/mapper/AdvancePaymentManageAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/mapper/AdvancePaymentManageAppMapper.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/mapper/AdvancePaymentManageAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/mapper/AdvancePaymentManageAppMapper.java
index 27ed85dbb..aea1f9d3b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/mapper/AdvancePaymentManageAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/mapper/AdvancePaymentManageAppMapper.java
@@ -1,11 +1,11 @@
-package com.openhis.web.inhospitalcharge.mapper;
+package com.healthlink.his.web.inhospitalcharge.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.inhospitalcharge.dto.AdvancePaymentFlowRecordDto;
-import com.openhis.web.inhospitalcharge.dto.AdvancePaymentInfoDto;
+import com.healthlink.his.web.inhospitalcharge.dto.AdvancePaymentFlowRecordDto;
+import com.healthlink.his.web.inhospitalcharge.dto.AdvancePaymentInfoDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/mapper/InHospitalRegisterAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/mapper/InHospitalRegisterAppMapper.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/mapper/InHospitalRegisterAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/mapper/InHospitalRegisterAppMapper.java
index 0d3de8cb7..387e1d9cc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/mapper/InHospitalRegisterAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/mapper/InHospitalRegisterAppMapper.java
@@ -1,13 +1,13 @@
-package com.openhis.web.inhospitalcharge.mapper;
+package com.healthlink.his.web.inhospitalcharge.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.administration.domain.Location;
-import com.openhis.web.inhospitalcharge.dto.InHospitalInfoDto;
-import com.openhis.web.inhospitalcharge.dto.InHospitalPatientInfoDto;
-import com.openhis.web.inhospitalcharge.dto.InHospitalRegisterQueryDto;
+import com.healthlink.his.administration.domain.Location;
+import com.healthlink.his.web.inhospitalcharge.dto.InHospitalInfoDto;
+import com.healthlink.his.web.inhospitalcharge.dto.InHospitalPatientInfoDto;
+import com.healthlink.his.web.inhospitalcharge.dto.InHospitalRegisterQueryDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IATDManageAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/IATDManageAppService.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IATDManageAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/IATDManageAppService.java
index 12b141043..3b14df260 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IATDManageAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/IATDManageAppService.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inhospitalnursestation.appservice;
+package com.healthlink.his.web.inhospitalnursestation.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inhospitalnursestation.dto.AdmissionPageParam;
-import com.openhis.web.inhospitalnursestation.dto.AdmissionPatientInfoDto;
-import com.openhis.web.inhospitalnursestation.dto.InpatientAdviceParam;
+import com.healthlink.his.web.inhospitalnursestation.dto.AdmissionPageParam;
+import com.healthlink.his.web.inhospitalnursestation.dto.AdmissionPatientInfoDto;
+import com.healthlink.his.web.inhospitalnursestation.dto.InpatientAdviceParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IAdviceProcessAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/IAdviceProcessAppService.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IAdviceProcessAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/IAdviceProcessAppService.java
index 25549d5fb..6535d9800 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IAdviceProcessAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/IAdviceProcessAppService.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inhospitalnursestation.appservice;
+package com.healthlink.his.web.inhospitalnursestation.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.common.dto.PerformInfoDto;
-import com.openhis.web.inhospitalnursestation.dto.AdmissionPageParam;
-import com.openhis.web.inhospitalnursestation.dto.AdviceExecuteParam;
-import com.openhis.web.inhospitalnursestation.dto.InpatientAdviceParam;
+import com.healthlink.his.web.common.dto.PerformInfoDto;
+import com.healthlink.his.web.inhospitalnursestation.dto.AdmissionPageParam;
+import com.healthlink.his.web.inhospitalnursestation.dto.AdviceExecuteParam;
+import com.healthlink.his.web.inhospitalnursestation.dto.InpatientAdviceParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IEncounterAutoRollAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/IEncounterAutoRollAppService.java
similarity index 80%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IEncounterAutoRollAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/IEncounterAutoRollAppService.java
index a5b166bce..9b1bea5f8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IEncounterAutoRollAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/IEncounterAutoRollAppService.java
@@ -1,10 +1,10 @@
-package com.openhis.web.inhospitalnursestation.appservice;
+package com.healthlink.his.web.inhospitalnursestation.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inhospitalnursestation.dto.AutoRollSourceDto;
-import com.openhis.web.inhospitalnursestation.dto.EncounterAutoRollQueryDto;
-import com.openhis.web.inhospitalnursestation.dto.EncounterAutoRollSaveDto;
-import com.openhis.web.inhospitalnursestation.dto.InBedPatientInfoDto;
+import com.healthlink.his.web.inhospitalnursestation.dto.AutoRollSourceDto;
+import com.healthlink.his.web.inhospitalnursestation.dto.EncounterAutoRollQueryDto;
+import com.healthlink.his.web.inhospitalnursestation.dto.EncounterAutoRollSaveDto;
+import com.healthlink.his.web.inhospitalnursestation.dto.InBedPatientInfoDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IMedicineSummaryAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/IMedicineSummaryAppService.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IMedicineSummaryAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/IMedicineSummaryAppService.java
index 9772e3e75..d07cb96c6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IMedicineSummaryAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/IMedicineSummaryAppService.java
@@ -1,8 +1,8 @@
-package com.openhis.web.inhospitalnursestation.appservice;
+package com.healthlink.his.web.inhospitalnursestation.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inhospitalnursestation.dto.DispenseFormSearchParam;
-import com.openhis.web.inhospitalnursestation.dto.MedicineSummaryParam;
+import com.healthlink.his.web.inhospitalnursestation.dto.DispenseFormSearchParam;
+import com.healthlink.his.web.inhospitalnursestation.dto.MedicineSummaryParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/INurseBillingAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/INurseBillingAppService.java
similarity index 83%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/INurseBillingAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/INurseBillingAppService.java
index 89b74b9d4..88f0e22a4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/INurseBillingAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/INurseBillingAppService.java
@@ -1,10 +1,10 @@
-package com.openhis.web.inhospitalnursestation.appservice;
+package com.healthlink.his.web.inhospitalnursestation.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.administration.dto.CostDetailSearchParam;
-import com.openhis.web.inhospitalnursestation.dto.InpatientAdviceParam;
-import com.openhis.web.regdoctorstation.dto.AdviceBatchOpParam;
-import com.openhis.web.regdoctorstation.dto.RegAdviceSaveParam;
+import com.healthlink.his.administration.dto.CostDetailSearchParam;
+import com.healthlink.his.web.inhospitalnursestation.dto.InpatientAdviceParam;
+import com.healthlink.his.web.regdoctorstation.dto.AdviceBatchOpParam;
+import com.healthlink.his.web.regdoctorstation.dto.RegAdviceSaveParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IOrgDeviceStockTakeAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/IOrgDeviceStockTakeAppService.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IOrgDeviceStockTakeAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/IOrgDeviceStockTakeAppService.java
index c2288bead..2a1a265e8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IOrgDeviceStockTakeAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/IOrgDeviceStockTakeAppService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.inhospitalnursestation.appservice;
+package com.healthlink.his.web.inhospitalnursestation.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inhospitalnursestation.dto.OrgDeviceSummaryParam;
+import com.healthlink.his.web.inhospitalnursestation.dto.OrgDeviceSummaryParam;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import jakarta.servlet.http.HttpServletRequest;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/ATDManageAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/ATDManageAppServiceImpl.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/ATDManageAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/ATDManageAppServiceImpl.java
index 8481f7a44..1220b336c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/ATDManageAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/ATDManageAppServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inhospitalnursestation.appservice.impl;
+package com.healthlink.his.web.inhospitalnursestation.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -12,36 +12,36 @@ import com.core.common.utils.AgeCalculatorUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
-import com.openhis.administration.domain.Encounter;
-import com.openhis.administration.domain.EncounterLocation;
-import com.openhis.administration.domain.EncounterParticipant;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.service.IEncounterLocationService;
-import com.openhis.administration.service.IEncounterParticipantService;
-import com.openhis.administration.service.IEncounterService;
-import com.openhis.administration.service.ILocationService;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.*;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.document.domain.DocStatistics;
-import com.openhis.document.domain.OrderProcess;
-import com.openhis.document.mapper.DocStatisticsMapper;
-import com.openhis.document.service.IOrderProcessService;
-import com.openhis.medication.domain.MedicationDispense;
-import com.openhis.medication.domain.MedicationRequest;
-import com.openhis.medication.service.IMedicationDispenseService;
-import com.openhis.medication.service.IMedicationRequestService;
-import com.openhis.web.document.appservice.IDocStatisticsAppService;
-import com.openhis.web.document.appservice.IDocStatisticsDefinitionAppService;
-import com.openhis.web.document.dto.DocStatisticsDefinitionDto;
-import com.openhis.web.document.dto.DocStatisticsDto;
-import com.openhis.web.inhospitalnursestation.appservice.IATDManageAppService;
-import com.openhis.web.inhospitalnursestation.dto.*;
-import com.openhis.web.inhospitalnursestation.mapper.ATDManageAppMapper;
-import com.openhis.workflow.domain.ServiceRequest;
-import com.openhis.workflow.service.IServiceRequestService;
+import com.healthlink.his.administration.domain.Encounter;
+import com.healthlink.his.administration.domain.EncounterLocation;
+import com.healthlink.his.administration.domain.EncounterParticipant;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.service.IEncounterLocationService;
+import com.healthlink.his.administration.service.IEncounterParticipantService;
+import com.healthlink.his.administration.service.IEncounterService;
+import com.healthlink.his.administration.service.ILocationService;
+import com.healthlink.his.administration.service.IPractitionerService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.enums.*;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.document.domain.DocStatistics;
+import com.healthlink.his.document.domain.OrderProcess;
+import com.healthlink.his.document.mapper.DocStatisticsMapper;
+import com.healthlink.his.document.service.IOrderProcessService;
+import com.healthlink.his.medication.domain.MedicationDispense;
+import com.healthlink.his.medication.domain.MedicationRequest;
+import com.healthlink.his.medication.service.IMedicationDispenseService;
+import com.healthlink.his.medication.service.IMedicationRequestService;
+import com.healthlink.his.web.document.appservice.IDocStatisticsAppService;
+import com.healthlink.his.web.document.appservice.IDocStatisticsDefinitionAppService;
+import com.healthlink.his.web.document.dto.DocStatisticsDefinitionDto;
+import com.healthlink.his.web.document.dto.DocStatisticsDto;
+import com.healthlink.his.web.inhospitalnursestation.appservice.IATDManageAppService;
+import com.healthlink.his.web.inhospitalnursestation.dto.*;
+import com.healthlink.his.web.inhospitalnursestation.mapper.ATDManageAppMapper;
+import com.healthlink.his.workflow.domain.ServiceRequest;
+import com.healthlink.his.workflow.service.IServiceRequestService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java
index cb94a1a05..5cde3e46a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inhospitalnursestation.appservice.impl;
+package com.healthlink.his.web.inhospitalnursestation.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -14,39 +14,39 @@ import com.core.common.exception.ServiceException;
 import com.core.common.utils.*;
 import com.core.common.utils.bean.BeanUtils;
 import com.core.web.util.TenantOptionUtil;
-import com.openhis.administration.domain.ChargeItem;
-import com.openhis.administration.service.IChargeItemService;
-import com.openhis.administration.service.IEncounterService;
-import com.openhis.clinical.domain.Procedure;
-import com.openhis.clinical.service.IProcedureService;
-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.medication.domain.MedicationDefinition;
-import com.openhis.medication.domain.MedicationDispense;
-import com.openhis.medication.domain.MedicationRequest;
-import com.openhis.medication.service.IMedicationDefinitionService;
-import com.openhis.medication.service.IMedicationDispenseService;
-import com.openhis.medication.service.IMedicationRequestService;
-import com.openhis.web.common.dto.PerformInfoDto;
-import com.openhis.web.common.dto.PerformRecordDto;
-import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService;
-import com.openhis.web.doctorstation.dto.ActivityBindDeviceDetailDto;
-import com.openhis.web.doctorstation.dto.AdviceBaseDto;
-import com.openhis.web.doctorstation.dto.AdviceInventoryDto;
-import com.openhis.web.doctorstation.dto.AdvicePriceDto;
-import com.openhis.web.doctorstation.mapper.DoctorStationAdviceAppMapper;
-import com.openhis.web.doctorstation.utils.AdviceUtils;
-import com.openhis.web.inhospitalnursestation.appservice.IAdviceProcessAppService;
-import com.openhis.web.inhospitalnursestation.dto.*;
-import com.openhis.web.inhospitalnursestation.mapper.AdviceProcessAppMapper;
-import com.openhis.web.outpatientmanage.mapper.OutpatientTreatmentAppMapper;
-import com.openhis.workflow.domain.DeviceDispense;
-import com.openhis.workflow.domain.DeviceRequest;
-import com.openhis.workflow.domain.ServiceRequest;
-import com.openhis.workflow.service.*;
+import com.healthlink.his.administration.domain.ChargeItem;
+import com.healthlink.his.administration.service.IChargeItemService;
+import com.healthlink.his.administration.service.IEncounterService;
+import com.healthlink.his.clinical.domain.Procedure;
+import com.healthlink.his.clinical.service.IProcedureService;
+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.medication.domain.MedicationDefinition;
+import com.healthlink.his.medication.domain.MedicationDispense;
+import com.healthlink.his.medication.domain.MedicationRequest;
+import com.healthlink.his.medication.service.IMedicationDefinitionService;
+import com.healthlink.his.medication.service.IMedicationDispenseService;
+import com.healthlink.his.medication.service.IMedicationRequestService;
+import com.healthlink.his.web.common.dto.PerformInfoDto;
+import com.healthlink.his.web.common.dto.PerformRecordDto;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationAdviceAppService;
+import com.healthlink.his.web.doctorstation.dto.ActivityBindDeviceDetailDto;
+import com.healthlink.his.web.doctorstation.dto.AdviceBaseDto;
+import com.healthlink.his.web.doctorstation.dto.AdviceInventoryDto;
+import com.healthlink.his.web.doctorstation.dto.AdvicePriceDto;
+import com.healthlink.his.web.doctorstation.mapper.DoctorStationAdviceAppMapper;
+import com.healthlink.his.web.doctorstation.utils.AdviceUtils;
+import com.healthlink.his.web.inhospitalnursestation.appservice.IAdviceProcessAppService;
+import com.healthlink.his.web.inhospitalnursestation.dto.*;
+import com.healthlink.his.web.inhospitalnursestation.mapper.AdviceProcessAppMapper;
+import com.healthlink.his.web.outpatientmanage.mapper.OutpatientTreatmentAppMapper;
+import com.healthlink.his.workflow.domain.DeviceDispense;
+import com.healthlink.his.workflow.domain.DeviceRequest;
+import com.healthlink.his.workflow.domain.ServiceRequest;
+import com.healthlink.his.workflow.service.*;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/EncounterAutoRollAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/EncounterAutoRollAppServiceImpl.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/EncounterAutoRollAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/EncounterAutoRollAppServiceImpl.java
index d9c9bf638..bcc556fa3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/EncounterAutoRollAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/EncounterAutoRollAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inhospitalnursestation.appservice.impl;
+package com.healthlink.his.web.inhospitalnursestation.appservice.impl;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -8,20 +8,20 @@ import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.ChargeItem;
-import com.openhis.administration.service.IChargeItemService;
-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.template.domain.EncounterAutoRoll;
-import com.openhis.template.service.IEncounterAutoRollService;
-import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService;
-import com.openhis.web.doctorstation.dto.AdviceBaseDto;
-import com.openhis.web.doctorstation.dto.AdvicePriceDto;
-import com.openhis.web.inhospitalnursestation.appservice.IEncounterAutoRollAppService;
-import com.openhis.web.inhospitalnursestation.dto.*;
-import com.openhis.web.inhospitalnursestation.mapper.EncounterAutoRollAppMapper;
+import com.healthlink.his.administration.domain.ChargeItem;
+import com.healthlink.his.administration.service.IChargeItemService;
+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.template.domain.EncounterAutoRoll;
+import com.healthlink.his.template.service.IEncounterAutoRollService;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationAdviceAppService;
+import com.healthlink.his.web.doctorstation.dto.AdviceBaseDto;
+import com.healthlink.his.web.doctorstation.dto.AdvicePriceDto;
+import com.healthlink.his.web.inhospitalnursestation.appservice.IEncounterAutoRollAppService;
+import com.healthlink.his.web.inhospitalnursestation.dto.*;
+import com.healthlink.his.web.inhospitalnursestation.mapper.EncounterAutoRollAppMapper;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java
index 0c6cf3418..7fc827e38 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java
@@ -1,30 +1,30 @@
-package com.openhis.web.inhospitalnursestation.appservice.impl;
+package com.healthlink.his.web.inhospitalnursestation.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.exception.ServiceException;
 import com.core.common.utils.*;
-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.medication.domain.MedicationDefinition;
-import com.openhis.medication.domain.MedicationDispense;
-import com.openhis.medication.service.IMedicationDefinitionService;
-import com.openhis.medication.service.IMedicationDispenseService;
-import com.openhis.web.inhospitalnursestation.appservice.IMedicineSummaryAppService;
-import com.openhis.web.inhospitalnursestation.dto.DispenseFormSearchParam;
-import com.openhis.web.inhospitalnursestation.dto.MedicineDispenseFormDto;
-import com.openhis.web.inhospitalnursestation.dto.MedicineSummaryFormDto;
-import com.openhis.web.inhospitalnursestation.dto.MedicineSummaryParam;
-import com.openhis.web.inhospitalnursestation.mapper.MedicineSummaryAppMapper;
-import com.openhis.web.pharmacymanage.dto.DispenseInitDto;
-import com.openhis.web.pharmacymanage.dto.DispenseStatusOption;
-import com.openhis.web.pharmacymanage.mapper.ReturnMedicineMapper;
-import com.openhis.workflow.service.ISupplyDeliveryService;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.medication.domain.MedicationDefinition;
+import com.healthlink.his.medication.domain.MedicationDispense;
+import com.healthlink.his.medication.service.IMedicationDefinitionService;
+import com.healthlink.his.medication.service.IMedicationDispenseService;
+import com.healthlink.his.web.inhospitalnursestation.appservice.IMedicineSummaryAppService;
+import com.healthlink.his.web.inhospitalnursestation.dto.DispenseFormSearchParam;
+import com.healthlink.his.web.inhospitalnursestation.dto.MedicineDispenseFormDto;
+import com.healthlink.his.web.inhospitalnursestation.dto.MedicineSummaryFormDto;
+import com.healthlink.his.web.inhospitalnursestation.dto.MedicineSummaryParam;
+import com.healthlink.his.web.inhospitalnursestation.mapper.MedicineSummaryAppMapper;
+import com.healthlink.his.web.pharmacymanage.dto.DispenseInitDto;
+import com.healthlink.his.web.pharmacymanage.dto.DispenseStatusOption;
+import com.healthlink.his.web.pharmacymanage.mapper.ReturnMedicineMapper;
+import com.healthlink.his.workflow.service.ISupplyDeliveryService;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/NurseBillingAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/NurseBillingAppService.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/NurseBillingAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/NurseBillingAppService.java
index c6f9a93b5..a003b5bf6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/NurseBillingAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/NurseBillingAppService.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inhospitalnursestation.appservice.impl;
+package com.healthlink.his.web.inhospitalnursestation.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,36 +7,36 @@ import com.core.common.core.domain.model.LoginUser;
 import com.core.common.exception.NonCaptureException;
 import com.core.common.exception.ServiceException;
 import com.core.common.utils.*;
-import com.openhis.administration.domain.ChargeItem;
-import com.openhis.administration.dto.CostDetailDto;
-import com.openhis.administration.dto.CostDetailSearchParam;
-import com.openhis.administration.service.IChargeItemService;
-import com.openhis.administration.service.IOrganizationService;
-import com.openhis.clinical.domain.Procedure;
-import com.openhis.clinical.service.IProcedureService;
-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.web.doctorstation.dto.ActivityChildrenJsonParams;
-import com.openhis.web.doctorstation.dto.AdviceSaveDto;
-import com.openhis.web.doctorstation.utils.AdviceUtils;
-import com.openhis.web.inhospitalnursestation.appservice.INurseBillingAppService;
-import com.openhis.web.inhospitalnursestation.dto.CostDetailExcelOutDto;
-import com.openhis.web.inhospitalnursestation.dto.InpatientAdviceDto;
-import com.openhis.web.inhospitalnursestation.dto.InpatientAdviceParam;
-import com.openhis.web.inhospitalnursestation.mapper.NurseBillingAppMapper;
-import com.openhis.web.regdoctorstation.dto.AdviceBatchOpParam;
-import com.openhis.web.regdoctorstation.dto.RegAdviceSaveDto;
-import com.openhis.web.regdoctorstation.dto.RegAdviceSaveParam;
-import com.openhis.workflow.domain.ActivityDefinition;
-import com.openhis.workflow.domain.DeviceRequest;
-import com.openhis.workflow.domain.ServiceRequest;
-import com.openhis.workflow.service.IActivityDefinitionService;
-import com.openhis.workflow.service.IDeviceDispenseService;
-import com.openhis.workflow.service.IDeviceRequestService;
-import com.openhis.workflow.service.IServiceRequestService;
+import com.healthlink.his.administration.domain.ChargeItem;
+import com.healthlink.his.administration.dto.CostDetailDto;
+import com.healthlink.his.administration.dto.CostDetailSearchParam;
+import com.healthlink.his.administration.service.IChargeItemService;
+import com.healthlink.his.administration.service.IOrganizationService;
+import com.healthlink.his.clinical.domain.Procedure;
+import com.healthlink.his.clinical.service.IProcedureService;
+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.web.doctorstation.dto.ActivityChildrenJsonParams;
+import com.healthlink.his.web.doctorstation.dto.AdviceSaveDto;
+import com.healthlink.his.web.doctorstation.utils.AdviceUtils;
+import com.healthlink.his.web.inhospitalnursestation.appservice.INurseBillingAppService;
+import com.healthlink.his.web.inhospitalnursestation.dto.CostDetailExcelOutDto;
+import com.healthlink.his.web.inhospitalnursestation.dto.InpatientAdviceDto;
+import com.healthlink.his.web.inhospitalnursestation.dto.InpatientAdviceParam;
+import com.healthlink.his.web.inhospitalnursestation.mapper.NurseBillingAppMapper;
+import com.healthlink.his.web.regdoctorstation.dto.AdviceBatchOpParam;
+import com.healthlink.his.web.regdoctorstation.dto.RegAdviceSaveDto;
+import com.healthlink.his.web.regdoctorstation.dto.RegAdviceSaveParam;
+import com.healthlink.his.workflow.domain.ActivityDefinition;
+import com.healthlink.his.workflow.domain.DeviceRequest;
+import com.healthlink.his.workflow.domain.ServiceRequest;
+import com.healthlink.his.workflow.service.IActivityDefinitionService;
+import com.healthlink.his.workflow.service.IDeviceDispenseService;
+import com.healthlink.his.workflow.service.IDeviceRequestService;
+import com.healthlink.his.workflow.service.IServiceRequestService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/OrgDeviceStockTakeAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/OrgDeviceStockTakeAppServiceImpl.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/OrgDeviceStockTakeAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/OrgDeviceStockTakeAppServiceImpl.java
index 1fba739e9..a40817bcb 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/OrgDeviceStockTakeAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/OrgDeviceStockTakeAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inhospitalnursestation.appservice.impl;
+package com.healthlink.his.web.inhospitalnursestation.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,23 +7,23 @@ import com.core.common.exception.ServiceException;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.*;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.common.appservice.impl.CommonServiceImpl;
-import com.openhis.web.common.dto.LocationDto;
-import com.openhis.web.common.dto.UnitDto;
-import com.openhis.web.inhospitalnursestation.appservice.IOrgDeviceStockTakeAppService;
-import com.openhis.web.inhospitalnursestation.dto.OrgDeviceDto;
-import com.openhis.web.inhospitalnursestation.dto.OrgDeviceSummaryFromDto;
-import com.openhis.web.inhospitalnursestation.dto.OrgDeviceSummaryParam;
-import com.openhis.web.inhospitalnursestation.mapper.OrgDeviceStockTakeAppMapper;
-import com.openhis.workflow.domain.InventoryItem;
-import com.openhis.workflow.mapper.InventoryItemMapper;
-import com.openhis.workflow.service.IDeviceDispenseService;
-import com.openhis.workflow.service.IInventoryItemService;
-import com.openhis.workflow.service.ISupplyDeliveryService;
-import com.openhis.workflow.service.ISupplyRequestService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.enums.*;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.common.appservice.impl.CommonServiceImpl;
+import com.healthlink.his.web.common.dto.LocationDto;
+import com.healthlink.his.web.common.dto.UnitDto;
+import com.healthlink.his.web.inhospitalnursestation.appservice.IOrgDeviceStockTakeAppService;
+import com.healthlink.his.web.inhospitalnursestation.dto.OrgDeviceDto;
+import com.healthlink.his.web.inhospitalnursestation.dto.OrgDeviceSummaryFromDto;
+import com.healthlink.his.web.inhospitalnursestation.dto.OrgDeviceSummaryParam;
+import com.healthlink.his.web.inhospitalnursestation.mapper.OrgDeviceStockTakeAppMapper;
+import com.healthlink.his.workflow.domain.InventoryItem;
+import com.healthlink.his.workflow.mapper.InventoryItemMapper;
+import com.healthlink.his.workflow.service.IDeviceDispenseService;
+import com.healthlink.his.workflow.service.IInventoryItemService;
+import com.healthlink.his.workflow.service.ISupplyDeliveryService;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/ATDManageController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/controller/ATDManageController.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/ATDManageController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/controller/ATDManageController.java
index 62bd6b661..b96551b7e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/ATDManageController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/controller/ATDManageController.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inhospitalnursestation.controller;
+package com.healthlink.his.web.inhospitalnursestation.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inhospitalnursestation.appservice.IATDManageAppService;
-import com.openhis.web.inhospitalnursestation.dto.AdmissionPageParam;
-import com.openhis.web.inhospitalnursestation.dto.AdmissionPatientInfoDto;
-import com.openhis.web.inhospitalnursestation.dto.InpatientAdviceParam;
+import com.healthlink.his.web.inhospitalnursestation.appservice.IATDManageAppService;
+import com.healthlink.his.web.inhospitalnursestation.dto.AdmissionPageParam;
+import com.healthlink.his.web.inhospitalnursestation.dto.AdmissionPatientInfoDto;
+import com.healthlink.his.web.inhospitalnursestation.dto.InpatientAdviceParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/AdviceProcessController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/controller/AdviceProcessController.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/AdviceProcessController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/controller/AdviceProcessController.java
index dd5b68400..81af46739 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/AdviceProcessController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/controller/AdviceProcessController.java
@@ -1,14 +1,14 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inhospitalnursestation.controller;
+package com.healthlink.his.web.inhospitalnursestation.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.common.dto.PerformInfoDto;
-import com.openhis.web.inhospitalnursestation.appservice.IAdviceProcessAppService;
-import com.openhis.web.inhospitalnursestation.dto.AdmissionPageParam;
-import com.openhis.web.inhospitalnursestation.dto.AdviceExecuteParam;
-import com.openhis.web.inhospitalnursestation.dto.InpatientAdviceParam;
+import com.healthlink.his.web.common.dto.PerformInfoDto;
+import com.healthlink.his.web.inhospitalnursestation.appservice.IAdviceProcessAppService;
+import com.healthlink.his.web.inhospitalnursestation.dto.AdmissionPageParam;
+import com.healthlink.his.web.inhospitalnursestation.dto.AdviceExecuteParam;
+import com.healthlink.his.web.inhospitalnursestation.dto.InpatientAdviceParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/EncounterAutoRollAppController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/controller/EncounterAutoRollAppController.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/EncounterAutoRollAppController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/controller/EncounterAutoRollAppController.java
index 56007b601..daf65c9cd 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/EncounterAutoRollAppController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/controller/EncounterAutoRollAppController.java
@@ -1,9 +1,9 @@
-package com.openhis.web.inhospitalnursestation.controller;
+package com.healthlink.his.web.inhospitalnursestation.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.PublicationStatus;
-import com.openhis.web.inhospitalnursestation.appservice.IEncounterAutoRollAppService;
-import com.openhis.web.inhospitalnursestation.dto.EncounterAutoRollSaveDto;
+import com.healthlink.his.common.enums.PublicationStatus;
+import com.healthlink.his.web.inhospitalnursestation.appservice.IEncounterAutoRollAppService;
+import com.healthlink.his.web.inhospitalnursestation.dto.EncounterAutoRollSaveDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/MedicineSummaryController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/controller/MedicineSummaryController.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/MedicineSummaryController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/controller/MedicineSummaryController.java
index 875197d3f..8f2d99f27 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/MedicineSummaryController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/controller/MedicineSummaryController.java
@@ -1,9 +1,9 @@
-package com.openhis.web.inhospitalnursestation.controller;
+package com.healthlink.his.web.inhospitalnursestation.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inhospitalnursestation.appservice.IMedicineSummaryAppService;
-import com.openhis.web.inhospitalnursestation.dto.DispenseFormSearchParam;
-import com.openhis.web.inhospitalnursestation.dto.MedicineSummaryParam;
+import com.healthlink.his.web.inhospitalnursestation.appservice.IMedicineSummaryAppService;
+import com.healthlink.his.web.inhospitalnursestation.dto.DispenseFormSearchParam;
+import com.healthlink.his.web.inhospitalnursestation.dto.MedicineSummaryParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/NurseBillingController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/controller/NurseBillingController.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/NurseBillingController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/controller/NurseBillingController.java
index 447c493cd..bcab465a6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/NurseBillingController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/controller/NurseBillingController.java
@@ -1,11 +1,11 @@
-package com.openhis.web.inhospitalnursestation.controller;
+package com.healthlink.his.web.inhospitalnursestation.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.administration.dto.CostDetailSearchParam;
-import com.openhis.web.inhospitalnursestation.appservice.INurseBillingAppService;
-import com.openhis.web.inhospitalnursestation.dto.InpatientAdviceParam;
-import com.openhis.web.regdoctorstation.dto.AdviceBatchOpParam;
-import com.openhis.web.regdoctorstation.dto.RegAdviceSaveParam;
+import com.healthlink.his.administration.dto.CostDetailSearchParam;
+import com.healthlink.his.web.inhospitalnursestation.appservice.INurseBillingAppService;
+import com.healthlink.his.web.inhospitalnursestation.dto.InpatientAdviceParam;
+import com.healthlink.his.web.regdoctorstation.dto.AdviceBatchOpParam;
+import com.healthlink.his.web.regdoctorstation.dto.RegAdviceSaveParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.format.annotation.DateTimeFormat;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/OrgDeviceStockTakeController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/controller/OrgDeviceStockTakeController.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/OrgDeviceStockTakeController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/controller/OrgDeviceStockTakeController.java
index 2e7275e92..330a2855c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/OrgDeviceStockTakeController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/controller/OrgDeviceStockTakeController.java
@@ -1,8 +1,8 @@
-package com.openhis.web.inhospitalnursestation.controller;
+package com.healthlink.his.web.inhospitalnursestation.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inhospitalnursestation.appservice.IOrgDeviceStockTakeAppService;
-import com.openhis.web.inhospitalnursestation.dto.OrgDeviceSummaryParam;
+import com.healthlink.his.web.inhospitalnursestation.appservice.IOrgDeviceStockTakeAppService;
+import com.healthlink.his.web.inhospitalnursestation.dto.OrgDeviceSummaryParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/ATDManageInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/ATDManageInitDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/ATDManageInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/ATDManageInitDto.java
index 8ed681fbc..db14a0951 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/ATDManageInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/ATDManageInitDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inhospitalnursestation.dto;
+package com.healthlink.his.web.inhospitalnursestation.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionBedPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/AdmissionBedPageDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionBedPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/AdmissionBedPageDto.java
index 74c2a35d9..9f4238e06 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionBedPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/AdmissionBedPageDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inhospitalnursestation.dto;
+package com.healthlink.his.web.inhospitalnursestation.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPageParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/AdmissionPageParam.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPageParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/AdmissionPageParam.java
index 344f2064e..e3846c502 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPageParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/AdmissionPageParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inhospitalnursestation.dto;
+package com.healthlink.his.web.inhospitalnursestation.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPatientInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/AdmissionPatientInfoDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPatientInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/AdmissionPatientInfoDto.java
index 00fc40fe1..81eb694b8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPatientInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/AdmissionPatientInfoDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inhospitalnursestation.dto;
+package com.healthlink.his.web.inhospitalnursestation.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPatientPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/AdmissionPatientPageDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPatientPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/AdmissionPatientPageDto.java
index 06f54293c..ee3c3c724 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPatientPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/AdmissionPatientPageDto.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inhospitalnursestation.dto;
+package com.healthlink.his.web.inhospitalnursestation.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdviceExecuteDetailParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/AdviceExecuteDetailParam.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdviceExecuteDetailParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/AdviceExecuteDetailParam.java
index 1100c39cf..096f2311d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdviceExecuteDetailParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/AdviceExecuteDetailParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inhospitalnursestation.dto;
+package com.healthlink.his.web.inhospitalnursestation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdviceExecuteParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/AdviceExecuteParam.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdviceExecuteParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/AdviceExecuteParam.java
index 9a163adec..3f316b1f2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdviceExecuteParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/AdviceExecuteParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inhospitalnursestation.dto;
+package com.healthlink.his.web.inhospitalnursestation.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AutoRollBasicServiceDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/AutoRollBasicServiceDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AutoRollBasicServiceDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/AutoRollBasicServiceDto.java
index a42a25f26..fd57220d1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AutoRollBasicServiceDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/AutoRollBasicServiceDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inhospitalnursestation.dto;
+package com.healthlink.his.web.inhospitalnursestation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AutoRollNursingDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/AutoRollNursingDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AutoRollNursingDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/AutoRollNursingDto.java
index a2748fcb4..93dc211ed 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AutoRollNursingDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/AutoRollNursingDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inhospitalnursestation.dto;
+package com.healthlink.his.web.inhospitalnursestation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AutoRollSourceDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/AutoRollSourceDto.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AutoRollSourceDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/AutoRollSourceDto.java
index 605e90721..d064de30d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AutoRollSourceDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/AutoRollSourceDto.java
@@ -1,8 +1,8 @@
-package com.openhis.web.inhospitalnursestation.dto;
+package com.healthlink.his.web.inhospitalnursestation.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/CostDetailExcelOutDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/CostDetailExcelOutDto.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/CostDetailExcelOutDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/CostDetailExcelOutDto.java
index de7c12eb2..cd7ccab99 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/CostDetailExcelOutDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/CostDetailExcelOutDto.java
@@ -1,7 +1,7 @@
-package com.openhis.web.inhospitalnursestation.dto;
+package com.healthlink.his.web.inhospitalnursestation.dto;
 
 import com.core.common.annotation.Excel;
-import com.openhis.administration.dto.CostDetailDto;
+import com.healthlink.his.administration.dto.CostDetailDto;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/DispenseFormSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/DispenseFormSearchParam.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/DispenseFormSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/DispenseFormSearchParam.java
index 18b0d04ee..b7c7add8e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/DispenseFormSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/DispenseFormSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inhospitalnursestation.dto;
+package com.healthlink.his.web.inhospitalnursestation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/EncounterAccountDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/EncounterAccountDto.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/EncounterAccountDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/EncounterAccountDto.java
index 356d0ba52..dff38ed1d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/EncounterAccountDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/EncounterAccountDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inhospitalnursestation.dto;
+package com.healthlink.his.web.inhospitalnursestation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/EncounterAutoRollQueryDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/EncounterAutoRollQueryDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/EncounterAutoRollQueryDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/EncounterAutoRollQueryDto.java
index e1c4f1f91..86c7ba7cb 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/EncounterAutoRollQueryDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/EncounterAutoRollQueryDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inhospitalnursestation.dto;
+package com.healthlink.his.web.inhospitalnursestation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/EncounterAutoRollSaveDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/EncounterAutoRollSaveDto.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/EncounterAutoRollSaveDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/EncounterAutoRollSaveDto.java
index 128b09f95..697744596 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/EncounterAutoRollSaveDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/EncounterAutoRollSaveDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inhospitalnursestation.dto;
+package com.healthlink.his.web.inhospitalnursestation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InBedPatientInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/InBedPatientInfoDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InBedPatientInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/InBedPatientInfoDto.java
index e9e427a49..8abbc42f0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InBedPatientInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/InBedPatientInfoDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inhospitalnursestation.dto;
+package com.healthlink.his.web.inhospitalnursestation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/InpatientAdviceDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/InpatientAdviceDto.java
index bcb4fa5ce..1d4565be8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/InpatientAdviceDto.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inhospitalnursestation.dto;
+package com.healthlink.his.web.inhospitalnursestation.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.openhis.web.common.dto.PerformRecordDto;
+import com.healthlink.his.common.annotation.Dict;
+import com.healthlink.his.web.common.dto.PerformRecordDto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/InpatientAdviceParam.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/InpatientAdviceParam.java
index 115d1d4fc..f42a7fadf 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/InpatientAdviceParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inhospitalnursestation.dto;
+package com.healthlink.his.web.inhospitalnursestation.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicationRequestUseExe.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/MedicationRequestUseExe.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicationRequestUseExe.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/MedicationRequestUseExe.java
index d7ef09652..4618de807 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicationRequestUseExe.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/MedicationRequestUseExe.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inhospitalnursestation.dto;
+package com.healthlink.his.web.inhospitalnursestation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.medication.domain.MedicationRequest;
+import com.healthlink.his.medication.domain.MedicationRequest;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineDispenseFormDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/MedicineDispenseFormDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineDispenseFormDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/MedicineDispenseFormDto.java
index 926cdc770..67a52225b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineDispenseFormDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/MedicineDispenseFormDto.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inhospitalnursestation.dto;
+package com.healthlink.his.web.inhospitalnursestation.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryFormDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/MedicineSummaryFormDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryFormDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/MedicineSummaryFormDto.java
index 7b2c036ab..6362fe2a6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryFormDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/MedicineSummaryFormDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inhospitalnursestation.dto;
+package com.healthlink.his.web.inhospitalnursestation.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/MedicineSummaryInfoDto.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/MedicineSummaryInfoDto.java
index f87f3dc5e..c5f8ffb2c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/MedicineSummaryInfoDto.java
@@ -1,9 +1,9 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inhospitalnursestation.dto;
+package com.healthlink.his.web.inhospitalnursestation.dto;
 
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/MedicineSummaryParam.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/MedicineSummaryParam.java
index dc973ee4c..e7da45dd0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/MedicineSummaryParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inhospitalnursestation.dto;
+package com.healthlink.his.web.inhospitalnursestation.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/OrgDeviceDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/OrgDeviceDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/OrgDeviceDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/OrgDeviceDto.java
index aa041dabd..866a2930e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/OrgDeviceDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/OrgDeviceDto.java
@@ -1,8 +1,8 @@
-package com.openhis.web.inhospitalnursestation.dto;
+package com.healthlink.his.web.inhospitalnursestation.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/OrgDeviceSummaryFromDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/OrgDeviceSummaryFromDto.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/OrgDeviceSummaryFromDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/OrgDeviceSummaryFromDto.java
index 1ec942eab..846ecf421 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/OrgDeviceSummaryFromDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/OrgDeviceSummaryFromDto.java
@@ -1,9 +1,9 @@
-package com.openhis.web.inhospitalnursestation.dto;
+package com.healthlink.his.web.inhospitalnursestation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.common.annotation.Dict;
-import com.openhis.web.common.dto.UnitDto;
+import com.healthlink.his.common.annotation.Dict;
+import com.healthlink.his.web.common.dto.UnitDto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/OrgDeviceSummaryParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/OrgDeviceSummaryParam.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/OrgDeviceSummaryParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/OrgDeviceSummaryParam.java
index 4ba3ec1cd..6e224a893 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/OrgDeviceSummaryParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/OrgDeviceSummaryParam.java
@@ -1,8 +1,8 @@
-package com.openhis.web.inhospitalnursestation.dto;
+package com.healthlink.his.web.inhospitalnursestation.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/PendingMedicationDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/PendingMedicationDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/PendingMedicationDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/PendingMedicationDto.java
index b04a440b6..0de6db3bf 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/PendingMedicationDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/PendingMedicationDto.java
@@ -1,8 +1,8 @@
-package com.openhis.web.inhospitalnursestation.dto;
+package com.healthlink.his.web.inhospitalnursestation.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/ServiceRequestUseExe.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/ServiceRequestUseExe.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/ServiceRequestUseExe.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/ServiceRequestUseExe.java
index cb59be9ca..bea413697 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/ServiceRequestUseExe.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/dto/ServiceRequestUseExe.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inhospitalnursestation.dto;
+package com.healthlink.his.web.inhospitalnursestation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.workflow.domain.ServiceRequest;
+import com.healthlink.his.workflow.domain.ServiceRequest;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/ATDManageAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/mapper/ATDManageAppMapper.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/ATDManageAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/mapper/ATDManageAppMapper.java
index 1c7284608..3c285acc8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/ATDManageAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/mapper/ATDManageAppMapper.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inhospitalnursestation.mapper;
+package com.healthlink.his.web.inhospitalnursestation.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.common.dto.PerformRecordDto;
-import com.openhis.web.inhospitalnursestation.dto.*;
+import com.healthlink.his.web.common.dto.PerformRecordDto;
+import com.healthlink.his.web.inhospitalnursestation.dto.*;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/AdviceProcessAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/mapper/AdviceProcessAppMapper.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/AdviceProcessAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/mapper/AdviceProcessAppMapper.java
index 95dd6bb3d..591433890 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/AdviceProcessAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/mapper/AdviceProcessAppMapper.java
@@ -1,15 +1,15 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inhospitalnursestation.mapper;
+package com.healthlink.his.web.inhospitalnursestation.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.inhospitalnursestation.dto.AdmissionPageParam;
-import com.openhis.web.inhospitalnursestation.dto.AdmissionPatientPageDto;
-import com.openhis.web.inhospitalnursestation.dto.InpatientAdviceDto;
-import com.openhis.web.inhospitalnursestation.dto.InpatientAdviceParam;
+import com.healthlink.his.web.inhospitalnursestation.dto.AdmissionPageParam;
+import com.healthlink.his.web.inhospitalnursestation.dto.AdmissionPatientPageDto;
+import com.healthlink.his.web.inhospitalnursestation.dto.InpatientAdviceDto;
+import com.healthlink.his.web.inhospitalnursestation.dto.InpatientAdviceParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/EncounterAutoRollAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/mapper/EncounterAutoRollAppMapper.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/EncounterAutoRollAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/mapper/EncounterAutoRollAppMapper.java
index 24fb94469..537544170 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/EncounterAutoRollAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/mapper/EncounterAutoRollAppMapper.java
@@ -1,9 +1,9 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inhospitalnursestation.mapper;
+package com.healthlink.his.web.inhospitalnursestation.mapper;
 
-import com.openhis.web.inhospitalnursestation.dto.*;
+import com.healthlink.his.web.inhospitalnursestation.dto.*;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/MedicineSummaryAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/mapper/MedicineSummaryAppMapper.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/MedicineSummaryAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/mapper/MedicineSummaryAppMapper.java
index 2c6601136..4ea00c58c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/MedicineSummaryAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/mapper/MedicineSummaryAppMapper.java
@@ -1,15 +1,15 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inhospitalnursestation.mapper;
+package com.healthlink.his.web.inhospitalnursestation.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.inhospitalnursestation.dto.DispenseFormSearchParam;
-import com.openhis.web.inhospitalnursestation.dto.MedicineDispenseFormDto;
-import com.openhis.web.inhospitalnursestation.dto.MedicineSummaryFormDto;
-import com.openhis.web.inhospitalnursestation.dto.MedicineSummaryInfoDto;
+import com.healthlink.his.web.inhospitalnursestation.dto.DispenseFormSearchParam;
+import com.healthlink.his.web.inhospitalnursestation.dto.MedicineDispenseFormDto;
+import com.healthlink.his.web.inhospitalnursestation.dto.MedicineSummaryFormDto;
+import com.healthlink.his.web.inhospitalnursestation.dto.MedicineSummaryInfoDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/NurseBillingAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/mapper/NurseBillingAppMapper.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/NurseBillingAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/mapper/NurseBillingAppMapper.java
index 15b200cb7..b1691d371 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/NurseBillingAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/mapper/NurseBillingAppMapper.java
@@ -1,10 +1,10 @@
-package com.openhis.web.inhospitalnursestation.mapper;
+package com.healthlink.his.web.inhospitalnursestation.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.inhospitalnursestation.dto.InpatientAdviceDto;
-import com.openhis.web.inhospitalnursestation.dto.InpatientAdviceParam;
+import com.healthlink.his.web.inhospitalnursestation.dto.InpatientAdviceDto;
+import com.healthlink.his.web.inhospitalnursestation.dto.InpatientAdviceParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/OrgDeviceStockTakeAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/mapper/OrgDeviceStockTakeAppMapper.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/OrgDeviceStockTakeAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/mapper/OrgDeviceStockTakeAppMapper.java
index 2ba52deba..d69ada953 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/OrgDeviceStockTakeAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/mapper/OrgDeviceStockTakeAppMapper.java
@@ -1,9 +1,9 @@
-package com.openhis.web.inhospitalnursestation.mapper;
+package com.healthlink.his.web.inhospitalnursestation.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.inhospitalnursestation.dto.OrgDeviceDto;
+import com.healthlink.his.web.inhospitalnursestation.dto.OrgDeviceDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IDepositAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/IDepositAppService.java
similarity index 83%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IDepositAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/IDepositAppService.java
index 1752e6e87..828af7199 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IDepositAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/IDepositAppService.java
@@ -1,8 +1,8 @@
-package com.openhis.web.inpatientmanage.appservice;
+package com.healthlink.his.web.inpatientmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inpatientmanage.dto.DepositSearchParam;
-import com.openhis.yb.dto.PaymentDto;
+import com.healthlink.his.web.inpatientmanage.dto.DepositSearchParam;
+import com.healthlink.his.yb.dto.PaymentDto;
 
 import jakarta.servlet.http.HttpServletRequest;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/INursingRecordAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/INursingRecordAppService.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/INursingRecordAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/INursingRecordAppService.java
index 84aaae879..1fb00ba35 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/INursingRecordAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/INursingRecordAppService.java
@@ -1,9 +1,9 @@
-package com.openhis.web.inpatientmanage.appservice;
+package com.healthlink.his.web.inpatientmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inpatientmanage.dto.NursingEmrTemplateDto;
-import com.openhis.web.inpatientmanage.dto.NursingRecordDto;
-import com.openhis.web.inpatientmanage.dto.NursingSearchParam;
+import com.healthlink.his.web.inpatientmanage.dto.NursingEmrTemplateDto;
+import com.healthlink.his.web.inpatientmanage.dto.NursingRecordDto;
+import com.healthlink.his.web.inpatientmanage.dto.NursingSearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IPatientHomeAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/IPatientHomeAppService.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IPatientHomeAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/IPatientHomeAppService.java
index 3d5e663a0..d91424d84 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IPatientHomeAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/IPatientHomeAppService.java
@@ -1,8 +1,8 @@
-package com.openhis.web.inpatientmanage.appservice;
+package com.healthlink.his.web.inpatientmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.chargemanage.dto.OrgMetadata;
-import com.openhis.web.inpatientmanage.dto.PatientHomeSearchParam;
+import com.healthlink.his.web.chargemanage.dto.OrgMetadata;
+import com.healthlink.his.web.inpatientmanage.dto.PatientHomeSearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.Date;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IVitalSignsAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/IVitalSignsAppService.java
similarity index 78%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IVitalSignsAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/IVitalSignsAppService.java
index 74382ca6a..1a1848ee3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IVitalSignsAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/IVitalSignsAppService.java
@@ -1,9 +1,9 @@
-package com.openhis.web.inpatientmanage.appservice;
+package com.healthlink.his.web.inpatientmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inpatientmanage.dto.VitalSignsDeleteDto;
-import com.openhis.web.inpatientmanage.dto.VitalSignsSaveDto;
-import com.openhis.web.inpatientmanage.dto.VitalSignsSearchParam;
+import com.healthlink.his.web.inpatientmanage.dto.VitalSignsDeleteDto;
+import com.healthlink.his.web.inpatientmanage.dto.VitalSignsSaveDto;
+import com.healthlink.his.web.inpatientmanage.dto.VitalSignsSearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/DepositAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/impl/DepositAppServiceImpl.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/DepositAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/impl/DepositAppServiceImpl.java
index e49873aa2..3ae13d943 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/DepositAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/impl/DepositAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inpatientmanage.appservice.impl;
+package com.healthlink.his.web.inpatientmanage.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -11,29 +11,29 @@ import com.core.common.utils.AgeCalculatorUtil;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.Account;
-import com.openhis.administration.domain.Encounter;
-import com.openhis.administration.domain.Invoice;
-import com.openhis.administration.service.IAccountService;
-import com.openhis.administration.service.IEncounterService;
-import com.openhis.administration.service.IInvoiceService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.*;
-import com.openhis.common.enums.ybenums.YbPayment;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.financial.domain.PaymentRecDetail;
-import com.openhis.financial.domain.PaymentReconciliation;
-import com.openhis.financial.service.IPaymentRecDetailService;
-import com.openhis.financial.service.IPaymentReconciliationService;
-import com.openhis.web.inpatientmanage.appservice.IDepositAppService;
-import com.openhis.web.inpatientmanage.dto.DepositDetailDto;
-import com.openhis.web.inpatientmanage.dto.DepositInitPageDto;
-import com.openhis.web.inpatientmanage.dto.DepositSearchParam;
-import com.openhis.web.inpatientmanage.mapper.DepositMapper;
-import com.openhis.yb.dto.PaymentDetailDto;
-import com.openhis.yb.dto.PaymentDto;
+import com.healthlink.his.administration.domain.Account;
+import com.healthlink.his.administration.domain.Encounter;
+import com.healthlink.his.administration.domain.Invoice;
+import com.healthlink.his.administration.service.IAccountService;
+import com.healthlink.his.administration.service.IEncounterService;
+import com.healthlink.his.administration.service.IInvoiceService;
+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.enums.ybenums.YbPayment;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.financial.domain.PaymentRecDetail;
+import com.healthlink.his.financial.domain.PaymentReconciliation;
+import com.healthlink.his.financial.service.IPaymentRecDetailService;
+import com.healthlink.his.financial.service.IPaymentReconciliationService;
+import com.healthlink.his.web.inpatientmanage.appservice.IDepositAppService;
+import com.healthlink.his.web.inpatientmanage.dto.DepositDetailDto;
+import com.healthlink.his.web.inpatientmanage.dto.DepositInitPageDto;
+import com.healthlink.his.web.inpatientmanage.dto.DepositSearchParam;
+import com.healthlink.his.web.inpatientmanage.mapper.DepositMapper;
+import com.healthlink.his.yb.dto.PaymentDetailDto;
+import com.healthlink.his.yb.dto.PaymentDto;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/NursingRecordAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/impl/NursingRecordAppServiceImpl.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/NursingRecordAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/impl/NursingRecordAppServiceImpl.java
index 64c2279a9..20a0800b9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/NursingRecordAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/impl/NursingRecordAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inpatientmanage.appservice.impl;
+package com.healthlink.his.web.inpatientmanage.appservice.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -9,25 +9,25 @@ import com.core.common.core.domain.R;
 import com.core.common.utils.AgeCalculatorUtil;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.AdministrativeGender;
-import com.openhis.common.enums.EncounterActivityStatus;
-import com.openhis.common.enums.EncounterClass;
-import com.openhis.common.enums.LocationForm;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.document.domain.Emr;
-import com.openhis.document.domain.EmrTemplate;
-import com.openhis.document.domain.VitalSigns;
-import com.openhis.document.service.IEmrService;
-import com.openhis.document.service.IEmrTemplateService;
-import com.openhis.document.service.IVitalSignsService;
-import com.openhis.web.inpatientmanage.appservice.INursingRecordAppService;
-import com.openhis.web.inpatientmanage.dto.*;
-import com.openhis.web.inpatientmanage.mapper.NursingRecordAppMapper;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.service.IPractitionerService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.AdministrativeGender;
+import com.healthlink.his.common.enums.EncounterActivityStatus;
+import com.healthlink.his.common.enums.EncounterClass;
+import com.healthlink.his.common.enums.LocationForm;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.document.domain.Emr;
+import com.healthlink.his.document.domain.EmrTemplate;
+import com.healthlink.his.document.domain.VitalSigns;
+import com.healthlink.his.document.service.IEmrService;
+import com.healthlink.his.document.service.IEmrTemplateService;
+import com.healthlink.his.document.service.IVitalSignsService;
+import com.healthlink.his.web.inpatientmanage.appservice.INursingRecordAppService;
+import com.healthlink.his.web.inpatientmanage.dto.*;
+import com.healthlink.his.web.inpatientmanage.mapper.NursingRecordAppMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/PatientHomeAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/impl/PatientHomeAppServiceImpl.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/PatientHomeAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/impl/PatientHomeAppServiceImpl.java
index f1c283a33..d4662e183 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/PatientHomeAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/impl/PatientHomeAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inpatientmanage.appservice.impl;
+package com.healthlink.his.web.inpatientmanage.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,23 +7,23 @@ import com.core.common.core.domain.R;
 import com.core.common.utils.AgeCalculatorUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.administration.domain.Encounter;
-import com.openhis.administration.domain.EncounterLocation;
-import com.openhis.administration.domain.Organization;
-import com.openhis.administration.service.IEncounterLocationService;
-import com.openhis.administration.service.IEncounterService;
-import com.openhis.administration.service.ILocationService;
-import com.openhis.administration.service.IOrganizationService;
-import com.openhis.common.enums.*;
-import com.openhis.common.enums.ybenums.PriorityType;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.chargemanage.dto.OrgMetadata;
-import com.openhis.web.inpatientmanage.appservice.IPatientHomeAppService;
-import com.openhis.web.inpatientmanage.dto.PatientHomeDto;
-import com.openhis.web.inpatientmanage.dto.PatientHomeEmptyBedDto;
-import com.openhis.web.inpatientmanage.dto.PatientHomeSearchParam;
-import com.openhis.web.inpatientmanage.mapper.PatientHomeAppMapper;
+import com.healthlink.his.administration.domain.Encounter;
+import com.healthlink.his.administration.domain.EncounterLocation;
+import com.healthlink.his.administration.domain.Organization;
+import com.healthlink.his.administration.service.IEncounterLocationService;
+import com.healthlink.his.administration.service.IEncounterService;
+import com.healthlink.his.administration.service.ILocationService;
+import com.healthlink.his.administration.service.IOrganizationService;
+import com.healthlink.his.common.enums.*;
+import com.healthlink.his.common.enums.ybenums.PriorityType;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.chargemanage.dto.OrgMetadata;
+import com.healthlink.his.web.inpatientmanage.appservice.IPatientHomeAppService;
+import com.healthlink.his.web.inpatientmanage.dto.PatientHomeDto;
+import com.healthlink.his.web.inpatientmanage.dto.PatientHomeEmptyBedDto;
+import com.healthlink.his.web.inpatientmanage.dto.PatientHomeSearchParam;
+import com.healthlink.his.web.inpatientmanage.mapper.PatientHomeAppMapper;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/VitalSignsAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/impl/VitalSignsAppServiceImpl.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/VitalSignsAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/impl/VitalSignsAppServiceImpl.java
index 5fd6e1a93..4cab12121 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/VitalSignsAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/impl/VitalSignsAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inpatientmanage.appservice.impl;
+package com.healthlink.his.web.inpatientmanage.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -10,16 +10,16 @@ import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.TimeUtils;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.EncounterClass;
-import com.openhis.common.enums.EventStatus;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.document.domain.VitalSigns;
-import com.openhis.document.service.IVitalSignsService;
-import com.openhis.web.inpatientmanage.appservice.IVitalSignsAppService;
-import com.openhis.web.inpatientmanage.dto.*;
-import com.openhis.web.inpatientmanage.mapper.VitalSignsAppMapper;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.EncounterClass;
+import com.healthlink.his.common.enums.EventStatus;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.document.domain.VitalSigns;
+import com.healthlink.his.document.service.IVitalSignsService;
+import com.healthlink.his.web.inpatientmanage.appservice.IVitalSignsAppService;
+import com.healthlink.his.web.inpatientmanage.dto.*;
+import com.healthlink.his.web.inpatientmanage.mapper.VitalSignsAppMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/assembler/AdmissionAssembler.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/assembler/AdmissionAssembler.java
new file mode 100755
index 000000000..36b940eb5
--- /dev/null
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/assembler/AdmissionAssembler.java
@@ -0,0 +1,3 @@
+package com.healthlink.his.web.inpatientmanage.assembler;
+
+public class AdmissionAssembler {}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/DepositController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/controller/DepositController.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/DepositController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/controller/DepositController.java
index 1bb7596f5..94b0d08b7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/DepositController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/controller/DepositController.java
@@ -1,9 +1,9 @@
-package com.openhis.web.inpatientmanage.controller;
+package com.healthlink.his.web.inpatientmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inpatientmanage.appservice.IDepositAppService;
-import com.openhis.web.inpatientmanage.dto.DepositSearchParam;
-import com.openhis.yb.dto.PaymentDto;
+import com.healthlink.his.web.inpatientmanage.appservice.IDepositAppService;
+import com.healthlink.his.web.inpatientmanage.dto.DepositSearchParam;
+import com.healthlink.his.yb.dto.PaymentDto;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/NursingRecordController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/controller/NursingRecordController.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/NursingRecordController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/controller/NursingRecordController.java
index 51ac7e545..37f3617e7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/NursingRecordController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/controller/NursingRecordController.java
@@ -1,10 +1,10 @@
-package com.openhis.web.inpatientmanage.controller;
+package com.healthlink.his.web.inpatientmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inpatientmanage.appservice.INursingRecordAppService;
-import com.openhis.web.inpatientmanage.dto.NursingEmrTemplateDto;
-import com.openhis.web.inpatientmanage.dto.NursingRecordDto;
-import com.openhis.web.inpatientmanage.dto.NursingSearchParam;
+import com.healthlink.his.web.inpatientmanage.appservice.INursingRecordAppService;
+import com.healthlink.his.web.inpatientmanage.dto.NursingEmrTemplateDto;
+import com.healthlink.his.web.inpatientmanage.dto.NursingRecordDto;
+import com.healthlink.his.web.inpatientmanage.dto.NursingSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/PatientHomeController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/controller/PatientHomeController.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/PatientHomeController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/controller/PatientHomeController.java
index 3ac6b987b..52819c9f2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/PatientHomeController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/controller/PatientHomeController.java
@@ -1,8 +1,8 @@
-package com.openhis.web.inpatientmanage.controller;
+package com.healthlink.his.web.inpatientmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inpatientmanage.appservice.IPatientHomeAppService;
-import com.openhis.web.inpatientmanage.dto.PatientHomeSearchParam;
+import com.healthlink.his.web.inpatientmanage.appservice.IPatientHomeAppService;
+import com.healthlink.his.web.inpatientmanage.dto.PatientHomeSearchParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.format.annotation.DateTimeFormat;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/VitalSignsController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/controller/VitalSignsController.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/VitalSignsController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/controller/VitalSignsController.java
index 00d351d0c..84a329bd3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/VitalSignsController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/controller/VitalSignsController.java
@@ -1,10 +1,10 @@
-package com.openhis.web.inpatientmanage.controller;
+package com.healthlink.his.web.inpatientmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inpatientmanage.appservice.IVitalSignsAppService;
-import com.openhis.web.inpatientmanage.dto.VitalSignsDeleteDto;
-import com.openhis.web.inpatientmanage.dto.VitalSignsSaveDto;
-import com.openhis.web.inpatientmanage.dto.VitalSignsSearchParam;
+import com.healthlink.his.web.inpatientmanage.appservice.IVitalSignsAppService;
+import com.healthlink.his.web.inpatientmanage.dto.VitalSignsDeleteDto;
+import com.healthlink.his.web.inpatientmanage.dto.VitalSignsSaveDto;
+import com.healthlink.his.web.inpatientmanage.dto.VitalSignsSearchParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/DepositDetailDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/DepositDetailDto.java
index a2c05484f..0cb45a6b4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/DepositDetailDto.java
@@ -1,9 +1,9 @@
-package com.openhis.web.inpatientmanage.dto;
+package com.healthlink.his.web.inpatientmanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositInitPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/DepositInitPageDto.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositInitPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/DepositInitPageDto.java
index 48e7f003f..d56688d71 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositInitPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/DepositInitPageDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inpatientmanage.dto;
+package com.healthlink.his.web.inpatientmanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositPaymentDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/DepositPaymentDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositPaymentDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/DepositPaymentDto.java
index 7fad7bd43..411ad0d13 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositPaymentDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/DepositPaymentDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inpatientmanage.dto;
+package com.healthlink.his.web.inpatientmanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/DepositSearchParam.java
similarity index 82%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/DepositSearchParam.java
index 64fb7b6b9..4ef4c7bd3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/DepositSearchParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inpatientmanage.dto;
+package com.healthlink.his.web.inpatientmanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/NursingDetailDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/NursingDetailDto.java
index 2e1f791d0..a86fbd5fc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/NursingDetailDto.java
@@ -1,9 +1,9 @@
-package com.openhis.web.inpatientmanage.dto;
+package com.healthlink.his.web.inpatientmanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingEmrTemplateDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/NursingEmrTemplateDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingEmrTemplateDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/NursingEmrTemplateDto.java
index 07d874dad..b6449e7b1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingEmrTemplateDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/NursingEmrTemplateDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inpatientmanage.dto;
+package com.healthlink.his.web.inpatientmanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/NursingPageDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/NursingPageDto.java
index b0f994bed..ad9a795aa 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/NursingPageDto.java
@@ -1,9 +1,9 @@
-package com.openhis.web.inpatientmanage.dto;
+package com.healthlink.his.web.inpatientmanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingRecordDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/NursingRecordDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingRecordDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/NursingRecordDto.java
index 404c2ba89..8d7bbe4c2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingRecordDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/NursingRecordDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inpatientmanage.dto;
+package com.healthlink.his.web.inpatientmanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/NursingSearchParam.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/NursingSearchParam.java
index 5c1dbcb18..6cced9f8c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/NursingSearchParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inpatientmanage.dto;
+package com.healthlink.his.web.inpatientmanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingVitalSignsDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/NursingVitalSignsDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingVitalSignsDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/NursingVitalSignsDto.java
index 848294fd4..bad3eccf7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingVitalSignsDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/NursingVitalSignsDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inpatientmanage.dto;
+package com.healthlink.his.web.inpatientmanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/PatientHomeDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/PatientHomeDto.java
index afa924dde..f43343b78 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/PatientHomeDto.java
@@ -1,9 +1,9 @@
-package com.openhis.web.inpatientmanage.dto;
+package com.healthlink.his.web.inpatientmanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeEmptyBedDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/PatientHomeEmptyBedDto.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeEmptyBedDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/PatientHomeEmptyBedDto.java
index d197354ef..ff050d30e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeEmptyBedDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/PatientHomeEmptyBedDto.java
@@ -1,8 +1,8 @@
-package com.openhis.web.inpatientmanage.dto;
+package com.healthlink.his.web.inpatientmanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/PatientHomeSearchParam.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/PatientHomeSearchParam.java
index 629593a6d..401c32e56 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/PatientHomeSearchParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inpatientmanage.dto;
+package com.healthlink.his.web.inpatientmanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignSearchRecordDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/VitalSignSearchRecordDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignSearchRecordDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/VitalSignSearchRecordDto.java
index 4f84589ff..5c58ba905 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignSearchRecordDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/VitalSignSearchRecordDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inpatientmanage.dto;
+package com.healthlink.his.web.inpatientmanage.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsChartSmallDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/VitalSignsChartSmallDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsChartSmallDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/VitalSignsChartSmallDto.java
index 8039cf5c3..e73cfbabd 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsChartSmallDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/VitalSignsChartSmallDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inpatientmanage.dto;
+package com.healthlink.his.web.inpatientmanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsDeleteDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/VitalSignsDeleteDto.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsDeleteDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/VitalSignsDeleteDto.java
index f76ccec00..822aa0080 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsDeleteDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/VitalSignsDeleteDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inpatientmanage.dto;
+package com.healthlink.his.web.inpatientmanage.dto;
 
 import com.core.common.core.domain.HisBaseEntity;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/VitalSignsDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/VitalSignsDto.java
index 56d3d1d14..1fc38387e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/VitalSignsDto.java
@@ -1,9 +1,9 @@
-package com.openhis.web.inpatientmanage.dto;
+package com.healthlink.his.web.inpatientmanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsField.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/VitalSignsField.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsField.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/VitalSignsField.java
index ece82cdbc..9ae21688f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsField.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/VitalSignsField.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inpatientmanage.dto;
+package com.healthlink.his.web.inpatientmanage.dto;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsMedicalRecordDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/VitalSignsMedicalRecordDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsMedicalRecordDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/VitalSignsMedicalRecordDto.java
index 45d9b8feb..08300cca6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsMedicalRecordDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/VitalSignsMedicalRecordDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inpatientmanage.dto;
+package com.healthlink.his.web.inpatientmanage.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsSaveDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/VitalSignsSaveDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsSaveDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/VitalSignsSaveDto.java
index b33d42a07..1dbcb33ba 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsSaveDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/VitalSignsSaveDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inpatientmanage.dto;
+package com.healthlink.his.web.inpatientmanage.dto;
 
 import com.core.common.core.domain.HisBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/VitalSignsSearchParam.java
similarity index 82%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/VitalSignsSearchParam.java
index 5488f2f8b..5ad465b03 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/VitalSignsSearchParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inpatientmanage.dto;
+package com.healthlink.his.web.inpatientmanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsTemperaturePulsesDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/VitalSignsTemperaturePulsesDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsTemperaturePulsesDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/VitalSignsTemperaturePulsesDto.java
index 67c697e25..9d879363f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsTemperaturePulsesDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/dto/VitalSignsTemperaturePulsesDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inpatientmanage.dto;
+package com.healthlink.his.web.inpatientmanage.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/DepositMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/mapper/DepositMapper.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/DepositMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/mapper/DepositMapper.java
index b935ea4d0..946c7a320 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/DepositMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/mapper/DepositMapper.java
@@ -1,10 +1,10 @@
-package com.openhis.web.inpatientmanage.mapper;
+package com.healthlink.his.web.inpatientmanage.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.inpatientmanage.dto.DepositDetailDto;
+import com.healthlink.his.web.inpatientmanage.dto.DepositDetailDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/NursingRecordAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/mapper/NursingRecordAppMapper.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/NursingRecordAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/mapper/NursingRecordAppMapper.java
index 5b597ea7f..c11a6beb9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/NursingRecordAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/mapper/NursingRecordAppMapper.java
@@ -1,13 +1,13 @@
-package com.openhis.web.inpatientmanage.mapper;
+package com.healthlink.his.web.inpatientmanage.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.inpatientmanage.dto.NursingDetailDto;
-import com.openhis.web.inpatientmanage.dto.NursingEmrTemplateDto;
-import com.openhis.web.inpatientmanage.dto.NursingPageDto;
-import com.openhis.web.inpatientmanage.dto.NursingSearchParam;
+import com.healthlink.his.web.inpatientmanage.dto.NursingDetailDto;
+import com.healthlink.his.web.inpatientmanage.dto.NursingEmrTemplateDto;
+import com.healthlink.his.web.inpatientmanage.dto.NursingPageDto;
+import com.healthlink.his.web.inpatientmanage.dto.NursingSearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/PatientHomeAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/mapper/PatientHomeAppMapper.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/PatientHomeAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/mapper/PatientHomeAppMapper.java
index cddbc59ef..539ca61c1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/PatientHomeAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/mapper/PatientHomeAppMapper.java
@@ -1,11 +1,11 @@
-package com.openhis.web.inpatientmanage.mapper;
+package com.healthlink.his.web.inpatientmanage.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.inpatientmanage.dto.PatientHomeDto;
-import com.openhis.web.inpatientmanage.dto.PatientHomeEmptyBedDto;
+import com.healthlink.his.web.inpatientmanage.dto.PatientHomeDto;
+import com.healthlink.his.web.inpatientmanage.dto.PatientHomeEmptyBedDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/VitalSignsAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/mapper/VitalSignsAppMapper.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/VitalSignsAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/mapper/VitalSignsAppMapper.java
index 8d59b2a04..12bfb18f0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/VitalSignsAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/mapper/VitalSignsAppMapper.java
@@ -1,12 +1,12 @@
-package com.openhis.web.inpatientmanage.mapper;
+package com.healthlink.his.web.inpatientmanage.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.document.domain.VitalSigns;
-import com.openhis.web.inpatientmanage.dto.PatientHomeDto;
-import com.openhis.web.inpatientmanage.dto.VitalSignsDto;
+import com.healthlink.his.document.domain.VitalSigns;
+import com.healthlink.his.web.inpatientmanage.dto.PatientHomeDto;
+import com.healthlink.his.web.inpatientmanage.dto.VitalSignsDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventoryAdjustPriceService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IInventoryAdjustPriceService.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventoryAdjustPriceService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IInventoryAdjustPriceService.java
index a69ec1acc..0ab94beb6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventoryAdjustPriceService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IInventoryAdjustPriceService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.inventorymanage.appservice;
+package com.healthlink.his.web.inventorymanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.adjustprice.dto.AdjustPriceManagerSearchParam;
+import com.healthlink.his.web.adjustprice.dto.AdjustPriceManagerSearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventoryDetailsAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IInventoryDetailsAppService.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventoryDetailsAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IInventoryDetailsAppService.java
index 4c72ea558..0c8cfd766 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventoryDetailsAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IInventoryDetailsAppService.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.appservice;
+package com.healthlink.his.web.inventorymanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inventorymanage.dto.InventoryDetailsSearchParam;
+import com.healthlink.his.web.inventorymanage.dto.InventoryDetailsSearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventorySettlementAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IInventorySettlementAppService.java
similarity index 78%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventorySettlementAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IInventorySettlementAppService.java
index 01b2c88d9..5e6e5600e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventorySettlementAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IInventorySettlementAppService.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.appservice;
+package com.healthlink.his.web.inventorymanage.appservice;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
-import com.openhis.web.inventorymanage.dto.InventorySettlementDto;
-import com.openhis.web.inventorymanage.dto.InventorySettlementSearchParam;
+import com.healthlink.his.web.inventorymanage.dto.InventorySettlementDto;
+import com.healthlink.his.web.inventorymanage.dto.InventorySettlementSearchParam;
 
 /**
  * 库房日结 service
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/ILossReportFormAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/ILossReportFormAppService.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/ILossReportFormAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/ILossReportFormAppService.java
index 6558cf024..767929645 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/ILossReportFormAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/ILossReportFormAppService.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.appservice;
+package com.healthlink.his.web.inventorymanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inventorymanage.dto.LossReceiptDetailDto;
-import com.openhis.web.inventorymanage.dto.LossReportFormDto;
-import com.openhis.web.inventorymanage.dto.LossReportSearchParam;
+import com.healthlink.his.web.inventorymanage.dto.LossReceiptDetailDto;
+import com.healthlink.his.web.inventorymanage.dto.LossReportFormDto;
+import com.healthlink.his.web.inventorymanage.dto.LossReportSearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductDetailAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IProductDetailAppService.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductDetailAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IProductDetailAppService.java
index a8399b26c..454fbdfb8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductDetailAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IProductDetailAppService.java
@@ -1,9 +1,9 @@
-package com.openhis.web.inventorymanage.appservice;
+package com.healthlink.his.web.inventorymanage.appservice;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
-import com.openhis.web.inventorymanage.dto.ProductDetailPageDto;
-import com.openhis.web.inventorymanage.dto.ProductDetailSearchParam;
+import com.healthlink.his.web.inventorymanage.dto.ProductDetailPageDto;
+import com.healthlink.his.web.inventorymanage.dto.ProductDetailSearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductStocktakingAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IProductStocktakingAppService.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductStocktakingAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IProductStocktakingAppService.java
index 15c0d4d18..fb91196c9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductStocktakingAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IProductStocktakingAppService.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.appservice;
+package com.healthlink.his.web.inventorymanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inventorymanage.dto.InventoryReceiptDetailDto;
-import com.openhis.web.inventorymanage.dto.ProductStocktakingDto;
-import com.openhis.web.inventorymanage.dto.ProductStocktakingSearchParam;
-import com.openhis.web.inventorymanage.dto.StocktakingBatchSearchParam;
+import com.healthlink.his.web.inventorymanage.dto.InventoryReceiptDetailDto;
+import com.healthlink.his.web.inventorymanage.dto.ProductStocktakingDto;
+import com.healthlink.his.web.inventorymanage.dto.ProductStocktakingSearchParam;
+import com.healthlink.his.web.inventorymanage.dto.StocktakingBatchSearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductTransferAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IProductTransferAppService.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductTransferAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IProductTransferAppService.java
index 770dbda0b..0db5ba2e2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductTransferAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IProductTransferAppService.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.appservice;
+package com.healthlink.his.web.inventorymanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inventorymanage.dto.BatchTransferSearchParam;
-import com.openhis.web.inventorymanage.dto.ProductTransferDto;
-import com.openhis.web.inventorymanage.dto.SupplySearchParam;
+import com.healthlink.his.web.inventorymanage.dto.BatchTransferSearchParam;
+import com.healthlink.his.web.inventorymanage.dto.ProductTransferDto;
+import com.healthlink.his.web.inventorymanage.dto.SupplySearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IPurchaseInventoryAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IPurchaseInventoryAppService.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IPurchaseInventoryAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IPurchaseInventoryAppService.java
index 24c0521df..1bbddc9c7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IPurchaseInventoryAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IPurchaseInventoryAppService.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.appservice;
+package com.healthlink.his.web.inventorymanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inventorymanage.dto.InventorySearchParam;
-import com.openhis.web.inventorymanage.dto.PurchaseInventoryDto;
+import com.healthlink.his.web.inventorymanage.dto.InventorySearchParam;
+import com.healthlink.his.web.inventorymanage.dto.PurchaseInventoryDto;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IPurchaseReturnAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IPurchaseReturnAppService.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IPurchaseReturnAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IPurchaseReturnAppService.java
index 270aa65b3..1fb48b781 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IPurchaseReturnAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IPurchaseReturnAppService.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.appservice;
+package com.healthlink.his.web.inventorymanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inventorymanage.dto.PurchaseReturnDetailDto;
+import com.healthlink.his.web.inventorymanage.dto.PurchaseReturnDetailDto;
 
 import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IReceiptApprovalAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IReceiptApprovalAppService.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IReceiptApprovalAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IReceiptApprovalAppService.java
index b9b1ab777..75b5bd0b2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IReceiptApprovalAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IReceiptApprovalAppService.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.appservice;
+package com.healthlink.his.web.inventorymanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inventorymanage.dto.ItemChargeDetailDto;
-import com.openhis.web.inventorymanage.dto.ReceiptApprovalSearchParam;
-import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
+import com.healthlink.his.web.inventorymanage.dto.ItemChargeDetailDto;
+import com.healthlink.his.web.inventorymanage.dto.ReceiptApprovalSearchParam;
+import com.healthlink.his.web.inventorymanage.dto.SupplyItemDetailDto;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IRequisitionIssueAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IRequisitionIssueAppService.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IRequisitionIssueAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IRequisitionIssueAppService.java
index 294825cba..9c76bbe91 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IRequisitionIssueAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IRequisitionIssueAppService.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.appservice;
+package com.healthlink.his.web.inventorymanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inventorymanage.dto.IssueDto;
-import com.openhis.web.inventorymanage.dto.IssueSearchParam;
+import com.healthlink.his.web.inventorymanage.dto.IssueDto;
+import com.healthlink.his.web.inventorymanage.dto.IssueSearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IReturnIssueAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IReturnIssueAppService.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IReturnIssueAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IReturnIssueAppService.java
index 7766a712c..0a1db821c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IReturnIssueAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/IReturnIssueAppService.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.appservice;
+package com.healthlink.his.web.inventorymanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inventorymanage.dto.IssueDto;
-import com.openhis.web.inventorymanage.dto.IssueSearchParam;
+import com.healthlink.his.web.inventorymanage.dto.IssueDto;
+import com.healthlink.his.web.inventorymanage.dto.IssueSearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/ITraceNoAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/ITraceNoAppService.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/ITraceNoAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/ITraceNoAppService.java
index b48da6157..e4da5eaf1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/ITraceNoAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/ITraceNoAppService.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.appservice;
+package com.healthlink.his.web.inventorymanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
-import com.openhis.web.inventorymanage.dto.TraceNoInfoParam;
-import com.openhis.web.inventorymanage.dto.TraceNoSearchParam;
+import com.healthlink.his.web.inventorymanage.dto.SupplyItemDetailDto;
+import com.healthlink.his.web.inventorymanage.dto.TraceNoInfoParam;
+import com.healthlink.his.web.inventorymanage.dto.TraceNoSearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/IInventoryAdjustPriceServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/IInventoryAdjustPriceServiceImpl.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/IInventoryAdjustPriceServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/IInventoryAdjustPriceServiceImpl.java
index 904da1564..ac0dcc462 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/IInventoryAdjustPriceServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/IInventoryAdjustPriceServiceImpl.java
@@ -1,30 +1,30 @@
-package com.openhis.web.inventorymanage.appservice.impl;
+package com.healthlink.his.web.inventorymanage.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.enums.DelFlag;
-import com.openhis.administration.domain.ChangePriceRecord;
-import com.openhis.administration.domain.ChargeItemDefDetail;
-import com.openhis.administration.domain.ChargeItemDefinition;
-import com.openhis.administration.dto.ChangePriceDataDto;
-import com.openhis.administration.service.IChangePriceRecordService;
-import com.openhis.administration.service.IChargeItemDefDetailService;
-import com.openhis.administration.service.IChargeItemDefinitionService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.ConditionCode;
-import com.openhis.common.enums.SupplyStatus;
-import com.openhis.common.enums.SupplyType;
-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.web.adjustprice.dto.AdjustPriceManagerSearchParam;
-import com.openhis.web.adjustprice.dto.ChangePricePageDto;
-import com.openhis.web.inventorymanage.appservice.IInventoryAdjustPriceService;
-import com.openhis.web.inventorymanage.dto.ReceiptApprovalSearchParam;
-import com.openhis.web.inventorymanage.dto.ReceiptInitDto;
-import com.openhis.web.inventorymanage.mapper.InventoryAdjustPriceMapper;
+import com.healthlink.his.administration.domain.ChangePriceRecord;
+import com.healthlink.his.administration.domain.ChargeItemDefDetail;
+import com.healthlink.his.administration.domain.ChargeItemDefinition;
+import com.healthlink.his.administration.dto.ChangePriceDataDto;
+import com.healthlink.his.administration.service.IChangePriceRecordService;
+import com.healthlink.his.administration.service.IChargeItemDefDetailService;
+import com.healthlink.his.administration.service.IChargeItemDefinitionService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.enums.ConditionCode;
+import com.healthlink.his.common.enums.SupplyStatus;
+import com.healthlink.his.common.enums.SupplyType;
+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.web.adjustprice.dto.AdjustPriceManagerSearchParam;
+import com.healthlink.his.web.adjustprice.dto.ChangePricePageDto;
+import com.healthlink.his.web.inventorymanage.appservice.IInventoryAdjustPriceService;
+import com.healthlink.his.web.inventorymanage.dto.ReceiptApprovalSearchParam;
+import com.healthlink.his.web.inventorymanage.dto.ReceiptInitDto;
+import com.healthlink.his.web.inventorymanage.mapper.InventoryAdjustPriceMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/IInventorySettlementAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/IInventorySettlementAppServiceImpl.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/IInventorySettlementAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/IInventorySettlementAppServiceImpl.java
index 1de73bcfe..72b32dca5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/IInventorySettlementAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/IInventorySettlementAppServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.appservice.impl;
+package com.healthlink.his.web.inventorymanage.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,20 +9,20 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.enums.DelFlag;
 import com.core.common.utils.DateUtils;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.DispenseStatus;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.common.enums.Whether;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.document.domain.DocInventoryItemStatic;
-import com.openhis.document.service.IDocInventoryItemStaticService;
-import com.openhis.web.inventorymanage.appservice.IInventorySettlementAppService;
-import com.openhis.web.inventorymanage.dto.InventoryBusinessInfoDto;
-import com.openhis.web.inventorymanage.dto.InventorySettlementDto;
-import com.openhis.web.inventorymanage.dto.InventorySettlementSearchParam;
-import com.openhis.web.inventorymanage.mapper.InventorySettlementAppMapper;
-import com.openhis.workflow.domain.InventoryItem;
-import com.openhis.workflow.service.IInventoryItemService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.enums.DispenseStatus;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.common.enums.Whether;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.document.domain.DocInventoryItemStatic;
+import com.healthlink.his.document.service.IDocInventoryItemStaticService;
+import com.healthlink.his.web.inventorymanage.appservice.IInventorySettlementAppService;
+import com.healthlink.his.web.inventorymanage.dto.InventoryBusinessInfoDto;
+import com.healthlink.his.web.inventorymanage.dto.InventorySettlementDto;
+import com.healthlink.his.web.inventorymanage.dto.InventorySettlementSearchParam;
+import com.healthlink.his.web.inventorymanage.mapper.InventorySettlementAppMapper;
+import com.healthlink.his.workflow.domain.InventoryItem;
+import com.healthlink.his.workflow.service.IInventoryItemService;
 import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/InventoryDetailsAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/InventoryDetailsAppServiceImpl.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/InventoryDetailsAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/InventoryDetailsAppServiceImpl.java
index 1eadcfcd7..1e33b3b14 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/InventoryDetailsAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/InventoryDetailsAppServiceImpl.java
@@ -1,22 +1,22 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.appservice.impl;
+package com.healthlink.his.web.inventorymanage.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.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.CategoryType;
-import com.openhis.common.enums.InventoryType;
-import com.openhis.common.enums.SupplyStatus;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.inventorymanage.appservice.IInventoryDetailsAppService;
-import com.openhis.web.inventorymanage.dto.InventoryDetailsPageDto;
-import com.openhis.web.inventorymanage.dto.InventoryDetailsSearchParam;
-import com.openhis.web.inventorymanage.mapper.InventoryDetailsMapper;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.enums.CategoryType;
+import com.healthlink.his.common.enums.InventoryType;
+import com.healthlink.his.common.enums.SupplyStatus;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.inventorymanage.appservice.IInventoryDetailsAppService;
+import com.healthlink.his.web.inventorymanage.dto.InventoryDetailsPageDto;
+import com.healthlink.his.web.inventorymanage.dto.InventoryDetailsSearchParam;
+import com.healthlink.his.web.inventorymanage.mapper.InventoryDetailsMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/LossReportFormAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/LossReportFormAppServiceImpl.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/LossReportFormAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/LossReportFormAppServiceImpl.java
index 314e29725..2c4411e2f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/LossReportFormAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/LossReportFormAppServiceImpl.java
@@ -1,29 +1,29 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.appservice.impl;
+package com.healthlink.his.web.inventorymanage.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.*;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.administration.domain.Location;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.service.ILocationService;
-import com.openhis.administration.service.IPractitionerService;
-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.web.basedatamanage.dto.LocationDto;
-import com.openhis.web.common.dto.UnitDto;
-import com.openhis.web.inventorymanage.appservice.ILossReportFormAppService;
-import com.openhis.web.inventorymanage.dto.*;
-import com.openhis.web.inventorymanage.mapper.LossReportFormMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+import com.healthlink.his.administration.domain.Location;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.service.ILocationService;
+import com.healthlink.his.administration.service.IPractitionerService;
+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.web.basedatamanage.dto.LocationDto;
+import com.healthlink.his.web.common.dto.UnitDto;
+import com.healthlink.his.web.inventorymanage.appservice.ILossReportFormAppService;
+import com.healthlink.his.web.inventorymanage.dto.*;
+import com.healthlink.his.web.inventorymanage.mapper.LossReportFormMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductDetailAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ProductDetailAppServiceImpl.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductDetailAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ProductDetailAppServiceImpl.java
index 62247a726..f3d0c2d91 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductDetailAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ProductDetailAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inventorymanage.appservice.impl;
+package com.healthlink.his.web.inventorymanage.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -11,21 +11,21 @@ import com.core.common.exception.NonCaptureException;
 import com.core.common.utils.*;
 import com.core.common.utils.poi.ExcelUtil;
 import com.core.web.util.TenantOptionUtil;
-import com.openhis.administration.domain.ChargeItemDefDetail;
-import com.openhis.administration.service.IChargeItemDefDetailService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.*;
-import com.openhis.common.enums.ybenums.YbChrgitmLv;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.inventorymanage.appservice.IProductDetailAppService;
-import com.openhis.web.inventorymanage.dto.ProductDetailInitDto;
-import com.openhis.web.inventorymanage.dto.ProductDetailPageDto;
-import com.openhis.web.inventorymanage.dto.ProductDetailSearchParam;
-import com.openhis.web.inventorymanage.mapper.ProductDetailAppMapper;
-import com.openhis.workflow.domain.InventoryItem;
-import com.openhis.workflow.mapper.InventoryItemMapper;
+import com.healthlink.his.administration.domain.ChargeItemDefDetail;
+import com.healthlink.his.administration.service.IChargeItemDefDetailService;
+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.enums.ybenums.YbChrgitmLv;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.inventorymanage.appservice.IProductDetailAppService;
+import com.healthlink.his.web.inventorymanage.dto.ProductDetailInitDto;
+import com.healthlink.his.web.inventorymanage.dto.ProductDetailPageDto;
+import com.healthlink.his.web.inventorymanage.dto.ProductDetailSearchParam;
+import com.healthlink.his.web.inventorymanage.mapper.ProductDetailAppMapper;
+import com.healthlink.his.workflow.domain.InventoryItem;
+import com.healthlink.his.workflow.mapper.InventoryItemMapper;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductStocktakingAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ProductStocktakingAppServiceImpl.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductStocktakingAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ProductStocktakingAppServiceImpl.java
index 113da4343..bde8f4c1f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductStocktakingAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ProductStocktakingAppServiceImpl.java
@@ -1,31 +1,31 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.appservice.impl;
+package com.healthlink.his.web.inventorymanage.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.core.domain.model.LoginUser;
 import com.core.common.utils.*;
-import com.openhis.administration.domain.Location;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.service.ILocationService;
-import com.openhis.administration.service.IPractitionerService;
-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.web.basedatamanage.dto.LocationDto;
-import com.openhis.web.common.dto.UnitDto;
-import com.openhis.web.inventorymanage.appservice.IProductStocktakingAppService;
-import com.openhis.web.inventorymanage.dto.*;
-import com.openhis.web.inventorymanage.mapper.ProductStocktakingMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.domain.SupplyRequestAuto;
-import com.openhis.workflow.service.ISupplyRequestAutoService;
-import com.openhis.workflow.service.ISupplyRequestService;
+import com.healthlink.his.administration.domain.Location;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.service.ILocationService;
+import com.healthlink.his.administration.service.IPractitionerService;
+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.web.basedatamanage.dto.LocationDto;
+import com.healthlink.his.web.common.dto.UnitDto;
+import com.healthlink.his.web.inventorymanage.appservice.IProductStocktakingAppService;
+import com.healthlink.his.web.inventorymanage.dto.*;
+import com.healthlink.his.web.inventorymanage.mapper.ProductStocktakingMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.domain.SupplyRequestAuto;
+import com.healthlink.his.workflow.service.ISupplyRequestAutoService;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductTransferAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ProductTransferAppServiceImpl.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductTransferAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ProductTransferAppServiceImpl.java
index 41c06fab0..7d19aa49a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductTransferAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ProductTransferAppServiceImpl.java
@@ -1,32 +1,32 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.appservice.impl;
+package com.healthlink.his.web.inventorymanage.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.*;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.administration.domain.Location;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.service.ILocationService;
-import com.openhis.administration.service.IPractitionerService;
-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.healthlink.his.administration.domain.Location;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.service.ILocationService;
+import com.healthlink.his.administration.service.IPractitionerService;
+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.core.common.utils.SecurityUtils;
-import com.openhis.workflow.domain.InventoryItem;
-import com.openhis.workflow.service.IInventoryItemService;
-import com.openhis.web.basedatamanage.dto.LocationDto;
-import com.openhis.web.common.dto.UnitDto;
-import com.openhis.web.inventorymanage.appservice.IProductTransferAppService;
-import com.openhis.web.inventorymanage.dto.*;
-import com.openhis.web.inventorymanage.mapper.ProductTransferMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+import com.healthlink.his.workflow.domain.InventoryItem;
+import com.healthlink.his.workflow.service.IInventoryItemService;
+import com.healthlink.his.web.basedatamanage.dto.LocationDto;
+import com.healthlink.his.web.common.dto.UnitDto;
+import com.healthlink.his.web.inventorymanage.appservice.IProductTransferAppService;
+import com.healthlink.his.web.inventorymanage.dto.*;
+import com.healthlink.his.web.inventorymanage.mapper.ProductTransferMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java
index 4993be252..53d9d29b7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.appservice.impl;
+package com.healthlink.his.web.inventorymanage.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -9,22 +9,22 @@ import com.core.common.core.domain.R;
 import com.core.common.exception.ServiceException;
 import com.core.common.utils.*;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.administration.domain.Location;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.domain.Supplier;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.administration.service.ISupplierService;
-import com.openhis.administration.service.impl.LocationServiceImpl;
-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.web.inventorymanage.appservice.IPurchaseInventoryAppService;
-import com.openhis.web.inventorymanage.dto.*;
-import com.openhis.web.inventorymanage.mapper.PurchaseInventoryMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+import com.healthlink.his.administration.domain.Location;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.domain.Supplier;
+import com.healthlink.his.administration.service.IPractitionerService;
+import com.healthlink.his.administration.service.ISupplierService;
+import com.healthlink.his.administration.service.impl.LocationServiceImpl;
+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.web.inventorymanage.appservice.IPurchaseInventoryAppService;
+import com.healthlink.his.web.inventorymanage.dto.*;
+import com.healthlink.his.web.inventorymanage.mapper.PurchaseInventoryMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseReturnAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/PurchaseReturnAppServiceImpl.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseReturnAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/PurchaseReturnAppServiceImpl.java
index a3b5f7b39..9907f591e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseReturnAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/PurchaseReturnAppServiceImpl.java
@@ -1,30 +1,30 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.appservice.impl;
+package com.healthlink.his.web.inventorymanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.*;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.AssignSeqEnum;
-import com.openhis.common.enums.ItemType;
-import com.openhis.common.enums.SupplyStatus;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.web.common.dto.UnitDto;
-import com.openhis.web.inventorymanage.appservice.IPurchaseReturnAppService;
-import com.openhis.web.inventorymanage.dto.PurchaseInventoryInitDto;
-import com.openhis.web.inventorymanage.dto.PurchaseReturnDetailDto;
-import com.openhis.web.inventorymanage.dto.PurchaseReturnInitDto;
-import com.openhis.web.inventorymanage.dto.PurchaseReturnPageDto;
-import com.openhis.web.inventorymanage.mapper.PurchaseReturnMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.service.IPractitionerService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.AssignSeqEnum;
+import com.healthlink.his.common.enums.ItemType;
+import com.healthlink.his.common.enums.SupplyStatus;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.web.common.dto.UnitDto;
+import com.healthlink.his.web.inventorymanage.appservice.IPurchaseReturnAppService;
+import com.healthlink.his.web.inventorymanage.dto.PurchaseInventoryInitDto;
+import com.healthlink.his.web.inventorymanage.dto.PurchaseReturnDetailDto;
+import com.healthlink.his.web.inventorymanage.dto.PurchaseReturnInitDto;
+import com.healthlink.his.web.inventorymanage.dto.PurchaseReturnPageDto;
+import com.healthlink.his.web.inventorymanage.mapper.PurchaseReturnMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReceiptApprovalAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ReceiptApprovalAppServiceImpl.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReceiptApprovalAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ReceiptApprovalAppServiceImpl.java
index 4232e3150..cc7caa389 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReceiptApprovalAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ReceiptApprovalAppServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.appservice.impl;
+package com.healthlink.his.web.inventorymanage.appservice.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -13,36 +13,36 @@ import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.NewExcelUtil;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.ChargeItemDefDetail;
-import com.openhis.administration.domain.Location;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.domain.Supplier;
-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.enums.ybenums.YbInvChgType;
-import com.openhis.common.enums.ybenums.YbRxFlag;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.medication.service.IMedicationDispenseService;
-import com.openhis.web.inventorymanage.appservice.IReceiptApprovalAppService;
-import com.openhis.web.inventorymanage.appservice.ITraceNoAppService;
-import com.openhis.web.inventorymanage.assembler.InventoryManageAssembler;
-import com.openhis.web.inventorymanage.dto.*;
-import com.openhis.web.inventorymanage.mapper.ReceiptApprovalMapper;
-import com.openhis.workflow.domain.InventoryItem;
-import com.openhis.workflow.domain.SupplyDelivery;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.IDeviceDispenseService;
-import com.openhis.workflow.service.IInventoryItemService;
-import com.openhis.workflow.service.ISupplyDeliveryService;
-import com.openhis.workflow.service.ISupplyRequestService;
-import com.openhis.yb.dto.Medical3503Param;
-import com.openhis.yb.dto.MedicalInventory3501Param;
-import com.openhis.yb.dto.MedicalInventory3502Param;
-import com.openhis.yb.dto.MedicalPurchase3504Param;
-import com.openhis.yb.service.YbManager;
+import com.healthlink.his.administration.domain.ChargeItemDefDetail;
+import com.healthlink.his.administration.domain.Location;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.domain.Supplier;
+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.enums.ybenums.YbInvChgType;
+import com.healthlink.his.common.enums.ybenums.YbRxFlag;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.medication.service.IMedicationDispenseService;
+import com.healthlink.his.web.inventorymanage.appservice.IReceiptApprovalAppService;
+import com.healthlink.his.web.inventorymanage.appservice.ITraceNoAppService;
+import com.healthlink.his.web.inventorymanage.assembler.InventoryManageAssembler;
+import com.healthlink.his.web.inventorymanage.dto.*;
+import com.healthlink.his.web.inventorymanage.mapper.ReceiptApprovalMapper;
+import com.healthlink.his.workflow.domain.InventoryItem;
+import com.healthlink.his.workflow.domain.SupplyDelivery;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.IDeviceDispenseService;
+import com.healthlink.his.workflow.service.IInventoryItemService;
+import com.healthlink.his.workflow.service.ISupplyDeliveryService;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
+import com.healthlink.his.yb.dto.Medical3503Param;
+import com.healthlink.his.yb.dto.MedicalInventory3501Param;
+import com.healthlink.his.yb.dto.MedicalInventory3502Param;
+import com.healthlink.his.yb.dto.MedicalPurchase3504Param;
+import com.healthlink.his.yb.service.YbManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/RequisitionIssueAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/RequisitionIssueAppServiceImpl.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/RequisitionIssueAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/RequisitionIssueAppServiceImpl.java
index 940f0f2fc..132f94693 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/RequisitionIssueAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/RequisitionIssueAppServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.appservice.impl;
+package com.healthlink.his.web.inventorymanage.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -10,25 +10,25 @@ import com.core.common.core.domain.R;
 import com.core.common.exception.ServiceException;
 import com.core.common.utils.*;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.administration.domain.DeviceDefinition;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.service.IDeviceDefinitionService;
-import com.openhis.administration.service.IPractitionerService;
-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.medication.domain.MedicationDefinition;
-import com.openhis.medication.service.IMedicationDefinitionService;
-import com.openhis.web.common.dto.UnitDto;
-import com.openhis.web.inventorymanage.appservice.IRequisitionIssueAppService;
-import com.openhis.web.inventorymanage.dto.*;
-import com.openhis.web.inventorymanage.mapper.RequisitionIssueMapper;
-import com.openhis.workflow.domain.InventoryItem;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.IInventoryItemService;
-import com.openhis.workflow.service.ISupplyRequestService;
+import com.healthlink.his.administration.domain.DeviceDefinition;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.service.IDeviceDefinitionService;
+import com.healthlink.his.administration.service.IPractitionerService;
+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.medication.domain.MedicationDefinition;
+import com.healthlink.his.medication.service.IMedicationDefinitionService;
+import com.healthlink.his.web.common.dto.UnitDto;
+import com.healthlink.his.web.inventorymanage.appservice.IRequisitionIssueAppService;
+import com.healthlink.his.web.inventorymanage.dto.*;
+import com.healthlink.his.web.inventorymanage.mapper.RequisitionIssueMapper;
+import com.healthlink.his.workflow.domain.InventoryItem;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.IInventoryItemService;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReturnIssueAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ReturnIssueAppServiceImpl.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReturnIssueAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ReturnIssueAppServiceImpl.java
index e7cc29c0a..0a24364cc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReturnIssueAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ReturnIssueAppServiceImpl.java
@@ -1,27 +1,27 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.appservice.impl;
+package com.healthlink.his.web.inventorymanage.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.*;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.domain.Supplier;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.administration.service.ISupplierService;
-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.web.inventorymanage.appservice.IReturnIssueAppService;
-import com.openhis.web.inventorymanage.dto.*;
-import com.openhis.web.inventorymanage.mapper.ReturnIssueMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.domain.Supplier;
+import com.healthlink.his.administration.service.IPractitionerService;
+import com.healthlink.his.administration.service.ISupplierService;
+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.web.inventorymanage.appservice.IReturnIssueAppService;
+import com.healthlink.his.web.inventorymanage.dto.*;
+import com.healthlink.his.web.inventorymanage.mapper.ReturnIssueMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/TraceNoAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/TraceNoAppServiceImpl.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/TraceNoAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/TraceNoAppServiceImpl.java
index 3aab8b1e6..ca0b5a176 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/TraceNoAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/TraceNoAppServiceImpl.java
@@ -1,27 +1,27 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.appservice.impl;
+package com.healthlink.his.web.inventorymanage.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.AgeCalculatorUtil;
-import com.openhis.administration.domain.Location;
-import com.openhis.administration.domain.TraceNoManage;
-import com.openhis.administration.dto.TracePatientInfoDto;
-import com.openhis.administration.mapper.TraceNoManageMapper;
-import com.openhis.administration.service.ILocationService;
-import com.openhis.administration.service.ITraceNoManageService;
-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.PageUtils;
-import com.openhis.web.inventorymanage.appservice.ITraceNoAppService;
-import com.openhis.web.inventorymanage.dto.*;
-import com.openhis.web.inventorymanage.mapper.TraceNoAppMapper;
+import com.healthlink.his.administration.domain.Location;
+import com.healthlink.his.administration.domain.TraceNoManage;
+import com.healthlink.his.administration.dto.TracePatientInfoDto;
+import com.healthlink.his.administration.mapper.TraceNoManageMapper;
+import com.healthlink.his.administration.service.ILocationService;
+import com.healthlink.his.administration.service.ITraceNoManageService;
+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.PageUtils;
+import com.healthlink.his.web.inventorymanage.appservice.ITraceNoAppService;
+import com.healthlink.his.web.inventorymanage.dto.*;
+import com.healthlink.his.web.inventorymanage.mapper.TraceNoAppMapper;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/assembler/InventoryManageAssembler.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/assembler/InventoryManageAssembler.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/assembler/InventoryManageAssembler.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/assembler/InventoryManageAssembler.java
index a23f05378..6465eba05 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/assembler/InventoryManageAssembler.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/assembler/InventoryManageAssembler.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.assembler;
+package com.healthlink.his.web.inventorymanage.assembler;
 
-import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
-import com.openhis.workflow.domain.InventoryItem;
+import com.healthlink.his.web.inventorymanage.dto.SupplyItemDetailDto;
+import com.healthlink.his.workflow.domain.InventoryItem;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/InventoryDetailsController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/InventoryDetailsController.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/InventoryDetailsController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/InventoryDetailsController.java
index 5f1ed3e1e..c57e3cc6b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/InventoryDetailsController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/InventoryDetailsController.java
@@ -1,7 +1,7 @@
 ///*
 // * Copyright ©2023 CJB-CNIT Team. All rights reserved
 // */
-//package com.openhis.web.inventorymanage.controller;
+//package com.healthlink.his.web.inventorymanage.controller;
 //
 //import jakarta.servlet.http.HttpServletRequest;
 //
@@ -12,8 +12,8 @@
 //import org.springframework.web.bind.annotation.RestController;
 //
 //import com.core.common.core.domain.R;
-//import com.openhis.web.inventorymanage.appservice.IInventoryDetailsAppService;
-//import com.openhis.web.inventorymanage.dto.InventoryDetailsSearchParam;
+//import com.healthlink.his.web.inventorymanage.appservice.IInventoryDetailsAppService;
+//import com.healthlink.his.web.inventorymanage.dto.InventoryDetailsSearchParam;
 //
 //import lombok.extern.slf4j.Slf4j;
 //
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/InventorySettlementController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/InventorySettlementController.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/InventorySettlementController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/InventorySettlementController.java
index 68b907281..6b7aab385 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/InventorySettlementController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/InventorySettlementController.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.controller;
+package com.healthlink.his.web.inventorymanage.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
-import com.openhis.web.inventorymanage.appservice.IInventorySettlementAppService;
-import com.openhis.web.inventorymanage.dto.InventorySettlementDto;
-import com.openhis.web.inventorymanage.dto.InventorySettlementSearchParam;
+import com.healthlink.his.web.inventorymanage.appservice.IInventorySettlementAppService;
+import com.healthlink.his.web.inventorymanage.dto.InventorySettlementDto;
+import com.healthlink.his.web.inventorymanage.dto.InventorySettlementSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/LossReportFormController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/LossReportFormController.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/LossReportFormController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/LossReportFormController.java
index 6b3210d6a..8332cf053 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/LossReportFormController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/LossReportFormController.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.controller;
+package com.healthlink.his.web.inventorymanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inventorymanage.appservice.ILossReportFormAppService;
-import com.openhis.web.inventorymanage.dto.BusNoRequest;
-import com.openhis.web.inventorymanage.dto.LossReportFormDto;
-import com.openhis.web.inventorymanage.dto.LossReportSearchParam;
+import com.healthlink.his.web.inventorymanage.appservice.ILossReportFormAppService;
+import com.healthlink.his.web.inventorymanage.dto.BusNoRequest;
+import com.healthlink.his.web.inventorymanage.dto.LossReportFormDto;
+import com.healthlink.his.web.inventorymanage.dto.LossReportSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PriceAdjustmentFormController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/PriceAdjustmentFormController.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PriceAdjustmentFormController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/PriceAdjustmentFormController.java
index 3a62a349c..94faf130f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PriceAdjustmentFormController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/PriceAdjustmentFormController.java
@@ -1,10 +1,10 @@
-package com.openhis.web.inventorymanage.controller;
+package com.healthlink.his.web.inventorymanage.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.AdjustPriceManagerSearchParam;
-import com.openhis.web.inventorymanage.appservice.IInventoryAdjustPriceService;
+import com.healthlink.his.web.adjustprice.appservice.IAdjustPriceService;
+import com.healthlink.his.web.adjustprice.dto.AdjustPriceManagerSearchParam;
+import com.healthlink.his.web.inventorymanage.appservice.IInventoryAdjustPriceService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductDetailController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/ProductDetailController.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductDetailController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/ProductDetailController.java
index de361af4a..508bc23d6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductDetailController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/ProductDetailController.java
@@ -1,10 +1,10 @@
-package com.openhis.web.inventorymanage.controller;
+package com.healthlink.his.web.inventorymanage.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
-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.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.springframework.web.bind.annotation.*;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductStocktakingController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/ProductStocktakingController.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductStocktakingController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/ProductStocktakingController.java
index 4fbb50ff4..54b8f9e60 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductStocktakingController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/ProductStocktakingController.java
@@ -1,14 +1,14 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.controller;
+package com.healthlink.his.web.inventorymanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inventorymanage.appservice.IProductStocktakingAppService;
-import com.openhis.web.inventorymanage.dto.BusNoRequest;
-import com.openhis.web.inventorymanage.dto.ProductStocktakingDto;
-import com.openhis.web.inventorymanage.dto.ProductStocktakingSearchParam;
-import com.openhis.web.inventorymanage.dto.StocktakingBatchSearchParam;
+import com.healthlink.his.web.inventorymanage.appservice.IProductStocktakingAppService;
+import com.healthlink.his.web.inventorymanage.dto.BusNoRequest;
+import com.healthlink.his.web.inventorymanage.dto.ProductStocktakingDto;
+import com.healthlink.his.web.inventorymanage.dto.ProductStocktakingSearchParam;
+import com.healthlink.his.web.inventorymanage.dto.StocktakingBatchSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductTransferController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/ProductTransferController.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductTransferController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/ProductTransferController.java
index af19b3503..6e757d370 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductTransferController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/ProductTransferController.java
@@ -1,14 +1,14 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.controller;
+package com.healthlink.his.web.inventorymanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inventorymanage.appservice.IProductTransferAppService;
-import com.openhis.web.inventorymanage.dto.BusNoRequest;
-import com.openhis.web.inventorymanage.dto.BatchTransferSearchParam;
-import com.openhis.web.inventorymanage.dto.ProductTransferDto;
-import com.openhis.web.inventorymanage.dto.SupplySearchParam;
+import com.healthlink.his.web.inventorymanage.appservice.IProductTransferAppService;
+import com.healthlink.his.web.inventorymanage.dto.BusNoRequest;
+import com.healthlink.his.web.inventorymanage.dto.BatchTransferSearchParam;
+import com.healthlink.his.web.inventorymanage.dto.ProductTransferDto;
+import com.healthlink.his.web.inventorymanage.dto.SupplySearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/PurchaseInventoryController.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/PurchaseInventoryController.java
index e8e02a0c7..264772bfc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/PurchaseInventoryController.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.controller;
+package com.healthlink.his.web.inventorymanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inventorymanage.appservice.IPurchaseInventoryAppService;
-import com.openhis.web.inventorymanage.dto.BusNoRequest;
-import com.openhis.web.inventorymanage.dto.InventorySearchParam;
-import com.openhis.web.inventorymanage.dto.PurchaseInventoryDto;
+import com.healthlink.his.web.inventorymanage.appservice.IPurchaseInventoryAppService;
+import com.healthlink.his.web.inventorymanage.dto.BusNoRequest;
+import com.healthlink.his.web.inventorymanage.dto.InventorySearchParam;
+import com.healthlink.his.web.inventorymanage.dto.PurchaseInventoryDto;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseReturnController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/PurchaseReturnController.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseReturnController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/PurchaseReturnController.java
index 8531ec053..650c07a13 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseReturnController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/PurchaseReturnController.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.controller;
+package com.healthlink.his.web.inventorymanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inventorymanage.appservice.IPurchaseReturnAppService;
-import com.openhis.web.inventorymanage.dto.BusNoRequest;
-import com.openhis.web.inventorymanage.dto.PurchaseReturnDetailDto;
+import com.healthlink.his.web.inventorymanage.appservice.IPurchaseReturnAppService;
+import com.healthlink.his.web.inventorymanage.dto.BusNoRequest;
+import com.healthlink.his.web.inventorymanage.dto.PurchaseReturnDetailDto;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReceiptApprovalController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/ReceiptApprovalController.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReceiptApprovalController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/ReceiptApprovalController.java
index 30e06c900..2db9235b7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReceiptApprovalController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/ReceiptApprovalController.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.controller;
+package com.healthlink.his.web.inventorymanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inventorymanage.appservice.IReceiptApprovalAppService;
-import com.openhis.web.inventorymanage.dto.ReceiptApprovalSearchParam;
+import com.healthlink.his.web.inventorymanage.appservice.IReceiptApprovalAppService;
+import com.healthlink.his.web.inventorymanage.dto.ReceiptApprovalSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/RequisitionIssueController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/RequisitionIssueController.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/RequisitionIssueController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/RequisitionIssueController.java
index cdfdedbbf..f5b36afd6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/RequisitionIssueController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/RequisitionIssueController.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.controller;
+package com.healthlink.his.web.inventorymanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inventorymanage.appservice.IRequisitionIssueAppService;
-import com.openhis.web.inventorymanage.dto.BusNoRequest;
-import com.openhis.web.inventorymanage.dto.IssueDto;
-import com.openhis.web.inventorymanage.dto.IssueSearchParam;
+import com.healthlink.his.web.inventorymanage.appservice.IRequisitionIssueAppService;
+import com.healthlink.his.web.inventorymanage.dto.BusNoRequest;
+import com.healthlink.his.web.inventorymanage.dto.IssueDto;
+import com.healthlink.his.web.inventorymanage.dto.IssueSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReturnIssueController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/ReturnIssueController.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReturnIssueController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/ReturnIssueController.java
index b4fe18d41..949d2742f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReturnIssueController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/ReturnIssueController.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.controller;
+package com.healthlink.his.web.inventorymanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inventorymanage.appservice.IReturnIssueAppService;
-import com.openhis.web.inventorymanage.dto.BusNoRequest;
-import com.openhis.web.inventorymanage.dto.IssueDto;
-import com.openhis.web.inventorymanage.dto.IssueSearchParam;
+import com.healthlink.his.web.inventorymanage.appservice.IReturnIssueAppService;
+import com.healthlink.his.web.inventorymanage.dto.BusNoRequest;
+import com.healthlink.his.web.inventorymanage.dto.IssueDto;
+import com.healthlink.his.web.inventorymanage.dto.IssueSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/TraceNoManageController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/TraceNoManageController.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/TraceNoManageController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/TraceNoManageController.java
index 1567fdfdf..e4fd3e3b3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/TraceNoManageController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/controller/TraceNoManageController.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.controller;
+package com.healthlink.his.web.inventorymanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inventorymanage.appservice.ITraceNoAppService;
-import com.openhis.web.inventorymanage.dto.TraceNoInfoParam;
-import com.openhis.web.inventorymanage.dto.TraceNoSearchParam;
+import com.healthlink.his.web.inventorymanage.appservice.ITraceNoAppService;
+import com.healthlink.his.web.inventorymanage.dto.TraceNoInfoParam;
+import com.healthlink.his.web.inventorymanage.dto.TraceNoSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/BatchTransferSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/BatchTransferSearchParam.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/BatchTransferSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/BatchTransferSearchParam.java
index 47a379030..f15b4c5ae 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/BatchTransferSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/BatchTransferSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/BusNoRequest.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/BusNoRequest.java
similarity index 82%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/BusNoRequest.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/BusNoRequest.java
index dac1e0046..b00c3df62 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/BusNoRequest.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/BusNoRequest.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryAdjustPriceDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventoryAdjustPriceDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryAdjustPriceDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventoryAdjustPriceDto.java
index 4840bf31f..93d61dd75 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryAdjustPriceDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventoryAdjustPriceDto.java
@@ -1,9 +1,9 @@
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.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;
 import org.springframework.format.annotation.DateTimeFormat;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryBusinessInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventoryBusinessInfoDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryBusinessInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventoryBusinessInfoDto.java
index 254ab7d63..d052e15f2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryBusinessInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventoryBusinessInfoDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryDetailsPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventoryDetailsPageDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryDetailsPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventoryDetailsPageDto.java
index dfeb3da4c..96eeb6b75 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryDetailsPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventoryDetailsPageDto.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryDetailsSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventoryDetailsSearchParam.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryDetailsSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventoryDetailsSearchParam.java
index 2c062bfec..45a534209 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryDetailsSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventoryDetailsSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryReceiptDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventoryReceiptDetailDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryReceiptDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventoryReceiptDetailDto.java
index 33d50358e..845f7fe71 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryReceiptDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventoryReceiptDetailDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -6,8 +6,8 @@ import com.core.common.annotation.Excel;
 import com.core.common.annotation.ExcelExtra;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.common.annotation.Dict;
-import com.openhis.web.common.dto.UnitDto;
+import com.healthlink.his.common.annotation.Dict;
+import com.healthlink.his.web.common.dto.UnitDto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventorySearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventorySearchParam.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventorySearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventorySearchParam.java
index bf434d1ce..0d79eb78b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventorySearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventorySearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventorySettlementDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventorySettlementDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventorySettlementDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventorySettlementDto.java
index 65aecc536..5c6be6955 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventorySettlementDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventorySettlementDto.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.common.annotation.Dict;
-import com.openhis.common.enums.Whether;
+import com.healthlink.his.common.annotation.Dict;
+import com.healthlink.his.common.enums.Whether;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventorySettlementSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventorySettlementSearchParam.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventorySettlementSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventorySettlementSearchParam.java
index f1e0378ad..29bfa0527 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventorySettlementSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventorySettlementSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryStockTakeDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventoryStockTakeDetailDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryStockTakeDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventoryStockTakeDetailDto.java
index 30b34541b..12dfbbba0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryStockTakeDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventoryStockTakeDetailDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryTransferDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventoryTransferDetailDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryTransferDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventoryTransferDetailDto.java
index a64a33c42..b5dee3bc5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryTransferDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/InventoryTransferDetailDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDepartmentDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/IssueDepartmentDto.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDepartmentDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/IssueDepartmentDto.java
index 2b9586718..f2c3930ce 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDepartmentDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/IssueDepartmentDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/IssueDetailDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/IssueDetailDto.java
index 943f5ce6f..0e57497c2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/IssueDetailDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -10,8 +10,8 @@ import com.core.common.annotation.ExcelExtra;
 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.openhis.web.common.dto.UnitDto;
+import com.healthlink.his.common.annotation.Dict;
+import com.healthlink.his.web.common.dto.UnitDto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/IssueDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/IssueDto.java
index 115441f79..367d36b5e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/IssueDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/IssueInitDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/IssueInitDto.java
index cd3bc7033..770cca9d0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/IssueInitDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssuePageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/IssuePageDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssuePageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/IssuePageDto.java
index 9972162d3..b4f3c00db 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssuePageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/IssuePageDto.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.core.common.annotation.Excel;
 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;
 import org.springframework.format.annotation.NumberFormat;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/IssueSearchParam.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/IssueSearchParam.java
index 99edcf1fd..4746863ba 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/IssueSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ItemChargeDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ItemChargeDetailDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ItemChargeDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ItemChargeDetailDto.java
index 9cfedf768..8eac26f6c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ItemChargeDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ItemChargeDetailDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LocationQueryDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/LocationQueryDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LocationQueryDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/LocationQueryDto.java
index a40f55b71..5f68584a8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LocationQueryDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/LocationQueryDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReceiptDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/LossReceiptDetailDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReceiptDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/LossReceiptDetailDto.java
index 93b95cfea..f5e806a16 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReceiptDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/LossReceiptDetailDto.java
@@ -1,11 +1,11 @@
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.core.common.annotation.Excel;
 import com.core.common.annotation.ExcelExtra;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.common.annotation.Dict;
-import com.openhis.web.common.dto.UnitDto;
+import com.healthlink.his.common.annotation.Dict;
+import com.healthlink.his.web.common.dto.UnitDto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/LossReportFormDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/LossReportFormDto.java
index 32c67fc8d..947bd5454 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/LossReportFormDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/LossReportFormInitDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/LossReportFormInitDto.java
index a4fdbef3f..ceff4ef53 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/LossReportFormInitDto.java
@@ -1,9 +1,9 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
-import com.openhis.web.basedatamanage.dto.LocationDto;
+import com.healthlink.his.web.basedatamanage.dto.LocationDto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/LossReportFormPageDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/LossReportFormPageDto.java
index a94bc035d..11cf1a12d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/LossReportFormPageDto.java
@@ -1,9 +1,9 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/LossReportSearchParam.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/LossReportSearchParam.java
index 328ceb5e9..44b178025 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/LossReportSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductDetailInitDto.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductDetailInitDto.java
index 52569eccc..dd69272cf 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductDetailInitDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductDetailPageDto.java
similarity index 99%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductDetailPageDto.java
index 7b4801f08..32049f0de 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductDetailPageDto.java
@@ -1,10 +1,10 @@
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.core.common.annotation.Excel;
 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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductDetailSearchParam.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductDetailSearchParam.java
index 6dcaaf735..8fbe6e693 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductDetailSearchParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductStocktakingDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductStocktakingDto.java
index 5ad1a4063..676e1d09e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductStocktakingDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductStocktakingInitDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductStocktakingInitDto.java
index 0cd7becc9..b605d60dc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductStocktakingInitDto.java
@@ -1,9 +1,9 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
-import com.openhis.web.basedatamanage.dto.LocationDto;
+import com.healthlink.his.web.basedatamanage.dto.LocationDto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductStocktakingSearchParam.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductStocktakingSearchParam.java
index 6c3a21d74..260964140 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductStocktakingSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductTransferDetailDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductTransferDetailDto.java
index f42b86f1a..ddf06aa77 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductTransferDetailDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -11,8 +11,8 @@ import com.core.common.annotation.ExcelExtra;
 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.openhis.web.common.dto.UnitDto;
+import com.healthlink.his.common.annotation.Dict;
+import com.healthlink.his.web.common.dto.UnitDto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductTransferDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductTransferDto.java
index acb5db39e..2b77e0d91 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductTransferDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductTransferInitDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductTransferInitDto.java
index 0187a293d..bf5cde243 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductTransferInitDto.java
@@ -1,9 +1,9 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
-import com.openhis.web.basedatamanage.dto.LocationDto;
+import com.healthlink.his.web.basedatamanage.dto.LocationDto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductTransferPageDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductTransferPageDto.java
index 76793bb20..2e7a28312 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ProductTransferPageDto.java
@@ -1,14 +1,14 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.core.common.annotation.Excel;
 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;
 import org.springframework.format.annotation.NumberFormat;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/PurchaseInventoryDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/PurchaseInventoryDto.java
index 94753040d..ca0dd7743 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/PurchaseInventoryDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/PurchaseInventoryInitDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/PurchaseInventoryInitDto.java
index 54fa836d4..8feaff373 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/PurchaseInventoryInitDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/PurchaseReturnDetailDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/PurchaseReturnDetailDto.java
index ec604d452..ea0568f9c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/PurchaseReturnDetailDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -10,8 +10,8 @@ import com.core.common.annotation.ExcelExtra;
 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.openhis.web.common.dto.UnitDto;
+import com.healthlink.his.common.annotation.Dict;
+import com.healthlink.his.web.common.dto.UnitDto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/PurchaseReturnInitDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/PurchaseReturnInitDto.java
index e9a22d8d2..78e8ad1dc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/PurchaseReturnInitDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/PurchaseReturnPageDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/PurchaseReturnPageDto.java
index dbc3bea96..ecbe6baf3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/PurchaseReturnPageDto.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 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;
 import org.springframework.format.annotation.DateTimeFormat;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/PurchaseReturnSearchParam.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/PurchaseReturnSearchParam.java
index 95535aaff..8aa97c36e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/PurchaseReturnSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptApprovalSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ReceiptApprovalSearchParam.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptApprovalSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ReceiptApprovalSearchParam.java
index 495767679..949b8332b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptApprovalSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ReceiptApprovalSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ReceiptDetailDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ReceiptDetailDto.java
index a62e48559..ab69a62f1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ReceiptDetailDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -9,8 +9,8 @@ import com.core.common.annotation.Excel;
 import com.core.common.annotation.ExcelExtra;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.common.annotation.Dict;
-import com.openhis.web.common.dto.UnitDto;
+import com.healthlink.his.common.annotation.Dict;
+import com.healthlink.his.web.common.dto.UnitDto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ReceiptInitDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ReceiptInitDto.java
index de8d7f684..ba0af619a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ReceiptInitDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ReceiptPageDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ReceiptPageDto.java
index 117d05fd2..6e442cc5a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/ReceiptPageDto.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.core.common.annotation.Excel;
 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;
 import org.springframework.format.annotation.DateTimeFormat;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/RequisitionOutDetailDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/RequisitionOutDetailDto.java
index b6d88415c..dac0887dc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/RequisitionOutDetailDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/RequisitionOutSearchParam.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/RequisitionOutSearchParam.java
index 3304310c2..077d72362 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/RequisitionOutSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/StocktakingBatchSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/StocktakingBatchSearchParam.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/StocktakingBatchSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/StocktakingBatchSearchParam.java
index cb0b1c9f0..bd40efec8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/StocktakingBatchSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/StocktakingBatchSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplyItemDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/SupplyItemDetailDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplyItemDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/SupplyItemDetailDto.java
index a5cdcdaeb..0a4ea6c29 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplyItemDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/SupplyItemDetailDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplySearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/SupplySearchParam.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplySearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/SupplySearchParam.java
index 028ef6361..5088206c0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplySearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/SupplySearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoDetailsPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/TraceNoDetailsPageDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoDetailsPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/TraceNoDetailsPageDto.java
index b591992ad..b79e98dc4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoDetailsPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/TraceNoDetailsPageDto.java
@@ -1,14 +1,14 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoInfoParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/TraceNoInfoParam.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoInfoParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/TraceNoInfoParam.java
index 73de120de..8e2fba04f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoInfoParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/TraceNoInfoParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/TraceNoInitDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/TraceNoInitDto.java
index b20ed9df3..c50700486 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/TraceNoInitDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/TraceNoSearchParam.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/TraceNoSearchParam.java
index 396ca0b1f..32695ace6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/dto/TraceNoSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.dto;
+package com.healthlink.his.web.inventorymanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryAdjustPriceMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/InventoryAdjustPriceMapper.java
similarity index 82%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryAdjustPriceMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/InventoryAdjustPriceMapper.java
index 782121b81..4305c1f77 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryAdjustPriceMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/InventoryAdjustPriceMapper.java
@@ -1,11 +1,11 @@
-package com.openhis.web.inventorymanage.mapper;
+package com.healthlink.his.web.inventorymanage.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.ChangePricePageDto;
-import com.openhis.web.inventorymanage.dto.ReceiptApprovalSearchParam;
-import com.openhis.web.inventorymanage.dto.ReceiptPageDto;
+import com.healthlink.his.web.adjustprice.dto.ChangePricePageDto;
+import com.healthlink.his.web.inventorymanage.dto.ReceiptApprovalSearchParam;
+import com.healthlink.his.web.inventorymanage.dto.ReceiptPageDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryDetailsMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/InventoryDetailsMapper.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryDetailsMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/InventoryDetailsMapper.java
index c7e406189..3e78b8972 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryDetailsMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/InventoryDetailsMapper.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.mapper;
+package com.healthlink.his.web.inventorymanage.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.inventorymanage.dto.InventoryDetailsPageDto;
-import com.openhis.web.inventorymanage.dto.InventoryDetailsSearchParam;
+import com.healthlink.his.web.inventorymanage.dto.InventoryDetailsPageDto;
+import com.healthlink.his.web.inventorymanage.dto.InventoryDetailsSearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventorySettlementAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/InventorySettlementAppMapper.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventorySettlementAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/InventorySettlementAppMapper.java
index 944129bd9..c67a8c79a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventorySettlementAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/InventorySettlementAppMapper.java
@@ -1,14 +1,14 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.mapper;
+package com.healthlink.his.web.inventorymanage.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.inventorymanage.dto.InventoryBusinessInfoDto;
-import com.openhis.web.inventorymanage.dto.InventorySettlementDto;
-import com.openhis.web.inventorymanage.dto.InventorySettlementSearchParam;
+import com.healthlink.his.web.inventorymanage.dto.InventoryBusinessInfoDto;
+import com.healthlink.his.web.inventorymanage.dto.InventorySettlementDto;
+import com.healthlink.his.web.inventorymanage.dto.InventorySettlementSearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/LossReportFormMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/LossReportFormMapper.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/LossReportFormMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/LossReportFormMapper.java
index a2d9c449c..bc7a7ba12 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/LossReportFormMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/LossReportFormMapper.java
@@ -1,15 +1,15 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.mapper;
+package com.healthlink.his.web.inventorymanage.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.inventorymanage.dto.LossReceiptDetailDto;
-import com.openhis.web.inventorymanage.dto.LossReportFormPageDto;
-import com.openhis.web.inventorymanage.dto.LossReportSearchParam;
-import com.openhis.web.inventorymanage.dto.ReceiptDetailDto;
+import com.healthlink.his.web.inventorymanage.dto.LossReceiptDetailDto;
+import com.healthlink.his.web.inventorymanage.dto.LossReportFormPageDto;
+import com.healthlink.his.web.inventorymanage.dto.LossReportSearchParam;
+import com.healthlink.his.web.inventorymanage.dto.ReceiptDetailDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductDetailAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/ProductDetailAppMapper.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductDetailAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/ProductDetailAppMapper.java
index e03c22803..680845d43 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductDetailAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/ProductDetailAppMapper.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.mapper;
+package com.healthlink.his.web.inventorymanage.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.inventorymanage.dto.ProductDetailPageDto;
-import com.openhis.web.inventorymanage.dto.ProductDetailSearchParam;
+import com.healthlink.his.web.inventorymanage.dto.ProductDetailPageDto;
+import com.healthlink.his.web.inventorymanage.dto.ProductDetailSearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductStocktakingMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/ProductStocktakingMapper.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductStocktakingMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/ProductStocktakingMapper.java
index ac4fec482..c3fe1c7ce 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductStocktakingMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/ProductStocktakingMapper.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.mapper;
+package com.healthlink.his.web.inventorymanage.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.inventorymanage.dto.*;
+import com.healthlink.his.web.inventorymanage.dto.*;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductTransferMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/ProductTransferMapper.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductTransferMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/ProductTransferMapper.java
index a0299569a..fc05a0346 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductTransferMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/ProductTransferMapper.java
@@ -1,15 +1,15 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.mapper;
+package com.healthlink.his.web.inventorymanage.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.inventorymanage.dto.ProductTransferDetailDto;
-import com.openhis.web.inventorymanage.dto.ProductTransferPageDto;
-import com.openhis.web.inventorymanage.dto.ReceiptDetailDto;
-import com.openhis.web.inventorymanage.dto.SupplySearchParam;
+import com.healthlink.his.web.inventorymanage.dto.ProductTransferDetailDto;
+import com.healthlink.his.web.inventorymanage.dto.ProductTransferPageDto;
+import com.healthlink.his.web.inventorymanage.dto.ReceiptDetailDto;
+import com.healthlink.his.web.inventorymanage.dto.SupplySearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseInventoryMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/PurchaseInventoryMapper.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseInventoryMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/PurchaseInventoryMapper.java
index 273ec3583..508ba4fcf 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseInventoryMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/PurchaseInventoryMapper.java
@@ -1,14 +1,14 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.mapper;
+package com.healthlink.his.web.inventorymanage.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.inventorymanage.dto.InventorySearchParam;
-import com.openhis.web.inventorymanage.dto.ReceiptDetailDto;
-import com.openhis.web.inventorymanage.dto.ReceiptPageDto;
+import com.healthlink.his.web.inventorymanage.dto.InventorySearchParam;
+import com.healthlink.his.web.inventorymanage.dto.ReceiptDetailDto;
+import com.healthlink.his.web.inventorymanage.dto.ReceiptPageDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseReturnMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/PurchaseReturnMapper.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseReturnMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/PurchaseReturnMapper.java
index 468363e6c..8d52163fc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseReturnMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/PurchaseReturnMapper.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.mapper;
+package com.healthlink.his.web.inventorymanage.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.openhis.web.inventorymanage.dto.PurchaseReturnDetailDto;
-import com.openhis.web.inventorymanage.dto.PurchaseReturnPageDto;
+import com.healthlink.his.web.inventorymanage.dto.PurchaseReturnDetailDto;
+import com.healthlink.his.web.inventorymanage.dto.PurchaseReturnPageDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ReceiptApprovalMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/ReceiptApprovalMapper.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ReceiptApprovalMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/ReceiptApprovalMapper.java
index b4a170db3..65fbb887d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ReceiptApprovalMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/ReceiptApprovalMapper.java
@@ -1,17 +1,17 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.mapper;
+package com.healthlink.his.web.inventorymanage.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.openhis.web.inventorymanage.dto.ItemChargeDetailDto;
-import com.openhis.web.inventorymanage.dto.ReceiptApprovalSearchParam;
-import com.openhis.web.inventorymanage.dto.ReceiptPageDto;
-import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
-import com.openhis.workflow.domain.SupplyRequest;
+import com.healthlink.his.web.inventorymanage.dto.ItemChargeDetailDto;
+import com.healthlink.his.web.inventorymanage.dto.ReceiptApprovalSearchParam;
+import com.healthlink.his.web.inventorymanage.dto.ReceiptPageDto;
+import com.healthlink.his.web.inventorymanage.dto.SupplyItemDetailDto;
+import com.healthlink.his.workflow.domain.SupplyRequest;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/RequisitionIssueMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/RequisitionIssueMapper.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/RequisitionIssueMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/RequisitionIssueMapper.java
index 9fb4019df..e54851175 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/RequisitionIssueMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/RequisitionIssueMapper.java
@@ -1,15 +1,15 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.mapper;
+package com.healthlink.his.web.inventorymanage.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.inventorymanage.dto.IssueDepartmentDto;
-import com.openhis.web.inventorymanage.dto.IssueDetailDto;
-import com.openhis.web.inventorymanage.dto.IssuePageDto;
-import com.openhis.web.inventorymanage.dto.IssueSearchParam;
+import com.healthlink.his.web.inventorymanage.dto.IssueDepartmentDto;
+import com.healthlink.his.web.inventorymanage.dto.IssueDetailDto;
+import com.healthlink.his.web.inventorymanage.dto.IssuePageDto;
+import com.healthlink.his.web.inventorymanage.dto.IssueSearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ReturnIssueMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/ReturnIssueMapper.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ReturnIssueMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/ReturnIssueMapper.java
index 8d548c3e6..ac27f7d52 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ReturnIssueMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/ReturnIssueMapper.java
@@ -1,15 +1,15 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.mapper;
+package com.healthlink.his.web.inventorymanage.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.inventorymanage.dto.IssueDepartmentDto;
-import com.openhis.web.inventorymanage.dto.IssueDetailDto;
-import com.openhis.web.inventorymanage.dto.IssuePageDto;
-import com.openhis.web.inventorymanage.dto.IssueSearchParam;
+import com.healthlink.his.web.inventorymanage.dto.IssueDepartmentDto;
+import com.healthlink.his.web.inventorymanage.dto.IssueDetailDto;
+import com.healthlink.his.web.inventorymanage.dto.IssuePageDto;
+import com.healthlink.his.web.inventorymanage.dto.IssueSearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/TraceNoAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/TraceNoAppMapper.java
similarity index 81%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/TraceNoAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/TraceNoAppMapper.java
index 9374c8d45..56d3bf38c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/TraceNoAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/mapper/TraceNoAppMapper.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.inventorymanage.mapper;
+package com.healthlink.his.web.inventorymanage.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.inventorymanage.dto.TraceNoDetailsPageDto;
-import com.openhis.web.inventorymanage.dto.TraceNoSearchParam;
+import com.healthlink.his.web.inventorymanage.dto.TraceNoDetailsPageDto;
+import com.healthlink.his.web.inventorymanage.dto.TraceNoSearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/appservice/IReviewPrescriptionRecordsAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/jlau/appservice/IReviewPrescriptionRecordsAppService.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/appservice/IReviewPrescriptionRecordsAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/jlau/appservice/IReviewPrescriptionRecordsAppService.java
index 1efbfbc6f..6d8c6d989 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/appservice/IReviewPrescriptionRecordsAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/jlau/appservice/IReviewPrescriptionRecordsAppService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.jlau.appservice;
+package com.healthlink.his.web.jlau.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.jlau.dto.ReviewPrescriptionRecordsDto;
+import com.healthlink.his.web.jlau.dto.ReviewPrescriptionRecordsDto;
 
 /**
  * 农大审方记录 应用Service
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/appservice/impl/ReviewPrescriptionRecordsAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/jlau/appservice/impl/ReviewPrescriptionRecordsAppServiceImpl.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/appservice/impl/ReviewPrescriptionRecordsAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/jlau/appservice/impl/ReviewPrescriptionRecordsAppServiceImpl.java
index f83559dfe..c70bf65ab 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/appservice/impl/ReviewPrescriptionRecordsAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/jlau/appservice/impl/ReviewPrescriptionRecordsAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.jlau.appservice.impl;
+package com.healthlink.his.web.jlau.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.core.common.core.domain.R;
@@ -6,16 +6,16 @@ import com.core.common.exception.ServiceException;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
-import com.openhis.administration.domain.ChargeItem;
-import com.openhis.administration.service.IChargeItemService;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.ChargeItemStatus;
-import com.openhis.common.enums.Whether;
-import com.openhis.jlau.domain.ReviewPrescriptionRecords;
-import com.openhis.jlau.service.IReviewPrescriptionRecordsService;
-import com.openhis.web.jlau.appservice.IReviewPrescriptionRecordsAppService;
-import com.openhis.web.jlau.dto.ReviewPrescriptionRecordsDto;
-import com.openhis.web.jlau.mapper.ReviewPrescriptionRecordsAppMapper;
+import com.healthlink.his.administration.domain.ChargeItem;
+import com.healthlink.his.administration.service.IChargeItemService;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.ChargeItemStatus;
+import com.healthlink.his.common.enums.Whether;
+import com.healthlink.his.jlau.domain.ReviewPrescriptionRecords;
+import com.healthlink.his.jlau.service.IReviewPrescriptionRecordsService;
+import com.healthlink.his.web.jlau.appservice.IReviewPrescriptionRecordsAppService;
+import com.healthlink.his.web.jlau.dto.ReviewPrescriptionRecordsDto;
+import com.healthlink.his.web.jlau.mapper.ReviewPrescriptionRecordsAppMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/controller/ReviewPrescriptionRecordsController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/jlau/controller/ReviewPrescriptionRecordsController.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/controller/ReviewPrescriptionRecordsController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/jlau/controller/ReviewPrescriptionRecordsController.java
index e630b5730..7cb31211f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/controller/ReviewPrescriptionRecordsController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/jlau/controller/ReviewPrescriptionRecordsController.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.jlau.controller;
+package com.healthlink.his.web.jlau.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.jlau.appservice.IReviewPrescriptionRecordsAppService;
-import com.openhis.web.jlau.dto.ReviewPrescriptionRecordsDto;
+import com.healthlink.his.web.jlau.appservice.IReviewPrescriptionRecordsAppService;
+import com.healthlink.his.web.jlau.dto.ReviewPrescriptionRecordsDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/dto/ReviewPrescriptionRecordsDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/jlau/dto/ReviewPrescriptionRecordsDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/dto/ReviewPrescriptionRecordsDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/jlau/dto/ReviewPrescriptionRecordsDto.java
index 4c70dfc48..a53c8ee1d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/dto/ReviewPrescriptionRecordsDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/jlau/dto/ReviewPrescriptionRecordsDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.jlau.dto;
+package com.healthlink.his.web.jlau.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/mapper/ReviewPrescriptionRecordsAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/jlau/mapper/ReviewPrescriptionRecordsAppMapper.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/mapper/ReviewPrescriptionRecordsAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/jlau/mapper/ReviewPrescriptionRecordsAppMapper.java
index 319a73ea6..1d0a51c5e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/mapper/ReviewPrescriptionRecordsAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/jlau/mapper/ReviewPrescriptionRecordsAppMapper.java
@@ -1,6 +1,6 @@
-package com.openhis.web.jlau.mapper;
+package com.healthlink.his.web.jlau.mapper;
 
-import com.openhis.web.jlau.dto.ReviewPrescriptionRecordsDto;
+import com.healthlink.his.web.jlau.dto.ReviewPrescriptionRecordsDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/appservice/ILabActivityDefinitionAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/lab/appservice/ILabActivityDefinitionAppService.java
similarity index 83%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/appservice/ILabActivityDefinitionAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/lab/appservice/ILabActivityDefinitionAppService.java
index 11fa0952f..614a760aa 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/appservice/ILabActivityDefinitionAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/lab/appservice/ILabActivityDefinitionAppService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.lab.appservice;
+package com.healthlink.his.web.lab.appservice;
 
-import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam;
-import com.openhis.web.datadictionary.dto.DiagnosisTreatmentUpDto;
+import com.healthlink.his.web.datadictionary.dto.DiagnosisTreatmentSelParam;
+import com.healthlink.his.web.datadictionary.dto.DiagnosisTreatmentUpDto;
 import com.core.common.core.domain.R;
 
 import jakarta.servlet.http.HttpServletRequest;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/appservice/impl/LabActivityDefinitionAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/lab/appservice/impl/LabActivityDefinitionAppServiceImpl.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/appservice/impl/LabActivityDefinitionAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/lab/appservice/impl/LabActivityDefinitionAppServiceImpl.java
index 17958ff5b..b9fd1616b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/appservice/impl/LabActivityDefinitionAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/lab/appservice/impl/LabActivityDefinitionAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.lab.appservice.impl;
+package com.healthlink.his.web.lab.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,21 +7,21 @@ import com.core.common.core.domain.R;
 import com.core.common.core.domain.model.LoginUser;
 import com.core.common.utils.*;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.ActivityType;
-import com.openhis.common.enums.PublicationStatus;
-import com.openhis.common.enums.Whether;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.ActivityType;
+import com.healthlink.his.common.enums.PublicationStatus;
+import com.healthlink.his.common.enums.Whether;
 import com.core.common.utils.ChineseConvertUtils;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.common.enums.AssignSeqEnum;
-import com.openhis.lab.domain.LabActivityDefinition;
-import com.openhis.lab.service.ILabActivityDefinitionService;
-import com.openhis.web.datadictionary.dto.DiagnosisTreatmentDto;
-import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam;
-import com.openhis.web.datadictionary.dto.DiagnosisTreatmentUpDto;
-import com.openhis.web.lab.appservice.ILabActivityDefinitionAppService;
-import com.openhis.web.datadictionary.mapper.LabActivityDefinitionManageMapper;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.common.enums.AssignSeqEnum;
+import com.healthlink.his.lab.domain.LabActivityDefinition;
+import com.healthlink.his.lab.service.ILabActivityDefinitionService;
+import com.healthlink.his.web.datadictionary.dto.DiagnosisTreatmentDto;
+import com.healthlink.his.web.datadictionary.dto.DiagnosisTreatmentSelParam;
+import com.healthlink.his.web.datadictionary.dto.DiagnosisTreatmentUpDto;
+import com.healthlink.his.web.lab.appservice.ILabActivityDefinitionAppService;
+import com.healthlink.his.web.datadictionary.mapper.LabActivityDefinitionManageMapper;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/controller/InspectionPackageController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/lab/controller/InspectionPackageController.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/controller/InspectionPackageController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/lab/controller/InspectionPackageController.java
index a011a243b..884d2d6e9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/controller/InspectionPackageController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/lab/controller/InspectionPackageController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.lab.controller;
+package com.healthlink.his.web.lab.controller;
 
 import com.core.common.core.controller.BaseController;
 import com.core.common.core.domain.AjaxResult;
 import com.core.common.core.page.TableDataInfo;
-import com.openhis.lab.domain.InspectionPackage;
-import com.openhis.lab.domain.InspectionPackageDetail;
-import com.openhis.lab.service.IInspectionPackageDetailService;
-import com.openhis.lab.service.IInspectionPackageService;
+import com.healthlink.his.lab.domain.InspectionPackage;
+import com.healthlink.his.lab.domain.InspectionPackageDetail;
+import com.healthlink.his.lab.service.IInspectionPackageDetailService;
+import com.healthlink.his.lab.service.IInspectionPackageService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.transaction.support.TransactionTemplate;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/controller/InspectionTypeController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/lab/controller/InspectionTypeController.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/controller/InspectionTypeController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/lab/controller/InspectionTypeController.java
index 3788df59b..87a445042 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/controller/InspectionTypeController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/lab/controller/InspectionTypeController.java
@@ -1,11 +1,11 @@
-package com.openhis.web.lab.controller;
+package com.healthlink.his.web.lab.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.controller.BaseController;
 import com.core.common.core.domain.AjaxResult;
-import com.openhis.lab.domain.InspectionType;
-import com.openhis.lab.service.IInspectionTypeService;
+import com.healthlink.his.lab.domain.InspectionType;
+import com.healthlink.his.lab.service.IInspectionTypeService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.transaction.support.TransactionTemplate;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/controller/LabActivityDefinitionController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/lab/controller/LabActivityDefinitionController.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/controller/LabActivityDefinitionController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/lab/controller/LabActivityDefinitionController.java
index 1653890d8..c0464e7f5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/controller/LabActivityDefinitionController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/lab/controller/LabActivityDefinitionController.java
@@ -1,9 +1,9 @@
-package com.openhis.web.lab.controller;
+package com.healthlink.his.web.lab.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam;
-import com.openhis.web.datadictionary.dto.DiagnosisTreatmentUpDto;
-import com.openhis.web.lab.appservice.ILabActivityDefinitionAppService;
+import com.healthlink.his.web.datadictionary.dto.DiagnosisTreatmentSelParam;
+import com.healthlink.his.web.datadictionary.dto.DiagnosisTreatmentUpDto;
+import com.healthlink.his.web.lab.appservice.ILabActivityDefinitionAppService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialCommonService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialCommonService.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialCommonService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialCommonService.java
index 60ca2ce54..5b210a41a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialCommonService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialCommonService.java
@@ -1,8 +1,8 @@
-package com.openhis.web.materialmanage.appservice;
+package com.healthlink.his.web.materialmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.materialmanage.dto.MaterialInitDto;
-import com.openhis.web.materialmanage.dto.MaterialSearchParam;
+import com.healthlink.his.web.materialmanage.dto.MaterialInitDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialSearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialProfitLossOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialProfitLossOrderService.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialProfitLossOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialProfitLossOrderService.java
index ea256af0a..803db3557 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialProfitLossOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialProfitLossOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.materialmanage.appservice;
+package com.healthlink.his.web.materialmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialPurchaseOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialPurchaseOrderService.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialPurchaseOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialPurchaseOrderService.java
index fbfa0966e..e9c21914e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialPurchaseOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialPurchaseOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.materialmanage.appservice;
+package com.healthlink.his.web.materialmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReceiptApprovalService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialReceiptApprovalService.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReceiptApprovalService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialReceiptApprovalService.java
index 136374cd7..a697557fc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReceiptApprovalService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialReceiptApprovalService.java
@@ -1,8 +1,8 @@
-package com.openhis.web.materialmanage.appservice;
+package com.healthlink.his.web.materialmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inventorymanage.dto.ItemChargeDetailDto;
-import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
+import com.healthlink.his.web.inventorymanage.dto.ItemChargeDetailDto;
+import com.healthlink.his.web.inventorymanage.dto.SupplyItemDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReturnOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialReturnOrderService.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReturnOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialReturnOrderService.java
index eddd90e2f..2486f8239 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReturnOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialReturnOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.materialmanage.appservice;
+package com.healthlink.his.web.materialmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReturnToWarehouseOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialReturnToWarehouseOrderService.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReturnToWarehouseOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialReturnToWarehouseOrderService.java
index 8193d1ea8..693ff908f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReturnToWarehouseOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialReturnToWarehouseOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.materialmanage.appservice;
+package com.healthlink.his.web.materialmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStockInOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialStockInOrderService.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStockInOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialStockInOrderService.java
index dda58bedc..deec08298 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStockInOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialStockInOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.materialmanage.appservice;
+package com.healthlink.his.web.materialmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStockOutOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialStockOutOrderService.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStockOutOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialStockOutOrderService.java
index da39e8128..b8ed2a7fc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStockOutOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialStockOutOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.materialmanage.appservice;
+package com.healthlink.his.web.materialmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStocktakingOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialStocktakingOrderService.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStocktakingOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialStocktakingOrderService.java
index bc13f0c43..e9cb62ecc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStocktakingOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialStocktakingOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.materialmanage.appservice;
+package com.healthlink.his.web.materialmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialTransferInOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialTransferInOrderService.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialTransferInOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialTransferInOrderService.java
index e84c19d54..26d70498b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialTransferInOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialTransferInOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.materialmanage.appservice;
+package com.healthlink.his.web.materialmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialTransferOutOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialTransferOutOrderService.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialTransferOutOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialTransferOutOrderService.java
index 90fb0bb37..e5fe521a6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialTransferOutOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/IMaterialTransferOutOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.materialmanage.appservice;
+package com.healthlink.his.web.materialmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.materialmanage.dto.MaterialDetailDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialCommonServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialCommonServiceImpl.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialCommonServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialCommonServiceImpl.java
index 0823afa97..16ef228ad 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialCommonServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialCommonServiceImpl.java
@@ -1,30 +1,30 @@
-package com.openhis.web.materialmanage.appservice.impl;
+package com.healthlink.his.web.materialmanage.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.Organization;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.domain.Supplier;
-import com.openhis.administration.service.IOrganizationService;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.administration.service.ISupplierService;
-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.web.common.appservice.ICommonService;
-import com.openhis.web.common.dto.LocationDto;
-import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
-import com.openhis.web.materialmanage.dto.MaterialDeviceInfoDto;
-import com.openhis.web.materialmanage.dto.MaterialDto;
-import com.openhis.web.materialmanage.dto.MaterialInitDto;
-import com.openhis.web.materialmanage.dto.MaterialSearchParam;
-import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+import com.healthlink.his.administration.domain.Organization;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.domain.Supplier;
+import com.healthlink.his.administration.service.IOrganizationService;
+import com.healthlink.his.administration.service.IPractitionerService;
+import com.healthlink.his.administration.service.ISupplierService;
+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.web.common.appservice.ICommonService;
+import com.healthlink.his.web.common.dto.LocationDto;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialCommonService;
+import com.healthlink.his.web.materialmanage.dto.MaterialDeviceInfoDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialInitDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialSearchParam;
+import com.healthlink.his.web.materialmanage.mapper.MaterialCommonMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialProfitLossOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialProfitLossOrderServiceImpl.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialProfitLossOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialProfitLossOrderServiceImpl.java
index a56fa32d4..1485a2d12 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialProfitLossOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialProfitLossOrderServiceImpl.java
@@ -1,22 +1,22 @@
-package com.openhis.web.materialmanage.appservice.impl;
+package com.healthlink.his.web.materialmanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
-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.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
-import com.openhis.web.materialmanage.appservice.IMaterialProfitLossOrderService;
-import com.openhis.web.materialmanage.dto.MaterialDetailDto;
-import com.openhis.web.materialmanage.dto.MaterialInitDto;
-import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialCommonService;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialProfitLossOrderService;
+import com.healthlink.his.web.materialmanage.dto.MaterialDetailDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialInitDto;
+import com.healthlink.his.web.materialmanage.mapper.MaterialCommonMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialPurchaseOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialPurchaseOrderServiceImpl.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialPurchaseOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialPurchaseOrderServiceImpl.java
index bf17e5a09..500ffdc80 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialPurchaseOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialPurchaseOrderServiceImpl.java
@@ -1,21 +1,21 @@
-package com.openhis.web.materialmanage.appservice.impl;
+package com.healthlink.his.web.materialmanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.MessageUtils;
-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.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
-import com.openhis.web.materialmanage.appservice.IMaterialPurchaseOrderService;
-import com.openhis.web.materialmanage.dto.MaterialDetailDto;
-import com.openhis.web.materialmanage.dto.MaterialInitDto;
-import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialCommonService;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialPurchaseOrderService;
+import com.healthlink.his.web.materialmanage.dto.MaterialDetailDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialInitDto;
+import com.healthlink.his.web.materialmanage.mapper.MaterialCommonMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReceiptApprovalServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialReceiptApprovalServiceImpl.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReceiptApprovalServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialReceiptApprovalServiceImpl.java
index 7b63690c5..3376a07b4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReceiptApprovalServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialReceiptApprovalServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.materialmanage.appservice.impl;
+package com.healthlink.his.web.materialmanage.appservice.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -7,35 +7,35 @@ import com.core.common.exception.ServiceException;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.ChargeItemDefDetail;
-import com.openhis.administration.service.IChargeItemDefDetailService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.*;
-import com.openhis.common.enums.ybenums.YbInvChgType;
-import com.openhis.common.enums.ybenums.YbRxFlag;
-import com.openhis.medication.domain.MedicationDispense;
-import com.openhis.medication.service.IMedicationDispenseService;
-import com.openhis.web.inventorymanage.appservice.IReceiptApprovalAppService;
-import com.openhis.web.inventorymanage.appservice.ITraceNoAppService;
-import com.openhis.web.inventorymanage.assembler.InventoryManageAssembler;
-import com.openhis.web.inventorymanage.dto.ItemChargeDetailDto;
-import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
-import com.openhis.web.inventorymanage.mapper.ReceiptApprovalMapper;
-import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
-import com.openhis.workflow.domain.DeviceDispense;
-import com.openhis.workflow.domain.InventoryItem;
-import com.openhis.workflow.domain.SupplyDelivery;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.IDeviceDispenseService;
-import com.openhis.workflow.service.IInventoryItemService;
-import com.openhis.workflow.service.ISupplyDeliveryService;
-import com.openhis.workflow.service.ISupplyRequestService;
-import com.openhis.yb.dto.Medical3503Param;
-import com.openhis.yb.dto.MedicalInventory3501Param;
-import com.openhis.yb.dto.MedicalInventory3502Param;
-import com.openhis.yb.dto.MedicalPurchase3504Param;
-import com.openhis.yb.service.YbManager;
+import com.healthlink.his.administration.domain.ChargeItemDefDetail;
+import com.healthlink.his.administration.service.IChargeItemDefDetailService;
+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.enums.ybenums.YbInvChgType;
+import com.healthlink.his.common.enums.ybenums.YbRxFlag;
+import com.healthlink.his.medication.domain.MedicationDispense;
+import com.healthlink.his.medication.service.IMedicationDispenseService;
+import com.healthlink.his.web.inventorymanage.appservice.IReceiptApprovalAppService;
+import com.healthlink.his.web.inventorymanage.appservice.ITraceNoAppService;
+import com.healthlink.his.web.inventorymanage.assembler.InventoryManageAssembler;
+import com.healthlink.his.web.inventorymanage.dto.ItemChargeDetailDto;
+import com.healthlink.his.web.inventorymanage.dto.SupplyItemDetailDto;
+import com.healthlink.his.web.inventorymanage.mapper.ReceiptApprovalMapper;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialReceiptApprovalService;
+import com.healthlink.his.workflow.domain.DeviceDispense;
+import com.healthlink.his.workflow.domain.InventoryItem;
+import com.healthlink.his.workflow.domain.SupplyDelivery;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.IDeviceDispenseService;
+import com.healthlink.his.workflow.service.IInventoryItemService;
+import com.healthlink.his.workflow.service.ISupplyDeliveryService;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
+import com.healthlink.his.yb.dto.Medical3503Param;
+import com.healthlink.his.yb.dto.MedicalInventory3501Param;
+import com.healthlink.his.yb.dto.MedicalInventory3502Param;
+import com.healthlink.his.yb.dto.MedicalPurchase3504Param;
+import com.healthlink.his.yb.service.YbManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReturnOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialReturnOrderServiceImpl.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReturnOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialReturnOrderServiceImpl.java
index 95cbe053e..b01956fd4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReturnOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialReturnOrderServiceImpl.java
@@ -1,22 +1,22 @@
-package com.openhis.web.materialmanage.appservice.impl;
+package com.healthlink.his.web.materialmanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
-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.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
-import com.openhis.web.materialmanage.appservice.IMaterialReturnOrderService;
-import com.openhis.web.materialmanage.dto.MaterialDetailDto;
-import com.openhis.web.materialmanage.dto.MaterialInitDto;
-import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialCommonService;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialReturnOrderService;
+import com.healthlink.his.web.materialmanage.dto.MaterialDetailDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialInitDto;
+import com.healthlink.his.web.materialmanage.mapper.MaterialCommonMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReturnToWarehouseOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialReturnToWarehouseOrderServiceImpl.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReturnToWarehouseOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialReturnToWarehouseOrderServiceImpl.java
index 2ae80908f..7ef68a81a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReturnToWarehouseOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialReturnToWarehouseOrderServiceImpl.java
@@ -1,22 +1,22 @@
-package com.openhis.web.materialmanage.appservice.impl;
+package com.healthlink.his.web.materialmanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
-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.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
-import com.openhis.web.materialmanage.appservice.IMaterialReturnToWarehouseOrderService;
-import com.openhis.web.materialmanage.dto.MaterialDetailDto;
-import com.openhis.web.materialmanage.dto.MaterialInitDto;
-import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialCommonService;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialReturnToWarehouseOrderService;
+import com.healthlink.his.web.materialmanage.dto.MaterialDetailDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialInitDto;
+import com.healthlink.his.web.materialmanage.mapper.MaterialCommonMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStockInOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialStockInOrderServiceImpl.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStockInOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialStockInOrderServiceImpl.java
index a417f8263..60f17cfea 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStockInOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialStockInOrderServiceImpl.java
@@ -1,22 +1,22 @@
-package com.openhis.web.materialmanage.appservice.impl;
+package com.healthlink.his.web.materialmanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
-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.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
-import com.openhis.web.materialmanage.appservice.IMaterialStockInOrderService;
-import com.openhis.web.materialmanage.dto.MaterialDetailDto;
-import com.openhis.web.materialmanage.dto.MaterialInitDto;
-import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialCommonService;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialStockInOrderService;
+import com.healthlink.his.web.materialmanage.dto.MaterialDetailDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialInitDto;
+import com.healthlink.his.web.materialmanage.mapper.MaterialCommonMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStockOutOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialStockOutOrderServiceImpl.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStockOutOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialStockOutOrderServiceImpl.java
index 2a9fe3c44..d28321fcd 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStockOutOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialStockOutOrderServiceImpl.java
@@ -1,22 +1,22 @@
-package com.openhis.web.materialmanage.appservice.impl;
+package com.healthlink.his.web.materialmanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
-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.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
-import com.openhis.web.materialmanage.appservice.IMaterialStockOutOrderService;
-import com.openhis.web.materialmanage.dto.MaterialDetailDto;
-import com.openhis.web.materialmanage.dto.MaterialInitDto;
-import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialCommonService;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialStockOutOrderService;
+import com.healthlink.his.web.materialmanage.dto.MaterialDetailDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialInitDto;
+import com.healthlink.his.web.materialmanage.mapper.MaterialCommonMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStocktakingOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialStocktakingOrderServiceImpl.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStocktakingOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialStocktakingOrderServiceImpl.java
index f92e28b55..1efd1cad7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStocktakingOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialStocktakingOrderServiceImpl.java
@@ -1,22 +1,22 @@
-package com.openhis.web.materialmanage.appservice.impl;
+package com.healthlink.his.web.materialmanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
-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.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
-import com.openhis.web.materialmanage.appservice.IMaterialStocktakingOrderService;
-import com.openhis.web.materialmanage.dto.MaterialDetailDto;
-import com.openhis.web.materialmanage.dto.MaterialInitDto;
-import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialCommonService;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialStocktakingOrderService;
+import com.healthlink.his.web.materialmanage.dto.MaterialDetailDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialInitDto;
+import com.healthlink.his.web.materialmanage.mapper.MaterialCommonMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialTransferInOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialTransferInOrderServiceImpl.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialTransferInOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialTransferInOrderServiceImpl.java
index 490ea3df4..ef9aa2179 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialTransferInOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialTransferInOrderServiceImpl.java
@@ -1,22 +1,22 @@
-package com.openhis.web.materialmanage.appservice.impl;
+package com.healthlink.his.web.materialmanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
-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.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
-import com.openhis.web.materialmanage.appservice.IMaterialTransferInOrderService;
-import com.openhis.web.materialmanage.dto.MaterialDetailDto;
-import com.openhis.web.materialmanage.dto.MaterialInitDto;
-import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialCommonService;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialTransferInOrderService;
+import com.healthlink.his.web.materialmanage.dto.MaterialDetailDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialInitDto;
+import com.healthlink.his.web.materialmanage.mapper.MaterialCommonMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialTransferOutOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialTransferOutOrderServiceImpl.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialTransferOutOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialTransferOutOrderServiceImpl.java
index 13d0fa2f3..6ed05126c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialTransferOutOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialTransferOutOrderServiceImpl.java
@@ -1,22 +1,22 @@
-package com.openhis.web.materialmanage.appservice.impl;
+package com.healthlink.his.web.materialmanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
-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.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
-import com.openhis.web.materialmanage.appservice.IMaterialTransferOutOrderService;
-import com.openhis.web.materialmanage.dto.MaterialDetailDto;
-import com.openhis.web.materialmanage.dto.MaterialInitDto;
-import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialCommonService;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialTransferOutOrderService;
+import com.healthlink.his.web.materialmanage.dto.MaterialDetailDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialInitDto;
+import com.healthlink.his.web.materialmanage.mapper.MaterialCommonMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialProfitLossOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/controller/MaterialProfitLossOrderController.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialProfitLossOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/controller/MaterialProfitLossOrderController.java
index 770dc6402..61e768411 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialProfitLossOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/controller/MaterialProfitLossOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.materialmanage.controller;
+package com.healthlink.his.web.materialmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
-import com.openhis.web.materialmanage.appservice.IMaterialProfitLossOrderService;
-import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
-import com.openhis.web.materialmanage.dto.MaterialDetailDto;
-import com.openhis.web.materialmanage.dto.MaterialSearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialCommonService;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialProfitLossOrderService;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialReceiptApprovalService;
+import com.healthlink.his.web.materialmanage.dto.MaterialDetailDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialPurchaseOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/controller/MaterialPurchaseOrderController.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialPurchaseOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/controller/MaterialPurchaseOrderController.java
index 0ebd9cd99..c4e8f9dca 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialPurchaseOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/controller/MaterialPurchaseOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.materialmanage.controller;
+package com.healthlink.his.web.materialmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
-import com.openhis.web.materialmanage.appservice.IMaterialPurchaseOrderService;
-import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
-import com.openhis.web.materialmanage.dto.MaterialDetailDto;
-import com.openhis.web.materialmanage.dto.MaterialSearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialCommonService;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialPurchaseOrderService;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialReceiptApprovalService;
+import com.healthlink.his.web.materialmanage.dto.MaterialDetailDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialReturnOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/controller/MaterialReturnOrderController.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialReturnOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/controller/MaterialReturnOrderController.java
index d2b78722c..1e0c3f410 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialReturnOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/controller/MaterialReturnOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.materialmanage.controller;
+package com.healthlink.his.web.materialmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
-import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
-import com.openhis.web.materialmanage.appservice.IMaterialReturnOrderService;
-import com.openhis.web.materialmanage.dto.MaterialDetailDto;
-import com.openhis.web.materialmanage.dto.MaterialSearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialCommonService;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialReceiptApprovalService;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialReturnOrderService;
+import com.healthlink.his.web.materialmanage.dto.MaterialDetailDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialReturnToWarehouseOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/controller/MaterialReturnToWarehouseOrderController.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialReturnToWarehouseOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/controller/MaterialReturnToWarehouseOrderController.java
index bda266924..45b8eded1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialReturnToWarehouseOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/controller/MaterialReturnToWarehouseOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.materialmanage.controller;
+package com.healthlink.his.web.materialmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
-import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
-import com.openhis.web.materialmanage.appservice.IMaterialReturnToWarehouseOrderService;
-import com.openhis.web.materialmanage.dto.MaterialDetailDto;
-import com.openhis.web.materialmanage.dto.MaterialSearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialCommonService;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialReceiptApprovalService;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialReturnToWarehouseOrderService;
+import com.healthlink.his.web.materialmanage.dto.MaterialDetailDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStockInOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/controller/MaterialStockInOrderController.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStockInOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/controller/MaterialStockInOrderController.java
index 400d287c0..25f527519 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStockInOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/controller/MaterialStockInOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.materialmanage.controller;
+package com.healthlink.his.web.materialmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
-import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
-import com.openhis.web.materialmanage.appservice.IMaterialStockInOrderService;
-import com.openhis.web.materialmanage.dto.MaterialDetailDto;
-import com.openhis.web.materialmanage.dto.MaterialSearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialCommonService;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialReceiptApprovalService;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialStockInOrderService;
+import com.healthlink.his.web.materialmanage.dto.MaterialDetailDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStockOutOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/controller/MaterialStockOutOrderController.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStockOutOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/controller/MaterialStockOutOrderController.java
index 0a51b3dac..42ec6547f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStockOutOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/controller/MaterialStockOutOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.materialmanage.controller;
+package com.healthlink.his.web.materialmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
-import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
-import com.openhis.web.materialmanage.appservice.IMaterialStockOutOrderService;
-import com.openhis.web.materialmanage.dto.MaterialDetailDto;
-import com.openhis.web.materialmanage.dto.MaterialSearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialCommonService;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialReceiptApprovalService;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialStockOutOrderService;
+import com.healthlink.his.web.materialmanage.dto.MaterialDetailDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStocktakingOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/controller/MaterialStocktakingOrderController.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStocktakingOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/controller/MaterialStocktakingOrderController.java
index 4220fe551..fba4ce17f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStocktakingOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/controller/MaterialStocktakingOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.materialmanage.controller;
+package com.healthlink.his.web.materialmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
-import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
-import com.openhis.web.materialmanage.appservice.IMaterialStocktakingOrderService;
-import com.openhis.web.materialmanage.dto.MaterialDetailDto;
-import com.openhis.web.materialmanage.dto.MaterialSearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialCommonService;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialReceiptApprovalService;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialStocktakingOrderService;
+import com.healthlink.his.web.materialmanage.dto.MaterialDetailDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialTransferInOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/controller/MaterialTransferInOrderController.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialTransferInOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/controller/MaterialTransferInOrderController.java
index b394e209b..acbdd4b8e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialTransferInOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/controller/MaterialTransferInOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.materialmanage.controller;
+package com.healthlink.his.web.materialmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
-import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
-import com.openhis.web.materialmanage.appservice.IMaterialTransferInOrderService;
-import com.openhis.web.materialmanage.dto.MaterialDetailDto;
-import com.openhis.web.materialmanage.dto.MaterialSearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialCommonService;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialReceiptApprovalService;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialTransferInOrderService;
+import com.healthlink.his.web.materialmanage.dto.MaterialDetailDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialTransferOutOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/controller/MaterialTransferOutOrderController.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialTransferOutOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/controller/MaterialTransferOutOrderController.java
index 855e5f931..a730784f1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialTransferOutOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/controller/MaterialTransferOutOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.materialmanage.controller;
+package com.healthlink.his.web.materialmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
-import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
-import com.openhis.web.materialmanage.appservice.IMaterialTransferOutOrderService;
-import com.openhis.web.materialmanage.dto.MaterialDetailDto;
-import com.openhis.web.materialmanage.dto.MaterialSearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialCommonService;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialReceiptApprovalService;
+import com.healthlink.his.web.materialmanage.appservice.IMaterialTransferOutOrderService;
+import com.healthlink.his.web.materialmanage.dto.MaterialDetailDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/dto/MaterialDetailDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/dto/MaterialDetailDto.java
index bbcd1e37d..743a6cbdf 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/dto/MaterialDetailDto.java
@@ -1,14 +1,14 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.materialmanage.dto;
+package com.healthlink.his.web.materialmanage.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDeviceInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/dto/MaterialDeviceInfoDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDeviceInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/dto/MaterialDeviceInfoDto.java
index 5ff4bfbb5..3e7b931fc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDeviceInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/dto/MaterialDeviceInfoDto.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.materialmanage.dto;
+package com.healthlink.his.web.materialmanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/dto/MaterialDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/dto/MaterialDto.java
index 6babb84a9..19f3536b3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/dto/MaterialDto.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.materialmanage.dto;
+package com.healthlink.his.web.materialmanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/dto/MaterialInitDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/dto/MaterialInitDto.java
index 77d1ae663..f63d6b317 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/dto/MaterialInitDto.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.materialmanage.dto;
+package com.healthlink.his.web.materialmanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.administration.domain.Organization;
-import com.openhis.web.common.dto.LocationDto;
+import com.healthlink.his.administration.domain.Organization;
+import com.healthlink.his.web.common.dto.LocationDto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/dto/MaterialSearchParam.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/dto/MaterialSearchParam.java
index f6a24ac7c..f939e99dd 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/dto/MaterialSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.materialmanage.dto;
+package com.healthlink.his.web.materialmanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialCommonMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialCommonMapper.java
similarity index 83%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialCommonMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialCommonMapper.java
index 16e382109..52d9075c0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialCommonMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialCommonMapper.java
@@ -1,12 +1,12 @@
-package com.openhis.web.materialmanage.mapper;
+package com.healthlink.his.web.materialmanage.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.materialmanage.dto.MaterialDetailDto;
-import com.openhis.web.materialmanage.dto.MaterialDeviceInfoDto;
-import com.openhis.web.materialmanage.dto.MaterialDto;
-import com.openhis.web.materialmanage.dto.MaterialSearchParam;
+import com.healthlink.his.web.materialmanage.dto.MaterialDetailDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialDeviceInfoDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialDto;
+import com.healthlink.his.web.materialmanage.dto.MaterialSearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialProfitLossOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialProfitLossOrderMapper.java
similarity index 77%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialProfitLossOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialProfitLossOrderMapper.java
index c6cd1e307..dc04a23f3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialProfitLossOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialProfitLossOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.materialmanage.mapper;
+package com.healthlink.his.web.materialmanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialPurchaseOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialPurchaseOrderMapper.java
similarity index 77%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialPurchaseOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialPurchaseOrderMapper.java
index b32c69199..0bde7ac95 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialPurchaseOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialPurchaseOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.materialmanage.mapper;
+package com.healthlink.his.web.materialmanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialReturnOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialReturnOrderMapper.java
similarity index 77%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialReturnOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialReturnOrderMapper.java
index 889904392..6248f6355 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialReturnOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialReturnOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.materialmanage.mapper;
+package com.healthlink.his.web.materialmanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialReturnToWarehouseOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialReturnToWarehouseOrderMapper.java
similarity index 78%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialReturnToWarehouseOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialReturnToWarehouseOrderMapper.java
index 4bda715bf..e8873d8ef 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialReturnToWarehouseOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialReturnToWarehouseOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.materialmanage.mapper;
+package com.healthlink.his.web.materialmanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialStockInOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialStockInOrderMapper.java
similarity index 77%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialStockInOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialStockInOrderMapper.java
index 305a7c2b5..936a8ba59 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialStockInOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialStockInOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.materialmanage.mapper;
+package com.healthlink.his.web.materialmanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialStockOutOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialStockOutOrderMapper.java
similarity index 77%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialStockOutOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialStockOutOrderMapper.java
index 2d4ebccdd..e166dd350 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialStockOutOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialStockOutOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.materialmanage.mapper;
+package com.healthlink.his.web.materialmanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialStocktakingOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialStocktakingOrderMapper.java
similarity index 77%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialStocktakingOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialStocktakingOrderMapper.java
index 53bbeaa10..8bfeb00ee 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialStocktakingOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialStocktakingOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.materialmanage.mapper;
+package com.healthlink.his.web.materialmanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialTransferInOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialTransferInOrderMapper.java
similarity index 77%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialTransferInOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialTransferInOrderMapper.java
index 1ece77e9a..302e4b0c7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialTransferInOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialTransferInOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.materialmanage.mapper;
+package com.healthlink.his.web.materialmanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialTransferOutOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialTransferOutOrderMapper.java
similarity index 77%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialTransferOutOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialTransferOutOrderMapper.java
index 658aa494c..a5f56082f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialTransferOutOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/mapper/MaterialTransferOutOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.materialmanage.mapper;
+package com.healthlink.his.web.materialmanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/medicationmanagement/controller/DayEndSettlementController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/medicationmanagement/controller/DayEndSettlementController.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/medicationmanagement/controller/DayEndSettlementController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/medicationmanagement/controller/DayEndSettlementController.java
index 29a6c0649..8ba36f24b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/medicationmanagement/controller/DayEndSettlementController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/medicationmanagement/controller/DayEndSettlementController.java
@@ -1,4 +1,4 @@
-package com.openhis.web.medicationmanagement.controller;
+package com.healthlink.his.web.medicationmanagement.controller;
 
 import java.util.List;
 import jakarta.servlet.http.HttpServletResponse;
@@ -17,8 +17,8 @@ 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.medicationmanagement.domain.DayEndSettlement;
-import com.openhis.medicationmanagement.service.IDayEndSettlementService;
+import com.healthlink.his.medicationmanagement.domain.DayEndSettlement;
+import com.healthlink.his.medicationmanagement.service.IDayEndSettlementService;
 import com.core.common.core.page.PageDomain;
 import com.core.common.utils.StringUtils;
 import com.github.pagehelper.PageHelper;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfRatioApplicationRecordAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/appservice/IGfRatioApplicationRecordAppService.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfRatioApplicationRecordAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/appservice/IGfRatioApplicationRecordAppService.java
index 3d7c9d86f..cf3ec295d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfRatioApplicationRecordAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/appservice/IGfRatioApplicationRecordAppService.java
@@ -1,11 +1,11 @@
-package com.openhis.web.nenu.appservice;
+package com.healthlink.his.web.nenu.appservice;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.web.nenu.dto.GfRatioApplicationDefinitionSelectDto;
-import com.openhis.web.nenu.dto.GfRatioApplicationPrintDto;
-import com.openhis.web.nenu.dto.GfRatioApplicationProcessDto;
-import com.openhis.web.nenu.dto.GfRatioApplicationRecordDto;
+import com.healthlink.his.web.nenu.dto.GfRatioApplicationDefinitionSelectDto;
+import com.healthlink.his.web.nenu.dto.GfRatioApplicationPrintDto;
+import com.healthlink.his.web.nenu.dto.GfRatioApplicationProcessDto;
+import com.healthlink.his.web.nenu.dto.GfRatioApplicationRecordDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfRatioManageAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/appservice/IGfRatioManageAppService.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfRatioManageAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/appservice/IGfRatioManageAppService.java
index 6367cdb65..4eb4b8f0a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfRatioManageAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/appservice/IGfRatioManageAppService.java
@@ -1,9 +1,9 @@
-package com.openhis.web.nenu.appservice;
+package com.healthlink.his.web.nenu.appservice;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.nenu.dto.GfTypeRatioDto;
-import com.openhis.web.nenu.dto.GfIndividualRatioDto;
+import com.healthlink.his.nenu.dto.GfTypeRatioDto;
+import com.healthlink.his.web.nenu.dto.GfIndividualRatioDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfStudentListAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/appservice/IGfStudentListAppService.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfStudentListAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/appservice/IGfStudentListAppService.java
index 917729d24..24ac986af 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfStudentListAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/appservice/IGfStudentListAppService.java
@@ -1,8 +1,8 @@
-package com.openhis.web.nenu.appservice;
+package com.healthlink.his.web.nenu.appservice;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.web.nenu.dto.GfStudentListDto;
+import com.healthlink.his.web.nenu.dto.GfStudentListDto;
 import org.springframework.web.multipart.MultipartFile;
 
 import jakarta.servlet.http.HttpServletResponse;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfRatioApplicationRecordAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/appservice/impl/GfRatioApplicationRecordAppServiceImpl.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfRatioApplicationRecordAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/appservice/impl/GfRatioApplicationRecordAppServiceImpl.java
index 6e1e0c097..38c18bf46 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfRatioApplicationRecordAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/appservice/impl/GfRatioApplicationRecordAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.nenu.appservice.impl;
+package com.healthlink.his.web.nenu.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -10,26 +10,26 @@ import com.core.common.enums.DelFlag;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.ChargeItemDefinition;
-import com.openhis.administration.service.IChargeItemDefinitionService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.*;
-import com.openhis.common.enums.ybenums.YbChrgitmLv;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.medication.domain.MedicationDefinition;
-import com.openhis.medication.service.IMedicationDefinitionService;
-import com.openhis.nenu.domain.GfRatio;
-import com.openhis.nenu.domain.GfRatioApplication;
-import com.openhis.nenu.service.IGfRatioApplicationService;
-import com.openhis.nenu.service.IGfRatioService;
-import com.openhis.web.nenu.appservice.IGfRatioApplicationRecordAppService;
-import com.openhis.web.nenu.dto.GfRatioApplicationDefinitionSelectDto;
-import com.openhis.web.nenu.dto.GfRatioApplicationPrintDto;
-import com.openhis.web.nenu.dto.GfRatioApplicationProcessDto;
-import com.openhis.web.nenu.dto.GfRatioApplicationRecordDto;
-import com.openhis.web.nenu.mapper.GfRatioApplicationRecordAppMapper;
-import com.openhis.workflow.domain.ActivityDefinition;
-import com.openhis.workflow.service.IActivityDefinitionService;
+import com.healthlink.his.administration.domain.ChargeItemDefinition;
+import com.healthlink.his.administration.service.IChargeItemDefinitionService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.enums.*;
+import com.healthlink.his.common.enums.ybenums.YbChrgitmLv;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.medication.domain.MedicationDefinition;
+import com.healthlink.his.medication.service.IMedicationDefinitionService;
+import com.healthlink.his.nenu.domain.GfRatio;
+import com.healthlink.his.nenu.domain.GfRatioApplication;
+import com.healthlink.his.nenu.service.IGfRatioApplicationService;
+import com.healthlink.his.nenu.service.IGfRatioService;
+import com.healthlink.his.web.nenu.appservice.IGfRatioApplicationRecordAppService;
+import com.healthlink.his.web.nenu.dto.GfRatioApplicationDefinitionSelectDto;
+import com.healthlink.his.web.nenu.dto.GfRatioApplicationPrintDto;
+import com.healthlink.his.web.nenu.dto.GfRatioApplicationProcessDto;
+import com.healthlink.his.web.nenu.dto.GfRatioApplicationRecordDto;
+import com.healthlink.his.web.nenu.mapper.GfRatioApplicationRecordAppMapper;
+import com.healthlink.his.workflow.domain.ActivityDefinition;
+import com.healthlink.his.workflow.service.IActivityDefinitionService;
 import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfRatioManageAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/appservice/impl/GfRatioManageAppServiceImpl.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfRatioManageAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/appservice/impl/GfRatioManageAppServiceImpl.java
index e4b2370e2..0e2c67025 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfRatioManageAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/appservice/impl/GfRatioManageAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.nenu.appservice.impl;
+package com.healthlink.his.web.nenu.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -6,16 +6,16 @@ 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.enums.DelFlag;
-import com.openhis.common.enums.GfItemType;
-import com.openhis.common.enums.GfRatioType;
-import com.openhis.common.enums.ybenums.YbChrgitmLv;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.nenu.domain.GfRatio;
-import com.openhis.nenu.dto.GfTypeRatioDto;
-import com.openhis.nenu.service.IGfRatioService;
-import com.openhis.web.nenu.appservice.IGfRatioManageAppService;
-import com.openhis.web.nenu.dto.GfIndividualRatioDto;
-import com.openhis.web.nenu.mapper.GfRatioManageAppMapper;
+import com.healthlink.his.common.enums.GfItemType;
+import com.healthlink.his.common.enums.GfRatioType;
+import com.healthlink.his.common.enums.ybenums.YbChrgitmLv;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.nenu.domain.GfRatio;
+import com.healthlink.his.nenu.dto.GfTypeRatioDto;
+import com.healthlink.his.nenu.service.IGfRatioService;
+import com.healthlink.his.web.nenu.appservice.IGfRatioManageAppService;
+import com.healthlink.his.web.nenu.dto.GfIndividualRatioDto;
+import com.healthlink.his.web.nenu.mapper.GfRatioManageAppMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfStudentListAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/appservice/impl/GfStudentListAppServiceImpl.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfStudentListAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/appservice/impl/GfStudentListAppServiceImpl.java
index 169b1ea5a..d9d254678 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfStudentListAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/appservice/impl/GfStudentListAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.nenu.appservice.impl;
+package com.healthlink.his.web.nenu.appservice.impl;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -16,22 +16,22 @@ import com.core.common.exception.ServiceException;
 import com.core.common.utils.*;
 import com.core.common.utils.poi.ExcelUtil;
 import com.core.web.util.TenantOptionUtil;
-import com.openhis.administration.domain.Patient;
-import com.openhis.administration.domain.PatientStudent;
-import com.openhis.administration.service.IPatientService;
-import com.openhis.administration.service.IPatientStudentService;
-import com.openhis.common.enums.AssignSeqEnum;
-import com.openhis.common.enums.PhysicalExamResult;
-import com.openhis.common.enums.StudentStatus;
-import com.openhis.common.utils.CommonUtil;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.common.utils.IdCardUtil;
-import com.openhis.web.nenu.appservice.IGfStudentListAppService;
-import com.openhis.web.nenu.dto.GfStudentListDto;
-import com.openhis.web.nenu.dto.GfStudentListImportDto;
-import com.openhis.web.nenu.dto.GfStudentPeisDto;
-import com.openhis.web.nenu.dto.PeisStudentPatientDto;
-import com.openhis.web.nenu.mapper.GfStudentListAppMapper;
+import com.healthlink.his.administration.domain.Patient;
+import com.healthlink.his.administration.domain.PatientStudent;
+import com.healthlink.his.administration.service.IPatientService;
+import com.healthlink.his.administration.service.IPatientStudentService;
+import com.healthlink.his.common.enums.AssignSeqEnum;
+import com.healthlink.his.common.enums.PhysicalExamResult;
+import com.healthlink.his.common.enums.StudentStatus;
+import com.healthlink.his.common.utils.CommonUtil;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.common.utils.IdCardUtil;
+import com.healthlink.his.web.nenu.appservice.IGfStudentListAppService;
+import com.healthlink.his.web.nenu.dto.GfStudentListDto;
+import com.healthlink.his.web.nenu.dto.GfStudentListImportDto;
+import com.healthlink.his.web.nenu.dto.GfStudentPeisDto;
+import com.healthlink.his.web.nenu.dto.PeisStudentPatientDto;
+import com.healthlink.his.web.nenu.mapper.GfStudentListAppMapper;
 import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.client5.http.classic.methods.HttpPost;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfRatioApplicationRecordController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/controller/GfRatioApplicationRecordController.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfRatioApplicationRecordController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/controller/GfRatioApplicationRecordController.java
index 038570455..03f484cef 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfRatioApplicationRecordController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/controller/GfRatioApplicationRecordController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.nenu.controller;
+package com.healthlink.his.web.nenu.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.web.nenu.appservice.IGfRatioApplicationRecordAppService;
-import com.openhis.web.nenu.dto.GfRatioApplicationDefinitionSelectDto;
-import com.openhis.web.nenu.dto.GfRatioApplicationPrintDto;
-import com.openhis.web.nenu.dto.GfRatioApplicationProcessDto;
-import com.openhis.web.nenu.dto.GfRatioApplicationRecordDto;
+import com.healthlink.his.web.nenu.appservice.IGfRatioApplicationRecordAppService;
+import com.healthlink.his.web.nenu.dto.GfRatioApplicationDefinitionSelectDto;
+import com.healthlink.his.web.nenu.dto.GfRatioApplicationPrintDto;
+import com.healthlink.his.web.nenu.dto.GfRatioApplicationProcessDto;
+import com.healthlink.his.web.nenu.dto.GfRatioApplicationRecordDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfRatioManageController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/controller/GfRatioManageController.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfRatioManageController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/controller/GfRatioManageController.java
index a20ab8876..83b995f8d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfRatioManageController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/controller/GfRatioManageController.java
@@ -1,11 +1,11 @@
-package com.openhis.web.nenu.controller;
+package com.healthlink.his.web.nenu.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.nenu.dto.GfTypeRatioDto;
-import com.openhis.web.nenu.appservice.IGfRatioManageAppService;
-import com.openhis.web.nenu.dto.GfIndividualRatioDto;
-import com.openhis.web.nenu.dto.GfTypeRatioSaveDto;
+import com.healthlink.his.nenu.dto.GfTypeRatioDto;
+import com.healthlink.his.web.nenu.appservice.IGfRatioManageAppService;
+import com.healthlink.his.web.nenu.dto.GfIndividualRatioDto;
+import com.healthlink.his.web.nenu.dto.GfTypeRatioSaveDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfStudentListController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/controller/GfStudentListController.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfStudentListController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/controller/GfStudentListController.java
index b8b0e22fa..e1c51aaee 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfStudentListController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/controller/GfStudentListController.java
@@ -1,9 +1,9 @@
-package com.openhis.web.nenu.controller;
+package com.healthlink.his.web.nenu.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.web.nenu.appservice.IGfStudentListAppService;
-import com.openhis.web.nenu.dto.GfStudentListDto;
+import com.healthlink.his.web.nenu.appservice.IGfStudentListAppService;
+import com.healthlink.his.web.nenu.dto.GfStudentListDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfIndividualRatioDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/GfIndividualRatioDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfIndividualRatioDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/GfIndividualRatioDto.java
index 1b0e6fded..32b0943dc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfIndividualRatioDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/GfIndividualRatioDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.nenu.dto;
+package com.healthlink.his.web.nenu.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationDefinitionSelectDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/GfRatioApplicationDefinitionSelectDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationDefinitionSelectDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/GfRatioApplicationDefinitionSelectDto.java
index 04a671034..f28a190e9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationDefinitionSelectDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/GfRatioApplicationDefinitionSelectDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.nenu.dto;
+package com.healthlink.his.web.nenu.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationPrintDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/GfRatioApplicationPrintDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationPrintDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/GfRatioApplicationPrintDto.java
index 6e167ccdf..6e8250833 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationPrintDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/GfRatioApplicationPrintDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.nenu.dto;
+package com.healthlink.his.web.nenu.dto;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationProcessDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/GfRatioApplicationProcessDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationProcessDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/GfRatioApplicationProcessDto.java
index 7c6e0bcfc..cdb303507 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationProcessDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/GfRatioApplicationProcessDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.nenu.dto;
+package com.healthlink.his.web.nenu.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationRecordDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/GfRatioApplicationRecordDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationRecordDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/GfRatioApplicationRecordDto.java
index eb4c805e7..0c0cbf18a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationRecordDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/GfRatioApplicationRecordDto.java
@@ -1,9 +1,9 @@
-package com.openhis.web.nenu.dto;
+package com.healthlink.his.web.nenu.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.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentListDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/GfStudentListDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentListDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/GfStudentListDto.java
index c520e34db..eb250fb0b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentListDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/GfStudentListDto.java
@@ -1,9 +1,9 @@
-package com.openhis.web.nenu.dto;
+package com.healthlink.his.web.nenu.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.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentListImportDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/GfStudentListImportDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentListImportDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/GfStudentListImportDto.java
index 74b42b94b..f8494a406 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentListImportDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/GfStudentListImportDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.nenu.dto;
+package com.healthlink.his.web.nenu.dto;
 
 import com.core.common.annotation.Excel;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentPeisDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/GfStudentPeisDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentPeisDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/GfStudentPeisDto.java
index 1ba239453..8008bef16 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentPeisDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/GfStudentPeisDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.nenu.dto;
+package com.healthlink.his.web.nenu.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfTypeRatioSaveDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/GfTypeRatioSaveDto.java
similarity index 80%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfTypeRatioSaveDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/GfTypeRatioSaveDto.java
index 9c6b74304..3a4f3623d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfTypeRatioSaveDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/GfTypeRatioSaveDto.java
@@ -1,6 +1,6 @@
-package com.openhis.web.nenu.dto;
+package com.healthlink.his.web.nenu.dto;
 
-import com.openhis.nenu.dto.GfTypeRatioDto;
+import com.healthlink.his.nenu.dto.GfTypeRatioDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/PeisStudentPatientDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/PeisStudentPatientDto.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/PeisStudentPatientDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/PeisStudentPatientDto.java
index 02d4073f1..d86ddbc6c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/PeisStudentPatientDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/dto/PeisStudentPatientDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.nenu.dto;
+package com.healthlink.his.web.nenu.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfRatioApplicationRecordAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/mapper/GfRatioApplicationRecordAppMapper.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfRatioApplicationRecordAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/mapper/GfRatioApplicationRecordAppMapper.java
index 15fcf83d1..73ebef753 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfRatioApplicationRecordAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/mapper/GfRatioApplicationRecordAppMapper.java
@@ -1,11 +1,11 @@
-package com.openhis.web.nenu.mapper;
+package com.healthlink.his.web.nenu.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.nenu.dto.GfRatioApplicationDefinitionSelectDto;
-import com.openhis.web.nenu.dto.GfRatioApplicationRecordDto;
+import com.healthlink.his.web.nenu.dto.GfRatioApplicationDefinitionSelectDto;
+import com.healthlink.his.web.nenu.dto.GfRatioApplicationRecordDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfRatioManageAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/mapper/GfRatioManageAppMapper.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfRatioManageAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/mapper/GfRatioManageAppMapper.java
index 912ad6d66..f406fb71e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfRatioManageAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/mapper/GfRatioManageAppMapper.java
@@ -1,10 +1,10 @@
-package com.openhis.web.nenu.mapper;
+package com.healthlink.his.web.nenu.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.nenu.dto.GfIndividualRatioDto;
+import com.healthlink.his.web.nenu.dto.GfIndividualRatioDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfStudentListAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/mapper/GfStudentListAppMapper.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfStudentListAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/mapper/GfStudentListAppMapper.java
index e7e00696f..842d21dc0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfStudentListAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/nenu/mapper/GfStudentListAppMapper.java
@@ -1,11 +1,11 @@
-package com.openhis.web.nenu.mapper;
+package com.healthlink.his.web.nenu.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.nenu.dto.GfStudentListDto;
-import com.openhis.web.nenu.dto.GfStudentPeisDto;
+import com.healthlink.his.web.nenu.dto.GfStudentListDto;
+import com.healthlink.his.web.nenu.dto.GfStudentPeisDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientInfusionAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/appservice/IOutpatientInfusionAppService.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientInfusionAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/appservice/IOutpatientInfusionAppService.java
index 7312234fb..c3927cd67 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientInfusionAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/appservice/IOutpatientInfusionAppService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.outpatientmanage.appservice;
+package com.healthlink.his.web.outpatientmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.outpatientmanage.dto.OutpatientInfusionPatientDto;
+import com.healthlink.his.web.outpatientmanage.dto.OutpatientInfusionPatientDto;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientSkinTestAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/appservice/IOutpatientSkinTestAppService.java
similarity index 80%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientSkinTestAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/appservice/IOutpatientSkinTestAppService.java
index 6835e6d87..ab38a849d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientSkinTestAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/appservice/IOutpatientSkinTestAppService.java
@@ -1,8 +1,8 @@
-package com.openhis.web.outpatientmanage.appservice;
+package com.healthlink.his.web.outpatientmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.outpatientmanage.dto.SkinTestQueryDto;
-import com.openhis.web.outpatientmanage.dto.SkinTestSaveDto;
+import com.healthlink.his.web.outpatientmanage.dto.SkinTestQueryDto;
+import com.healthlink.his.web.outpatientmanage.dto.SkinTestSaveDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientTreatmentAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/appservice/IOutpatientTreatmentAppService.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientTreatmentAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/appservice/IOutpatientTreatmentAppService.java
index 2372eac88..d6c3d14a9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientTreatmentAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/appservice/IOutpatientTreatmentAppService.java
@@ -1,9 +1,9 @@
-package com.openhis.web.outpatientmanage.appservice;
+package com.healthlink.his.web.outpatientmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.common.dto.PerformInfoDto;
-import com.openhis.web.outpatientmanage.dto.OutpatientTreatmentEncounterDto;
-import com.openhis.web.outpatientmanage.dto.OutpatientTreatmentInfoDto;
+import com.healthlink.his.web.common.dto.PerformInfoDto;
+import com.healthlink.his.web.outpatientmanage.dto.OutpatientTreatmentEncounterDto;
+import com.healthlink.his.web.outpatientmanage.dto.OutpatientTreatmentInfoDto;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/appservice/impl/OutpatientInfusionAppServiceImpl.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/appservice/impl/OutpatientInfusionAppServiceImpl.java
index afd7c25d9..c7d62316b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/appservice/impl/OutpatientInfusionAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.outpatientmanage.appservice.impl;
+package com.healthlink.his.web.outpatientmanage.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -8,19 +8,19 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.exception.ServiceException;
 import com.core.common.utils.*;
-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.web.outpatientmanage.appservice.IOutpatientInfusionAppService;
-import com.openhis.web.outpatientmanage.dto.OutpatientInfusionPatientDto;
-import com.openhis.web.outpatientmanage.dto.OutpatientInfusionRecordDto;
-import com.openhis.web.outpatientmanage.dto.OutpatientStationInitDto;
-import com.openhis.web.outpatientmanage.mapper.OutpatientInfusionAppMapper;
-import com.openhis.workflow.domain.ServiceRequest;
-import com.openhis.workflow.mapper.ServiceRequestMapper;
-import com.openhis.workflow.service.IServiceRequestService;
+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.web.outpatientmanage.appservice.IOutpatientInfusionAppService;
+import com.healthlink.his.web.outpatientmanage.dto.OutpatientInfusionPatientDto;
+import com.healthlink.his.web.outpatientmanage.dto.OutpatientInfusionRecordDto;
+import com.healthlink.his.web.outpatientmanage.dto.OutpatientStationInitDto;
+import com.healthlink.his.web.outpatientmanage.mapper.OutpatientInfusionAppMapper;
+import com.healthlink.his.workflow.domain.ServiceRequest;
+import com.healthlink.his.workflow.mapper.ServiceRequestMapper;
+import com.healthlink.his.workflow.service.IServiceRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientSkinTestAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/appservice/impl/OutpatientSkinTestAppServiceImpl.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientSkinTestAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/appservice/impl/OutpatientSkinTestAppServiceImpl.java
index 732c99e13..cbc35eee5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientSkinTestAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/appservice/impl/OutpatientSkinTestAppServiceImpl.java
@@ -1,20 +1,20 @@
-package com.openhis.web.outpatientmanage.appservice.impl;
+package com.healthlink.his.web.outpatientmanage.appservice.impl;
 
 import com.core.common.core.domain.R;
 import com.core.common.utils.MessageUtils;
-import com.openhis.clinical.domain.AllergyIntolerance;
-import com.openhis.clinical.service.IAllergyIntoleranceService;
-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.web.outpatientmanage.appservice.IOutpatientSkinTestAppService;
-import com.openhis.web.outpatientmanage.dto.AllergyIntoInitDto;
-import com.openhis.web.outpatientmanage.dto.SkinTestMedLotNumberDto;
-import com.openhis.web.outpatientmanage.dto.SkinTestQueryDto;
-import com.openhis.web.outpatientmanage.dto.SkinTestSaveDto;
-import com.openhis.web.outpatientmanage.mapper.OutpatientSkinTestAppMapper;
-import com.openhis.workflow.service.IActivityDefinitionService;
+import com.healthlink.his.clinical.domain.AllergyIntolerance;
+import com.healthlink.his.clinical.service.IAllergyIntoleranceService;
+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.web.outpatientmanage.appservice.IOutpatientSkinTestAppService;
+import com.healthlink.his.web.outpatientmanage.dto.AllergyIntoInitDto;
+import com.healthlink.his.web.outpatientmanage.dto.SkinTestMedLotNumberDto;
+import com.healthlink.his.web.outpatientmanage.dto.SkinTestQueryDto;
+import com.healthlink.his.web.outpatientmanage.dto.SkinTestSaveDto;
+import com.healthlink.his.web.outpatientmanage.mapper.OutpatientSkinTestAppMapper;
+import com.healthlink.his.workflow.service.IActivityDefinitionService;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientTreatmentAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/appservice/impl/OutpatientTreatmentAppServiceImpl.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientTreatmentAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/appservice/impl/OutpatientTreatmentAppServiceImpl.java
index ea1b5d09f..f695b117f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientTreatmentAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/appservice/impl/OutpatientTreatmentAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.outpatientmanage.appservice.impl;
+package com.healthlink.his.web.outpatientmanage.appservice.impl;
 
 import cn.hutool.core.lang.Pair;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -10,37 +10,37 @@ import com.core.common.core.domain.R;
 import com.core.common.enums.DelFlag;
 import com.core.common.exception.ServiceException;
 import com.core.common.utils.*;
-import com.openhis.administration.domain.ChargeItem;
-import com.openhis.administration.service.IChargeItemService;
-import com.openhis.clinical.domain.Procedure;
-import com.openhis.clinical.service.IProcedureService;
-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.medication.domain.MedicationRequest;
-import com.openhis.medication.service.IMedicationRequestService;
-import com.openhis.web.common.dto.PerformInfoDto;
-import com.openhis.web.common.dto.PerformRecordDto;
-import com.openhis.web.outpatientmanage.appservice.IOutpatientTreatmentAppService;
-import com.openhis.web.outpatientmanage.dto.BloodTransfusionPatchDto;
-import com.openhis.web.outpatientmanage.dto.OutpatientStationInitDto;
-import com.openhis.web.outpatientmanage.dto.OutpatientTreatmentEncounterDto;
-import com.openhis.web.outpatientmanage.dto.OutpatientTreatmentInfoDto;
-import com.openhis.web.outpatientmanage.mapper.OutpatientTreatmentAppMapper;
-import com.openhis.web.pharmacymanage.appservice.impl.ReturnMedicineAppServiceImpl;
-import com.openhis.web.pharmacymanage.appservice.impl.WesternMedicineDispenseAppServiceImpl;
-import com.openhis.web.pharmacymanage.dto.UnDispenseInventoryDto;
-import com.openhis.web.pharmacymanage.mapper.ReturnMedicineMapper;
-import com.openhis.workflow.domain.DeviceDispense;
-import com.openhis.workflow.domain.DeviceRequest;
-import com.openhis.workflow.domain.InventoryItem;
-import com.openhis.workflow.domain.ServiceRequest;
-import com.openhis.workflow.service.IDeviceDispenseService;
-import com.openhis.workflow.service.IDeviceRequestService;
-import com.openhis.workflow.service.IInventoryItemService;
-import com.openhis.workflow.service.IServiceRequestService;
+import com.healthlink.his.administration.domain.ChargeItem;
+import com.healthlink.his.administration.service.IChargeItemService;
+import com.healthlink.his.clinical.domain.Procedure;
+import com.healthlink.his.clinical.service.IProcedureService;
+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.medication.domain.MedicationRequest;
+import com.healthlink.his.medication.service.IMedicationRequestService;
+import com.healthlink.his.web.common.dto.PerformInfoDto;
+import com.healthlink.his.web.common.dto.PerformRecordDto;
+import com.healthlink.his.web.outpatientmanage.appservice.IOutpatientTreatmentAppService;
+import com.healthlink.his.web.outpatientmanage.dto.BloodTransfusionPatchDto;
+import com.healthlink.his.web.outpatientmanage.dto.OutpatientStationInitDto;
+import com.healthlink.his.web.outpatientmanage.dto.OutpatientTreatmentEncounterDto;
+import com.healthlink.his.web.outpatientmanage.dto.OutpatientTreatmentInfoDto;
+import com.healthlink.his.web.outpatientmanage.mapper.OutpatientTreatmentAppMapper;
+import com.healthlink.his.web.pharmacymanage.appservice.impl.ReturnMedicineAppServiceImpl;
+import com.healthlink.his.web.pharmacymanage.appservice.impl.WesternMedicineDispenseAppServiceImpl;
+import com.healthlink.his.web.pharmacymanage.dto.UnDispenseInventoryDto;
+import com.healthlink.his.web.pharmacymanage.mapper.ReturnMedicineMapper;
+import com.healthlink.his.workflow.domain.DeviceDispense;
+import com.healthlink.his.workflow.domain.DeviceRequest;
+import com.healthlink.his.workflow.domain.InventoryItem;
+import com.healthlink.his.workflow.domain.ServiceRequest;
+import com.healthlink.his.workflow.service.IDeviceDispenseService;
+import com.healthlink.his.workflow.service.IDeviceRequestService;
+import com.healthlink.his.workflow.service.IInventoryItemService;
+import com.healthlink.his.workflow.service.IServiceRequestService;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientInfusionController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/controller/OutpatientInfusionController.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientInfusionController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/controller/OutpatientInfusionController.java
index 445b05ab2..26a94adca 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientInfusionController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/controller/OutpatientInfusionController.java
@@ -1,8 +1,8 @@
-package com.openhis.web.outpatientmanage.controller;
+package com.healthlink.his.web.outpatientmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.outpatientmanage.appservice.IOutpatientInfusionAppService;
-import com.openhis.web.outpatientmanage.dto.OutpatientInfusionPatientDto;
+import com.healthlink.his.web.outpatientmanage.appservice.IOutpatientInfusionAppService;
+import com.healthlink.his.web.outpatientmanage.dto.OutpatientInfusionPatientDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientSkinTestAppController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/controller/OutpatientSkinTestAppController.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientSkinTestAppController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/controller/OutpatientSkinTestAppController.java
index d1cf75499..94e897d2d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientSkinTestAppController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/controller/OutpatientSkinTestAppController.java
@@ -1,8 +1,8 @@
-package com.openhis.web.outpatientmanage.controller;
+package com.healthlink.his.web.outpatientmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.outpatientmanage.appservice.IOutpatientSkinTestAppService;
-import com.openhis.web.outpatientmanage.dto.SkinTestSaveDto;
+import com.healthlink.his.web.outpatientmanage.appservice.IOutpatientSkinTestAppService;
+import com.healthlink.his.web.outpatientmanage.dto.SkinTestSaveDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientTreatmentController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/controller/OutpatientTreatmentController.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientTreatmentController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/controller/OutpatientTreatmentController.java
index b3dc1bf46..b59c9ed2f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientTreatmentController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/controller/OutpatientTreatmentController.java
@@ -1,10 +1,10 @@
-package com.openhis.web.outpatientmanage.controller;
+package com.healthlink.his.web.outpatientmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.common.dto.PerformInfoDto;
-import com.openhis.web.outpatientmanage.appservice.IOutpatientTreatmentAppService;
-import com.openhis.web.outpatientmanage.dto.OutpatientTreatmentEncounterDto;
-import com.openhis.web.outpatientmanage.dto.OutpatientTreatmentInfoDto;
+import com.healthlink.his.web.common.dto.PerformInfoDto;
+import com.healthlink.his.web.outpatientmanage.appservice.IOutpatientTreatmentAppService;
+import com.healthlink.his.web.outpatientmanage.dto.OutpatientTreatmentEncounterDto;
+import com.healthlink.his.web.outpatientmanage.dto.OutpatientTreatmentInfoDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/AllergyIntoInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/AllergyIntoInitDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/AllergyIntoInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/AllergyIntoInitDto.java
index 89adbaf90..c6e8135bf 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/AllergyIntoInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/AllergyIntoInitDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.outpatientmanage.dto;
+package com.healthlink.his.web.outpatientmanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/BloodTransfusionPatchDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/BloodTransfusionPatchDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/BloodTransfusionPatchDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/BloodTransfusionPatchDto.java
index 59eec5120..5060740c9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/BloodTransfusionPatchDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/BloodTransfusionPatchDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.outpatientmanage.dto;
+package com.healthlink.his.web.outpatientmanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionPatientDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/OutpatientInfusionPatientDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionPatientDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/OutpatientInfusionPatientDto.java
index 3dd2b38a3..9c32d65c2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionPatientDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/OutpatientInfusionPatientDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.outpatientmanage.dto;
+package com.healthlink.his.web.outpatientmanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionRecordDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/OutpatientInfusionRecordDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionRecordDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/OutpatientInfusionRecordDto.java
index 0a5ec6d2e..aed0afa90 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionRecordDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/OutpatientInfusionRecordDto.java
@@ -1,8 +1,8 @@
-package com.openhis.web.outpatientmanage.dto;
+package com.healthlink.his.web.outpatientmanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientStationInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/OutpatientStationInitDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientStationInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/OutpatientStationInitDto.java
index 84a56adb6..e16122f0b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientStationInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/OutpatientStationInitDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.outpatientmanage.dto;
+package com.healthlink.his.web.outpatientmanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientTreatmentEncounterDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/OutpatientTreatmentEncounterDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientTreatmentEncounterDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/OutpatientTreatmentEncounterDto.java
index 7052ab5d5..71d94a35e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientTreatmentEncounterDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/OutpatientTreatmentEncounterDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.outpatientmanage.dto;
+package com.healthlink.his.web.outpatientmanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientTreatmentInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/OutpatientTreatmentInfoDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientTreatmentInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/OutpatientTreatmentInfoDto.java
index 9086d8dae..de388cd59 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientTreatmentInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/OutpatientTreatmentInfoDto.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.outpatientmanage.dto;
+package com.healthlink.his.web.outpatientmanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/SkinTestMedLotNumberDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/SkinTestMedLotNumberDto.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/SkinTestMedLotNumberDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/SkinTestMedLotNumberDto.java
index 5172c9b39..1df2033e0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/SkinTestMedLotNumberDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/SkinTestMedLotNumberDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.outpatientmanage.dto;
+package com.healthlink.his.web.outpatientmanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/SkinTestQueryDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/SkinTestQueryDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/SkinTestQueryDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/SkinTestQueryDto.java
index 51bb01934..fe57d0bd7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/SkinTestQueryDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/SkinTestQueryDto.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.outpatientmanage.dto;
+package com.healthlink.his.web.outpatientmanage.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;
 import org.springframework.format.annotation.DateTimeFormat;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/SkinTestSaveDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/SkinTestSaveDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/SkinTestSaveDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/SkinTestSaveDto.java
index b577d9298..a75973a6e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/SkinTestSaveDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/dto/SkinTestSaveDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.outpatientmanage.dto;
+package com.healthlink.his.web.outpatientmanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientInfusionAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/mapper/OutpatientInfusionAppMapper.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientInfusionAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/mapper/OutpatientInfusionAppMapper.java
index 6474087bb..40561e1f1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientInfusionAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/mapper/OutpatientInfusionAppMapper.java
@@ -1,11 +1,11 @@
-package com.openhis.web.outpatientmanage.mapper;
+package com.healthlink.his.web.outpatientmanage.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.outpatientmanage.dto.OutpatientInfusionPatientDto;
-import com.openhis.web.outpatientmanage.dto.OutpatientInfusionRecordDto;
+import com.healthlink.his.web.outpatientmanage.dto.OutpatientInfusionPatientDto;
+import com.healthlink.his.web.outpatientmanage.dto.OutpatientInfusionRecordDto;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientSkinTestAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/mapper/OutpatientSkinTestAppMapper.java
similarity index 80%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientSkinTestAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/mapper/OutpatientSkinTestAppMapper.java
index 727213bfa..c0b235e38 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientSkinTestAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/mapper/OutpatientSkinTestAppMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.web.outpatientmanage.mapper;
+package com.healthlink.his.web.outpatientmanage.mapper;
 
-import com.openhis.web.outpatientmanage.dto.SkinTestMedLotNumberDto;
-import com.openhis.web.outpatientmanage.dto.SkinTestQueryDto;
+import com.healthlink.his.web.outpatientmanage.dto.SkinTestMedLotNumberDto;
+import com.healthlink.his.web.outpatientmanage.dto.SkinTestQueryDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientTreatmentAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/mapper/OutpatientTreatmentAppMapper.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientTreatmentAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/mapper/OutpatientTreatmentAppMapper.java
index 0e4bd6504..78776a639 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientTreatmentAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/mapper/OutpatientTreatmentAppMapper.java
@@ -1,15 +1,15 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.outpatientmanage.mapper;
+package com.healthlink.his.web.outpatientmanage.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.common.dto.PerformRecordDto;
-import com.openhis.web.outpatientmanage.dto.BloodTransfusionPatchDto;
-import com.openhis.web.outpatientmanage.dto.OutpatientTreatmentEncounterDto;
-import com.openhis.web.outpatientmanage.dto.OutpatientTreatmentInfoDto;
+import com.healthlink.his.web.common.dto.PerformRecordDto;
+import com.healthlink.his.web.outpatientmanage.dto.BloodTransfusionPatchDto;
+import com.healthlink.his.web.outpatientmanage.dto.OutpatientTreatmentEncounterDto;
+import com.healthlink.his.web.outpatientmanage.dto.OutpatientTreatmentInfoDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IOutpatientRecordService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/appservice/IOutpatientRecordService.java
similarity index 81%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IOutpatientRecordService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/appservice/IOutpatientRecordService.java
index 992abb3cd..d28073730 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IOutpatientRecordService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/appservice/IOutpatientRecordService.java
@@ -1,9 +1,9 @@
-package com.openhis.web.patientmanage.appservice;
+package com.healthlink.his.web.patientmanage.appservice;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.web.patientmanage.dto.OutpatientRecordDto;
-import com.openhis.web.patientmanage.dto.OutpatientRecordSearchParam;
+import com.healthlink.his.web.patientmanage.dto.OutpatientRecordDto;
+import com.healthlink.his.web.patientmanage.dto.OutpatientRecordSearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IPatientInformationService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/appservice/IPatientInformationService.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IPatientInformationService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/appservice/IPatientInformationService.java
index 95e535c53..eda2edd8e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IPatientInformationService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/appservice/IPatientInformationService.java
@@ -1,9 +1,9 @@
-package com.openhis.web.patientmanage.appservice;
+package com.healthlink.his.web.patientmanage.appservice;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.web.patientmanage.dto.PatientBaseInfoDto;
-import com.openhis.web.patientmanage.dto.PatientInfoInitDto;
+import com.healthlink.his.web.patientmanage.dto.PatientBaseInfoDto;
+import com.healthlink.his.web.patientmanage.dto.PatientInfoInitDto;
 
 import jakarta.servlet.http.HttpServletRequest;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/OutpatientRecordServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/appservice/impl/OutpatientRecordServiceImpl.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/OutpatientRecordServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/appservice/impl/OutpatientRecordServiceImpl.java
index 545dbb239..37b612eea 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/OutpatientRecordServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/appservice/impl/OutpatientRecordServiceImpl.java
@@ -1,19 +1,19 @@
-package com.openhis.web.patientmanage.appservice.impl;
+package com.healthlink.his.web.patientmanage.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.constant.CommonConstants;
-import com.openhis.common.enums.AdministrativeGender;
-import com.openhis.common.enums.EncounterSubjectStatus;
-import com.openhis.common.enums.ParticipantType;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.patientmanage.appservice.IOutpatientRecordService;
-import com.openhis.web.patientmanage.dto.OutpatientRecordDto;
-import com.openhis.web.patientmanage.dto.OutpatientRecordSearchParam;
-import com.openhis.web.patientmanage.mapper.PatientManageMapper;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.enums.AdministrativeGender;
+import com.healthlink.his.common.enums.EncounterSubjectStatus;
+import com.healthlink.his.common.enums.ParticipantType;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.patientmanage.appservice.IOutpatientRecordService;
+import com.healthlink.his.web.patientmanage.dto.OutpatientRecordDto;
+import com.healthlink.his.web.patientmanage.dto.OutpatientRecordSearchParam;
+import com.healthlink.his.web.patientmanage.mapper.PatientManageMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java
index 8fe0ab482..8246a4db2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.patientmanage.appservice.impl;
+package com.healthlink.his.web.patientmanage.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -13,22 +13,22 @@ import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.ChineseConvertUtils;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.Patient;
-import com.openhis.administration.domain.PatientIdentifier;
-import com.openhis.administration.service.IPatientIdentifierService;
-import com.openhis.administration.service.IPatientService;
-import com.openhis.administration.service.IPractitionerService;
-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.IdCardUtil;
-import com.openhis.web.patientmanage.appservice.IPatientInformationService;
-import com.openhis.web.patientmanage.dto.PatientBaseInfoDto;
-import com.openhis.web.patientmanage.dto.PatientIdInfoDto;
-import com.openhis.web.patientmanage.dto.PatientInfoInitDto;
-import com.openhis.web.patientmanage.mapper.PatientManageMapper;
+import com.healthlink.his.administration.domain.Patient;
+import com.healthlink.his.administration.domain.PatientIdentifier;
+import com.healthlink.his.administration.service.IPatientIdentifierService;
+import com.healthlink.his.administration.service.IPatientService;
+import com.healthlink.his.administration.service.IPractitionerService;
+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.IdCardUtil;
+import com.healthlink.his.web.patientmanage.appservice.IPatientInformationService;
+import com.healthlink.his.web.patientmanage.dto.PatientBaseInfoDto;
+import com.healthlink.his.web.patientmanage.dto.PatientIdInfoDto;
+import com.healthlink.his.web.patientmanage.dto.PatientInfoInitDto;
+import com.healthlink.his.web.patientmanage.mapper.PatientManageMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/OutpatientRecordController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/controller/OutpatientRecordController.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/OutpatientRecordController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/controller/OutpatientRecordController.java
index ad14990bd..7decf0059 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/OutpatientRecordController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/controller/OutpatientRecordController.java
@@ -1,11 +1,11 @@
-package com.openhis.web.patientmanage.controller;
+package com.healthlink.his.web.patientmanage.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.annotation.Anonymous;
 import com.core.common.core.domain.R;
-import com.openhis.web.patientmanage.appservice.IOutpatientRecordService;
-import com.openhis.web.patientmanage.dto.OutpatientRecordDto;
-import com.openhis.web.patientmanage.dto.OutpatientRecordSearchParam;
+import com.healthlink.his.web.patientmanage.appservice.IOutpatientRecordService;
+import com.healthlink.his.web.patientmanage.dto.OutpatientRecordDto;
+import com.healthlink.his.web.patientmanage.dto.OutpatientRecordSearchParam;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/controller/PatientInformationController.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/controller/PatientInformationController.java
index 96d10b2bd..ea0c2ccac 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/controller/PatientInformationController.java
@@ -1,8 +1,8 @@
-package com.openhis.web.patientmanage.controller;
+package com.healthlink.his.web.patientmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.patientmanage.appservice.IPatientInformationService;
-import com.openhis.web.patientmanage.dto.PatientBaseInfoDto;
+import com.healthlink.his.web.patientmanage.appservice.IPatientInformationService;
+import com.healthlink.his.web.patientmanage.dto.PatientBaseInfoDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/OutpatientRecordDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/dto/OutpatientRecordDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/OutpatientRecordDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/dto/OutpatientRecordDto.java
index 342f20fbf..57177e8a6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/OutpatientRecordDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/dto/OutpatientRecordDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.patientmanage.dto;
+package com.healthlink.his.web.patientmanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/OutpatientRecordSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/dto/OutpatientRecordSearchParam.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/OutpatientRecordSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/dto/OutpatientRecordSearchParam.java
index 104fa2e3f..42cc7b4b2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/OutpatientRecordSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/dto/OutpatientRecordSearchParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.patientmanage.dto;
+package com.healthlink.his.web.patientmanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientBaseInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/dto/PatientBaseInfoDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientBaseInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/dto/PatientBaseInfoDto.java
index 9fcc7aa98..56b689231 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientBaseInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/dto/PatientBaseInfoDto.java
@@ -1,9 +1,9 @@
-package com.openhis.web.patientmanage.dto;
+package com.healthlink.his.web.patientmanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientIdInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/dto/PatientIdInfoDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientIdInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/dto/PatientIdInfoDto.java
index fe95b4739..5e7c98872 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientIdInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/dto/PatientIdInfoDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.patientmanage.dto;
+package com.healthlink.his.web.patientmanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInfoInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/dto/PatientInfoInitDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInfoInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/dto/PatientInfoInitDto.java
index ce26b0067..101b3b927 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInfoInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/dto/PatientInfoInitDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.patientmanage.dto;
+package com.healthlink.his.web.patientmanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/mapper/PatientManageMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/mapper/PatientManageMapper.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/mapper/PatientManageMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/mapper/PatientManageMapper.java
index 2b6b738b4..a77cad62d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/mapper/PatientManageMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/patientmanage/mapper/PatientManageMapper.java
@@ -1,14 +1,14 @@
-package com.openhis.web.patientmanage.mapper;
+package com.healthlink.his.web.patientmanage.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.administration.domain.Patient;
-import com.openhis.web.patientmanage.dto.OutpatientRecordDto;
-import com.openhis.web.patientmanage.dto.PatientBaseInfoDto;
-import com.openhis.web.patientmanage.dto.PatientIdInfoDto;
+import com.healthlink.his.administration.domain.Patient;
+import com.healthlink.his.web.patientmanage.dto.OutpatientRecordDto;
+import com.healthlink.his.web.patientmanage.dto.PatientBaseInfoDto;
+import com.healthlink.his.web.patientmanage.dto.PatientIdInfoDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChangePriceService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/IChangePriceService.java
similarity index 66%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChangePriceService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/IChangePriceService.java
index e62905877..d695a0a92 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChangePriceService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/IChangePriceService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.paymentmanage.appservice;
+package com.healthlink.his.web.paymentmanage.appservice;
 
 import com.github.pagehelper.PageInfo;
-import com.openhis.web.paymentmanage.dto.ChangePriceListDto;
+import com.healthlink.his.web.paymentmanage.dto.ChangePriceListDto;
 
 /**
  * Desc:
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChargeBillService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/IChargeBillService.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChargeBillService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/IChargeBillService.java
index 47c521893..cb68b7c9c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChargeBillService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/IChargeBillService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.paymentmanage.appservice;
+package com.healthlink.his.web.paymentmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.paymentmanage.dto.ChargeSummaryDto;
+import com.healthlink.his.web.paymentmanage.dto.ChargeSummaryDto;
 
 import java.util.Map;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IEleInvoiceService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/IEleInvoiceService.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IEleInvoiceService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/IEleInvoiceService.java
index 3549cddd3..6725f1b87 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IEleInvoiceService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/IEleInvoiceService.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.paymentmanage.appservice;
+package com.healthlink.his.web.paymentmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.administration.domain.Invoice;
+import com.healthlink.his.administration.domain.Invoice;
 
 /**
  * 电子发票接口Service
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IPaymentRecService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/IPaymentRecService.java
similarity index 81%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IPaymentRecService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/IPaymentRecService.java
index 2ca6831e9..3bc13fc63 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IPaymentRecService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/IPaymentRecService.java
@@ -1,20 +1,20 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.paymentmanage.appservice;
+package com.healthlink.his.web.paymentmanage.appservice;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.web.chargemanage.dto.OutpatientRegistrationAddParam;
-import com.openhis.web.chargemanage.dto.OutpatientRegistrationSettleParam;
-import com.openhis.web.paymentmanage.dto.CancelPaymentDto;
-import com.openhis.web.paymentmanage.dto.InpatientPreSettleResultDto;
-import com.openhis.web.paymentmanage.dto.NenuBpcPayDto;
-import com.openhis.web.paymentmanage.dto.PaymentVO;
-import com.openhis.yb.dto.PaymentDetailDto;
-import com.openhis.yb.dto.PaymentDto;
-import com.openhis.yb.dto.PaymentInpatientDto;
-import com.openhis.yb.dto.PrePaymentDto;
+import com.healthlink.his.web.chargemanage.dto.OutpatientRegistrationAddParam;
+import com.healthlink.his.web.chargemanage.dto.OutpatientRegistrationSettleParam;
+import com.healthlink.his.web.paymentmanage.dto.CancelPaymentDto;
+import com.healthlink.his.web.paymentmanage.dto.InpatientPreSettleResultDto;
+import com.healthlink.his.web.paymentmanage.dto.NenuBpcPayDto;
+import com.healthlink.his.web.paymentmanage.dto.PaymentVO;
+import com.healthlink.his.yb.dto.PaymentDetailDto;
+import com.healthlink.his.yb.dto.PaymentDto;
+import com.healthlink.his.yb.dto.PaymentInpatientDto;
+import com.healthlink.his.yb.dto.PrePaymentDto;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/ThreePartPayService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/ThreePartPayService.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/ThreePartPayService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/ThreePartPayService.java
index 81f6982fa..36939ff5d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/ThreePartPayService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/ThreePartPayService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.paymentmanage.appservice;
+package com.healthlink.his.web.paymentmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.yb.dto.ThreePartPayDto;
+import com.healthlink.his.yb.dto.ThreePartPayDto;
 
 import jakarta.servlet.http.HttpServletRequest;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ChangePriceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/ChangePriceImpl.java
similarity index 69%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ChangePriceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/ChangePriceImpl.java
index 69e4d0690..d622480dd 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ChangePriceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/ChangePriceImpl.java
@@ -1,10 +1,10 @@
-package com.openhis.web.paymentmanage.appservice.impl;
+package com.healthlink.his.web.paymentmanage.appservice.impl;
 
 import com.github.pagehelper.PageInfo;
-import com.openhis.medication.domain.MedicationDefinition;
-import com.openhis.web.paymentmanage.appservice.IChangePriceService;
-import com.openhis.web.paymentmanage.dto.ChangePriceListDto;
-import com.openhis.web.paymentmanage.mapper.ChangePriceMapper;
+import com.healthlink.his.medication.domain.MedicationDefinition;
+import com.healthlink.his.web.paymentmanage.appservice.IChangePriceService;
+import com.healthlink.his.web.paymentmanage.dto.ChangePriceListDto;
+import com.healthlink.his.web.paymentmanage.mapper.ChangePriceMapper;
 import org.springframework.stereotype.Component;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java
index cdce108ae..4a14f2715 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.paymentmanage.appservice.impl;
+package com.healthlink.his.web.paymentmanage.appservice.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson2.JSONArray;
@@ -12,31 +12,31 @@ import com.core.common.core.domain.model.LoginUser;
 import com.core.common.exception.ServiceException;
 import com.core.common.utils.*;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.openhis.administration.domain.ChargeItem;
-import com.openhis.administration.domain.Encounter;
-import com.openhis.administration.domain.Invoice;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.service.IChargeItemService;
-import com.openhis.administration.service.IEncounterService;
-import com.openhis.administration.service.IInvoiceService;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.*;
-import com.openhis.common.enums.ybenums.YbEncounterClass;
-import com.openhis.common.enums.ybenums.YbPayment;
-import com.openhis.config.HttpConfig;
-import com.openhis.financial.domain.PaymentRecDetail;
-import com.openhis.financial.domain.PaymentReconciliation;
-import com.openhis.financial.service.IPaymentRecDetailService;
-import com.openhis.financial.service.IPaymentReconciliationService;
-import com.openhis.web.paymentmanage.appservice.IChargeBillService;
-import com.openhis.web.paymentmanage.appservice.IEleInvoiceService;
-import com.openhis.web.paymentmanage.dto.*;
-import com.openhis.web.paymentmanage.mapper.EleInvoiceMapper;
-import com.openhis.yb.domain.ClinicReg;
-import com.openhis.yb.service.IClinicSettleService;
-import com.openhis.yb.service.IRegService;
+import com.healthlink.his.administration.domain.ChargeItem;
+import com.healthlink.his.administration.domain.Encounter;
+import com.healthlink.his.administration.domain.Invoice;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.service.IChargeItemService;
+import com.healthlink.his.administration.service.IEncounterService;
+import com.healthlink.his.administration.service.IInvoiceService;
+import com.healthlink.his.administration.service.IPractitionerService;
+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.enums.ybenums.YbEncounterClass;
+import com.healthlink.his.common.enums.ybenums.YbPayment;
+import com.healthlink.his.config.HttpConfig;
+import com.healthlink.his.financial.domain.PaymentRecDetail;
+import com.healthlink.his.financial.domain.PaymentReconciliation;
+import com.healthlink.his.financial.service.IPaymentRecDetailService;
+import com.healthlink.his.financial.service.IPaymentReconciliationService;
+import com.healthlink.his.web.paymentmanage.appservice.IChargeBillService;
+import com.healthlink.his.web.paymentmanage.appservice.IEleInvoiceService;
+import com.healthlink.his.web.paymentmanage.dto.*;
+import com.healthlink.his.web.paymentmanage.mapper.EleInvoiceMapper;
+import com.healthlink.his.yb.domain.ClinicReg;
+import com.healthlink.his.yb.service.IClinicSettleService;
+import com.healthlink.his.yb.service.IRegService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.velocity.Template;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java
index 9d5e15db2..1e086eaaf 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.paymentmanage.appservice.impl;
+package com.healthlink.his.web.paymentmanage.appservice.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
@@ -8,49 +8,49 @@ import com.core.common.core.domain.R;
 import com.core.common.enums.DelFlag;
 import com.core.common.exception.ServiceException;
 import com.core.common.utils.*;
-import com.openhis.administration.domain.*;
-import com.openhis.administration.dto.ChargeItemBaseInfoDto;
-import com.openhis.administration.dto.ChargeItemDefInfo;
-import com.openhis.administration.dto.EncounterAccountDto;
-import com.openhis.administration.service.*;
-import com.openhis.clinical.domain.Condition;
-import com.openhis.clinical.domain.ConditionDefinition;
-import com.openhis.clinical.service.IConditionDefinitionService;
-import com.openhis.clinical.service.IConditionService;
-import com.openhis.clinical.service.IProcedureService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.common.enums.*;
-import com.openhis.common.enums.ybenums.YbMdcsType;
-import com.openhis.common.enums.ybenums.YbMedChrgItmType;
-import com.openhis.common.enums.ybenums.YbPayment;
-import com.openhis.financial.domain.Contract;
-import com.openhis.financial.domain.PaymentRecDetail;
-import com.openhis.financial.domain.PaymentReconciliation;
-import com.openhis.financial.model.PaymentRecDetailAccountResult;
-import com.openhis.financial.model.PaymentReconciliationAccountDel;
-import com.openhis.financial.service.IContractService;
-import com.openhis.financial.service.IPaymentRecDetailService;
-import com.openhis.financial.service.IPaymentReconciliationService;
-import com.openhis.medication.domain.Medication;
-import com.openhis.medication.domain.MedicationDefinition;
-import com.openhis.medication.service.IMedicationDefinitionService;
-import com.openhis.medication.service.IMedicationService;
-import com.openhis.web.outpatientmanage.mapper.OutpatientTreatmentAppMapper;
-import com.openhis.web.paymentmanage.appservice.IChargeBillService;
-import com.openhis.web.paymentmanage.dto.*;
-import com.openhis.web.paymentmanage.mapper.ChargeBillMapper;
-import com.openhis.workflow.domain.ActivityDefinition;
-import com.openhis.workflow.domain.ServiceRequest;
-import com.openhis.workflow.service.IActivityDefinitionService;
-import com.openhis.workflow.service.IServiceRequestService;
-import com.openhis.yb.domain.ClinicSettle;
-import com.openhis.yb.domain.ClinicUnSettle;
-import com.openhis.yb.domain.InfoPerson;
-import com.openhis.yb.dto.Catalogue1312Output;
-import com.openhis.yb.dto.Catalogue1312QueryParam;
-import com.openhis.yb.service.*;
-import com.openhis.ybcatalog.service.ICatalogMedicalServiceService;
+import com.healthlink.his.administration.domain.*;
+import com.healthlink.his.administration.dto.ChargeItemBaseInfoDto;
+import com.healthlink.his.administration.dto.ChargeItemDefInfo;
+import com.healthlink.his.administration.dto.EncounterAccountDto;
+import com.healthlink.his.administration.service.*;
+import com.healthlink.his.clinical.domain.Condition;
+import com.healthlink.his.clinical.domain.ConditionDefinition;
+import com.healthlink.his.clinical.service.IConditionDefinitionService;
+import com.healthlink.his.clinical.service.IConditionService;
+import com.healthlink.his.clinical.service.IProcedureService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.YbCommonConstants;
+import com.healthlink.his.common.enums.*;
+import com.healthlink.his.common.enums.ybenums.YbMdcsType;
+import com.healthlink.his.common.enums.ybenums.YbMedChrgItmType;
+import com.healthlink.his.common.enums.ybenums.YbPayment;
+import com.healthlink.his.financial.domain.Contract;
+import com.healthlink.his.financial.domain.PaymentRecDetail;
+import com.healthlink.his.financial.domain.PaymentReconciliation;
+import com.healthlink.his.financial.model.PaymentRecDetailAccountResult;
+import com.healthlink.his.financial.model.PaymentReconciliationAccountDel;
+import com.healthlink.his.financial.service.IContractService;
+import com.healthlink.his.financial.service.IPaymentRecDetailService;
+import com.healthlink.his.financial.service.IPaymentReconciliationService;
+import com.healthlink.his.medication.domain.Medication;
+import com.healthlink.his.medication.domain.MedicationDefinition;
+import com.healthlink.his.medication.service.IMedicationDefinitionService;
+import com.healthlink.his.medication.service.IMedicationService;
+import com.healthlink.his.web.outpatientmanage.mapper.OutpatientTreatmentAppMapper;
+import com.healthlink.his.web.paymentmanage.appservice.IChargeBillService;
+import com.healthlink.his.web.paymentmanage.dto.*;
+import com.healthlink.his.web.paymentmanage.mapper.ChargeBillMapper;
+import com.healthlink.his.workflow.domain.ActivityDefinition;
+import com.healthlink.his.workflow.domain.ServiceRequest;
+import com.healthlink.his.workflow.service.IActivityDefinitionService;
+import com.healthlink.his.workflow.service.IServiceRequestService;
+import com.healthlink.his.yb.domain.ClinicSettle;
+import com.healthlink.his.yb.domain.ClinicUnSettle;
+import com.healthlink.his.yb.domain.InfoPerson;
+import com.healthlink.his.yb.dto.Catalogue1312Output;
+import com.healthlink.his.yb.dto.Catalogue1312QueryParam;
+import com.healthlink.his.yb.service.*;
+import com.healthlink.his.ybcatalog.service.ICatalogMedicalServiceService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java
index f4211077c..033a01e64 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.paymentmanage.appservice.impl;
+package com.healthlink.his.web.paymentmanage.appservice.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -17,66 +17,66 @@ import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.administration.domain.*;
-import com.openhis.administration.dto.ChargeItemBaseInfoDto;
-import com.openhis.administration.service.*;
-import com.openhis.administration.service.impl.PatientStudentServiceImpl;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.*;
-import com.openhis.common.enums.ybenums.YbMdtrtCertType;
-import com.openhis.common.enums.ybenums.YbPayment;
-import com.openhis.common.enums.ybenums.YbPsnSetlWay;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.financial.domain.Contract;
-import com.openhis.financial.domain.PaymentRecDetail;
-import com.openhis.financial.domain.PaymentReconciliation;
-import com.openhis.financial.model.PaymentRecDetailDto;
-import com.openhis.financial.model.PaymentedItemModel;
-import com.openhis.financial.model.PrePaymentResult;
-import com.openhis.financial.model.PrePaymentResultModel;
-import com.openhis.financial.service.*;
-import com.openhis.medication.domain.MedicationDefinition;
-import com.openhis.medication.domain.MedicationRequest;
-import com.openhis.medication.service.IMedicationDefinitionService;
-import com.openhis.medication.service.IMedicationDispenseService;
-import com.openhis.medication.service.IMedicationRequestService;
-import com.openhis.nenu.domain.TransactionResponse;
-import com.openhis.nenu.service.ITransactionResponseService;
-import com.openhis.web.chargemanage.appservice.impl.OutpatientRegistrationAppServiceImpl;
-import com.openhis.web.chargemanage.dto.*;
-import com.openhis.web.chargemanage.mapper.OutpatientRegistrationAppMapper;
-import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService;
-import com.openhis.web.doctorstation.dto.AdviceBaseDto;
-import com.openhis.web.doctorstation.dto.AdvicePriceDto;
-import com.openhis.web.externalintegration.appservice.IBankPosCloudAppService;
-import com.openhis.web.paymentmanage.appservice.IPaymentRecService;
-import com.openhis.web.paymentmanage.dto.*;
-import com.openhis.web.paymentmanage.dto.CancelPaymentDto;
-import com.openhis.web.paymentmanage.dto.Clinic2207OrderResultDto;
-import com.openhis.web.paymentmanage.mapper.PaymentMapper;
-import com.openhis.web.personalization.dto.ActivityDeviceDto;
-import com.openhis.triageandqueuemanage.domain.TriageQueueItem;
-import com.openhis.triageandqueuemanage.service.TriageQueueItemService;
-import com.openhis.appointmentmanage.domain.ScheduleSlot;
-import com.openhis.appointmentmanage.domain.SchedulePool;
-import com.openhis.appointmentmanage.mapper.ScheduleSlotMapper;
-import com.openhis.appointmentmanage.mapper.SchedulePoolMapper;
-import com.openhis.clinical.domain.Order;
-import com.openhis.clinical.service.IOrderService;
-import com.openhis.workflow.domain.ServiceRequest;
-import com.openhis.workflow.service.IDeviceDispenseService;
-import com.openhis.workflow.service.IDeviceRequestService;
-import com.openhis.workflow.service.IServiceRequestService;
-import com.openhis.yb.domain.ClinicReg;
-import com.openhis.yb.domain.ClinicSettle;
-import com.openhis.yb.domain.InpatientSettle;
-import com.openhis.yb.dto.*;
-import com.openhis.yb.model.OutpatientRegistrationModel;
-import com.openhis.yb.service.IClinicSettleService;
-import com.openhis.yb.service.IInpatientSettleService;
-import com.openhis.yb.service.IRegService;
-import com.openhis.yb.service.YbManager;
+import com.healthlink.his.administration.domain.*;
+import com.healthlink.his.administration.dto.ChargeItemBaseInfoDto;
+import com.healthlink.his.administration.service.*;
+import com.healthlink.his.administration.service.impl.PatientStudentServiceImpl;
+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.enums.ybenums.YbMdtrtCertType;
+import com.healthlink.his.common.enums.ybenums.YbPayment;
+import com.healthlink.his.common.enums.ybenums.YbPsnSetlWay;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.financial.domain.Contract;
+import com.healthlink.his.financial.domain.PaymentRecDetail;
+import com.healthlink.his.financial.domain.PaymentReconciliation;
+import com.healthlink.his.financial.model.PaymentRecDetailDto;
+import com.healthlink.his.financial.model.PaymentedItemModel;
+import com.healthlink.his.financial.model.PrePaymentResult;
+import com.healthlink.his.financial.model.PrePaymentResultModel;
+import com.healthlink.his.financial.service.*;
+import com.healthlink.his.medication.domain.MedicationDefinition;
+import com.healthlink.his.medication.domain.MedicationRequest;
+import com.healthlink.his.medication.service.IMedicationDefinitionService;
+import com.healthlink.his.medication.service.IMedicationDispenseService;
+import com.healthlink.his.medication.service.IMedicationRequestService;
+import com.healthlink.his.nenu.domain.TransactionResponse;
+import com.healthlink.his.nenu.service.ITransactionResponseService;
+import com.healthlink.his.web.chargemanage.appservice.impl.OutpatientRegistrationAppServiceImpl;
+import com.healthlink.his.web.chargemanage.dto.*;
+import com.healthlink.his.web.chargemanage.mapper.OutpatientRegistrationAppMapper;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationAdviceAppService;
+import com.healthlink.his.web.doctorstation.dto.AdviceBaseDto;
+import com.healthlink.his.web.doctorstation.dto.AdvicePriceDto;
+import com.healthlink.his.web.externalintegration.appservice.IBankPosCloudAppService;
+import com.healthlink.his.web.paymentmanage.appservice.IPaymentRecService;
+import com.healthlink.his.web.paymentmanage.dto.*;
+import com.healthlink.his.web.paymentmanage.dto.CancelPaymentDto;
+import com.healthlink.his.web.paymentmanage.dto.Clinic2207OrderResultDto;
+import com.healthlink.his.web.paymentmanage.mapper.PaymentMapper;
+import com.healthlink.his.web.personalization.dto.ActivityDeviceDto;
+import com.healthlink.his.triageandqueuemanage.domain.TriageQueueItem;
+import com.healthlink.his.triageandqueuemanage.service.TriageQueueItemService;
+import com.healthlink.his.appointmentmanage.domain.ScheduleSlot;
+import com.healthlink.his.appointmentmanage.domain.SchedulePool;
+import com.healthlink.his.appointmentmanage.mapper.ScheduleSlotMapper;
+import com.healthlink.his.appointmentmanage.mapper.SchedulePoolMapper;
+import com.healthlink.his.clinical.domain.Order;
+import com.healthlink.his.clinical.service.IOrderService;
+import com.healthlink.his.workflow.domain.ServiceRequest;
+import com.healthlink.his.workflow.service.IDeviceDispenseService;
+import com.healthlink.his.workflow.service.IDeviceRequestService;
+import com.healthlink.his.workflow.service.IServiceRequestService;
+import com.healthlink.his.yb.domain.ClinicReg;
+import com.healthlink.his.yb.domain.ClinicSettle;
+import com.healthlink.his.yb.domain.InpatientSettle;
+import com.healthlink.his.yb.dto.*;
+import com.healthlink.his.yb.model.OutpatientRegistrationModel;
+import com.healthlink.his.yb.service.IClinicSettleService;
+import com.healthlink.his.yb.service.IInpatientSettleService;
+import com.healthlink.his.yb.service.IRegService;
+import com.healthlink.his.yb.service.YbManager;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.util.StringUtil;
@@ -622,8 +622,8 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
             throw new ServiceException("收费详情缺少批次号信息");
         }
 
-        com.openhis.financial.model.PaymentResult paymentResult;
-        List<com.openhis.financial.model.PaymentResult> paymentResultList = new ArrayList<>();
+        com.healthlink.his.financial.model.PaymentResult paymentResult;
+        List<com.healthlink.his.financial.model.PaymentResult> paymentResultList = new ArrayList<>();
 
         for (Map.Entry<String, List<PaymentRecDetail>> stringListEntry : payTransNoMap.entrySet()) {
             // paymentResult = new PaymentResult();
@@ -647,7 +647,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
             paymentResultList.add(paymentResult);
         }
 
-        List<String> ybSettleIds = paymentResultList.stream().map(com.openhis.financial.model.PaymentResult::getSetlId)
+        List<String> ybSettleIds = paymentResultList.stream().map(com.healthlink.his.financial.model.PaymentResult::getSetlId)
                 .collect(Collectors.toList());
 
         // 更改付款状态
@@ -663,8 +663,8 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         }
 
         // 记录卡余额等信息
-        com.openhis.financial.model.PaymentResult minAmountResult = null;
-        for (com.openhis.financial.model.PaymentResult result : paymentResultList) {
+        com.healthlink.his.financial.model.PaymentResult minAmountResult = null;
+        for (com.healthlink.his.financial.model.PaymentResult result : paymentResultList) {
             if (result.getBalc() == null) {
                 continue;
             }
@@ -1350,7 +1350,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
      * @param payment 付款实体
      * @param paymentDetails 付款详情
      */
-    private void savePaymentDetail(com.openhis.financial.model.PaymentResult paymentResult,
+    private void savePaymentDetail(com.healthlink.his.financial.model.PaymentResult paymentResult,
             PaymentReconciliation payment, List<PaymentDetailDto> paymentDetails, Long accountId) {
         // 保存付款详情
         List<PaymentRecDetail> paymentRecDetails = new ArrayList<>();
@@ -1958,7 +1958,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         if (contract == null) {
             throw new ServiceException("请选择合适的费用性质");
         }
-        com.openhis.financial.model.PaymentResult paymentResult;
+        com.healthlink.his.financial.model.PaymentResult paymentResult;
         if ("1".equals(SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH))
                 && !CommonConstants.BusinessName.DEFAULT_CONTRACT_NO
                         .equals(outpatientRegistrationAddParam.getAccountFormData().getContractNo())
@@ -1969,7 +1969,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
                     chrgBchno);
         } else {
             // 自费结算
-            paymentResult = new com.openhis.financial.model.PaymentResult();
+            paymentResult = new com.healthlink.his.financial.model.PaymentResult();
             paymentResult.setChrgBchno(chrgBchno).setMedfeeSumamt(chargeItem.getTotalPrice())
                     .setFulamtOwnpayAmt(chargeItem.getTotalPrice()).setPsnPartAmt(chargeItem.getTotalPrice())
                     .setPsnCashPay(chargeItem.getTotalPrice()).setSetlId(contract.getBusNo());
@@ -2627,8 +2627,8 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
                 .filter(acc -> acc.getId() != null)
                 .collect(Collectors.groupingBy(Account::getId));
 
-        com.openhis.financial.model.PaymentResult paymentResult;
-        List<com.openhis.financial.model.PaymentResult> paymentResultList = new ArrayList<>();
+        com.healthlink.his.financial.model.PaymentResult paymentResult;
+        List<com.healthlink.his.financial.model.PaymentResult> paymentResultList = new ArrayList<>();
 
         Integer minpacuntDrugTracCnt = 0;
         Integer mcsTracCnt = 0;
@@ -2662,7 +2662,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
             paymentResultList.add(paymentResult);
         }
 
-        List<String> ybSettleIds = paymentResultList.stream().map(com.openhis.financial.model.PaymentResult::getSetlId)
+        List<String> ybSettleIds = paymentResultList.stream().map(com.healthlink.his.financial.model.PaymentResult::getSetlId)
                 .filter(StringUtils::isNotEmpty).collect(Collectors.toList());
 
         // <4>更改付款状态
@@ -2705,8 +2705,8 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         }
 
         // 记录卡余额等信息
-        com.openhis.financial.model.PaymentResult minAmountResult = null;
-        for (com.openhis.financial.model.PaymentResult result : paymentResultList) {
+        com.healthlink.his.financial.model.PaymentResult minAmountResult = null;
+        for (com.healthlink.his.financial.model.PaymentResult result : paymentResultList) {
             if (result.getBalc() == null) {
                 continue;
             }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ThreePartPayServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/ThreePartPayServiceImpl.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ThreePartPayServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/ThreePartPayServiceImpl.java
index a8d043e74..8e313469f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ThreePartPayServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/ThreePartPayServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.paymentmanage.appservice.impl;
+package com.healthlink.his.web.paymentmanage.appservice.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -11,20 +11,20 @@ import com.core.common.exception.ServiceException;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
 import com.core.web.util.TenantOptionUtil;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.financial.domain.PaymentReconciliation;
-import com.openhis.financial.domain.ThreePartPayCallBack;
-import com.openhis.financial.service.IPaymentRecDetailService;
-import com.openhis.financial.service.IPaymentReconciliationService;
-import com.openhis.financial.service.ThreePartPayCallBackService;
-import com.openhis.web.paymentmanage.appservice.ThreePartPayService;
-import com.openhis.web.paymentmanage.dto.ThreePartCallBackVo;
-import com.openhis.web.paymentmanage.mapper.PaymentMapper;
-import com.openhis.yb.dto.PaymentDetailDto;
-import com.openhis.yb.dto.ThreePartPayDto;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.service.IPractitionerService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.financial.domain.PaymentReconciliation;
+import com.healthlink.his.financial.domain.ThreePartPayCallBack;
+import com.healthlink.his.financial.service.IPaymentRecDetailService;
+import com.healthlink.his.financial.service.IPaymentReconciliationService;
+import com.healthlink.his.financial.service.ThreePartPayCallBackService;
+import com.healthlink.his.web.paymentmanage.appservice.ThreePartPayService;
+import com.healthlink.his.web.paymentmanage.dto.ThreePartCallBackVo;
+import com.healthlink.his.web.paymentmanage.mapper.PaymentMapper;
+import com.healthlink.his.yb.dto.PaymentDetailDto;
+import com.healthlink.his.yb.dto.ThreePartPayDto;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.core5.http.ClassicHttpResponse;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ThreePartSimpleFieldMappingService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/ThreePartSimpleFieldMappingService.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ThreePartSimpleFieldMappingService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/ThreePartSimpleFieldMappingService.java
index 8dcc6547b..fa536e7e6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ThreePartSimpleFieldMappingService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/ThreePartSimpleFieldMappingService.java
@@ -1,8 +1,8 @@
-package com.openhis.web.paymentmanage.appservice.impl;
+package com.healthlink.his.web.paymentmanage.appservice.impl;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.openhis.web.paymentmanage.util.ReverseMappingProperties;
+import com.healthlink.his.web.paymentmanage.util.ReverseMappingProperties;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ChargeBillController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/controller/ChargeBillController.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ChargeBillController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/controller/ChargeBillController.java
index f0cddd605..21d2b6958 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ChargeBillController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/controller/ChargeBillController.java
@@ -1,9 +1,9 @@
-package com.openhis.web.paymentmanage.controller;
+package com.healthlink.his.web.paymentmanage.controller;
 
 import com.core.common.annotation.Anonymous;
 import com.core.common.core.domain.R;
-import com.openhis.web.paymentmanage.appservice.IChargeBillService;
-import com.openhis.web.paymentmanage.dto.ChargeSummaryDto;
+import com.healthlink.his.web.paymentmanage.appservice.IChargeBillService;
+import com.healthlink.his.web.paymentmanage.dto.ChargeSummaryDto;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/EleInvoiceController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/controller/EleInvoiceController.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/EleInvoiceController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/controller/EleInvoiceController.java
index ccc6c87a9..c1749bc5b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/EleInvoiceController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/controller/EleInvoiceController.java
@@ -1,13 +1,13 @@
-package com.openhis.web.paymentmanage.controller;
+package com.healthlink.his.web.paymentmanage.controller;
 
 import com.core.common.core.domain.R;
 import com.core.common.exception.ServiceException;
-import com.openhis.administration.domain.Invoice;
-import com.openhis.common.enums.ybenums.YbEncounterClass;
-import com.openhis.web.paymentmanage.appservice.IChargeBillService;
-import com.openhis.web.paymentmanage.appservice.IEleInvoiceService;
-import com.openhis.web.paymentmanage.dto.InvoiceWriteOffDto;
-import com.openhis.web.paymentmanage.dto.MakeInvoiceDto;
+import com.healthlink.his.administration.domain.Invoice;
+import com.healthlink.his.common.enums.ybenums.YbEncounterClass;
+import com.healthlink.his.web.paymentmanage.appservice.IChargeBillService;
+import com.healthlink.his.web.paymentmanage.appservice.IEleInvoiceService;
+import com.healthlink.his.web.paymentmanage.dto.InvoiceWriteOffDto;
+import com.healthlink.his.web.paymentmanage.dto.MakeInvoiceDto;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentContractController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/controller/PaymentContractController.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentContractController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/controller/PaymentContractController.java
index 39f20619f..f4804845b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentContractController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/controller/PaymentContractController.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.paymentmanage.controller;
+package com.healthlink.his.web.paymentmanage.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.financial.domain.Contract;
-import com.openhis.financial.service.IContractService;
+import com.healthlink.his.financial.domain.Contract;
+import com.healthlink.his.financial.service.IContractService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentReconciliationController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/controller/PaymentReconciliationController.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentReconciliationController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/controller/PaymentReconciliationController.java
index c275d597b..c22e26592 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentReconciliationController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/controller/PaymentReconciliationController.java
@@ -1,24 +1,24 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.paymentmanage.controller;
+package com.healthlink.his.web.paymentmanage.controller;
 
 import com.core.common.core.domain.R;
 import com.core.common.enums.TenantOptionDict;
 import com.core.web.util.TenantOptionUtil;
-import com.openhis.administration.domain.Invoice;
-import com.openhis.financial.domain.PaymentReconciliation;
-import com.openhis.web.chargemanage.dto.OutpatientRegistrationAddParam;
-import com.openhis.web.chargemanage.dto.OutpatientRegistrationSettleParam;
-import com.openhis.web.paymentmanage.appservice.IChargeBillService;
-import com.openhis.web.paymentmanage.appservice.IEleInvoiceService;
-import com.openhis.web.paymentmanage.appservice.IPaymentRecService;
-import com.openhis.web.paymentmanage.dto.CancelPaymentDto;
-import com.openhis.web.paymentmanage.dto.CancelPaymentInpatientDto;
-import com.openhis.web.paymentmanage.dto.NenuBpcPayDto;
-import com.openhis.yb.dto.PaymentDto;
-import com.openhis.yb.dto.PaymentInpatientDto;
-import com.openhis.yb.dto.PrePaymentDto;
+import com.healthlink.his.administration.domain.Invoice;
+import com.healthlink.his.financial.domain.PaymentReconciliation;
+import com.healthlink.his.web.chargemanage.dto.OutpatientRegistrationAddParam;
+import com.healthlink.his.web.chargemanage.dto.OutpatientRegistrationSettleParam;
+import com.healthlink.his.web.paymentmanage.appservice.IChargeBillService;
+import com.healthlink.his.web.paymentmanage.appservice.IEleInvoiceService;
+import com.healthlink.his.web.paymentmanage.appservice.IPaymentRecService;
+import com.healthlink.his.web.paymentmanage.dto.CancelPaymentDto;
+import com.healthlink.his.web.paymentmanage.dto.CancelPaymentInpatientDto;
+import com.healthlink.his.web.paymentmanage.dto.NenuBpcPayDto;
+import com.healthlink.his.yb.dto.PaymentDto;
+import com.healthlink.his.yb.dto.PaymentInpatientDto;
+import com.healthlink.his.yb.dto.PrePaymentDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ThreePartPayController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/controller/ThreePartPayController.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ThreePartPayController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/controller/ThreePartPayController.java
index 717a90219..329968c29 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ThreePartPayController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/controller/ThreePartPayController.java
@@ -1,8 +1,8 @@
-package com.openhis.web.paymentmanage.controller;
+package com.healthlink.his.web.paymentmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.paymentmanage.appservice.ThreePartPayService;
-import com.openhis.yb.dto.ThreePartPayDto;
+import com.healthlink.his.web.paymentmanage.appservice.ThreePartPayService;
+import com.healthlink.his.yb.dto.ThreePartPayDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelPaymentDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/CancelPaymentDto.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelPaymentDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/CancelPaymentDto.java
index 0a34082c6..d8d6e94e4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelPaymentDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/CancelPaymentDto.java
@@ -1,9 +1,9 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
-import com.openhis.yb.dto.PaymentDetailDto;
+import com.healthlink.his.yb.dto.PaymentDetailDto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelPaymentInpatientDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/CancelPaymentInpatientDto.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelPaymentInpatientDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/CancelPaymentInpatientDto.java
index 8494b05fc..48ba291a1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelPaymentInpatientDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/CancelPaymentInpatientDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelRegPaymentDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/CancelRegPaymentDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelRegPaymentDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/CancelRegPaymentDto.java
index 843d6dd37..0267e7f6c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelRegPaymentDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/CancelRegPaymentDto.java
@@ -1,8 +1,8 @@
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.yb.dto.PaymentDetailDto;
+import com.healthlink.his.yb.dto.PaymentDetailDto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChangePriceListDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ChangePriceListDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChangePriceListDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ChangePriceListDto.java
index cdd5a4e61..3290ff8c7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChangePriceListDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ChangePriceListDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemDetailVO.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ChargeItemDetailVO.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemDetailVO.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ChargeItemDetailVO.java
index c25d5613d..e7539a484 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemDetailVO.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ChargeItemDetailVO.java
@@ -1,6 +1,6 @@
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ChargeItemDto.java
similarity index 73%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ChargeItemDto.java
index 68e640e15..3b7a70426 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ChargeItemDto.java
@@ -1,9 +1,9 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
-import com.openhis.administration.domain.ChargeItem;
+import com.healthlink.his.administration.domain.ChargeItem;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemExtendInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ChargeItemExtendInfoDto.java
similarity index 80%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemExtendInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ChargeItemExtendInfoDto.java
index 74a6b4d3f..69a49ce69 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemExtendInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ChargeItemExtendInfoDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemGroupDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ChargeItemGroupDto.java
similarity index 71%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemGroupDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ChargeItemGroupDto.java
index ae1f42142..e67ae0ee8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemGroupDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ChargeItemGroupDto.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
-import com.openhis.administration.domain.ChargeItem;
-import com.openhis.financial.domain.Contract;
+import com.healthlink.his.administration.domain.ChargeItem;
+import com.healthlink.his.financial.domain.Contract;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeSummaryDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ChargeSummaryDto.java
similarity index 78%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeSummaryDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ChargeSummaryDto.java
index a23cc5e3d..fead1bf10 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeSummaryDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ChargeSummaryDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2206OrderResultDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/Clinic2206OrderResultDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2206OrderResultDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/Clinic2206OrderResultDto.java
index 9428b3905..2c6b51b8a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2206OrderResultDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/Clinic2206OrderResultDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2207OrderResultDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/Clinic2207OrderResultDto.java
similarity index 68%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2207OrderResultDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/Clinic2207OrderResultDto.java
index fb0071d72..34bd64165 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2207OrderResultDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/Clinic2207OrderResultDto.java
@@ -1,6 +1,6 @@
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
-import com.openhis.yb.dto.Clinic2207OrderResult;
+import com.healthlink.his.yb.dto.Clinic2207OrderResult;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2207OrderResultInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/Clinic2207OrderResultInfoDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2207OrderResultInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/Clinic2207OrderResultInfoDto.java
index 3099391d9..312911426 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2207OrderResultInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/Clinic2207OrderResultInfoDto.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
-import com.openhis.yb.dto.Clinic2206FundPaymentResult;
+import com.healthlink.his.yb.dto.Clinic2206FundPaymentResult;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/DispenseQuantityDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/DispenseQuantityDto.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/DispenseQuantityDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/DispenseQuantityDto.java
index a655367b2..218416b6b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/DispenseQuantityDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/DispenseQuantityDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvioceBillDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/EleInvioceBillDto.java
similarity index 81%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvioceBillDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/EleInvioceBillDto.java
index 3eefdb520..982c3b22d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvioceBillDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/EleInvioceBillDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
 import com.alibaba.fastjson2.JSONObject;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceChargeDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/EleInvoiceChargeDetailDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceChargeDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/EleInvoiceChargeDetailDto.java
index 0a3fded0f..d0a4be4a5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceChargeDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/EleInvoiceChargeDetailDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceListDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/EleInvoiceListDetailDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceListDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/EleInvoiceListDetailDto.java
index a0bf3ec7a..3c0b0b91e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceListDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/EleInvoiceListDetailDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoicePatientInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/EleInvoicePatientInfoDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoicePatientInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/EleInvoicePatientInfoDto.java
index 7fa82deaf..dd73b7fb6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoicePatientInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/EleInvoicePatientInfoDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoicePaymentInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/EleInvoicePaymentInfoDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoicePaymentInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/EleInvoicePaymentInfoDto.java
index 9242833b9..30863a43d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoicePaymentInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/EleInvoicePaymentInfoDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceResultDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/EleInvoiceResultDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceResultDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/EleInvoiceResultDto.java
index 3dc052a8b..be9d6343a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceResultDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/EleInvoiceResultDto.java
@@ -1,9 +1,9 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
-import com.openhis.common.enums.InvoiceStatus;
+import com.healthlink.his.common.enums.InvoiceStatus;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InpatientPreSettleDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/InpatientPreSettleDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InpatientPreSettleDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/InpatientPreSettleDto.java
index a41ad7c69..1bc71cb85 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InpatientPreSettleDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/InpatientPreSettleDto.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.openhis.yb.dto.Clinic2206FundPaymentResult;
+import com.healthlink.his.yb.dto.Clinic2206FundPaymentResult;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InpatientPreSettleResultDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/InpatientPreSettleResultDto.java
similarity index 82%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InpatientPreSettleResultDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/InpatientPreSettleResultDto.java
index 2ee10d5e2..3a88e38b5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InpatientPreSettleResultDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/InpatientPreSettleResultDto.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
-import com.openhis.financial.domain.PaymentReconciliation;
-import com.openhis.financial.model.PaymentRecDetailDto;
+import com.healthlink.his.financial.domain.PaymentReconciliation;
+import com.healthlink.his.financial.model.PaymentRecDetailDto;
 import lombok.Data;
 
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InvoiceBaseInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/InvoiceBaseInfoDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InvoiceBaseInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/InvoiceBaseInfoDto.java
index f416db69b..4e790c90a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InvoiceBaseInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/InvoiceBaseInfoDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InvoiceWriteOffDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/InvoiceWriteOffDto.java
similarity index 70%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InvoiceWriteOffDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/InvoiceWriteOffDto.java
index a87680894..e896092b8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InvoiceWriteOffDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/InvoiceWriteOffDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/MakeInvoiceDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/MakeInvoiceDto.java
similarity index 70%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/MakeInvoiceDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/MakeInvoiceDto.java
index 568da5165..3cc557132 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/MakeInvoiceDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/MakeInvoiceDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/NenuBpcPayDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/NenuBpcPayDto.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/NenuBpcPayDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/NenuBpcPayDto.java
index e5c463a07..ee560b3a2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/NenuBpcPayDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/NenuBpcPayDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/OrgIncomeDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/OrgIncomeDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/OrgIncomeDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/OrgIncomeDto.java
index bc6c6e246..19c8c55ae 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/OrgIncomeDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/OrgIncomeDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentSettleDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/PaymentSettleDto.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentSettleDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/PaymentSettleDto.java
index 622efdb6c..f8a882f33 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentSettleDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/PaymentSettleDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentVO.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/PaymentVO.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentVO.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/PaymentVO.java
index 9b4ee155a..012b3e833 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentVO.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/PaymentVO.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.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 java.math.BigDecimal;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ReportVo.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ReportVo.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ReportVo.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ReportVo.java
index 3e911b8b7..8152f8e4f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ReportVo.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ReportVo.java
@@ -1,4 +1,4 @@
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ReturnBillVO.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ReturnBillVO.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ReturnBillVO.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ReturnBillVO.java
index 2f7d508db..f90829005 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ReturnBillVO.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ReturnBillVO.java
@@ -1,4 +1,4 @@
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartCallBackVo.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ThreePartCallBackVo.java
similarity index 79%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartCallBackVo.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ThreePartCallBackVo.java
index 0f64b5b9e..bd3e8e3dc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartCallBackVo.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ThreePartCallBackVo.java
@@ -1,8 +1,8 @@
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.financial.domain.ThreePartPayCallBack;
+import com.healthlink.his.financial.domain.ThreePartPayCallBack;
 import lombok.Data;
 
 @Data
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartCompareDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ThreePartCompareDto.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartCompareDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ThreePartCompareDto.java
index bdf85b4d3..3867ae0a3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartCompareDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ThreePartCompareDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartComparePaymentDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ThreePartComparePaymentDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartComparePaymentDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ThreePartComparePaymentDto.java
index e352a5035..23f73c87b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartComparePaymentDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ThreePartComparePaymentDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
 import java.math.BigDecimal;
 import java.util.Date;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartCompareRequestDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ThreePartCompareRequestDto.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartCompareRequestDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ThreePartCompareRequestDto.java
index ed6b20ccc..95c54c601 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartCompareRequestDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/dto/ThreePartCompareRequestDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.paymentmanage.dto;
+package com.healthlink.his.web.paymentmanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChangePriceMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/mapper/ChangePriceMapper.java
similarity index 68%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChangePriceMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/mapper/ChangePriceMapper.java
index e222b1a0b..4ee7d2f2c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChangePriceMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/mapper/ChangePriceMapper.java
@@ -1,6 +1,6 @@
-package com.openhis.web.paymentmanage.mapper;
+package com.healthlink.his.web.paymentmanage.mapper;
 
-import com.openhis.medication.domain.MedicationDefinition;
+import com.healthlink.his.medication.domain.MedicationDefinition;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChargeBillMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/mapper/ChargeBillMapper.java
similarity index 77%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChargeBillMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/mapper/ChargeBillMapper.java
index 85bfe4ade..e70670dee 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChargeBillMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/mapper/ChargeBillMapper.java
@@ -1,6 +1,6 @@
-package com.openhis.web.paymentmanage.mapper;
+package com.healthlink.his.web.paymentmanage.mapper;
 
-import com.openhis.web.paymentmanage.dto.ChargeItemExtendInfoDto;
+import com.healthlink.his.web.paymentmanage.dto.ChargeItemExtendInfoDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/EleInvoiceMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/mapper/EleInvoiceMapper.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/EleInvoiceMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/mapper/EleInvoiceMapper.java
index 8cba023ac..ac9426c76 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/EleInvoiceMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/mapper/EleInvoiceMapper.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.paymentmanage.mapper;
+package com.healthlink.his.web.paymentmanage.mapper;
 
-import com.openhis.web.paymentmanage.dto.EleInvoiceChargeDetailDto;
-import com.openhis.web.paymentmanage.dto.EleInvoiceListDetailDto;
-import com.openhis.web.paymentmanage.dto.EleInvoicePatientInfoDto;
-import com.openhis.web.paymentmanage.dto.EleInvoicePaymentInfoDto;
+import com.healthlink.his.web.paymentmanage.dto.EleInvoiceChargeDetailDto;
+import com.healthlink.his.web.paymentmanage.dto.EleInvoiceListDetailDto;
+import com.healthlink.his.web.paymentmanage.dto.EleInvoicePatientInfoDto;
+import com.healthlink.his.web.paymentmanage.dto.EleInvoicePaymentInfoDto;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/PaymentMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/mapper/PaymentMapper.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/PaymentMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/mapper/PaymentMapper.java
index beee26ae6..285ce01d8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/PaymentMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/mapper/PaymentMapper.java
@@ -1,17 +1,17 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.paymentmanage.mapper;
+package com.healthlink.his.web.paymentmanage.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.paymentmanage.dto.ChargeItemDto;
-import com.openhis.web.paymentmanage.dto.DispenseQuantityDto;
-import com.openhis.web.paymentmanage.dto.PaymentVO;
-import com.openhis.web.paymentmanage.dto.ThreePartCallBackVo;
-import com.openhis.yb.dto.PaymentDetailDto;
+import com.healthlink.his.web.paymentmanage.dto.ChargeItemDto;
+import com.healthlink.his.web.paymentmanage.dto.DispenseQuantityDto;
+import com.healthlink.his.web.paymentmanage.dto.PaymentVO;
+import com.healthlink.his.web.paymentmanage.dto.ThreePartCallBackVo;
+import com.healthlink.his.yb.dto.PaymentDetailDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ThreePartPayMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/mapper/ThreePartPayMapper.java
similarity index 76%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ThreePartPayMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/mapper/ThreePartPayMapper.java
index 36877e603..0f2a1c6be 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ThreePartPayMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/mapper/ThreePartPayMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.web.paymentmanage.mapper;
+package com.healthlink.his.web.paymentmanage.mapper;
 
-import com.openhis.web.paymentmanage.dto.ThreePartComparePaymentDto;
-import com.openhis.web.paymentmanage.dto.ThreePartCompareRequestDto;
+import com.healthlink.his.web.paymentmanage.dto.ThreePartComparePaymentDto;
+import com.healthlink.his.web.paymentmanage.dto.ThreePartCompareRequestDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/util/MD5Util.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/util/MD5Util.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/util/MD5Util.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/util/MD5Util.java
index 74f605435..78425f3e3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/util/MD5Util.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/util/MD5Util.java
@@ -1,4 +1,4 @@
-package com.openhis.web.paymentmanage.util;
+package com.healthlink.his.web.paymentmanage.util;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/util/ReverseMappingProperties.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/util/ReverseMappingProperties.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/util/ReverseMappingProperties.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/util/ReverseMappingProperties.java
index d4c8de16c..c13ac7a90 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/util/ReverseMappingProperties.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/util/ReverseMappingProperties.java
@@ -1,4 +1,4 @@
-package com.openhis.web.paymentmanage.util;
+package com.healthlink.his.web.paymentmanage.util;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/IActivityDeviceAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/appservice/IActivityDeviceAppService.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/IActivityDeviceAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/appservice/IActivityDeviceAppService.java
index 24dfd7cea..5614d0dc8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/IActivityDeviceAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/appservice/IActivityDeviceAppService.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.personalization.appservice;
+package com.healthlink.his.web.personalization.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.datadictionary.dto.DeviceManageSelParam;
-import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam;
-import com.openhis.web.personalization.dto.ActivityDeviceDto;
+import com.healthlink.his.web.datadictionary.dto.DeviceManageSelParam;
+import com.healthlink.his.web.datadictionary.dto.DiagnosisTreatmentSelParam;
+import com.healthlink.his.web.personalization.dto.ActivityDeviceDto;
 
 import jakarta.servlet.http.HttpServletRequest;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/IOrderGroupAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/appservice/IOrderGroupAppService.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/IOrderGroupAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/appservice/IOrderGroupAppService.java
index a9e53c262..3b4184729 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/IOrderGroupAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/appservice/IOrderGroupAppService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.personalization.appservice;
+package com.healthlink.his.web.personalization.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.personalization.dto.OrderGroupDto;
+import com.healthlink.his.web.personalization.dto.OrderGroupDto;
 
 /**
  * 组套 service
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/IOrdersGroupPackageAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/appservice/IOrdersGroupPackageAppService.java
similarity index 80%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/IOrdersGroupPackageAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/appservice/IOrdersGroupPackageAppService.java
index cd7abffc8..63f989045 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/IOrdersGroupPackageAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/appservice/IOrdersGroupPackageAppService.java
@@ -1,10 +1,10 @@
-package com.openhis.web.personalization.appservice;
+package com.healthlink.his.web.personalization.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.personalization.dto.OrdersGroupPackageDetailQueryDto;
-import com.openhis.web.personalization.dto.OrdersGroupPackageQueryDto;
-import com.openhis.web.personalization.dto.OrdersGroupPackageSaveDto;
-import com.openhis.web.personalization.dto.OrdersGroupPackageUseDto;
+import com.healthlink.his.web.personalization.dto.OrdersGroupPackageDetailQueryDto;
+import com.healthlink.his.web.personalization.dto.OrdersGroupPackageQueryDto;
+import com.healthlink.his.web.personalization.dto.OrdersGroupPackageSaveDto;
+import com.healthlink.his.web.personalization.dto.OrdersGroupPackageUseDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/ActivityDeviceAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/appservice/impl/ActivityDeviceAppServiceImpl.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/ActivityDeviceAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/appservice/impl/ActivityDeviceAppServiceImpl.java
index 565fd44c6..d828372c9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/ActivityDeviceAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/appservice/impl/ActivityDeviceAppServiceImpl.java
@@ -1,28 +1,28 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.personalization.appservice.impl;
+package com.healthlink.his.web.personalization.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.MessageUtils;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.PublicationStatus;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.template.domain.ActivityDevice;
-import com.openhis.template.service.IActivityDeviceService;
-import com.openhis.web.datadictionary.appservice.IDeviceManageAppService;
-import com.openhis.web.datadictionary.appservice.IDiagTreatMAppService;
-import com.openhis.web.datadictionary.dto.DeviceManageSelParam;
-import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam;
-import com.openhis.web.personalization.appservice.IActivityDeviceAppService;
-import com.openhis.web.personalization.dto.ActivityDeviceDto;
-import com.openhis.web.personalization.dto.ActivityDeviceInitDto;
-import com.openhis.web.personalization.mapper.ActivityDeviceAppMapper;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.PublicationStatus;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.template.domain.ActivityDevice;
+import com.healthlink.his.template.service.IActivityDeviceService;
+import com.healthlink.his.web.datadictionary.appservice.IDeviceManageAppService;
+import com.healthlink.his.web.datadictionary.appservice.IDiagTreatMAppService;
+import com.healthlink.his.web.datadictionary.dto.DeviceManageSelParam;
+import com.healthlink.his.web.datadictionary.dto.DiagnosisTreatmentSelParam;
+import com.healthlink.his.web.personalization.appservice.IActivityDeviceAppService;
+import com.healthlink.his.web.personalization.dto.ActivityDeviceDto;
+import com.healthlink.his.web.personalization.dto.ActivityDeviceInitDto;
+import com.healthlink.his.web.personalization.mapper.ActivityDeviceAppMapper;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/IOrderGroupAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/appservice/impl/IOrderGroupAppServiceImpl.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/IOrderGroupAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/appservice/impl/IOrderGroupAppServiceImpl.java
index 6a86ede29..c581c937b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/IOrderGroupAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/appservice/impl/IOrderGroupAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.personalization.appservice.impl;
+package com.healthlink.his.web.personalization.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -6,18 +6,18 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.OrderGroupType;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.template.domain.OrderGroup;
-import com.openhis.template.mapper.OrderGroupMapper;
-import com.openhis.template.service.OrderGroupService;
-import com.openhis.web.personalization.appservice.IOrderGroupAppService;
-import com.openhis.web.personalization.dto.OrderGroupDto;
-import com.openhis.web.personalization.dto.OrderGroupInitDto;
-import com.openhis.web.personalization.mapper.OrderGroupAppMapper;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.OrderGroupType;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.template.domain.OrderGroup;
+import com.healthlink.his.template.mapper.OrderGroupMapper;
+import com.healthlink.his.template.service.OrderGroupService;
+import com.healthlink.his.web.personalization.appservice.IOrderGroupAppService;
+import com.healthlink.his.web.personalization.dto.OrderGroupDto;
+import com.healthlink.his.web.personalization.dto.OrderGroupInitDto;
+import com.healthlink.his.web.personalization.mapper.OrderGroupAppMapper;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/OrdersGroupPackageAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/appservice/impl/OrdersGroupPackageAppServiceImpl.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/OrdersGroupPackageAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/appservice/impl/OrdersGroupPackageAppServiceImpl.java
index 83964f788..cc553ac2a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/OrdersGroupPackageAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/appservice/impl/OrdersGroupPackageAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.personalization.appservice.impl;
+package com.healthlink.his.web.personalization.appservice.impl;
 
 import java.util.Collections;
 import java.util.List;
@@ -13,19 +13,19 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.core.common.core.domain.R;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.BindingType;
-import com.openhis.common.enums.Whether;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.template.domain.OrdersGroupPackage;
-import com.openhis.template.domain.OrdersGroupPackageDetail;
-import com.openhis.template.service.IOrdersGroupPackageDetailService;
-import com.openhis.template.service.IOrdersGroupPackageService;
-import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService;
-import com.openhis.web.doctorstation.dto.AdviceBaseDto;
-import com.openhis.web.personalization.appservice.IOrdersGroupPackageAppService;
-import com.openhis.web.personalization.dto.*;
-import com.openhis.web.personalization.mapper.OrdersGroupPackageAppMapper;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.BindingType;
+import com.healthlink.his.common.enums.Whether;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.template.domain.OrdersGroupPackage;
+import com.healthlink.his.template.domain.OrdersGroupPackageDetail;
+import com.healthlink.his.template.service.IOrdersGroupPackageDetailService;
+import com.healthlink.his.template.service.IOrdersGroupPackageService;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationAdviceAppService;
+import com.healthlink.his.web.doctorstation.dto.AdviceBaseDto;
+import com.healthlink.his.web.personalization.appservice.IOrdersGroupPackageAppService;
+import com.healthlink.his.web.personalization.dto.*;
+import com.healthlink.his.web.personalization.mapper.OrdersGroupPackageAppMapper;
 
 import static com.core.framework.datasource.DynamicDataSourceContextHolder.log;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/OrdersGroupPackageAppServiceImpl.java.backup b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/appservice/impl/OrdersGroupPackageAppServiceImpl.java.backup
similarity index 100%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/OrdersGroupPackageAppServiceImpl.java.backup
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/appservice/impl/OrdersGroupPackageAppServiceImpl.java.backup
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/ActivityDeviceController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/controller/ActivityDeviceController.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/ActivityDeviceController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/controller/ActivityDeviceController.java
index a87db2a88..7e0ae50c4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/ActivityDeviceController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/controller/ActivityDeviceController.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.personalization.controller;
+package com.healthlink.his.web.personalization.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.datadictionary.dto.DeviceManageSelParam;
-import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam;
-import com.openhis.web.personalization.appservice.IActivityDeviceAppService;
-import com.openhis.web.personalization.dto.ActivityDeviceDto;
+import com.healthlink.his.web.datadictionary.dto.DeviceManageSelParam;
+import com.healthlink.his.web.datadictionary.dto.DiagnosisTreatmentSelParam;
+import com.healthlink.his.web.personalization.appservice.IActivityDeviceAppService;
+import com.healthlink.his.web.personalization.dto.ActivityDeviceDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/OrderGroupController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/controller/OrderGroupController.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/OrderGroupController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/controller/OrderGroupController.java
index df440dd02..46cb40556 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/OrderGroupController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/controller/OrderGroupController.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.personalization.controller;
+package com.healthlink.his.web.personalization.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.personalization.appservice.IOrderGroupAppService;
-import com.openhis.web.personalization.dto.OrderGroupDto;
+import com.healthlink.his.web.personalization.appservice.IOrderGroupAppService;
+import com.healthlink.his.web.personalization.dto.OrderGroupDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/OrdersGroupPackageController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/controller/OrdersGroupPackageController.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/OrdersGroupPackageController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/controller/OrdersGroupPackageController.java
index beb48a8e9..374556755 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/OrdersGroupPackageController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/controller/OrdersGroupPackageController.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.personalization.controller;
+package com.healthlink.his.web.personalization.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.BindingType;
-import com.openhis.web.personalization.appservice.IOrdersGroupPackageAppService;
-import com.openhis.web.personalization.dto.OrdersGroupPackageSaveDto;
+import com.healthlink.his.common.enums.BindingType;
+import com.healthlink.his.web.personalization.appservice.IOrdersGroupPackageAppService;
+import com.healthlink.his.web.personalization.dto.OrdersGroupPackageSaveDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/ActivityDeviceDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/ActivityDeviceDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/ActivityDeviceDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/ActivityDeviceDto.java
index e8de1370c..ecc67a9b3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/ActivityDeviceDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/ActivityDeviceDto.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.personalization.dto;
+package com.healthlink.his.web.personalization.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/ActivityDeviceInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/ActivityDeviceInitDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/ActivityDeviceInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/ActivityDeviceInitDto.java
index 10fc027bb..de06602a4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/ActivityDeviceInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/ActivityDeviceInitDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.personalization.dto;
+package com.healthlink.his.web.personalization.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrderGroupDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/OrderGroupDto.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrderGroupDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/OrderGroupDto.java
index 8f19eebf1..af3a28a50 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrderGroupDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/OrderGroupDto.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.personalization.dto;
+package com.healthlink.his.web.personalization.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrderGroupInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/OrderGroupInitDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrderGroupInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/OrderGroupInitDto.java
index 7f9c03a57..67907fe3c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrderGroupInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/OrderGroupInitDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.personalization.dto;
+package com.healthlink.his.web.personalization.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailQueryDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/OrdersGroupPackageDetailQueryDto.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailQueryDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/OrdersGroupPackageDetailQueryDto.java
index 8ac0f7d87..a8482f291 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailQueryDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/OrdersGroupPackageDetailQueryDto.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.personalization.dto;
+package com.healthlink.his.web.personalization.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.common.annotation.Dict;
-import com.openhis.web.doctorstation.dto.AdviceBaseDto;
+import com.healthlink.his.common.annotation.Dict;
+import com.healthlink.his.web.doctorstation.dto.AdviceBaseDto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailSaveDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/OrdersGroupPackageDetailSaveDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailSaveDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/OrdersGroupPackageDetailSaveDto.java
index 8ad2f0633..cfb2f7a24 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailSaveDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/OrdersGroupPackageDetailSaveDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.personalization.dto;
+package com.healthlink.his.web.personalization.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/OrdersGroupPackageDto.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/OrdersGroupPackageDto.java
index 844ed61e2..572d59172 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/OrdersGroupPackageDto.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.personalization.dto;
+package com.healthlink.his.web.personalization.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageQueryDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/OrdersGroupPackageQueryDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageQueryDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/OrdersGroupPackageQueryDto.java
index 6a699b37b..6df568906 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageQueryDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/OrdersGroupPackageQueryDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.personalization.dto;
+package com.healthlink.his.web.personalization.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageSaveDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/OrdersGroupPackageSaveDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageSaveDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/OrdersGroupPackageSaveDto.java
index cc5f07226..25d1c7926 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageSaveDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/OrdersGroupPackageSaveDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.personalization.dto;
+package com.healthlink.his.web.personalization.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageUseDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/OrdersGroupPackageUseDto.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageUseDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/OrdersGroupPackageUseDto.java
index 398b26c5b..ae9a14019 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageUseDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/OrdersGroupPackageUseDto.java
@@ -1,9 +1,9 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.personalization.dto;
+package com.healthlink.his.web.personalization.dto;
 
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/mapper/ActivityDeviceAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/mapper/ActivityDeviceAppMapper.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/mapper/ActivityDeviceAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/mapper/ActivityDeviceAppMapper.java
index 388085a24..1d25c33e3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/mapper/ActivityDeviceAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/mapper/ActivityDeviceAppMapper.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.personalization.mapper;
+package com.healthlink.his.web.personalization.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.personalization.dto.ActivityDeviceDto;
+import com.healthlink.his.web.personalization.dto.ActivityDeviceDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/mapper/OrderGroupAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/mapper/OrderGroupAppMapper.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/mapper/OrderGroupAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/mapper/OrderGroupAppMapper.java
index cd6cecba6..8f26e1608 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/mapper/OrderGroupAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/mapper/OrderGroupAppMapper.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.personalization.mapper;
+package com.healthlink.his.web.personalization.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.personalization.dto.OrderGroupDto;
+import com.healthlink.his.web.personalization.dto.OrderGroupDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/mapper/OrdersGroupPackageAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/mapper/OrdersGroupPackageAppMapper.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/mapper/OrdersGroupPackageAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/mapper/OrdersGroupPackageAppMapper.java
index 77b3808dd..9947c3dbc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/mapper/OrdersGroupPackageAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/mapper/OrdersGroupPackageAppMapper.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.personalization.mapper;
+package com.healthlink.his.web.personalization.mapper;
 
-import com.openhis.web.personalization.dto.OrdersGroupPackageDetailQueryDto;
-import com.openhis.web.personalization.dto.OrdersGroupPackageQueryDto;
+import com.healthlink.his.web.personalization.dto.OrdersGroupPackageDetailQueryDto;
+import com.healthlink.his.web.personalization.dto.OrdersGroupPackageQueryDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryCommonService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryCommonService.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryCommonService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryCommonService.java
index 5d7aa9d47..e009e6a4b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryCommonService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryCommonService.java
@@ -1,8 +1,8 @@
-package com.openhis.web.pharmacyDispensarymanage.appservice;
+package com.healthlink.his.web.pharmacyDispensarymanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryDispensingOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryDispensingOrderService.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryDispensingOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryDispensingOrderService.java
index 73bfee6fe..9f45d3574 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryDispensingOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryDispensingOrderService.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacyDispensarymanage.appservice;
+package com.healthlink.his.web.pharmacyDispensarymanage.appservice;
 
 import com.core.common.core.domain.R;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryProfitLossOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryProfitLossOrderService.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryProfitLossOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryProfitLossOrderService.java
index 44c6bf39a..106ec7332 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryProfitLossOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryProfitLossOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.pharmacyDispensarymanage.appservice;
+package com.healthlink.his.web.pharmacyDispensarymanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryReceiptApprovalService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryReceiptApprovalService.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryReceiptApprovalService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryReceiptApprovalService.java
index da486ebdc..903439199 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryReceiptApprovalService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryReceiptApprovalService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.pharmacyDispensarymanage.appservice;
+package com.healthlink.his.web.pharmacyDispensarymanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
+import com.healthlink.his.web.inventorymanage.dto.SupplyItemDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryRequisitionOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryRequisitionOrderService.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryRequisitionOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryRequisitionOrderService.java
index 25174b44e..bf559bfe8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryRequisitionOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryRequisitionOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.pharmacyDispensarymanage.appservice;
+package com.healthlink.his.web.pharmacyDispensarymanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryReturnToWarehouseOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryReturnToWarehouseOrderService.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryReturnToWarehouseOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryReturnToWarehouseOrderService.java
index a2b25e32b..f8b52f506 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryReturnToWarehouseOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryReturnToWarehouseOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.pharmacyDispensarymanage.appservice;
+package com.healthlink.his.web.pharmacyDispensarymanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryStockInOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryStockInOrderService.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryStockInOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryStockInOrderService.java
index 4ea953cf7..3f927b780 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryStockInOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryStockInOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.pharmacyDispensarymanage.appservice;
+package com.healthlink.his.web.pharmacyDispensarymanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryStocktakingOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryStocktakingOrderService.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryStocktakingOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryStocktakingOrderService.java
index 5ad38210e..5f6ec6d1e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryStocktakingOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryStocktakingOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.pharmacyDispensarymanage.appservice;
+package com.healthlink.his.web.pharmacyDispensarymanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryTransferInOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryTransferInOrderService.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryTransferInOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryTransferInOrderService.java
index 34c9c3cf6..526cbd23f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryTransferInOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryTransferInOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.pharmacyDispensarymanage.appservice;
+package com.healthlink.his.web.pharmacyDispensarymanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryTransferOutOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryTransferOutOrderService.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryTransferOutOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryTransferOutOrderService.java
index 5c45e18c1..26f7d507a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryTransferOutOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryTransferOutOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.pharmacyDispensarymanage.appservice;
+package com.healthlink.his.web.pharmacyDispensarymanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryCommonServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryCommonServiceImpl.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryCommonServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryCommonServiceImpl.java
index 5cd10acec..503a863e1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryCommonServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryCommonServiceImpl.java
@@ -1,31 +1,31 @@
-package com.openhis.web.pharmacyDispensarymanage.appservice.impl;
+package com.healthlink.his.web.pharmacyDispensarymanage.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.Practitioner;
-import com.openhis.administration.domain.Supplier;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.administration.service.ISupplierService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.AcceptanceResult;
-import com.openhis.common.enums.PackagingCondition;
-import com.openhis.common.enums.SupplyStatus;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.common.appservice.ICommonService;
-import com.openhis.web.common.dto.LocationDto;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDto;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryMedicationInfoDto;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
-import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.domain.Supplier;
+import com.healthlink.his.administration.service.IPractitionerService;
+import com.healthlink.his.administration.service.ISupplierService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.AcceptanceResult;
+import com.healthlink.his.common.enums.PackagingCondition;
+import com.healthlink.his.common.enums.SupplyStatus;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.common.appservice.ICommonService;
+import com.healthlink.his.web.common.dto.LocationDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryMedicationInfoDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
+import com.healthlink.his.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryDispensingOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryDispensingOrderServiceImpl.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryDispensingOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryDispensingOrderServiceImpl.java
index 36f2dacc2..9fa91ae04 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryDispensingOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryDispensingOrderServiceImpl.java
@@ -1,21 +1,21 @@
-package com.openhis.web.pharmacyDispensarymanage.appservice.impl;
+package com.healthlink.his.web.pharmacyDispensarymanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.*;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryDispensingOrderService;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
-import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper;
-import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryDispensingOrderMapper;
-import com.openhis.workflow.domain.SupplyDelivery;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyDeliveryService;
-import com.openhis.workflow.service.ISupplyRequestService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.enums.*;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryDispensingOrderService;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper;
+import com.healthlink.his.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryDispensingOrderMapper;
+import com.healthlink.his.workflow.domain.SupplyDelivery;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyDeliveryService;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryProfitLossOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryProfitLossOrderServiceImpl.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryProfitLossOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryProfitLossOrderServiceImpl.java
index 95ec82ec2..fe899d225 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryProfitLossOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryProfitLossOrderServiceImpl.java
@@ -1,22 +1,22 @@
-package com.openhis.web.pharmacyDispensarymanage.appservice.impl;
+package com.healthlink.his.web.pharmacyDispensarymanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
-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.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryProfitLossOrderService;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
-import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryProfitLossOrderService;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReceiptApprovalServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReceiptApprovalServiceImpl.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReceiptApprovalServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReceiptApprovalServiceImpl.java
index a97a0ffaf..2929507fe 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReceiptApprovalServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReceiptApprovalServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacyDispensarymanage.appservice.impl;
+package com.healthlink.his.web.pharmacyDispensarymanage.appservice.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -6,36 +6,36 @@ import com.core.common.core.domain.R;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.DispenseStatus;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.common.enums.TraceNoStatus;
-import com.openhis.common.enums.Whether;
-import com.openhis.common.enums.ybenums.YbInvChgType;
-import com.openhis.common.enums.ybenums.YbRxFlag;
-import com.openhis.medication.domain.MedicationDispense;
-import com.openhis.medication.service.IMedicationDispenseService;
-import com.openhis.web.inventorymanage.appservice.IReceiptApprovalAppService;
-import com.openhis.web.inventorymanage.appservice.ITraceNoAppService;
-import com.openhis.web.inventorymanage.assembler.InventoryManageAssembler;
-import com.openhis.web.inventorymanage.dto.ItemChargeDetailDto;
-import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
-import com.openhis.web.inventorymanage.mapper.ReceiptApprovalMapper;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService;
-import com.openhis.workflow.domain.DeviceDispense;
-import com.openhis.workflow.domain.InventoryItem;
-import com.openhis.workflow.domain.SupplyDelivery;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.IDeviceDispenseService;
-import com.openhis.workflow.service.IInventoryItemService;
-import com.openhis.workflow.service.ISupplyDeliveryService;
-import com.openhis.workflow.service.ISupplyRequestService;
-import com.openhis.yb.dto.Medical3503Param;
-import com.openhis.yb.dto.MedicalInventory3501Param;
-import com.openhis.yb.dto.MedicalInventory3502Param;
-import com.openhis.yb.dto.MedicalPurchase3504Param;
-import com.openhis.yb.service.YbManager;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.DispenseStatus;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.common.enums.TraceNoStatus;
+import com.healthlink.his.common.enums.Whether;
+import com.healthlink.his.common.enums.ybenums.YbInvChgType;
+import com.healthlink.his.common.enums.ybenums.YbRxFlag;
+import com.healthlink.his.medication.domain.MedicationDispense;
+import com.healthlink.his.medication.service.IMedicationDispenseService;
+import com.healthlink.his.web.inventorymanage.appservice.IReceiptApprovalAppService;
+import com.healthlink.his.web.inventorymanage.appservice.ITraceNoAppService;
+import com.healthlink.his.web.inventorymanage.assembler.InventoryManageAssembler;
+import com.healthlink.his.web.inventorymanage.dto.ItemChargeDetailDto;
+import com.healthlink.his.web.inventorymanage.dto.SupplyItemDetailDto;
+import com.healthlink.his.web.inventorymanage.mapper.ReceiptApprovalMapper;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService;
+import com.healthlink.his.workflow.domain.DeviceDispense;
+import com.healthlink.his.workflow.domain.InventoryItem;
+import com.healthlink.his.workflow.domain.SupplyDelivery;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.IDeviceDispenseService;
+import com.healthlink.his.workflow.service.IInventoryItemService;
+import com.healthlink.his.workflow.service.ISupplyDeliveryService;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
+import com.healthlink.his.yb.dto.Medical3503Param;
+import com.healthlink.his.yb.dto.MedicalInventory3501Param;
+import com.healthlink.his.yb.dto.MedicalInventory3502Param;
+import com.healthlink.his.yb.dto.MedicalPurchase3504Param;
+import com.healthlink.his.yb.service.YbManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryRequisitionOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryRequisitionOrderServiceImpl.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryRequisitionOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryRequisitionOrderServiceImpl.java
index bf668cc27..3152a8f56 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryRequisitionOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryRequisitionOrderServiceImpl.java
@@ -1,21 +1,21 @@
-package com.openhis.web.pharmacyDispensarymanage.appservice.impl;
+package com.healthlink.his.web.pharmacyDispensarymanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.MessageUtils;
-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.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryRequisitionOrderService;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
-import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryRequisitionOrderService;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReturnToWarehouseOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReturnToWarehouseOrderServiceImpl.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReturnToWarehouseOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReturnToWarehouseOrderServiceImpl.java
index 88bfdd05c..9e1aa7a70 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReturnToWarehouseOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReturnToWarehouseOrderServiceImpl.java
@@ -1,22 +1,22 @@
-package com.openhis.web.pharmacyDispensarymanage.appservice.impl;
+package com.healthlink.his.web.pharmacyDispensarymanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
-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.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReturnToWarehouseOrderService;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
-import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReturnToWarehouseOrderService;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStockInOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStockInOrderServiceImpl.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStockInOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStockInOrderServiceImpl.java
index deb73184c..e3c525e36 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStockInOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStockInOrderServiceImpl.java
@@ -1,22 +1,22 @@
-package com.openhis.web.pharmacyDispensarymanage.appservice.impl;
+package com.healthlink.his.web.pharmacyDispensarymanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
-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.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryStockInOrderService;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
-import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryStockInOrderService;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStocktakingOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStocktakingOrderServiceImpl.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStocktakingOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStocktakingOrderServiceImpl.java
index 8efc8a6b4..90e6e53a6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStocktakingOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStocktakingOrderServiceImpl.java
@@ -1,22 +1,22 @@
-package com.openhis.web.pharmacyDispensarymanage.appservice.impl;
+package com.healthlink.his.web.pharmacyDispensarymanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
-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.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryStocktakingOrderService;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
-import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryStocktakingOrderService;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferInOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferInOrderServiceImpl.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferInOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferInOrderServiceImpl.java
index d65c8f977..be5a38b5f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferInOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferInOrderServiceImpl.java
@@ -1,22 +1,22 @@
-package com.openhis.web.pharmacyDispensarymanage.appservice.impl;
+package com.healthlink.his.web.pharmacyDispensarymanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
-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.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryTransferInOrderService;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
-import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryTransferInOrderService;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferOutOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferOutOrderServiceImpl.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferOutOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferOutOrderServiceImpl.java
index 077ee9f1f..ab1cad53d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferOutOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferOutOrderServiceImpl.java
@@ -1,22 +1,22 @@
-package com.openhis.web.pharmacyDispensarymanage.appservice.impl;
+package com.healthlink.his.web.pharmacyDispensarymanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
-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.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryTransferOutOrderService;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
-import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryTransferOutOrderService;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryDispensingOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/controller/PharmacyDispensaryDispensingOrderController.java
similarity index 83%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryDispensingOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/controller/PharmacyDispensaryDispensingOrderController.java
index 9a80c4e8c..8293cf431 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryDispensingOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/controller/PharmacyDispensaryDispensingOrderController.java
@@ -1,11 +1,11 @@
-package com.openhis.web.pharmacyDispensarymanage.controller;
+package com.healthlink.his.web.pharmacyDispensarymanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryDispensingOrderService;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryDispensingOrderService;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryProfitLossOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/controller/PharmacyDispensaryProfitLossOrderController.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryProfitLossOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/controller/PharmacyDispensaryProfitLossOrderController.java
index a111e9892..2d4e8bc3b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryProfitLossOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/controller/PharmacyDispensaryProfitLossOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.pharmacyDispensarymanage.controller;
+package com.healthlink.his.web.pharmacyDispensarymanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryProfitLossOrderService;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryProfitLossOrderService;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryRequisitionOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/controller/PharmacyDispensaryRequisitionOrderController.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryRequisitionOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/controller/PharmacyDispensaryRequisitionOrderController.java
index 101f44b6a..ddd6faa8a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryRequisitionOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/controller/PharmacyDispensaryRequisitionOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.pharmacyDispensarymanage.controller;
+package com.healthlink.his.web.pharmacyDispensarymanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryRequisitionOrderService;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryRequisitionOrderService;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryReturnToWarehouseOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/controller/PharmacyDispensaryReturnToWarehouseOrderController.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryReturnToWarehouseOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/controller/PharmacyDispensaryReturnToWarehouseOrderController.java
index 0d77d3601..cc93c80d3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryReturnToWarehouseOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/controller/PharmacyDispensaryReturnToWarehouseOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.pharmacyDispensarymanage.controller;
+package com.healthlink.his.web.pharmacyDispensarymanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReturnToWarehouseOrderService;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReturnToWarehouseOrderService;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryStockInOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/controller/PharmacyDispensaryStockInOrderController.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryStockInOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/controller/PharmacyDispensaryStockInOrderController.java
index 66d520a51..8633def99 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryStockInOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/controller/PharmacyDispensaryStockInOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.pharmacyDispensarymanage.controller;
+package com.healthlink.his.web.pharmacyDispensarymanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryStockInOrderService;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryStockInOrderService;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryStocktakingOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/controller/PharmacyDispensaryStocktakingOrderController.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryStocktakingOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/controller/PharmacyDispensaryStocktakingOrderController.java
index 8aa8f61ee..43e826877 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryStocktakingOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/controller/PharmacyDispensaryStocktakingOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.pharmacyDispensarymanage.controller;
+package com.healthlink.his.web.pharmacyDispensarymanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryStocktakingOrderService;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryStocktakingOrderService;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryTransferInOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/controller/PharmacyDispensaryTransferInOrderController.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryTransferInOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/controller/PharmacyDispensaryTransferInOrderController.java
index 453e23e96..a6691b0f3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryTransferInOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/controller/PharmacyDispensaryTransferInOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.pharmacyDispensarymanage.controller;
+package com.healthlink.his.web.pharmacyDispensarymanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryTransferInOrderService;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryTransferInOrderService;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryTransferOutOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/controller/PharmacyDispensaryTransferOutOrderController.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryTransferOutOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/controller/PharmacyDispensaryTransferOutOrderController.java
index e4cdceddb..0a99e9d79 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryTransferOutOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/controller/PharmacyDispensaryTransferOutOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.pharmacyDispensarymanage.controller;
+package com.healthlink.his.web.pharmacyDispensarymanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService;
-import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryTransferOutOrderService;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService;
+import com.healthlink.his.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryTransferOutOrderService;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/dto/PharmacyDispensaryDetailDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/dto/PharmacyDispensaryDetailDto.java
index fe8a41665..7b46ed38b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/dto/PharmacyDispensaryDetailDto.java
@@ -1,14 +1,14 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacyDispensarymanage.dto;
+package com.healthlink.his.web.pharmacyDispensarymanage.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/dto/PharmacyDispensaryDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/dto/PharmacyDispensaryDto.java
index bfa09f9c3..7cb2cc662 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/dto/PharmacyDispensaryDto.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacyDispensarymanage.dto;
+package com.healthlink.his.web.pharmacyDispensarymanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/dto/PharmacyDispensaryInitDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/dto/PharmacyDispensaryInitDto.java
index b99277897..a2649ee8e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/dto/PharmacyDispensaryInitDto.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacyDispensarymanage.dto;
+package com.healthlink.his.web.pharmacyDispensarymanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.web.common.dto.LocationDto;
+import com.healthlink.his.web.common.dto.LocationDto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryMedicationInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/dto/PharmacyDispensaryMedicationInfoDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryMedicationInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/dto/PharmacyDispensaryMedicationInfoDto.java
index ccf0a9819..852428ac6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryMedicationInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/dto/PharmacyDispensaryMedicationInfoDto.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacyDispensarymanage.dto;
+package com.healthlink.his.web.pharmacyDispensarymanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensarySearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/dto/PharmacyDispensarySearchParam.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensarySearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/dto/PharmacyDispensarySearchParam.java
index b649b8ff4..632077401 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensarySearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/dto/PharmacyDispensarySearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacyDispensarymanage.dto;
+package com.healthlink.his.web.pharmacyDispensarymanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryCommonMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryCommonMapper.java
similarity index 80%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryCommonMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryCommonMapper.java
index d4f63172a..17b07398f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryCommonMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryCommonMapper.java
@@ -1,12 +1,12 @@
-package com.openhis.web.pharmacyDispensarymanage.mapper;
+package com.healthlink.his.web.pharmacyDispensarymanage.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.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDto;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryMedicationInfoDto;
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryMedicationInfoDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryDispensingOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryDispensingOrderMapper.java
similarity index 79%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryDispensingOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryDispensingOrderMapper.java
index 021e69c53..46508b568 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryDispensingOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryDispensingOrderMapper.java
@@ -1,6 +1,6 @@
-package com.openhis.web.pharmacyDispensarymanage.mapper;
+package com.healthlink.his.web.pharmacyDispensarymanage.mapper;
 
-import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
+import com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryProfitLossOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryProfitLossOrderMapper.java
similarity index 75%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryProfitLossOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryProfitLossOrderMapper.java
index 90eaa129e..2856adaa8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryProfitLossOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryProfitLossOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacyDispensarymanage.mapper;
+package com.healthlink.his.web.pharmacyDispensarymanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryRequisitionOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryRequisitionOrderMapper.java
similarity index 75%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryRequisitionOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryRequisitionOrderMapper.java
index 9e7ff8d98..194c64655 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryRequisitionOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryRequisitionOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacyDispensarymanage.mapper;
+package com.healthlink.his.web.pharmacyDispensarymanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryReturnToWarehouseOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryReturnToWarehouseOrderMapper.java
similarity index 76%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryReturnToWarehouseOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryReturnToWarehouseOrderMapper.java
index f7bd14ac9..e82c61814 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryReturnToWarehouseOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryReturnToWarehouseOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacyDispensarymanage.mapper;
+package com.healthlink.his.web.pharmacyDispensarymanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryStockInOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryStockInOrderMapper.java
similarity index 75%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryStockInOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryStockInOrderMapper.java
index 9fd74c066..1fd9f3ecb 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryStockInOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryStockInOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacyDispensarymanage.mapper;
+package com.healthlink.his.web.pharmacyDispensarymanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryStocktakingOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryStocktakingOrderMapper.java
similarity index 75%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryStocktakingOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryStocktakingOrderMapper.java
index 2073cb3e6..c609f396d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryStocktakingOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryStocktakingOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacyDispensarymanage.mapper;
+package com.healthlink.his.web.pharmacyDispensarymanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryTransferInOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryTransferInOrderMapper.java
similarity index 75%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryTransferInOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryTransferInOrderMapper.java
index 2eebf1061..87ca4a731 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryTransferInOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryTransferInOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacyDispensarymanage.mapper;
+package com.healthlink.his.web.pharmacyDispensarymanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryTransferOutOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryTransferOutOrderMapper.java
similarity index 75%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryTransferOutOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryTransferOutOrderMapper.java
index 768d4a3bf..7094a17be 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryTransferOutOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryTransferOutOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacyDispensarymanage.mapper;
+package com.healthlink.his.web.pharmacyDispensarymanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseCommonService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseCommonService.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseCommonService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseCommonService.java
index 00a54a1cb..d82283183 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseCommonService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseCommonService.java
@@ -1,8 +1,8 @@
-package com.openhis.web.pharmacyWarehousemanage.appservice;
+package com.healthlink.his.web.pharmacyWarehousemanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseDocumentManagementService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseDocumentManagementService.java
similarity index 79%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseDocumentManagementService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseDocumentManagementService.java
index 07be32a21..bc7ea34e7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseDocumentManagementService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseDocumentManagementService.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacyWarehousemanage.appservice;
+package com.healthlink.his.web.pharmacyWarehousemanage.appservice;
 
 import com.core.common.core.domain.R;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseProfitLossOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseProfitLossOrderService.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseProfitLossOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseProfitLossOrderService.java
index 8978e05cf..a0c0979a7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseProfitLossOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseProfitLossOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.pharmacyWarehousemanage.appservice;
+package com.healthlink.his.web.pharmacyWarehousemanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehousePurchaseOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehousePurchaseOrderService.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehousePurchaseOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehousePurchaseOrderService.java
index c47b6c6ae..120d8e1c7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehousePurchaseOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehousePurchaseOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.pharmacyWarehousemanage.appservice;
+package com.healthlink.his.web.pharmacyWarehousemanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReceiptApprovalService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReceiptApprovalService.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReceiptApprovalService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReceiptApprovalService.java
index 278734ab6..6c352927b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReceiptApprovalService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReceiptApprovalService.java
@@ -1,8 +1,8 @@
-package com.openhis.web.pharmacyWarehousemanage.appservice;
+package com.healthlink.his.web.pharmacyWarehousemanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inventorymanage.dto.ItemChargeDetailDto;
-import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
+import com.healthlink.his.web.inventorymanage.dto.ItemChargeDetailDto;
+import com.healthlink.his.web.inventorymanage.dto.SupplyItemDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReturnOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReturnOrderService.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReturnOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReturnOrderService.java
index 4ab55612d..1624ead3b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReturnOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReturnOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.pharmacyWarehousemanage.appservice;
+package com.healthlink.his.web.pharmacyWarehousemanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReturnToWarehouseOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReturnToWarehouseOrderService.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReturnToWarehouseOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReturnToWarehouseOrderService.java
index 66cc14f59..3c1414135 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReturnToWarehouseOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReturnToWarehouseOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.pharmacyWarehousemanage.appservice;
+package com.healthlink.his.web.pharmacyWarehousemanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStockInOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStockInOrderService.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStockInOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStockInOrderService.java
index 5fb449997..f438afc90 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStockInOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStockInOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.pharmacyWarehousemanage.appservice;
+package com.healthlink.his.web.pharmacyWarehousemanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStockOutOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStockOutOrderService.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStockOutOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStockOutOrderService.java
index 082846e3f..088280dd6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStockOutOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStockOutOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.pharmacyWarehousemanage.appservice;
+package com.healthlink.his.web.pharmacyWarehousemanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStocktakingOrderService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStocktakingOrderService.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStocktakingOrderService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStocktakingOrderService.java
index 7c1559323..3656b16d6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStocktakingOrderService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStocktakingOrderService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.pharmacyWarehousemanage.appservice;
+package com.healthlink.his.web.pharmacyWarehousemanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseCommonServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseCommonServiceImpl.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseCommonServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseCommonServiceImpl.java
index b7e951a76..309d35e29 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseCommonServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseCommonServiceImpl.java
@@ -1,31 +1,31 @@
-package com.openhis.web.pharmacyWarehousemanage.appservice.impl;
+package com.healthlink.his.web.pharmacyWarehousemanage.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.Practitioner;
-import com.openhis.administration.domain.Supplier;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.administration.service.ISupplierService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.AcceptanceResult;
-import com.openhis.common.enums.PackagingCondition;
-import com.openhis.common.enums.SupplyStatus;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.common.appservice.ICommonService;
-import com.openhis.web.common.dto.LocationDto;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDto;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseMedicationInfoDto;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
-import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.domain.Supplier;
+import com.healthlink.his.administration.service.IPractitionerService;
+import com.healthlink.his.administration.service.ISupplierService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.AcceptanceResult;
+import com.healthlink.his.common.enums.PackagingCondition;
+import com.healthlink.his.common.enums.SupplyStatus;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.common.appservice.ICommonService;
+import com.healthlink.his.web.common.dto.LocationDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseMedicationInfoDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+import com.healthlink.his.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseDocumentManagementServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseDocumentManagementServiceImpl.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseDocumentManagementServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseDocumentManagementServiceImpl.java
index bd0f92259..959dc1716 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseDocumentManagementServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseDocumentManagementServiceImpl.java
@@ -1,14 +1,14 @@
-package com.openhis.web.pharmacyWarehousemanage.appservice.impl;
+package com.healthlink.his.web.pharmacyWarehousemanage.appservice.impl;
 
 import com.core.common.core.domain.R;
-import com.openhis.administration.domain.Organization;
-import com.openhis.common.enums.LocationForm;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.common.appservice.ICommonService;
-import com.openhis.web.common.dto.LocationDto;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseDocumentManagementService;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
+import com.healthlink.his.administration.domain.Organization;
+import com.healthlink.his.common.enums.LocationForm;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.common.appservice.ICommonService;
+import com.healthlink.his.web.common.dto.LocationDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseDocumentManagementService;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseProfitLossOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseProfitLossOrderServiceImpl.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseProfitLossOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseProfitLossOrderServiceImpl.java
index 3301da2e7..9c6c11ad4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseProfitLossOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseProfitLossOrderServiceImpl.java
@@ -1,22 +1,22 @@
-package com.openhis.web.pharmacyWarehousemanage.appservice.impl;
+package com.healthlink.his.web.pharmacyWarehousemanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
-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.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseProfitLossOrderService;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
-import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseProfitLossOrderService;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehousePurchaseOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehousePurchaseOrderServiceImpl.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehousePurchaseOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehousePurchaseOrderServiceImpl.java
index 2becc1b25..2b9b9d969 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehousePurchaseOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehousePurchaseOrderServiceImpl.java
@@ -1,21 +1,21 @@
-package com.openhis.web.pharmacyWarehousemanage.appservice.impl;
+package com.healthlink.his.web.pharmacyWarehousemanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.MessageUtils;
-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.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehousePurchaseOrderService;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
-import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehousePurchaseOrderService;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReceiptApprovalServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReceiptApprovalServiceImpl.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReceiptApprovalServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReceiptApprovalServiceImpl.java
index a049fa810..5d4e3ff9b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReceiptApprovalServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReceiptApprovalServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacyWarehousemanage.appservice.impl;
+package com.healthlink.his.web.pharmacyWarehousemanage.appservice.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -7,35 +7,35 @@ import com.core.common.exception.ServiceException;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.ChargeItemDefDetail;
-import com.openhis.administration.service.IChargeItemDefDetailService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.*;
-import com.openhis.common.enums.ybenums.YbInvChgType;
-import com.openhis.common.enums.ybenums.YbRxFlag;
-import com.openhis.medication.domain.MedicationDispense;
-import com.openhis.medication.service.IMedicationDispenseService;
-import com.openhis.web.inventorymanage.appservice.IReceiptApprovalAppService;
-import com.openhis.web.inventorymanage.appservice.ITraceNoAppService;
-import com.openhis.web.inventorymanage.assembler.InventoryManageAssembler;
-import com.openhis.web.inventorymanage.dto.ItemChargeDetailDto;
-import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
-import com.openhis.web.inventorymanage.mapper.ReceiptApprovalMapper;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService;
-import com.openhis.workflow.domain.DeviceDispense;
-import com.openhis.workflow.domain.InventoryItem;
-import com.openhis.workflow.domain.SupplyDelivery;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.IDeviceDispenseService;
-import com.openhis.workflow.service.IInventoryItemService;
-import com.openhis.workflow.service.ISupplyDeliveryService;
-import com.openhis.workflow.service.ISupplyRequestService;
-import com.openhis.yb.dto.Medical3503Param;
-import com.openhis.yb.dto.MedicalInventory3501Param;
-import com.openhis.yb.dto.MedicalInventory3502Param;
-import com.openhis.yb.dto.MedicalPurchase3504Param;
-import com.openhis.yb.service.YbManager;
+import com.healthlink.his.administration.domain.ChargeItemDefDetail;
+import com.healthlink.his.administration.service.IChargeItemDefDetailService;
+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.enums.ybenums.YbInvChgType;
+import com.healthlink.his.common.enums.ybenums.YbRxFlag;
+import com.healthlink.his.medication.domain.MedicationDispense;
+import com.healthlink.his.medication.service.IMedicationDispenseService;
+import com.healthlink.his.web.inventorymanage.appservice.IReceiptApprovalAppService;
+import com.healthlink.his.web.inventorymanage.appservice.ITraceNoAppService;
+import com.healthlink.his.web.inventorymanage.assembler.InventoryManageAssembler;
+import com.healthlink.his.web.inventorymanage.dto.ItemChargeDetailDto;
+import com.healthlink.his.web.inventorymanage.dto.SupplyItemDetailDto;
+import com.healthlink.his.web.inventorymanage.mapper.ReceiptApprovalMapper;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService;
+import com.healthlink.his.workflow.domain.DeviceDispense;
+import com.healthlink.his.workflow.domain.InventoryItem;
+import com.healthlink.his.workflow.domain.SupplyDelivery;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.IDeviceDispenseService;
+import com.healthlink.his.workflow.service.IInventoryItemService;
+import com.healthlink.his.workflow.service.ISupplyDeliveryService;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
+import com.healthlink.his.yb.dto.Medical3503Param;
+import com.healthlink.his.yb.dto.MedicalInventory3501Param;
+import com.healthlink.his.yb.dto.MedicalInventory3502Param;
+import com.healthlink.his.yb.dto.MedicalPurchase3504Param;
+import com.healthlink.his.yb.service.YbManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnOrderServiceImpl.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnOrderServiceImpl.java
index 94d0d5628..98cfa4a41 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnOrderServiceImpl.java
@@ -1,22 +1,22 @@
-package com.openhis.web.pharmacyWarehousemanage.appservice.impl;
+package com.healthlink.his.web.pharmacyWarehousemanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
-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.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReturnOrderService;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
-import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReturnOrderService;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnToWarehouseOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnToWarehouseOrderServiceImpl.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnToWarehouseOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnToWarehouseOrderServiceImpl.java
index 9004b5a03..213f5edc1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnToWarehouseOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnToWarehouseOrderServiceImpl.java
@@ -1,22 +1,22 @@
-package com.openhis.web.pharmacyWarehousemanage.appservice.impl;
+package com.healthlink.his.web.pharmacyWarehousemanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
-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.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReturnToWarehouseOrderService;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
-import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReturnToWarehouseOrderService;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockInOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockInOrderServiceImpl.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockInOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockInOrderServiceImpl.java
index 94c8a8f7a..3d80b0d13 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockInOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockInOrderServiceImpl.java
@@ -1,22 +1,22 @@
-package com.openhis.web.pharmacyWarehousemanage.appservice.impl;
+package com.healthlink.his.web.pharmacyWarehousemanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
-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.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseStockInOrderService;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
-import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseStockInOrderService;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockOutOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockOutOrderServiceImpl.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockOutOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockOutOrderServiceImpl.java
index 2008475cd..fca57d008 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockOutOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockOutOrderServiceImpl.java
@@ -1,22 +1,22 @@
-package com.openhis.web.pharmacyWarehousemanage.appservice.impl;
+package com.healthlink.his.web.pharmacyWarehousemanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
-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.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseStockOutOrderService;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
-import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseStockOutOrderService;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStocktakingOrderServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStocktakingOrderServiceImpl.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStocktakingOrderServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStocktakingOrderServiceImpl.java
index 4c6d922ce..ad5f11c8f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStocktakingOrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStocktakingOrderServiceImpl.java
@@ -1,22 +1,22 @@
-package com.openhis.web.pharmacyWarehousemanage.appservice.impl;
+package com.healthlink.his.web.pharmacyWarehousemanage.appservice.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
-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.web.inventorymanage.dto.ProductStocktakingInitDto;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseStocktakingOrderService;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
-import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.ISupplyRequestService;
+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.web.inventorymanage.dto.ProductStocktakingInitDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseStocktakingOrderService;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseDocumentManagementController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/controller/PharmacyWarehouseDocumentManagementController.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseDocumentManagementController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/controller/PharmacyWarehouseDocumentManagementController.java
index f5117b40e..bf5dda1e4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseDocumentManagementController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/controller/PharmacyWarehouseDocumentManagementController.java
@@ -1,9 +1,9 @@
-package com.openhis.web.pharmacyWarehousemanage.controller;
+package com.healthlink.his.web.pharmacyWarehousemanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseDocumentManagementService;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseDocumentManagementService;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseProfitLossOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/controller/PharmacyWarehouseProfitLossOrderController.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseProfitLossOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/controller/PharmacyWarehouseProfitLossOrderController.java
index ddd76d301..01ddd7e43 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseProfitLossOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/controller/PharmacyWarehouseProfitLossOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.pharmacyWarehousemanage.controller;
+package com.healthlink.his.web.pharmacyWarehousemanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseProfitLossOrderService;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseProfitLossOrderService;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehousePurchaseOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/controller/PharmacyWarehousePurchaseOrderController.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehousePurchaseOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/controller/PharmacyWarehousePurchaseOrderController.java
index 726fc8124..f499e662a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehousePurchaseOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/controller/PharmacyWarehousePurchaseOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.pharmacyWarehousemanage.controller;
+package com.healthlink.his.web.pharmacyWarehousemanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehousePurchaseOrderService;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehousePurchaseOrderService;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseReturnOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/controller/PharmacyWarehouseReturnOrderController.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseReturnOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/controller/PharmacyWarehouseReturnOrderController.java
index d3d75a966..e98090df6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseReturnOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/controller/PharmacyWarehouseReturnOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.pharmacyWarehousemanage.controller;
+package com.healthlink.his.web.pharmacyWarehousemanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReturnOrderService;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReturnOrderService;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseReturnToWarehouseOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/controller/PharmacyWarehouseReturnToWarehouseOrderController.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseReturnToWarehouseOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/controller/PharmacyWarehouseReturnToWarehouseOrderController.java
index acfa7b511..5da8355d9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseReturnToWarehouseOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/controller/PharmacyWarehouseReturnToWarehouseOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.pharmacyWarehousemanage.controller;
+package com.healthlink.his.web.pharmacyWarehousemanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReturnToWarehouseOrderService;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReturnToWarehouseOrderService;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStockInOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStockInOrderController.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStockInOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStockInOrderController.java
index 65bd87979..9c1d55218 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStockInOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStockInOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.pharmacyWarehousemanage.controller;
+package com.healthlink.his.web.pharmacyWarehousemanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseStockInOrderService;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseStockInOrderService;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStockOutOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStockOutOrderController.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStockOutOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStockOutOrderController.java
index 5dea13095..d77ebb4d2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStockOutOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStockOutOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.pharmacyWarehousemanage.controller;
+package com.healthlink.his.web.pharmacyWarehousemanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseStockOutOrderService;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseStockOutOrderService;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStocktakingOrderController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStocktakingOrderController.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStocktakingOrderController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStocktakingOrderController.java
index 694763c25..787fbeb3d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStocktakingOrderController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStocktakingOrderController.java
@@ -1,12 +1,12 @@
-package com.openhis.web.pharmacyWarehousemanage.controller;
+package com.healthlink.his.web.pharmacyWarehousemanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService;
-import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseStocktakingOrderService;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService;
+import com.healthlink.his.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseStocktakingOrderService;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/dto/PharmacyWarehouseDetailDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/dto/PharmacyWarehouseDetailDto.java
index f4f220509..a3cd674b1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/dto/PharmacyWarehouseDetailDto.java
@@ -1,14 +1,14 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacyWarehousemanage.dto;
+package com.healthlink.his.web.pharmacyWarehousemanage.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/dto/PharmacyWarehouseDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/dto/PharmacyWarehouseDto.java
index b3971e301..be0c7190f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/dto/PharmacyWarehouseDto.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacyWarehousemanage.dto;
+package com.healthlink.his.web.pharmacyWarehousemanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/dto/PharmacyWarehouseInitDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/dto/PharmacyWarehouseInitDto.java
index 3842b1dc2..8e7d2c379 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/dto/PharmacyWarehouseInitDto.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacyWarehousemanage.dto;
+package com.healthlink.his.web.pharmacyWarehousemanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.web.common.dto.LocationDto;
+import com.healthlink.his.web.common.dto.LocationDto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseMedicationInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/dto/PharmacyWarehouseMedicationInfoDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseMedicationInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/dto/PharmacyWarehouseMedicationInfoDto.java
index ffe533e1c..2605ac941 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseMedicationInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/dto/PharmacyWarehouseMedicationInfoDto.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacyWarehousemanage.dto;
+package com.healthlink.his.web.pharmacyWarehousemanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/dto/PharmacyWarehouseSearchParam.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/dto/PharmacyWarehouseSearchParam.java
index 557db0daf..b867a2bc2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/dto/PharmacyWarehouseSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacyWarehousemanage.dto;
+package com.healthlink.his.web.pharmacyWarehousemanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseCommonMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseCommonMapper.java
similarity index 80%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseCommonMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseCommonMapper.java
index afad68f46..1bb92d5fa 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseCommonMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseCommonMapper.java
@@ -1,12 +1,12 @@
-package com.openhis.web.pharmacyWarehousemanage.mapper;
+package com.healthlink.his.web.pharmacyWarehousemanage.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.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDto;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseMedicationInfoDto;
-import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseMedicationInfoDto;
+import com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseDocumentManagementMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseDocumentManagementMapper.java
similarity index 75%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseDocumentManagementMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseDocumentManagementMapper.java
index 90c6d9ab5..dea6e568b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseDocumentManagementMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseDocumentManagementMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacyWarehousemanage.mapper;
+package com.healthlink.his.web.pharmacyWarehousemanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseProfitLossOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseProfitLossOrderMapper.java
similarity index 75%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseProfitLossOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseProfitLossOrderMapper.java
index 58f2175bf..771b674f5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseProfitLossOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseProfitLossOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacyWarehousemanage.mapper;
+package com.healthlink.his.web.pharmacyWarehousemanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehousePurchaseOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/mapper/PharmacyWarehousePurchaseOrderMapper.java
similarity index 75%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehousePurchaseOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/mapper/PharmacyWarehousePurchaseOrderMapper.java
index f72b13a65..0cb47edca 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehousePurchaseOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/mapper/PharmacyWarehousePurchaseOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacyWarehousemanage.mapper;
+package com.healthlink.his.web.pharmacyWarehousemanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseReturnOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseReturnOrderMapper.java
similarity index 75%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseReturnOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseReturnOrderMapper.java
index eaa01c353..469b405bd 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseReturnOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseReturnOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacyWarehousemanage.mapper;
+package com.healthlink.his.web.pharmacyWarehousemanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseReturnToWarehouseOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseReturnToWarehouseOrderMapper.java
similarity index 76%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseReturnToWarehouseOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseReturnToWarehouseOrderMapper.java
index f226fbd4d..f22756834 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseReturnToWarehouseOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseReturnToWarehouseOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacyWarehousemanage.mapper;
+package com.healthlink.his.web.pharmacyWarehousemanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStockInOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStockInOrderMapper.java
similarity index 75%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStockInOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStockInOrderMapper.java
index 1067936aa..dfc46c0d3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStockInOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStockInOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacyWarehousemanage.mapper;
+package com.healthlink.his.web.pharmacyWarehousemanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStockOutOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStockOutOrderMapper.java
similarity index 75%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStockOutOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStockOutOrderMapper.java
index 1c74db9c5..3d77fc596 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStockOutOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStockOutOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacyWarehousemanage.mapper;
+package com.healthlink.his.web.pharmacyWarehousemanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStocktakingOrderMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStocktakingOrderMapper.java
similarity index 76%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStocktakingOrderMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStocktakingOrderMapper.java
index 1915de49e..339490435 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStocktakingOrderMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStocktakingOrderMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacyWarehousemanage.mapper;
+package com.healthlink.his.web.pharmacyWarehousemanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IInHospitalReturnMedicineAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/IInHospitalReturnMedicineAppService.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IInHospitalReturnMedicineAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/IInHospitalReturnMedicineAppService.java
index 94621f873..f6498eb28 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IInHospitalReturnMedicineAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/IInHospitalReturnMedicineAppService.java
@@ -1,15 +1,15 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacymanage.appservice;
+package com.healthlink.his.web.pharmacymanage.appservice;
 
 import java.util.List;
 
 import jakarta.servlet.http.HttpServletRequest;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacymanage.dto.EncounterInfoDto;
-import com.openhis.web.pharmacymanage.dto.ReturnMedicineDto;
+import com.healthlink.his.web.pharmacymanage.dto.EncounterInfoDto;
+import com.healthlink.his.web.pharmacymanage.dto.ReturnMedicineDto;
 
 /**
  * TODO:概括描述当前类的主要用途和注意事项
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IMedicalDeviceDispenseAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/IMedicalDeviceDispenseAppService.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IMedicalDeviceDispenseAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/IMedicalDeviceDispenseAppService.java
index 119e388c4..e19004fbb 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IMedicalDeviceDispenseAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/IMedicalDeviceDispenseAppService.java
@@ -1,9 +1,9 @@
-package com.openhis.web.pharmacymanage.appservice;
+package com.healthlink.his.web.pharmacymanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacymanage.dto.DispenseItemDto;
-import com.openhis.web.pharmacymanage.dto.EncounterInfoSearchParam;
-import com.openhis.web.pharmacymanage.dto.ItemDispenseOrderDto;
+import com.healthlink.his.web.pharmacymanage.dto.DispenseItemDto;
+import com.healthlink.his.web.pharmacymanage.dto.EncounterInfoSearchParam;
+import com.healthlink.his.web.pharmacymanage.dto.ItemDispenseOrderDto;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IMedicationDetailsAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/IMedicationDetailsAppService.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IMedicationDetailsAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/IMedicationDetailsAppService.java
index e015780ba..d1d99be05 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IMedicationDetailsAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/IMedicationDetailsAppService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.pharmacymanage.appservice;
+package com.healthlink.his.web.pharmacymanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacymanage.dto.MedDetailsSearchParam;
+import com.healthlink.his.web.pharmacymanage.dto.MedDetailsSearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IPendingMedicationDetailsAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/IPendingMedicationDetailsAppService.java
similarity index 83%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IPendingMedicationDetailsAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/IPendingMedicationDetailsAppService.java
index c98bbf30d..ddc7df01d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IPendingMedicationDetailsAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/IPendingMedicationDetailsAppService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.pharmacymanage.appservice;
+package com.healthlink.his.web.pharmacymanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacymanage.dto.PendingMedicationSearchParam;
+import com.healthlink.his.web.pharmacymanage.dto.PendingMedicationSearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IReturnMedicineAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/IReturnMedicineAppService.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IReturnMedicineAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/IReturnMedicineAppService.java
index 4a8876bc2..f0e33b5a8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IReturnMedicineAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/IReturnMedicineAppService.java
@@ -1,8 +1,8 @@
-package com.openhis.web.pharmacymanage.appservice;
+package com.healthlink.his.web.pharmacymanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacymanage.dto.EncounterInfoDto;
-import com.openhis.web.pharmacymanage.dto.ReturnMedicineDto;
+import com.healthlink.his.web.pharmacymanage.dto.EncounterInfoDto;
+import com.healthlink.his.web.pharmacymanage.dto.ReturnMedicineDto;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/ISummaryDispenseMedicineAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/ISummaryDispenseMedicineAppService.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/ISummaryDispenseMedicineAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/ISummaryDispenseMedicineAppService.java
index ffca0e40d..688a267df 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/ISummaryDispenseMedicineAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/ISummaryDispenseMedicineAppService.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacymanage.appservice;
+package com.healthlink.his.web.pharmacymanage.appservice;
 
 import com.core.common.core.domain.R;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IWesternMedicineDispenseAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/IWesternMedicineDispenseAppService.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IWesternMedicineDispenseAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/IWesternMedicineDispenseAppService.java
index b3de59da0..e946c21db 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IWesternMedicineDispenseAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/IWesternMedicineDispenseAppService.java
@@ -1,9 +1,9 @@
-package com.openhis.web.pharmacymanage.appservice;
+package com.healthlink.his.web.pharmacymanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacymanage.dto.DispenseItemDto;
-import com.openhis.web.pharmacymanage.dto.EncounterInfoSearchParam;
-import com.openhis.web.pharmacymanage.dto.ItemDispenseOrderDto;
+import com.healthlink.his.web.pharmacymanage.dto.DispenseItemDto;
+import com.healthlink.his.web.pharmacymanage.dto.EncounterInfoSearchParam;
+import com.healthlink.his.web.pharmacymanage.dto.ItemDispenseOrderDto;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/InHospitalReturnMedicineAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/InHospitalReturnMedicineAppServiceImpl.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/InHospitalReturnMedicineAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/InHospitalReturnMedicineAppServiceImpl.java
index 73b11735d..3f999c985 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/InHospitalReturnMedicineAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/InHospitalReturnMedicineAppServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacymanage.appservice.impl;
+package com.healthlink.his.web.pharmacymanage.appservice.impl;
 
 import java.math.BigDecimal;
 import java.util.*;
@@ -24,42 +24,42 @@ import com.core.common.utils.AgeCalculatorUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.*;
-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.enums.ybenums.YbInvChgType;
-import com.openhis.common.enums.ybenums.YbMdtrtCertType;
-import com.openhis.common.enums.ybenums.YbRxFlag;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.financial.domain.Contract;
-import com.openhis.financial.domain.PaymentReconciliation;
-import com.openhis.financial.service.IContractService;
-import com.openhis.financial.service.IPaymentReconciliationService;
-import com.openhis.medication.domain.MedicationDefinition;
-import com.openhis.medication.domain.MedicationDispense;
-import com.openhis.medication.domain.MedicationRequest;
-import com.openhis.medication.service.IMedicationDefinitionService;
-import com.openhis.medication.service.IMedicationDispenseService;
-import com.openhis.medication.service.IMedicationRequestService;
-import com.openhis.web.inventorymanage.appservice.impl.ReceiptApprovalAppServiceImpl;
-import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
-import com.openhis.web.pharmacymanage.appservice.IInHospitalReturnMedicineAppService;
-import com.openhis.web.pharmacymanage.dto.*;
-import com.openhis.web.pharmacymanage.mapper.InHospitalReturnMedicineAppMapper;
-import com.openhis.web.pharmacymanage.mapper.ReturnMedicineMapper;
-import com.openhis.workflow.domain.DeviceDispense;
-import com.openhis.workflow.domain.InventoryItem;
-import com.openhis.workflow.service.IDeviceDispenseService;
-import com.openhis.workflow.service.IDeviceRequestService;
-import com.openhis.workflow.service.IInventoryItemService;
-import com.openhis.yb.domain.ClinicSettle;
-import com.openhis.yb.dto.Medical3506Param;
-import com.openhis.yb.dto.MedicalInventory3511Param;
-import com.openhis.yb.service.IClinicSettleService;
-import com.openhis.yb.service.YbManager;
+import com.healthlink.his.administration.domain.*;
+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.enums.ybenums.YbInvChgType;
+import com.healthlink.his.common.enums.ybenums.YbMdtrtCertType;
+import com.healthlink.his.common.enums.ybenums.YbRxFlag;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.financial.domain.Contract;
+import com.healthlink.his.financial.domain.PaymentReconciliation;
+import com.healthlink.his.financial.service.IContractService;
+import com.healthlink.his.financial.service.IPaymentReconciliationService;
+import com.healthlink.his.medication.domain.MedicationDefinition;
+import com.healthlink.his.medication.domain.MedicationDispense;
+import com.healthlink.his.medication.domain.MedicationRequest;
+import com.healthlink.his.medication.service.IMedicationDefinitionService;
+import com.healthlink.his.medication.service.IMedicationDispenseService;
+import com.healthlink.his.medication.service.IMedicationRequestService;
+import com.healthlink.his.web.inventorymanage.appservice.impl.ReceiptApprovalAppServiceImpl;
+import com.healthlink.his.web.inventorymanage.dto.SupplyItemDetailDto;
+import com.healthlink.his.web.pharmacymanage.appservice.IInHospitalReturnMedicineAppService;
+import com.healthlink.his.web.pharmacymanage.dto.*;
+import com.healthlink.his.web.pharmacymanage.mapper.InHospitalReturnMedicineAppMapper;
+import com.healthlink.his.web.pharmacymanage.mapper.ReturnMedicineMapper;
+import com.healthlink.his.workflow.domain.DeviceDispense;
+import com.healthlink.his.workflow.domain.InventoryItem;
+import com.healthlink.his.workflow.service.IDeviceDispenseService;
+import com.healthlink.his.workflow.service.IDeviceRequestService;
+import com.healthlink.his.workflow.service.IInventoryItemService;
+import com.healthlink.his.yb.domain.ClinicSettle;
+import com.healthlink.his.yb.dto.Medical3506Param;
+import com.healthlink.his.yb.dto.MedicalInventory3511Param;
+import com.healthlink.his.yb.service.IClinicSettleService;
+import com.healthlink.his.yb.service.YbManager;
 
 /**
  * TODO:概括描述当前类的主要用途和注意事项
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/MedicalDeviceDispenseAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/MedicalDeviceDispenseAppServiceImpl.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/MedicalDeviceDispenseAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/MedicalDeviceDispenseAppServiceImpl.java
index 6f9669c82..79b82206c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/MedicalDeviceDispenseAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/MedicalDeviceDispenseAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacymanage.appservice.impl;
+package com.healthlink.his.web.pharmacymanage.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,29 +9,29 @@ import com.core.common.utils.AgeCalculatorUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.ChargeItem;
-import com.openhis.administration.domain.Organization;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.domain.TraceNoManage;
-import com.openhis.administration.service.IChargeItemService;
-import com.openhis.administration.service.IDeviceDefinitionService;
-import com.openhis.administration.service.IOrganizationService;
-import com.openhis.administration.service.ITraceNoManageService;
-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.web.inventorymanage.appservice.impl.ReceiptApprovalAppServiceImpl;
-import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
-import com.openhis.web.pharmacymanage.appservice.IMedicalDeviceDispenseAppService;
-import com.openhis.web.pharmacymanage.dto.*;
-import com.openhis.web.pharmacymanage.mapper.MedicalDeviceDispenseMapper;
-import com.openhis.web.pharmacymanage.mapper.ReturnMedicineMapper;
-import com.openhis.workflow.domain.DeviceDispense;
-import com.openhis.workflow.domain.InventoryItem;
-import com.openhis.workflow.service.IDeviceDispenseService;
-import com.openhis.workflow.service.IInventoryItemService;
+import com.healthlink.his.administration.domain.ChargeItem;
+import com.healthlink.his.administration.domain.Organization;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.domain.TraceNoManage;
+import com.healthlink.his.administration.service.IChargeItemService;
+import com.healthlink.his.administration.service.IDeviceDefinitionService;
+import com.healthlink.his.administration.service.IOrganizationService;
+import com.healthlink.his.administration.service.ITraceNoManageService;
+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.web.inventorymanage.appservice.impl.ReceiptApprovalAppServiceImpl;
+import com.healthlink.his.web.inventorymanage.dto.SupplyItemDetailDto;
+import com.healthlink.his.web.pharmacymanage.appservice.IMedicalDeviceDispenseAppService;
+import com.healthlink.his.web.pharmacymanage.dto.*;
+import com.healthlink.his.web.pharmacymanage.mapper.MedicalDeviceDispenseMapper;
+import com.healthlink.his.web.pharmacymanage.mapper.ReturnMedicineMapper;
+import com.healthlink.his.workflow.domain.DeviceDispense;
+import com.healthlink.his.workflow.domain.InventoryItem;
+import com.healthlink.his.workflow.service.IDeviceDispenseService;
+import com.healthlink.his.workflow.service.IInventoryItemService;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/MedicationDetailsAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/MedicationDetailsAppServiceImpl.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/MedicationDetailsAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/MedicationDetailsAppServiceImpl.java
index 4014da50a..d21b36b9d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/MedicationDetailsAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/MedicationDetailsAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacymanage.appservice.impl;
+package com.healthlink.his.web.pharmacymanage.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,19 +8,19 @@ import com.core.common.exception.NonCaptureException;
 import com.core.common.utils.StringUtils;
 import com.core.common.utils.poi.ExcelUtil;
 import com.core.system.service.ISysDictTypeService;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.ConditionCode;
-import com.openhis.common.enums.DispenseStatus;
-import com.openhis.common.enums.PublicationStatus;
-import com.openhis.common.enums.RequestStatus;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.pharmacymanage.appservice.IMedicationDetailsAppService;
-import com.openhis.web.pharmacymanage.dto.MedDetailedAccountPageDto;
-import com.openhis.web.pharmacymanage.dto.MedDetailsInitDto;
-import com.openhis.web.pharmacymanage.dto.MedDetailsSearchParam;
-import com.openhis.web.pharmacymanage.mapper.MedicationDetailsMapper;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.service.IPractitionerService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.enums.ConditionCode;
+import com.healthlink.his.common.enums.DispenseStatus;
+import com.healthlink.his.common.enums.PublicationStatus;
+import com.healthlink.his.common.enums.RequestStatus;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.pharmacymanage.appservice.IMedicationDetailsAppService;
+import com.healthlink.his.web.pharmacymanage.dto.MedDetailedAccountPageDto;
+import com.healthlink.his.web.pharmacymanage.dto.MedDetailsInitDto;
+import com.healthlink.his.web.pharmacymanage.dto.MedDetailsSearchParam;
+import com.healthlink.his.web.pharmacymanage.mapper.MedicationDetailsMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -34,8 +34,8 @@ import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static com.openhis.common.constant.CommonConstants.ExcelOut.*;
-import static com.openhis.common.constant.CommonConstants.SheetName.SHEET_NAME_DRUG_DETAIL;
+import static com.healthlink.his.common.constant.CommonConstants.ExcelOut.*;
+import static com.healthlink.his.common.constant.CommonConstants.SheetName.SHEET_NAME_DRUG_DETAIL;
 
 /**
  * 发药明细 应用实现类
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/PendingMedicationDetailsAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/PendingMedicationDetailsAppServiceImpl.java
similarity index 78%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/PendingMedicationDetailsAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/PendingMedicationDetailsAppServiceImpl.java
index 69abf1ae9..4a4ab23d5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/PendingMedicationDetailsAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/PendingMedicationDetailsAppServiceImpl.java
@@ -1,16 +1,16 @@
-package com.openhis.web.pharmacymanage.appservice.impl;
+package com.healthlink.his.web.pharmacymanage.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.openhis.common.enums.DispenseStatus;
-import com.openhis.common.enums.EncounterClass;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.pharmacymanage.appservice.IPendingMedicationDetailsAppService;
-import com.openhis.web.pharmacymanage.dto.PendingMedicationPageDto;
-import com.openhis.web.pharmacymanage.dto.PendingMedicationSearchParam;
-import com.openhis.web.pharmacymanage.mapper.PendingMedicationDetailsMapper;
+import com.healthlink.his.common.enums.DispenseStatus;
+import com.healthlink.his.common.enums.EncounterClass;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.pharmacymanage.appservice.IPendingMedicationDetailsAppService;
+import com.healthlink.his.web.pharmacymanage.dto.PendingMedicationPageDto;
+import com.healthlink.his.web.pharmacymanage.dto.PendingMedicationSearchParam;
+import com.healthlink.his.web.pharmacymanage.mapper.PendingMedicationDetailsMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/ReturnMedicineAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/ReturnMedicineAppServiceImpl.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/ReturnMedicineAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/ReturnMedicineAppServiceImpl.java
index 45b5015d7..b70e88584 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/ReturnMedicineAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/ReturnMedicineAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacymanage.appservice.impl;
+package com.healthlink.his.web.pharmacymanage.appservice.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -7,41 +7,41 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.exception.ServiceException;
 import com.core.common.utils.*;
-import com.openhis.administration.domain.*;
-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.enums.ybenums.YbInvChgType;
-import com.openhis.common.enums.ybenums.YbMdtrtCertType;
-import com.openhis.common.enums.ybenums.YbRxFlag;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.financial.domain.Contract;
-import com.openhis.financial.domain.PaymentReconciliation;
-import com.openhis.financial.service.IContractService;
-import com.openhis.financial.service.IPaymentReconciliationService;
-import com.openhis.medication.domain.MedicationDefinition;
-import com.openhis.medication.domain.MedicationDispense;
-import com.openhis.medication.domain.MedicationRequest;
-import com.openhis.medication.service.IMedicationDefinitionService;
-import com.openhis.medication.service.IMedicationDispenseService;
-import com.openhis.medication.service.IMedicationRequestService;
-import com.openhis.web.inventorymanage.appservice.impl.ReceiptApprovalAppServiceImpl;
-import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
-import com.openhis.web.pharmacymanage.appservice.IReturnMedicineAppService;
-import com.openhis.web.pharmacymanage.dto.*;
-import com.openhis.web.pharmacymanage.mapper.ReturnMedicineMapper;
-import com.openhis.workflow.domain.DeviceDispense;
-import com.openhis.workflow.domain.InventoryItem;
-import com.openhis.workflow.service.IDeviceDispenseService;
-import com.openhis.workflow.service.IDeviceRequestService;
-import com.openhis.workflow.service.IInventoryItemService;
-import com.openhis.yb.domain.ClinicSettle;
-import com.openhis.yb.dto.Medical3506Param;
-import com.openhis.yb.dto.MedicalInventory3511Param;
-import com.openhis.yb.service.IClinicSettleService;
-import com.openhis.yb.service.YbManager;
+import com.healthlink.his.administration.domain.*;
+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.enums.ybenums.YbInvChgType;
+import com.healthlink.his.common.enums.ybenums.YbMdtrtCertType;
+import com.healthlink.his.common.enums.ybenums.YbRxFlag;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.financial.domain.Contract;
+import com.healthlink.his.financial.domain.PaymentReconciliation;
+import com.healthlink.his.financial.service.IContractService;
+import com.healthlink.his.financial.service.IPaymentReconciliationService;
+import com.healthlink.his.medication.domain.MedicationDefinition;
+import com.healthlink.his.medication.domain.MedicationDispense;
+import com.healthlink.his.medication.domain.MedicationRequest;
+import com.healthlink.his.medication.service.IMedicationDefinitionService;
+import com.healthlink.his.medication.service.IMedicationDispenseService;
+import com.healthlink.his.medication.service.IMedicationRequestService;
+import com.healthlink.his.web.inventorymanage.appservice.impl.ReceiptApprovalAppServiceImpl;
+import com.healthlink.his.web.inventorymanage.dto.SupplyItemDetailDto;
+import com.healthlink.his.web.pharmacymanage.appservice.IReturnMedicineAppService;
+import com.healthlink.his.web.pharmacymanage.dto.*;
+import com.healthlink.his.web.pharmacymanage.mapper.ReturnMedicineMapper;
+import com.healthlink.his.workflow.domain.DeviceDispense;
+import com.healthlink.his.workflow.domain.InventoryItem;
+import com.healthlink.his.workflow.service.IDeviceDispenseService;
+import com.healthlink.his.workflow.service.IDeviceRequestService;
+import com.healthlink.his.workflow.service.IInventoryItemService;
+import com.healthlink.his.yb.domain.ClinicSettle;
+import com.healthlink.his.yb.dto.Medical3506Param;
+import com.healthlink.his.yb.dto.MedicalInventory3511Param;
+import com.healthlink.his.yb.service.IClinicSettleService;
+import com.healthlink.his.yb.service.YbManager;
 import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/SummaryDispenseMedicineAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/SummaryDispenseMedicineAppServiceImpl.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/SummaryDispenseMedicineAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/SummaryDispenseMedicineAppServiceImpl.java
index 8ee1fec9d..992b4fa02 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/SummaryDispenseMedicineAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/SummaryDispenseMedicineAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacymanage.appservice.impl;
+package com.healthlink.his.web.pharmacymanage.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.core.common.core.domain.R;
@@ -8,31 +8,31 @@ import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
 import com.core.system.service.ISysDictTypeService;
-import com.openhis.administration.domain.TraceNoManage;
-import com.openhis.administration.service.IOrganizationService;
-import com.openhis.administration.service.ITraceNoManageService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.*;
-import com.openhis.common.enums.ybenums.YbInvChgType;
-import com.openhis.medication.domain.MedicationDefinition;
-import com.openhis.medication.domain.MedicationDispense;
-import com.openhis.medication.service.IMedicationDefinitionService;
-import com.openhis.medication.service.IMedicationDispenseService;
-import com.openhis.medication.service.impl.MedicationRequestServiceImpl;
-import com.openhis.web.inhospitalnursestation.mapper.AdviceProcessAppMapper;
-import com.openhis.web.inventorymanage.appservice.impl.ReceiptApprovalAppServiceImpl;
-import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
-import com.openhis.web.pharmacymanage.appservice.ISummaryDispenseMedicineAppService;
-import com.openhis.web.pharmacymanage.dto.UnDispenseInventoryDto;
-import com.openhis.web.pharmacymanage.mapper.ReturnMedicineMapper;
-import com.openhis.web.pharmacymanage.mapper.WesternMedicineDispenseMapper;
-import com.openhis.workflow.domain.InventoryItem;
-import com.openhis.workflow.domain.SupplyDelivery;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.service.IInventoryItemService;
-import com.openhis.workflow.service.ISupplyDeliveryService;
-import com.openhis.workflow.service.ISupplyRequestService;
+import com.healthlink.his.administration.domain.TraceNoManage;
+import com.healthlink.his.administration.service.IOrganizationService;
+import com.healthlink.his.administration.service.ITraceNoManageService;
+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.enums.ybenums.YbInvChgType;
+import com.healthlink.his.medication.domain.MedicationDefinition;
+import com.healthlink.his.medication.domain.MedicationDispense;
+import com.healthlink.his.medication.service.IMedicationDefinitionService;
+import com.healthlink.his.medication.service.IMedicationDispenseService;
+import com.healthlink.his.medication.service.impl.MedicationRequestServiceImpl;
+import com.healthlink.his.web.inhospitalnursestation.mapper.AdviceProcessAppMapper;
+import com.healthlink.his.web.inventorymanage.appservice.impl.ReceiptApprovalAppServiceImpl;
+import com.healthlink.his.web.inventorymanage.dto.SupplyItemDetailDto;
+import com.healthlink.his.web.pharmacymanage.appservice.ISummaryDispenseMedicineAppService;
+import com.healthlink.his.web.pharmacymanage.dto.UnDispenseInventoryDto;
+import com.healthlink.his.web.pharmacymanage.mapper.ReturnMedicineMapper;
+import com.healthlink.his.web.pharmacymanage.mapper.WesternMedicineDispenseMapper;
+import com.healthlink.his.workflow.domain.InventoryItem;
+import com.healthlink.his.workflow.domain.SupplyDelivery;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.service.IInventoryItemService;
+import com.healthlink.his.workflow.service.ISupplyDeliveryService;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java
index 041ffd8a1..91377249e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacymanage.appservice.impl;
+package com.healthlink.his.web.pharmacymanage.appservice.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -11,39 +11,39 @@ import com.core.common.utils.AgeCalculatorUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.*;
-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.enums.ybenums.YbInvChgType;
-import com.openhis.common.enums.ybenums.YbMdtrtCertType;
-import com.openhis.common.enums.ybenums.YbRxFlag;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.financial.domain.Contract;
-import com.openhis.financial.domain.PaymentReconciliation;
-import com.openhis.financial.service.IContractService;
-import com.openhis.financial.service.IPaymentReconciliationService;
-import com.openhis.medication.domain.MedicationDefinition;
-import com.openhis.medication.domain.MedicationDispense;
-import com.openhis.medication.domain.MedicationRequest;
-import com.openhis.medication.service.IMedicationDefinitionService;
-import com.openhis.medication.service.IMedicationDispenseService;
-import com.openhis.medication.service.IMedicationRequestService;
-import com.openhis.web.inventorymanage.appservice.impl.ReceiptApprovalAppServiceImpl;
-import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
-import com.openhis.web.pharmacymanage.appservice.IWesternMedicineDispenseAppService;
-import com.openhis.web.pharmacymanage.dto.*;
-import com.openhis.web.pharmacymanage.mapper.ReturnMedicineMapper;
-import com.openhis.web.pharmacymanage.mapper.WesternMedicineDispenseMapper;
-import com.openhis.workflow.domain.InventoryItem;
-import com.openhis.workflow.service.IInventoryItemService;
-import com.openhis.yb.domain.ClinicSettle;
-import com.openhis.yb.dto.Medical3505Param;
-import com.openhis.yb.service.IClinicSettleService;
-import com.openhis.yb.service.YbHttpUtils;
-import com.openhis.yb.service.YbManager;
+import com.healthlink.his.administration.domain.*;
+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.enums.ybenums.YbInvChgType;
+import com.healthlink.his.common.enums.ybenums.YbMdtrtCertType;
+import com.healthlink.his.common.enums.ybenums.YbRxFlag;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.financial.domain.Contract;
+import com.healthlink.his.financial.domain.PaymentReconciliation;
+import com.healthlink.his.financial.service.IContractService;
+import com.healthlink.his.financial.service.IPaymentReconciliationService;
+import com.healthlink.his.medication.domain.MedicationDefinition;
+import com.healthlink.his.medication.domain.MedicationDispense;
+import com.healthlink.his.medication.domain.MedicationRequest;
+import com.healthlink.his.medication.service.IMedicationDefinitionService;
+import com.healthlink.his.medication.service.IMedicationDispenseService;
+import com.healthlink.his.medication.service.IMedicationRequestService;
+import com.healthlink.his.web.inventorymanage.appservice.impl.ReceiptApprovalAppServiceImpl;
+import com.healthlink.his.web.inventorymanage.dto.SupplyItemDetailDto;
+import com.healthlink.his.web.pharmacymanage.appservice.IWesternMedicineDispenseAppService;
+import com.healthlink.his.web.pharmacymanage.dto.*;
+import com.healthlink.his.web.pharmacymanage.mapper.ReturnMedicineMapper;
+import com.healthlink.his.web.pharmacymanage.mapper.WesternMedicineDispenseMapper;
+import com.healthlink.his.workflow.domain.InventoryItem;
+import com.healthlink.his.workflow.service.IInventoryItemService;
+import com.healthlink.his.yb.domain.ClinicSettle;
+import com.healthlink.his.yb.dto.Medical3505Param;
+import com.healthlink.his.yb.service.IClinicSettleService;
+import com.healthlink.his.yb.service.YbHttpUtils;
+import com.healthlink.his.yb.service.YbManager;
 import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.stereotype.Service;
 import reactor.util.annotation.Nullable;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/InHospitalReturnMedicineController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/controller/InHospitalReturnMedicineController.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/InHospitalReturnMedicineController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/controller/InHospitalReturnMedicineController.java
index 8d96eb7fa..0854e46dd 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/InHospitalReturnMedicineController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/controller/InHospitalReturnMedicineController.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacymanage.controller;
+package com.healthlink.his.web.pharmacymanage.controller;
 
 import java.util.List;
 
@@ -11,9 +11,9 @@ import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.web.bind.annotation.*;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacymanage.appservice.IInHospitalReturnMedicineAppService;
-import com.openhis.web.pharmacymanage.dto.EncounterInfoDto;
-import com.openhis.web.pharmacymanage.dto.ReturnMedicineDto;
+import com.healthlink.his.web.pharmacymanage.appservice.IInHospitalReturnMedicineAppService;
+import com.healthlink.his.web.pharmacymanage.dto.EncounterInfoDto;
+import com.healthlink.his.web.pharmacymanage.dto.ReturnMedicineDto;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicalDeviceDispenseController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/controller/MedicalDeviceDispenseController.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicalDeviceDispenseController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/controller/MedicalDeviceDispenseController.java
index c0365b3e9..4df6f3904 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicalDeviceDispenseController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/controller/MedicalDeviceDispenseController.java
@@ -1,10 +1,10 @@
-package com.openhis.web.pharmacymanage.controller;
+package com.healthlink.his.web.pharmacymanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacymanage.appservice.IMedicalDeviceDispenseAppService;
-import com.openhis.web.pharmacymanage.dto.DispenseItemDto;
-import com.openhis.web.pharmacymanage.dto.EncounterInfoSearchParam;
-import com.openhis.web.pharmacymanage.dto.ItemDispenseOrderDto;
+import com.healthlink.his.web.pharmacymanage.appservice.IMedicalDeviceDispenseAppService;
+import com.healthlink.his.web.pharmacymanage.dto.DispenseItemDto;
+import com.healthlink.his.web.pharmacymanage.dto.EncounterInfoSearchParam;
+import com.healthlink.his.web.pharmacymanage.dto.ItemDispenseOrderDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicationDetailsController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/controller/MedicationDetailsController.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicationDetailsController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/controller/MedicationDetailsController.java
index 99ca306b4..049bd0a44 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicationDetailsController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/controller/MedicationDetailsController.java
@@ -1,8 +1,8 @@
-package com.openhis.web.pharmacymanage.controller;
+package com.healthlink.his.web.pharmacymanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacymanage.appservice.IMedicationDetailsAppService;
-import com.openhis.web.pharmacymanage.dto.MedDetailsSearchParam;
+import com.healthlink.his.web.pharmacymanage.appservice.IMedicationDetailsAppService;
+import com.healthlink.his.web.pharmacymanage.dto.MedDetailsSearchParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/PendingMedicationDetailsController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/controller/PendingMedicationDetailsController.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/PendingMedicationDetailsController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/controller/PendingMedicationDetailsController.java
index 1f31f7572..e753ed43c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/PendingMedicationDetailsController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/controller/PendingMedicationDetailsController.java
@@ -1,8 +1,8 @@
-package com.openhis.web.pharmacymanage.controller;
+package com.healthlink.his.web.pharmacymanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacymanage.appservice.IPendingMedicationDetailsAppService;
-import com.openhis.web.pharmacymanage.dto.PendingMedicationSearchParam;
+import com.healthlink.his.web.pharmacymanage.appservice.IPendingMedicationDetailsAppService;
+import com.healthlink.his.web.pharmacymanage.dto.PendingMedicationSearchParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/ReturnMedicineController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/controller/ReturnMedicineController.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/ReturnMedicineController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/controller/ReturnMedicineController.java
index 2cc955b8e..66fed9122 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/ReturnMedicineController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/controller/ReturnMedicineController.java
@@ -1,9 +1,9 @@
-package com.openhis.web.pharmacymanage.controller;
+package com.healthlink.his.web.pharmacymanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacymanage.appservice.IReturnMedicineAppService;
-import com.openhis.web.pharmacymanage.dto.EncounterInfoDto;
-import com.openhis.web.pharmacymanage.dto.ReturnMedicineDto;
+import com.healthlink.his.web.pharmacymanage.appservice.IReturnMedicineAppService;
+import com.healthlink.his.web.pharmacymanage.dto.EncounterInfoDto;
+import com.healthlink.his.web.pharmacymanage.dto.ReturnMedicineDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/SummaryDispenseMedicineController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/controller/SummaryDispenseMedicineController.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/SummaryDispenseMedicineController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/controller/SummaryDispenseMedicineController.java
index 45dbd98cf..047b00a07 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/SummaryDispenseMedicineController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/controller/SummaryDispenseMedicineController.java
@@ -1,7 +1,7 @@
-package com.openhis.web.pharmacymanage.controller;
+package com.healthlink.his.web.pharmacymanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacymanage.appservice.ISummaryDispenseMedicineAppService;
+import com.healthlink.his.web.pharmacymanage.appservice.ISummaryDispenseMedicineAppService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PutMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/WesternMedicineDispenseController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/controller/WesternMedicineDispenseController.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/WesternMedicineDispenseController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/controller/WesternMedicineDispenseController.java
index 2be2ab34a..9f0ba16cb 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/WesternMedicineDispenseController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/controller/WesternMedicineDispenseController.java
@@ -1,10 +1,10 @@
-package com.openhis.web.pharmacymanage.controller;
+package com.healthlink.his.web.pharmacymanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacymanage.appservice.IWesternMedicineDispenseAppService;
-import com.openhis.web.pharmacymanage.dto.DispenseItemDto;
-import com.openhis.web.pharmacymanage.dto.EncounterInfoSearchParam;
-import com.openhis.web.pharmacymanage.dto.ItemDispenseOrderDto;
+import com.healthlink.his.web.pharmacymanage.appservice.IWesternMedicineDispenseAppService;
+import com.healthlink.his.web.pharmacymanage.dto.DispenseItemDto;
+import com.healthlink.his.web.pharmacymanage.dto.EncounterInfoSearchParam;
+import com.healthlink.his.web.pharmacymanage.dto.ItemDispenseOrderDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/DispenseInitDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/DispenseInitDto.java
index e4b7c3845..d973b4723 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/DispenseInitDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacymanage.dto;
+package com.healthlink.his.web.pharmacymanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInventoryDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/DispenseInventoryDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInventoryDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/DispenseInventoryDto.java
index ad63f320d..bea39dcae 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInventoryDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/DispenseInventoryDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacymanage.dto;
+package com.healthlink.his.web.pharmacymanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseItemDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/DispenseItemDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseItemDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/DispenseItemDto.java
index cadce80de..7fa7f57a0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseItemDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/DispenseItemDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacymanage.dto;
+package com.healthlink.his.web.pharmacymanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseStatusOption.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/DispenseStatusOption.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseStatusOption.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/DispenseStatusOption.java
index 407721a3a..8edd76761 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseStatusOption.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/DispenseStatusOption.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacymanage.dto;
+package com.healthlink.his.web.pharmacymanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/EncounterInfoDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/EncounterInfoDto.java
index 7580523e1..3ef12f686 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/EncounterInfoDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacymanage.dto;
+package com.healthlink.his.web.pharmacymanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/EncounterInfoSearchParam.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/EncounterInfoSearchParam.java
index 390362c33..12b62ed4c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/EncounterInfoSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacymanage.dto;
+package com.healthlink.his.web.pharmacymanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/FromSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/FromSearchParam.java
similarity index 76%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/FromSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/FromSearchParam.java
index a2e8a1723..bec3fcc81 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/FromSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/FromSearchParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacymanage.dto;
+package com.healthlink.his.web.pharmacymanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/FromSummaryDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/FromSummaryDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/FromSummaryDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/FromSummaryDto.java
index 585934ce8..6214baae2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/FromSummaryDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/FromSummaryDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacymanage.dto;
+package com.healthlink.his.web.pharmacymanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/FromSummarySearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/FromSummarySearchParam.java
similarity index 81%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/FromSummarySearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/FromSummarySearchParam.java
index a520089a0..2a3905306 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/FromSummarySearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/FromSummarySearchParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacymanage.dto;
+package com.healthlink.his.web.pharmacymanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InventoryDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/InventoryDetailDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InventoryDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/InventoryDetailDto.java
index 3115b2cc3..7707d63d1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InventoryDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/InventoryDetailDto.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacymanage.dto;
+package com.healthlink.his.web.pharmacymanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ItemDispenseOrderDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/ItemDispenseOrderDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ItemDispenseOrderDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/ItemDispenseOrderDto.java
index 910243f45..81446ef66 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ItemDispenseOrderDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/ItemDispenseOrderDto.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacymanage.dto;
+package com.healthlink.his.web.pharmacymanage.dto;
 
 import com.core.common.annotation.Excel;
 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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/JlauDispenseParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/JlauDispenseParam.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/JlauDispenseParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/JlauDispenseParam.java
index a9dd435fc..a896cc472 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/JlauDispenseParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/JlauDispenseParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacymanage.dto;
+package com.healthlink.his.web.pharmacymanage.dto;
 
 import java.util.Date;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailedAccountPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/MedDetailedAccountPageDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailedAccountPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/MedDetailedAccountPageDto.java
index 5afd9ae20..209ab0f62 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailedAccountPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/MedDetailedAccountPageDto.java
@@ -1,7 +1,7 @@
-package com.openhis.web.pharmacymanage.dto;
+package com.healthlink.his.web.pharmacymanage.dto;
 
 import com.core.common.annotation.Excel;
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailsInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/MedDetailsInitDto.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailsInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/MedDetailsInitDto.java
index a427de630..8cb2951e3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailsInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/MedDetailsInitDto.java
@@ -1,6 +1,6 @@
-package com.openhis.web.pharmacymanage.dto;
+package com.healthlink.his.web.pharmacymanage.dto;
 
-import com.openhis.administration.domain.Practitioner;
+import com.healthlink.his.administration.domain.Practitioner;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailsSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/MedDetailsSearchParam.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailsSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/MedDetailsSearchParam.java
index ee90d55d6..821d33163 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailsSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/MedDetailsSearchParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacymanage.dto;
+package com.healthlink.his.web.pharmacymanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummaryDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/MedicineSummaryDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummaryDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/MedicineSummaryDto.java
index ac5a2aba6..a75d527b3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummaryDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/MedicineSummaryDto.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacymanage.dto;
+package com.healthlink.his.web.pharmacymanage.dto;
 
 import com.core.common.annotation.Excel;
 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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummaryInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/MedicineSummaryInitDto.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummaryInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/MedicineSummaryInitDto.java
index e64732e34..ca0920e49 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummaryInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/MedicineSummaryInitDto.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacymanage.dto;
+package com.healthlink.his.web.pharmacymanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.administration.domain.Practitioner;
+import com.healthlink.his.administration.domain.Practitioner;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummarySearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/MedicineSummarySearchParam.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummarySearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/MedicineSummarySearchParam.java
index 31d539344..10b2a93bf 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummarySearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/MedicineSummarySearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacymanage.dto;
+package com.healthlink.his.web.pharmacymanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PendingMedicationPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/PendingMedicationPageDto.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PendingMedicationPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/PendingMedicationPageDto.java
index ec0a6e215..fb78a2291 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PendingMedicationPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/PendingMedicationPageDto.java
@@ -1,6 +1,6 @@
-package com.openhis.web.pharmacymanage.dto;
+package com.healthlink.his.web.pharmacymanage.dto;
 
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PendingMedicationSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/PendingMedicationSearchParam.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PendingMedicationSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/PendingMedicationSearchParam.java
index 8a756dd2f..00666afa6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PendingMedicationSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/PendingMedicationSearchParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.pharmacymanage.dto;
+package com.healthlink.his.web.pharmacymanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/ReturnMedicineDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/ReturnMedicineDto.java
index e32ad7672..faeca0a05 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/ReturnMedicineDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacymanage.dto;
+package com.healthlink.his.web.pharmacymanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/ReturnMedicineInfoDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/ReturnMedicineInfoDto.java
index d2c991cca..5b590a558 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/ReturnMedicineInfoDto.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacymanage.dto;
+package com.healthlink.his.web.pharmacymanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/ReturnMedicineInitDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/ReturnMedicineInitDto.java
index c7e278cb7..215a7e3cf 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/ReturnMedicineInitDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacymanage.dto;
+package com.healthlink.his.web.pharmacymanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/UnDispenseInventoryDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/UnDispenseInventoryDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/UnDispenseInventoryDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/UnDispenseInventoryDto.java
index 419d04cc9..7fc898e82 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/UnDispenseInventoryDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/dto/UnDispenseInventoryDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacymanage.dto;
+package com.healthlink.his.web.pharmacymanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/InHospitalReturnMedicineAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/mapper/InHospitalReturnMedicineAppMapper.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/InHospitalReturnMedicineAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/mapper/InHospitalReturnMedicineAppMapper.java
index 47f483607..81aca2684 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/InHospitalReturnMedicineAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/mapper/InHospitalReturnMedicineAppMapper.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacymanage.mapper;
+package com.healthlink.his.web.pharmacymanage.mapper;
 
 import java.util.List;
 
@@ -11,8 +11,8 @@ import org.springframework.stereotype.Repository;
 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.pharmacymanage.dto.EncounterInfoDto;
-import com.openhis.web.pharmacymanage.dto.ReturnMedicineInfoDto;
+import com.healthlink.his.web.pharmacymanage.dto.EncounterInfoDto;
+import com.healthlink.his.web.pharmacymanage.dto.ReturnMedicineInfoDto;
 
 /**
  * TODO:概括描述当前类的主要用途和注意事项
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicalDeviceDispenseMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/mapper/MedicalDeviceDispenseMapper.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicalDeviceDispenseMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/mapper/MedicalDeviceDispenseMapper.java
index a8b06799b..83cd3988a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicalDeviceDispenseMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/mapper/MedicalDeviceDispenseMapper.java
@@ -1,15 +1,15 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacymanage.mapper;
+package com.healthlink.his.web.pharmacymanage.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.administration.domain.Practitioner;
-import com.openhis.web.pharmacymanage.dto.EncounterInfoDto;
-import com.openhis.web.pharmacymanage.dto.EncounterInfoSearchParam;
-import com.openhis.web.pharmacymanage.dto.ItemDispenseOrderDto;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.web.pharmacymanage.dto.EncounterInfoDto;
+import com.healthlink.his.web.pharmacymanage.dto.EncounterInfoSearchParam;
+import com.healthlink.his.web.pharmacymanage.dto.ItemDispenseOrderDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicationDetailsMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/mapper/MedicationDetailsMapper.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicationDetailsMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/mapper/MedicationDetailsMapper.java
index 440596ef2..7f8301dd8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicationDetailsMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/mapper/MedicationDetailsMapper.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacymanage.mapper;
+package com.healthlink.his.web.pharmacymanage.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.pharmacymanage.dto.MedDetailedAccountPageDto;
-import com.openhis.web.pharmacymanage.dto.MedDetailsSearchParam;
+import com.healthlink.his.web.pharmacymanage.dto.MedDetailedAccountPageDto;
+import com.healthlink.his.web.pharmacymanage.dto.MedDetailsSearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/PendingMedicationDetailsMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/mapper/PendingMedicationDetailsMapper.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/PendingMedicationDetailsMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/mapper/PendingMedicationDetailsMapper.java
index 9f614e57c..330b3191f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/PendingMedicationDetailsMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/mapper/PendingMedicationDetailsMapper.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacymanage.mapper;
+package com.healthlink.his.web.pharmacymanage.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.pharmacymanage.dto.PendingMedicationPageDto;
-import com.openhis.web.pharmacymanage.dto.PendingMedicationSearchParam;
+import com.healthlink.his.web.pharmacymanage.dto.PendingMedicationPageDto;
+import com.healthlink.his.web.pharmacymanage.dto.PendingMedicationSearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/ReturnMedicineMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/mapper/ReturnMedicineMapper.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/ReturnMedicineMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/mapper/ReturnMedicineMapper.java
index 922fcf6bb..6b3d86b30 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/ReturnMedicineMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/mapper/ReturnMedicineMapper.java
@@ -1,15 +1,15 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacymanage.mapper;
+package com.healthlink.his.web.pharmacymanage.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.pharmacymanage.dto.DispenseInventoryDto;
-import com.openhis.web.pharmacymanage.dto.EncounterInfoDto;
-import com.openhis.web.pharmacymanage.dto.ReturnMedicineInfoDto;
-import com.openhis.web.pharmacymanage.dto.UnDispenseInventoryDto;
+import com.healthlink.his.web.pharmacymanage.dto.DispenseInventoryDto;
+import com.healthlink.his.web.pharmacymanage.dto.EncounterInfoDto;
+import com.healthlink.his.web.pharmacymanage.dto.ReturnMedicineInfoDto;
+import com.healthlink.his.web.pharmacymanage.dto.UnDispenseInventoryDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/SummaryDispenseMedicineMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/mapper/SummaryDispenseMedicineMapper.java
similarity index 76%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/SummaryDispenseMedicineMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/mapper/SummaryDispenseMedicineMapper.java
index 3f94fb610..da10bdf10 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/SummaryDispenseMedicineMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/mapper/SummaryDispenseMedicineMapper.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacymanage.mapper;
+package com.healthlink.his.web.pharmacymanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java
index 68b06c5bc..1971ecf8a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java
@@ -1,16 +1,16 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.pharmacymanage.mapper;
+package com.healthlink.his.web.pharmacymanage.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.administration.domain.Practitioner;
-import com.openhis.web.pharmacymanage.dto.EncounterInfoDto;
-import com.openhis.web.pharmacymanage.dto.EncounterInfoSearchParam;
-import com.openhis.web.pharmacymanage.dto.InventoryDetailDto;
-import com.openhis.web.pharmacymanage.dto.ItemDispenseOrderDto;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.web.pharmacymanage.dto.EncounterInfoDto;
+import com.healthlink.his.web.pharmacymanage.dto.EncounterInfoSearchParam;
+import com.healthlink.his.web.pharmacymanage.dto.InventoryDetailDto;
+import com.healthlink.his.web.pharmacymanage.dto.ItemDispenseOrderDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IAdviceManageAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/IAdviceManageAppService.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IAdviceManageAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/IAdviceManageAppService.java
index 71e50ff9c..d51a2bf0c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IAdviceManageAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/IAdviceManageAppService.java
@@ -1,10 +1,10 @@
-package com.openhis.web.regdoctorstation.appservice;
+package com.healthlink.his.web.regdoctorstation.appservice;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.web.regdoctorstation.dto.AdviceBatchOpParam;
-import com.openhis.web.regdoctorstation.dto.RegAdviceSaveParam;
-import com.openhis.web.regdoctorstation.dto.RegPatientMainInfoDto;
+import com.healthlink.his.web.regdoctorstation.dto.AdviceBatchOpParam;
+import com.healthlink.his.web.regdoctorstation.dto.RegAdviceSaveParam;
+import com.healthlink.his.web.regdoctorstation.dto.RegPatientMainInfoDto;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/INurseManageService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/INurseManageService.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/INurseManageService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/INurseManageService.java
index 1a674ab41..33d777c60 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/INurseManageService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/INurseManageService.java
@@ -1,4 +1,4 @@
-package com.openhis.web.regdoctorstation.appservice;
+package com.healthlink.his.web.regdoctorstation.appservice;
 
 import com.core.common.core.domain.R;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/IRequestFormManageAppService.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/IRequestFormManageAppService.java
index f865495d1..d0f6cfc85 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/IRequestFormManageAppService.java
@@ -1,11 +1,11 @@
-package com.openhis.web.regdoctorstation.appservice;
+package com.healthlink.his.web.regdoctorstation.appservice;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.web.regdoctorstation.dto.RequestFormDto;
-import com.openhis.web.regdoctorstation.dto.RequestFormPageDto;
-import com.openhis.web.regdoctorstation.dto.RequestFormQueryDto;
-import com.openhis.web.regdoctorstation.dto.RequestFormSaveDto;
+import com.healthlink.his.web.regdoctorstation.dto.RequestFormDto;
+import com.healthlink.his.web.regdoctorstation.dto.RequestFormPageDto;
+import com.healthlink.his.web.regdoctorstation.dto.RequestFormQueryDto;
+import com.healthlink.his.web.regdoctorstation.dto.RequestFormSaveDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/ISpecialAdviceAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/ISpecialAdviceAppService.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/ISpecialAdviceAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/ISpecialAdviceAppService.java
index 37f6fe939..d0fa1ce64 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/ISpecialAdviceAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/ISpecialAdviceAppService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.regdoctorstation.appservice;
+package com.healthlink.his.web.regdoctorstation.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.regdoctorstation.dto.*;
+import com.healthlink.his.web.regdoctorstation.dto.*;
 
 /**
  * 特殊医嘱 应用Service
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java
index 15e6aa355..60d98e840 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.regdoctorstation.appservice.impl;
+package com.healthlink.his.web.regdoctorstation.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -11,37 +11,37 @@ import com.core.common.utils.AgeCalculatorUtil;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.ChargeItem;
-import com.openhis.administration.service.IChargeItemService;
-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.medication.domain.MedicationDispense;
-import com.openhis.medication.domain.MedicationRequest;
-import com.openhis.medication.service.IMedicationDispenseService;
-import com.openhis.medication.service.IMedicationRequestService;
-import com.openhis.web.doctorstation.dto.ActivityChildrenJsonParams;
-import com.openhis.web.doctorstation.dto.AdviceSaveDto;
-import com.openhis.web.doctorstation.utils.AdviceUtils;
-import com.openhis.web.inhospitalnursestation.dto.EncounterAccountDto;
-import com.openhis.web.regdoctorstation.appservice.IAdviceManageAppService;
-import com.openhis.web.regdoctorstation.dto.*;
-import com.openhis.web.regdoctorstation.mapper.AdviceManageAppMapper;
-import com.openhis.web.regdoctorstation.utils.RegPrescriptionUtils;
-import com.openhis.workflow.domain.DeviceRequest;
+import com.healthlink.his.administration.domain.ChargeItem;
+import com.healthlink.his.administration.service.IChargeItemService;
+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.medication.domain.MedicationDispense;
+import com.healthlink.his.medication.domain.MedicationRequest;
+import com.healthlink.his.medication.service.IMedicationDispenseService;
+import com.healthlink.his.medication.service.IMedicationRequestService;
+import com.healthlink.his.web.doctorstation.dto.ActivityChildrenJsonParams;
+import com.healthlink.his.web.doctorstation.dto.AdviceSaveDto;
+import com.healthlink.his.web.doctorstation.utils.AdviceUtils;
+import com.healthlink.his.web.inhospitalnursestation.dto.EncounterAccountDto;
+import com.healthlink.his.web.regdoctorstation.appservice.IAdviceManageAppService;
+import com.healthlink.his.web.regdoctorstation.dto.*;
+import com.healthlink.his.web.regdoctorstation.mapper.AdviceManageAppMapper;
+import com.healthlink.his.web.regdoctorstation.utils.RegPrescriptionUtils;
+import com.healthlink.his.workflow.domain.DeviceRequest;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.openhis.workflow.domain.ServiceRequest;
-import com.openhis.workflow.service.IActivityDefinitionService;
-import com.openhis.workflow.domain.ActivityDefinition;
-import com.openhis.workflow.service.IDeviceDispenseService;
-import com.openhis.workflow.service.IDeviceRequestService;
-import com.openhis.workflow.service.IServiceRequestService;
-import com.openhis.document.domain.RequestForm;
-import com.openhis.document.service.IRequestFormService;
+import com.healthlink.his.workflow.domain.ServiceRequest;
+import com.healthlink.his.workflow.service.IActivityDefinitionService;
+import com.healthlink.his.workflow.domain.ActivityDefinition;
+import com.healthlink.his.workflow.service.IDeviceDispenseService;
+import com.healthlink.his.workflow.service.IDeviceRequestService;
+import com.healthlink.his.workflow.service.IServiceRequestService;
+import com.healthlink.his.document.domain.RequestForm;
+import com.healthlink.his.document.service.IRequestFormService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/NurseManageServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/NurseManageServiceImpl.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/NurseManageServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/NurseManageServiceImpl.java
index 0363525cc..8cf0e70da 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/NurseManageServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/NurseManageServiceImpl.java
@@ -1,23 +1,23 @@
-package com.openhis.web.regdoctorstation.appservice.impl;
+package com.healthlink.his.web.regdoctorstation.appservice.impl;
 
 import com.core.common.core.domain.R;
 import com.core.common.utils.AgeCalculatorUtil;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.administration.domain.Patient;
-import com.openhis.administration.dto.EncounterDataDto;
-import com.openhis.administration.dto.LocationDataDto;
-import com.openhis.administration.dto.PatientBedInfoDto;
-import com.openhis.administration.mapper.EncounterLocationMapper;
-import com.openhis.administration.mapper.LocationMapper;
-import com.openhis.administration.service.IEncounterService;
-import com.openhis.administration.service.ILocationService;
-import com.openhis.administration.service.IPatientService;
-import com.openhis.administration.service.IPractitionerRoleService;
-import com.openhis.common.enums.*;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.web.regdoctorstation.appservice.INurseManageService;
+import com.healthlink.his.administration.domain.Patient;
+import com.healthlink.his.administration.dto.EncounterDataDto;
+import com.healthlink.his.administration.dto.LocationDataDto;
+import com.healthlink.his.administration.dto.PatientBedInfoDto;
+import com.healthlink.his.administration.mapper.EncounterLocationMapper;
+import com.healthlink.his.administration.mapper.LocationMapper;
+import com.healthlink.his.administration.service.IEncounterService;
+import com.healthlink.his.administration.service.ILocationService;
+import com.healthlink.his.administration.service.IPatientService;
+import com.healthlink.his.administration.service.IPractitionerRoleService;
+import com.healthlink.his.common.enums.*;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.web.regdoctorstation.appservice.INurseManageService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java
index 2971b8357..aef0ab28b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.regdoctorstation.appservice.impl;
+package com.healthlink.his.web.regdoctorstation.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -11,31 +11,31 @@ import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.openhis.administration.domain.ChargeItem;
-import com.openhis.administration.domain.Organization;
-import com.openhis.administration.service.IChargeItemService;
-import com.openhis.administration.service.IOrganizationService;
-import com.openhis.administration.service.IPatientService;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.clinical.domain.Surgery;
-import com.openhis.clinical.service.ISurgeryService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.*;
-import com.openhis.document.domain.RequestForm;
-import com.openhis.document.service.IRequestFormService;
-import com.openhis.lab.domain.Specimen;
-import com.openhis.lab.service.ISpecimenService;
-import com.openhis.web.doctorstation.dto.ActivityChildrenJsonParams;
-import com.openhis.web.doctorstation.utils.AdviceUtils;
-import com.openhis.web.regdoctorstation.appservice.IRequestFormManageAppService;
-import com.openhis.web.regdoctorstation.dto.*;
-import com.openhis.web.regdoctorstation.mapper.RequestFormManageAppMapper;
-import com.openhis.workflow.domain.ActivityDefinition;
-import com.openhis.workflow.domain.ServiceRequest;
-import com.openhis.workflow.service.IActivityDefinitionService;
-import com.openhis.workflow.service.IServiceRequestService;
+import com.healthlink.his.administration.domain.ChargeItem;
+import com.healthlink.his.administration.domain.Organization;
+import com.healthlink.his.administration.service.IChargeItemService;
+import com.healthlink.his.administration.service.IOrganizationService;
+import com.healthlink.his.administration.service.IPatientService;
+import com.healthlink.his.administration.service.IPractitionerService;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.clinical.domain.Surgery;
+import com.healthlink.his.clinical.service.ISurgeryService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.*;
+import com.healthlink.his.document.domain.RequestForm;
+import com.healthlink.his.document.service.IRequestFormService;
+import com.healthlink.his.lab.domain.Specimen;
+import com.healthlink.his.lab.service.ISpecimenService;
+import com.healthlink.his.web.doctorstation.dto.ActivityChildrenJsonParams;
+import com.healthlink.his.web.doctorstation.utils.AdviceUtils;
+import com.healthlink.his.web.regdoctorstation.appservice.IRequestFormManageAppService;
+import com.healthlink.his.web.regdoctorstation.dto.*;
+import com.healthlink.his.web.regdoctorstation.mapper.RequestFormManageAppMapper;
+import com.healthlink.his.workflow.domain.ActivityDefinition;
+import com.healthlink.his.workflow.domain.ServiceRequest;
+import com.healthlink.his.workflow.service.IActivityDefinitionService;
+import com.healthlink.his.workflow.service.IServiceRequestService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -495,7 +495,7 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
                     // 填充患者姓名（从 adm_patient 查询）
                     if (patientId != null) {
                         try {
-                            com.openhis.administration.domain.Patient patient = iPatientService.getById(patientId);
+                            com.healthlink.his.administration.domain.Patient patient = iPatientService.getById(patientId);
                             if (patient != null) {
                                 surgery.setPatientName(patient.getName());
                             }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java
index 5678f0fa6..560da1a29 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.regdoctorstation.appservice.impl;
+package com.healthlink.his.web.regdoctorstation.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -6,19 +6,19 @@ import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.*;
-import com.openhis.document.domain.OrderProcess;
-import com.openhis.document.service.IOrderProcessService;
-import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService;
-import com.openhis.web.doctorstation.dto.AdviceBaseDto;
-import com.openhis.web.regdoctorstation.appservice.ISpecialAdviceAppService;
-import com.openhis.web.regdoctorstation.dto.*;
-import com.openhis.web.regdoctorstation.mapper.SpecialAdviceAppMapper;
-import com.openhis.workflow.domain.ServiceRequest;
-import com.openhis.workflow.service.IActivityDefinitionService;
-import com.openhis.workflow.service.IServiceRequestService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.*;
+import com.healthlink.his.document.domain.OrderProcess;
+import com.healthlink.his.document.service.IOrderProcessService;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationAdviceAppService;
+import com.healthlink.his.web.doctorstation.dto.AdviceBaseDto;
+import com.healthlink.his.web.regdoctorstation.appservice.ISpecialAdviceAppService;
+import com.healthlink.his.web.regdoctorstation.dto.*;
+import com.healthlink.his.web.regdoctorstation.mapper.SpecialAdviceAppMapper;
+import com.healthlink.his.workflow.domain.ServiceRequest;
+import com.healthlink.his.workflow.service.IActivityDefinitionService;
+import com.healthlink.his.workflow.service.IServiceRequestService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/AdviceManageController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/controller/AdviceManageController.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/AdviceManageController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/controller/AdviceManageController.java
index 82251432e..287fee652 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/AdviceManageController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/controller/AdviceManageController.java
@@ -1,15 +1,15 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.regdoctorstation.controller;
+package com.healthlink.his.web.regdoctorstation.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.AdviceOpType;
-import com.openhis.web.regdoctorstation.appservice.IAdviceManageAppService;
-import com.openhis.web.regdoctorstation.dto.AdviceBatchOpParam;
-import com.openhis.web.regdoctorstation.dto.RegAdviceSaveParam;
-import com.openhis.web.regdoctorstation.dto.RegDoctorStationInitDto;
-import com.openhis.web.regdoctorstation.dto.RegPatientMainInfoDto;
+import com.healthlink.his.common.enums.AdviceOpType;
+import com.healthlink.his.web.regdoctorstation.appservice.IAdviceManageAppService;
+import com.healthlink.his.web.regdoctorstation.dto.AdviceBatchOpParam;
+import com.healthlink.his.web.regdoctorstation.dto.RegAdviceSaveParam;
+import com.healthlink.his.web.regdoctorstation.dto.RegDoctorStationInitDto;
+import com.healthlink.his.web.regdoctorstation.dto.RegPatientMainInfoDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/NurseManageController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/controller/NurseManageController.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/NurseManageController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/controller/NurseManageController.java
index 719461ab3..f02c9d4bd 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/NurseManageController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/controller/NurseManageController.java
@@ -1,8 +1,8 @@
-package com.openhis.web.regdoctorstation.controller;
+package com.healthlink.his.web.regdoctorstation.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.regdoctorstation.appservice.INurseManageService;
-import com.openhis.web.regdoctorstation.dto.NurseStationRequestParam;
+import com.healthlink.his.web.regdoctorstation.appservice.INurseManageService;
+import com.healthlink.his.web.regdoctorstation.dto.NurseStationRequestParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/controller/RequestFormManageController.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/controller/RequestFormManageController.java
index fc53b5b1f..3b72df4cb 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/controller/RequestFormManageController.java
@@ -1,17 +1,17 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.regdoctorstation.controller;
+package com.healthlink.his.web.regdoctorstation.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.ActivityDefCategory;
-import com.openhis.document.domain.RequestForm;
-import com.openhis.web.inventorymanage.appservice.impl.ProductStocktakingAppServiceImpl;
-import com.openhis.web.regdoctorstation.appservice.IRequestFormManageAppService;
-import com.openhis.web.regdoctorstation.dto.RequestFormDto;
-import com.openhis.web.regdoctorstation.dto.RequestFormPageDto;
-import com.openhis.web.regdoctorstation.dto.RequestFormSaveDto;
+import com.healthlink.his.common.enums.ActivityDefCategory;
+import com.healthlink.his.document.domain.RequestForm;
+import com.healthlink.his.web.inventorymanage.appservice.impl.ProductStocktakingAppServiceImpl;
+import com.healthlink.his.web.regdoctorstation.appservice.IRequestFormManageAppService;
+import com.healthlink.his.web.regdoctorstation.dto.RequestFormDto;
+import com.healthlink.his.web.regdoctorstation.dto.RequestFormPageDto;
+import com.healthlink.his.web.regdoctorstation.dto.RequestFormSaveDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/SpecialAdviceController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/controller/SpecialAdviceController.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/SpecialAdviceController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/controller/SpecialAdviceController.java
index 4777a43eb..adcb9dc7f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/SpecialAdviceController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/controller/SpecialAdviceController.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.regdoctorstation.controller;
+package com.healthlink.his.web.regdoctorstation.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.regdoctorstation.appservice.ISpecialAdviceAppService;
-import com.openhis.web.regdoctorstation.dto.LeaveHospitalParam;
-import com.openhis.web.regdoctorstation.dto.NursingOrdersSaveDto;
-import com.openhis.web.regdoctorstation.dto.TransferOrganizationParam;
+import com.healthlink.his.web.regdoctorstation.appservice.ISpecialAdviceAppService;
+import com.healthlink.his.web.regdoctorstation.dto.LeaveHospitalParam;
+import com.healthlink.his.web.regdoctorstation.dto.NursingOrdersSaveDto;
+import com.healthlink.his.web.regdoctorstation.dto.TransferOrganizationParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/ActivityOrganizationConfigDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/ActivityOrganizationConfigDto.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/ActivityOrganizationConfigDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/ActivityOrganizationConfigDto.java
index ecc61448d..b82ea22e4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/ActivityOrganizationConfigDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/ActivityOrganizationConfigDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.regdoctorstation.dto;
+package com.healthlink.his.web.regdoctorstation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/ActivitySaveDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/ActivitySaveDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/ActivitySaveDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/ActivitySaveDto.java
index 76eeb4fba..e754edcb0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/ActivitySaveDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/ActivitySaveDto.java
@@ -1,8 +1,8 @@
-package com.openhis.web.regdoctorstation.dto;
+package com.healthlink.his.web.regdoctorstation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.common.enums.ChargeItemContext;
+import com.healthlink.his.common.enums.ChargeItemContext;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/AdviceBatchOpParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/AdviceBatchOpParam.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/AdviceBatchOpParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/AdviceBatchOpParam.java
index 943e22b47..8037c9bdf 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/AdviceBatchOpParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/AdviceBatchOpParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.regdoctorstation.dto;
+package com.healthlink.his.web.regdoctorstation.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/LeaveHospitalParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/LeaveHospitalParam.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/LeaveHospitalParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/LeaveHospitalParam.java
index 64f295ad4..7e1ec9877 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/LeaveHospitalParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/LeaveHospitalParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.regdoctorstation.dto;
+package com.healthlink.his.web.regdoctorstation.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NurseStationRequestParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/NurseStationRequestParam.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NurseStationRequestParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/NurseStationRequestParam.java
index f0a7599c8..8aca5d635 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NurseStationRequestParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/NurseStationRequestParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.regdoctorstation.dto;
+package com.healthlink.his.web.regdoctorstation.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/NursingOrdersDetailDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/NursingOrdersDetailDto.java
index 5ed86f792..c6af0b17d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/NursingOrdersDetailDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.regdoctorstation.dto;
+package com.healthlink.his.web.regdoctorstation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/NursingOrdersDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/NursingOrdersDto.java
index 0a74ae799..1e91aa5c1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/NursingOrdersDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.regdoctorstation.dto;
+package com.healthlink.his.web.regdoctorstation.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersEncounterDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/NursingOrdersEncounterDetailDto.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersEncounterDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/NursingOrdersEncounterDetailDto.java
index d7e5b7750..b7f8a3160 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersEncounterDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/NursingOrdersEncounterDetailDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.regdoctorstation.dto;
+package com.healthlink.his.web.regdoctorstation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersEncounterDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/NursingOrdersEncounterDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersEncounterDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/NursingOrdersEncounterDto.java
index 3bca9da8b..fa3747fcc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersEncounterDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/NursingOrdersEncounterDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.regdoctorstation.dto;
+package com.healthlink.his.web.regdoctorstation.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersSaveDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/NursingOrdersSaveDetailDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersSaveDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/NursingOrdersSaveDetailDto.java
index 58454c2fb..f940f7e3b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersSaveDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/NursingOrdersSaveDetailDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.regdoctorstation.dto;
+package com.healthlink.his.web.regdoctorstation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersSaveDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/NursingOrdersSaveDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersSaveDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/NursingOrdersSaveDto.java
index 63e1a97bf..dc152a35d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersSaveDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/NursingOrdersSaveDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.regdoctorstation.dto;
+package com.healthlink.his.web.regdoctorstation.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegAdviceSaveDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RegAdviceSaveDto.java
similarity index 60%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegAdviceSaveDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RegAdviceSaveDto.java
index 5c228ea99..4af99f220 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegAdviceSaveDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RegAdviceSaveDto.java
@@ -1,6 +1,6 @@
-package com.openhis.web.regdoctorstation.dto;
+package com.healthlink.his.web.regdoctorstation.dto;
 
-import com.openhis.web.doctorstation.dto.AdviceSaveDto;
+import com.healthlink.his.web.doctorstation.dto.AdviceSaveDto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegAdviceSaveParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RegAdviceSaveParam.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegAdviceSaveParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RegAdviceSaveParam.java
index 5d8868aeb..731425863 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegAdviceSaveParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RegAdviceSaveParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.regdoctorstation.dto;
+package com.healthlink.his.web.regdoctorstation.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegDoctorStationInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RegDoctorStationInitDto.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegDoctorStationInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RegDoctorStationInitDto.java
index 150565cea..696511ab3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegDoctorStationInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RegDoctorStationInitDto.java
@@ -1,6 +1,6 @@
-package com.openhis.web.regdoctorstation.dto;
+package com.healthlink.his.web.regdoctorstation.dto;
 
-import com.openhis.common.enums.EncounterZyStatus;
+import com.healthlink.his.common.enums.EncounterZyStatus;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegPatientMainInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RegPatientMainInfoDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegPatientMainInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RegPatientMainInfoDto.java
index d2df91f38..a16b3cdfe 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegPatientMainInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RegPatientMainInfoDto.java
@@ -1,9 +1,9 @@
-package com.openhis.web.regdoctorstation.dto;
+package com.healthlink.his.web.regdoctorstation.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;
 import org.springframework.format.annotation.DateTimeFormat;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegRequestBaseDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RegRequestBaseDto.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegRequestBaseDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RegRequestBaseDto.java
index 402d603dc..2559d9638 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegRequestBaseDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RegRequestBaseDto.java
@@ -1,9 +1,9 @@
-package com.openhis.web.regdoctorstation.dto;
+package com.healthlink.his.web.regdoctorstation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.common.annotation.Dict;
-import com.openhis.web.doctorstation.dto.RequestBaseDto;
+import com.healthlink.his.common.annotation.Dict;
+import com.healthlink.his.web.doctorstation.dto.RequestBaseDto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormDetailQueryDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RequestFormDetailQueryDto.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormDetailQueryDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RequestFormDetailQueryDto.java
index 9eb044230..ad3b61d58 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormDetailQueryDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RequestFormDetailQueryDto.java
@@ -1,6 +1,6 @@
-package com.openhis.web.regdoctorstation.dto;
+package com.healthlink.his.web.regdoctorstation.dto;
 
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RequestFormDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RequestFormDto.java
index 7e564cac4..4b6b181f2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RequestFormDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.regdoctorstation.dto;
+package com.healthlink.his.web.regdoctorstation.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RequestFormPageDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RequestFormPageDto.java
index 8205c8e20..be2938b6b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RequestFormPageDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.regdoctorstation.dto;
+package com.healthlink.his.web.regdoctorstation.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RequestFormQueryDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RequestFormQueryDto.java
index 530b9826d..7138ac5a8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RequestFormQueryDto.java
@@ -1,9 +1,9 @@
-package com.openhis.web.regdoctorstation.dto;
+package com.healthlink.his.web.regdoctorstation.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;
 import org.springframework.format.annotation.DateTimeFormat;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormSaveDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RequestFormSaveDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormSaveDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RequestFormSaveDto.java
index 74cf87cbc..e9f80fddd 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormSaveDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RequestFormSaveDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.regdoctorstation.dto;
+package com.healthlink.his.web.regdoctorstation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/TransferOrganizationParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/TransferOrganizationParam.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/TransferOrganizationParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/TransferOrganizationParam.java
index 6d5c8db02..3639be96e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/TransferOrganizationParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/TransferOrganizationParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.regdoctorstation.dto;
+package com.healthlink.his.web.regdoctorstation.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/AdviceManageAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/mapper/AdviceManageAppMapper.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/AdviceManageAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/mapper/AdviceManageAppMapper.java
index d1dc75024..7acf02e33 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/AdviceManageAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/mapper/AdviceManageAppMapper.java
@@ -1,12 +1,12 @@
-package com.openhis.web.regdoctorstation.mapper;
+package com.healthlink.his.web.regdoctorstation.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.inhospitalnursestation.dto.EncounterAccountDto;
-import com.openhis.web.regdoctorstation.dto.RegPatientMainInfoDto;
-import com.openhis.web.regdoctorstation.dto.RegRequestBaseDto;
+import com.healthlink.his.web.inhospitalnursestation.dto.EncounterAccountDto;
+import com.healthlink.his.web.regdoctorstation.dto.RegPatientMainInfoDto;
+import com.healthlink.his.web.regdoctorstation.dto.RegRequestBaseDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/RequestFormManageAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/mapper/RequestFormManageAppMapper.java
similarity index 82%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/RequestFormManageAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/mapper/RequestFormManageAppMapper.java
index fd0b8da5d..b89c611e4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/RequestFormManageAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/mapper/RequestFormManageAppMapper.java
@@ -1,13 +1,13 @@
-package com.openhis.web.regdoctorstation.mapper;
+package com.healthlink.his.web.regdoctorstation.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.openhis.document.domain.RequestForm;
-import com.openhis.web.regdoctorstation.dto.ActivityOrganizationConfigDto;
-import com.openhis.web.regdoctorstation.dto.RequestFormDetailQueryDto;
-import com.openhis.web.regdoctorstation.dto.RequestFormDto;
-import com.openhis.web.regdoctorstation.dto.RequestFormPageDto;
-import com.openhis.web.regdoctorstation.dto.RequestFormQueryDto;
+import com.healthlink.his.document.domain.RequestForm;
+import com.healthlink.his.web.regdoctorstation.dto.ActivityOrganizationConfigDto;
+import com.healthlink.his.web.regdoctorstation.dto.RequestFormDetailQueryDto;
+import com.healthlink.his.web.regdoctorstation.dto.RequestFormDto;
+import com.healthlink.his.web.regdoctorstation.dto.RequestFormPageDto;
+import com.healthlink.his.web.regdoctorstation.dto.RequestFormQueryDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/SpecialAdviceAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/mapper/SpecialAdviceAppMapper.java
similarity index 83%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/SpecialAdviceAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/mapper/SpecialAdviceAppMapper.java
index 5ebf596f2..44b58d488 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/SpecialAdviceAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/mapper/SpecialAdviceAppMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.web.regdoctorstation.mapper;
+package com.healthlink.his.web.regdoctorstation.mapper;
 
-import com.openhis.web.regdoctorstation.dto.NursingOrdersDetailDto;
-import com.openhis.web.regdoctorstation.dto.NursingOrdersEncounterDetailDto;
+import com.healthlink.his.web.regdoctorstation.dto.NursingOrdersDetailDto;
+import com.healthlink.his.web.regdoctorstation.dto.NursingOrdersEncounterDetailDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/utils/RegPrescriptionUtils.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/utils/RegPrescriptionUtils.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/utils/RegPrescriptionUtils.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/utils/RegPrescriptionUtils.java
index 8d58e6a8b..1a5dcae06 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/utils/RegPrescriptionUtils.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/utils/RegPrescriptionUtils.java
@@ -1,8 +1,8 @@
-package com.openhis.web.regdoctorstation.utils;
+package com.healthlink.his.web.regdoctorstation.utils;
 
 import com.core.common.utils.AssignSeqUtil;
-import com.openhis.common.enums.AssignSeqEnum;
-import com.openhis.web.regdoctorstation.dto.RegAdviceSaveDto;
+import com.healthlink.his.common.enums.AssignSeqEnum;
+import com.healthlink.his.web.regdoctorstation.dto.RegAdviceSaveDto;
 import org.springframework.stereotype.Component;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/appservice/IInfectiousCardAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/appservice/IInfectiousCardAppService.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/appservice/IInfectiousCardAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/appservice/IInfectiousCardAppService.java
index 574f444ad..55a5ec5cb 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/appservice/IInfectiousCardAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/appservice/IInfectiousCardAppService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.reportManagement.appservice;
+package com.healthlink.his.web.reportManagement.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportManagement.dto.InfectiousCardParam;
+import com.healthlink.his.web.reportManagement.dto.InfectiousCardParam;
 
 import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/appservice/impl/InfectiousCardAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/appservice/impl/InfectiousCardAppServiceImpl.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/appservice/impl/InfectiousCardAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/appservice/impl/InfectiousCardAppServiceImpl.java
index cba749820..4c5f1596f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/appservice/impl/InfectiousCardAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/appservice/impl/InfectiousCardAppServiceImpl.java
@@ -1,18 +1,18 @@
-package com.openhis.web.reportManagement.appservice.impl;
+package com.healthlink.his.web.reportManagement.appservice.impl;
 
 import com.alibaba.fastjson2.JSONObject;
 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.Organization;
-import com.openhis.administration.service.IOrganizationService;
-import com.openhis.infectious.domain.InfectiousAudit;
-import com.openhis.web.reportManagement.appservice.IInfectiousCardAppService;
-import com.openhis.web.reportManagement.dto.InfectiousCardDto;
-import com.openhis.web.reportManagement.dto.InfectiousCardParam;
-import com.openhis.web.cardmanagement.mapper.InfectiousAuditMapper;
-import com.openhis.web.reportManagement.mapper.ReportManageCardMapper;
+import com.healthlink.his.administration.domain.Organization;
+import com.healthlink.his.administration.service.IOrganizationService;
+import com.healthlink.his.infectious.domain.InfectiousAudit;
+import com.healthlink.his.web.reportManagement.appservice.IInfectiousCardAppService;
+import com.healthlink.his.web.reportManagement.dto.InfectiousCardDto;
+import com.healthlink.his.web.reportManagement.dto.InfectiousCardParam;
+import com.healthlink.his.web.cardmanagement.mapper.InfectiousAuditMapper;
+import com.healthlink.his.web.reportManagement.mapper.ReportManageCardMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/controller/reportManagementController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/controller/reportManagementController.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/controller/reportManagementController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/controller/reportManagementController.java
index 7d656a876..d8fcb3abf 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/controller/reportManagementController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/controller/reportManagementController.java
@@ -1,13 +1,13 @@
-package com.openhis.web.reportManagement.controller;
+package com.healthlink.his.web.reportManagement.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportManagement.appservice.IInfectiousCardAppService;
-import com.openhis.web.reportManagement.dto.InfectiousCardParam;
-import com.openhis.web.reportManagement.dto.AuditInfectiousCardRequest;
-import com.openhis.web.reportManagement.dto.ReturnInfectiousCardRequest;
-import com.openhis.web.reportManagement.dto.BatchAuditInfectiousCardRequest;
-import com.openhis.web.reportManagement.dto.BatchReturnInfectiousCardRequest;
-import com.openhis.web.reportManagement.dto.RevokeAuditInfectiousCardRequest;
+import com.healthlink.his.web.reportManagement.appservice.IInfectiousCardAppService;
+import com.healthlink.his.web.reportManagement.dto.InfectiousCardParam;
+import com.healthlink.his.web.reportManagement.dto.AuditInfectiousCardRequest;
+import com.healthlink.his.web.reportManagement.dto.ReturnInfectiousCardRequest;
+import com.healthlink.his.web.reportManagement.dto.BatchAuditInfectiousCardRequest;
+import com.healthlink.his.web.reportManagement.dto.BatchReturnInfectiousCardRequest;
+import com.healthlink.his.web.reportManagement.dto.RevokeAuditInfectiousCardRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/AuditInfectiousCardRequest.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/dto/AuditInfectiousCardRequest.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/AuditInfectiousCardRequest.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/dto/AuditInfectiousCardRequest.java
index c8a0f0a01..57ce3deaf 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/AuditInfectiousCardRequest.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/dto/AuditInfectiousCardRequest.java
@@ -1,4 +1,4 @@
-package com.openhis.web.reportManagement.dto;
+package com.healthlink.his.web.reportManagement.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/BatchAuditInfectiousCardRequest.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/dto/BatchAuditInfectiousCardRequest.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/BatchAuditInfectiousCardRequest.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/dto/BatchAuditInfectiousCardRequest.java
index 16b1f28b4..aa32ec687 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/BatchAuditInfectiousCardRequest.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/dto/BatchAuditInfectiousCardRequest.java
@@ -1,4 +1,4 @@
-package com.openhis.web.reportManagement.dto;
+package com.healthlink.his.web.reportManagement.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/BatchReturnInfectiousCardRequest.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/dto/BatchReturnInfectiousCardRequest.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/BatchReturnInfectiousCardRequest.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/dto/BatchReturnInfectiousCardRequest.java
index 07570fd28..614731191 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/BatchReturnInfectiousCardRequest.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/dto/BatchReturnInfectiousCardRequest.java
@@ -1,4 +1,4 @@
-package com.openhis.web.reportManagement.dto;
+package com.healthlink.his.web.reportManagement.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/InfectiousCardDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/dto/InfectiousCardDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/InfectiousCardDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/dto/InfectiousCardDto.java
index e78846434..c60b7db8d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/InfectiousCardDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/dto/InfectiousCardDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.reportManagement.dto;
+package com.healthlink.his.web.reportManagement.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/InfectiousCardParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/dto/InfectiousCardParam.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/InfectiousCardParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/dto/InfectiousCardParam.java
index 2b57aca79..dc4e191a7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/InfectiousCardParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/dto/InfectiousCardParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.reportManagement.dto;
+package com.healthlink.his.web.reportManagement.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/ReturnInfectiousCardRequest.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/dto/ReturnInfectiousCardRequest.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/ReturnInfectiousCardRequest.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/dto/ReturnInfectiousCardRequest.java
index 6837b2b6d..8a413eb68 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/ReturnInfectiousCardRequest.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/dto/ReturnInfectiousCardRequest.java
@@ -1,4 +1,4 @@
-package com.openhis.web.reportManagement.dto;
+package com.healthlink.his.web.reportManagement.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/RevokeAuditInfectiousCardRequest.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/dto/RevokeAuditInfectiousCardRequest.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/RevokeAuditInfectiousCardRequest.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/dto/RevokeAuditInfectiousCardRequest.java
index 125d61e2c..fde8d055c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/RevokeAuditInfectiousCardRequest.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/dto/RevokeAuditInfectiousCardRequest.java
@@ -1,4 +1,4 @@
-package com.openhis.web.reportManagement.dto;
+package com.healthlink.his.web.reportManagement.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/mapper/ReportManageCardMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/mapper/ReportManageCardMapper.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/mapper/ReportManageCardMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/mapper/ReportManageCardMapper.java
index b3d13b9f3..6a3f41150 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/mapper/ReportManageCardMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportManagement/mapper/ReportManageCardMapper.java
@@ -1,9 +1,9 @@
-package com.openhis.web.reportManagement.mapper;
+package com.healthlink.his.web.reportManagement.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.openhis.web.reportManagement.dto.InfectiousCardDto;
-import com.openhis.web.reportManagement.dto.InfectiousCardParam;
+import com.healthlink.his.web.reportManagement.dto.InfectiousCardDto;
+import com.healthlink.his.web.reportManagement.dto.InfectiousCardParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IAmbAdviceStatisticsAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IAmbAdviceStatisticsAppService.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IAmbAdviceStatisticsAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IAmbAdviceStatisticsAppService.java
index 4626a6840..980c714e1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IAmbAdviceStatisticsAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IAmbAdviceStatisticsAppService.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice;
+package com.healthlink.his.web.reportmanage.appservice;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IChargeReportAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IChargeReportAppService.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IChargeReportAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IChargeReportAppService.java
index ad9bc46e4..be85224e9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IChargeReportAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IChargeReportAppService.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice;
+package com.healthlink.his.web.reportmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.dto.ChargeReportSearchParam;
+import com.healthlink.his.web.reportmanage.dto.ChargeReportSearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IDepartmentRevenueStatisticsAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IDepartmentRevenueStatisticsAppService.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IDepartmentRevenueStatisticsAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IDepartmentRevenueStatisticsAppService.java
index 144fac05f..faf6833bc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IDepartmentRevenueStatisticsAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IDepartmentRevenueStatisticsAppService.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice;
+package com.healthlink.his.web.reportmanage.appservice;
 
 import com.core.common.core.domain.R;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IDrugDosageSettlementAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IDrugDosageSettlementAppService.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IDrugDosageSettlementAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IDrugDosageSettlementAppService.java
index 4353b9832..fc6e06855 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IDrugDosageSettlementAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IDrugDosageSettlementAppService.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice;
+package com.healthlink.his.web.reportmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.dto.DrugDosageSettlementSearchParam;
+import com.healthlink.his.web.reportmanage.dto.DrugDosageSettlementSearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IInboundReportAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IInboundReportAppService.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IInboundReportAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IInboundReportAppService.java
index 5736121ba..4aad2152f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IInboundReportAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IInboundReportAppService.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice;
+package com.healthlink.his.web.reportmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.dto.InboundReportSearchParam;
+import com.healthlink.his.web.reportmanage.dto.InboundReportSearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IInventoryProductReportAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IInventoryProductReportAppService.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IInventoryProductReportAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IInventoryProductReportAppService.java
index 5c70f3de1..49f8ccd19 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IInventoryProductReportAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IInventoryProductReportAppService.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice;
+package com.healthlink.his.web.reportmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.dto.InventoryProductReportSearchParam;
+import com.healthlink.his.web.reportmanage.dto.InventoryProductReportSearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/ILossReportAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/ILossReportAppService.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/ILossReportAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/ILossReportAppService.java
index f41b67544..83fb49784 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/ILossReportAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/ILossReportAppService.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice;
+package com.healthlink.his.web.reportmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.dto.LossReportSearchParam;
+import com.healthlink.his.web.reportmanage.dto.LossReportSearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMedicationDeviceReportAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IMedicationDeviceReportAppService.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMedicationDeviceReportAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IMedicationDeviceReportAppService.java
index cd6382195..d1758f008 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMedicationDeviceReportAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IMedicationDeviceReportAppService.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice;
+package com.healthlink.his.web.reportmanage.appservice;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.dto.MedUseReportInfoDto;
+import com.healthlink.his.web.reportmanage.dto.MedUseReportInfoDto;
 
 import jakarta.servlet.http.HttpServletResponse;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMedicationInboundReportAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IMedicationInboundReportAppService.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMedicationInboundReportAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IMedicationInboundReportAppService.java
index accc364bd..6ebf7ce64 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMedicationInboundReportAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IMedicationInboundReportAppService.java
@@ -1,4 +1,4 @@
-package com.openhis.web.reportmanage.appservice;
+package com.healthlink.his.web.reportmanage.appservice;
 
 import com.core.common.core.domain.R;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMonthlySettlementReportAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IMonthlySettlementReportAppService.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMonthlySettlementReportAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IMonthlySettlementReportAppService.java
index 9b256afc1..84f960f4f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMonthlySettlementReportAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IMonthlySettlementReportAppService.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice;
+package com.healthlink.his.web.reportmanage.appservice;
 
 import com.core.common.core.domain.R;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IOutboundReportAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IOutboundReportAppService.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IOutboundReportAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IOutboundReportAppService.java
index 7b54974b7..eb3d23014 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IOutboundReportAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IOutboundReportAppService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.reportmanage.appservice;
+package com.healthlink.his.web.reportmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.dto.OutboundReportSearchParam;
+import com.healthlink.his.web.reportmanage.dto.OutboundReportSearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IPharmacySettlementReportAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IPharmacySettlementReportAppService.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IPharmacySettlementReportAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IPharmacySettlementReportAppService.java
index 99862a99f..bd8cdf055 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IPharmacySettlementReportAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IPharmacySettlementReportAppService.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice;
+package com.healthlink.his.web.reportmanage.appservice;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IPrintReportAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IPrintReportAppService.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IPrintReportAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IPrintReportAppService.java
index da4f718f5..bc46b8d07 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IPrintReportAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IPrintReportAppService.java
@@ -1,4 +1,4 @@
-package com.openhis.web.reportmanage.appservice;
+package com.healthlink.his.web.reportmanage.appservice;
 
 import com.core.common.core.domain.R;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IRegisterReportAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IRegisterReportAppService.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IRegisterReportAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IRegisterReportAppService.java
index c916048d9..08873e69e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IRegisterReportAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IRegisterReportAppService.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice;
+package com.healthlink.his.web.reportmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.dto.RegisterReportSearchParam;
+import com.healthlink.his.web.reportmanage.dto.RegisterReportSearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReportAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IReportAppService.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReportAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IReportAppService.java
index a9e20bc73..97a3074a1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReportAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IReportAppService.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice;
+package com.healthlink.his.web.reportmanage.appservice;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.dto.*;
+import com.healthlink.his.web.reportmanage.dto.*;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReportStatisticsAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IReportStatisticsAppService.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReportStatisticsAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IReportStatisticsAppService.java
index 4a5851249..c516cb2bc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReportStatisticsAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IReportStatisticsAppService.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice;
+package com.healthlink.his.web.reportmanage.appservice;
 
 import com.core.common.core.domain.R;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReturnIssueReportAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IReturnIssueReportAppService.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReturnIssueReportAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IReturnIssueReportAppService.java
index 5591c235b..f1f8ea139 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReturnIssueReportAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IReturnIssueReportAppService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.reportmanage.appservice;
+package com.healthlink.his.web.reportmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.dto.ReturnIssueReportSearchParam;
+import com.healthlink.his.web.reportmanage.dto.ReturnIssueReportSearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IStocktakingReportAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IStocktakingReportAppService.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IStocktakingReportAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IStocktakingReportAppService.java
index 85cdbde04..3ccc811fb 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IStocktakingReportAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/IStocktakingReportAppService.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice;
+package com.healthlink.his.web.reportmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.dto.StocktakingReportSearchParam;
+import com.healthlink.his.web.reportmanage.dto.StocktakingReportSearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/ITransferReportAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/ITransferReportAppService.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/ITransferReportAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/ITransferReportAppService.java
index c0cca47c8..f9a3e5b84 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/ITransferReportAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/ITransferReportAppService.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice;
+package com.healthlink.his.web.reportmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.dto.TransferReportSearchParam;
+import com.healthlink.his.web.reportmanage.dto.TransferReportSearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/InpatientMedicalRecordHomePageCollectionAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/InpatientMedicalRecordHomePageCollectionAppService.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/InpatientMedicalRecordHomePageCollectionAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/InpatientMedicalRecordHomePageCollectionAppService.java
index 10d9dfa62..c08d75ef4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/InpatientMedicalRecordHomePageCollectionAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/InpatientMedicalRecordHomePageCollectionAppService.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice;
+package com.healthlink.his.web.reportmanage.appservice;
 
 import com.core.common.core.domain.R;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/PurchaseReturnReportAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/PurchaseReturnReportAppService.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/PurchaseReturnReportAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/PurchaseReturnReportAppService.java
index 989b4d863..85d9b844c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/PurchaseReturnReportAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/PurchaseReturnReportAppService.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice;
+package com.healthlink.his.web.reportmanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.dto.PurchaseReturnReportSearchParam;
+import com.healthlink.his.web.reportmanage.dto.PurchaseReturnReportSearchParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/AmbAdviceStatisticsAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/AmbAdviceStatisticsAppServiceImpl.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/AmbAdviceStatisticsAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/AmbAdviceStatisticsAppServiceImpl.java
index efb1211c7..83d03efb5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/AmbAdviceStatisticsAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/AmbAdviceStatisticsAppServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice.impl;
+package com.healthlink.his.web.reportmanage.appservice.impl;
 
 import java.util.List;
 
@@ -13,12 +13,12 @@ import org.springframework.stereotype.Service;
 
 import com.core.common.core.domain.R;
 import com.core.common.utils.poi.ExcelUtil;
-import com.openhis.common.enums.EncounterClass;
-import com.openhis.common.enums.RequestStatus;
-import com.openhis.web.reportmanage.appservice.IAmbAdviceStatisticsAppService;
-import com.openhis.web.reportmanage.dto.AmbActAdviceStatisticsDto;
-import com.openhis.web.reportmanage.dto.AmbMedAdviceStatisticsDto;
-import com.openhis.web.reportmanage.mapper.AmbAdviceStatisticsAppMapper;
+import com.healthlink.his.common.enums.EncounterClass;
+import com.healthlink.his.common.enums.RequestStatus;
+import com.healthlink.his.web.reportmanage.appservice.IAmbAdviceStatisticsAppService;
+import com.healthlink.his.web.reportmanage.dto.AmbActAdviceStatisticsDto;
+import com.healthlink.his.web.reportmanage.dto.AmbMedAdviceStatisticsDto;
+import com.healthlink.his.web.reportmanage.mapper.AmbAdviceStatisticsAppMapper;
 
 /**
  * 门诊医嘱统计 impl
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ChargeReportAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/ChargeReportAppServiceImpl.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ChargeReportAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/ChargeReportAppServiceImpl.java
index 905e650a8..2a8eb944b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ChargeReportAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/ChargeReportAppServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice.impl;
+package com.healthlink.his.web.reportmanage.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -9,19 +9,19 @@ import com.core.common.core.domain.R;
 import com.core.common.utils.AgeCalculatorUtil;
 import com.core.common.utils.NewExcelUtil;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.service.IPractitionerService;
-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.web.reportmanage.appservice.IChargeReportAppService;
-import com.openhis.web.reportmanage.dto.ChargeReportDto;
-import com.openhis.web.reportmanage.dto.ChargeReportInitDto;
-import com.openhis.web.reportmanage.dto.ChargeReportPageDto;
-import com.openhis.web.reportmanage.dto.ChargeReportSearchParam;
-import com.openhis.web.reportmanage.mapper.ChargeReportMapper;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.service.IPractitionerService;
+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.web.reportmanage.appservice.IChargeReportAppService;
+import com.healthlink.his.web.reportmanage.dto.ChargeReportDto;
+import com.healthlink.his.web.reportmanage.dto.ChargeReportInitDto;
+import com.healthlink.his.web.reportmanage.dto.ChargeReportPageDto;
+import com.healthlink.his.web.reportmanage.dto.ChargeReportSearchParam;
+import com.healthlink.his.web.reportmanage.mapper.ChargeReportMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/DepartmentRevenueStatisticsAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/DepartmentRevenueStatisticsAppServiceImpl.java
similarity index 72%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/DepartmentRevenueStatisticsAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/DepartmentRevenueStatisticsAppServiceImpl.java
index c550bebd8..0359c2e72 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/DepartmentRevenueStatisticsAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/DepartmentRevenueStatisticsAppServiceImpl.java
@@ -1,18 +1,18 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice.impl;
+package com.healthlink.his.web.reportmanage.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.openhis.common.enums.DispenseStatus;
-import com.openhis.common.enums.RequestStatus;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.reportmanage.appservice.IDepartmentRevenueStatisticsAppService;
-import com.openhis.web.reportmanage.dto.DepartmentRevenueStatisticsPageDto;
-import com.openhis.web.reportmanage.dto.DrugDosageSettlementSearchParam;
-import com.openhis.web.reportmanage.mapper.DepartmentRevenueStatisticsMapper;
+import com.healthlink.his.common.enums.DispenseStatus;
+import com.healthlink.his.common.enums.RequestStatus;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.reportmanage.appservice.IDepartmentRevenueStatisticsAppService;
+import com.healthlink.his.web.reportmanage.dto.DepartmentRevenueStatisticsPageDto;
+import com.healthlink.his.web.reportmanage.dto.DrugDosageSettlementSearchParam;
+import com.healthlink.his.web.reportmanage.mapper.DepartmentRevenueStatisticsMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/DrugDosageSettlementAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/DrugDosageSettlementAppServiceImpl.java
similarity index 83%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/DrugDosageSettlementAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/DrugDosageSettlementAppServiceImpl.java
index 2a42773ff..e7ba80808 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/DrugDosageSettlementAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/DrugDosageSettlementAppServiceImpl.java
@@ -1,19 +1,19 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice.impl;
+package com.healthlink.his.web.reportmanage.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.openhis.common.enums.DispenseStatus;
-import com.openhis.common.enums.RequestStatus;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.reportmanage.appservice.IDrugDosageSettlementAppService;
-import com.openhis.web.reportmanage.dto.DrugDosageSettlementPageDto;
-import com.openhis.web.reportmanage.dto.DrugDosageSettlementSearchParam;
-import com.openhis.web.reportmanage.mapper.DrugDosageSettlementMapper;
+import com.healthlink.his.common.enums.DispenseStatus;
+import com.healthlink.his.common.enums.RequestStatus;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.reportmanage.appservice.IDrugDosageSettlementAppService;
+import com.healthlink.his.web.reportmanage.dto.DrugDosageSettlementPageDto;
+import com.healthlink.his.web.reportmanage.dto.DrugDosageSettlementSearchParam;
+import com.healthlink.his.web.reportmanage.mapper.DrugDosageSettlementMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/IPrintReportAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/IPrintReportAppServiceImpl.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/IPrintReportAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/IPrintReportAppServiceImpl.java
index 6951697cf..684615c24 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/IPrintReportAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/IPrintReportAppServiceImpl.java
@@ -1,23 +1,23 @@
-package com.openhis.web.reportmanage.appservice.impl;
+package com.healthlink.his.web.reportmanage.appservice.impl;
 
 import com.core.common.core.domain.R;
 import com.core.common.utils.AgeCalculatorUtil;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.AccountType;
-import com.openhis.common.enums.AdministrativeGender;
-import com.openhis.common.enums.ClinicalStatus;
-import com.openhis.common.enums.Whether;
-import com.openhis.common.enums.ybenums.YbRxItemTypeCode;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.web.reportmanage.appservice.IPrintReportAppService;
-import com.openhis.web.reportmanage.dto.BottleLabelDto;
-import com.openhis.web.reportmanage.dto.CkInspAppDto;
-import com.openhis.web.reportmanage.dto.DisposalDto;
-import com.openhis.web.reportmanage.dto.PrescriptionPrintDto;
-import com.openhis.web.reportmanage.mapper.PrintReportMapper;
-import com.openhis.workflow.service.IServiceRequestService;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.AccountType;
+import com.healthlink.his.common.enums.AdministrativeGender;
+import com.healthlink.his.common.enums.ClinicalStatus;
+import com.healthlink.his.common.enums.Whether;
+import com.healthlink.his.common.enums.ybenums.YbRxItemTypeCode;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.web.reportmanage.appservice.IPrintReportAppService;
+import com.healthlink.his.web.reportmanage.dto.BottleLabelDto;
+import com.healthlink.his.web.reportmanage.dto.CkInspAppDto;
+import com.healthlink.his.web.reportmanage.dto.DisposalDto;
+import com.healthlink.his.web.reportmanage.dto.PrescriptionPrintDto;
+import com.healthlink.his.web.reportmanage.mapper.PrintReportMapper;
+import com.healthlink.his.workflow.service.IServiceRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InboundReportAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/InboundReportAppServiceImpl.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InboundReportAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/InboundReportAppServiceImpl.java
index f6f25ecaa..02ecbee32 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InboundReportAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/InboundReportAppServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice.impl;
+package com.healthlink.his.web.reportmanage.appservice.impl;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -13,21 +13,21 @@ import com.core.common.core.domain.entity.SysDictData;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.poi.ExcelUtil;
 import com.core.system.service.ISysDictTypeService;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.domain.Supplier;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.administration.service.ISupplierService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.DispenseStatus;
-import com.openhis.common.enums.SupplyStatus;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.reportmanage.appservice.IInboundReportAppService;
-import com.openhis.web.reportmanage.dto.InboundReportInitDto;
-import com.openhis.web.reportmanage.dto.InboundReportPageDto;
-import com.openhis.web.reportmanage.dto.InboundReportSearchParam;
-import com.openhis.web.reportmanage.mapper.InboundReportMapper;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.domain.Supplier;
+import com.healthlink.his.administration.service.IPractitionerService;
+import com.healthlink.his.administration.service.ISupplierService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.DispenseStatus;
+import com.healthlink.his.common.enums.SupplyStatus;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.reportmanage.appservice.IInboundReportAppService;
+import com.healthlink.his.web.reportmanage.dto.InboundReportInitDto;
+import com.healthlink.his.web.reportmanage.dto.InboundReportPageDto;
+import com.healthlink.his.web.reportmanage.dto.InboundReportSearchParam;
+import com.healthlink.his.web.reportmanage.mapper.InboundReportMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InpatientMedicalRecordHomePageCollectionAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/InpatientMedicalRecordHomePageCollectionAppServiceImpl.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InpatientMedicalRecordHomePageCollectionAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/InpatientMedicalRecordHomePageCollectionAppServiceImpl.java
index 986a23f34..cd652b025 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InpatientMedicalRecordHomePageCollectionAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/InpatientMedicalRecordHomePageCollectionAppServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice.impl;
+package com.healthlink.his.web.reportmanage.appservice.impl;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -10,14 +10,14 @@ import com.alibaba.fastjson2.JSONObject;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AgeCalculatorUtil;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.service.IEncounterService;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.web.reportmanage.appservice.InpatientMedicalRecordHomePageCollectionAppService;
-import com.openhis.web.reportmanage.dto.InpatientMedicalRecordHomePageCollectionDto;
-import com.openhis.web.reportmanage.dto.InpatientMedicalRecordHomePageMakeDto;
-import com.openhis.web.reportmanage.mapper.InpatientMedicalRecordHomePageCollectionMapper;
-import com.openhis.web.reportmanage.utils.CsvFillerUtil;
+import com.healthlink.his.administration.service.IEncounterService;
+import com.healthlink.his.administration.service.IPractitionerService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.web.reportmanage.appservice.InpatientMedicalRecordHomePageCollectionAppService;
+import com.healthlink.his.web.reportmanage.dto.InpatientMedicalRecordHomePageCollectionDto;
+import com.healthlink.his.web.reportmanage.dto.InpatientMedicalRecordHomePageMakeDto;
+import com.healthlink.his.web.reportmanage.mapper.InpatientMedicalRecordHomePageCollectionMapper;
+import com.healthlink.his.web.reportmanage.utils.CsvFillerUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InventoryProductReportAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/InventoryProductReportAppServiceImpl.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InventoryProductReportAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/InventoryProductReportAppServiceImpl.java
index c70b90371..9200ef304 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InventoryProductReportAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/InventoryProductReportAppServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice.impl;
+package com.healthlink.his.web.reportmanage.appservice.impl;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -12,20 +12,20 @@ import com.core.common.core.domain.R;
 import com.core.common.core.domain.entity.SysDictData;
 import com.core.common.utils.MessageUtils;
 import com.core.system.service.ISysDictTypeService;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.CategoryType;
-import com.openhis.common.enums.ConditionCode;
-import com.openhis.common.enums.LocationForm;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.reportmanage.appservice.IInventoryProductReportAppService;
-import com.openhis.web.reportmanage.dto.InventoryProductReportPageDto;
-import com.openhis.web.reportmanage.dto.InventoryProductReportSearchParam;
-import com.openhis.web.reportmanage.mapper.InventoryProductReportMapper;
-import com.openhis.web.reportmanage.utils.ExcelFillerUtil;
+import com.healthlink.his.administration.service.IPractitionerService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.CategoryType;
+import com.healthlink.his.common.enums.ConditionCode;
+import com.healthlink.his.common.enums.LocationForm;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.reportmanage.appservice.IInventoryProductReportAppService;
+import com.healthlink.his.web.reportmanage.dto.InventoryProductReportPageDto;
+import com.healthlink.his.web.reportmanage.dto.InventoryProductReportSearchParam;
+import com.healthlink.his.web.reportmanage.mapper.InventoryProductReportMapper;
+import com.healthlink.his.web.reportmanage.utils.ExcelFillerUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/LossReportAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/LossReportAppServiceImpl.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/LossReportAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/LossReportAppServiceImpl.java
index 4895d4a8f..1e3a93142 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/LossReportAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/LossReportAppServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice.impl;
+package com.healthlink.his.web.reportmanage.appservice.impl;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -13,18 +13,18 @@ import com.core.common.core.domain.entity.SysDictData;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.poi.ExcelUtil;
 import com.core.system.service.ISysDictTypeService;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.DispenseStatus;
-import com.openhis.common.enums.SupplyStatus;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.reportmanage.appservice.ILossReportAppService;
-import com.openhis.web.reportmanage.dto.LossReportPageDto;
-import com.openhis.web.reportmanage.dto.LossReportSearchParam;
-import com.openhis.web.reportmanage.mapper.LossReportMapper;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.service.IPractitionerService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.DispenseStatus;
+import com.healthlink.his.common.enums.SupplyStatus;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.reportmanage.appservice.ILossReportAppService;
+import com.healthlink.his.web.reportmanage.dto.LossReportPageDto;
+import com.healthlink.his.web.reportmanage.dto.LossReportSearchParam;
+import com.healthlink.his.web.reportmanage.mapper.LossReportMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/MedicationDeviceReportAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/MedicationDeviceReportAppServiceImpl.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/MedicationDeviceReportAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/MedicationDeviceReportAppServiceImpl.java
index 5a2972112..08c56346f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/MedicationDeviceReportAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/MedicationDeviceReportAppServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice.impl;
+package com.healthlink.his.web.reportmanage.appservice.impl;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -11,19 +11,19 @@ import com.core.common.core.domain.R;
 import com.core.common.core.domain.entity.SysDictData;
 import com.core.common.utils.MessageUtils;
 import com.core.system.service.ISysDictTypeService;
-import com.openhis.administration.domain.Organization;
-import com.openhis.administration.service.IOrganizationService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.DispenseStatus;
-import com.openhis.common.enums.OrganizationType;
-import com.openhis.common.enums.RequestStatus;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.reportmanage.appservice.IMedicationDeviceReportAppService;
-import com.openhis.web.reportmanage.dto.MedDevUseReportDto;
-import com.openhis.web.reportmanage.dto.MedUseReportInfoDto;
-import com.openhis.web.reportmanage.mapper.MedicationDeviceReportMapper;
-import com.openhis.web.reportmanage.utils.ExcelFillerUtil;
+import com.healthlink.his.administration.domain.Organization;
+import com.healthlink.his.administration.service.IOrganizationService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.DispenseStatus;
+import com.healthlink.his.common.enums.OrganizationType;
+import com.healthlink.his.common.enums.RequestStatus;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.reportmanage.appservice.IMedicationDeviceReportAppService;
+import com.healthlink.his.web.reportmanage.dto.MedDevUseReportDto;
+import com.healthlink.his.web.reportmanage.dto.MedUseReportInfoDto;
+import com.healthlink.his.web.reportmanage.mapper.MedicationDeviceReportMapper;
+import com.healthlink.his.web.reportmanage.utils.ExcelFillerUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/MedicationInboundReportAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/MedicationInboundReportAppServiceImpl.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/MedicationInboundReportAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/MedicationInboundReportAppServiceImpl.java
index 3c535993c..152bef7da 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/MedicationInboundReportAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/MedicationInboundReportAppServiceImpl.java
@@ -1,19 +1,19 @@
-package com.openhis.web.reportmanage.appservice.impl;
+package com.healthlink.his.web.reportmanage.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.core.domain.model.LoginUser;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.DispenseStatus;
-import com.openhis.common.enums.RequestStatus;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.common.utils.PageUtils;
-import com.openhis.web.reportmanage.appservice.IMedicationInboundReportAppService;
-import com.openhis.web.reportmanage.dto.MedicationInboundReportDto;
-import com.openhis.web.reportmanage.mapper.MedicationInboundReportMapper;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.enums.DispenseStatus;
+import com.healthlink.his.common.enums.RequestStatus;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.common.utils.PageUtils;
+import com.healthlink.his.web.reportmanage.appservice.IMedicationInboundReportAppService;
+import com.healthlink.his.web.reportmanage.dto.MedicationInboundReportDto;
+import com.healthlink.his.web.reportmanage.mapper.MedicationInboundReportMapper;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/MonthlySettlementReportAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/MonthlySettlementReportAppServiceImpl.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/MonthlySettlementReportAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/MonthlySettlementReportAppServiceImpl.java
index cf6569772..43b603022 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/MonthlySettlementReportAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/MonthlySettlementReportAppServiceImpl.java
@@ -1,21 +1,21 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice.impl;
+package com.healthlink.his.web.reportmanage.appservice.impl;
 
 import com.core.common.core.domain.R;
-import com.openhis.administration.domain.Location;
-import com.openhis.administration.service.ILocationService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.DispenseStatus;
-import com.openhis.common.enums.RequestStatus;
-import com.openhis.common.enums.SupplyStatus;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.reportmanage.appservice.IMonthlySettlementReportAppService;
-import com.openhis.web.reportmanage.dto.AmountNumberDto;
-import com.openhis.web.reportmanage.dto.MonthlySettlementDto;
-import com.openhis.web.reportmanage.dto.MonthlySettlementInitDto;
-import com.openhis.web.reportmanage.mapper.MonthlySettlementReportMapper;
+import com.healthlink.his.administration.domain.Location;
+import com.healthlink.his.administration.service.ILocationService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.enums.DispenseStatus;
+import com.healthlink.his.common.enums.RequestStatus;
+import com.healthlink.his.common.enums.SupplyStatus;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.reportmanage.appservice.IMonthlySettlementReportAppService;
+import com.healthlink.his.web.reportmanage.dto.AmountNumberDto;
+import com.healthlink.his.web.reportmanage.dto.MonthlySettlementDto;
+import com.healthlink.his.web.reportmanage.dto.MonthlySettlementInitDto;
+import com.healthlink.his.web.reportmanage.mapper.MonthlySettlementReportMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/OutboundReportAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/OutboundReportAppServiceImpl.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/OutboundReportAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/OutboundReportAppServiceImpl.java
index 0594de6cb..f1a3105c0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/OutboundReportAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/OutboundReportAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.reportmanage.appservice.impl;
+package com.healthlink.his.web.reportmanage.appservice.impl;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -10,21 +10,21 @@ import com.core.common.core.domain.entity.SysDictData;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.poi.ExcelUtil;
 import com.core.system.service.ISysDictTypeService;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.domain.Supplier;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.administration.service.ISupplierService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.DispenseStatus;
-import com.openhis.common.enums.SupplyStatus;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.reportmanage.appservice.IOutboundReportAppService;
-import com.openhis.web.reportmanage.dto.OutboundReportInitDto;
-import com.openhis.web.reportmanage.dto.OutboundReportPageDto;
-import com.openhis.web.reportmanage.dto.OutboundReportSearchParam;
-import com.openhis.web.reportmanage.mapper.OutboundReportMapper;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.domain.Supplier;
+import com.healthlink.his.administration.service.IPractitionerService;
+import com.healthlink.his.administration.service.ISupplierService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.DispenseStatus;
+import com.healthlink.his.common.enums.SupplyStatus;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.reportmanage.appservice.IOutboundReportAppService;
+import com.healthlink.his.web.reportmanage.dto.OutboundReportInitDto;
+import com.healthlink.his.web.reportmanage.dto.OutboundReportPageDto;
+import com.healthlink.his.web.reportmanage.dto.OutboundReportSearchParam;
+import com.healthlink.his.web.reportmanage.mapper.OutboundReportMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/PharmacySettlementReportAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/PharmacySettlementReportAppServiceImpl.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/PharmacySettlementReportAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/PharmacySettlementReportAppServiceImpl.java
index 4cba218cb..6c0fc2742 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/PharmacySettlementReportAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/PharmacySettlementReportAppServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice.impl;
+package com.healthlink.his.web.reportmanage.appservice.impl;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -18,15 +18,15 @@ import org.springframework.stereotype.Service;
 
 import com.core.common.core.domain.R;
 import com.core.common.utils.poi.ExcelUtil;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.ConditionCode;
-import com.openhis.common.enums.DispenseStatus;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.web.reportmanage.appservice.IPharmacySettlementReportAppService;
-import com.openhis.web.reportmanage.dto.PharmacySettlementMedDto;
-import com.openhis.web.reportmanage.dto.PharmacySettlementReportDto;
-import com.openhis.web.reportmanage.dto.UnitTransformationDto;
-import com.openhis.web.reportmanage.mapper.PharmacySettlementReportAppMapper;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.enums.ConditionCode;
+import com.healthlink.his.common.enums.DispenseStatus;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.web.reportmanage.appservice.IPharmacySettlementReportAppService;
+import com.healthlink.his.web.reportmanage.dto.PharmacySettlementMedDto;
+import com.healthlink.his.web.reportmanage.dto.PharmacySettlementReportDto;
+import com.healthlink.his.web.reportmanage.dto.UnitTransformationDto;
+import com.healthlink.his.web.reportmanage.mapper.PharmacySettlementReportAppMapper;
 
 /**
  * 药房结算报表 impl
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/PurchaseReturnReportAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/PurchaseReturnReportAppServiceImpl.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/PurchaseReturnReportAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/PurchaseReturnReportAppServiceImpl.java
index c505e64a3..c48f92c6b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/PurchaseReturnReportAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/PurchaseReturnReportAppServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice.impl;
+package com.healthlink.his.web.reportmanage.appservice.impl;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -12,22 +12,22 @@ import com.core.common.core.domain.R;
 import com.core.common.core.domain.entity.SysDictData;
 import com.core.common.utils.MessageUtils;
 import com.core.system.service.ISysDictTypeService;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.domain.Supplier;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.administration.service.ISupplierService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.DispenseStatus;
-import com.openhis.common.enums.SupplyStatus;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.reportmanage.appservice.PurchaseReturnReportAppService;
-import com.openhis.web.reportmanage.dto.PurchaseReturnReportInitDto;
-import com.openhis.web.reportmanage.dto.PurchaseReturnReportPageDto;
-import com.openhis.web.reportmanage.dto.PurchaseReturnReportSearchParam;
-import com.openhis.web.reportmanage.mapper.PurchaseReturnReportMapper;
-import com.openhis.web.reportmanage.utils.ExcelFillerUtil;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.domain.Supplier;
+import com.healthlink.his.administration.service.IPractitionerService;
+import com.healthlink.his.administration.service.ISupplierService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.DispenseStatus;
+import com.healthlink.his.common.enums.SupplyStatus;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.reportmanage.appservice.PurchaseReturnReportAppService;
+import com.healthlink.his.web.reportmanage.dto.PurchaseReturnReportInitDto;
+import com.healthlink.his.web.reportmanage.dto.PurchaseReturnReportPageDto;
+import com.healthlink.his.web.reportmanage.dto.PurchaseReturnReportSearchParam;
+import com.healthlink.his.web.reportmanage.mapper.PurchaseReturnReportMapper;
+import com.healthlink.his.web.reportmanage.utils.ExcelFillerUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/RegisterReportAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/RegisterReportAppServiceImpl.java
similarity index 79%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/RegisterReportAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/RegisterReportAppServiceImpl.java
index b947c8221..0d0012125 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/RegisterReportAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/RegisterReportAppServiceImpl.java
@@ -1,23 +1,23 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice.impl;
+package com.healthlink.his.web.reportmanage.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.openhis.administration.domain.Organization;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.service.IOrganizationService;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.*;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.reportmanage.appservice.IRegisterReportAppService;
-import com.openhis.web.reportmanage.dto.RegisterReportInitDto;
-import com.openhis.web.reportmanage.dto.RegisterReportPageDto;
-import com.openhis.web.reportmanage.dto.RegisterReportSearchParam;
-import com.openhis.web.reportmanage.mapper.RegisterReportMapper;
+import com.healthlink.his.administration.domain.Organization;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.service.IOrganizationService;
+import com.healthlink.his.administration.service.IPractitionerService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.enums.*;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.reportmanage.appservice.IRegisterReportAppService;
+import com.healthlink.his.web.reportmanage.dto.RegisterReportInitDto;
+import com.healthlink.his.web.reportmanage.dto.RegisterReportPageDto;
+import com.healthlink.his.web.reportmanage.dto.RegisterReportSearchParam;
+import com.healthlink.his.web.reportmanage.mapper.RegisterReportMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReportAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/ReportAppServiceImpl.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReportAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/ReportAppServiceImpl.java
index a40cc53b8..5713cd60e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReportAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/ReportAppServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice.impl;
+package com.healthlink.his.web.reportmanage.appservice.impl;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -11,17 +11,17 @@ import com.core.common.core.domain.R;
 import com.core.common.core.domain.model.LoginUser;
 import com.core.common.utils.NewExcelUtil;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.DispenseStatus;
-import com.openhis.common.enums.EncounterClass;
-import com.openhis.common.enums.ReportCodeEnum;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.financial.domain.PaymentRecStatic;
-import com.openhis.financial.service.IPaymentRecStaticService;
-import com.openhis.web.reportmanage.appservice.IReportAppService;
-import com.openhis.web.reportmanage.dto.*;
-import com.openhis.web.reportmanage.mapper.ReportMapper;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.enums.DispenseStatus;
+import com.healthlink.his.common.enums.EncounterClass;
+import com.healthlink.his.common.enums.ReportCodeEnum;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.financial.domain.PaymentRecStatic;
+import com.healthlink.his.financial.service.IPaymentRecStaticService;
+import com.healthlink.his.web.reportmanage.appservice.IReportAppService;
+import com.healthlink.his.web.reportmanage.dto.*;
+import com.healthlink.his.web.reportmanage.mapper.ReportMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReportStatisticsAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/ReportStatisticsAppServiceImpl.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReportStatisticsAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/ReportStatisticsAppServiceImpl.java
index ce2d3ed94..83f258961 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReportStatisticsAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/ReportStatisticsAppServiceImpl.java
@@ -1,19 +1,19 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice.impl;
+package com.healthlink.his.web.reportmanage.appservice.impl;
 
 import com.core.common.core.domain.R;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.common.enums.ChargeItemStatus;
-import com.openhis.common.enums.EncounterClass;
-import com.openhis.common.enums.LocationForm;
-import com.openhis.common.enums.PractitionerRoles;
-import com.openhis.common.enums.ybenums.YbMedChrgItmType;
-import com.openhis.web.reportmanage.appservice.IReportStatisticsAppService;
-import com.openhis.web.reportmanage.dto.AnnualReportStatisticsPageDto;
-import com.openhis.web.reportmanage.dto.DailyReportStatisticsPageDto;
-import com.openhis.web.reportmanage.mapper.ReportStatisticsMapper;
+import com.healthlink.his.common.enums.ChargeItemStatus;
+import com.healthlink.his.common.enums.EncounterClass;
+import com.healthlink.his.common.enums.LocationForm;
+import com.healthlink.his.common.enums.PractitionerRoles;
+import com.healthlink.his.common.enums.ybenums.YbMedChrgItmType;
+import com.healthlink.his.web.reportmanage.appservice.IReportStatisticsAppService;
+import com.healthlink.his.web.reportmanage.dto.AnnualReportStatisticsPageDto;
+import com.healthlink.his.web.reportmanage.dto.DailyReportStatisticsPageDto;
+import com.healthlink.his.web.reportmanage.mapper.ReportStatisticsMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReturnIssueReportAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/ReturnIssueReportAppServiceImpl.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReturnIssueReportAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/ReturnIssueReportAppServiceImpl.java
index 17cccf3d0..2ef50bef6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReturnIssueReportAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/ReturnIssueReportAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.reportmanage.appservice.impl;
+package com.healthlink.his.web.reportmanage.appservice.impl;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -9,22 +9,22 @@ import com.core.common.core.domain.R;
 import com.core.common.core.domain.entity.SysDictData;
 import com.core.common.utils.MessageUtils;
 import com.core.system.service.ISysDictTypeService;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.domain.Supplier;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.administration.service.ISupplierService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.DispenseStatus;
-import com.openhis.common.enums.SupplyStatus;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.reportmanage.appservice.IReturnIssueReportAppService;
-import com.openhis.web.reportmanage.dto.ReturnIssueReportInitDto;
-import com.openhis.web.reportmanage.dto.ReturnIssueReportPageDto;
-import com.openhis.web.reportmanage.dto.ReturnIssueReportSearchParam;
-import com.openhis.web.reportmanage.mapper.ReturnIssueReportMapper;
-import com.openhis.web.reportmanage.utils.ExcelFillerUtil;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.domain.Supplier;
+import com.healthlink.his.administration.service.IPractitionerService;
+import com.healthlink.his.administration.service.ISupplierService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.DispenseStatus;
+import com.healthlink.his.common.enums.SupplyStatus;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.reportmanage.appservice.IReturnIssueReportAppService;
+import com.healthlink.his.web.reportmanage.dto.ReturnIssueReportInitDto;
+import com.healthlink.his.web.reportmanage.dto.ReturnIssueReportPageDto;
+import com.healthlink.his.web.reportmanage.dto.ReturnIssueReportSearchParam;
+import com.healthlink.his.web.reportmanage.mapper.ReturnIssueReportMapper;
+import com.healthlink.his.web.reportmanage.utils.ExcelFillerUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/StocktakingReportAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/StocktakingReportAppServiceImpl.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/StocktakingReportAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/StocktakingReportAppServiceImpl.java
index 3c9726e37..e313676be 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/StocktakingReportAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/StocktakingReportAppServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice.impl;
+package com.healthlink.his.web.reportmanage.appservice.impl;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -13,18 +13,18 @@ import com.core.common.core.domain.entity.SysDictData;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.poi.ExcelUtil;
 import com.core.system.service.ISysDictTypeService;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.DispenseStatus;
-import com.openhis.common.enums.SupplyStatus;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.reportmanage.appservice.IStocktakingReportAppService;
-import com.openhis.web.reportmanage.dto.StocktakingReportPageDto;
-import com.openhis.web.reportmanage.dto.StocktakingReportSearchParam;
-import com.openhis.web.reportmanage.mapper.StocktakingReportMapper;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.service.IPractitionerService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.DispenseStatus;
+import com.healthlink.his.common.enums.SupplyStatus;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.reportmanage.appservice.IStocktakingReportAppService;
+import com.healthlink.his.web.reportmanage.dto.StocktakingReportPageDto;
+import com.healthlink.his.web.reportmanage.dto.StocktakingReportSearchParam;
+import com.healthlink.his.web.reportmanage.mapper.StocktakingReportMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/TransferReportAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/TransferReportAppServiceImpl.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/TransferReportAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/TransferReportAppServiceImpl.java
index 574def805..c88c86e3d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/TransferReportAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/TransferReportAppServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.appservice.impl;
+package com.healthlink.his.web.reportmanage.appservice.impl;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -13,19 +13,19 @@ import com.core.common.core.domain.entity.SysDictData;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.poi.ExcelUtil;
 import com.core.system.service.ISysDictTypeService;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.DispenseStatus;
-import com.openhis.common.enums.SupplyStatus;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.reportmanage.appservice.ITransferReportAppService;
-import com.openhis.web.reportmanage.dto.TransferReportPageDto;
-import com.openhis.web.reportmanage.dto.TransferReportSearchParam;
-import com.openhis.web.reportmanage.mapper.TransferReportMapper;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.service.IPractitionerService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.enums.DispenseStatus;
+import com.healthlink.his.common.enums.SupplyStatus;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.reportmanage.appservice.ITransferReportAppService;
+import com.healthlink.his.web.reportmanage.dto.TransferReportPageDto;
+import com.healthlink.his.web.reportmanage.dto.TransferReportSearchParam;
+import com.healthlink.his.web.reportmanage.mapper.TransferReportMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/AmbAdviceStatisticsAppController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/AmbAdviceStatisticsAppController.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/AmbAdviceStatisticsAppController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/AmbAdviceStatisticsAppController.java
index 2c551a489..eca1a5cda 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/AmbAdviceStatisticsAppController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/AmbAdviceStatisticsAppController.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.controller;
+package com.healthlink.his.web.reportmanage.controller;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.appservice.IAmbAdviceStatisticsAppService;
+import com.healthlink.his.web.reportmanage.appservice.IAmbAdviceStatisticsAppService;
 
 import lombok.extern.slf4j.Slf4j;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ChargeReportController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/ChargeReportController.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ChargeReportController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/ChargeReportController.java
index 1c5f8d110..8aeda08ef 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ChargeReportController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/ChargeReportController.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.controller;
+package com.healthlink.his.web.reportmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.appservice.IChargeReportAppService;
-import com.openhis.web.reportmanage.dto.ChargeReportSearchParam;
+import com.healthlink.his.web.reportmanage.appservice.IChargeReportAppService;
+import com.healthlink.his.web.reportmanage.dto.ChargeReportSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/DepartmentRevenueStatisticsController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/DepartmentRevenueStatisticsController.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/DepartmentRevenueStatisticsController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/DepartmentRevenueStatisticsController.java
index b40ebb703..2ef0214d8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/DepartmentRevenueStatisticsController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/DepartmentRevenueStatisticsController.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.controller;
+package com.healthlink.his.web.reportmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.appservice.IDepartmentRevenueStatisticsAppService;
+import com.healthlink.his.web.reportmanage.appservice.IDepartmentRevenueStatisticsAppService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/DrugDosageSettlementController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/DrugDosageSettlementController.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/DrugDosageSettlementController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/DrugDosageSettlementController.java
index f06905219..0c8a44097 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/DrugDosageSettlementController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/DrugDosageSettlementController.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.controller;
+package com.healthlink.his.web.reportmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.appservice.IDrugDosageSettlementAppService;
-import com.openhis.web.reportmanage.dto.DrugDosageSettlementSearchParam;
+import com.healthlink.his.web.reportmanage.appservice.IDrugDosageSettlementAppService;
+import com.healthlink.his.web.reportmanage.dto.DrugDosageSettlementSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InboundReportController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/InboundReportController.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InboundReportController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/InboundReportController.java
index b7d02a257..461ef7cb2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InboundReportController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/InboundReportController.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.controller;
+package com.healthlink.his.web.reportmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.appservice.IInboundReportAppService;
-import com.openhis.web.reportmanage.dto.InboundReportSearchParam;
+import com.healthlink.his.web.reportmanage.appservice.IInboundReportAppService;
+import com.healthlink.his.web.reportmanage.dto.InboundReportSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InpatientMedicalRecordHomePageCollectionController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/InpatientMedicalRecordHomePageCollectionController.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InpatientMedicalRecordHomePageCollectionController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/InpatientMedicalRecordHomePageCollectionController.java
index e834065ca..6ab2dd80a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InpatientMedicalRecordHomePageCollectionController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/InpatientMedicalRecordHomePageCollectionController.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.controller;
+package com.healthlink.his.web.reportmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.appservice.InpatientMedicalRecordHomePageCollectionAppService;
+import com.healthlink.his.web.reportmanage.appservice.InpatientMedicalRecordHomePageCollectionAppService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InventoryProductReportController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/InventoryProductReportController.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InventoryProductReportController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/InventoryProductReportController.java
index df644ff50..2a5c46b6b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InventoryProductReportController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/InventoryProductReportController.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.controller;
+package com.healthlink.his.web.reportmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.appservice.IInventoryProductReportAppService;
-import com.openhis.web.reportmanage.dto.InventoryProductReportSearchParam;
+import com.healthlink.his.web.reportmanage.appservice.IInventoryProductReportAppService;
+import com.healthlink.his.web.reportmanage.dto.InventoryProductReportSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/LossReportController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/LossReportController.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/LossReportController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/LossReportController.java
index 0a47e8c17..0c137c593 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/LossReportController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/LossReportController.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.controller;
+package com.healthlink.his.web.reportmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.appservice.ILossReportAppService;
-import com.openhis.web.reportmanage.dto.LossReportSearchParam;
+import com.healthlink.his.web.reportmanage.appservice.ILossReportAppService;
+import com.healthlink.his.web.reportmanage.dto.LossReportSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MedicationDeviceReportController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/MedicationDeviceReportController.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MedicationDeviceReportController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/MedicationDeviceReportController.java
index a02b283ff..6c1d6515b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MedicationDeviceReportController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/MedicationDeviceReportController.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.controller;
+package com.healthlink.his.web.reportmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.appservice.IMedicationDeviceReportAppService;
+import com.healthlink.his.web.reportmanage.appservice.IMedicationDeviceReportAppService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MedicationInboundReportController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/MedicationInboundReportController.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MedicationInboundReportController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/MedicationInboundReportController.java
index 56348f0e1..877d77973 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MedicationInboundReportController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/MedicationInboundReportController.java
@@ -1,7 +1,7 @@
-package com.openhis.web.reportmanage.controller;
+package com.healthlink.his.web.reportmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.appservice.IMedicationInboundReportAppService;
+import com.healthlink.his.web.reportmanage.appservice.IMedicationInboundReportAppService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MonthlySettlementController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/MonthlySettlementController.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MonthlySettlementController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/MonthlySettlementController.java
index ca802b7ae..293e88de2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MonthlySettlementController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/MonthlySettlementController.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.controller;
+package com.healthlink.his.web.reportmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.appservice.IMonthlySettlementReportAppService;
+import com.healthlink.his.web.reportmanage.appservice.IMonthlySettlementReportAppService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/OutboundReportController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/OutboundReportController.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/OutboundReportController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/OutboundReportController.java
index be924974d..2a2afbf52 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/OutboundReportController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/OutboundReportController.java
@@ -1,8 +1,8 @@
-package com.openhis.web.reportmanage.controller;
+package com.healthlink.his.web.reportmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.appservice.IOutboundReportAppService;
-import com.openhis.web.reportmanage.dto.OutboundReportSearchParam;
+import com.healthlink.his.web.reportmanage.appservice.IOutboundReportAppService;
+import com.healthlink.his.web.reportmanage.dto.OutboundReportSearchParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PharmacySettlementReportAppController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/PharmacySettlementReportAppController.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PharmacySettlementReportAppController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/PharmacySettlementReportAppController.java
index 713a077bb..33d111d0b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PharmacySettlementReportAppController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/PharmacySettlementReportAppController.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.controller;
+package com.healthlink.his.web.reportmanage.controller;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.appservice.IPharmacySettlementReportAppService;
+import com.healthlink.his.web.reportmanage.appservice.IPharmacySettlementReportAppService;
 
 import lombok.extern.slf4j.Slf4j;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PrintReportController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/PrintReportController.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PrintReportController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/PrintReportController.java
index 1a50e682b..35c61125b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PrintReportController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/PrintReportController.java
@@ -1,7 +1,7 @@
-package com.openhis.web.reportmanage.controller;
+package com.healthlink.his.web.reportmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.appservice.IPrintReportAppService;
+import com.healthlink.his.web.reportmanage.appservice.IPrintReportAppService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PurchaseReturnReportController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/PurchaseReturnReportController.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PurchaseReturnReportController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/PurchaseReturnReportController.java
index 769fb2ce1..9b8ab0f73 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PurchaseReturnReportController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/PurchaseReturnReportController.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.controller;
+package com.healthlink.his.web.reportmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.appservice.PurchaseReturnReportAppService;
-import com.openhis.web.reportmanage.dto.PurchaseReturnReportSearchParam;
+import com.healthlink.his.web.reportmanage.appservice.PurchaseReturnReportAppService;
+import com.healthlink.his.web.reportmanage.dto.PurchaseReturnReportSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/RegisterReportController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/RegisterReportController.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/RegisterReportController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/RegisterReportController.java
index ad1cbbb28..58d7124c9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/RegisterReportController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/RegisterReportController.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.controller;
+package com.healthlink.his.web.reportmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.appservice.IRegisterReportAppService;
-import com.openhis.web.reportmanage.dto.RegisterReportSearchParam;
+import com.healthlink.his.web.reportmanage.appservice.IRegisterReportAppService;
+import com.healthlink.his.web.reportmanage.dto.RegisterReportSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReportController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/ReportController.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReportController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/ReportController.java
index a96a5607e..72d8a7460 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReportController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/ReportController.java
@@ -1,14 +1,14 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.controller;
+package com.healthlink.his.web.reportmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.appservice.IReportAppService;
-import com.openhis.web.reportmanage.dto.ReportDetailsSearchParam;
-import com.openhis.web.reportmanage.dto.ReportPatientDetailsSearchParam;
-import com.openhis.web.reportmanage.dto.ReportPatientMasterDetailsSearchParam;
-import com.openhis.web.reportmanage.dto.ReportPhysicianWorkloadSearchParam;
+import com.healthlink.his.web.reportmanage.appservice.IReportAppService;
+import com.healthlink.his.web.reportmanage.dto.ReportDetailsSearchParam;
+import com.healthlink.his.web.reportmanage.dto.ReportPatientDetailsSearchParam;
+import com.healthlink.his.web.reportmanage.dto.ReportPatientMasterDetailsSearchParam;
+import com.healthlink.his.web.reportmanage.dto.ReportPhysicianWorkloadSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReportStatisticsController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/ReportStatisticsController.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReportStatisticsController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/ReportStatisticsController.java
index 4635f3ca8..27cbb297d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReportStatisticsController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/ReportStatisticsController.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.controller;
+package com.healthlink.his.web.reportmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.appservice.IReportStatisticsAppService;
+import com.healthlink.his.web.reportmanage.appservice.IReportStatisticsAppService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReturnIssueReportController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/ReturnIssueReportController.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReturnIssueReportController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/ReturnIssueReportController.java
index 2fcbbbd51..9a3093c5a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReturnIssueReportController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/ReturnIssueReportController.java
@@ -1,8 +1,8 @@
-package com.openhis.web.reportmanage.controller;
+package com.healthlink.his.web.reportmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.appservice.IReturnIssueReportAppService;
-import com.openhis.web.reportmanage.dto.ReturnIssueReportSearchParam;
+import com.healthlink.his.web.reportmanage.appservice.IReturnIssueReportAppService;
+import com.healthlink.his.web.reportmanage.dto.ReturnIssueReportSearchParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/StocktakingReportController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/StocktakingReportController.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/StocktakingReportController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/StocktakingReportController.java
index 8f70aa40c..50382f53e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/StocktakingReportController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/StocktakingReportController.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.controller;
+package com.healthlink.his.web.reportmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.appservice.IStocktakingReportAppService;
-import com.openhis.web.reportmanage.dto.StocktakingReportSearchParam;
+import com.healthlink.his.web.reportmanage.appservice.IStocktakingReportAppService;
+import com.healthlink.his.web.reportmanage.dto.StocktakingReportSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/TransferReportController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/TransferReportController.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/TransferReportController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/TransferReportController.java
index 17a7e0c41..4bf6fb89c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/TransferReportController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/controller/TransferReportController.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.controller;
+package com.healthlink.his.web.reportmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.reportmanage.appservice.ITransferReportAppService;
-import com.openhis.web.reportmanage.dto.TransferReportSearchParam;
+import com.healthlink.his.web.reportmanage.appservice.ITransferReportAppService;
+import com.healthlink.his.web.reportmanage.dto.TransferReportSearchParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/AmbActAdviceStatisticsDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/AmbActAdviceStatisticsDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/AmbActAdviceStatisticsDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/AmbActAdviceStatisticsDto.java
index 0d6d912de..1b4e6bb01 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/AmbActAdviceStatisticsDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/AmbActAdviceStatisticsDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 import java.util.Date;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/AmbMedAdviceStatisticsDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/AmbMedAdviceStatisticsDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/AmbMedAdviceStatisticsDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/AmbMedAdviceStatisticsDto.java
index a72af7e01..ff6ca9de1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/AmbMedAdviceStatisticsDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/AmbMedAdviceStatisticsDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 import java.util.Date;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/AmountNumberDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/AmountNumberDto.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/AmountNumberDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/AmountNumberDto.java
index aab341ceb..d200ce8a1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/AmountNumberDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/AmountNumberDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/AnnualReportStatisticsPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/AnnualReportStatisticsPageDto.java
similarity index 99%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/AnnualReportStatisticsPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/AnnualReportStatisticsPageDto.java
index 87f1ccafd..43313d48b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/AnnualReportStatisticsPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/AnnualReportStatisticsPageDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/BottleLabelDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/BottleLabelDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/BottleLabelDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/BottleLabelDto.java
index db19157fa..fd069fefe 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/BottleLabelDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/BottleLabelDto.java
@@ -1,10 +1,10 @@
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ChargeReportDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ChargeReportDto.java
index 48521166c..6a6ece0a1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ChargeReportDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ChargeReportInitDto.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ChargeReportInitDto.java
index cc497f86b..daca6e3d3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ChargeReportInitDto.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.web.doctorstation.dto.ElepPrescriptionInitDto;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.web.doctorstation.dto.ElepPrescriptionInitDto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ChargeReportPageDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ChargeReportPageDto.java
index 07970a1e5..f315f1427 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ChargeReportPageDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -9,7 +9,7 @@ import java.util.Date;
 import com.core.common.annotation.Excel;
 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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ChargeReportSearchParam.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ChargeReportSearchParam.java
index 9e95d2240..f2cbf8cb8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ChargeReportSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/CkInspAppDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/CkInspAppDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/CkInspAppDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/CkInspAppDto.java
index b0145aabe..28639ab4e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/CkInspAppDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/CkInspAppDto.java
@@ -1,7 +1,7 @@
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DailyReportStatisticsPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/DailyReportStatisticsPageDto.java
similarity index 99%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DailyReportStatisticsPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/DailyReportStatisticsPageDto.java
index 5f70e7fe6..1c9ecc919 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DailyReportStatisticsPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/DailyReportStatisticsPageDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DepartmentRevenueStatisticsPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/DepartmentRevenueStatisticsPageDto.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DepartmentRevenueStatisticsPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/DepartmentRevenueStatisticsPageDto.java
index 0a61f1a40..f08a660eb 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DepartmentRevenueStatisticsPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/DepartmentRevenueStatisticsPageDto.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DisposalDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/DisposalDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DisposalDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/DisposalDto.java
index 2f92c480b..200cc8c36 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DisposalDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/DisposalDto.java
@@ -1,7 +1,7 @@
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DrugDosageSettlementPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/DrugDosageSettlementPageDto.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DrugDosageSettlementPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/DrugDosageSettlementPageDto.java
index 765934860..15d6c7e3e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DrugDosageSettlementPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/DrugDosageSettlementPageDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DrugDosageSettlementSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/DrugDosageSettlementSearchParam.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DrugDosageSettlementSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/DrugDosageSettlementSearchParam.java
index 0e5991adc..fe583c8f4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DrugDosageSettlementSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/DrugDosageSettlementSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.util.Date;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/InboundReportInitDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/InboundReportInitDto.java
index 6d7faa382..32f10aff0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/InboundReportInitDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/InboundReportPageDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/InboundReportPageDto.java
index 8ef3af9c5..2e2d738a1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/InboundReportPageDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -13,7 +13,7 @@ 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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/InboundReportSearchParam.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/InboundReportSearchParam.java
index fccb9b39f..44195a9f3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/InboundReportSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.util.Date;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InpatientMedicalRecordHomePageCollectionDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/InpatientMedicalRecordHomePageCollectionDto.java
similarity index 99%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InpatientMedicalRecordHomePageCollectionDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/InpatientMedicalRecordHomePageCollectionDto.java
index 4fa52beee..64ba9252e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InpatientMedicalRecordHomePageCollectionDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/InpatientMedicalRecordHomePageCollectionDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 
 import java.util.Date;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InpatientMedicalRecordHomePageMakeDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/InpatientMedicalRecordHomePageMakeDto.java
similarity index 99%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InpatientMedicalRecordHomePageMakeDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/InpatientMedicalRecordHomePageMakeDto.java
index 2a8f6bcdc..7833a6cda 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InpatientMedicalRecordHomePageMakeDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/InpatientMedicalRecordHomePageMakeDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 import java.util.Date;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/InventoryProductReportPageDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/InventoryProductReportPageDto.java
index db6073fb9..edbef9399 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/InventoryProductReportPageDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/InventoryProductReportSearchParam.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/InventoryProductReportSearchParam.java
index 28241b3b6..0dcdc9546 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/InventoryProductReportSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.util.Date;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/LossReportPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/LossReportPageDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/LossReportPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/LossReportPageDto.java
index 40a1ab822..fcfd6e9a9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/LossReportPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/LossReportPageDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -10,7 +10,7 @@ import com.core.common.annotation.Excel;
 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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/LossReportSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/LossReportSearchParam.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/LossReportSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/LossReportSearchParam.java
index 53843b61c..17814bcc2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/LossReportSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/LossReportSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.util.Date;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MedDevUseReportDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/MedDevUseReportDto.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MedDevUseReportDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/MedDevUseReportDto.java
index 61ae4cca8..e3c162dd4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MedDevUseReportDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/MedDevUseReportDto.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 
 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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MedUseReportInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/MedUseReportInfoDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MedUseReportInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/MedUseReportInfoDto.java
index 8fd4a9122..0d77c42ce 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MedUseReportInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/MedUseReportInfoDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -9,7 +9,7 @@ import java.util.Date;
 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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MedicationInboundReportDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/MedicationInboundReportDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MedicationInboundReportDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/MedicationInboundReportDto.java
index 93cf3c665..82454bb56 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MedicationInboundReportDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/MedicationInboundReportDto.java
@@ -1,7 +1,7 @@
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MedicationUsageParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/MedicationUsageParam.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MedicationUsageParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/MedicationUsageParam.java
index c69c78476..9ae2d7bf0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MedicationUsageParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/MedicationUsageParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MonthlySettlementDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/MonthlySettlementDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MonthlySettlementDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/MonthlySettlementDto.java
index 8a1e2b67e..9c0aee7d1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MonthlySettlementDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/MonthlySettlementDto.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 
 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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MonthlySettlementInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/MonthlySettlementInitDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MonthlySettlementInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/MonthlySettlementInitDto.java
index 473ef3abd..f999ef0e8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MonthlySettlementInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/MonthlySettlementInitDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/OutboundReportInitDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/OutboundReportInitDto.java
index 52d46772d..9e92eea65 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/OutboundReportInitDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/OutboundReportPageDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/OutboundReportPageDto.java
index dcf104350..f7e7a7fdd 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/OutboundReportPageDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -6,7 +6,7 @@ import com.core.common.annotation.Excel;
 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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/OutboundReportSearchParam.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/OutboundReportSearchParam.java
index 3b1928ea1..9309a4646 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/OutboundReportSearchParam.java
@@ -1,8 +1,8 @@
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutpatientBillingDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/OutpatientBillingDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutpatientBillingDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/OutpatientBillingDto.java
index d97fc5ce1..a6994316d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutpatientBillingDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/OutpatientBillingDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutpatientManageParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/OutpatientManageParam.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutpatientManageParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/OutpatientManageParam.java
index 80af9c309..54f6ab0a9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutpatientManageParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/OutpatientManageParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutpatientSettlementDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/OutpatientSettlementDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutpatientSettlementDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/OutpatientSettlementDto.java
index 8dba0f07f..a495c41c5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutpatientSettlementDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/OutpatientSettlementDto.java
@@ -1,6 +1,6 @@
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PharmacySettlementMedDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/PharmacySettlementMedDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PharmacySettlementMedDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/PharmacySettlementMedDto.java
index a2e50b80c..b72a9f48d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PharmacySettlementMedDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/PharmacySettlementMedDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PharmacySettlementReportDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/PharmacySettlementReportDto.java
similarity index 99%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PharmacySettlementReportDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/PharmacySettlementReportDto.java
index 273f768d3..b7365e4ba 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PharmacySettlementReportDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/PharmacySettlementReportDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PrescriptionPrintDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/PrescriptionPrintDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PrescriptionPrintDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/PrescriptionPrintDto.java
index de2584e51..585aba8f3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PrescriptionPrintDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/PrescriptionPrintDto.java
@@ -1,11 +1,11 @@
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/PurchaseReturnReportInitDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/PurchaseReturnReportInitDto.java
index 0cac4d83e..4f23a9c9c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/PurchaseReturnReportInitDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/PurchaseReturnReportPageDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/PurchaseReturnReportPageDto.java
index 94a22feea..43e4f4f5b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/PurchaseReturnReportPageDto.java
@@ -1,14 +1,14 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
 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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/PurchaseReturnReportSearchParam.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/PurchaseReturnReportSearchParam.java
index 3e2b1941e..983cace2c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/PurchaseReturnReportSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.util.Date;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/RegisterReportInitDto.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/RegisterReportInitDto.java
index 9b8f51c7a..9fbd4f092 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/RegisterReportInitDto.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.util.List;
 
-import com.openhis.administration.domain.Practitioner;
+import com.healthlink.his.administration.domain.Practitioner;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/RegisterReportPageDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/RegisterReportPageDto.java
index 9f653bd6b..a94e8233e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/RegisterReportPageDto.java
@@ -1,14 +1,14 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/RegisterReportSearchParam.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/RegisterReportSearchParam.java
index 6b8179b7b..9e9cf1dfb 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/RegisterReportSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportBasicInformationDetailsDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportBasicInformationDetailsDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportBasicInformationDetailsDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportBasicInformationDetailsDto.java
index 255f65361..6dd012e6c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportBasicInformationDetailsDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportBasicInformationDetailsDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportDetailsSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportDetailsSearchParam.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportDetailsSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportDetailsSearchParam.java
index 43cb8eda8..df0f15a4e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportDetailsSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportDetailsSearchParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportDiseaseDetailsDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportDiseaseDetailsDto.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportDiseaseDetailsDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportDiseaseDetailsDto.java
index b4a743e7b..b917e62e9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportDiseaseDetailsDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportDiseaseDetailsDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -11,7 +11,7 @@ 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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportDrugCostGrowthDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportDrugCostGrowthDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportDrugCostGrowthDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportDrugCostGrowthDto.java
index 97b3e0cff..067a68c13 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportDrugCostGrowthDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportDrugCostGrowthDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationInboundDetailsDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportMedicationInboundDetailsDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationInboundDetailsDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportMedicationInboundDetailsDto.java
index 16d010633..c33396ad1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationInboundDetailsDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportMedicationInboundDetailsDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationSaleDetailsDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportMedicationSaleDetailsDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationSaleDetailsDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportMedicationSaleDetailsDto.java
index 088247faa..09b875bfc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationSaleDetailsDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportMedicationSaleDetailsDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -11,7 +11,7 @@ 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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationStockOutDetailsDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportMedicationStockOutDetailsDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationStockOutDetailsDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportMedicationStockOutDetailsDto.java
index 307cdf3df..68b2bb5d3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationStockOutDetailsDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportMedicationStockOutDetailsDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationUsageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportMedicationUsageDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationUsageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportMedicationUsageDto.java
index dda05398f..df2205977 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationUsageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportMedicationUsageDto.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 
 import com.core.common.annotation.Excel;
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportNonWinQtyRatioDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportNonWinQtyRatioDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportNonWinQtyRatioDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportNonWinQtyRatioDto.java
index 17c47bebf..ae69d11f3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportNonWinQtyRatioDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportNonWinQtyRatioDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportOfflinePurchaseRatioDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportOfflinePurchaseRatioDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportOfflinePurchaseRatioDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportOfflinePurchaseRatioDto.java
index ae3bca5eb..645cf1154 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportOfflinePurchaseRatioDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportOfflinePurchaseRatioDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 import java.util.Date;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportOutpatientMetricsDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportOutpatientMetricsDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportOutpatientMetricsDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportOutpatientMetricsDto.java
index be78b70fb..9be720590 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportOutpatientMetricsDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportOutpatientMetricsDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientDetailsDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportPatientDetailsDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientDetailsDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportPatientDetailsDto.java
index fbf2c3a92..771eea922 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientDetailsDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportPatientDetailsDto.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 
 import com.core.common.annotation.Excel;
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientDetailsSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportPatientDetailsSearchParam.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientDetailsSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportPatientDetailsSearchParam.java
index 7f38e46b9..8ed4356eb 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientDetailsSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportPatientDetailsSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientMasterDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportPatientMasterDetailDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientMasterDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportPatientMasterDetailDto.java
index 8807e9a98..39cfb9a09 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientMasterDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportPatientMasterDetailDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 import java.util.Date;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientMasterDetailsSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportPatientMasterDetailsSearchParam.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientMasterDetailsSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportPatientMasterDetailsSearchParam.java
index fdcbdf06c..41d02bcfd 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientMasterDetailsSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportPatientMasterDetailsSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPhysicianWorkloadInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportPhysicianWorkloadInitDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPhysicianWorkloadInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportPhysicianWorkloadInitDto.java
index dc38650d3..940d1af85 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPhysicianWorkloadInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportPhysicianWorkloadInitDto.java
@@ -1,9 +1,9 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
-import com.openhis.administration.domain.Practitioner;
+import com.healthlink.his.administration.domain.Practitioner;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPhysicianWorkloadPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportPhysicianWorkloadPageDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPhysicianWorkloadPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportPhysicianWorkloadPageDto.java
index ba204d562..225bbd455 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPhysicianWorkloadPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportPhysicianWorkloadPageDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPhysicianWorkloadSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportPhysicianWorkloadSearchParam.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPhysicianWorkloadSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportPhysicianWorkloadSearchParam.java
index 4a118edb0..c54c28119 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPhysicianWorkloadSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportPhysicianWorkloadSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportProductUsageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportProductUsageDto.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportProductUsageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportProductUsageDto.java
index 7e963c845..59207a443 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportProductUsageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportProductUsageDto.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportStockOutDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportStockOutDetailDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportStockOutDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportStockOutDetailDto.java
index 8a425f8e2..15c1bcaa1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportStockOutDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportStockOutDetailDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -11,7 +11,7 @@ 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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportThirtyDayCollectionRateDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportThirtyDayCollectionRateDto.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportThirtyDayCollectionRateDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportThirtyDayCollectionRateDto.java
index 648b26019..bee1e5cd9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportThirtyDayCollectionRateDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReportThirtyDayCollectionRateDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportInitDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReturnIssueReportInitDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportInitDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReturnIssueReportInitDto.java
index 569bbbd1c..53e15591b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportInitDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReturnIssueReportInitDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReturnIssueReportPageDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReturnIssueReportPageDto.java
index fdef558f2..d58097361 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReturnIssueReportPageDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -6,7 +6,7 @@ import java.util.Date;
 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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReturnIssueReportSearchParam.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReturnIssueReportSearchParam.java
index 128e8dd8b..1f543b830 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ReturnIssueReportSearchParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.util.Date;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/StocktakingReportPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/StocktakingReportPageDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/StocktakingReportPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/StocktakingReportPageDto.java
index 862d2d7a1..f5ed60b3e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/StocktakingReportPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/StocktakingReportPageDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -12,7 +12,7 @@ import com.core.common.annotation.Excel;
 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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/StocktakingReportSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/StocktakingReportSearchParam.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/StocktakingReportSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/StocktakingReportSearchParam.java
index f56d8d144..3135e5dc5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/StocktakingReportSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/StocktakingReportSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.util.Date;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/TransferReportPageDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/TransferReportPageDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/TransferReportPageDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/TransferReportPageDto.java
index e64e70f17..0e61d74b8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/TransferReportPageDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/TransferReportPageDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.core.common.annotation.Excel;
 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;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/TransferReportSearchParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/TransferReportSearchParam.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/TransferReportSearchParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/TransferReportSearchParam.java
index a09891577..3ebea90a7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/TransferReportSearchParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/TransferReportSearchParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.util.Date;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/UnitTransformationDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/UnitTransformationDto.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/UnitTransformationDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/UnitTransformationDto.java
index 6ce217b12..98caedc46 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/UnitTransformationDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/UnitTransformationDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/WorkloadQueryParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/WorkloadQueryParam.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/WorkloadQueryParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/WorkloadQueryParam.java
index a71e4c2a0..2af7b133f 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/WorkloadQueryParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/WorkloadQueryParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ZyCostDetailDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ZyCostDetailDto.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ZyCostDetailDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ZyCostDetailDto.java
index 995c2aff8..3972297cb 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ZyCostDetailDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ZyCostDetailDto.java
@@ -1,9 +1,9 @@
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.util.List;
 
 import com.core.common.annotation.Excel;
-import com.openhis.web.paymentmanage.dto.ChargeItemDto;
+import com.healthlink.his.web.paymentmanage.dto.ChargeItemDto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ZyCostDetailParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ZyCostDetailParam.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ZyCostDetailParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ZyCostDetailParam.java
index ec911c910..0f2b80737 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ZyCostDetailParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/ZyCostDetailParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/workloadReportDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/workloadReportDto.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/workloadReportDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/workloadReportDto.java
index 17934d68b..83a0d19c6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/workloadReportDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/dto/workloadReportDto.java
@@ -1,8 +1,8 @@
-package com.openhis.web.reportmanage.dto;
+package com.healthlink.his.web.reportmanage.dto;
 
 import java.math.BigDecimal;
 
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/AmbAdviceStatisticsAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/AmbAdviceStatisticsAppMapper.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/AmbAdviceStatisticsAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/AmbAdviceStatisticsAppMapper.java
index bed77bc84..1ca01ef10 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/AmbAdviceStatisticsAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/AmbAdviceStatisticsAppMapper.java
@@ -1,15 +1,15 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.mapper;
+package com.healthlink.his.web.reportmanage.mapper;
 
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
-import com.openhis.web.reportmanage.dto.AmbActAdviceStatisticsDto;
-import com.openhis.web.reportmanage.dto.AmbMedAdviceStatisticsDto;
+import com.healthlink.his.web.reportmanage.dto.AmbActAdviceStatisticsDto;
+import com.healthlink.his.web.reportmanage.dto.AmbMedAdviceStatisticsDto;
 
 /**
  * 门诊医嘱统计 mapper
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ChargeReportMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/ChargeReportMapper.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ChargeReportMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/ChargeReportMapper.java
index 666d87f49..e2dfa890c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ChargeReportMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/ChargeReportMapper.java
@@ -1,14 +1,14 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.mapper;
+package com.healthlink.his.web.reportmanage.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.reportmanage.dto.ChargeReportPageDto;
-import com.openhis.web.reportmanage.dto.ChargeReportSearchParam;
-import com.openhis.web.reportmanage.dto.workloadReportDto;
+import com.healthlink.his.web.reportmanage.dto.ChargeReportPageDto;
+import com.healthlink.his.web.reportmanage.dto.ChargeReportSearchParam;
+import com.healthlink.his.web.reportmanage.dto.workloadReportDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/DepartmentRevenueStatisticsMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/DepartmentRevenueStatisticsMapper.java
similarity index 79%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/DepartmentRevenueStatisticsMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/DepartmentRevenueStatisticsMapper.java
index 7db8f8270..6402b6a70 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/DepartmentRevenueStatisticsMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/DepartmentRevenueStatisticsMapper.java
@@ -1,14 +1,14 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.mapper;
+package com.healthlink.his.web.reportmanage.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.reportmanage.dto.DepartmentRevenueStatisticsPageDto;
-import com.openhis.web.reportmanage.dto.DrugDosageSettlementPageDto;
-import com.openhis.web.reportmanage.dto.DrugDosageSettlementSearchParam;
+import com.healthlink.his.web.reportmanage.dto.DepartmentRevenueStatisticsPageDto;
+import com.healthlink.his.web.reportmanage.dto.DrugDosageSettlementPageDto;
+import com.healthlink.his.web.reportmanage.dto.DrugDosageSettlementSearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/DrugDosageSettlementMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/DrugDosageSettlementMapper.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/DrugDosageSettlementMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/DrugDosageSettlementMapper.java
index c79429713..da1f7c9ed 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/DrugDosageSettlementMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/DrugDosageSettlementMapper.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.mapper;
+package com.healthlink.his.web.reportmanage.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.reportmanage.dto.DrugDosageSettlementPageDto;
-import com.openhis.web.reportmanage.dto.DrugDosageSettlementSearchParam;
+import com.healthlink.his.web.reportmanage.dto.DrugDosageSettlementPageDto;
+import com.healthlink.his.web.reportmanage.dto.DrugDosageSettlementSearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InboundReportMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/InboundReportMapper.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InboundReportMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/InboundReportMapper.java
index f59c5cd6f..52ed86884 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InboundReportMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/InboundReportMapper.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.mapper;
+package com.healthlink.his.web.reportmanage.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.reportmanage.dto.InboundReportPageDto;
-import com.openhis.web.reportmanage.dto.InboundReportSearchParam;
+import com.healthlink.his.web.reportmanage.dto.InboundReportPageDto;
+import com.healthlink.his.web.reportmanage.dto.InboundReportSearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InpatientMedicalRecordHomePageCollectionMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/InpatientMedicalRecordHomePageCollectionMapper.java
similarity index 81%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InpatientMedicalRecordHomePageCollectionMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/InpatientMedicalRecordHomePageCollectionMapper.java
index 611a45b89..18f9b85e7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InpatientMedicalRecordHomePageCollectionMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/InpatientMedicalRecordHomePageCollectionMapper.java
@@ -1,9 +1,9 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.mapper;
+package com.healthlink.his.web.reportmanage.mapper;
 
-import com.openhis.web.reportmanage.dto.InpatientMedicalRecordHomePageMakeDto;
+import com.healthlink.his.web.reportmanage.dto.InpatientMedicalRecordHomePageMakeDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InventoryProductReportMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/InventoryProductReportMapper.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InventoryProductReportMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/InventoryProductReportMapper.java
index 1057a9fa4..117928e09 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InventoryProductReportMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/InventoryProductReportMapper.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.mapper;
+package com.healthlink.his.web.reportmanage.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.reportmanage.dto.InventoryProductReportPageDto;
-import com.openhis.web.reportmanage.dto.InventoryProductReportSearchParam;
+import com.healthlink.his.web.reportmanage.dto.InventoryProductReportPageDto;
+import com.healthlink.his.web.reportmanage.dto.InventoryProductReportSearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/LossReportMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/LossReportMapper.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/LossReportMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/LossReportMapper.java
index 192e4b8fe..db5eb585b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/LossReportMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/LossReportMapper.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.mapper;
+package com.healthlink.his.web.reportmanage.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.reportmanage.dto.LossReportPageDto;
-import com.openhis.web.reportmanage.dto.LossReportSearchParam;
+import com.healthlink.his.web.reportmanage.dto.LossReportPageDto;
+import com.healthlink.his.web.reportmanage.dto.LossReportSearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/MedicationDeviceReportMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/MedicationDeviceReportMapper.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/MedicationDeviceReportMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/MedicationDeviceReportMapper.java
index 26f9c84ba..530a17072 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/MedicationDeviceReportMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/MedicationDeviceReportMapper.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.mapper;
+package com.healthlink.his.web.reportmanage.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.openhis.web.reportmanage.dto.MedDevUseReportDto;
-import com.openhis.web.reportmanage.dto.MedUseReportInfoDto;
+import com.healthlink.his.web.reportmanage.dto.MedDevUseReportDto;
+import com.healthlink.his.web.reportmanage.dto.MedUseReportInfoDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/MedicationInboundReportMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/MedicationInboundReportMapper.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/MedicationInboundReportMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/MedicationInboundReportMapper.java
index e0e6850a5..15dc9e7e1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/MedicationInboundReportMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/MedicationInboundReportMapper.java
@@ -1,9 +1,9 @@
-package com.openhis.web.reportmanage.mapper;
+package com.healthlink.his.web.reportmanage.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.reportmanage.dto.MedicationInboundReportDto;
+import com.healthlink.his.web.reportmanage.dto.MedicationInboundReportDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/MonthlySettlementReportMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/MonthlySettlementReportMapper.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/MonthlySettlementReportMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/MonthlySettlementReportMapper.java
index 9f45b00fb..e94f43d3a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/MonthlySettlementReportMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/MonthlySettlementReportMapper.java
@@ -1,9 +1,9 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.mapper;
+package com.healthlink.his.web.reportmanage.mapper;
 
-import com.openhis.web.reportmanage.dto.AmountNumberDto;
+import com.healthlink.his.web.reportmanage.dto.AmountNumberDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/OutboundReportMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/OutboundReportMapper.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/OutboundReportMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/OutboundReportMapper.java
index c2857acda..d585b482b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/OutboundReportMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/OutboundReportMapper.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.mapper;
+package com.healthlink.his.web.reportmanage.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.reportmanage.dto.OutboundReportPageDto;
-import com.openhis.web.reportmanage.dto.OutboundReportSearchParam;
+import com.healthlink.his.web.reportmanage.dto.OutboundReportPageDto;
+import com.healthlink.his.web.reportmanage.dto.OutboundReportSearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/PharmacySettlementReportAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/PharmacySettlementReportAppMapper.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/PharmacySettlementReportAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/PharmacySettlementReportAppMapper.java
index 6af6c4e1d..74ff3f08b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/PharmacySettlementReportAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/PharmacySettlementReportAppMapper.java
@@ -1,15 +1,15 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.mapper;
+package com.healthlink.his.web.reportmanage.mapper;
 
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
-import com.openhis.web.reportmanage.dto.PharmacySettlementMedDto;
-import com.openhis.web.reportmanage.dto.PharmacySettlementReportDto;
+import com.healthlink.his.web.reportmanage.dto.PharmacySettlementMedDto;
+import com.healthlink.his.web.reportmanage.dto.PharmacySettlementReportDto;
 
 /**
  * 药房结算报表 mapper
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/PrintReportMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/PrintReportMapper.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/PrintReportMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/PrintReportMapper.java
index 94ec4572f..136b81f98 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/PrintReportMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/PrintReportMapper.java
@@ -1,9 +1,9 @@
-package com.openhis.web.reportmanage.mapper;
+package com.healthlink.his.web.reportmanage.mapper;
 
-import com.openhis.web.reportmanage.dto.BottleLabelDto;
-import com.openhis.web.reportmanage.dto.CkInspAppDto;
-import com.openhis.web.reportmanage.dto.DisposalDto;
-import com.openhis.web.reportmanage.dto.PrescriptionPrintDto;
+import com.healthlink.his.web.reportmanage.dto.BottleLabelDto;
+import com.healthlink.his.web.reportmanage.dto.CkInspAppDto;
+import com.healthlink.his.web.reportmanage.dto.DisposalDto;
+import com.healthlink.his.web.reportmanage.dto.PrescriptionPrintDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/PurchaseReturnReportMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/PurchaseReturnReportMapper.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/PurchaseReturnReportMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/PurchaseReturnReportMapper.java
index b3eceb162..19e563d5e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/PurchaseReturnReportMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/PurchaseReturnReportMapper.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.mapper;
+package com.healthlink.his.web.reportmanage.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.reportmanage.dto.PurchaseReturnReportPageDto;
-import com.openhis.web.reportmanage.dto.PurchaseReturnReportSearchParam;
+import com.healthlink.his.web.reportmanage.dto.PurchaseReturnReportPageDto;
+import com.healthlink.his.web.reportmanage.dto.PurchaseReturnReportSearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/RegisterReportMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/RegisterReportMapper.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/RegisterReportMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/RegisterReportMapper.java
index a4d5a5d4f..fefc95311 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/RegisterReportMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/RegisterReportMapper.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.mapper;
+package com.healthlink.his.web.reportmanage.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.reportmanage.dto.RegisterReportPageDto;
-import com.openhis.web.reportmanage.dto.RegisterReportSearchParam;
+import com.healthlink.his.web.reportmanage.dto.RegisterReportPageDto;
+import com.healthlink.his.web.reportmanage.dto.RegisterReportSearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ReportMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/ReportMapper.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ReportMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/ReportMapper.java
index d5dbabf85..9538aaf34 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ReportMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/ReportMapper.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.mapper;
+package com.healthlink.his.web.reportmanage.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.reportmanage.dto.*;
+import com.healthlink.his.web.reportmanage.dto.*;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ReportStatisticsMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/ReportStatisticsMapper.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ReportStatisticsMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/ReportStatisticsMapper.java
index a414aa3f9..2e3320379 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ReportStatisticsMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/ReportStatisticsMapper.java
@@ -1,9 +1,9 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.mapper;
+package com.healthlink.his.web.reportmanage.mapper;
 
-import com.openhis.web.reportmanage.dto.DailyReportStatisticsPageDto;
+import com.healthlink.his.web.reportmanage.dto.DailyReportStatisticsPageDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ReturnIssueReportMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/ReturnIssueReportMapper.java
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ReturnIssueReportMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/ReturnIssueReportMapper.java
index d9c9c991a..ee925e5e4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ReturnIssueReportMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/ReturnIssueReportMapper.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.mapper;
+package com.healthlink.his.web.reportmanage.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.reportmanage.dto.ReturnIssueReportPageDto;
-import com.openhis.web.reportmanage.dto.ReturnIssueReportSearchParam;
+import com.healthlink.his.web.reportmanage.dto.ReturnIssueReportPageDto;
+import com.healthlink.his.web.reportmanage.dto.ReturnIssueReportSearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/StocktakingReportMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/StocktakingReportMapper.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/StocktakingReportMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/StocktakingReportMapper.java
index 8450aa2fe..c03955021 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/StocktakingReportMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/StocktakingReportMapper.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.mapper;
+package com.healthlink.his.web.reportmanage.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.reportmanage.dto.StocktakingReportPageDto;
-import com.openhis.web.reportmanage.dto.StocktakingReportSearchParam;
+import com.healthlink.his.web.reportmanage.dto.StocktakingReportPageDto;
+import com.healthlink.his.web.reportmanage.dto.StocktakingReportSearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/TransferReportMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/TransferReportMapper.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/TransferReportMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/TransferReportMapper.java
index 0107e1587..0f1ed55cc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/TransferReportMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/mapper/TransferReportMapper.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.reportmanage.mapper;
+package com.healthlink.his.web.reportmanage.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.reportmanage.dto.TransferReportPageDto;
-import com.openhis.web.reportmanage.dto.TransferReportSearchParam;
+import com.healthlink.his.web.reportmanage.dto.TransferReportPageDto;
+import com.healthlink.his.web.reportmanage.dto.TransferReportSearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/utils/CsvFillerUtil.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/utils/CsvFillerUtil.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/utils/CsvFillerUtil.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/utils/CsvFillerUtil.java
index 95766027a..12bf3ad0e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/utils/CsvFillerUtil.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/utils/CsvFillerUtil.java
@@ -1,10 +1,10 @@
-package com.openhis.web.reportmanage.utils;
+package com.healthlink.his.web.reportmanage.utils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.web.reportmanage.dto.InpatientMedicalRecordHomePageCollectionDto;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.web.reportmanage.dto.InpatientMedicalRecordHomePageCollectionDto;
 
 import jakarta.servlet.http.HttpServletResponse;
 import java.io.BufferedWriter;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/utils/ExcelFillerUtil.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/utils/ExcelFillerUtil.java
similarity index 99%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/utils/ExcelFillerUtil.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/utils/ExcelFillerUtil.java
index cd8e05dfd..1b3736eb3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/utils/ExcelFillerUtil.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/utils/ExcelFillerUtil.java
@@ -1,4 +1,4 @@
-package com.openhis.web.reportmanage.utils;
+package com.healthlink.his.web.reportmanage.utils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/service/IHomeStatisticsService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/service/IHomeStatisticsService.java
similarity index 73%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/service/IHomeStatisticsService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/service/IHomeStatisticsService.java
index 15df82204..d0d91f027 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/service/IHomeStatisticsService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/service/IHomeStatisticsService.java
@@ -1,6 +1,6 @@
-package com.openhis.web.service;
+package com.healthlink.his.web.service;
 
-import com.openhis.web.dto.HomeStatisticsDto;
+import com.healthlink.his.web.dto.HomeStatisticsDto;
 
 /**
  * 首页统计Service接口
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/service/impl/HomeStatisticsServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/service/impl/HomeStatisticsServiceImpl.java
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/service/impl/HomeStatisticsServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/service/impl/HomeStatisticsServiceImpl.java
index acc67f090..ee0a27ede 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/service/impl/HomeStatisticsServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/service/impl/HomeStatisticsServiceImpl.java
@@ -1,29 +1,29 @@
-package com.openhis.web.service.impl;
+package com.healthlink.his.web.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.Encounter;
-import com.openhis.administration.domain.EncounterParticipant;
-import com.openhis.administration.domain.Patient;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.service.IEncounterParticipantService;
-import com.openhis.administration.service.IEncounterService;
-import com.openhis.administration.service.IPatientService;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.common.enums.ParticipantType;
-import com.openhis.web.dto.HomeStatisticsDto;
-import com.openhis.financial.domain.PaymentReconciliation;
-import com.openhis.financial.service.IPaymentReconciliationService;
-import com.openhis.medication.domain.MedicationRequest;
-import com.openhis.medication.service.IMedicationRequestService;
-import com.openhis.common.enums.PaymentStatus;
-import com.openhis.web.service.IHomeStatisticsService;
+import com.healthlink.his.administration.domain.Encounter;
+import com.healthlink.his.administration.domain.EncounterParticipant;
+import com.healthlink.his.administration.domain.Patient;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.service.IEncounterParticipantService;
+import com.healthlink.his.administration.service.IEncounterService;
+import com.healthlink.his.administration.service.IPatientService;
+import com.healthlink.his.administration.service.IPractitionerService;
+import com.healthlink.his.common.enums.ParticipantType;
+import com.healthlink.his.web.dto.HomeStatisticsDto;
+import com.healthlink.his.financial.domain.PaymentReconciliation;
+import com.healthlink.his.financial.service.IPaymentReconciliationService;
+import com.healthlink.his.medication.domain.MedicationRequest;
+import com.healthlink.his.medication.service.IMedicationRequestService;
+import com.healthlink.his.common.enums.PaymentStatus;
+import com.healthlink.his.web.service.IHomeStatisticsService;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
-import com.openhis.web.patientmanage.mapper.PatientManageMapper;
+import com.healthlink.his.web.patientmanage.mapper.PatientManageMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/system/controller/HomeController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/system/controller/HomeController.java
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/system/controller/HomeController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/system/controller/HomeController.java
index bfa11ae66..b8d9fa555 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/system/controller/HomeController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/system/controller/HomeController.java
@@ -1,10 +1,10 @@
-package com.openhis.web.system.controller;
+package com.healthlink.his.web.system.controller;
 
 import com.core.common.core.domain.R;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.web.doctorstation.appservice.IDoctorStationEmrAppService;
-import com.openhis.web.dto.HomeStatisticsDto;
-import com.openhis.web.service.IHomeStatisticsService;
+import com.healthlink.his.web.doctorstation.appservice.IDoctorStationEmrAppService;
+import com.healthlink.his.web.dto.HomeStatisticsDto;
+import com.healthlink.his.web.service.IHomeStatisticsService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameters;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/techstation/controller/TechStationController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/techstation/controller/TechStationController.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/techstation/controller/TechStationController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/techstation/controller/TechStationController.java
index 6bdeb34f3..71cc13c09 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/techstation/controller/TechStationController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/techstation/controller/TechStationController.java
@@ -1,15 +1,15 @@
-package com.openhis.web.techstation.controller;
+package com.healthlink.his.web.techstation.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.core.common.core.controller.BaseController;
 import com.core.common.core.domain.AjaxResult;
 import com.core.common.core.page.TableDataInfo;
-import com.openhis.check.domain.ExamApply;
-import com.openhis.check.domain.ExamApplyItem;
-import com.openhis.check.service.IExamApplyItemService;
-import com.openhis.check.service.IExamApplyService;
-import com.openhis.lab.domain.InspectionLabApply;
-import com.openhis.lab.service.IInspectionLabApplyService;
+import com.healthlink.his.check.domain.ExamApply;
+import com.healthlink.his.check.domain.ExamApplyItem;
+import com.healthlink.his.check.service.IExamApplyItemService;
+import com.healthlink.his.check.service.IExamApplyService;
+import com.healthlink.his.lab.domain.InspectionLabApply;
+import com.healthlink.his.lab.service.IInspectionLabApplyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/appservice/ITencentAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/appservice/ITencentAppService.java
similarity index 82%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/appservice/ITencentAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/appservice/ITencentAppService.java
index e004e0985..3e3bdd19c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/appservice/ITencentAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/appservice/ITencentAppService.java
@@ -1,8 +1,8 @@
-package com.openhis.web.tencentJH.appservice;
+package com.healthlink.his.web.tencentJH.appservice;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.openhis.web.tencentJH.dto.CurrentDayEncounterTencentDto;
-import com.openhis.web.tencentJH.dto.PatientInfoTencentDto;
+import com.healthlink.his.web.tencentJH.dto.CurrentDayEncounterTencentDto;
+import com.healthlink.his.web.tencentJH.dto.PatientInfoTencentDto;
 
 import jakarta.servlet.http.HttpServletRequest;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/appservice/impl/TencentAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/appservice/impl/TencentAppServiceImpl.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/appservice/impl/TencentAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/appservice/impl/TencentAppServiceImpl.java
index c36f33840..8f00d9e52 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/appservice/impl/TencentAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/appservice/impl/TencentAppServiceImpl.java
@@ -1,17 +1,17 @@
-package com.openhis.web.tencentJH.appservice.impl;
+package com.healthlink.his.web.tencentJH.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.utils.AgeCalculatorUtil;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.common.enums.*;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.tencentJH.appservice.ITencentAppService;
-import com.openhis.web.tencentJH.dto.CurrentDayEncounterTencentDto;
-import com.openhis.web.tencentJH.dto.PatientInfoTencentDto;
-import com.openhis.web.tencentJH.mapper.TencentAppMapper;
+import com.healthlink.his.common.enums.*;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.web.tencentJH.appservice.ITencentAppService;
+import com.healthlink.his.web.tencentJH.dto.CurrentDayEncounterTencentDto;
+import com.healthlink.his.web.tencentJH.dto.PatientInfoTencentDto;
+import com.healthlink.his.web.tencentJH.mapper.TencentAppMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/controller/TencentController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/controller/TencentController.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/controller/TencentController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/controller/TencentController.java
index ccb71f910..b415f3260 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/controller/TencentController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/controller/TencentController.java
@@ -1,9 +1,9 @@
-package com.openhis.web.tencentJH.controller;
+package com.healthlink.his.web.tencentJH.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.Whether;
-import com.openhis.web.tencentJH.appservice.ITencentAppService;
-import com.openhis.web.tencentJH.dto.PatientInfoTencentDto;
+import com.healthlink.his.common.enums.Whether;
+import com.healthlink.his.web.tencentJH.appservice.ITencentAppService;
+import com.healthlink.his.web.tencentJH.dto.PatientInfoTencentDto;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/dto/CurrentDayEncounterTencentDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/dto/CurrentDayEncounterTencentDto.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/dto/CurrentDayEncounterTencentDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/dto/CurrentDayEncounterTencentDto.java
index 3cae9d7ea..fb4043444 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/dto/CurrentDayEncounterTencentDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/dto/CurrentDayEncounterTencentDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.tencentJH.dto;
+package com.healthlink.his.web.tencentJH.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/dto/PatientInfoTencentDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/dto/PatientInfoTencentDto.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/dto/PatientInfoTencentDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/dto/PatientInfoTencentDto.java
index 5b723ec1d..f0234d22a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/dto/PatientInfoTencentDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/dto/PatientInfoTencentDto.java
@@ -1,8 +1,8 @@
-package com.openhis.web.tencentJH.dto;
+package com.healthlink.his.web.tencentJH.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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/mapper/TencentAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/mapper/TencentAppMapper.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/mapper/TencentAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/mapper/TencentAppMapper.java
index 2528446fb..23bef3fa2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/mapper/TencentAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/mapper/TencentAppMapper.java
@@ -1,14 +1,14 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.tencentJH.mapper;
+package com.healthlink.his.web.tencentJH.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.tencentJH.dto.CurrentDayEncounterTencentDto;
-import com.openhis.web.tencentJH.dto.PatientInfoTencentDto;
+import com.healthlink.his.web.tencentJH.dto.CurrentDayEncounterTencentDto;
+import com.healthlink.his.web.tencentJH.dto.PatientInfoTencentDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/utils/httpUtil/HttpClient.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/utils/httpUtil/HttpClient.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/utils/httpUtil/HttpClient.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/utils/httpUtil/HttpClient.java
index 80c6deec0..3751515ba 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/utils/httpUtil/HttpClient.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/utils/httpUtil/HttpClient.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.openhis.web.tencentJH.utils.httpUtil;
+package com.healthlink.his.web.tencentJH.utils.httpUtil;
 
 import java.util.Map;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/utils/httpUtil/HttpReques.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/utils/httpUtil/HttpReques.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/utils/httpUtil/HttpReques.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/utils/httpUtil/HttpReques.java
index 56582f8be..b11fefc45 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/utils/httpUtil/HttpReques.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/utils/httpUtil/HttpReques.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.openhis.web.tencentJH.utils.httpUtil;
+package com.healthlink.his.web.tencentJH.utils.httpUtil;
 
 import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/utils/httpUtil/HttpRequesGet.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/utils/httpUtil/HttpRequesGet.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/utils/httpUtil/HttpRequesGet.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/utils/httpUtil/HttpRequesGet.java
index 20ba64d46..da489d976 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/utils/httpUtil/HttpRequesGet.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/utils/httpUtil/HttpRequesGet.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.openhis.web.tencentJH.utils.httpUtil;
+package com.healthlink.his.web.tencentJH.utils.httpUtil;
 
 import org.apache.hc.client5.http.classic.methods.HttpGet;
 import org.apache.hc.client5.http.config.RequestConfig;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/utils/httpUtil/HttpRequesPost.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/utils/httpUtil/HttpRequesPost.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/utils/httpUtil/HttpRequesPost.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/utils/httpUtil/HttpRequesPost.java
index f234308c4..a665474d9 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/utils/httpUtil/HttpRequesPost.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/utils/httpUtil/HttpRequesPost.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.openhis.web.tencentJH.utils.httpUtil;
+package com.healthlink.his.web.tencentJH.utils.httpUtil;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/utils/httpUtil/HttpRequestGetJson.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/utils/httpUtil/HttpRequestGetJson.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/utils/httpUtil/HttpRequestGetJson.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/utils/httpUtil/HttpRequestGetJson.java
index 2b2671f77..b5fe76920 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/utils/httpUtil/HttpRequestGetJson.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/utils/httpUtil/HttpRequestGetJson.java
@@ -1,4 +1,4 @@
-package com.openhis.web.tencentJH.utils.httpUtil;
+package com.healthlink.his.web.tencentJH.utils.httpUtil;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/utils/httpUtil/HttpsClientUtil.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/utils/httpUtil/HttpsClientUtil.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/utils/httpUtil/HttpsClientUtil.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/utils/httpUtil/HttpsClientUtil.java
index 504a73087..81812d7f8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/utils/httpUtil/HttpsClientUtil.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/utils/httpUtil/HttpsClientUtil.java
@@ -1,4 +1,4 @@
-package com.openhis.web.tencentJH.utils.httpUtil;
+package com.healthlink.his.web.tencentJH.utils.httpUtil;
 
 
 import org.apache.hc.client5.http.classic.methods.HttpPost;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/utils/httpUtil/SSLClient.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/utils/httpUtil/SSLClient.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/utils/httpUtil/SSLClient.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/utils/httpUtil/SSLClient.java
index e1f55ccaa..cbb63b1a2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/utils/httpUtil/SSLClient.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/tencentJH/utils/httpUtil/SSLClient.java
@@ -1,4 +1,4 @@
-package com.openhis.web.tencentJH.utils.httpUtil;
+package com.healthlink.his.web.tencentJH.utils.httpUtil;
 
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.classic.HttpClients;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/CallNumberVoiceConfigAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/appservice/CallNumberVoiceConfigAppService.java
similarity index 67%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/CallNumberVoiceConfigAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/appservice/CallNumberVoiceConfigAppService.java
index 8bedc12d0..768ed4964 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/CallNumberVoiceConfigAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/appservice/CallNumberVoiceConfigAppService.java
@@ -1,7 +1,7 @@
-package com.openhis.web.triageandqueuemanage.appservice;
+package com.healthlink.his.web.triageandqueuemanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.triageandqueuemanage.domain.CallNumberVoiceConfig;
+import com.healthlink.his.triageandqueuemanage.domain.CallNumberVoiceConfig;
 
 public interface CallNumberVoiceConfigAppService {
     R<?> addCallNumberVoiceConfig(CallNumberVoiceConfig callNumberVoiceConfig);
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/TriageQueueAppService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/appservice/TriageQueueAppService.java
similarity index 74%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/TriageQueueAppService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/appservice/TriageQueueAppService.java
index 07012df11..c55294a8e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/TriageQueueAppService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/appservice/TriageQueueAppService.java
@@ -1,10 +1,10 @@
-package com.openhis.web.triageandqueuemanage.appservice;
+package com.healthlink.his.web.triageandqueuemanage.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.triageandqueuemanage.dto.CallNumberDisplayResp;
-import com.openhis.web.triageandqueuemanage.dto.TriageQueueActionReq;
-import com.openhis.web.triageandqueuemanage.dto.TriageQueueAddReq;
-import com.openhis.web.triageandqueuemanage.dto.TriageQueueAdjustReq;
+import com.healthlink.his.web.triageandqueuemanage.dto.CallNumberDisplayResp;
+import com.healthlink.his.web.triageandqueuemanage.dto.TriageQueueActionReq;
+import com.healthlink.his.web.triageandqueuemanage.dto.TriageQueueAddReq;
+import com.healthlink.his.web.triageandqueuemanage.dto.TriageQueueAdjustReq;
 
 import java.time.LocalDate;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/impl/CallNumberVoiceConfigAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/appservice/impl/CallNumberVoiceConfigAppServiceImpl.java
similarity index 79%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/impl/CallNumberVoiceConfigAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/appservice/impl/CallNumberVoiceConfigAppServiceImpl.java
index 8fff8693f..aca250970 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/impl/CallNumberVoiceConfigAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/appservice/impl/CallNumberVoiceConfigAppServiceImpl.java
@@ -1,10 +1,10 @@
-package com.openhis.web.triageandqueuemanage.appservice.impl;
+package com.healthlink.his.web.triageandqueuemanage.appservice.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.core.common.core.domain.R;
-import com.openhis.triageandqueuemanage.domain.CallNumberVoiceConfig;
-import com.openhis.triageandqueuemanage.service.CallNumberVoiceConfigService;
-import com.openhis.web.triageandqueuemanage.appservice.CallNumberVoiceConfigAppService;
+import com.healthlink.his.triageandqueuemanage.domain.CallNumberVoiceConfig;
+import com.healthlink.his.triageandqueuemanage.service.CallNumberVoiceConfigService;
+import com.healthlink.his.web.triageandqueuemanage.appservice.CallNumberVoiceConfigAppService;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/impl/TriageQueueAppServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/appservice/impl/TriageQueueAppServiceImpl.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/impl/TriageQueueAppServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/appservice/impl/TriageQueueAppServiceImpl.java
index f635c7e4c..2acbd16f3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/impl/TriageQueueAppServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/appservice/impl/TriageQueueAppServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.triageandqueuemanage.appservice.impl;
+package com.healthlink.his.web.triageandqueuemanage.appservice.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -6,25 +6,25 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.core.common.core.domain.R;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.Encounter;
-import com.openhis.administration.mapper.EncounterMapper;
-import com.openhis.common.enums.EncounterStatus;
-import com.openhis.common.enums.EncounterSubjectStatus;
-import com.openhis.common.enums.TriageQueueStatus;
-import com.openhis.triageandqueuemanage.domain.CallRecord;
-import com.openhis.triageandqueuemanage.domain.DivLog;
-import com.openhis.triageandqueuemanage.domain.TriageCandidateExclusion;
-import com.openhis.triageandqueuemanage.domain.TriageQueueItem;
-import com.openhis.triageandqueuemanage.service.CallRecordService;
-import com.openhis.triageandqueuemanage.service.DivLogService;
-import com.openhis.triageandqueuemanage.service.TriageCandidateExclusionService;
-import com.openhis.triageandqueuemanage.service.TriageQueueItemService;
-import com.openhis.appointmentmanage.domain.ScheduleSlot;
-import com.openhis.appointmentmanage.mapper.ScheduleSlotMapper;
-import com.openhis.common.enums.CallType;
-import com.openhis.web.triageandqueuemanage.appservice.TriageQueueAppService;
-import com.openhis.web.triageandqueuemanage.dto.*;
-import com.openhis.web.triageandqueuemanage.sse.CallNumberSseManager;
+import com.healthlink.his.administration.domain.Encounter;
+import com.healthlink.his.administration.mapper.EncounterMapper;
+import com.healthlink.his.common.enums.EncounterStatus;
+import com.healthlink.his.common.enums.EncounterSubjectStatus;
+import com.healthlink.his.common.enums.TriageQueueStatus;
+import com.healthlink.his.triageandqueuemanage.domain.CallRecord;
+import com.healthlink.his.triageandqueuemanage.domain.DivLog;
+import com.healthlink.his.triageandqueuemanage.domain.TriageCandidateExclusion;
+import com.healthlink.his.triageandqueuemanage.domain.TriageQueueItem;
+import com.healthlink.his.triageandqueuemanage.service.CallRecordService;
+import com.healthlink.his.triageandqueuemanage.service.DivLogService;
+import com.healthlink.his.triageandqueuemanage.service.TriageCandidateExclusionService;
+import com.healthlink.his.triageandqueuemanage.service.TriageQueueItemService;
+import com.healthlink.his.appointmentmanage.domain.ScheduleSlot;
+import com.healthlink.his.appointmentmanage.mapper.ScheduleSlotMapper;
+import com.healthlink.his.common.enums.CallType;
+import com.healthlink.his.web.triageandqueuemanage.appservice.TriageQueueAppService;
+import com.healthlink.his.web.triageandqueuemanage.dto.*;
+import com.healthlink.his.web.triageandqueuemanage.sse.CallNumberSseManager;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/controller/CallNumberVoiceConfigController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/controller/CallNumberVoiceConfigController.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/controller/CallNumberVoiceConfigController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/controller/CallNumberVoiceConfigController.java
index e0f3f815e..3ff7e38d5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/controller/CallNumberVoiceConfigController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/controller/CallNumberVoiceConfigController.java
@@ -1,8 +1,8 @@
-package com.openhis.web.triageandqueuemanage.controller;
+package com.healthlink.his.web.triageandqueuemanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.triageandqueuemanage.domain.CallNumberVoiceConfig;
-import com.openhis.web.triageandqueuemanage.appservice.CallNumberVoiceConfigAppService;
+import com.healthlink.his.triageandqueuemanage.domain.CallNumberVoiceConfig;
+import com.healthlink.his.web.triageandqueuemanage.appservice.CallNumberVoiceConfigAppService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/controller/TriageQueueController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/controller/TriageQueueController.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/controller/TriageQueueController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/controller/TriageQueueController.java
index faca9281a..c23428722 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/controller/TriageQueueController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/controller/TriageQueueController.java
@@ -1,14 +1,14 @@
-package com.openhis.web.triageandqueuemanage.controller;
+package com.healthlink.his.web.triageandqueuemanage.controller;
 
 import com.core.common.annotation.Anonymous;
 import com.core.common.core.domain.R;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.web.triageandqueuemanage.appservice.TriageQueueAppService;
-import com.openhis.web.triageandqueuemanage.dto.CallNumberDisplayResp;
-import com.openhis.web.triageandqueuemanage.dto.TriageQueueActionReq;
-import com.openhis.web.triageandqueuemanage.dto.TriageQueueAddReq;
-import com.openhis.web.triageandqueuemanage.dto.TriageQueueAdjustReq;
-import com.openhis.web.triageandqueuemanage.sse.CallNumberSseManager;
+import com.healthlink.his.web.triageandqueuemanage.appservice.TriageQueueAppService;
+import com.healthlink.his.web.triageandqueuemanage.dto.CallNumberDisplayResp;
+import com.healthlink.his.web.triageandqueuemanage.dto.TriageQueueActionReq;
+import com.healthlink.his.web.triageandqueuemanage.dto.TriageQueueAddReq;
+import com.healthlink.his.web.triageandqueuemanage.dto.TriageQueueAdjustReq;
+import com.healthlink.his.web.triageandqueuemanage.sse.CallNumberSseManager;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.http.MediaType;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/CallNumberDisplayResp.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/dto/CallNumberDisplayResp.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/CallNumberDisplayResp.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/dto/CallNumberDisplayResp.java
index e7f072797..dc111f50a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/CallNumberDisplayResp.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/dto/CallNumberDisplayResp.java
@@ -1,4 +1,4 @@
-package com.openhis.web.triageandqueuemanage.dto;
+package com.healthlink.his.web.triageandqueuemanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueActionReq.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/dto/TriageQueueActionReq.java
similarity index 81%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueActionReq.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/dto/TriageQueueActionReq.java
index 1ba6e187e..9ac926166 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueActionReq.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/dto/TriageQueueActionReq.java
@@ -1,4 +1,4 @@
-package com.openhis.web.triageandqueuemanage.dto;
+package com.healthlink.his.web.triageandqueuemanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueAddReq.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/dto/TriageQueueAddReq.java
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueAddReq.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/dto/TriageQueueAddReq.java
index 44f681f76..91455a22b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueAddReq.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/dto/TriageQueueAddReq.java
@@ -1,4 +1,4 @@
-package com.openhis.web.triageandqueuemanage.dto;
+package com.healthlink.his.web.triageandqueuemanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueAdjustReq.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/dto/TriageQueueAdjustReq.java
similarity index 71%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueAdjustReq.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/dto/TriageQueueAdjustReq.java
index d800c1dc3..f117588ef 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueAdjustReq.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/dto/TriageQueueAdjustReq.java
@@ -1,4 +1,4 @@
-package com.openhis.web.triageandqueuemanage.dto;
+package com.healthlink.his.web.triageandqueuemanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueEncounterItem.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/dto/TriageQueueEncounterItem.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueEncounterItem.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/dto/TriageQueueEncounterItem.java
index c308f8c64..98fb92064 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueEncounterItem.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/dto/TriageQueueEncounterItem.java
@@ -1,4 +1,4 @@
-package com.openhis.web.triageandqueuemanage.dto;
+package com.healthlink.his.web.triageandqueuemanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/mapper/CallNumberVoiceConfigAppMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/mapper/CallNumberVoiceConfigAppMapper.java
similarity index 65%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/mapper/CallNumberVoiceConfigAppMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/mapper/CallNumberVoiceConfigAppMapper.java
index f65eb42a9..2eba1afdb 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/mapper/CallNumberVoiceConfigAppMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/mapper/CallNumberVoiceConfigAppMapper.java
@@ -1,4 +1,4 @@
-package com.openhis.web.triageandqueuemanage.mapper;
+package com.healthlink.his.web.triageandqueuemanage.mapper;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/sse/CallNumberSseManager.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/sse/CallNumberSseManager.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/sse/CallNumberSseManager.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/sse/CallNumberSseManager.java
index 5fc5e6e47..23ac09d36 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/sse/CallNumberSseManager.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/triageandqueuemanage/sse/CallNumberSseManager.java
@@ -1,4 +1,4 @@
-package com.openhis.web.triageandqueuemanage.sse;
+package com.healthlink.his.web.triageandqueuemanage.sse;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/config/YbServiceConfig.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/config/YbServiceConfig.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/config/YbServiceConfig.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/config/YbServiceConfig.java
index b6728e2e1..6d69be93e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/config/YbServiceConfig.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/config/YbServiceConfig.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.ybmanage.config;
+package com.healthlink.his.web.ybmanage.config;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/controller/YbController.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/controller/YbController.java
index 2e342a3d6..8302537fd 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/controller/YbController.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.ybmanage.controller;
+package com.healthlink.his.web.ybmanage.controller;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -13,35 +13,35 @@ import com.core.common.core.domain.R;
 import com.core.common.exception.ServiceException;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
-import com.openhis.administration.domain.Encounter;
-import com.openhis.administration.domain.Patient;
-import com.openhis.administration.service.IEncounterService;
-import com.openhis.administration.service.IPatientService;
-import com.openhis.clinical.domain.ConditionDefinition;
-import com.openhis.clinical.service.IConditionDefinitionService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.financial.domain.Contract;
-import com.openhis.financial.service.IContractService;
-import com.openhis.web.ybmanage.dto.*;
-import com.openhis.web.ybmanage.service.IYbService;
-import com.openhis.yb.domain.FinancialApplyRecord;
-import com.openhis.yb.domain.InfoPerson;
-import com.openhis.yb.domain.InpatientDischarge;
-import com.openhis.yb.domain.InpatientReg;
-import com.openhis.yb.dto.*;
-import com.openhis.yb.dto.Catalogue1312Output;
-import com.openhis.yb.dto.Clinic2208UnSetlInfoOutput;
-import com.openhis.yb.dto.Financial3203AWebParam;
-import com.openhis.yb.dto.Info1101Output;
-import com.openhis.yb.dto.PatientInfoDto;
-import com.openhis.yb.dto.Result;
-import com.openhis.yb.dto.Settlement3201WebParam;
-import com.openhis.yb.dto.Settlement3202WebParam;
-import com.openhis.yb.dto.Settlement3209AWebParam;
-import com.openhis.yb.service.IPerinfoService;
-import com.openhis.yb.service.YbDao;
-import com.openhis.yb.service.YbHttpUtils;
-import com.openhis.yb.util.CommonConstant;
+import com.healthlink.his.administration.domain.Encounter;
+import com.healthlink.his.administration.domain.Patient;
+import com.healthlink.his.administration.service.IEncounterService;
+import com.healthlink.his.administration.service.IPatientService;
+import com.healthlink.his.clinical.domain.ConditionDefinition;
+import com.healthlink.his.clinical.service.IConditionDefinitionService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.financial.domain.Contract;
+import com.healthlink.his.financial.service.IContractService;
+import com.healthlink.his.web.ybmanage.dto.*;
+import com.healthlink.his.web.ybmanage.service.IYbService;
+import com.healthlink.his.yb.domain.FinancialApplyRecord;
+import com.healthlink.his.yb.domain.InfoPerson;
+import com.healthlink.his.yb.domain.InpatientDischarge;
+import com.healthlink.his.yb.domain.InpatientReg;
+import com.healthlink.his.yb.dto.*;
+import com.healthlink.his.yb.dto.Catalogue1312Output;
+import com.healthlink.his.yb.dto.Clinic2208UnSetlInfoOutput;
+import com.healthlink.his.yb.dto.Financial3203AWebParam;
+import com.healthlink.his.yb.dto.Info1101Output;
+import com.healthlink.his.yb.dto.PatientInfoDto;
+import com.healthlink.his.yb.dto.Result;
+import com.healthlink.his.yb.dto.Settlement3201WebParam;
+import com.healthlink.his.yb.dto.Settlement3202WebParam;
+import com.healthlink.his.yb.dto.Settlement3209AWebParam;
+import com.healthlink.his.yb.service.IPerinfoService;
+import com.healthlink.his.yb.service.YbDao;
+import com.healthlink.his.yb.service.YbHttpUtils;
+import com.healthlink.his.yb.util.CommonConstant;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbElepController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/controller/YbElepController.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbElepController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/controller/YbElepController.java
index 3b07d7b0b..50cb594ff 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbElepController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/controller/YbElepController.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.ybmanage.controller;
+package com.healthlink.his.web.ybmanage.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.ybmanage.dto.VeriPrescriptionParam;
-import com.openhis.web.ybmanage.service.IYbEleBaseService;
-import com.openhis.web.ybmanage.service.IYbEleHttpService;
-import com.openhis.ybelep.domain.*;
+import com.healthlink.his.web.ybmanage.dto.VeriPrescriptionParam;
+import com.healthlink.his.web.ybmanage.service.IYbEleBaseService;
+import com.healthlink.his.web.ybmanage.service.IYbEleHttpService;
+import com.healthlink.his.ybelep.domain.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbInpatientController.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/controller/YbInpatientController.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbInpatientController.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/controller/YbInpatientController.java
index 4d7fe11d4..d1700c49e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbInpatientController.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/controller/YbInpatientController.java
@@ -1,17 +1,17 @@
-package com.openhis.web.ybmanage.controller;
+package com.healthlink.his.web.ybmanage.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.annotation.Anonymous;
 import com.core.common.core.domain.R;
-import com.openhis.web.inhospitalcharge.appservice.IInHospitalRegisterAppService;
-import com.openhis.web.ybmanage.dto.PerinfoParamDto;
-import com.openhis.web.ybmanage.dto.Yb2401InputInpatientParamDto;
-import com.openhis.web.ybmanage.dto.Yb2403InputInpatientParamDto;
-import com.openhis.web.ybmanage.dto.YbInHospitalRegisterQueryDto;
-import com.openhis.web.ybmanage.service.IYbService;
-import com.openhis.yb.dto.*;
-import com.openhis.yb.service.YbDao;
-import com.openhis.yb.service.YbHttpUtils;
+import com.healthlink.his.web.inhospitalcharge.appservice.IInHospitalRegisterAppService;
+import com.healthlink.his.web.ybmanage.dto.PerinfoParamDto;
+import com.healthlink.his.web.ybmanage.dto.Yb2401InputInpatientParamDto;
+import com.healthlink.his.web.ybmanage.dto.Yb2403InputInpatientParamDto;
+import com.healthlink.his.web.ybmanage.dto.YbInHospitalRegisterQueryDto;
+import com.healthlink.his.web.ybmanage.service.IYbService;
+import com.healthlink.his.yb.dto.*;
+import com.healthlink.his.yb.service.YbDao;
+import com.healthlink.his.yb.service.YbHttpUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Catalogue1312Output.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Catalogue1312Output.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Catalogue1312Output.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Catalogue1312Output.java
index 9913a0f40..0c0a53355 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Catalogue1312Output.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Catalogue1312Output.java
@@ -1,4 +1,4 @@
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import com.core.common.core.domain.HisBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clearing3205AWebParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Clearing3205AWebParam.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clearing3205AWebParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Clearing3205AWebParam.java
index 18199ade6..53ce5d04b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clearing3205AWebParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Clearing3205AWebParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2207OrderOutput.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Clinic2207OrderOutput.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2207OrderOutput.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Clinic2207OrderOutput.java
index 92a9d0b99..eeb052234 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2207OrderOutput.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Clinic2207OrderOutput.java
@@ -1,9 +1,9 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
-import com.openhis.yb.dto.Clinic2206FundPaymentResult;
+import com.healthlink.his.yb.dto.Clinic2206FundPaymentResult;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2208UnSetlInfoOutput.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Clinic2208UnSetlInfoOutput.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2208UnSetlInfoOutput.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Clinic2208UnSetlInfoOutput.java
index a0b21f07f..658b09194 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2208UnSetlInfoOutput.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Clinic2208UnSetlInfoOutput.java
@@ -1,9 +1,9 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
-import com.openhis.yb.dto.Clinic2206FundPaymentResult;
+import com.healthlink.his.yb.dto.Clinic2206FundPaymentResult;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ClinicReg2201Output.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/ClinicReg2201Output.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ClinicReg2201Output.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/ClinicReg2201Output.java
index d3371b980..f06e30cb5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ClinicReg2201Output.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/ClinicReg2201Output.java
@@ -1,4 +1,4 @@
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/EncounterDiagnosisDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/EncounterDiagnosisDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/EncounterDiagnosisDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/EncounterDiagnosisDto.java
index 735ac0b6f..7352a3393 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/EncounterDiagnosisDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/EncounterDiagnosisDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial13203WebParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Financial13203WebParam.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial13203WebParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Financial13203WebParam.java
index c693c24f4..590886824 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial13203WebParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Financial13203WebParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3202WebParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Financial3202WebParam.java
similarity index 73%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3202WebParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Financial3202WebParam.java
index 9164fe51d..601e33b63 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3202WebParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Financial3202WebParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203AWebParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Financial3203AWebParam.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203AWebParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Financial3203AWebParam.java
index 9c79d0d23..3147ec153 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203AWebParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Financial3203AWebParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203WebParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Financial3203WebParam.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203WebParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Financial3203WebParam.java
index 80cf0dbba..c4a331895 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203WebParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Financial3203WebParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3201WebParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/FinancialHand3201WebParam.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3201WebParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/FinancialHand3201WebParam.java
index fa7307c7b..0f416c507 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3201WebParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/FinancialHand3201WebParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3203AWebParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/FinancialHand3203AWebParam.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3203AWebParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/FinancialHand3203AWebParam.java
index 26e038dfc..d8f4853b8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3203AWebParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/FinancialHand3203AWebParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Info1101Output.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Info1101Output.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Info1101Output.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Info1101Output.java
index 8eaf8c965..aa6a03bce 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Info1101Output.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Info1101Output.java
@@ -1,8 +1,8 @@
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.core.common.core.domain.HisBaseEntity;
-import com.openhis.yb.dto.Info5301SpecialConditionResult;
+import com.healthlink.his.yb.dto.Info5301SpecialConditionResult;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/PatientInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/PatientInfoDto.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/PatientInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/PatientInfoDto.java
index e8e550cda..7b54bdb9b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/PatientInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/PatientInfoDto.java
@@ -1,10 +1,10 @@
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.yb.dto.Info5301SpecialConditionResult;
+import com.healthlink.his.yb.dto.Info5301SpecialConditionResult;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/PerinfoParamDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/PerinfoParamDto.java
similarity index 79%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/PerinfoParamDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/PerinfoParamDto.java
index 4fc2c597b..36c214d56 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/PerinfoParamDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/PerinfoParamDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Result.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Result.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Result.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Result.java
index 2820e4a1a..61e36794b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Result.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Result.java
@@ -1,4 +1,4 @@
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ResultBody.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/ResultBody.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ResultBody.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/ResultBody.java
index 7c3ffc54f..a2240b1c2 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ResultBody.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/ResultBody.java
@@ -1,4 +1,4 @@
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3201WebParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Settlement3201WebParam.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3201WebParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Settlement3201WebParam.java
index 588b2779b..76a1ace7a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3201WebParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Settlement3201WebParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3202WebParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Settlement3202WebParam.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3202WebParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Settlement3202WebParam.java
index 9af774500..6e67e784e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3202WebParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Settlement3202WebParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3209AWebParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Settlement3209AWebParam.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3209AWebParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Settlement3209AWebParam.java
index 97f675fa3..b55e7916a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3209AWebParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Settlement3209AWebParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionDetailInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/VeriPrescriptionDetailInfoDto.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionDetailInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/VeriPrescriptionDetailInfoDto.java
index cd974eb13..0fc59d686 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionDetailInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/VeriPrescriptionDetailInfoDto.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionInfoDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/VeriPrescriptionInfoDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionInfoDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/VeriPrescriptionInfoDto.java
index d32af0ac1..e9afee2f5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionInfoDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/VeriPrescriptionInfoDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/VeriPrescriptionParam.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/VeriPrescriptionParam.java
index b24594588..70eaac8bf 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/VeriPrescriptionParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301FeeDetailParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2301FeeDetailParam.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301FeeDetailParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2301FeeDetailParam.java
index faeb33118..cbce98831 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301FeeDetailParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2301FeeDetailParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301InpatientOutput.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2301InpatientOutput.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301InpatientOutput.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2301InpatientOutput.java
index 12e3d5945..46bb7a569 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301InpatientOutput.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2301InpatientOutput.java
@@ -1,4 +1,4 @@
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientOutput.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2303InpatientOutput.java
similarity index 99%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientOutput.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2303InpatientOutput.java
index 5b62a1afe..7604b95fa 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientOutput.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2303InpatientOutput.java
@@ -1,4 +1,4 @@
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientPram.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2303InpatientPram.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientPram.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2303InpatientPram.java
index 34cc39694..aec30f0ba 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientPram.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2303InpatientPram.java
@@ -1,4 +1,4 @@
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientExpContentParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2304InpatientExpContentParam.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientExpContentParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2304InpatientExpContentParam.java
index e9f25d1bb..c6a94b633 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientExpContentParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2304InpatientExpContentParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientOutput.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2304InpatientOutput.java
similarity index 99%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientOutput.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2304InpatientOutput.java
index 7a3c0706b..514a93cab 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientOutput.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2304InpatientOutput.java
@@ -1,4 +1,4 @@
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2304InpatientParam.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2304InpatientParam.java
index 2476e1905..f722f710a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2304InpatientParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientOutput.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2305InpatientOutput.java
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientOutput.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2305InpatientOutput.java
index 918888c48..febaea026 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientOutput.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2305InpatientOutput.java
@@ -1,4 +1,4 @@
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2305InpatientParam.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2305InpatientParam.java
index 99bc5924d..93dab8566 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2305InpatientParam.java
@@ -1,4 +1,4 @@
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2401InpatientRegParamDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2401InpatientRegParamDto.java
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2401InpatientRegParamDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2401InpatientRegParamDto.java
index 0c6c16580..0bd3b5f76 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2401InpatientRegParamDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2401InpatientRegParamDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2401InputInpatientParamDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2401InputInpatientParamDto.java
similarity index 70%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2401InputInpatientParamDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2401InputInpatientParamDto.java
index 82ac1059e..bd99b940c 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2401InputInpatientParamDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2401InputInpatientParamDto.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
-import com.openhis.administration.domain.Patient;
-import com.openhis.yb.dto.PatientInfoDto;
-import com.openhis.yb.dto.Yb2401InputInpatientDiseInfo;
-import com.openhis.yb.dto.Yb2401InputInpatientMdtrtInfo;
+import com.healthlink.his.administration.domain.Patient;
+import com.healthlink.his.yb.dto.PatientInfoDto;
+import com.healthlink.his.yb.dto.Yb2401InputInpatientDiseInfo;
+import com.healthlink.his.yb.dto.Yb2401InputInpatientMdtrtInfo;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2403InputInpatientParamDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2403InputInpatientParamDto.java
similarity index 73%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2403InputInpatientParamDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2403InputInpatientParamDto.java
index 4305584a4..4838ddd68 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2403InputInpatientParamDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb2403InputInpatientParamDto.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
-import com.openhis.yb.dto.Yb2403InputAdmInfo;
-import com.openhis.yb.dto.Yb2403InputDiseInfo;
-import com.openhis.yb.dto.Yb2403InputMdtrtGrpContent;
+import com.healthlink.his.yb.dto.Yb2403InputAdmInfo;
+import com.healthlink.his.yb.dto.Yb2403InputDiseInfo;
+import com.healthlink.his.yb.dto.Yb2403InputMdtrtGrpContent;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb5205SpecialDiseaseWebParam.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb5205SpecialDiseaseWebParam.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb5205SpecialDiseaseWebParam.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb5205SpecialDiseaseWebParam.java
index a9e783cae..f082843b3 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb5205SpecialDiseaseWebParam.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/Yb5205SpecialDiseaseWebParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/YbInHospitalRegisterQueryDto.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/YbInHospitalRegisterQueryDto.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/YbInHospitalRegisterQueryDto.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/YbInHospitalRegisterQueryDto.java
index a06a5e796..876957cc4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/YbInHospitalRegisterQueryDto.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/dto/YbInHospitalRegisterQueryDto.java
@@ -1,4 +1,4 @@
-package com.openhis.web.ybmanage.dto;
+package com.healthlink.his.web.ybmanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbElepMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/mapper/YbElepMapper.java
similarity index 80%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbElepMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/mapper/YbElepMapper.java
index b226ad497..9dc60e966 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbElepMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/mapper/YbElepMapper.java
@@ -1,14 +1,14 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.ybmanage.mapper;
+package com.healthlink.his.web.ybmanage.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.ybmanage.dto.VeriPrescriptionDetailInfoDto;
-import com.openhis.web.ybmanage.dto.VeriPrescriptionInfoDto;
-import com.openhis.web.ybmanage.dto.VeriPrescriptionParam;
+import com.healthlink.his.web.ybmanage.dto.VeriPrescriptionDetailInfoDto;
+import com.healthlink.his.web.ybmanage.dto.VeriPrescriptionInfoDto;
+import com.healthlink.his.web.ybmanage.dto.VeriPrescriptionParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbMapper.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/mapper/YbMapper.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbMapper.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/mapper/YbMapper.java
index 24a792ab3..027f46841 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbMapper.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/mapper/YbMapper.java
@@ -1,13 +1,13 @@
-package com.openhis.web.ybmanage.mapper;
+package com.healthlink.his.web.ybmanage.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.inhospitalcharge.dto.InHospitalRegisterQueryDto;
-import com.openhis.web.ybmanage.dto.EncounterDiagnosisDto;
-import com.openhis.web.ybmanage.dto.YbInHospitalRegisterQueryDto;
-import com.openhis.yb.dto.*;
+import com.healthlink.his.web.inhospitalcharge.dto.InHospitalRegisterQueryDto;
+import com.healthlink.his.web.ybmanage.dto.EncounterDiagnosisDto;
+import com.healthlink.his.web.ybmanage.dto.YbInHospitalRegisterQueryDto;
+import com.healthlink.his.yb.dto.*;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleBaseService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/IYbEleBaseService.java
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleBaseService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/IYbEleBaseService.java
index e121de8d5..26b92d6fc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleBaseService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/IYbEleBaseService.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.ybmanage.service;
+package com.healthlink.his.web.ybmanage.service;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.ybmanage.dto.VeriPrescriptionParam;
-import com.openhis.ybelep.domain.*;
+import com.healthlink.his.web.ybmanage.dto.VeriPrescriptionParam;
+import com.healthlink.his.ybelep.domain.*;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.rmi.ServerException;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleHttpService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/IYbEleHttpService.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleHttpService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/IYbEleHttpService.java
index 9d81a156e..52ab2210d 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleHttpService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/IYbEleHttpService.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.ybmanage.service;
+package com.healthlink.his.web.ybmanage.service;
 
 import com.core.common.core.domain.R;
-import com.openhis.ybelep.domain.*;
+import com.healthlink.his.ybelep.domain.*;
 
 /**
  *
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbService.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/IYbService.java
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbService.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/IYbService.java
index e933e7231..afd476809 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbService.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/IYbService.java
@@ -1,13 +1,13 @@
-package com.openhis.web.ybmanage.service;
+package com.healthlink.his.web.ybmanage.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.web.ybmanage.dto.Yb2401InputInpatientParamDto;
-import com.openhis.web.ybmanage.dto.Yb2403InputInpatientParamDto;
-import com.openhis.web.ybmanage.dto.YbInHospitalRegisterQueryDto;
-import com.openhis.yb.dto.Info1101Output;
-import com.openhis.yb.dto.PrePaymentDto;
-import com.openhis.yb.dto.Yb2402InputParam;
+import com.healthlink.his.web.ybmanage.dto.Yb2401InputInpatientParamDto;
+import com.healthlink.his.web.ybmanage.dto.Yb2403InputInpatientParamDto;
+import com.healthlink.his.web.ybmanage.dto.YbInHospitalRegisterQueryDto;
+import com.healthlink.his.yb.dto.Info1101Output;
+import com.healthlink.his.yb.dto.PrePaymentDto;
+import com.healthlink.his.yb.dto.Yb2402InputParam;
 
 import jakarta.servlet.http.HttpServletRequest;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbEleHttpServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/impl/YbEleHttpServiceImpl.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbEleHttpServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/impl/YbEleHttpServiceImpl.java
index aafedf511..47ad19990 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbEleHttpServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/impl/YbEleHttpServiceImpl.java
@@ -1,20 +1,20 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.ybmanage.service.impl;
+package com.healthlink.his.web.ybmanage.service.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.core.common.core.domain.R;
 import com.core.common.exception.ServiceException;
 import com.core.common.utils.SecurityUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.openhis.web.ybmanage.config.YbServiceConfig;
-import com.openhis.web.ybmanage.dto.Result;
-import com.openhis.web.ybmanage.service.IYbEleHttpService;
-import com.openhis.yb.dto.BaseInfo;
-import com.openhis.yb.dto.BaseParam;
-import com.openhis.yb.util.YbParamBuilderUtil;
-import com.openhis.ybelep.domain.*;
+import com.healthlink.his.web.ybmanage.config.YbServiceConfig;
+import com.healthlink.his.web.ybmanage.dto.Result;
+import com.healthlink.his.web.ybmanage.service.IYbEleHttpService;
+import com.healthlink.his.yb.dto.BaseInfo;
+import com.healthlink.his.yb.dto.BaseParam;
+import com.healthlink.his.yb.util.YbParamBuilderUtil;
+import com.healthlink.his.ybelep.domain.*;
 import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.client5.http.classic.methods.HttpPost;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbElepBaseServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/impl/YbElepBaseServiceImpl.java
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbElepBaseServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/impl/YbElepBaseServiceImpl.java
index d15941f30..9903757d6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbElepBaseServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/impl/YbElepBaseServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.ybmanage.service.impl;
+package com.healthlink.his.web.ybmanage.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -12,43 +12,43 @@ import com.core.common.core.domain.model.LoginUser;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.Encounter;
-import com.openhis.administration.domain.Patient;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.service.IEncounterService;
-import com.openhis.administration.service.IPatientService;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.clinical.domain.ConditionDefinition;
-import com.openhis.clinical.service.IConditionDefinitionService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.common.enums.PrescriptionType;
-import com.openhis.common.enums.RequestStatus;
-import com.openhis.common.enums.Whether;
-import com.openhis.common.enums.ybenums.YbMedType;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.financial.service.IContractService;
-import com.openhis.web.ybmanage.dto.VeriPrescriptionDetailInfoDto;
-import com.openhis.web.ybmanage.dto.VeriPrescriptionInfoDto;
-import com.openhis.web.ybmanage.dto.VeriPrescriptionParam;
-import com.openhis.web.ybmanage.mapper.YbElepMapper;
-import com.openhis.web.ybmanage.service.IYbEleBaseService;
-import com.openhis.web.ybmanage.util.YbEleParamBuilderUtil;
-import com.openhis.workflow.domain.ElepMedicationRequest;
-import com.openhis.workflow.service.IElepMedicationRequestService;
-import com.openhis.yb.domain.ClinicReg;
-import com.openhis.yb.dto.Clinic2203DiseInfoParam;
-import com.openhis.yb.dto.Clinic2203MedicalParam;
-import com.openhis.yb.service.IPerinfoService;
-import com.openhis.yb.service.IRegService;
-import com.openhis.yb.service.YbHttpUtils;
-import com.openhis.ybcatalog.domain.CatalogSpecialInsuranceDisease;
-import com.openhis.ybcatalog.service.ICatalogSpecialDiseaseService;
-import com.openhis.ybcatalog.service.ICatalogSpecialInsuranceDiseaseService;
-import com.openhis.ybelep.domain.*;
-import com.openhis.ybelep.service.*;
+import com.healthlink.his.administration.domain.Encounter;
+import com.healthlink.his.administration.domain.Patient;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.service.IEncounterService;
+import com.healthlink.his.administration.service.IPatientService;
+import com.healthlink.his.administration.service.IPractitionerService;
+import com.healthlink.his.clinical.domain.ConditionDefinition;
+import com.healthlink.his.clinical.service.IConditionDefinitionService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.PromptMsgConstant;
+import com.healthlink.his.common.constant.YbCommonConstants;
+import com.healthlink.his.common.enums.PrescriptionType;
+import com.healthlink.his.common.enums.RequestStatus;
+import com.healthlink.his.common.enums.Whether;
+import com.healthlink.his.common.enums.ybenums.YbMedType;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.financial.service.IContractService;
+import com.healthlink.his.web.ybmanage.dto.VeriPrescriptionDetailInfoDto;
+import com.healthlink.his.web.ybmanage.dto.VeriPrescriptionInfoDto;
+import com.healthlink.his.web.ybmanage.dto.VeriPrescriptionParam;
+import com.healthlink.his.web.ybmanage.mapper.YbElepMapper;
+import com.healthlink.his.web.ybmanage.service.IYbEleBaseService;
+import com.healthlink.his.web.ybmanage.util.YbEleParamBuilderUtil;
+import com.healthlink.his.workflow.domain.ElepMedicationRequest;
+import com.healthlink.his.workflow.service.IElepMedicationRequestService;
+import com.healthlink.his.yb.domain.ClinicReg;
+import com.healthlink.his.yb.dto.Clinic2203DiseInfoParam;
+import com.healthlink.his.yb.dto.Clinic2203MedicalParam;
+import com.healthlink.his.yb.service.IPerinfoService;
+import com.healthlink.his.yb.service.IRegService;
+import com.healthlink.his.yb.service.YbHttpUtils;
+import com.healthlink.his.ybcatalog.domain.CatalogSpecialInsuranceDisease;
+import com.healthlink.his.ybcatalog.service.ICatalogSpecialDiseaseService;
+import com.healthlink.his.ybcatalog.service.ICatalogSpecialInsuranceDiseaseService;
+import com.healthlink.his.ybelep.domain.*;
+import com.healthlink.his.ybelep.service.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbServiceImpl.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/impl/YbServiceImpl.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbServiceImpl.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/impl/YbServiceImpl.java
index 6b995246d..4a915773a 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbServiceImpl.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/impl/YbServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.web.ybmanage.service.impl;
+package com.healthlink.his.web.ybmanage.service.impl;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,48 +19,48 @@ import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
 import com.core.system.service.impl.SysUserServiceImpl;
 import com.core.web.util.TenantOptionUtil;
-import com.openhis.administration.domain.*;
-import com.openhis.administration.dto.ChargeItemBaseInfoDto;
-import com.openhis.administration.service.*;
-import com.openhis.clinical.domain.Condition;
-import com.openhis.clinical.domain.ConditionDefinition;
-import com.openhis.clinical.service.IConditionDefinitionService;
-import com.openhis.clinical.service.IConditionService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.common.enums.*;
-import com.openhis.common.enums.ybenums.*;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.financial.domain.Contract;
-import com.openhis.financial.domain.PaymentReconciliation;
-import com.openhis.financial.service.IContractService;
-import com.openhis.financial.service.IPaymentRecDetailService;
-import com.openhis.financial.service.IPaymentReconciliationService;
-import com.openhis.medication.service.IMedicationDispenseService;
-import com.openhis.web.document.appservice.IDocRecordAppService;
-import com.openhis.web.inhospitalcharge.dto.InHospitalRegisterQueryDto;
-import com.openhis.web.paymentmanage.dto.InpatientPreSettleDto;
-import com.openhis.web.ybmanage.dto.EncounterDiagnosisDto;
-import com.openhis.web.ybmanage.dto.Yb2401InputInpatientParamDto;
-import com.openhis.web.ybmanage.dto.Yb2403InputInpatientParamDto;
-import com.openhis.web.ybmanage.dto.YbInHospitalRegisterQueryDto;
-import com.openhis.web.ybmanage.mapper.YbMapper;
-import com.openhis.web.ybmanage.service.IYbService;
-import com.openhis.web.ybmanage.util.CsvHelperZipProcessor;
-import com.openhis.workflow.domain.ActivityDefinition;
-import com.openhis.workflow.domain.ServiceRequest;
-import com.openhis.workflow.service.IActivityDefinitionService;
-import com.openhis.workflow.service.IDeviceDispenseService;
-import com.openhis.workflow.service.IServiceRequestService;
-import com.openhis.yb.domain.*;
-import com.openhis.yb.dto.*;
-import com.openhis.yb.mapper.MedicalInsuranceMapper;
-import com.openhis.yb.service.*;
-import com.openhis.yb.service.impl.DirectoryCheckRecordServiceImpl;
-import com.openhis.yb.util.YbParamBuilderUtil;
-import com.openhis.ybcatalog.domain.*;
-import com.openhis.ybcatalog.service.*;
+import com.healthlink.his.administration.domain.*;
+import com.healthlink.his.administration.dto.ChargeItemBaseInfoDto;
+import com.healthlink.his.administration.service.*;
+import com.healthlink.his.clinical.domain.Condition;
+import com.healthlink.his.clinical.domain.ConditionDefinition;
+import com.healthlink.his.clinical.service.IConditionDefinitionService;
+import com.healthlink.his.clinical.service.IConditionService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.YbCommonConstants;
+import com.healthlink.his.common.enums.*;
+import com.healthlink.his.common.enums.ybenums.*;
+import com.healthlink.his.common.utils.EnumUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.financial.domain.Contract;
+import com.healthlink.his.financial.domain.PaymentReconciliation;
+import com.healthlink.his.financial.service.IContractService;
+import com.healthlink.his.financial.service.IPaymentRecDetailService;
+import com.healthlink.his.financial.service.IPaymentReconciliationService;
+import com.healthlink.his.medication.service.IMedicationDispenseService;
+import com.healthlink.his.web.document.appservice.IDocRecordAppService;
+import com.healthlink.his.web.inhospitalcharge.dto.InHospitalRegisterQueryDto;
+import com.healthlink.his.web.paymentmanage.dto.InpatientPreSettleDto;
+import com.healthlink.his.web.ybmanage.dto.EncounterDiagnosisDto;
+import com.healthlink.his.web.ybmanage.dto.Yb2401InputInpatientParamDto;
+import com.healthlink.his.web.ybmanage.dto.Yb2403InputInpatientParamDto;
+import com.healthlink.his.web.ybmanage.dto.YbInHospitalRegisterQueryDto;
+import com.healthlink.his.web.ybmanage.mapper.YbMapper;
+import com.healthlink.his.web.ybmanage.service.IYbService;
+import com.healthlink.his.web.ybmanage.util.CsvHelperZipProcessor;
+import com.healthlink.his.workflow.domain.ActivityDefinition;
+import com.healthlink.his.workflow.domain.ServiceRequest;
+import com.healthlink.his.workflow.service.IActivityDefinitionService;
+import com.healthlink.his.workflow.service.IDeviceDispenseService;
+import com.healthlink.his.workflow.service.IServiceRequestService;
+import com.healthlink.his.yb.domain.*;
+import com.healthlink.his.yb.dto.*;
+import com.healthlink.his.yb.mapper.MedicalInsuranceMapper;
+import com.healthlink.his.yb.service.*;
+import com.healthlink.his.yb.service.impl.DirectoryCheckRecordServiceImpl;
+import com.healthlink.his.yb.util.YbParamBuilderUtil;
+import com.healthlink.his.ybcatalog.domain.*;
+import com.healthlink.his.ybcatalog.service.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/util/CsvHelperZipProcessor.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/util/CsvHelperZipProcessor.java
similarity index 99%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/util/CsvHelperZipProcessor.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/util/CsvHelperZipProcessor.java
index 7a600cbb0..0bcd493d4 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/util/CsvHelperZipProcessor.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/util/CsvHelperZipProcessor.java
@@ -1,4 +1,4 @@
-package com.openhis.web.ybmanage.util;
+package com.healthlink.his.web.ybmanage.util;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/util/YbEleParamBuilderUtil.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/util/YbEleParamBuilderUtil.java
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/util/YbEleParamBuilderUtil.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/util/YbEleParamBuilderUtil.java
index d84771fb1..4f0cab3ce 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/util/YbEleParamBuilderUtil.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/util/YbEleParamBuilderUtil.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.ybmanage.util;
+package com.healthlink.his.web.ybmanage.util;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -11,29 +11,29 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.core.common.exception.ServiceException;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.*;
-import com.openhis.administration.service.*;
-import com.openhis.clinical.domain.Condition;
-import com.openhis.clinical.domain.ConditionDefinition;
-import com.openhis.clinical.service.IConditionDefinitionService;
-import com.openhis.clinical.service.IConditionService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.common.enums.AccountType;
-import com.openhis.common.enums.AdministrativeGender;
-import com.openhis.common.enums.EncounterClass;
-import com.openhis.common.enums.Whether;
-import com.openhis.common.enums.ybenums.*;
-import com.openhis.medication.service.IMedicationDefinitionService;
-import com.openhis.workflow.domain.ElepMedicationRequest;
-import com.openhis.workflow.service.IElepMedicationRequestService;
-import com.openhis.yb.domain.ClinicReg;
-import com.openhis.yb.service.IRegService;
-import com.openhis.ybcatalog.domain.CatalogDrugInfo;
-import com.openhis.ybcatalog.service.ICatalogDrugInfoService;
-import com.openhis.ybelep.domain.*;
-import com.openhis.ybelep.service.IElepVeriPrescriptionInfoService;
-import com.openhis.ybelep.service.IElepVeriVisitInfoService;
+import com.healthlink.his.administration.domain.*;
+import com.healthlink.his.administration.service.*;
+import com.healthlink.his.clinical.domain.Condition;
+import com.healthlink.his.clinical.domain.ConditionDefinition;
+import com.healthlink.his.clinical.service.IConditionDefinitionService;
+import com.healthlink.his.clinical.service.IConditionService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.YbCommonConstants;
+import com.healthlink.his.common.enums.AccountType;
+import com.healthlink.his.common.enums.AdministrativeGender;
+import com.healthlink.his.common.enums.EncounterClass;
+import com.healthlink.his.common.enums.Whether;
+import com.healthlink.his.common.enums.ybenums.*;
+import com.healthlink.his.medication.service.IMedicationDefinitionService;
+import com.healthlink.his.workflow.domain.ElepMedicationRequest;
+import com.healthlink.his.workflow.service.IElepMedicationRequestService;
+import com.healthlink.his.yb.domain.ClinicReg;
+import com.healthlink.his.yb.service.IRegService;
+import com.healthlink.his.ybcatalog.domain.CatalogDrugInfo;
+import com.healthlink.his.ybcatalog.service.ICatalogDrugInfoService;
+import com.healthlink.his.ybelep.domain.*;
+import com.healthlink.his.ybelep.service.IElepVeriPrescriptionInfoService;
+import com.healthlink.his.ybelep.service.IElepVeriVisitInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Financial3203VO.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/vo/Financial3203VO.java
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Financial3203VO.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/vo/Financial3203VO.java
index d725f1ed1..5c80c6831 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Financial3203VO.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/vo/Financial3203VO.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.ybmanage.vo;
+package com.healthlink.his.web.ybmanage.vo;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201DetailVO.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/vo/Settlement3201DetailVO.java
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201DetailVO.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/vo/Settlement3201DetailVO.java
index 41d8bb69b..497e3e4c6 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201DetailVO.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/vo/Settlement3201DetailVO.java
@@ -1,4 +1,4 @@
-package com.openhis.web.ybmanage.vo;
+package com.healthlink.his.web.ybmanage.vo;
 
 import java.math.BigDecimal;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201VO.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/vo/Settlement3201VO.java
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201VO.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/vo/Settlement3201VO.java
index e540075bf..ae2b51582 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201VO.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/vo/Settlement3201VO.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.ybmanage.vo;
+package com.healthlink.his.web.ybmanage.vo;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3202VO.java b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/vo/Settlement3202VO.java
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3202VO.java
rename to openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/vo/Settlement3202VO.java
index de67511fa..f701ceefb 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3202VO.java
+++ b/openhis-server-new/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/vo/Settlement3202VO.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.web.ybmanage.vo;
+package com.healthlink.his.web.ybmanage.vo;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-application/src/main/resources/META-INF/spring-devtools.properties b/openhis-server-new/healthlink-his-application/src/main/resources/META-INF/spring-devtools.properties
similarity index 100%
rename from openhis-server-new/openhis-application/src/main/resources/META-INF/spring-devtools.properties
rename to openhis-server-new/healthlink-his-application/src/main/resources/META-INF/spring-devtools.properties
diff --git a/openhis-server-new/openhis-application/src/main/resources/application-dev.yml b/openhis-server-new/healthlink-his-application/src/main/resources/application-dev.yml
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/resources/application-dev.yml
rename to openhis-server-new/healthlink-his-application/src/main/resources/application-dev.yml
index d895ecc66..c5844befe 100755
--- a/openhis-server-new/openhis-application/src/main/resources/application-dev.yml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/application-dev.yml
@@ -14,7 +14,7 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:postgresql://192.168.110.252:15432/postgresql?currentSchema=hisdev&characterEncoding=UTF-8&client_encoding=UTF-8
+        url: jdbc:postgresql://192.168.110.252:15432/postgresql?currentSchema=healthlink_his&characterEncoding=UTF-8&client_encoding=UTF-8
         username: postgresql
         password: Jchl1528  # 请替换为实际的数据库密码
       # 从库数据源
@@ -57,7 +57,7 @@ spring:
         allow:
         url-pattern: /druid/*
         # 控制台管理用户名和密码
-        login-username: openhis
+        login-username: healthlink-his
         login-password: 123456
       filter:
         stat:
@@ -99,5 +99,5 @@ server:
   port: 18080
   servlet:
     # 应用的访问路径
-    context-path: /openhis
+    context-path: /healthlink-his
 
diff --git a/openhis-server-new/openhis-application/src/main/resources/application-dev.yml.bak b/openhis-server-new/healthlink-his-application/src/main/resources/application-dev.yml.bak
similarity index 100%
rename from openhis-server-new/openhis-application/src/main/resources/application-dev.yml.bak
rename to openhis-server-new/healthlink-his-application/src/main/resources/application-dev.yml.bak
diff --git a/openhis-server-new/openhis-application/src/main/resources/application-prd.yml b/openhis-server-new/healthlink-his-application/src/main/resources/application-prd.yml
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/resources/application-prd.yml
rename to openhis-server-new/healthlink-his-application/src/main/resources/application-prd.yml
index 91f6c8851..7f2f27032 100755
--- a/openhis-server-new/openhis-application/src/main/resources/application-prd.yml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/application-prd.yml
@@ -47,7 +47,7 @@ spring:
         allow:
         url-pattern: /druid/*
         # 控制台管理用户名和密码
-        login-username: openhis
+        login-username: healthlink-his
         login-password: 123456
       filter:
         stat:
@@ -91,4 +91,4 @@ server:
   port: 18082
   servlet:
     # 应用的访问路径
-    context-path: /openhis
\ No newline at end of file
+    context-path: /healthlink-his
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/application-test.yml b/openhis-server-new/healthlink-his-application/src/main/resources/application-test.yml
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/resources/application-test.yml
rename to openhis-server-new/healthlink-his-application/src/main/resources/application-test.yml
index 8615df62c..e4eeb8125 100755
--- a/openhis-server-new/openhis-application/src/main/resources/application-test.yml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/application-test.yml
@@ -47,7 +47,7 @@ spring:
         allow:
         url-pattern: /druid/*
         # 控制台管理用户名和密码
-        login-username: openhis
+        login-username: healthlink-his
         login-password: 123456
       filter:
         stat:
@@ -91,4 +91,4 @@ server:
   port: 18081
   servlet:
     # 应用的访问路径
-    context-path: /openhis
\ No newline at end of file
+    context-path: /healthlink-his
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/application.yml b/openhis-server-new/healthlink-his-application/src/main/resources/application.yml
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/resources/application.yml
rename to openhis-server-new/healthlink-his-application/src/main/resources/application.yml
index 6910f0d10..d2304c09c 100755
--- a/openhis-server-new/openhis-application/src/main/resources/application.yml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/application.yml
@@ -17,7 +17,7 @@ core:
 server:
   # 应用上下文路径
   servlet:
-    context-path: /openhis
+    context-path: /healthlink-his
   tomcat:
     # tomcat的URI编码
     uri-encoding: UTF-8
@@ -32,11 +32,11 @@ server:
 # 日志配置
 logging:
   level:
-    com.openhis: info
+    com.healthlink.his: info
     org.springframework: warn
     # MyBatis和MyBatis-Plus日志
     com.baomidou.mybatisplus: debug
-    com.openhis.web.regdoctorstation.mapper: info
+    com.healthlink.his.web.regdoctorstation.mapper: info
     # JDBC日志
     org.springframework.jdbc.core: info
     # Druid SQL日志
@@ -92,7 +92,7 @@ token:
 # MyBatis配置
 mybatis-plus:
   # 搜索指定包别名
-  typeAliasesPackage: com.core.**.domain,com.openhis.**.domain
+  typeAliasesPackage: com.core.**.domain,com.healthlink.his.**.domain
   # 配置mapper的扫描，找到所有的mapper.xml映射文件
   mapperLocations: classpath*:mapper/**/*Mapper.xml
   # 加载全局的配置文件
@@ -121,7 +121,7 @@ springdoc:
     enabled: true
     tags-sorter: alpha
     operations-sorter: alpha
-  packages-to-scan: com.core.web,com.openhis.web
+  packages-to-scan: com.core.web,com.healthlink.his.web
 
 # 防止XSS攻击
 xss:
diff --git a/openhis-server-new/openhis-application/src/main/resources/banner.txt b/openhis-server-new/healthlink-his-application/src/main/resources/banner.txt
similarity index 100%
rename from openhis-server-new/openhis-application/src/main/resources/banner.txt
rename to openhis-server-new/healthlink-his-application/src/main/resources/banner.txt
diff --git a/openhis-server-new/openhis-application/src/main/resources/config/flow.el.xml b/openhis-server-new/healthlink-his-application/src/main/resources/config/flow.el.xml
similarity index 100%
rename from openhis-server-new/openhis-application/src/main/resources/config/flow.el.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/config/flow.el.xml
diff --git a/openhis-server-new/openhis-application/src/main/resources/db/migration/README.md b/openhis-server-new/healthlink-his-application/src/main/resources/db/migration/README.md
similarity index 100%
rename from openhis-server-new/openhis-application/src/main/resources/db/migration/README.md
rename to openhis-server-new/healthlink-his-application/src/main/resources/db/migration/README.md
diff --git a/openhis-server-new/openhis-application/src/main/resources/db/migration/V1__baseline_marker.sql b/openhis-server-new/healthlink-his-application/src/main/resources/db/migration/V1__baseline_marker.sql
similarity index 100%
rename from openhis-server-new/openhis-application/src/main/resources/db/migration/V1__baseline_marker.sql
rename to openhis-server-new/healthlink-his-application/src/main/resources/db/migration/V1__baseline_marker.sql
diff --git a/openhis-server-new/openhis-application/src/main/resources/http.yml b/openhis-server-new/healthlink-his-application/src/main/resources/http.yml
similarity index 100%
rename from openhis-server-new/openhis-application/src/main/resources/http.yml
rename to openhis-server-new/healthlink-his-application/src/main/resources/http.yml
diff --git a/openhis-server-new/openhis-application/src/main/resources/i18n/messages.properties b/openhis-server-new/healthlink-his-application/src/main/resources/i18n/messages.properties
similarity index 100%
rename from openhis-server-new/openhis-application/src/main/resources/i18n/messages.properties
rename to openhis-server-new/healthlink-his-application/src/main/resources/i18n/messages.properties
diff --git a/openhis-server-new/openhis-application/src/main/resources/i18n/messages_zh_CN.properties b/openhis-server-new/healthlink-his-application/src/main/resources/i18n/messages_zh_CN.properties
similarity index 100%
rename from openhis-server-new/openhis-application/src/main/resources/i18n/messages_zh_CN.properties
rename to openhis-server-new/healthlink-his-application/src/main/resources/i18n/messages_zh_CN.properties
diff --git a/openhis-server-new/openhis-application/src/main/resources/logback.xml b/openhis-server-new/healthlink-his-application/src/main/resources/logback.xml
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/resources/logback.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/logback.xml
index 8fbae8ba5..164256bb4 100755
--- a/openhis-server-new/openhis-application/src/main/resources/logback.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/logback.xml
@@ -85,7 +85,7 @@
     </appender>
 
     <!-- 在原有logger配置下方添加 -->
-    <logger name="com.openhis.yb.service.YbManager" level="info" additivity="false">
+    <logger name="com.healthlink.his.yb.service.YbManager" level="info" additivity="false">
         <appender-ref ref="YB_LOGS" />
     </logger>
 
@@ -102,7 +102,7 @@
         </encoder>
     </appender>
     <!-- 在原有logger配置下方添加 -->
-    <logger name="com.openhis.web.paymentmanage.appservice.impl.PaymentRecServiceImpl" level="info" additivity="false">
+    <logger name="com.healthlink.his.web.paymentmanage.appservice.impl.PaymentRecServiceImpl" level="info" additivity="false">
         <appender-ref ref="PAYMENT_LOGS" />
     </logger>
 
@@ -119,7 +119,7 @@
         </encoder>
     </appender>
     <!-- 在原有logger配置下方添加 -->
-    <logger name="com.openhis.web.paymentmanage.appservice.impl.EleInvoiceServiceImpl" level="info" additivity="false">
+    <logger name="com.healthlink.his.web.paymentmanage.appservice.impl.EleInvoiceServiceImpl" level="info" additivity="false">
         <appender-ref ref="E_INVOICE_LOGS" />
     </logger>
 
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/InventoryAdjustPriceMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/InventoryAdjustPriceMapper.xml
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/InventoryAdjustPriceMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/InventoryAdjustPriceMapper.xml
index 0c74ce55c..644de4bbe 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/InventoryAdjustPriceMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/InventoryAdjustPriceMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.inventorymanage.mapper.InventoryAdjustPriceMapper">
+<mapper namespace="com.healthlink.his.web.inventorymanage.mapper.InventoryAdjustPriceMapper">
 
     <select id="selectReceiptPageByAdjustPrice"
-            resultType="com.openhis.web.inventorymanage.dto.InventoryAdjustPriceDto">
+            resultType="com.healthlink.his.web.inventorymanage.dto.InventoryAdjustPriceDto">
         SELECT T2.supply_bus_no,
                T2.status_enum,
                T2.type_enum,
@@ -45,7 +45,7 @@
             ${ew.customSqlSegment}
     </select>
 
-    <select id="searchPageByExamine" resultType="com.openhis.web.adjustprice.dto.ChangePricePageDto">
+    <select id="searchPageByExamine" resultType="com.healthlink.his.web.adjustprice.dto.ChangePricePageDto">
         select t2.bus_no,
                t2.status_enum,
                t2.approver_id,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/InventoryDetailsMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/InventoryDetailsMapper.xml
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/InventoryDetailsMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/InventoryDetailsMapper.xml
index 2de5d6924..0acbe095a 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/InventoryDetailsMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/InventoryDetailsMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.inventorymanage.mapper.InventoryDetailsMapper">
+<mapper namespace="com.healthlink.his.web.inventorymanage.mapper.InventoryDetailsMapper">
 
     <select id="selectPurchaseInDetailsPage"
-            resultType="com.openhis.web.inventorymanage.dto.InventoryDetailsPageDto">
+            resultType="com.healthlink.his.web.inventorymanage.dto.InventoryDetailsPageDto">
         SELECT T7.id,                        --id
                T7.bus_no,                    --单据号
                T7.status_enum,               --单据类型
@@ -125,7 +125,7 @@
     </select>
 
     <select id="selectTransferDetailsPage"
-            resultType="com.openhis.web.inventorymanage.dto.InventoryDetailsPageDto">
+            resultType="com.healthlink.his.web.inventorymanage.dto.InventoryDetailsPageDto">
         SELECT T7.id,                        --id
                T7.bus_no,                    --单据号
                T7.status_enum,               --单据类型
@@ -254,7 +254,7 @@
             ${ew.customSqlSegment}
     </select>
     <select id="selectRequisitionOutDetailsPage"
-            resultType="com.openhis.web.inventorymanage.dto.InventoryDetailsPageDto">
+            resultType="com.healthlink.his.web.inventorymanage.dto.InventoryDetailsPageDto">
         SELECT T7.id,                        --id
                T7.bus_no,                    --单据号
                T7.status_enum,               --单据类型
@@ -351,7 +351,7 @@
             ${ew.customSqlSegment}
     </select>
     <select id="selectInventoryStockDetailsPage"
-            resultType="com.openhis.web.inventorymanage.dto.InventoryDetailsPageDto">
+            resultType="com.healthlink.his.web.inventorymanage.dto.InventoryDetailsPageDto">
         SELECT T6.id,                        --id
                T6.bus_no,                    --单据号
                T6.status_enum,               --单据类型
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/InventorySettlementAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/InventorySettlementAppMapper.xml
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/InventorySettlementAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/InventorySettlementAppMapper.xml
index 4c123d8d3..735071fb1 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/InventorySettlementAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/InventorySettlementAppMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.inventorymanage.mapper.InventorySettlementAppMapper">
+<mapper namespace="com.healthlink.his.web.inventorymanage.mapper.InventorySettlementAppMapper">
     <select id="selectMedicationPage"
-            resultType="com.openhis.web.inventorymanage.dto.InventorySettlementDto">
+            resultType="com.healthlink.his.web.inventorymanage.dto.InventorySettlementDto">
         SELECT ii.item_name ,
                ii.item_no ,
                ii.item_id ,
@@ -35,7 +35,7 @@
             ${ew.customSqlSegment}
         ORDER BY ii.py_str
     </select>
-    <select id="selectMedDispenseList" resultType="com.openhis.web.inventorymanage.dto.InventoryBusinessInfoDto">
+    <select id="selectMedDispenseList" resultType="com.healthlink.his.web.inventorymanage.dto.InventoryBusinessInfoDto">
         SELECT mmd.id AS item_id ,
                mmd.unit_code ,
                mmd.min_unit_code ,
@@ -61,7 +61,7 @@
             AND mmd2.location_id = #{locationId}
     </select>
     <select id="selectInventorySupplyList"
-            resultType="com.openhis.web.inventorymanage.dto.InventoryBusinessInfoDto">
+            resultType="com.healthlink.his.web.inventorymanage.dto.InventoryBusinessInfoDto">
         SELECT mmd.id            AS item_id,
                mmd.unit_code ,
                mmd.min_unit_code ,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/LossReportFormMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/LossReportFormMapper.xml
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/LossReportFormMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/LossReportFormMapper.xml
index 5167aacae..048ede888 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/LossReportFormMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/LossReportFormMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.inventorymanage.mapper.LossReportFormMapper">
+<mapper namespace="com.healthlink.his.web.inventorymanage.mapper.LossReportFormMapper">
 
     <select id="selectLossReportFormPage"
-            resultType="com.openhis.web.inventorymanage.dto.LossReportFormPageDto">
+            resultType="com.healthlink.his.web.inventorymanage.dto.LossReportFormPageDto">
         SELECT T4.supply_bus_no,           --  单据号
                T4.type,                    --  单据类型
                T4.status_enum,             --  单据状态
@@ -46,7 +46,7 @@
               ORDER BY T1.bus_no desc) AS T4
             ${ew.customSqlSegment}
     </select>
-    <select id="selectDetail" resultType="com.openhis.web.inventorymanage.dto.ReceiptDetailDto">
+    <select id="selectDetail" resultType="com.healthlink.his.web.inventorymanage.dto.ReceiptDetailDto">
         SELECT T1.id,                                            -- ID
                T1.bus_no         AS supply_bus_no,               -- 单据号
                T1.item_id,                                       -- 物品编码
@@ -169,7 +169,7 @@
           AND T1.item_table = #{deviceTableName}
           AND T1.delete_flag = '0'
     </select>
-    <select id="getMonthlySettlementDetail" resultType="com.openhis.web.inventorymanage.dto.ReceiptDetailDto">
+    <select id="getMonthlySettlementDetail" resultType="com.healthlink.his.web.inventorymanage.dto.ReceiptDetailDto">
         SELECT T1.id,                                       -- ID
                T1.bus_no    AS supply_bus_no,               -- 单据号
                T1.item_id,                                  -- 物品编码
@@ -297,7 +297,7 @@
           AND T1.delete_flag = '0'
     </select>
 
-    <select id="selectLossDetail" resultType="com.openhis.web.inventorymanage.dto.LossReceiptDetailDto">
+    <select id="selectLossDetail" resultType="com.healthlink.his.web.inventorymanage.dto.LossReceiptDetailDto">
         SELECT T1.id,                                            -- ID
                T1.bus_no         AS supply_bus_no,               -- 单据号
                T1.item_id,                                       -- 物品编码
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductDetailAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/ProductDetailAppMapper.xml
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductDetailAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/ProductDetailAppMapper.xml
index f0a6aec4a..236acb0cb 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductDetailAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/ProductDetailAppMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.inventorymanage.mapper.ProductDetailAppMapper">
+<mapper namespace="com.healthlink.his.web.inventorymanage.mapper.ProductDetailAppMapper">
 
     <select id="selectProductDetailsPage"
-            resultType="com.openhis.web.inventorymanage.dto.ProductDetailPageDto">
+            resultType="com.healthlink.his.web.inventorymanage.dto.ProductDetailPageDto">
         SELECT ii.inventory_id,
                ii.production_date,
                ii.expiration_date,
@@ -163,7 +163,7 @@ LEFT JOIN adm_charge_item_def_detail acidd
     </select>
 
     <select id="getProductDetailPageAndTranslateField"
-            resultType="com.openhis.web.inventorymanage.dto.ProductDetailPageDto">
+            resultType="com.healthlink.his.web.inventorymanage.dto.ProductDetailPageDto">
         SELECT *
         FROM (SELECT DISTINCT ii.inventory_id,
                               ii.production_date,
@@ -333,7 +333,7 @@ WHERE wii.item_table = #{admDeviceDefinition}
         ORDER BY py_str
     </select>
     <select id="selectProductDetailsBackupPage"
-            resultType="com.openhis.web.inventorymanage.dto.ProductDetailPageDto">
+            resultType="com.healthlink.his.web.inventorymanage.dto.ProductDetailPageDto">
         SELECT ii.med_category_code,
                ii.dev_category_code,
                ii.item_name,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductStocktakingMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/ProductStocktakingMapper.xml
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductStocktakingMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/ProductStocktakingMapper.xml
index 6a21eabf8..a18364a86 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductStocktakingMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/ProductStocktakingMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.inventorymanage.mapper.ProductStocktakingMapper">
+<mapper namespace="com.healthlink.his.web.inventorymanage.mapper.ProductStocktakingMapper">
 
     <select id="selectStocktakingReceiptPage"
-            resultType="com.openhis.web.inventorymanage.dto.ReceiptPageDto">
+            resultType="com.healthlink.his.web.inventorymanage.dto.ReceiptPageDto">
         SELECT T4.tenant_id,
                T4.supply_bus_no,             -- 单据号
                T4.type_enum,                 -- 类型
@@ -52,7 +52,7 @@
               ORDER BY T1.bus_no desc) AS T4
             ${ew.customSqlSegment}
     </select>
-    <select id="selectDetail" resultType="com.openhis.web.inventorymanage.dto.ReceiptDetailDto">
+    <select id="selectDetail" resultType="com.healthlink.his.web.inventorymanage.dto.ReceiptDetailDto">
         SELECT T1.id,                                 --ID
                T1.bus_no,                             --单据号
                T1.trace_no,                           --追溯码
@@ -171,7 +171,7 @@
           AND T1.item_table = #{deviceTableName}
     </select>
     <select id="selectStocktakingReceiptDetail"
-            resultType="com.openhis.web.inventorymanage.dto.ReceiptDetailDto">
+            resultType="com.healthlink.his.web.inventorymanage.dto.ReceiptDetailDto">
         SELECT T6.tenant_id,
                T6.id                AS item_Id,                   -- Id
                T6.bus_no            AS item_bus_no,               -- 编码
@@ -294,7 +294,7 @@
             ${ew.customSqlSegment}
     </select>
     <select id="selectAutoStocktakingBatch"
-            resultType="com.openhis.web.inventorymanage.dto.ProductStocktakingDto">
+            resultType="com.healthlink.his.web.inventorymanage.dto.ProductStocktakingDto">
         SELECT T1.id,
                T1.item_table,                                         --  项目
                T2.id                        AS item_id,               --  项目id
@@ -370,7 +370,7 @@
           AND T1.inventory_status_enum = #{inventoryStatusEnum}
           AND T1.item_table = #{deviceTableName}
     </select>
-    <select id="getMonthlySettlementDetail" resultType="com.openhis.web.inventorymanage.dto.ReceiptDetailDto">
+    <select id="getMonthlySettlementDetail" resultType="com.healthlink.his.web.inventorymanage.dto.ReceiptDetailDto">
         SELECT T1.id,                                 -- ID
                T1.bus_no,                             -- 单据号
                T1.trace_no,                           -- 追溯码
@@ -522,7 +522,7 @@
     </select>
 
 
-    <select id="selectInventoryReceiptDetail" resultType="com.openhis.web.inventorymanage.dto.InventoryReceiptDetailDto">
+    <select id="selectInventoryReceiptDetail" resultType="com.healthlink.his.web.inventorymanage.dto.InventoryReceiptDetailDto">
         SELECT T1.id,                                 -- ID
                T1.bus_no,                             -- 单据号
                T1.trace_no,                           -- 追溯码
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductTransferMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/ProductTransferMapper.xml
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductTransferMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/ProductTransferMapper.xml
index 86f4e128b..164e638e2 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductTransferMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/ProductTransferMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.inventorymanage.mapper.ProductTransferMapper">
+<mapper namespace="com.healthlink.his.web.inventorymanage.mapper.ProductTransferMapper">
 
     <select id="selectProductTransferPage"
-            resultType="com.openhis.web.inventorymanage.dto.ProductTransferPageDto">
+            resultType="com.healthlink.his.web.inventorymanage.dto.ProductTransferPageDto">
         SELECT T2.supply_bus_no,         -- 商品调拨单据号
                T2.item_table,            -- 项目(药品类型)
                T2.status_enum,           -- 单据状态
@@ -55,7 +55,7 @@
              ) AS T2
             ${ew.customSqlSegment}
     </select>
-    <select id="selectBatchTransferDetail" resultType="com.openhis.web.inventorymanage.dto.ProductTransferDetailDto">
+    <select id="selectBatchTransferDetail" resultType="com.healthlink.his.web.inventorymanage.dto.ProductTransferDetailDto">
         SELECT A.tenant_id,
                A.id,
                A.medication_type,        -- 药品类型
@@ -186,7 +186,7 @@
     </select>
 
 
-    <select id="selectDetail" resultType="com.openhis.web.inventorymanage.dto.ProductTransferDetailDto">
+    <select id="selectDetail" resultType="com.healthlink.his.web.inventorymanage.dto.ProductTransferDetailDto">
         SELECT DISTINCT T1.id,
                         T1.bus_no,                                           -- 商品调拨单据号
                         T1.apply_time,                                       -- 申请时间
@@ -340,7 +340,7 @@
           AND T1.delete_flag = '0'
     </select>
 
-    <select id="getMonthlySettlementDetail" resultType="com.openhis.web.inventorymanage.dto.ReceiptDetailDto">
+    <select id="getMonthlySettlementDetail" resultType="com.healthlink.his.web.inventorymanage.dto.ReceiptDetailDto">
         SELECT DISTINCT T1.id,
                         T1.bus_no,                                           -- 商品调拨单据号
                         T1.occurrence_time,                                       -- 制单时间
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml
index 884ad5710..265a101d4 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.inventorymanage.mapper.PurchaseInventoryMapper">
+<mapper namespace="com.healthlink.his.web.inventorymanage.mapper.PurchaseInventoryMapper">
 
     <select id="selectInventoryReceiptPage"
-            resultType="com.openhis.web.inventorymanage.dto.ReceiptPageDto">
+            resultType="com.healthlink.his.web.inventorymanage.dto.ReceiptPageDto">
         SELECT T2.supply_bus_no,
                T2.status_enum,
                T2.type_enum,
@@ -63,7 +63,7 @@
              ) AS T2
             ${ew.customSqlSegment}
     </select>
-    <select id="selectDetail" resultType="com.openhis.web.inventorymanage.dto.ReceiptDetailDto">
+    <select id="selectDetail" resultType="com.healthlink.his.web.inventorymanage.dto.ReceiptDetailDto">
         SELECT T1.id,
                T1.bus_no,
                T1.item_quantity,
@@ -179,7 +179,7 @@
         WHERE T1.bus_no = #{busNo}
           AND T1.delete_flag = '0'
     </select>
-    <select id="getMonthlySettlementDetail" resultType="com.openhis.web.inventorymanage.dto.ReceiptDetailDto">
+    <select id="getMonthlySettlementDetail" resultType="com.healthlink.his.web.inventorymanage.dto.ReceiptDetailDto">
         SELECT T1.id,
         T1.bus_no,
         T1.item_quantity,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseReturnMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/PurchaseReturnMapper.xml
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseReturnMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/PurchaseReturnMapper.xml
index 69d386ff8..d1909f8f0 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseReturnMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/PurchaseReturnMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.inventorymanage.mapper.PurchaseReturnMapper">
-    <select id="selectDetail" resultType="com.openhis.web.inventorymanage.dto.PurchaseReturnDetailDto">
+<mapper namespace="com.healthlink.his.web.inventorymanage.mapper.PurchaseReturnMapper">
+    <select id="selectDetail" resultType="com.healthlink.his.web.inventorymanage.dto.PurchaseReturnDetailDto">
         SELECT T1.bus_no,
                T1.original_bus_no,
                CASE
@@ -264,7 +264,7 @@
     </select>
 
     <select id="selectGeneratedDetail"
-            resultType="com.openhis.web.inventorymanage.dto.PurchaseReturnPageDto">
+            resultType="com.healthlink.his.web.inventorymanage.dto.PurchaseReturnPageDto">
         SELECT T1.bus_no AS supply_bus_no,
                T1.status_enum,
                T1.type_enum,
@@ -288,7 +288,7 @@
                  T1.approval_time
         ORDER BY T1.bus_no DESC
     </select>
-    <select id="getMonthlySettlementDetail" resultType="com.openhis.web.inventorymanage.dto.PurchaseReturnDetailDto">
+    <select id="getMonthlySettlementDetail" resultType="com.healthlink.his.web.inventorymanage.dto.PurchaseReturnDetailDto">
         SELECT T1.bus_no,
                T1.original_bus_no,
                T1.item_quantity  AS item_quantity,               -- 退库数量
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ReceiptApprovalMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/ReceiptApprovalMapper.xml
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ReceiptApprovalMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/ReceiptApprovalMapper.xml
index 2b82ad60c..3ebecd012 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ReceiptApprovalMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/ReceiptApprovalMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.inventorymanage.mapper.ReceiptApprovalMapper">
+<mapper namespace="com.healthlink.his.web.inventorymanage.mapper.ReceiptApprovalMapper">
 
-    <select id="selectSupplyDetail" resultType="com.openhis.web.inventorymanage.dto.SupplyItemDetailDto">
+    <select id="selectSupplyDetail" resultType="com.healthlink.his.web.inventorymanage.dto.SupplyItemDetailDto">
         SELECT T1.id            AS supply_id,
                T1.item_table,
                T1.item_id,
@@ -112,7 +112,7 @@
           AND T1.delete_flag = '0'
     </select>
 
-    <select id="selectChargeDetail" resultType="com.openhis.web.inventorymanage.dto.ItemChargeDetailDto">
+    <select id="selectChargeDetail" resultType="com.healthlink.his.web.inventorymanage.dto.ItemChargeDetailDto">
         SELECT T1.id AS definition_id,
         T1.instance_id,
         T1.charge_name,
@@ -137,7 +137,7 @@
             #{itemId}
         </foreach>
     </select>
-    <select id="selectReceiptPage" resultType="com.openhis.web.inventorymanage.dto.ReceiptPageDto">
+    <select id="selectReceiptPage" resultType="com.healthlink.his.web.inventorymanage.dto.ReceiptPageDto">
         SELECT T2.supply_bus_no,
                T2.status_enum,
                T2.type_enum,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/RequisitionIssueMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/RequisitionIssueMapper.xml
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/RequisitionIssueMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/RequisitionIssueMapper.xml
index d122c1783..dc5cdfae5 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/RequisitionIssueMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/RequisitionIssueMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.inventorymanage.mapper.RequisitionIssueMapper">
-    <select id="selectRequisitionDepartment" resultType="com.openhis.web.inventorymanage.dto.IssueDepartmentDto">
+<mapper namespace="com.healthlink.his.web.inventorymanage.mapper.RequisitionIssueMapper">
+    <select id="selectRequisitionDepartment" resultType="com.healthlink.his.web.inventorymanage.dto.IssueDepartmentDto">
         SELECT id AS location_id,--科室id
                name,--名称
                type_enum--科室
@@ -10,7 +10,7 @@
           AND delete_flag = '0'
     </select>
     <select id="selectRequisitionIssuePage"
-            resultType="com.openhis.web.inventorymanage.dto.IssuePageDto">
+            resultType="com.healthlink.his.web.inventorymanage.dto.IssuePageDto">
         SELECT T2.supply_bus_no,--单据号
                T2.status_enum,--状态
                T2.approver_id,--审批人
@@ -53,7 +53,7 @@
              ) AS T2
             ${ew.customSqlSegment}
     </select>
-    <select id="requisitionIssueDetail" resultType="com.openhis.web.inventorymanage.dto.IssueDetailDto">
+    <select id="requisitionIssueDetail" resultType="com.healthlink.his.web.inventorymanage.dto.IssueDetailDto">
         SELECT T1.id,
                T1.bus_no,--单据号
                T1.item_id,
@@ -194,7 +194,7 @@
           AND T1.item_table = #{deviceTableName}
           AND T1.delete_flag = '0'
     </select>
-    <select id="getMonthlySettlementDetail" resultType="com.openhis.web.inventorymanage.dto.IssueDetailDto">
+    <select id="getMonthlySettlementDetail" resultType="com.healthlink.his.web.inventorymanage.dto.IssueDetailDto">
         SELECT T1.id,
         T1.bus_no,--单据号
         T1.item_id,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ReturnIssueMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/ReturnIssueMapper.xml
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ReturnIssueMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/ReturnIssueMapper.xml
index e1b8904bd..1c3fd42a6 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ReturnIssueMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/ReturnIssueMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.inventorymanage.mapper.ReturnIssueMapper">
-    <select id="selectReturnIssueDepartment" resultType="com.openhis.web.inventorymanage.dto.IssueDepartmentDto">
+<mapper namespace="com.healthlink.his.web.inventorymanage.mapper.ReturnIssueMapper">
+    <select id="selectReturnIssueDepartment" resultType="com.healthlink.his.web.inventorymanage.dto.IssueDepartmentDto">
         SELECT id AS location_id,--科室id
                name,--名称
                type_enum--科室
@@ -10,7 +10,7 @@
           AND delete_flag = '0'
     </select>
     <select id="selectReturnIssuePage"
-            resultType="com.openhis.web.inventorymanage.dto.IssuePageDto">
+            resultType="com.healthlink.his.web.inventorymanage.dto.IssuePageDto">
         SELECT T2.supply_bus_no,--单据号
                T2.status_enum,--状态
                T2.approver_id,--审批人
@@ -51,7 +51,7 @@
             ) AS T2
         ${ew.customSqlSegment}
     </select>
-    <select id="returnIssueDetail" resultType="com.openhis.web.inventorymanage.dto.IssueDetailDto">
+    <select id="returnIssueDetail" resultType="com.healthlink.his.web.inventorymanage.dto.IssueDetailDto">
         SELECT T1.id,
                T1.bus_no,--单据号
                T1.item_id,
@@ -192,7 +192,7 @@
             AND T1.item_table = #{deviceTableName}
             AND T1.delete_flag = '0'
     </select>
-    <select id="getMonthlySettlementDetail" resultType="com.openhis.web.inventorymanage.dto.IssueDetailDto">
+    <select id="getMonthlySettlementDetail" resultType="com.healthlink.his.web.inventorymanage.dto.IssueDetailDto">
         SELECT T1.id,
                T1.bus_no,--单据号
                T1.item_id,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/TraceNoAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/TraceNoAppMapper.xml
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/TraceNoAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/TraceNoAppMapper.xml
index 3951122d2..778bac506 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/TraceNoAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/Inventorymanage/TraceNoAppMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.inventorymanage.mapper.TraceNoAppMapper">
-    <select id="selectDetailsPage" resultType="com.openhis.web.inventorymanage.dto.TraceNoDetailsPageDto">
+<mapper namespace="com.healthlink.his.web.inventorymanage.mapper.TraceNoAppMapper">
+    <select id="selectDetailsPage" resultType="com.healthlink.his.web.inventorymanage.dto.TraceNoDetailsPageDto">
         SELECT T4.id,--ID
                T4.name,--药品名
                T4.location_id,--药房药库
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryCommonMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryCommonMapper.xml
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryCommonMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryCommonMapper.xml
index fc30f093b..b9153b351 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryCommonMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryCommonMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper">
+<mapper namespace="com.healthlink.his.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper">
     <select id="getMedicationInfo"
-            resultType="com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryMedicationInfoDto">
+            resultType="com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryMedicationInfoDto">
         SELECT T6.id,--物品id
                T6.bus_no,--   药品编号
                T6.name,-- 物品名称
@@ -172,7 +172,7 @@
             ${ew.customSqlSegment}
     </select>
     <select id="getPage"
-            resultType="com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDto">
+            resultType="com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDto">
         SELECT T4.tenant_id,
                T4.supply_bus_no, --单据号
                T4.type_enum,     --类型
@@ -233,7 +233,7 @@
             ${ew.customSqlSegment}
     </select>
     <select id="getDetailPage"
-            resultType="com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto">
+            resultType="com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto">
         SELECT T1.id,                             --ID
                T1.bus_no,                         --单据号
                T2.bus_no        AS item_bus_no,   --药品编码
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryDispensingOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryDispensingOrderMapper.xml
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryDispensingOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryDispensingOrderMapper.xml
index 6b41b8f9e..e96b72583 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryDispensingOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryDispensingOrderMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryDispensingOrderMapper">
+<mapper namespace="com.healthlink.his.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryDispensingOrderMapper">
     <select id="getInfo"
-            resultType="com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto">
+            resultType="com.healthlink.his.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto">
      SELECT  string_agg(T1.id::text, ',' ORDER BY T1.id) AS dispense_ids,--药品发放id
              T1.status_enum,--发放状态
              CASE T3.category_enum
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryProfitLossOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryProfitLossOrderMapper.xml
similarity index 57%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryProfitLossOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryProfitLossOrderMapper.xml
index d4c61a3a7..6bd559acb 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryProfitLossOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryProfitLossOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryProfitLossOrderMapper">
+<mapper namespace="com.healthlink.his.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryProfitLossOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryRequisitionOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryRequisitionOrderMapper.xml
similarity index 57%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryRequisitionOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryRequisitionOrderMapper.xml
index cd557c197..e29b78c57 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryRequisitionOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryRequisitionOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryRequisitionOrderMapper">
+<mapper namespace="com.healthlink.his.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryRequisitionOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryReturnToWarehouseOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryReturnToWarehouseOrderMapper.xml
similarity index 56%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryReturnToWarehouseOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryReturnToWarehouseOrderMapper.xml
index d61a75ea4..f17317407 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryReturnToWarehouseOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryReturnToWarehouseOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryReturnToWarehouseOrderMapper">
+<mapper namespace="com.healthlink.his.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryReturnToWarehouseOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryStockInOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryStockInOrderMapper.xml
similarity index 58%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryStockInOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryStockInOrderMapper.xml
index b6ae2eaea..730154e37 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryStockInOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryStockInOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryStockInOrderMapper">
+<mapper namespace="com.healthlink.his.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryStockInOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryStocktakingOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryStocktakingOrderMapper.xml
similarity index 57%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryStocktakingOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryStocktakingOrderMapper.xml
index 35cc02c1e..4110e8ea5 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryStocktakingOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryStocktakingOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryStocktakingOrderMapper">
+<mapper namespace="com.healthlink.his.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryStocktakingOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryTransferInOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryTransferInOrderMapper.xml
similarity index 57%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryTransferInOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryTransferInOrderMapper.xml
index 314aca69d..3c328b2d0 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryTransferInOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryTransferInOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryTransferInOrderMapper">
+<mapper namespace="com.healthlink.his.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryTransferInOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryTransferOutOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryTransferOutOrderMapper.xml
similarity index 57%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryTransferOutOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryTransferOutOrderMapper.xml
index 40b23892d..2a069ce29 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryTransferOutOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyDispensarymanage/PharmacyDispensaryTransferOutOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryTransferOutOrderMapper">
+<mapper namespace="com.healthlink.his.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryTransferOutOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseCommonMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseCommonMapper.xml
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseCommonMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseCommonMapper.xml
index b5d702c15..ce7dd80a8 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseCommonMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseCommonMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper">
+<mapper namespace="com.healthlink.his.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper">
     <select id="getMedicationInfo"
-            resultType="com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseMedicationInfoDto">
+            resultType="com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseMedicationInfoDto">
         SELECT T6.id,--物品id
                T6.bus_no,--   药品编号
                T6.name,-- 物品名称
@@ -175,7 +175,7 @@
             ${ew.customSqlSegment}
     </select>
     <select id="getPage"
-            resultType="com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDto">
+            resultType="com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDto">
         SELECT T4.tenant_id,
                T4.supply_bus_no, --单据号
                T4.type_enum,     --类型
@@ -238,7 +238,7 @@
             ${ew.customSqlSegment}
     </select>
     <select id="getDetailPage"
-            resultType="com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto">
+            resultType="com.healthlink.his.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto">
         SELECT T1.id,                             --ID
                T1.bus_no,                         --单据号
                T2.bus_no        AS item_bus_no,   --药品编码
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseDocumentManagementMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseDocumentManagementMapper.xml
similarity index 57%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseDocumentManagementMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseDocumentManagementMapper.xml
index 0a821304f..f3815e5e9 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseDocumentManagementMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseDocumentManagementMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseDocumentManagementMapper">
+<mapper namespace="com.healthlink.his.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseDocumentManagementMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseProfitLossOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseProfitLossOrderMapper.xml
similarity index 58%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseProfitLossOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseProfitLossOrderMapper.xml
index 44a7c9cb2..4987bffee 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseProfitLossOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseProfitLossOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseProfitLossOrderMapper">
+<mapper namespace="com.healthlink.his.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseProfitLossOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehousePurchaseOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehousePurchaseOrderMapper.xml
similarity index 58%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehousePurchaseOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehousePurchaseOrderMapper.xml
index dedae60c0..2bf9f0aa4 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehousePurchaseOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehousePurchaseOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehousePurchaseOrderMapper">
+<mapper namespace="com.healthlink.his.web.pharmacyWarehousemanage.mapper.PharmacyWarehousePurchaseOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseReturnOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseReturnOrderMapper.xml
similarity index 58%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseReturnOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseReturnOrderMapper.xml
index 12a089b28..39806dd45 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseReturnOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseReturnOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseReturnOrderMapper">
+<mapper namespace="com.healthlink.his.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseReturnOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseReturnToWarehouseOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseReturnToWarehouseOrderMapper.xml
similarity index 56%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseReturnToWarehouseOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseReturnToWarehouseOrderMapper.xml
index 70483531e..8fc69f8b0 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseReturnToWarehouseOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseReturnToWarehouseOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseReturnToWarehouseOrderMapper">
+<mapper namespace="com.healthlink.his.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseReturnToWarehouseOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStockInOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStockInOrderMapper.xml
similarity index 58%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStockInOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStockInOrderMapper.xml
index ee474a756..ac64ebcea 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStockInOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStockInOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseStockInOrderMapper">
+<mapper namespace="com.healthlink.his.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseStockInOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStockOutOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStockOutOrderMapper.xml
similarity index 58%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStockOutOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStockOutOrderMapper.xml
index 439a417c1..89afbd50c 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStockOutOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStockOutOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseStockOutOrderMapper">
+<mapper namespace="com.healthlink.his.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseStockOutOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStocktakingOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStocktakingOrderMapper.xml
similarity index 57%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStocktakingOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStocktakingOrderMapper.xml
index e47cbac6b..cc4292e14 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStocktakingOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/PharmacyWarehousemanage/PharmacyWarehouseStocktakingOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseStocktakingOrderMapper">
+<mapper namespace="com.healthlink.his.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseStocktakingOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/adjustprice/AdjustPriceMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/adjustprice/AdjustPriceMapper.xml
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/adjustprice/AdjustPriceMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/adjustprice/AdjustPriceMapper.xml
index fd67328d3..84bb655a2 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/adjustprice/AdjustPriceMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/adjustprice/AdjustPriceMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.adjustprice.mapper.AdjustPriceMapper">
+<mapper namespace="com.healthlink.his.web.adjustprice.mapper.AdjustPriceMapper">
 
     <select id="selectInventoryReceiptPage"
-            resultType="com.openhis.web.inventorymanage.dto.ReceiptPageDto">
+            resultType="com.healthlink.his.web.inventorymanage.dto.ReceiptPageDto">
         SELECT T2.supply_bus_no,
                T2.status_enum,
                T2.type_enum,
@@ -61,7 +61,7 @@
             ${ew.customSqlSegment}
     </select>
 
-    <select id="searchChangePriceDataToPage" resultType="com.openhis.web.adjustprice.dto.ChangePricePageDto">
+    <select id="searchChangePriceDataToPage" resultType="com.healthlink.his.web.adjustprice.dto.ChangePricePageDto">
         select t2.bus_no,
                t2.status_enum,
                t2.approver_id,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/appointmentmanage/ClinicRoomMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/appointmentmanage/ClinicRoomMapper.xml
similarity index 83%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/appointmentmanage/ClinicRoomMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/appointmentmanage/ClinicRoomMapper.xml
index 665462e39..0cf1554c8 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/appointmentmanage/ClinicRoomMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/appointmentmanage/ClinicRoomMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.appointmentmanage.mapper.ClinicRoomMapper">
+<mapper namespace="com.healthlink.his.appointmentmanage.mapper.ClinicRoomMapper">
     
     <!-- 通用查询映射结果 -->
-    <resultMap id="ClinicRoomResult" type="com.openhis.appointmentmanage.domain.ClinicRoom">
+    <resultMap id="ClinicRoomResult" type="com.healthlink.his.appointmentmanage.domain.ClinicRoom">
         <id property="id" column="id" />
         <result property="orgName" column="org_name" />
         <result property="roomName" column="room_name" />
@@ -26,7 +26,7 @@
     </sql>
     
     <!-- 分页查询 -->
-    <select id="selectClinicRoomPage" parameterType="com.openhis.appointmentmanage.domain.ClinicRoom" resultMap="ClinicRoomResult">
+    <select id="selectClinicRoomPage" parameterType="com.healthlink.his.appointmentmanage.domain.ClinicRoom" resultMap="ClinicRoomResult">
         select
         <include refid="Base_Column_List" />
         from clinic_room
@@ -49,7 +49,7 @@
     </select>
     
     <!-- 新增 -->
-    <insert id="insertClinicRoom" parameterType="com.openhis.appointmentmanage.domain.ClinicRoom" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertClinicRoom" parameterType="com.healthlink.his.appointmentmanage.domain.ClinicRoom" useGeneratedKeys="true" keyProperty="id">
         insert into clinic_room
         (org_name, room_name, department, building, floor, room_no, is_disabled, remarks, void, create_by, create_time, update_by, update_time)
         values
@@ -57,7 +57,7 @@
     </insert>
     
     <!-- 更新 -->
-    <update id="updateClinicRoom" parameterType="com.openhis.appointmentmanage.domain.ClinicRoom">
+    <update id="updateClinicRoom" parameterType="com.healthlink.his.appointmentmanage.domain.ClinicRoom">
         update clinic_room
         set
         org_name = #{orgName},
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/appointmentmanage/DoctorScheduleMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/appointmentmanage/DoctorScheduleMapper.xml
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/appointmentmanage/DoctorScheduleMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/appointmentmanage/DoctorScheduleMapper.xml
index f9558c1d7..6991b1745 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/appointmentmanage/DoctorScheduleMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/appointmentmanage/DoctorScheduleMapper.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.appointmentmanage.mapper.DoctorScheduleMapper">
+<mapper namespace="com.healthlink.his.appointmentmanage.mapper.DoctorScheduleMapper">
 
     <!-- 自定义插入方法，明确排除id字段（数据库GENERATED ALWAYS） -->
-    <insert id="insertWithoutId" parameterType="com.openhis.appointmentmanage.domain.DoctorSchedule" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
+    <insert id="insertWithoutId" parameterType="com.healthlink.his.appointmentmanage.domain.DoctorSchedule" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
         INSERT INTO adm_doctor_schedule (
             weekday,
             time_period,
@@ -51,7 +51,7 @@
         )
     </insert>
     <!--自定义更新方法-->
-    <update id="updateDoctorSchedule" parameterType="com.openhis.appointmentmanage.domain.DoctorSchedule">
+    <update id="updateDoctorSchedule" parameterType="com.healthlink.his.appointmentmanage.domain.DoctorSchedule">
         UPDATE adm_doctor_schedule
         <set>
             <if test="weekday != null">weekday = #{weekday},</if>
@@ -79,7 +79,7 @@
 
     <!-- 联表查询：根据科室ID和日期范围查询排班信息（含具体出诊日期） -->
     <select id="selectScheduleWithDateByDeptAndRange"
-            resultType="com.openhis.appointmentmanage.domain.DoctorScheduleWithDateDto">
+            resultType="com.healthlink.his.appointmentmanage.domain.DoctorScheduleWithDateDto">
         SELECT
             ds.id,
             ds.weekday,
@@ -116,7 +116,7 @@
 
     <!-- 联表查询：获取今日所有排班 -->
     <select id="selectTodaySchedule"
-            resultType="com.openhis.appointmentmanage.domain.DoctorScheduleWithDateDto">
+            resultType="com.healthlink.his.appointmentmanage.domain.DoctorScheduleWithDateDto">
         SELECT
             ds.id,
             ds.weekday,
@@ -152,7 +152,7 @@
 
     <!-- 联表查询：获取指定医生今日排班 -->
     <select id="selectTodayMySchedule"
-            resultType="com.openhis.appointmentmanage.domain.DoctorScheduleWithDateDto">
+            resultType="com.healthlink.his.appointmentmanage.domain.DoctorScheduleWithDateDto">
         SELECT
             ds.id,
             ds.weekday,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/basedatamanage/PractitionerAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/basedatamanage/PractitionerAppMapper.xml
similarity index 86%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/basedatamanage/PractitionerAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/basedatamanage/PractitionerAppMapper.xml
index 057ca11a2..3339b9488 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/basedatamanage/PractitionerAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/basedatamanage/PractitionerAppMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.basedatamanage.mapper.PractitionerAppAppMapper">
+<mapper namespace="com.healthlink.his.web.basedatamanage.mapper.PractitionerAppAppMapper">
 
-    <select id="getUserPractitionerPage" resultType="com.openhis.web.basedatamanage.dto.UserAndPractitionerDto">
+    <select id="getUserPractitionerPage" resultType="com.healthlink.his.web.basedatamanage.dto.UserAndPractitionerDto">
         SELECT T3.tenant_id,
                T3.user_id,
                T3.practitioner_id,
@@ -53,7 +53,7 @@
             ${ew.customSqlSegment}
     </select>
 
-    <select id="getPractitionerRolesDtoList" resultType="com.openhis.web.basedatamanage.dto.PractitionerRolesDto">
+    <select id="getPractitionerRolesDtoList" resultType="com.healthlink.his.web.basedatamanage.dto.PractitionerRolesDto">
         SELECT
         sr.role_id,
         sr.role_key AS role_code,
@@ -73,7 +73,7 @@
         </if>
     </select>
 
-    <select id="getOrgAndLocationDtoList" resultType="com.openhis.web.basedatamanage.dto.PractitionerOrgAndLocationDto">
+    <select id="getOrgAndLocationDtoList" resultType="com.healthlink.his.web.basedatamanage.dto.PractitionerOrgAndLocationDto">
         SELECT
         t1.practitioner_id,
         t1.role_code,
@@ -107,7 +107,7 @@
         where practitioner_id = #{practitionerId}
     </delete>
 
-    <select id="getSelectableOrgList" resultType="com.openhis.web.basedatamanage.dto.SelectableOrgDto">
+    <select id="getSelectableOrgList" resultType="com.healthlink.his.web.basedatamanage.dto.SelectableOrgDto">
         SELECT apr.org_id AS org_id,
                ao.NAME    AS org_name
         FROM adm_practitioner_role AS apr
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/basicservice/HealthcareServiceBizMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/basicservice/HealthcareServiceBizMapper.xml
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/basicservice/HealthcareServiceBizMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/basicservice/HealthcareServiceBizMapper.xml
index dad680e8b..d38561640 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/basicservice/HealthcareServiceBizMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/basicservice/HealthcareServiceBizMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.basicservice.mapper.HealthcareServiceBizMapper">
+<mapper namespace="com.healthlink.his.web.basicservice.mapper.HealthcareServiceBizMapper">
 
-    <select id="getHealthcareServicePage" resultType="com.openhis.web.basicservice.dto.HealthcareServiceDto">
+    <select id="getHealthcareServicePage" resultType="com.healthlink.his.web.basicservice.dto.HealthcareServiceDto">
         SELECT T3.id,
                T3.tenant_id,
                T3.active_flag,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/catalogmanage/CatalogMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/catalogmanage/CatalogMapper.xml
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/catalogmanage/CatalogMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/catalogmanage/CatalogMapper.xml
index 6549292a5..ac066d3de 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/catalogmanage/CatalogMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/catalogmanage/CatalogMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.catalogmanage.mapper.CatalogMapper">
-    <select id="get1315Page" resultType="com.openhis.ybcatalog.domain.CatalogZySyndrome">
+<mapper namespace="com.healthlink.his.web.catalogmanage.mapper.CatalogMapper">
+    <select id="get1315Page" resultType="com.healthlink.his.ybcatalog.domain.CatalogZySyndrome">
         SELECT
             T1.tcm_syndrome_id
             ,T1.syndrome_class_code
@@ -37,7 +37,7 @@
             ) AS T1
         ${ew.customSqlSegment}
     </select>
-    <select id="get1314Page" resultType="com.openhis.ybcatalog.domain.CatalogZyDiseaseDiagnosis">
+    <select id="get1314Page" resultType="com.healthlink.his.ybcatalog.domain.CatalogZyDiseaseDiagnosis">
         SELECT
             id
             ,T1.category_code
@@ -73,7 +73,7 @@
             ) AS T1
             ${ew.customSqlSegment}
     </select>
-    <select id="get1308Page" resultType="com.openhis.ybcatalog.domain.CatalogSurgeryStandardDirectory">
+    <select id="get1308Page" resultType="com.healthlink.his.ybcatalog.domain.CatalogSurgeryStandardDirectory">
         SELECT
             id
             ,T1.chapter
@@ -129,7 +129,7 @@
             ) AS T1
             ${ew.customSqlSegment}
     </select>
-    <select id="get1307Page" resultType="com.openhis.ybcatalog.domain.CatalogWesternDisease">
+    <select id="get1307Page" resultType="com.healthlink.his.ybcatalog.domain.CatalogWesternDisease">
         SELECT
             disease_id
             ,T1.chapter
@@ -185,7 +185,7 @@
             ) AS T1
             ${ew.customSqlSegment}
     </select>
-    <select id="get1306Page" resultType="com.openhis.ybcatalog.domain.CatalogMedicalConsumables">
+    <select id="get1306Page" resultType="com.healthlink.his.ybcatalog.domain.CatalogMedicalConsumables">
         SELECT
             T1.medical_catalog_code
             ,T1.consumable_name
@@ -335,7 +335,7 @@
             ) AS T1
             ${ew.customSqlSegment}
     </select>
-    <select id="get1305Page" resultType="com.openhis.ybcatalog.domain.CatalogMedicalService">
+    <select id="get1305Page" resultType="com.healthlink.his.ybcatalog.domain.CatalogMedicalService">
         SELECT
              T1.tenant_id
             ,T1.medical_catalog_code
@@ -390,7 +390,7 @@
             ) AS T1
             ${ew.customSqlSegment}
     </select>
-    <select id="get1302Page" resultType="com.openhis.ybcatalog.domain.CatalogMedicalHerbInfo">
+    <select id="get1302Page" resultType="com.healthlink.his.ybcatalog.domain.CatalogMedicalHerbInfo">
         SELECT
             T1.medical_catalog_code,
             T1.single_drug_name,
@@ -465,7 +465,7 @@
             ) AS T1
             ${ew.customSqlSegment}
     </select>
-    <select id="get1301Page" resultType="com.openhis.ybcatalog.domain.CatalogDrugInfo">
+    <select id="get1301Page" resultType="com.healthlink.his.ybcatalog.domain.CatalogDrugInfo">
         SELECT
              T1.tenant_id
             ,T1.medical_catalog_code
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/InpatientChargeAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/chargemanage/InpatientChargeAppMapper.xml
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/InpatientChargeAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/chargemanage/InpatientChargeAppMapper.xml
index e27300d47..125962bea 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/InpatientChargeAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/chargemanage/InpatientChargeAppMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.chargemanage.mapper.InpatientChargeAppMapper">
+<mapper namespace="com.healthlink.his.web.chargemanage.mapper.InpatientChargeAppMapper">
 
     <select id="selectEncounterPatientPage"
-            resultType="com.openhis.web.chargemanage.dto.EncounterPatientPageDto">
+            resultType="com.healthlink.his.web.chargemanage.dto.EncounterPatientPageDto">
         SELECT T4.encounter_id,
                T4.encounter_bus_no,
                T4.patient_id,
@@ -77,7 +77,7 @@
     </select>
 
     <select id="selectEncounterPatientPrescription"
-            resultType="com.openhis.web.chargemanage.dto.EncounterPatientPrescriptionDto">
+            resultType="com.healthlink.his.web.chargemanage.dto.EncounterPatientPrescriptionDto">
         SELECT T1.encounter_id,
                T1.id,
                T1.patient_id,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml
index 30aeee339..ce235fb21 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.chargemanage.mapper.OutpatientChargeAppMapper">
+<mapper namespace="com.healthlink.his.web.chargemanage.mapper.OutpatientChargeAppMapper">
 
     <select id="selectEncounterPatientPage"
-            resultType="com.openhis.web.chargemanage.dto.EncounterPatientPageDto">
+            resultType="com.healthlink.his.web.chargemanage.dto.EncounterPatientPageDto">
         SELECT ii.encounter_id,
                ii.encounter_bus_no,
                ii.patient_id,
@@ -65,7 +65,7 @@
     </select>
 
     <select id="selectEncounterPatientPrescription"
-            resultType="com.openhis.web.chargemanage.dto.EncounterPatientPrescriptionDto">
+            resultType="com.healthlink.his.web.chargemanage.dto.EncounterPatientPrescriptionDto">
         SELECT T1.encounter_id,
                T1.id,
                T1.patient_id,
@@ -193,7 +193,7 @@
 
 
     <select id="selectEncounterPatientPrescriptionWithPrice"
-            resultType="com.openhis.web.chargemanage.dto.EncounterPatientPrescriptionDto">
+            resultType="com.healthlink.his.web.chargemanage.dto.EncounterPatientPrescriptionDto">
         SELECT final_res.*,
                (SELECT SUM(amount)
                 FROM fin_payment_rec_detail
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientPricingAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/chargemanage/OutpatientPricingAppMapper.xml
similarity index 63%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientPricingAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/chargemanage/OutpatientPricingAppMapper.xml
index e7c79bf48..661e818ce 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientPricingAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/chargemanage/OutpatientPricingAppMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.chargemanage.mapper.OutpatientPricingAppMapper">
+<mapper namespace="com.healthlink.his.web.chargemanage.mapper.OutpatientPricingAppMapper">
 
 </mapper>
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRefundAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/chargemanage/OutpatientRefundAppMapper.xml
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRefundAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/chargemanage/OutpatientRefundAppMapper.xml
index ea63ef28a..fdad7b896 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRefundAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/chargemanage/OutpatientRefundAppMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.chargemanage.mapper.OutpatientRefundAppMapper">
+<mapper namespace="com.healthlink.his.web.chargemanage.mapper.OutpatientRefundAppMapper">
     <resultMap id="encounterPatientRefundMap"
-               type="com.openhis.web.chargemanage.dto.EncounterPatientRefundDto">
+               type="com.healthlink.his.web.chargemanage.dto.EncounterPatientRefundDto">
         <!--患者退费项目信息-->
         <result property="paymentId" column="payment_id"/>
         <result property="entererId" column="enterer_id"/>
@@ -31,7 +31,7 @@
 
         <!--支付明细-->
         <collection property="paymentDetailList"
-                    ofType="com.openhis.yb.dto.PaymentDetailDto">
+                    ofType="com.healthlink.his.yb.dto.PaymentDetailDto">
             <!--唯一值，避免相同数据合并-->
             <id column="payment_detail_id"/>
             <result property="payEnum" column="pay_enum"/>
@@ -42,7 +42,7 @@
         </collection>
     </resultMap>
     <select id="selectEncounterPatientPayment"
-            resultType="com.openhis.web.chargemanage.dto.EncounterPatientPaymentDto">
+            resultType="com.healthlink.his.web.chargemanage.dto.EncounterPatientPaymentDto">
         SELECT T1.id AS payment_id,
                T1.status_enum,
                T1.relation_id,
@@ -64,7 +64,7 @@
           AND T1.status_enum IN (#{success})
           AND T1.delete_flag = '0'
     </select>
-    <select id="selectRefundItem" resultType="com.openhis.web.chargemanage.dto.RefundItemDto">
+    <select id="selectRefundItem" resultType="com.healthlink.his.web.chargemanage.dto.RefundItemDto">
         SELECT T1.id AS charge_item_id,
         T1.service_table,
         T1.service_id,
@@ -170,7 +170,7 @@
         </if>
     </select>
     <select id="selectBilledEncounterPatientPage"
-            resultType="com.openhis.web.chargemanage.dto.EncounterPatientPageDto">
+            resultType="com.healthlink.his.web.chargemanage.dto.EncounterPatientPageDto">
         SELECT T8.encounter_id,
                T8.encounter_bus_no,
                T8.status_enum,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml
index 772db5d2c..3f0642c6c 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.chargemanage.mapper.OutpatientRegistrationAppMapper">
+<mapper namespace="com.healthlink.his.web.chargemanage.mapper.OutpatientRegistrationAppMapper">
 
-    <select id="getPractitionerMetadataPage" resultType="com.openhis.web.chargemanage.dto.PractitionerMetadata">
+    <select id="getPractitionerMetadataPage" resultType="com.healthlink.his.web.chargemanage.dto.PractitionerMetadata">
         SELECT T3.tenant_id,
                T3.ID,
                T3.NAME,
@@ -32,7 +32,7 @@
     </select>
 
     <!-- 查询全院医生（不限科室），用于手术申请等需跨科室选择医生的场景 -->
-    <select id="getAllDoctorPage" resultType="com.openhis.web.chargemanage.dto.PractitionerMetadata">
+    <select id="getAllDoctorPage" resultType="com.healthlink.his.web.chargemanage.dto.PractitionerMetadata">
         SELECT T3.tenant_id,
                T3.ID,
                T3.NAME,
@@ -71,7 +71,7 @@
             > CURRENT_DATE
     </select>
 
-    <select id="getCurrentDayEncounter" resultType="com.openhis.web.chargemanage.dto.CurrentDayEncounterDto">
+    <select id="getCurrentDayEncounter" resultType="com.healthlink.his.web.chargemanage.dto.CurrentDayEncounterDto">
         SELECT T9.tenant_id AS tenantId,
                T9.encounter_id AS encounterId,
                T9.display_order AS displayOrder,
@@ -222,7 +222,7 @@
         ORDER BY T9.register_time DESC
     </select>
 
-    <select id="getTmpActivityList" resultType="com.openhis.web.personalization.dto.ActivityDeviceDto">
+    <select id="getTmpActivityList" resultType="com.healthlink.his.web.personalization.dto.ActivityDeviceDto">
         SELECT dev_act_id,
                quantity
         FROM tmp_activity_device
@@ -231,7 +231,7 @@
           AND dev_act_table = #{devActable}
     </select>
 
-    <select id="getBoundDevicesByUsage" resultType="com.openhis.web.personalization.dto.ActivityDeviceDto">
+    <select id="getBoundDevicesByUsage" resultType="com.healthlink.his.web.personalization.dto.ActivityDeviceDto">
         SELECT tad.dev_act_id,
                tad.quantity,
                tad.unit_code,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/clinical/SurgeryMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/clinical/SurgeryMapper.xml
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/clinical/SurgeryMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/clinical/SurgeryMapper.xml
index 8dddf7c2f..4c6bd5979 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/clinical/SurgeryMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/clinical/SurgeryMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.clinical.mapper.SurgeryMapper">
+<mapper namespace="com.healthlink.his.clinical.mapper.SurgeryMapper">
 
-    <resultMap type="com.openhis.clinical.domain.Surgery" id="SurgeryResult">
+    <resultMap type="com.healthlink.his.clinical.domain.Surgery" id="SurgeryResult">
         <result property="id" column="id" />
         <result property="surgeryNo" column="surgery_no" />
         <result property="patientId" column="patient_id" />
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgeryMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/clinicalmanage/SurgeryMapper.xml
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgeryMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/clinicalmanage/SurgeryMapper.xml
index 342fa4210..d42a12aa7 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgeryMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/clinicalmanage/SurgeryMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.clinicalmanage.mapper.SurgeryAppMapper">
+<mapper namespace="com.healthlink.his.web.clinicalmanage.mapper.SurgeryAppMapper">
 
-    <resultMap type="com.openhis.web.clinicalmanage.dto.SurgeryDto" id="SurgeryResult">
+    <resultMap type="com.healthlink.his.web.clinicalmanage.dto.SurgeryDto" id="SurgeryResult">
         <result property="id" column="id" />
         <result property="surgeryNo" column="surgery_no" />
         <result property="patientId" column="patient_id" />
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgicalScheduleAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/clinicalmanage/SurgicalScheduleAppMapper.xml
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgicalScheduleAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/clinicalmanage/SurgicalScheduleAppMapper.xml
index 5399be5ce..222e51f39 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgicalScheduleAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/clinicalmanage/SurgicalScheduleAppMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.clinicalmanage.mapper.SurgicalScheduleAppMapper">
+<mapper namespace="com.healthlink.his.web.clinicalmanage.mapper.SurgicalScheduleAppMapper">
 <!--    分页查询手术安排-->
-    <select id="getSurgerySchedulePage" resultType="com.openhis.web.clinicalmanage.dto.OpScheduleDto">
+    <select id="getSurgerySchedulePage" resultType="com.healthlink.his.web.clinicalmanage.dto.OpScheduleDto">
         SELECT
             os.schedule_id,
             os.tenant_id,
@@ -74,7 +74,7 @@
         ORDER BY os.create_time DESC, os.schedule_id DESC
     </select>
 <!--    根据ID查询手术安排详情-->
-    <select id="getSurgeryScheduleDetail" resultType="com.openhis.web.clinicalmanage.dto.OpScheduleDto">
+    <select id="getSurgeryScheduleDetail" resultType="com.healthlink.his.web.clinicalmanage.dto.OpScheduleDto">
         SELECT
             os.*,
             os.oper_code AS surgeryNo,
@@ -125,7 +125,7 @@
     </update>
 
     <!-- 查询所有符合条件的手术安排列表（用于导出） -->
-    <select id="getSurgeryScheduleList" resultType="com.openhis.web.clinicalmanage.dto.OpScheduleDto">
+    <select id="getSurgeryScheduleList" resultType="com.healthlink.his.web.clinicalmanage.dto.OpScheduleDto">
         SELECT
             os.schedule_id,
             os.tenant_id,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/common/CommonAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/common/CommonAppMapper.xml
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/common/CommonAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/common/CommonAppMapper.xml
index f9cb6e213..0e7a672d3 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/common/CommonAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/common/CommonAppMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.common.mapper.CommonAppMapper">
-    <resultMap id="PrescriptionPrintInfoMap" type="com.openhis.web.common.dto.AdvicePrintInfoDto">
+<mapper namespace="com.healthlink.his.web.common.mapper.CommonAppMapper">
+    <resultMap id="PrescriptionPrintInfoMap" type="com.healthlink.his.web.common.dto.AdvicePrintInfoDto">
         <id property="departmentName" column="department_name"/>
         <result property="patientName" column="patient_name"/>
         <result property="phone" column="phone"/>
@@ -17,7 +17,7 @@
         <result property="preparerDoctorName" column="preparer_doctor_name"/>
         <result property="chargeDoctorName" column="charge_doctor_name"/>
         <result property="encounterYbClass" column="encounter_yb_class"/>
-        <collection property="adviceItemList" ofType="com.openhis.web.common.dto.AdviceItemPrintInfoDto">
+        <collection property="adviceItemList" ofType="com.healthlink.his.web.common.dto.AdviceItemPrintInfoDto">
             <result property="quantity" column="quantity"/>
             <result property="unitPrice" column="unit_price"/>
             <result property="totalPrice" column="total_price"/>
@@ -36,7 +36,7 @@
             <result property="basicFlag" column="basic_flag"/>
         </collection>
     </resultMap>
-    <resultMap id="TreatmentPrintInfoMap" type="com.openhis.web.common.dto.AdvicePrintInfoDto">
+    <resultMap id="TreatmentPrintInfoMap" type="com.healthlink.his.web.common.dto.AdvicePrintInfoDto">
         <id property="departmentName" column="department_name"/>
         <result property="patientName" column="patient_name"/>
         <result property="phone" column="phone"/>
@@ -48,7 +48,7 @@
         <result property="contractName" column="contract_name"/>
         <result property="doctorName" column="doctor_name"/>
         <result property="encounterYbClass" column="encounter_yb_class"/>
-        <collection property="adviceItemList" ofType="com.openhis.web.common.dto.AdviceItemPrintInfoDto">
+        <collection property="adviceItemList" ofType="com.healthlink.his.web.common.dto.AdviceItemPrintInfoDto">
             <result property="quantity" column="quantity"/>
             <result property="unitPrice" column="unit_price"/>
             <result property="totalPrice" column="total_price"/>
@@ -56,7 +56,7 @@
             <result property="unitCode" column="unit_code"/>
         </collection>
     </resultMap>
-    <select id="selectInventoryItemList" resultType="com.openhis.web.common.dto.InventoryItemDto">
+    <select id="selectInventoryItemList" resultType="com.healthlink.his.web.common.dto.InventoryItemDto">
         SELECT ii.tenant_id,
         ii.item_type,
         ii.category_code,
@@ -196,7 +196,7 @@
         ) AS ii
         ${ew.customSqlSegment}
     </select>
-    <select id="selectInventoryItemInfo" resultType="com.openhis.web.common.dto.LocationInventoryDto">
+    <select id="selectInventoryItemInfo" resultType="com.healthlink.his.web.common.dto.LocationInventoryDto">
         SELECT T1.item_id,
         T1.item_table,
         T1.location_id,
@@ -287,7 +287,7 @@
         ORDER BY T1.lot_number DESC
     </select>
 
-    <select id="getInfoByTraceNo" resultType="com.openhis.administration.domain.TraceNoManage">
+    <select id="getInfoByTraceNo" resultType="com.healthlink.his.administration.domain.TraceNoManage">
         SELECT id,
                item_table,
                item_id,
@@ -320,7 +320,7 @@
         ORDER BY create_time DESC LIMIT 1
     </select>
 
-    <select id="getPractitionerList" resultType="com.openhis.web.common.dto.PractitionerInfoDto">
+    <select id="getPractitionerList" resultType="com.healthlink.his.web.common.dto.PractitionerInfoDto">
         SELECT ap.ID AS practitioner_id,
         ap.NAME AS practitioner_name,
         ao.NAME AS organization_name
@@ -527,7 +527,7 @@
         WHERE id = #{practitionerId}
     </select>
 
-    <select id="getActivityDefinition" resultType="com.openhis.web.common.dto.ActivityDefinitionDto">
+    <select id="getActivityDefinition" resultType="com.healthlink.his.web.common.dto.ActivityDefinitionDto">
         SELECT ID   AS
                        activity_definition_id,
                NAME AS activity_definition_name
@@ -542,7 +542,7 @@
         WHERE id = #{practitionerId}
     </select>
 
-    <select id="getActivityDefinition" resultType="com.openhis.web.common.dto.ActivityDefinitionDto">
+    <select id="getActivityDefinition" resultType="com.healthlink.his.web.common.dto.ActivityDefinitionDto">
         SELECT ID   AS
                        activity_definition_id,
                NAME AS activity_definition_name
@@ -551,7 +551,7 @@
           AND status_enum = #{statusEnum}
     </select>
     <select id="selectMedicineInventoryDetail"
-            resultType="com.openhis.web.pharmacymanage.dto.InventoryDetailDto">
+            resultType="com.healthlink.his.web.pharmacymanage.dto.InventoryDetailDto">
         SELECT wii.expiration_date ,
                wii.location_id ,
                wii.item_id ,
@@ -578,7 +578,7 @@
             AND wii.inventory_status_enum = #{active}
     </select>
     <select id="selectDeviceInventoryDetail"
-            resultType="com.openhis.web.pharmacymanage.dto.InventoryDetailDto">
+            resultType="com.healthlink.his.web.pharmacymanage.dto.InventoryDetailDto">
         SELECT wii.expiration_date ,
                wii.location_id ,
                wii.item_id ,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/consultation/ConsultationRequestMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/consultation/ConsultationRequestMapper.xml
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/consultation/ConsultationRequestMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/consultation/ConsultationRequestMapper.xml
index 8a104a297..76073b79c 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/consultation/ConsultationRequestMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/consultation/ConsultationRequestMapper.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.consultation.mapper.ConsultationRequestMapper">
+<mapper namespace="com.healthlink.his.web.consultation.mapper.ConsultationRequestMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.openhis.web.consultation.domain.ConsultationRequest">
+    <resultMap id="BaseResultMap" type="com.healthlink.his.web.consultation.domain.ConsultationRequest">
         <id column="id" property="id" />
         <result column="consultation_id" property="consultationId" />
         <result column="patient_id" property="patientId" />
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml
index 53bb90d02..bf2962fb0 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.datadictionary.mapper.ActivityDefinitionManageMapper">
+<mapper namespace="com.healthlink.his.web.datadictionary.mapper.ActivityDefinitionManageMapper">
     <!-- 优化后的分页查询：减少JOIN，使用索引友好的写法 -->
     <select id="getDiseaseTreatmentPage" parameterType="java.util.Map"
-            resultType="com.openhis.web.datadictionary.dto.DiagnosisTreatmentDto">
+            resultType="com.healthlink.his.web.datadictionary.dto.DiagnosisTreatmentDto">
 
         SELECT
             T1.id,
@@ -79,7 +79,7 @@
     </select>
 
     <!-- 诊疗目录下拉列表（轻量级，只查4个字段，1个JOIN） -->
-    <select id="getDiagnosisTreatmentSimpleList" resultType="com.openhis.web.datadictionary.dto.DiagnosisTreatmentDto">
+    <select id="getDiagnosisTreatmentSimpleList" resultType="com.healthlink.his.web.datadictionary.dto.DiagnosisTreatmentDto">
         SELECT 
             T1.id,
             T1.bus_no,
@@ -109,7 +109,7 @@
         </if>
     </select>
 
-    <select id="getDiseaseTreatmentOne" resultType="com.openhis.web.datadictionary.dto.DiagnosisTreatmentDto">
+    <select id="getDiseaseTreatmentOne" resultType="com.healthlink.his.web.datadictionary.dto.DiagnosisTreatmentDto">
         SELECT
         T1.id,
         T1.category_code,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ChargeItemDefSearchMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/datadictionary/ChargeItemDefSearchMapper.xml
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ChargeItemDefSearchMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/datadictionary/ChargeItemDefSearchMapper.xml
index 6d6222eb6..3d7ca050d 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ChargeItemDefSearchMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/datadictionary/ChargeItemDefSearchMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.datadictionary.mapper.ChargeItemDefSearchMapper">
-    <select id="getMedList" resultType="com.openhis.web.datadictionary.dto.ChargeItemDefPageDto">
+<mapper namespace="com.healthlink.his.web.datadictionary.mapper.ChargeItemDefSearchMapper">
+    <select id="getMedList" resultType="com.healthlink.his.web.datadictionary.dto.ChargeItemDefPageDto">
         SELECT
         T5.id,
         T5.charge_name,
@@ -71,7 +71,7 @@
         ORDER BY T1.create_time DESC) T5
         ${ew.customSqlSegment}
     </select>
-    <select id="getDevList" resultType="com.openhis.web.datadictionary.dto.ChargeItemDefPageDto">
+    <select id="getDevList" resultType="com.healthlink.his.web.datadictionary.dto.ChargeItemDefPageDto">
         SELECT
         T5.id,
         T5.charge_name,
@@ -139,7 +139,7 @@
         ORDER BY T1.create_time DESC) T5
         ${ew.customSqlSegment}
     </select>
-    <select id="getActList" resultType="com.openhis.web.datadictionary.dto.ChargeItemDefPageDto">
+    <select id="getActList" resultType="com.healthlink.his.web.datadictionary.dto.ChargeItemDefPageDto">
         SELECT
         T5.id,
         T5.charge_name,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/DeviceManageMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/datadictionary/DeviceManageMapper.xml
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/DeviceManageMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/datadictionary/DeviceManageMapper.xml
index e4d776d91..8a10b97f8 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/DeviceManageMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/datadictionary/DeviceManageMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.datadictionary.mapper.DeviceManageMapper">
+<mapper namespace="com.healthlink.his.web.datadictionary.mapper.DeviceManageMapper">
     <select id="getDevicePage" parameterType="java.util.Map"
-            resultType="com.openhis.web.datadictionary.dto.DeviceManageDto">
+            resultType="com.healthlink.his.web.datadictionary.dto.DeviceManageDto">
 
     SELECT
         T3.id,
@@ -126,7 +126,7 @@
 
     </select>
 
-    <select id="getOne" resultType="com.openhis.web.datadictionary.dto.DeviceManageDto">
+    <select id="getOne" resultType="com.healthlink.his.web.datadictionary.dto.DeviceManageDto">
     SELECT
         T1.id,
         T1.bus_no,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ICDCodeMpper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/datadictionary/ICDCodeMpper.xml
similarity index 77%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ICDCodeMpper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/datadictionary/ICDCodeMpper.xml
index 23b85ee4b..105d0db60 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ICDCodeMpper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/datadictionary/ICDCodeMpper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.datadictionary.mapper.ICDCodeMapper">
+<mapper namespace="com.healthlink.his.web.datadictionary.mapper.ICDCodeMapper">
     <select id="getCode" parameterType="java.util.Map"
-            resultType="com.openhis.web.datadictionary.dto.ICDCodeDto">
+            resultType="com.healthlink.his.web.datadictionary.dto.ICDCodeDto">
 
         SELECT
         id,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ItemDefinitionAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/datadictionary/ItemDefinitionAppMapper.xml
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ItemDefinitionAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/datadictionary/ItemDefinitionAppMapper.xml
index 640e3c745..215de0810 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ItemDefinitionAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/datadictionary/ItemDefinitionAppMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.datadictionary.mapper.ItemDefinitionAppMapper">
+<mapper namespace="com.healthlink.his.web.datadictionary.mapper.ItemDefinitionAppMapper">
 
-    <select id="getChargeItemInfo" resultType="com.openhis.web.datadictionary.dto.ItemDefinitionDto">
+    <select id="getChargeItemInfo" resultType="com.healthlink.his.web.datadictionary.dto.ItemDefinitionDto">
         SELECT
         cii.tenant_id,
         cii.ID,
@@ -56,7 +56,7 @@
         ${ew.customSqlSegment}
     </select>
 
-    <select id="getChargeItemInfoDetail" resultType="com.openhis.web.datadictionary.dto.ItemDefinitionDetailDto">
+    <select id="getChargeItemInfoDetail" resultType="com.healthlink.his.web.datadictionary.dto.ItemDefinitionDetailDto">
         SELECT condition_code,
                amount
         FROM adm_charge_item_def_detail
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/LabActivityDefinitionManageMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/datadictionary/LabActivityDefinitionManageMapper.xml
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/LabActivityDefinitionManageMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/datadictionary/LabActivityDefinitionManageMapper.xml
index 32a94c5da..2f8baf63d 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/LabActivityDefinitionManageMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/datadictionary/LabActivityDefinitionManageMapper.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.datadictionary.mapper.LabActivityDefinitionManageMapper">
+<mapper namespace="com.healthlink.his.web.datadictionary.mapper.LabActivityDefinitionManageMapper">
 
     <!-- 检验项目分页查询（操作 lab_activity_definition 表，无物理外键） -->
     <select id="getLabActivityDefinitionPage" parameterType="java.util.Map"
-            resultType="com.openhis.web.datadictionary.dto.DiagnosisTreatmentDto">
+            resultType="com.healthlink.his.web.datadictionary.dto.DiagnosisTreatmentDto">
         SELECT
             T1.id,
             T1.category_code,
@@ -68,7 +68,7 @@
     </select>
 
     <!-- 检验项目详情 -->
-    <select id="getLabActivityDefinitionOne" resultType="com.openhis.web.datadictionary.dto.DiagnosisTreatmentDto">
+    <select id="getLabActivityDefinitionOne" resultType="com.healthlink.his.web.datadictionary.dto.DiagnosisTreatmentDto">
         SELECT
             T1.id,
             T1.category_code,
@@ -124,7 +124,7 @@
     </select>
 
     <!-- 检验项目下拉列表（轻量级） -->
-    <select id="getLabActivityDefinitionSimpleList" resultType="com.openhis.web.datadictionary.dto.DiagnosisTreatmentDto">
+    <select id="getLabActivityDefinitionSimpleList" resultType="com.healthlink.his.web.datadictionary.dto.DiagnosisTreatmentDto">
         SELECT
             T1.id,
             T1.bus_no,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml
index 1f6ce23e3..fc3e4ae4d 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.datadictionary.mapper.MedicationManageSearchMapper">
+<mapper namespace="com.healthlink.his.web.datadictionary.mapper.MedicationManageSearchMapper">
     <!-- 药品信息分页查询-->
     <select id="getPage" parameterType="java.util.Map"
-            resultType="com.openhis.web.datadictionary.dto.MedicationManageDto">
+            resultType="com.healthlink.his.web.datadictionary.dto.MedicationManageDto">
         SELECT
         T6.id,
         T6.medication_def_id,
@@ -179,7 +179,7 @@
         ${ew.customSqlSegment}
     </select>
 
-    <select id="getOne" resultType="com.openhis.web.datadictionary.dto.MedicationManageDto">
+    <select id="getOne" resultType="com.healthlink.his.web.datadictionary.dto.MedicationManageDto">
         SELECT T2.id,
         T2.medication_def_id,
         T2.status_enum,
@@ -283,7 +283,7 @@
         </where>
     </select>
 
-    <select id="getList" resultType="com.openhis.web.datadictionary.dto.MedicationManageDto">
+    <select id="getList" resultType="com.healthlink.his.web.datadictionary.dto.MedicationManageDto">
         SELECT T2.id,
         T2.medication_def_id,
         T2.status_enum,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentCommonMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/departmentmanage/DepartmentCommonMapper.xml
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentCommonMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/departmentmanage/DepartmentCommonMapper.xml
index c6c43e639..8905fa3c9 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentCommonMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/departmentmanage/DepartmentCommonMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper">
+<mapper namespace="com.healthlink.his.web.departmentmanage.mapper.DepartmentCommonMapper">
     <select id="getDeviceInfo"
-            resultType="com.openhis.web.departmentmanage.dto.DepartmentDeviceInfoDto">
+            resultType="com.healthlink.his.web.departmentmanage.dto.DepartmentDeviceInfoDto">
         SELECT T6.id,--物品id
                T6.bus_no,--   药品编号
                T6.name,-- 物品名称
@@ -169,7 +169,7 @@
             ${ew.customSqlSegment}
     </select>
     <select id="getPage"
-            resultType="com.openhis.web.departmentmanage.dto.DepartmentDto">
+            resultType="com.healthlink.his.web.departmentmanage.dto.DepartmentDto">
         SELECT T4.tenant_id,
                T4.supply_bus_no, --单据号
                T4.type_enum,     --类型
@@ -230,7 +230,7 @@
             ${ew.customSqlSegment}
     </select>
     <select id="getDetailPage"
-            resultType="com.openhis.web.departmentmanage.dto.DepartmentDetailDto">
+            resultType="com.healthlink.his.web.departmentmanage.dto.DepartmentDetailDto">
         SELECT T1.id,                             --ID
                T1.bus_no,                         --单据号
                T2.bus_no        AS item_bus_no,   --药品编码
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentIssuanceOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/departmentmanage/DepartmentIssuanceOrderMapper.xml
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentIssuanceOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/departmentmanage/DepartmentIssuanceOrderMapper.xml
index c8f7d6d7e..3eeacdd4a 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentIssuanceOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/departmentmanage/DepartmentIssuanceOrderMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.departmentmanage.mapper.DepartmentIssuanceOrderMapper">
+<mapper namespace="com.healthlink.his.web.departmentmanage.mapper.DepartmentIssuanceOrderMapper">
     <select id="getInfo"
-            resultType="com.openhis.web.departmentmanage.dto.DepartmentDetailDto">
+            resultType="com.healthlink.his.web.departmentmanage.dto.DepartmentDetailDto">
         SELECT string_agg(T1.id::text, ',' ORDER BY T1.id) AS dispense_ids,--药品发放id
                T1.status_enum,--发放状态
                CASE T3.category_enum
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentProfitLossOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/departmentmanage/DepartmentProfitLossOrderMapper.xml
similarity index 61%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentProfitLossOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/departmentmanage/DepartmentProfitLossOrderMapper.xml
index 544ec6c23..15416426b 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentProfitLossOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/departmentmanage/DepartmentProfitLossOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.departmentmanage.mapper.DepartmentProfitLossOrderMapper">
+<mapper namespace="com.healthlink.his.web.departmentmanage.mapper.DepartmentProfitLossOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentRequisitionOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/departmentmanage/DepartmentRequisitionOrderMapper.xml
similarity index 61%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentRequisitionOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/departmentmanage/DepartmentRequisitionOrderMapper.xml
index e46143b5a..2f5508568 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentRequisitionOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/departmentmanage/DepartmentRequisitionOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.departmentmanage.mapper.DepartmentRequisitionOrderMapper">
+<mapper namespace="com.healthlink.his.web.departmentmanage.mapper.DepartmentRequisitionOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentReturnToWarehouseOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/departmentmanage/DepartmentReturnToWarehouseOrderMapper.xml
similarity index 59%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentReturnToWarehouseOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/departmentmanage/DepartmentReturnToWarehouseOrderMapper.xml
index b71940b6c..22a84218a 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentReturnToWarehouseOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/departmentmanage/DepartmentReturnToWarehouseOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.departmentmanage.mapper.DepartmentReturnToWarehouseOrderMapper">
+<mapper namespace="com.healthlink.his.web.departmentmanage.mapper.DepartmentReturnToWarehouseOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentStockInOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/departmentmanage/DepartmentStockInOrderMapper.xml
similarity index 61%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentStockInOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/departmentmanage/DepartmentStockInOrderMapper.xml
index 5ba6b5eed..a5d3b9557 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentStockInOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/departmentmanage/DepartmentStockInOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.departmentmanage.mapper.DepartmentStockInOrderMapper">
+<mapper namespace="com.healthlink.his.web.departmentmanage.mapper.DepartmentStockInOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentStocktakingOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/departmentmanage/DepartmentStocktakingOrderMapper.xml
similarity index 61%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentStocktakingOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/departmentmanage/DepartmentStocktakingOrderMapper.xml
index 47691f49a..d9995a7c4 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentStocktakingOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/departmentmanage/DepartmentStocktakingOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.departmentmanage.mapper.DepartmentStocktakingOrderMapper">
+<mapper namespace="com.healthlink.his.web.departmentmanage.mapper.DepartmentStocktakingOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentTransferInOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/departmentmanage/DepartmentTransferInOrderMapper.xml
similarity index 61%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentTransferInOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/departmentmanage/DepartmentTransferInOrderMapper.xml
index f0e3ef457..f0407a686 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentTransferInOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/departmentmanage/DepartmentTransferInOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.departmentmanage.mapper.DepartmentTransferInOrderMapper">
+<mapper namespace="com.healthlink.his.web.departmentmanage.mapper.DepartmentTransferInOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentTransferOutOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/departmentmanage/DepartmentTransferOutOrderMapper.xml
similarity index 61%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentTransferOutOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/departmentmanage/DepartmentTransferOutOrderMapper.xml
index 859c695b2..b428e7189 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/departmentmanage/DepartmentTransferOutOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/departmentmanage/DepartmentTransferOutOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.departmentmanage.mapper.DepartmentTransferOutOrderMapper">
+<mapper namespace="com.healthlink.his.web.departmentmanage.mapper.DepartmentTransferOutOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
index 469370ae1..dba7e62b2 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.doctorstation.mapper.DoctorStationAdviceAppMapper">
+<mapper namespace="com.healthlink.his.web.doctorstation.mapper.DoctorStationAdviceAppMapper">
 
-    <select id="getAdviceBaseInfo" resultType="com.openhis.web.doctorstation.dto.AdviceBaseDto">
+    <select id="getAdviceBaseInfo" resultType="com.healthlink.his.web.doctorstation.dto.AdviceBaseDto">
         SELECT abi.tenant_id,
         abi.advice_type,
         abi.bus_no,
@@ -341,7 +341,7 @@
         ${ew.customSqlSegment}
     </select>
 
-    <select id="getAdviceInventory" resultType="com.openhis.web.doctorstation.dto.AdviceInventoryDto">
+    <select id="getAdviceInventory" resultType="com.healthlink.his.web.doctorstation.dto.AdviceInventoryDto">
         SELECT
         T1.id AS inventory_id,
         T1.item_id,
@@ -375,7 +375,7 @@
         order by T1.expiration_date
     </select>
 
-    <select id="getAdviceDraftInventory" resultType="com.openhis.web.doctorstation.dto.AdviceInventoryDto">
+    <select id="getAdviceDraftInventory" resultType="com.healthlink.his.web.doctorstation.dto.AdviceInventoryDto">
         SELECT #{medicationTableName} AS item_table,
                T1.medication_id       AS item_id,
                T1.lot_number,
@@ -419,7 +419,7 @@
           AND (T1.status_enum = #{status1} OR T1.status_enum = #{status2})
     </select>
 
-    <select id="getMedLocationConfig" resultType="com.openhis.web.doctorstation.dto.AdviceInventoryDto">
+    <select id="getMedLocationConfig" resultType="com.healthlink.his.web.doctorstation.dto.AdviceInventoryDto">
         SELECT aol.distribution_category_code AS category_code,
                aol.def_location_id            AS location_id
         FROM adm_organization_location AS aol
@@ -439,7 +439,7 @@
           AND aol.end_time >= CURRENT_TIME
     </select>
 
-    <select id="getChildCharge" resultType="com.openhis.web.doctorstation.dto.AdvicePriceDto">
+    <select id="getChildCharge" resultType="com.healthlink.his.web.doctorstation.dto.AdvicePriceDto">
         SELECT
         T1.definition_id,
         T1.id AS definition_detail_id,
@@ -461,7 +461,7 @@
         ORDER BY T1.priority DESC, T1.definition_id
     </select>
 
-    <select id="getMainCharge" resultType="com.openhis.web.doctorstation.dto.AdvicePriceDto">
+    <select id="getMainCharge" resultType="com.healthlink.his.web.doctorstation.dto.AdvicePriceDto">
         SELECT
         id AS definition_id,
         charge_name,
@@ -478,7 +478,7 @@
         </if>
     </select>
 
-    <select id="getRequestBaseInfo" resultType="com.openhis.web.doctorstation.dto.RequestBaseDto">
+    <select id="getRequestBaseInfo" resultType="com.healthlink.his.web.doctorstation.dto.RequestBaseDto">
         (SELECT 1 AS advice_type,
         T1.id AS request_id,
         T1.id || '-1' AS unique_key,
@@ -786,7 +786,7 @@
         ORDER BY T1.status_enum)
     </select>
 
-    <select id="getEncounterContract" resultType="com.openhis.web.doctorstation.dto.EncounterContractDto">
+    <select id="getEncounterContract" resultType="com.healthlink.his.web.doctorstation.dto.EncounterContractDto">
         SELECT aa.id AS account_id,
                fc.contract_name,
                fc.bus_no
@@ -797,7 +797,7 @@
           AND aa.encounter_id = #{encounterId}
     </select>
 
-    <select id="getActivityBindDevice" resultType="com.openhis.web.doctorstation.dto.ActivityBindDeviceDetailDto">
+    <select id="getActivityBindDevice" resultType="com.healthlink.his.web.doctorstation.dto.ActivityBindDeviceDetailDto">
         SELECT tcd.item_no    AS activity_id,
                tcd.dev_act_id AS device_id,
                tcd.quantity,
@@ -822,7 +822,7 @@
           AND tcd.item_no = #{activityId}
     </select>
 
-    <select id="getOrderBindInfo" resultType="com.openhis.web.doctorstation.dto.OrderBindInfoDto">
+    <select id="getOrderBindInfo" resultType="com.healthlink.his.web.doctorstation.dto.OrderBindInfoDto">
         SELECT tad.dev_act_id AS order_definition_id,
                tad.quantity   AS quantity,
                tad.unit_code  AS unit_code,
@@ -850,7 +850,7 @@
           AND tad.item_no = #{itemNo}
     </select>
 
-    <select id="getProofAndTestHistory" resultType="com.openhis.web.doctorstation.dto.ProofAndTestHistoryDto">
+    <select id="getProofAndTestHistory" resultType="com.healthlink.his.web.doctorstation.dto.ProofAndTestHistoryDto">
         SELECT wsr.authored_time,
                aper.NAME AS requester
         FROM wor_service_request AS wsr
@@ -862,7 +862,7 @@
           AND wsr.authored_time >= CURRENT_DATE - INTERVAL '30 days'
     </select>
 
-    <select id="getProofAndTestResult" resultType="com.openhis.web.doctorstation.dto.ProofAndTestResultDto">
+    <select id="getProofAndTestResult" resultType="com.healthlink.his.web.doctorstation.dto.ProofAndTestResultDto">
         SELECT wsr.bus_no,
                wad.NAME advice_name
         FROM wor_service_request AS wsr
@@ -885,7 +885,7 @@
 
     <!-- 手术项目专用分页查询：仅查手术 + 定价，无库存/草稿库存/取药科室等无关逻辑 -->
     <!-- 使用 LIMIT/OFFSET 直接查询，避免 MyBatis Plus 分页插件的 COUNT 开销 -->
-    <select id="getSurgeryPage" resultType="com.openhis.web.doctorstation.dto.SurgeryItemDto">
+    <select id="getSurgeryPage" resultType="com.healthlink.his.web.doctorstation.dto.SurgeryItemDto">
         SELECT DISTINCT ON (t1.ID)
             t1.ID AS advice_definition_id,
             t1.NAME AS advice_name,
@@ -914,7 +914,7 @@
     </select>
 
     <!-- 检查/检验项目专用分页查询：仅查指定 category_code + 定价，无库存/草稿库存/取药科室等无关逻辑 -->
-    <select id="getExaminationPage" resultType="com.openhis.web.doctorstation.dto.SurgeryItemDto">
+    <select id="getExaminationPage" resultType="com.healthlink.his.web.doctorstation.dto.SurgeryItemDto">
         SELECT DISTINCT ON (t1.ID)
             t1.ID AS advice_definition_id,
             t1.NAME AS advice_name,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationChineseMedicalAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationChineseMedicalAppMapper.xml
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationChineseMedicalAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationChineseMedicalAppMapper.xml
index ace994565..e1debbc72 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationChineseMedicalAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationChineseMedicalAppMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.doctorstation.mapper.DoctorStationChineseMedicalAppMapper">
+<mapper namespace="com.healthlink.his.web.doctorstation.mapper.DoctorStationChineseMedicalAppMapper">
 
-    <select id="getTcmEncounterDiagnosis" resultType="com.openhis.web.doctorstation.dto.DiagnosisQueryDto">
+    <select id="getTcmEncounterDiagnosis" resultType="com.healthlink.his.web.doctorstation.dto.DiagnosisQueryDto">
         SELECT T1.id AS encounter_diagnosis_id,
                T1.condition_id,
                T1.syndrome_group_no,
@@ -27,7 +27,7 @@
         ORDER BY T1.diag_srt_no
     </select>
 
-    <select id="getTcmRequestBaseInfo" resultType="com.openhis.web.doctorstation.dto.RequestBaseDto">
+    <select id="getTcmRequestBaseInfo" resultType="com.healthlink.his.web.doctorstation.dto.RequestBaseDto">
         SELECT 1 AS advice_type,
         T1.id AS request_id,
         T1.id || '-1' AS unique_key,
@@ -81,7 +81,7 @@
         ORDER BY T1.group_id,T1.prescription_no, T1.status_enum
     </select>
 
-    <select id="getTcmRequestHistoryInfo" resultType="com.openhis.web.doctorstation.dto.RequestBaseDto">
+    <select id="getTcmRequestHistoryInfo" resultType="com.healthlink.his.web.doctorstation.dto.RequestBaseDto">
         SELECT 1 AS advice_type,
         T1.id AS request_id,
         T1.id || '-1' AS unique_key,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml
similarity index 88%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml
index bbe5174e2..0cfb6e0c6 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.doctorstation.mapper.DoctorStationDiagnosisAppMapper">
+<mapper namespace="com.healthlink.his.web.doctorstation.mapper.DoctorStationDiagnosisAppMapper">
 
-    <select id="getDiagnosisBelongBindingPage" resultType="com.openhis.web.doctorstation.dto.DiagnosisBelongBindingDto">
+    <select id="getDiagnosisBelongBindingPage" resultType="com.healthlink.his.web.doctorstation.dto.DiagnosisBelongBindingDto">
         SELECT T5.tenant_id,
                T5.ID,
                T5.object_id,
@@ -36,7 +36,7 @@
             ${ew.customSqlSegment}
     </select>
 
-    <select id="getPatientHistoryList" resultType="com.openhis.web.doctorstation.dto.ConditionDefinitionMetadata">
+    <select id="getPatientHistoryList" resultType="com.healthlink.his.web.doctorstation.dto.ConditionDefinitionMetadata">
         SELECT T1.ID AS definition_id,
                T1.source_enum,
                T1.condition_code,
@@ -58,7 +58,7 @@
             )
     </select>
 
-    <select id="getDoctorCommonUseList" resultType="com.openhis.web.doctorstation.dto.ConditionDefinitionMetadata">
+    <select id="getDoctorCommonUseList" resultType="com.healthlink.his.web.doctorstation.dto.ConditionDefinitionMetadata">
         SELECT T1.ID AS definition_id,
                T1.source_enum,
                T1.condition_code,
@@ -78,7 +78,7 @@
           AND T1.status_enum = #{statusEnum}
     </select>
 
-    <select id="getUserPersonalList" resultType="com.openhis.web.doctorstation.dto.ConditionDefinitionMetadata">
+    <select id="getUserPersonalList" resultType="com.healthlink.his.web.doctorstation.dto.ConditionDefinitionMetadata">
         SELECT T2.ID,
                T2.definition_id,
                T1.source_enum,
@@ -97,7 +97,7 @@
           AND T1.status_enum = #{statusEnum}
     </select>
 
-    <select id="getOrganizationList" resultType="com.openhis.web.doctorstation.dto.ConditionDefinitionMetadata">
+    <select id="getOrganizationList" resultType="com.healthlink.his.web.doctorstation.dto.ConditionDefinitionMetadata">
         SELECT T2.ID,
         T2.definition_id,
         T1.source_enum,
@@ -119,7 +119,7 @@
         AND T1.status_enum = #{statusEnum}
     </select>
 
-    <select id="getEncounterDiagnosis" resultType="com.openhis.web.doctorstation.dto.DiagnosisQueryDto">
+    <select id="getEncounterDiagnosis" resultType="com.healthlink.his.web.doctorstation.dto.DiagnosisQueryDto">
         SELECT T1.id AS encounter_diagnosis_id,
                T1.condition_id,
                T2.definition_id,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationElepPrescriptionMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationElepPrescriptionMapper.xml
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationElepPrescriptionMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationElepPrescriptionMapper.xml
index ca5ff3921..f92100c9b 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationElepPrescriptionMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationElepPrescriptionMapper.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.doctorstation.mapper.DoctorStationElepPrescriptionMapper">
-    <select id="selectCatalogDrugInfoByNo" resultType="com.openhis.ybcatalog.domain.CatalogDrugInfo">
+<mapper namespace="com.healthlink.his.web.doctorstation.mapper.DoctorStationElepPrescriptionMapper">
+    <select id="selectCatalogDrugInfoByNo" resultType="com.healthlink.his.ybcatalog.domain.CatalogDrugInfo">
         SELECT T1.medical_catalog_code,
                T1.drug_trade_name,
                T1.generic_name_id,
@@ -106,7 +106,7 @@
           AND T1.version = #{version}
           AND T1.valid_flag = '1'
     </select>
-    <select id="selectCatalogDrugInfo" resultType="com.openhis.ybcatalog.domain.CatalogDrugInfo">
+    <select id="selectCatalogDrugInfo" resultType="com.healthlink.his.ybcatalog.domain.CatalogDrugInfo">
         SELECT T3.medical_catalog_code,
                T3.drug_trade_name,
                T3.generic_name_id,
@@ -315,7 +315,7 @@
               WHERE T1.valid_flag = '1') AS T3
             ${ew.customSqlSegment}
     </select>
-    <select id="selectElepPrescriptionInfo" resultType="com.openhis.web.doctorstation.dto.ElepPrescriptionInfoDto">
+    <select id="selectElepPrescriptionInfo" resultType="com.healthlink.his.web.doctorstation.dto.ElepPrescriptionInfoDto">
         SELECT tenant_id,
                prescription_no,             --处方号
                ipt_otp_no,                  --门诊号
@@ -379,7 +379,7 @@
                  rx_type_code
         ORDER BY prsc_time DESC
     </select>
-    <select id="selectMedicationInfo" resultType="com.openhis.web.doctorstation.dto.ElepMedicationInfoDto">
+    <select id="selectMedicationInfo" resultType="com.healthlink.his.web.doctorstation.dto.ElepMedicationInfoDto">
         SELECT T1.id,
                T2.medical_catalog_code AS medication_id,   --药品id
                T2.registered_name      AS medication_name, --药品名
@@ -429,7 +429,7 @@
                  T1.condition_id,
                  T1.version
     </select>
-    <select id="selectSaveInfo" resultType="com.openhis.web.doctorstation.dto.ElepPrescriptionInfoParam">
+    <select id="selectSaveInfo" resultType="com.healthlink.his.web.doctorstation.dto.ElepPrescriptionInfoParam">
         SELECT T7.id       AS organization_id, --医院id
                T1.bus_no   AS ipt_otp_no,      --门诊/住院病历号
                CASE
@@ -473,7 +473,7 @@
             T6.insutype
         --  T8.id
     </select>
-    <!--    <select id="selectConditionInfo" resultType="com.openhis.web.doctorstation.dto.ElepPrescriptionInfoParam">-->
+    <!--    <select id="selectConditionInfo" resultType="com.healthlink.his.web.doctorstation.dto.ElepPrescriptionInfoParam">-->
     <!--        SELECT  T3.id       AS condition_id,     &#45;&#45;诊断id-->
     <!--                T4.name     AS condition_name     &#45;&#45;诊断名-->
     <!--        FROM adm_encounter AS T1-->
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationEmrAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationEmrAppMapper.xml
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationEmrAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationEmrAppMapper.xml
index b4a88763d..070c0b7cd 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationEmrAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationEmrAppMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.doctorstation.mapper.DoctorStationEmrAppMapper">
+<mapper namespace="com.healthlink.his.web.doctorstation.mapper.DoctorStationEmrAppMapper">
 
     <select id="getPendingEmrList" resultType="java.util.HashMap">
         SELECT e.id AS "encounterId",
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationLabApplyMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationLabApplyMapper.xml
similarity index 85%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationLabApplyMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationLabApplyMapper.xml
index d3a8168f5..fb8d38545 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationLabApplyMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationLabApplyMapper.xml
@@ -2,12 +2,12 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.doctorstation.mapper.DoctorStationLabApplyMapper">
+<mapper namespace="com.healthlink.his.web.doctorstation.mapper.DoctorStationLabApplyMapper">
 
 
     <!-- 分页查询检验申请单列表（根据就诊ID查询，按申请时间降序）
          从明细表聚合项目名称和金额-->
-    <select id="getInspectionApplyListPage" resultType="com.openhis.web.doctorstation.dto.DoctorStationLabApplyDto">
+    <select id="getInspectionApplyListPage" resultType="com.healthlink.his.web.doctorstation.dto.DoctorStationLabApplyDto">
         SELECT t1.id              AS applicationId,
                t1.apply_no        AS applyNo,
                (SELECT STRING_AGG(t2.item_name, '+')
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml
index 832f39f75..b22329fe1 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.doctorstation.mapper.DoctorStationMainAppMapper">
+<mapper namespace="com.healthlink.his.web.doctorstation.mapper.DoctorStationMainAppMapper">
 
-    <select id="getPatientInfo" resultType="com.openhis.web.doctorstation.dto.PatientInfoDto">
+    <select id="getPatientInfo" resultType="com.healthlink.his.web.doctorstation.dto.PatientInfoDto">
         SELECT
         T10.encounter_id,
         T10.patient_id,
@@ -111,7 +111,7 @@
         ${ew.customSqlSegment}
     </select>
 
-    <select id="getPrescriptionPageInfo" resultType="com.openhis.web.doctorstation.dto.PrescriptionInfoBaseDto">
+    <select id="getPrescriptionPageInfo" resultType="com.healthlink.his.web.doctorstation.dto.PrescriptionInfoBaseDto">
         SELECT ppi.prescription_no,
                ppi.encounter_id,
                ppi.patient_id,
@@ -165,7 +165,7 @@
             ${ew.customSqlSegment}
     </select>
 
-    <select id="getPrescriptionDetailInfo" resultType="com.openhis.web.doctorstation.dto.PrescriptionInfoDetailDto">
+    <select id="getPrescriptionDetailInfo" resultType="com.healthlink.his.web.doctorstation.dto.PrescriptionInfoDetailDto">
         SELECT mmr.prescription_no,
         mmr.ID AS request_id,
         mmr.practitioner_id AS requester_id,
@@ -210,7 +210,7 @@
         </if>
     </select>
 
-    <select id="getReceptionStatistics" resultType="com.openhis.web.doctorstation.dto.ReceptionStatisticsDto">
+    <select id="getReceptionStatistics" resultType="com.healthlink.his.web.doctorstation.dto.ReceptionStatisticsDto">
         SELECT aep.practitioner_id,
         aper.NAME AS practitioner_name,
         COUNT(1) AS reception_nums
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationPtDetailsAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationPtDetailsAppMapper.xml
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationPtDetailsAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationPtDetailsAppMapper.xml
index 25db46189..d241a0015 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationPtDetailsAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationPtDetailsAppMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.doctorstation.mapper.DoctorStationPtDetailsAppMapper">
+<mapper namespace="com.healthlink.his.web.doctorstation.mapper.DoctorStationPtDetailsAppMapper">
     <!-- 查询患者详情-->
-    <select id="getPtDetailsList" resultType="com.openhis.web.doctorstation.dto.PatientDetailsDto">
+    <select id="getPtDetailsList" resultType="com.healthlink.his.web.doctorstation.dto.PatientDetailsDto">
     SELECT
         p.name,
         p.gender_enum,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/ReservationRecordAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/doctorstation/ReservationRecordAppMapper.xml
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/ReservationRecordAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/doctorstation/ReservationRecordAppMapper.xml
index 4cfe34049..78de86282 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/ReservationRecordAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/doctorstation/ReservationRecordAppMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.doctorstation.mapper.ReservationRecordAppMapper">
+<mapper namespace="com.healthlink.his.web.doctorstation.mapper.ReservationRecordAppMapper">
 
-    <select id="getReservationInfo" resultType="com.openhis.web.doctorstation.dto.ReservationRecordDto">
+    <select id="getReservationInfo" resultType="com.healthlink.his.web.doctorstation.dto.ReservationRecordDto">
         SELECT ri.tenant_id,
                ri.id,
                ri.patient_name,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/document/DocDefinitionAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/document/DocDefinitionAppMapper.xml
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/document/DocDefinitionAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/document/DocDefinitionAppMapper.xml
index 302d6fcc6..e01c6c8ae 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/document/DocDefinitionAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/document/DocDefinitionAppMapper.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.document.mapper.DocDefinitionAppMapper">
+<mapper namespace="com.healthlink.his.web.document.mapper.DocDefinitionAppMapper">
 
     <select id="getDefinationList" parameterType="java.util.Map"
-            resultType="com.openhis.web.document.dto.DocDefinitionDto">
+            resultType="com.healthlink.his.web.document.dto.DocDefinitionDto">
 
         SELECT
         dd.id,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/document/DocRecordAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/document/DocRecordAppMapper.xml
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/document/DocRecordAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/document/DocRecordAppMapper.xml
index 16957c140..789820117 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/document/DocRecordAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/document/DocRecordAppMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.document.mapper.DocRecordAppMapper">
+<mapper namespace="com.healthlink.his.web.document.mapper.DocRecordAppMapper">
     <!-- 患者信息分页查询-->
     <select id="getRecordPageList" parameterType="java.util.Map"
-            resultType="com.openhis.web.document.dto.DocRecordPatientDto">
+            resultType="com.healthlink.his.web.document.dto.DocRecordPatientDto">
         SELECT t1.id,
         t1.definition_id,
         t1.definition_bus_no,
@@ -87,7 +87,7 @@
         ${ew.customSqlSegment}
     </select>
     <select id="getRecordPageListByEncounterId" parameterType="java.util.Map"
-            resultType="com.openhis.web.document.dto.DocRecordDto">
+            resultType="com.healthlink.his.web.document.dto.DocRecordDto">
         SELECT t1.id,
                t1.definition_id,
                t1.definition_bus_no,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/document/DocStatisticsDefinitionAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/document/DocStatisticsDefinitionAppMapper.xml
similarity index 80%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/document/DocStatisticsDefinitionAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/document/DocStatisticsDefinitionAppMapper.xml
index d5babe441..f6baed610 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/document/DocStatisticsDefinitionAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/document/DocStatisticsDefinitionAppMapper.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.document.mapper.DocStatisticsDefinitionAppMapper">
+<mapper namespace="com.healthlink.his.web.document.mapper.DocStatisticsDefinitionAppMapper">
     <!-- 患者信息分页查询-->
     <select id="getDocStatisticsDefinitionPageList" parameterType="java.util.Map"
-            resultType="com.openhis.web.document.dto.DocStatisticsDefinitionDto">
+            resultType="com.healthlink.his.web.document.dto.DocStatisticsDefinitionDto">
 
     </select>
     <select id="getOptionList" parameterType="java.util.Map"
-            resultType="com.openhis.web.document.dto.OptionDto">
+            resultType="com.healthlink.his.web.document.dto.OptionDto">
         SELECT op.id as option_id,
         op.option,
         op.display_order,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/externalintegration/FoodborneAcquisitionAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/externalintegration/FoodborneAcquisitionAppMapper.xml
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/externalintegration/FoodborneAcquisitionAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/externalintegration/FoodborneAcquisitionAppMapper.xml
index 9c5cf031b..164e2e5fa 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/externalintegration/FoodborneAcquisitionAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/externalintegration/FoodborneAcquisitionAppMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.externalintegration.mapper.FoodborneAcquisitionAppMapper">
+<mapper namespace="com.healthlink.his.web.externalintegration.mapper.FoodborneAcquisitionAppMapper">
 
     <select id="selectEncounterDiagnosisConditionNameList" resultType="String">
         SELECT T3."name"
@@ -13,7 +13,7 @@
     </select>
 
     <select id="selectSimplediseaseAddNopwParam"
-            resultType="com.openhis.web.externalintegration.dto.FaSimplediseaseAddNopwParam">
+            resultType="com.healthlink.his.web.externalintegration.dto.FaSimplediseaseAddNopwParam">
         SELECT to_char(COALESCE(T3.onset_datetime, T1.create_time), 'YYYY-MM-DD HH24:MI') AS diseaseDate
              , to_char(T1.create_time, 'YYYY-MM-DD HH24:MI')                              AS diseaseTreattime
              , T1.bus_no                                                                  AS outPatientNumber
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalcharge/AdvancePaymentManageAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/AdvancePaymentManageAppMapper.xml
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalcharge/AdvancePaymentManageAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/AdvancePaymentManageAppMapper.xml
index eaf9f0d43..db8d70208 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalcharge/AdvancePaymentManageAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/AdvancePaymentManageAppMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.inhospitalcharge.mapper.AdvancePaymentManageAppMapper">
+<mapper namespace="com.healthlink.his.web.inhospitalcharge.mapper.AdvancePaymentManageAppMapper">
 
-    <select id="getAdvancePaymentInfo" resultType="com.openhis.web.inhospitalcharge.dto.AdvancePaymentInfoDto">
+    <select id="getAdvancePaymentInfo" resultType="com.healthlink.his.web.inhospitalcharge.dto.AdvancePaymentInfoDto">
         SELECT api.tenant_id,
         api.encounter_id,
         api.bus_no,
@@ -94,7 +94,7 @@
     </select>
 
     <select id="getAdvancePaymentFlowRecordList"
-            resultType="com.openhis.web.inhospitalcharge.dto.AdvancePaymentFlowRecordDto">
+            resultType="com.healthlink.his.web.inhospitalcharge.dto.AdvancePaymentFlowRecordDto">
         SELECT fpr.payment_no,
                fpr.tendered_amount,
                fpr.payment_enum,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalcharge/InHospitalRegisterAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/InHospitalRegisterAppMapper.xml
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalcharge/InHospitalRegisterAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/InHospitalRegisterAppMapper.xml
index 9dd86a07c..99f17153a 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalcharge/InHospitalRegisterAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/InHospitalRegisterAppMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.inhospitalcharge.mapper.InHospitalRegisterAppMapper">
+<mapper namespace="com.healthlink.his.web.inhospitalcharge.mapper.InHospitalRegisterAppMapper">
 
-    <select id="getInHospitalRegisterInfo" resultType="com.openhis.web.inhospitalcharge.dto.InHospitalRegisterQueryDto">
+    <select id="getInHospitalRegisterInfo" resultType="com.healthlink.his.web.inhospitalcharge.dto.InHospitalRegisterQueryDto">
         SELECT ihri.tenant_id,
         ihri.encounter_id,
         ihri.amb_encounter_id,
@@ -63,7 +63,7 @@
         ORDER BY ihri.request_time DESC
     </select>
 
-    <select id="getPatientInfo" resultType="com.openhis.web.inhospitalcharge.dto.InHospitalPatientInfoDto">
+    <select id="getPatientInfo" resultType="com.healthlink.his.web.inhospitalcharge.dto.InHospitalPatientInfoDto">
         SELECT ap.id   AS patient_id,
                ap.bus_no,
                ap.NAME AS patient_name,
@@ -83,7 +83,7 @@
           AND ap.ID = #{patientId}
     </select>
 
-    <select id="getInHospitalInfo" resultType="com.openhis.web.inhospitalcharge.dto.InHospitalInfoDto">
+    <select id="getInHospitalInfo" resultType="com.healthlink.his.web.inhospitalcharge.dto.InHospitalInfoDto">
         SELECT ae.ID                                  AS encounter_id,
                ae.bus_no                              AS bus_no,
                (SELECT COUNT(1)
@@ -169,7 +169,7 @@
             , '%')
     </select>
 
-    <select id="selectWardList" resultType="com.openhis.administration.domain.Location">
+    <select id="selectWardList" resultType="com.healthlink.his.administration.domain.Location">
         SELECT
         id,
         name,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml
index b9e7ec3b1..72c8c9a7f 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.inhospitalnursestation.mapper.ATDManageAppMapper">
+<mapper namespace="com.healthlink.his.web.inhospitalnursestation.mapper.ATDManageAppMapper">
     <select id="selectAdmissionPatientPage"
-            resultType="com.openhis.web.inhospitalnursestation.dto.AdmissionPatientPageDto">
+            resultType="com.healthlink.his.web.inhospitalnursestation.dto.AdmissionPatientPageDto">
     SELECT ii.encounter_id,
            ii.bus_no,
            ii.encounter_status,
@@ -121,7 +121,7 @@
     ${ew.customSqlSegment}
     </select>
     <select id="selectAdmissionBadPage"
-            resultType="com.openhis.web.inhospitalnursestation.dto.AdmissionBedPageDto">
+            resultType="com.healthlink.his.web.inhospitalnursestation.dto.AdmissionBedPageDto">
     SELECT ii.bed_id,
            ii.bed_name,
            ii.bed_status,
@@ -225,7 +225,7 @@
     ${ew.customSqlSegment}
     </select>
     <select id="selectAdmissionPatientInfo"
-            resultType="com.openhis.web.inhospitalnursestation.dto.AdmissionPatientInfoDto">
+            resultType="com.healthlink.his.web.inhospitalnursestation.dto.AdmissionPatientInfoDto">
         SELECT DISTINCT ae.id                             AS encounter_id,
                ae.bus_no,
                ae.priority_enum,
@@ -354,7 +354,7 @@
         WHERE ae.id = #{encounterId}
           AND ae.delete_flag = '0'
     </select>
-    <select id="getAmount" resultType="com.openhis.web.inhospitalnursestation.dto.EncounterAccountDto">
+    <select id="getAmount" resultType="com.healthlink.his.web.inhospitalnursestation.dto.EncounterAccountDto">
         SELECT aa.id,
                aa.encounter_id,
                aa.balance_amount AS advance_amount,
@@ -376,7 +376,7 @@
           AND aa.encounter_id = #{encounterId}
         GROUP BY aa.id, aa.encounter_id, aa.balance_amount;
     </select>
-    <select id="getPendingMedication" resultType="com.openhis.web.inhospitalnursestation.dto.PendingMedicationDto">
+    <select id="getPendingMedication" resultType="com.healthlink.his.web.inhospitalnursestation.dto.PendingMedicationDto">
         SELECT mmr.id               AS medication_request_id,
                mmdi.id              AS medication_dispense_id,
                ao.name              AS org_name,
@@ -423,7 +423,7 @@
            OR mmr.status_enum = #{requestStatus})
     </select>
     <select id="selectInpatientAdvicePage"
-            resultType="com.openhis.web.inhospitalnursestation.dto.InpatientAdviceDto">
+            resultType="com.healthlink.his.web.inhospitalnursestation.dto.InpatientAdviceDto">
         SELECT ii.encounter_id,
                ii.advice_table,
                ii.request_id,
@@ -748,7 +748,7 @@
                ORDER BY T1.status_enum)) AS ii
             ${ew.customSqlSegment}
     </select>
-    <select id="selectPerformRecordList" resultType="com.openhis.web.common.dto.PerformRecordDto">
+    <select id="selectPerformRecordList" resultType="com.healthlink.his.web.common.dto.PerformRecordDto">
         SELECT cp.id AS procedure_id,
         cp.status_enum,
         cp.occurrence_time,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml
index 462449943..3888151bb 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.inhospitalnursestation.mapper.AdviceProcessAppMapper">
+<mapper namespace="com.healthlink.his.web.inhospitalnursestation.mapper.AdviceProcessAppMapper">
 
     <select id="selectInpatientPage"
-            resultType="com.openhis.web.inhospitalnursestation.dto.AdmissionPatientPageDto">
+            resultType="com.healthlink.his.web.inhospitalnursestation.dto.AdmissionPatientPageDto">
         SELECT ii.encounter_id,
                ii.bus_no,
                ii.encounter_status,
@@ -110,7 +110,7 @@
             ${ew.customSqlSegment}
     </select>
     <select id="selectInpatientAdvicePage"
-            resultType="com.openhis.web.inhospitalnursestation.dto.InpatientAdviceDto">
+            resultType="com.healthlink.his.web.inhospitalnursestation.dto.InpatientAdviceDto">
     SELECT ii.encounter_id,
            ii.advice_table,
            ii.request_id,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/EncounterAutoRollAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inhospitalnursestation/EncounterAutoRollAppMapper.xml
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/EncounterAutoRollAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/inhospitalnursestation/EncounterAutoRollAppMapper.xml
index 9d3065db8..ccb7d4c6d 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/EncounterAutoRollAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inhospitalnursestation/EncounterAutoRollAppMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.inhospitalnursestation.mapper.EncounterAutoRollAppMapper">
+<mapper namespace="com.healthlink.his.web.inhospitalnursestation.mapper.EncounterAutoRollAppMapper">
 
-    <select id="getSource" resultType="com.openhis.web.inhospitalnursestation.dto.AutoRollSourceDto">
+    <select id="getSource" resultType="com.healthlink.his.web.inhospitalnursestation.dto.AutoRollSourceDto">
         SELECT ID   AS instance_id,
                NAME AS instance_name,
                permitted_unit_code
@@ -12,7 +12,7 @@
           AND category_code = #{basicService}
     </select>
 
-    <select id="getEncounter" resultType="com.openhis.web.inhospitalnursestation.dto.EncounterAutoRollQueryDto">
+    <select id="getEncounter" resultType="com.healthlink.his.web.inhospitalnursestation.dto.EncounterAutoRollQueryDto">
         SELECT tear.ID,
                tear.status_enum,
                tear.quantity,
@@ -33,7 +33,7 @@
           AND tear.encounter_id = #{encounterId}
     </select>
 
-    <select id="getInBedPatientInfo" resultType="com.openhis.web.inhospitalnursestation.dto.InBedPatientInfoDto">
+    <select id="getInBedPatientInfo" resultType="com.healthlink.his.web.inhospitalnursestation.dto.InBedPatientInfoDto">
         SELECT ae.ID  AS encounter_id,
                ae.organization_id,
                ae.patient_id,
@@ -59,7 +59,7 @@
             )
     </select>
 
-    <select id="getNursingRequest" resultType="com.openhis.web.inhospitalnursestation.dto.AutoRollNursingDto">
+    <select id="getNursingRequest" resultType="com.healthlink.his.web.inhospitalnursestation.dto.AutoRollNursingDto">
         SELECT
         wsr.activity_id AS activity_definition_id,
         wsr.quantity,
@@ -81,7 +81,7 @@
     </select>
 
     <select id="getAutoRollBasicService"
-            resultType="com.openhis.web.inhospitalnursestation.dto.AutoRollBasicServiceDto">
+            resultType="com.healthlink.his.web.inhospitalnursestation.dto.AutoRollBasicServiceDto">
         SELECT
         tear.encounter_id,
         tear.instance_id AS activity_definition_id,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/MedicineSummaryAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inhospitalnursestation/MedicineSummaryAppMapper.xml
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/MedicineSummaryAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/inhospitalnursestation/MedicineSummaryAppMapper.xml
index a48616428..e90c8784a 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/MedicineSummaryAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inhospitalnursestation/MedicineSummaryAppMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.inhospitalnursestation.mapper.MedicineSummaryAppMapper">
-    <resultMap id="MedicineDispenseFormMap" type="com.openhis.web.inhospitalnursestation.dto.MedicineDispenseFormDto">
+<mapper namespace="com.healthlink.his.web.inhospitalnursestation.mapper.MedicineSummaryAppMapper">
+    <resultMap id="MedicineDispenseFormMap" type="com.healthlink.his.web.inhospitalnursestation.dto.MedicineDispenseFormDto">
         <result property="encounterId" column="encounter_id"/>
         <result property="skinTestFlag" column="skin_test_flag"/>
         <result property="injectFlag" column="inject_flag"/>
@@ -33,7 +33,7 @@
         <result property="conditionNames" column="condition_names"/>
         <result property="admittingDoctorName" column="admitting_doctor_name"/>
         <result property="balanceAmount" column="balance_amount"/>
-        <collection property="medicineSummaryParamList" ofType="com.openhis.web.inhospitalnursestation.dto.MedicineSummaryParam">
+        <collection property="medicineSummaryParamList" ofType="com.healthlink.his.web.inhospitalnursestation.dto.MedicineSummaryParam">
             <result property="procedureId" column="procedure_id"/>
             <result property="dispenseId" column="dispense_id"/>
             <result property="dispenseTime" column="planned_dispense_time"/>
@@ -204,7 +204,7 @@
             ${ew.customSqlSegment}
     </select>
     <select id="selectMedicineSummaryFormPage"
-            resultType="com.openhis.web.inhospitalnursestation.dto.MedicineSummaryFormDto">
+            resultType="com.healthlink.his.web.inhospitalnursestation.dto.MedicineSummaryFormDto">
     SELECT T1.bus_no ,
            T1.apply_time ,
            T1.applicant_id,
@@ -255,7 +255,7 @@
     ${ew.customSqlSegment}
     </select>
     <select id="selectMedicineSummaryFormDetail"
-            resultType="com.openhis.web.inhospitalnursestation.dto.MedicineSummaryInfoDto">
+            resultType="com.healthlink.his.web.inhospitalnursestation.dto.MedicineSummaryInfoDto">
         SELECT mmd."name" AS item_name,
                mmd.unit_code ,
                mmd.min_unit_code ,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/NurseBillingAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inhospitalnursestation/NurseBillingAppMapper.xml
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/NurseBillingAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/inhospitalnursestation/NurseBillingAppMapper.xml
index f024a2dc8..4fae4b976 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/NurseBillingAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inhospitalnursestation/NurseBillingAppMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.inhospitalnursestation.mapper.NurseBillingAppMapper">
+<mapper namespace="com.healthlink.his.web.inhospitalnursestation.mapper.NurseBillingAppMapper">
 
     <select id="getInNurseBillingPage"
-            resultType="com.openhis.web.inhospitalnursestation.dto.InpatientAdviceDto">
+            resultType="com.healthlink.his.web.inhospitalnursestation.dto.InpatientAdviceDto">
         SELECT ii.encounter_id,
                ii.advice_table,
                ii.request_id,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/OrgDeviceStockTakeAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inhospitalnursestation/OrgDeviceStockTakeAppMapper.xml
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/OrgDeviceStockTakeAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/inhospitalnursestation/OrgDeviceStockTakeAppMapper.xml
index ad46fb0d4..5f5fbd4cb 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/OrgDeviceStockTakeAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inhospitalnursestation/OrgDeviceStockTakeAppMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.inhospitalnursestation.mapper.OrgDeviceStockTakeAppMapper">
-    <select id="selectOrgDeviceInfo" resultType="com.openhis.web.inhospitalnursestation.dto.OrgDeviceDto">
+<mapper namespace="com.healthlink.his.web.inhospitalnursestation.mapper.OrgDeviceStockTakeAppMapper">
+    <select id="selectOrgDeviceInfo" resultType="com.healthlink.his.web.inhospitalnursestation.dto.OrgDeviceDto">
         SELECT ii.bus_no,              --单据号
                ii.request_id,          --供应请求id
                ii.dispense_id,         --供应发放id
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/DepositMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inpatientmanage/DepositMapper.xml
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/DepositMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/inpatientmanage/DepositMapper.xml
index 51002babc..3e9550b09 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/DepositMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inpatientmanage/DepositMapper.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.inpatientmanage.mapper.DepositMapper">
+<mapper namespace="com.healthlink.his.web.inpatientmanage.mapper.DepositMapper">
 
     <!-- 住院登记信息分页查询-->
     <select id="getPage" parameterType="java.util.Map"
-            resultType="com.openhis.web.inpatientmanage.dto.DepositDetailDto">
+            resultType="com.healthlink.his.web.inpatientmanage.dto.DepositDetailDto">
         SELECT T8.patient_id,
                T8.name,
                T8.gender_enum,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/NursingRecordAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inpatientmanage/NursingRecordAppMapper.xml
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/NursingRecordAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/inpatientmanage/NursingRecordAppMapper.xml
index c36a03f67..6112b8f94 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/NursingRecordAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inpatientmanage/NursingRecordAppMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.inpatientmanage.mapper.NursingRecordAppMapper">
+<mapper namespace="com.healthlink.his.web.inpatientmanage.mapper.NursingRecordAppMapper">
     <!-- 患者信息分页查询-->
     <select id="getPatientPage" parameterType="java.util.Map"
-            resultType="com.openhis.web.inpatientmanage.dto.NursingPageDto">
+            resultType="com.healthlink.his.web.inpatientmanage.dto.NursingPageDto">
         SELECT T5.tenant_id,
                T5.patient_id,
                T5.patient_name,
@@ -88,7 +88,7 @@
 
     <!-- 患者护理记录单信息分页查询-->
     <select id="getNursingPatientPage" parameterType="java.util.Map"
-            resultType="com.openhis.web.inpatientmanage.dto.NursingDetailDto">
+            resultType="com.healthlink.his.web.inpatientmanage.dto.NursingDetailDto">
         SELECT T6.tenant_id,
                T6.patient_id,
                T6.patient_name,
@@ -175,7 +175,7 @@
 
     <!-- 病历模板分页查询-->
     <select id="getEmrTemplate" parameterType="java.util.Map"
-            resultType="com.openhis.web.inpatientmanage.dto.NursingEmrTemplateDto">
+            resultType="com.healthlink.his.web.inpatientmanage.dto.NursingEmrTemplateDto">
         SELECT T2.tenant_id,
                T2.id,
                T2.template_name,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/PatientHomeAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inpatientmanage/PatientHomeAppMapper.xml
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/PatientHomeAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/inpatientmanage/PatientHomeAppMapper.xml
index b474788e4..23b59e544 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/PatientHomeAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inpatientmanage/PatientHomeAppMapper.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.inpatientmanage.mapper.PatientHomeAppMapper">
+<mapper namespace="com.healthlink.his.web.inpatientmanage.mapper.PatientHomeAppMapper">
 
     <!-- 患者首页信息分页查询 -->
     <select id="getPage" parameterType="java.util.Map"
-            resultType="com.openhis.web.inpatientmanage.dto.PatientHomeDto">
+            resultType="com.healthlink.his.web.inpatientmanage.dto.PatientHomeDto">
         SELECT
             id,
             active_flag,
@@ -267,7 +267,7 @@
 
     <!-- 科室空床查询-->
     <select id="getEmptyBedList" parameterType="java.util.List"
-            resultType="com.openhis.web.inpatientmanage.dto.PatientHomeEmptyBedDto">
+            resultType="com.healthlink.his.web.inpatientmanage.dto.PatientHomeEmptyBedDto">
         SELECT id as locationId
         FROM adm_location
         WHERE organization_id = #{organizationId}
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/VitalSignsAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inpatientmanage/VitalSignsAppMapper.xml
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/VitalSignsAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/inpatientmanage/VitalSignsAppMapper.xml
index a540f5ef3..f61bffcda 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/VitalSignsAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inpatientmanage/VitalSignsAppMapper.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.inpatientmanage.mapper.VitalSignsAppMapper">
+<mapper namespace="com.healthlink.his.web.inpatientmanage.mapper.VitalSignsAppMapper">
 
     <!-- 三测单患者信息查询-->
     <select id="getVitalSignsInfo" parameterType="java.util.Map"
-            resultType="com.openhis.web.inpatientmanage.dto.VitalSignsDto">
+            resultType="com.healthlink.his.web.inpatientmanage.dto.VitalSignsDto">
         SELECT  T1.id,
                 T1.patient_id,
                 T1.encounter_id,
@@ -63,7 +63,7 @@
 
     <!-- 三测单患者信息查询-->
     <select id="searchVitalSigns" parameterType="java.util.Map"
-            resultType="com.openhis.document.domain.VitalSigns">
+            resultType="com.healthlink.his.document.domain.VitalSigns">
         SELECT  T1.id,
                 T1.patient_id,
                 T1.encounter_id,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inspection/GroupRecMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inspection/GroupRecMapper.xml
similarity index 67%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/inspection/GroupRecMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/inspection/GroupRecMapper.xml
index b1b11a152..49d06212a 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/inspection/GroupRecMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inspection/GroupRecMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.Inspection.mapper.GroupRecMapper">
+<mapper namespace="com.healthlink.his.web.Inspection.mapper.GroupRecMapper">
 
 
 
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inspection/LisReportMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inspection/LisReportMapper.xml
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/inspection/LisReportMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/inspection/LisReportMapper.xml
index bdba87a48..7244d074e 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/inspection/LisReportMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inspection/LisReportMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.Inspection.mapper.LisReportMapper">
+<mapper namespace="com.healthlink.his.web.Inspection.mapper.LisReportMapper">
 
 
-    <select id="getReportResultList" resultType="com.openhis.web.Inspection.dto.ReportResultManageDto">
+    <select id="getReportResultList" resultType="com.healthlink.his.web.Inspection.dto.ReportResultManageDto">
         SELECT
             *
         FROM
@@ -106,7 +106,7 @@
             )
             ${ew.customSqlSegment}
     </select>
-    <select id="getReportListById" resultType="com.openhis.web.Inspection.dto.ReportResultManageDto">
+    <select id="getReportListById" resultType="com.healthlink.his.web.Inspection.dto.ReportResultManageDto">
         SELECT
             t2.service_id AS parentId,
             t1.id,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inspection/SampleCollectMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inspection/SampleCollectMapper.xml
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/inspection/SampleCollectMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/inspection/SampleCollectMapper.xml
index 0590863c4..ecf25779d 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/inspection/SampleCollectMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/inspection/SampleCollectMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.Inspection.mapper.SampleCollectMapper">
+<mapper namespace="com.healthlink.his.web.Inspection.mapper.SampleCollectMapper">
 
-    <select id="getSampleCollectList" resultType="com.openhis.web.Inspection.dto.SampleCollectManageDto">
+    <select id="getSampleCollectList" resultType="com.healthlink.his.web.Inspection.dto.SampleCollectManageDto">
         -- 查询所有子数据
         SELECT
             *
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/jlau/ReviewPrescriptionRecordsAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/jlau/ReviewPrescriptionRecordsAppMapper.xml
similarity index 81%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/jlau/ReviewPrescriptionRecordsAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/jlau/ReviewPrescriptionRecordsAppMapper.xml
index 297dfd118..64a921f7c 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/jlau/ReviewPrescriptionRecordsAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/jlau/ReviewPrescriptionRecordsAppMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.jlau.mapper.ReviewPrescriptionRecordsAppMapper">
+<mapper namespace="com.healthlink.his.web.jlau.mapper.ReviewPrescriptionRecordsAppMapper">
 
-    <select id="getReviewPrescriptionRecords" resultType="com.openhis.web.jlau.dto.ReviewPrescriptionRecordsDto">
+    <select id="getReviewPrescriptionRecords" resultType="com.healthlink.his.web.jlau.dto.ReviewPrescriptionRecordsDto">
         SELECT nrpr.ID AS review_id,
         nrpr.encounter_id,
         nrpr.prescription_no,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialCommonMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialCommonMapper.xml
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialCommonMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialCommonMapper.xml
index cf7508dc1..1c24979c0 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialCommonMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialCommonMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.materialmanage.mapper.MaterialCommonMapper">
+<mapper namespace="com.healthlink.his.web.materialmanage.mapper.MaterialCommonMapper">
     <select id="getDeviceInfo"
-            resultType="com.openhis.web.materialmanage.dto.MaterialDeviceInfoDto">
+            resultType="com.healthlink.his.web.materialmanage.dto.MaterialDeviceInfoDto">
         SELECT T6.id,--物品id
                T6.bus_no,--   药品编号
                T6.name,-- 物品名称
@@ -169,7 +169,7 @@
             ${ew.customSqlSegment}
     </select>
     <select id="getPage"
-            resultType="com.openhis.web.materialmanage.dto.MaterialDto">
+            resultType="com.healthlink.his.web.materialmanage.dto.MaterialDto">
         SELECT T4.tenant_id,
                T4.supply_bus_no, --单据号
                T4.type_enum,     --类型
@@ -230,7 +230,7 @@
             ${ew.customSqlSegment}
     </select>
     <select id="getDetailPage"
-            resultType="com.openhis.web.materialmanage.dto.MaterialDetailDto">
+            resultType="com.healthlink.his.web.materialmanage.dto.MaterialDetailDto">
         SELECT T1.id,                             --ID
                T1.bus_no,                         --单据号
                T2.bus_no        AS item_bus_no,   --药品编码
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialProfitLossOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialProfitLossOrderMapper.xml
similarity index 62%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialProfitLossOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialProfitLossOrderMapper.xml
index 27c71c1f3..e912b916f 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialProfitLossOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialProfitLossOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.materialmanage.mapper.MaterialProfitLossOrderMapper">
+<mapper namespace="com.healthlink.his.web.materialmanage.mapper.MaterialProfitLossOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialPurchaseOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialPurchaseOrderMapper.xml
similarity index 62%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialPurchaseOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialPurchaseOrderMapper.xml
index e6468200f..a3a6729d1 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialPurchaseOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialPurchaseOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.materialmanage.mapper.MaterialPurchaseOrderMapper">
+<mapper namespace="com.healthlink.his.web.materialmanage.mapper.MaterialPurchaseOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialReturnOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialReturnOrderMapper.xml
similarity index 63%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialReturnOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialReturnOrderMapper.xml
index 1370cc419..790683ced 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialReturnOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialReturnOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.materialmanage.mapper.MaterialReturnOrderMapper">
+<mapper namespace="com.healthlink.his.web.materialmanage.mapper.MaterialReturnOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialReturnToWarehouseOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialReturnToWarehouseOrderMapper.xml
similarity index 60%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialReturnToWarehouseOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialReturnToWarehouseOrderMapper.xml
index 0aae096df..c4e55c293 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialReturnToWarehouseOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialReturnToWarehouseOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.materialmanage.mapper.MaterialReturnToWarehouseOrderMapper">
+<mapper namespace="com.healthlink.his.web.materialmanage.mapper.MaterialReturnToWarehouseOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialStockInOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialStockInOrderMapper.xml
similarity index 62%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialStockInOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialStockInOrderMapper.xml
index 96c323a26..13e2b324b 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialStockInOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialStockInOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.materialmanage.mapper.MaterialStockInOrderMapper">
+<mapper namespace="com.healthlink.his.web.materialmanage.mapper.MaterialStockInOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialStockOutOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialStockOutOrderMapper.xml
similarity index 62%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialStockOutOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialStockOutOrderMapper.xml
index 1e21e5bff..ec11ee3fd 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialStockOutOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialStockOutOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.materialmanage.mapper.MaterialStockOutOrderMapper">
+<mapper namespace="com.healthlink.his.web.materialmanage.mapper.MaterialStockOutOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialStocktakingOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialStocktakingOrderMapper.xml
similarity index 61%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialStocktakingOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialStocktakingOrderMapper.xml
index 47311a1fc..6079b1ac2 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialStocktakingOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialStocktakingOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.materialmanage.mapper.MaterialStocktakingOrderMapper">
+<mapper namespace="com.healthlink.his.web.materialmanage.mapper.MaterialStocktakingOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialTransferInOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialTransferInOrderMapper.xml
similarity index 62%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialTransferInOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialTransferInOrderMapper.xml
index a9524a4d9..35d354519 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialTransferInOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialTransferInOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.materialmanage.mapper.MaterialTransferInOrderMapper">
+<mapper namespace="com.healthlink.his.web.materialmanage.mapper.MaterialTransferInOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialTransferOutOrderMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialTransferOutOrderMapper.xml
similarity index 61%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialTransferOutOrderMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialTransferOutOrderMapper.xml
index 776fd61df..22a8f8ae9 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/materialmanage/MaterialTransferOutOrderMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/materialmanage/MaterialTransferOutOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.materialmanage.mapper.MaterialTransferOutOrderMapper">
+<mapper namespace="com.healthlink.his.web.materialmanage.mapper.MaterialTransferOutOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/nenu/GfRatioApplicationRecordAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/nenu/GfRatioApplicationRecordAppMapper.xml
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/nenu/GfRatioApplicationRecordAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/nenu/GfRatioApplicationRecordAppMapper.xml
index a8fa5050c..380efcfb7 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/nenu/GfRatioApplicationRecordAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/nenu/GfRatioApplicationRecordAppMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.nenu.mapper.GfRatioApplicationRecordAppMapper">
+<mapper namespace="com.healthlink.his.web.nenu.mapper.GfRatioApplicationRecordAppMapper">
 
-    <select id="selectGfRatioApplicationRecordPage" resultType="com.openhis.web.nenu.dto.GfRatioApplicationRecordDto">
+    <select id="selectGfRatioApplicationRecordPage" resultType="com.healthlink.his.web.nenu.dto.GfRatioApplicationRecordDto">
         SELECT T.id
              , T.application_no
              , T.item_type
@@ -95,7 +95,7 @@
     </select>
 
     <select id="selectGfRatioApplicationDefinitionSelectPage"
-            resultType="com.openhis.web.nenu.dto.GfRatioApplicationDefinitionSelectDto">
+            resultType="com.healthlink.his.web.nenu.dto.GfRatioApplicationDefinitionSelectDto">
         SELECT T.id
         , T.bus_no
         , T."name"
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/nenu/GfRatioManageAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/nenu/GfRatioManageAppMapper.xml
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/nenu/GfRatioManageAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/nenu/GfRatioManageAppMapper.xml
index 086edffc4..45eebd700 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/nenu/GfRatioManageAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/nenu/GfRatioManageAppMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.nenu.mapper.GfRatioManageAppMapper">
+<mapper namespace="com.healthlink.his.web.nenu.mapper.GfRatioManageAppMapper">
 
-    <select id="selectGfIndividualRatioPage" resultType="com.openhis.web.nenu.dto.GfIndividualRatioDto">
+    <select id="selectGfIndividualRatioPage" resultType="com.healthlink.his.web.nenu.dto.GfIndividualRatioDto">
         SELECT T.id
              , T.item_type
              , T.self_ratio
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/nenu/GfStudentListAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/nenu/GfStudentListAppMapper.xml
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/nenu/GfStudentListAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/nenu/GfStudentListAppMapper.xml
index 74b02ea60..a1baa9c24 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/nenu/GfStudentListAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/nenu/GfStudentListAppMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.nenu.mapper.GfStudentListAppMapper">
+<mapper namespace="com.healthlink.his.web.nenu.mapper.GfStudentListAppMapper">
 
-    <select id="selectGfStudentListPage" resultType="com.openhis.web.nenu.dto.GfStudentListDto">
+    <select id="selectGfStudentListPage" resultType="com.healthlink.his.web.nenu.dto.GfStudentListDto">
         SELECT T.id
              , T.name
              , T.py_str
@@ -64,7 +64,7 @@
               ORDER BY T1.id DESC) AS T
             ${ew.customSqlSegment}
     </select>
-    <select id="getPatientBusNoList" resultType="com.openhis.web.nenu.dto.GfStudentPeisDto">
+    <select id="getPatientBusNoList" resultType="com.healthlink.his.web.nenu.dto.GfStudentPeisDto">
         SELECT T1.bus_no as bus_no
              , T.id_number as id_number
              , T.student_id as student_id
@@ -77,7 +77,7 @@
             LIMIT #{pageSize} OFFSET #{pageNum}
     </select>
 
-    <select id="getPatientBusNoList1" resultType="com.openhis.web.nenu.dto.GfStudentPeisDto">
+    <select id="getPatientBusNoList1" resultType="com.healthlink.his.web.nenu.dto.GfStudentPeisDto">
         SELECT * FROM
         (SELECT T1.bus_no as bus_no
              , T.id_number as id_number
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientInfusionAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/outpatientmanage/OutpatientInfusionAppMapper.xml
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientInfusionAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/outpatientmanage/OutpatientInfusionAppMapper.xml
index 84267b0d7..17304186d 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientInfusionAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/outpatientmanage/OutpatientInfusionAppMapper.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.outpatientmanage.mapper.OutpatientInfusionAppMapper">
+<mapper namespace="com.healthlink.his.web.outpatientmanage.mapper.OutpatientInfusionAppMapper">
 
     <!-- 门诊输液记录患者列表信息查询-->
     <select id="getOutpatientInfusionPatient"
-            resultType="com.openhis.web.outpatientmanage.dto.OutpatientInfusionPatientDto">
+            resultType="com.healthlink.his.web.outpatientmanage.dto.OutpatientInfusionPatientDto">
         SELECT T1.service_status,
                T1.encounter_id,
                T1.encounter_bus_no,
@@ -62,7 +62,7 @@
     </select>
 
     <select id="selectInfusionPendingRecord"
-            resultType="com.openhis.web.outpatientmanage.dto.OutpatientInfusionRecordDto">
+            resultType="com.healthlink.his.web.outpatientmanage.dto.OutpatientInfusionRecordDto">
         SELECT pr.encounter_id,
                pr.service_status,
                pr.authored_time,
@@ -152,7 +152,7 @@
         ORDER BY pr.authored_time DESC
     </select>
     <select id="selectInfusionPerformRecord"
-            resultType="com.openhis.web.outpatientmanage.dto.OutpatientInfusionRecordDto">
+            resultType="com.healthlink.his.web.outpatientmanage.dto.OutpatientInfusionRecordDto">
         SELECT pr.service_status,
                pr.bus_no,
                pr.based_on_id,
@@ -193,7 +193,7 @@
         ORDER BY pr.occurrence_end_time DESC
     </select>
     <select id="selectPerformInfo"
-            resultType="com.openhis.web.outpatientmanage.dto.OutpatientInfusionRecordDto">
+            resultType="com.healthlink.his.web.outpatientmanage.dto.OutpatientInfusionRecordDto">
         SELECT wsr.id AS service_id,
         wsr.status_enum AS service_status,
         mmr.execute_num ,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientSkinTestAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/outpatientmanage/OutpatientSkinTestAppMapper.xml
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientSkinTestAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/outpatientmanage/OutpatientSkinTestAppMapper.xml
index 4e96e44e9..b6ec03be1 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientSkinTestAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/outpatientmanage/OutpatientSkinTestAppMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.outpatientmanage.mapper.OutpatientSkinTestAppMapper">
+<mapper namespace="com.healthlink.his.web.outpatientmanage.mapper.OutpatientSkinTestAppMapper">
 
-    <select id="getRecordInfo" resultType="com.openhis.web.outpatientmanage.dto.SkinTestQueryDto">
+    <select id="getRecordInfo" resultType="com.healthlink.his.web.outpatientmanage.dto.SkinTestQueryDto">
         SELECT wsr.ID   AS request_id,
                wsr.encounter_id,
                wsr.patient_id,
@@ -30,7 +30,7 @@
           AND wsr.encounter_id = #{encounterId}
     </select>
 
-    <select id="getMedLotNumber" resultType="com.openhis.web.outpatientmanage.dto.SkinTestMedLotNumberDto">
+    <select id="getMedLotNumber" resultType="com.healthlink.his.web.outpatientmanage.dto.SkinTestMedLotNumberDto">
         SELECT wii.item_id AS medication_id,
                aser.NAME   AS supplier_name,
                wii.lot_number
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientTreatmentAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/outpatientmanage/OutpatientTreatmentAppMapper.xml
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientTreatmentAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/outpatientmanage/OutpatientTreatmentAppMapper.xml
index 2ad7bfdb4..07bc938c5 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientTreatmentAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/outpatientmanage/OutpatientTreatmentAppMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.outpatientmanage.mapper.OutpatientTreatmentAppMapper">
+<mapper namespace="com.healthlink.his.web.outpatientmanage.mapper.OutpatientTreatmentAppMapper">
     <select id="selectEncounterInfoListPage"
-            resultType="com.openhis.web.outpatientmanage.dto.OutpatientTreatmentEncounterDto">
+            resultType="com.healthlink.his.web.outpatientmanage.dto.OutpatientTreatmentEncounterDto">
         SELECT ii.encounter_id,
                ii.reception_time,
                ii.encounter_no,
@@ -51,7 +51,7 @@
             ${ew.customSqlSegment}
     </select>
     <select id="selectTreatmentInfoPage"
-            resultType="com.openhis.web.outpatientmanage.dto.OutpatientTreatmentInfoDto">
+            resultType="com.healthlink.his.web.outpatientmanage.dto.OutpatientTreatmentInfoDto">
         SELECT ii.encounter_id,
                ii.request_id,
                ii.service_status,
@@ -204,7 +204,7 @@
             ${ew.customSqlSegment}
         ORDER BY ii.sort_number
     </select>
-    <select id="selectPerformRecordList" resultType="com.openhis.web.common.dto.PerformRecordDto">
+    <select id="selectPerformRecordList" resultType="com.healthlink.his.web.common.dto.PerformRecordDto">
         SELECT cp.id AS procedure_id,
                cp.status_enum,
                cp.occurrence_time,
@@ -239,7 +239,7 @@
         </if>
     </select>
 
-    <select id="getBloodTransfusionPatch" resultType="com.openhis.web.outpatientmanage.dto.BloodTransfusionPatchDto">
+    <select id="getBloodTransfusionPatch" resultType="com.healthlink.his.web.outpatientmanage.dto.BloodTransfusionPatchDto">
         SELECT ap.NAME                      AS patient_name,
                ap.gender_enum,
                ap.birth_date,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml
index 221a7fa1e..1897f963e 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.patientmanage.mapper.PatientManageMapper">
+<mapper namespace="com.healthlink.his.web.patientmanage.mapper.PatientManageMapper">
     <!-- 病人信息相关查询-->
-    <select id="getPatientPage" resultType="com.openhis.web.patientmanage.dto.PatientBaseInfoDto">
+    <select id="getPatientPage" resultType="com.healthlink.his.web.patientmanage.dto.PatientBaseInfoDto">
         SELECT
                pt.identifier_no,
                pt.tenant_id,
@@ -89,7 +89,7 @@
             ORDER BY pt.bus_no DESC
     </select>
 
-    <select id="getPatientIdInfo" resultType="com.openhis.web.patientmanage.dto.PatientIdInfoDto">
+    <select id="getPatientIdInfo" resultType="com.healthlink.his.web.patientmanage.dto.PatientIdInfoDto">
         SELECT patient_id,
         type_code,
         identifier_no,
@@ -106,7 +106,7 @@
     </select>
 
     <!-- 查询门诊记录 -->
-    <select id="getOutpatientRecord" resultType="com.openhis.web.patientmanage.dto.OutpatientRecordDto">
+    <select id="getOutpatientRecord" resultType="com.healthlink.his.web.patientmanage.dto.OutpatientRecordDto">
         SELECT
             enc.id as encounterId,
             pt.name,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/ChangePriceMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/paymentmanage/ChangePriceMapper.xml
similarity index 71%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/ChangePriceMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/paymentmanage/ChangePriceMapper.xml
index e351aa051..2e3d5b84f 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/ChangePriceMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/paymentmanage/ChangePriceMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.paymentmanage.mapper.ChangePriceMapper">
+<mapper namespace="com.healthlink.his.web.paymentmanage.mapper.ChangePriceMapper">
     <!-- 查询药品信息集合 -->
-    <select id="searchMedicationList" resultType="com.openhis.medication.domain.MedicationDefinition">
+    <select id="searchMedicationList" resultType="com.healthlink.his.medication.domain.MedicationDefinition">
         SELECT *
         FROM med_medication_definition medication_def
 --                  INNER JOIN med_medication medication ON medication_def.id = medication.medication_def_id
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/ChargeBillMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/paymentmanage/ChargeBillMapper.xml
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/ChargeBillMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/paymentmanage/ChargeBillMapper.xml
index 883b8d41b..c9a1c7b4f 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/ChargeBillMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/paymentmanage/ChargeBillMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.paymentmanage.mapper.ChargeBillMapper">
+<mapper namespace="com.healthlink.his.web.paymentmanage.mapper.ChargeBillMapper">
 
-    <select id="selectChargeItemExtendInfoList" resultType="com.openhis.web.paymentmanage.dto.ChargeItemExtendInfoDto">
+    <select id="selectChargeItemExtendInfoList" resultType="com.healthlink.his.web.paymentmanage.dto.ChargeItemExtendInfoDto">
         SELECT
         T1.total_price,
         T1.org_id,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/EleInvoiceMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/paymentmanage/EleInvoiceMapper.xml
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/EleInvoiceMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/paymentmanage/EleInvoiceMapper.xml
index 1e440c6bd..e90225541 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/EleInvoiceMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/paymentmanage/EleInvoiceMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.paymentmanage.mapper.EleInvoiceMapper">
+<mapper namespace="com.healthlink.his.web.paymentmanage.mapper.EleInvoiceMapper">
     <!-- 付款信息相关查询-->
-    <select id="getPaymentInfo" resultType="com.openhis.web.paymentmanage.dto.EleInvoicePaymentInfoDto">
+    <select id="getPaymentInfo" resultType="com.healthlink.his.web.paymentmanage.dto.EleInvoicePaymentInfoDto">
         SELECT T1.status_enum     AS payment_status,-- 付款状态
                T4.id              AS invoice_id, --发票id
                T4.status_enum     AS invoice_status, --发票状态
@@ -67,7 +67,7 @@
                  T1.bill_date
     </select>
     <!-- 患者信息相关查询-->
-    <select id="getPatientInfo" resultType="com.openhis.web.paymentmanage.dto.EleInvoicePatientInfoDto">
+    <select id="getPatientInfo" resultType="com.healthlink.his.web.paymentmanage.dto.EleInvoicePatientInfoDto">
         SELECT DISTINCT T1.id          AS payer_id,              --患者id
                         T1.name        AS payer,                 --患者姓名
                         T1.bus_no      AS case_number,           --患者院内编码/病历号
@@ -145,7 +145,7 @@
         LIMIT 1
     </select>
     <!-- 收费项目明细相关查询-->
-    <select id="getChargeDetail" resultType="com.openhis.web.paymentmanage.dto.EleInvoiceChargeDetailDto">
+    <select id="getChargeDetail" resultType="com.healthlink.his.web.paymentmanage.dto.EleInvoiceChargeDetailDto">
         SELECT T2.yb_type, --医疗收费项目类别
         SUM(T1.quantity_value) AS number, --数量
         SUM(T1.total_price) AS amt,--金额
@@ -179,7 +179,7 @@
         ORDER BY T2.yb_type
     </select>
     <!-- 清单项目明细相关查询-->
-    <select id="getListDetail" resultType="com.openhis.web.paymentmanage.dto.EleInvoiceListDetailDto">
+    <select id="getListDetail" resultType="com.healthlink.his.web.paymentmanage.dto.EleInvoiceListDetailDto">
         SELECT T1.id AS list_detail_no,--明细流水号
         T2.yb_type, --医疗收费项目类别
         CASE
@@ -244,7 +244,7 @@
         AND T1.delete_flag = '0'
     </select>
     <!-- 挂号清单项目明细相关查询-->
-    <select id="getRegListDetail" resultType="com.openhis.web.paymentmanage.dto.EleInvoiceListDetailDto">
+    <select id="getRegListDetail" resultType="com.healthlink.his.web.paymentmanage.dto.EleInvoiceListDetailDto">
         SELECT T1.id AS list_detail_no,--明细流水号
         T2.id AS code, --药品编码
         T2.charge_name AS name, --药品名称
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/PaymentMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/paymentmanage/PaymentMapper.xml
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/PaymentMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/paymentmanage/PaymentMapper.xml
index 96c62d523..e8e1b0540 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/PaymentMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/paymentmanage/PaymentMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.paymentmanage.mapper.PaymentMapper">
+<mapper namespace="com.healthlink.his.web.paymentmanage.mapper.PaymentMapper">
 
-    <select id="getPage" resultType="com.openhis.web.paymentmanage.dto.PaymentVO">
+    <select id="getPage" resultType="com.healthlink.his.web.paymentmanage.dto.PaymentVO">
         SELECT T1.id,
         T1.relation_id,
         T1.status_enum,
@@ -64,7 +64,7 @@
         ORDER BY t.create_time DESC) as T1
         ${ew.customSqlSegment}
     </select>
-    <select id="getPaymentDetailList" resultType="com.openhis.yb.dto.PaymentDetailDto">
+    <select id="getPaymentDetailList" resultType="com.healthlink.his.yb.dto.PaymentDetailDto">
         SELECT id,
                predecessor_id,
                target_enum,
@@ -90,7 +90,7 @@
         FROM fin_payment_rec_detail
         WHERE reconciliation_id = #{id}
     </select>
-    <select id="getChargeItemList" resultType="com.openhis.web.paymentmanage.dto.ChargeItemDto">
+    <select id="getChargeItemList" resultType="com.healthlink.his.web.paymentmanage.dto.ChargeItemDto">
         select T.id,
                T.status_enum,
                T.bus_no,
@@ -138,7 +138,7 @@
         WHERE T2.dict_type = #{s}
           AND T.id IN (#{collect})
     </select>
-    <select id="getChargeItems" resultType="com.openhis.web.paymentmanage.dto.ChargeItemDto">
+    <select id="getChargeItems" resultType="com.healthlink.his.web.paymentmanage.dto.ChargeItemDto">
         select T.id,
                T.status_enum,
                T.bus_no,
@@ -185,7 +185,7 @@
                  LEFT JOIN sys_dict_type AS T2 ON T1.type_code = T2.dict_type
         WHERE T.id IN (#{collect})
     </select>
-    <select id="getChargeItemListByEncounterId" resultType="com.openhis.web.paymentmanage.dto.ChargeItemDto">
+    <select id="getChargeItemListByEncounterId" resultType="com.healthlink.his.web.paymentmanage.dto.ChargeItemDto">
         select T.id,
                T.status_enum,
                T.bus_no,
@@ -232,7 +232,7 @@
                  LEFT JOIN sys_dict_type AS T2 ON T1.type_code = T2.dict_type
         WHERE T.encounter_id = #{encounterId}
     </select>
-    <select id="selectDispenseQuantity" resultType="com.openhis.web.paymentmanage.dto.DispenseQuantityDto">
+    <select id="selectDispenseQuantity" resultType="com.healthlink.his.web.paymentmanage.dto.DispenseQuantityDto">
         SELECT COALESCE(SUM(mmr.quantity), 0) AS minpacunt_drug_trac_cnt,
         COALESCE(SUM(wdr.quantity), 0) AS mcs_trac_cnt
         FROM adm_charge_item aci
@@ -248,7 +248,7 @@
             #{chargeItemId}
         </foreach>
     </select>
-    <select id="getThreePartCallBackVoPage" resultType="com.openhis.web.paymentmanage.dto.ThreePartCallBackVo">
+    <select id="getThreePartCallBackVoPage" resultType="com.healthlink.his.web.paymentmanage.dto.ThreePartCallBackVo">
         SELECT *
         FROM
             (select three.*,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/ThreePartPayMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/paymentmanage/ThreePartPayMapper.xml
similarity index 84%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/ThreePartPayMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/paymentmanage/ThreePartPayMapper.xml
index cf5a0f94e..32c387778 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/ThreePartPayMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/paymentmanage/ThreePartPayMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.paymentmanage.mapper.ThreePartPayMapper">
+<mapper namespace="com.healthlink.his.web.paymentmanage.mapper.ThreePartPayMapper">
 
     <select id="getThreePartComparePaymentDtoList"
-            resultType="com.openhis.web.paymentmanage.dto.ThreePartComparePaymentDto">
+            resultType="com.healthlink.his.web.paymentmanage.dto.ThreePartComparePaymentDto">
         SELECT
         fin.ID AS payment_id,
         fin.payment_no AS payment_no,
@@ -25,7 +25,7 @@
 
     </select>
     <select id="getThreePartCompareRequestDtoList"
-            resultType="com.openhis.web.paymentmanage.dto.ThreePartCompareRequestDto">
+            resultType="com.healthlink.his.web.paymentmanage.dto.ThreePartCompareRequestDto">
         SELECT
             req.ID AS request_id,
             req.payment_id,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/personalization/ActivityDeviceAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/personalization/ActivityDeviceAppMapper.xml
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/personalization/ActivityDeviceAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/personalization/ActivityDeviceAppMapper.xml
index fa1e33de3..530333c2e 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/personalization/ActivityDeviceAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/personalization/ActivityDeviceAppMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.personalization.mapper.ActivityDeviceAppMapper">
+<mapper namespace="com.healthlink.his.web.personalization.mapper.ActivityDeviceAppMapper">
 
-    <select id="selectActivityDevicePage" resultType="com.openhis.web.personalization.dto.ActivityDeviceDto">
+    <select id="selectActivityDevicePage" resultType="com.healthlink.his.web.personalization.dto.ActivityDeviceDto">
         SELECT T1.id,
                T1.range_code,
                T1.type_code,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/personalization/OrderGroupAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/personalization/OrderGroupAppMapper.xml
similarity index 79%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/personalization/OrderGroupAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/personalization/OrderGroupAppMapper.xml
index 7543cc7b9..21407e234 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/personalization/OrderGroupAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/personalization/OrderGroupAppMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.personalization.mapper.OrderGroupAppMapper">
+<mapper namespace="com.healthlink.his.web.personalization.mapper.OrderGroupAppMapper">
 
-    <select id="selectOrderGroup" resultType="com.openhis.web.personalization.dto.OrderGroupDto">
+    <select id="selectOrderGroup" resultType="com.healthlink.his.web.personalization.dto.OrderGroupDto">
     SELECT ii.id,
            ii."name",
            ii.type_enum,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/personalization/OrdersGroupPackageAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/personalization/OrdersGroupPackageAppMapper.xml
similarity index 92%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/personalization/OrdersGroupPackageAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/personalization/OrdersGroupPackageAppMapper.xml
index 7b428ba37..8d2cd43ab 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/personalization/OrdersGroupPackageAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/personalization/OrdersGroupPackageAppMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.personalization.mapper.OrdersGroupPackageAppMapper">
+<mapper namespace="com.healthlink.his.web.personalization.mapper.OrdersGroupPackageAppMapper">
 
-    <select id="getGroupPackage" resultType="com.openhis.web.personalization.dto.OrdersGroupPackageQueryDto">
+    <select id="getGroupPackage" resultType="com.healthlink.his.web.personalization.dto.OrdersGroupPackageQueryDto">
         SELECT togp.ID AS group_package_id,
         togp.NAME AS NAME,
         togp.package_type_enum AS package_type_enum,
@@ -35,7 +35,7 @@
     </select>
 
     <select id="getGroupPackageDetail"
-            resultType="com.openhis.web.personalization.dto.OrdersGroupPackageDetailQueryDto">
+            resultType="com.healthlink.his.web.personalization.dto.OrdersGroupPackageDetailQueryDto">
         SELECT togpd.group_package_id,
         togpd.order_definition_id,
         togpd.order_definition_table,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/InHospitalReturnMedicineAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/pharmacymanage/InHospitalReturnMedicineAppMapper.xml
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/InHospitalReturnMedicineAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/pharmacymanage/InHospitalReturnMedicineAppMapper.xml
index 349954878..fc584ca84 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/InHospitalReturnMedicineAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/pharmacymanage/InHospitalReturnMedicineAppMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.pharmacymanage.mapper.InHospitalReturnMedicineAppMapper">
-    <select id="selectEncounterInfoListPage" resultType="com.openhis.web.pharmacymanage.dto.EncounterInfoDto">
+<mapper namespace="com.healthlink.his.web.pharmacymanage.mapper.InHospitalReturnMedicineAppMapper">
+    <select id="selectEncounterInfoListPage" resultType="com.healthlink.his.web.pharmacymanage.dto.EncounterInfoDto">
         SELECT ii.reception_time,
                ii.start_time,
                ii.encounter_id,
@@ -93,7 +93,7 @@
         ORDER BY ii.reception_time DESC
     </select>
     <select id="selectReturnMedicineInfo"
-            resultType="com.openhis.web.pharmacymanage.dto.ReturnMedicineInfoDto">
+            resultType="com.healthlink.his.web.pharmacymanage.dto.ReturnMedicineInfoDto">
         <if test="itemTable == null or itemTable == medMedicationDefinition">
         SELECT mmd.status_enum AS refund_enum,
                mmd.quantity,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/MedicalDeviceDispenseMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/pharmacymanage/MedicalDeviceDispenseMapper.xml
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/MedicalDeviceDispenseMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/pharmacymanage/MedicalDeviceDispenseMapper.xml
index 7e4848985..fc76bbbae 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/MedicalDeviceDispenseMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/pharmacymanage/MedicalDeviceDispenseMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.pharmacymanage.mapper.MedicalDeviceDispenseMapper">
-    <select id="selectEncounterInfoListPage" resultType="com.openhis.web.pharmacymanage.dto.EncounterInfoDto">
+<mapper namespace="com.healthlink.his.web.pharmacymanage.mapper.MedicalDeviceDispenseMapper">
+    <select id="selectEncounterInfoListPage" resultType="com.healthlink.his.web.pharmacymanage.dto.EncounterInfoDto">
         SELECT ii.encounter_id,
                ii.encounter_no,
                ii.department_name,
@@ -67,7 +67,7 @@
                  ii.status_enum
         ORDER BY ii.reception_time DESC
     </select>
-    <select id="selectDeviceDispenseOrderPage" resultType="com.openhis.web.pharmacymanage.dto.ItemDispenseOrderDto">
+    <select id="selectDeviceDispenseOrderPage" resultType="com.healthlink.his.web.pharmacymanage.dto.ItemDispenseOrderDto">
     SELECT ii.department_name,
            ii.doctor_name,
            ii.item_type,
@@ -164,7 +164,7 @@
         ) AS ii
         ${ew.customSqlSegment}
     </select>
-    <select id="getPreparerDoctorList" resultType="com.openhis.administration.domain.Practitioner">
+    <select id="getPreparerDoctorList" resultType="com.healthlink.his.administration.domain.Practitioner">
         SELECT ap.id,
                ap."name"
         FROM adm_practitioner ap
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/MedicationDetailsMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/pharmacymanage/MedicationDetailsMapper.xml
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/MedicationDetailsMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/pharmacymanage/MedicationDetailsMapper.xml
index 93c61a41c..92e989349 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/MedicationDetailsMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/pharmacymanage/MedicationDetailsMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.pharmacymanage.mapper.MedicationDetailsMapper">
+<mapper namespace="com.healthlink.his.web.pharmacymanage.mapper.MedicationDetailsMapper">
     <select id="selectAmbPractitionerDetailPage"
-            resultType="com.openhis.web.pharmacymanage.dto.MedDetailedAccountPageDto">
+            resultType="com.healthlink.his.web.pharmacymanage.dto.MedDetailedAccountPageDto">
         select A.outpatient_no,
         A.prescription_no,
         A.patient_name,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/PendingMedicationDetailsMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/pharmacymanage/PendingMedicationDetailsMapper.xml
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/PendingMedicationDetailsMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/pharmacymanage/PendingMedicationDetailsMapper.xml
index 6c5a45c82..984e2cb06 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/PendingMedicationDetailsMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/pharmacymanage/PendingMedicationDetailsMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.pharmacymanage.mapper.PendingMedicationDetailsMapper">
+<mapper namespace="com.healthlink.his.web.pharmacymanage.mapper.PendingMedicationDetailsMapper">
 <select id="selectPendingMedicationDetailsPage"
-            resultType="com.openhis.web.pharmacymanage.dto.PendingMedicationPageDto">
+            resultType="com.healthlink.his.web.pharmacymanage.dto.PendingMedicationPageDto">
         SELECT T7.medicine_no,      --药品编码
                T7.medicine_name,    --药品名称
                T7.py_str,    --药品拼音
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/ReturnMedicineMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/pharmacymanage/ReturnMedicineMapper.xml
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/ReturnMedicineMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/pharmacymanage/ReturnMedicineMapper.xml
index e0d43c3df..83925ef6f 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/ReturnMedicineMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/pharmacymanage/ReturnMedicineMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.pharmacymanage.mapper.ReturnMedicineMapper">
-    <select id="selectEncounterInfoListPage" resultType="com.openhis.web.pharmacymanage.dto.EncounterInfoDto">
+<mapper namespace="com.healthlink.his.web.pharmacymanage.mapper.ReturnMedicineMapper">
+    <select id="selectEncounterInfoListPage" resultType="com.healthlink.his.web.pharmacymanage.dto.EncounterInfoDto">
         SELECT ii.reception_time,
                ii.start_time,
                ii.encounter_id,
@@ -78,7 +78,7 @@
         ORDER BY ii.reception_time DESC
     </select>
     <select id="selectInventoryInfoList"
-            resultType="com.openhis.web.pharmacymanage.dto.UnDispenseInventoryDto">
+            resultType="com.healthlink.his.web.pharmacymanage.dto.UnDispenseInventoryDto">
         <choose>
         <when test="(medDispenseIdList != null and !medDispenseIdList.isEmpty())
                   or (devDispenseIdList != null and !devDispenseIdList.isEmpty())">
@@ -158,7 +158,7 @@
         </choose>
     </select>
     <select id="selectReturnMedicineInfo"
-            resultType="com.openhis.web.pharmacymanage.dto.ReturnMedicineInfoDto">
+            resultType="com.healthlink.his.web.pharmacymanage.dto.ReturnMedicineInfoDto">
         SELECT mmd.status_enum AS refund_enum,
                mmr.refund_medicine_id,
                mmr.id          AS request_id,
@@ -237,7 +237,7 @@
         </if>
           AND wdr.delete_flag = '0'
     </select>
-    <select id="selectReturnItemDetail" resultType="com.openhis.web.pharmacymanage.dto.DispenseInventoryDto">
+    <select id="selectReturnItemDetail" resultType="com.healthlink.his.web.pharmacymanage.dto.DispenseInventoryDto">
         <choose>
         <when test="(medDispenseIdList != null and !medDispenseIdList.isEmpty())
                   or (devDispenseIdList != null and !devDispenseIdList.isEmpty())">
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/SummaryDispenseMedicineMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/pharmacymanage/SummaryDispenseMedicineMapper.xml
similarity index 62%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/SummaryDispenseMedicineMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/pharmacymanage/SummaryDispenseMedicineMapper.xml
index 30c913a41..bdda5bb22 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/SummaryDispenseMedicineMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/pharmacymanage/SummaryDispenseMedicineMapper.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.pharmacymanage.mapper.SummaryDispenseMedicineMapper">
+<mapper namespace="com.healthlink.his.web.pharmacymanage.mapper.SummaryDispenseMedicineMapper">
 </mapper>
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml
similarity index 95%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml
index 352c4160d..96e96b1ad 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.pharmacymanage.mapper.WesternMedicineDispenseMapper">
-    <resultMap id="medicineDispenseOrderMap" type="com.openhis.web.pharmacymanage.dto.ItemDispenseOrderDto">
+<mapper namespace="com.healthlink.his.web.pharmacymanage.mapper.WesternMedicineDispenseMapper">
+    <resultMap id="medicineDispenseOrderMap" type="com.healthlink.his.web.pharmacymanage.dto.ItemDispenseOrderDto">
         <result property="lotNumber" column="lot_number"/>
         <result property="departmentName" column="department_name"/>
         <result property="doctorId" column="doctor_id"/>
@@ -42,7 +42,7 @@
         <result property="traceNo" column="trace_no"/>
         <result property="partAttributeEnum" column="part_attribute_enum"/>
         <result property="dispenseEnum" column="dispense_enum"/>
-        <collection property="inventoryDetailList" ofType="com.openhis.web.pharmacymanage.dto.InventoryDetailDto">
+        <collection property="inventoryDetailList" ofType="com.healthlink.his.web.pharmacymanage.dto.InventoryDetailDto">
             <result property="inventoryId" column="inventory_id"/>
             <result property="maxUnitCode" column="max_unit_code"/>
             <result property="partPercent" column="part_percent"/>
@@ -52,7 +52,7 @@
             <result property="expirationDate" column="expiration_date"/>
         </collection>
     </resultMap>
-    <select id="selectEncounterInfoListPage" resultType="com.openhis.web.pharmacymanage.dto.EncounterInfoDto">
+    <select id="selectEncounterInfoListPage" resultType="com.healthlink.his.web.pharmacymanage.dto.EncounterInfoDto">
         SELECT ii.encounter_id,
                ii.encounter_no,
                ii.department_name,
@@ -288,7 +288,7 @@
         ) AS ii
         ${ew.customSqlSegment}
     </select>
-    <select id="getPreparerDoctorList" resultType="com.openhis.administration.domain.Practitioner">
+    <select id="getPreparerDoctorList" resultType="com.healthlink.his.administration.domain.Practitioner">
         SELECT ap.id,
                ap."name",
                su.status
@@ -305,7 +305,7 @@
                  su.status
     </select>
     <select id="selectMedicineInventoryDetail"
-            resultType="com.openhis.web.pharmacymanage.dto.InventoryDetailDto">
+            resultType="com.healthlink.his.web.pharmacymanage.dto.InventoryDetailDto">
         SELECT wii.expiration_date ,
         wii.location_id ,
         wii.item_id ,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml
index 77879a155..e526b053f 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.regdoctorstation.mapper.AdviceManageAppMapper">
+<mapper namespace="com.healthlink.his.web.regdoctorstation.mapper.AdviceManageAppMapper">
 
-    <select id="getRegPatientMainInfo" resultType="com.openhis.web.regdoctorstation.dto.RegPatientMainInfoDto">
+    <select id="getRegPatientMainInfo" resultType="com.healthlink.his.web.regdoctorstation.dto.RegPatientMainInfoDto">
         SELECT DISTINCT ON (rpmi.patient_id)
                rpmi.tenant_id,
                rpmi.encounter_id,
@@ -184,7 +184,7 @@
         ) AS distinct_patients
     </select>
 
-    <select id="getRegRequestBaseInfo" resultType="com.openhis.web.regdoctorstation.dto.RegRequestBaseDto">
+    <select id="getRegRequestBaseInfo" resultType="com.healthlink.his.web.regdoctorstation.dto.RegRequestBaseDto">
         (SELECT 1 AS advice_type,
         T1.id AS request_id,
         T1.id || '-1' AS unique_key,
@@ -351,7 +351,7 @@
         ORDER BY T1.status_enum)
     </select>
 
-    <select id="getAmount" resultType="com.openhis.web.inhospitalnursestation.dto.EncounterAccountDto">
+    <select id="getAmount" resultType="com.healthlink.his.web.inhospitalnursestation.dto.EncounterAccountDto">
         SELECT final_res.id,
                final_res.insutype,
                final_res.encounter_id,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
index 039eec2ba..46051997d 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.regdoctorstation.mapper.RequestFormManageAppMapper">
+<mapper namespace="com.healthlink.his.web.regdoctorstation.mapper.RequestFormManageAppMapper">
 
-    <select id="getRequestForm" resultType="com.openhis.web.regdoctorstation.dto.RequestFormQueryDto">
+    <select id="getRequestForm" resultType="com.healthlink.his.web.regdoctorstation.dto.RequestFormQueryDto">
         SELECT sub.request_form_id,
                sub.encounter_id,
                sub.prescription_no,
@@ -139,7 +139,7 @@
         ORDER BY sub.create_time DESC
     </select>
 
-    <select id="getRequestFormDetail" resultType="com.openhis.web.regdoctorstation.dto.RequestFormDetailQueryDto">
+    <select id="getRequestFormDetail" resultType="com.healthlink.his.web.regdoctorstation.dto.RequestFormDetailQueryDto">
         SELECT wsr.activity_id AS activity_id,
                wsr.quantity,
                wsr.unit_code,
@@ -156,7 +156,7 @@
     </select>
 
     <select id="getActivityOrganizationConfig"
-            resultType="com.openhis.web.regdoctorstation.dto.ActivityOrganizationConfigDto">
+            resultType="com.healthlink.his.web.regdoctorstation.dto.ActivityOrganizationConfigDto">
         SELECT organization_id,
                activity_definition_id
         FROM adm_organization_location
@@ -166,7 +166,7 @@
     </select>
 
     <!-- 结果映射 -->
-    <resultMap id="RequestFormPageDtoMap" type="com.openhis.web.regdoctorstation.dto.RequestFormPageDto">
+    <resultMap id="RequestFormPageDtoMap" type="com.healthlink.his.web.regdoctorstation.dto.RequestFormPageDto">
         <result column="surgery_no" property="surgeryNo"/>
         <result column="desc_json" property="descJson" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
         <result column="name" property="name"/>
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/SpecialAdviceAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/regdoctorstation/SpecialAdviceAppMapper.xml
similarity index 87%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/SpecialAdviceAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/regdoctorstation/SpecialAdviceAppMapper.xml
index afc63f4a7..633faa7a6 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/SpecialAdviceAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/regdoctorstation/SpecialAdviceAppMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.regdoctorstation.mapper.SpecialAdviceAppMapper">
+<mapper namespace="com.healthlink.his.web.regdoctorstation.mapper.SpecialAdviceAppMapper">
 
-    <select id="getNursingOrdersInfos" resultType="com.openhis.web.regdoctorstation.dto.NursingOrdersDetailDto">
+    <select id="getNursingOrdersInfos" resultType="com.healthlink.his.web.regdoctorstation.dto.NursingOrdersDetailDto">
         SELECT
         wad.ID AS definition_id,
         wad.category_code AS category_code,
@@ -23,7 +23,7 @@
     </select>
 
     <select id="getEncounterNursingOrdersInfos"
-            resultType="com.openhis.web.regdoctorstation.dto.NursingOrdersEncounterDetailDto">
+            resultType="com.healthlink.his.web.regdoctorstation.dto.NursingOrdersEncounterDetailDto">
         SELECT wsr.activity_id AS definition_id,
         wsr.category_enum AS category_enum
         FROM wor_service_request AS wsr
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportManagement/InfectiousCardMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportManagement/InfectiousCardMapper.xml
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/reportManagement/InfectiousCardMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportManagement/InfectiousCardMapper.xml
index 260e57604..6630f71f8 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/reportManagement/InfectiousCardMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportManagement/InfectiousCardMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.reportManagement.mapper.ReportManageCardMapper">
+<mapper namespace="com.healthlink.his.web.reportManagement.mapper.ReportManageCardMapper">
 
     <!-- 分页查询报卡列表 -->
-    <select id="selectCardPage" resultType="com.openhis.web.reportManagement.dto.InfectiousCardDto">
+    <select id="selectCardPage" resultType="com.healthlink.his.web.reportManagement.dto.InfectiousCardDto">
         SELECT
             t1.card_no AS cardNo,
             '传染病报告卡' AS cardName,
@@ -88,7 +88,7 @@
     </select>
 
     <!-- 根据卡号查询报卡详情 -->
-    <select id="selectCardByCardNo" resultType="com.openhis.web.reportManagement.dto.InfectiousCardDto">
+    <select id="selectCardByCardNo" resultType="com.healthlink.his.web.reportManagement.dto.InfectiousCardDto">
         SELECT
             t1.card_no AS cardNo,
             '传染病报告卡' AS cardName,
@@ -169,7 +169,7 @@
     </update>
 
     <!-- 查询所有报卡数据（用于导出） -->
-    <select id="selectAllCards" resultType="com.openhis.web.reportManagement.dto.InfectiousCardDto">
+    <select id="selectAllCards" resultType="com.healthlink.his.web.reportManagement.dto.InfectiousCardDto">
         SELECT
             t1.card_no AS cardNo,
             '传染病报告卡' AS cardName,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/AmbAdviceStatisticsAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/AmbAdviceStatisticsAppMapper.xml
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/AmbAdviceStatisticsAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/AmbAdviceStatisticsAppMapper.xml
index c5588ee64..65774c0a2 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/AmbAdviceStatisticsAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/AmbAdviceStatisticsAppMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.reportmanage.mapper.AmbAdviceStatisticsAppMapper">
+<mapper namespace="com.healthlink.his.web.reportmanage.mapper.AmbAdviceStatisticsAppMapper">
 
-    <select id="getMedStatistics" resultType="com.openhis.web.reportmanage.dto.AmbMedAdviceStatisticsDto">
+    <select id="getMedStatistics" resultType="com.healthlink.his.web.reportmanage.dto.AmbMedAdviceStatisticsDto">
         SELECT mmr.prescription_no,
         mmr.req_authored_time,
         ap.name AS patient_name,
@@ -51,7 +51,7 @@
         ORDER BY mmr.req_authored_time DESC
     </select>
 
-    <select id="getActStatistics" resultType="com.openhis.web.reportmanage.dto.AmbActAdviceStatisticsDto">
+    <select id="getActStatistics" resultType="com.healthlink.his.web.reportmanage.dto.AmbActAdviceStatisticsDto">
         SELECT wsr.authored_time AS req_authored_time,
         ap.name AS patient_name,
         fc.bus_no AS contract_no,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/ChargeReportMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/ChargeReportMapper.xml
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/ChargeReportMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/ChargeReportMapper.xml
index 21644a673..469d5d3a6 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/ChargeReportMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/ChargeReportMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.reportmanage.mapper.ChargeReportMapper">
+<mapper namespace="com.healthlink.his.web.reportmanage.mapper.ChargeReportMapper">
     <sql id="selectRevenueReportPage">
         SELECT T8.tenant_id,
         T8.payment_id,
@@ -209,14 +209,14 @@
     </sql>
     <!--门诊收入明细 -->
     <select id="selectRevenueReportPage"
-            resultType="com.openhis.web.reportmanage.dto.ChargeReportPageDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.ChargeReportPageDto">
         <include refid="selectRevenueReportPage"/>
     </select>
     <!--门诊收入明细，不分页 -->
-    <select id="selectAllRevenueReportPage" resultType="com.openhis.web.reportmanage.dto.ChargeReportPageDto">
+    <select id="selectAllRevenueReportPage" resultType="com.healthlink.his.web.reportmanage.dto.ChargeReportPageDto">
         <include refid="selectRevenueReportPage"/>
     </select>
-    <select id="selectOrgWorkload" resultType="com.openhis.web.reportmanage.dto.workloadReportDto">
+    <select id="selectOrgWorkload" resultType="com.healthlink.his.web.reportmanage.dto.workloadReportDto">
         SELECT
         T8.requesting_org_id AS org_id,
         T3.name AS org_name,
@@ -448,7 +448,7 @@
         T5.type_code,
         T8.trade_type;
     </select>
-    <select id="selectDoctorWorkload" resultType="com.openhis.web.reportmanage.dto.workloadReportDto">
+    <select id="selectDoctorWorkload" resultType="com.healthlink.his.web.reportmanage.dto.workloadReportDto">
         SELECT
         T8.requesting_org_id AS org_id,
         T3.name AS org_name,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/DepartmentRevenueStatisticsMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/DepartmentRevenueStatisticsMapper.xml
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/DepartmentRevenueStatisticsMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/DepartmentRevenueStatisticsMapper.xml
index 7d74857cc..5153eaa05 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/DepartmentRevenueStatisticsMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/DepartmentRevenueStatisticsMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.reportmanage.mapper.DepartmentRevenueStatisticsMapper">
+<mapper namespace="com.healthlink.his.web.reportmanage.mapper.DepartmentRevenueStatisticsMapper">
     <!--门诊收入明细-->
     <select id="selectPage"
-            resultType="com.openhis.web.reportmanage.dto.DepartmentRevenueStatisticsPageDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.DepartmentRevenueStatisticsPageDto">
         select A.medication_name,
                A.bus_no,
                A.yb_no,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/DrugDosageSettlementMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/DrugDosageSettlementMapper.xml
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/DrugDosageSettlementMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/DrugDosageSettlementMapper.xml
index 0fc0683e3..fcf4cc034 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/DrugDosageSettlementMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/DrugDosageSettlementMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.reportmanage.mapper.DrugDosageSettlementMapper">
+<mapper namespace="com.healthlink.his.web.reportmanage.mapper.DrugDosageSettlementMapper">
     <!--门诊收入明细-->
     <select id="selectDrugDosageReportPage"
-            resultType="com.openhis.web.reportmanage.dto.DrugDosageSettlementPageDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.DrugDosageSettlementPageDto">
         select A.medication_name,
                A.bus_no,
                A.yb_no,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InboundReportMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/InboundReportMapper.xml
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InboundReportMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/InboundReportMapper.xml
index df8d42a42..4347df490 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InboundReportMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/InboundReportMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.reportmanage.mapper.InboundReportMapper">
+<mapper namespace="com.healthlink.his.web.reportmanage.mapper.InboundReportMapper">
 
     <select id="selectInboundReportPage"
-            resultType="com.openhis.web.reportmanage.dto.InboundReportPageDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.InboundReportPageDto">
         SELECT T10.supply_bus_no,                                 --单据号
                T10.name,                                          --药品名称
                T10.bus_no,                                        --药品编码
@@ -128,7 +128,7 @@
     </select>
 
     <select id="excelInboundReportPage"
-            resultType="com.openhis.web.reportmanage.dto.InboundReportPageDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.InboundReportPageDto">
         SELECT T10.supply_bus_no,                                 --单据号
             T10.name,                                          --药品名称
             T10.bus_no,                                        --药品编码
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InpatientMedicalRecordHomePageCollectionMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/InpatientMedicalRecordHomePageCollectionMapper.xml
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InpatientMedicalRecordHomePageCollectionMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/InpatientMedicalRecordHomePageCollectionMapper.xml
index ccb9ec2a2..59358fb1f 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InpatientMedicalRecordHomePageCollectionMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/InpatientMedicalRecordHomePageCollectionMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.reportmanage.mapper.InpatientMedicalRecordHomePageCollectionMapper">
+<mapper namespace="com.healthlink.his.web.reportmanage.mapper.InpatientMedicalRecordHomePageCollectionMapper">
     <select id="getInfo"
-            resultType="com.openhis.web.reportmanage.dto.InpatientMedicalRecordHomePageMakeDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.InpatientMedicalRecordHomePageMakeDto">
         SELECT                                                                            --todo sql没写完
          AS  A48, -- 病案号 A48 字符 50 必填
          AS  A49, -- 住院次数 A49 数字 4 必填
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InventoryProductReportMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/InventoryProductReportMapper.xml
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InventoryProductReportMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/InventoryProductReportMapper.xml
index 98b07a933..7a37b1a65 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InventoryProductReportMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/InventoryProductReportMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.reportmanage.mapper.InventoryProductReportMapper">
+<mapper namespace="com.healthlink.his.web.reportmanage.mapper.InventoryProductReportMapper">
 
     <select id="selectProductReportPage"
-            resultType="com.openhis.web.reportmanage.dto.InventoryProductReportPageDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.InventoryProductReportPageDto">
         SELECT * FROM (
             SELECT T8.id,                                                --ID
                    T8.bus_no,                                            --药品编码
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/LossReportMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/LossReportMapper.xml
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/LossReportMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/LossReportMapper.xml
index d5a7be1db..555bd24b7 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/LossReportMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/LossReportMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.reportmanage.mapper.LossReportMapper">
+<mapper namespace="com.healthlink.his.web.reportmanage.mapper.LossReportMapper">
 
     <select id="selectLossReportPage"
-            resultType="com.openhis.web.reportmanage.dto.LossReportPageDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.LossReportPageDto">
         SELECT T9.bus_no,            --编码
                T9.name,              --名称
                T9.total_volume,      --规格
@@ -109,7 +109,7 @@
     </select>
 
     <select id="excelLossReportPage"
-            resultType="com.openhis.web.reportmanage.dto.LossReportPageDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.LossReportPageDto">
         SELECT T9.bus_no,            --编码
             T9.name,              --名称
             T9.total_volume,      --规格
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/MedicationDeviceReportMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/MedicationDeviceReportMapper.xml
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/MedicationDeviceReportMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/MedicationDeviceReportMapper.xml
index 248c1d988..f4e594b68 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/MedicationDeviceReportMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/MedicationDeviceReportMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.reportmanage.mapper.MedicationDeviceReportMapper">
+<mapper namespace="com.healthlink.his.web.reportmanage.mapper.MedicationDeviceReportMapper">
 
     <select id="selectMedDdevInfo"
-            resultType="com.openhis.web.reportmanage.dto.MedUseReportInfoDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.MedUseReportInfoDto">
                SELECT
                    name,
                    total_volume,
@@ -205,7 +205,7 @@
 
 
     <select id="selectMedDevReport"
-            resultType="com.openhis.web.reportmanage.dto.MedDevUseReportDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.MedDevUseReportDto">
         SELECT org_id,
                org_name,
                SUM(total_money) AS total_money
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/MedicationInboundReportMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/MedicationInboundReportMapper.xml
similarity index 89%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/MedicationInboundReportMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/MedicationInboundReportMapper.xml
index dec4bf375..32542bce7 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/MedicationInboundReportMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/MedicationInboundReportMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.reportmanage.mapper.MedicationInboundReportMapper">
+<mapper namespace="com.healthlink.his.web.reportmanage.mapper.MedicationInboundReportMapper">
 
-    <select id="getMedicationInboundPage" resultType="com.openhis.web.reportmanage.dto.MedicationInboundReportDto">
+    <select id="getMedicationInboundPage" resultType="com.healthlink.his.web.reportmanage.dto.MedicationInboundReportDto">
         SELECT ii.medication_id,  --药品id
                ii.NAME,           --药品名称
                ii.py_str,         --拼音码
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/MonthlySettlementReportMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/MonthlySettlementReportMapper.xml
similarity index 93%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/MonthlySettlementReportMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/MonthlySettlementReportMapper.xml
index 165019782..5b135e35f 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/MonthlySettlementReportMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/MonthlySettlementReportMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.reportmanage.mapper.MonthlySettlementReportMapper">
+<mapper namespace="com.healthlink.his.web.reportmanage.mapper.MonthlySettlementReportMapper">
 
     <!--期初金额 todo：定时任务每日凌晨批量盘库，做成盘点时间occurrence_time是 yyyy-MM-dd 00:00:00，-->
     <select id="selectAmount" resultType="java.math.BigDecimal">
@@ -14,7 +14,7 @@
 
     <!--采购入库金额 -->
     <select id="selectAmountNumber"
-            resultType="com.openhis.web.reportmanage.dto.AmountNumberDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.AmountNumberDto">
         SELECT
             COALESCE(SUM(total_price), 0) AS total_amount,
             COUNT(DISTINCT bus_no) AS total_number
@@ -30,7 +30,7 @@
 
     <!--调拨入库查询 -->
     <select id="selectTransferInAmountNumber"
-            resultType="com.openhis.web.reportmanage.dto.AmountNumberDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.AmountNumberDto">
         SELECT
             COALESCE(SUM(total_price), 0) AS total_amount,
             COUNT(DISTINCT bus_no) AS total_number
@@ -46,7 +46,7 @@
 
     <!--调拨出库查询 -->
     <select id="selectTransferOutAmountNumber"
-            resultType="com.openhis.web.reportmanage.dto.AmountNumberDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.AmountNumberDto">
         SELECT
             COALESCE(SUM(total_price), 0) AS total_amount,
             COUNT(DISTINCT bus_no) AS total_number
@@ -62,7 +62,7 @@
 
     <!--盘点查询 -->
     <select id="selectProfitLossAmountNumber"
-            resultType="com.openhis.web.reportmanage.dto.AmountNumberDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.AmountNumberDto">
         SELECT
             COALESCE(SUM(total_price), 0) AS total_amount,
             COUNT(DISTINCT bus_no) AS total_number
@@ -78,7 +78,7 @@
 
     <!--报损单查询 -->
     <select id="selectLossAmountNumber"
-            resultType="com.openhis.web.reportmanage.dto.AmountNumberDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.AmountNumberDto">
         SELECT
             COALESCE(SUM(total_price), 0) AS total_amount,
             COUNT(DISTINCT bus_no) AS total_number
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/OutboundReportMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/OutboundReportMapper.xml
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/OutboundReportMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/OutboundReportMapper.xml
index 47b65104c..303263576 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/OutboundReportMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/OutboundReportMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.reportmanage.mapper.OutboundReportMapper">
+<mapper namespace="com.healthlink.his.web.reportmanage.mapper.OutboundReportMapper">
 
     <select id="selectOutboundReportPage"
-            resultType="com.openhis.web.reportmanage.dto.OutboundReportPageDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.OutboundReportPageDto">
         select T10.supply_bus_no,                                            --单据号
                T10.name,                                                    --药品名称
                T10.bus_no,                                                  --编码
@@ -133,7 +133,7 @@
     </select>
 
     <select id="excelOutboundReportPage"
-            resultType="com.openhis.web.reportmanage.dto.OutboundReportPageDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.OutboundReportPageDto">
         select T10.supply_bus_no,                                            --单据号
             T10.name,                                                    --药品名称
             T10.bus_no,                                                  --编码
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/PharmacySettlementReportAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/PharmacySettlementReportAppMapper.xml
similarity index 90%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/PharmacySettlementReportAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/PharmacySettlementReportAppMapper.xml
index 5af6b7285..b191bddb7 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/PharmacySettlementReportAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/PharmacySettlementReportAppMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.reportmanage.mapper.PharmacySettlementReportAppMapper">
+<mapper namespace="com.healthlink.his.web.reportmanage.mapper.PharmacySettlementReportAppMapper">
 
-    <select id="getListInfo" resultType="com.openhis.web.reportmanage.dto.PharmacySettlementReportDto">
+    <select id="getListInfo" resultType="com.healthlink.his.web.reportmanage.dto.PharmacySettlementReportDto">
         SELECT sdd.dict_label AS category_code_text,
         mmd.bus_no AS item_no,
         mmd.ID AS item_id,
@@ -32,7 +32,7 @@
         order by mmd.category_code
     </select>
 
-    <select id="getDispenseInfo" resultType="com.openhis.web.reportmanage.dto.PharmacySettlementMedDto">
+    <select id="getDispenseInfo" resultType="com.healthlink.his.web.reportmanage.dto.PharmacySettlementMedDto">
         SELECT medication_id,
                min_unit_code,
                COALESCE(SUM(CASE WHEN status = 'dispense' THEN quantity END), 0) -
@@ -76,7 +76,7 @@
                  min_unit_code
     </select>
 
-    <select id="getSupplyRequestInfo" resultType="com.openhis.web.reportmanage.dto.PharmacySettlementMedDto">
+    <select id="getSupplyRequestInfo" resultType="com.healthlink.his.web.reportmanage.dto.PharmacySettlementMedDto">
         SELECT wsr.item_id       AS medication_id,
                mmd.min_unit_code AS min_unit_code,
                wsr.item_quantity AS supply_request_quantity,
@@ -106,7 +106,7 @@
             , #{returnIssue})
     </select>
 
-    <select id="getInventoryInfo" resultType="com.openhis.web.reportmanage.dto.PharmacySettlementMedDto">
+    <select id="getInventoryInfo" resultType="com.healthlink.his.web.reportmanage.dto.PharmacySettlementMedDto">
         SELECT wii.item_id  AS medication_id,
                wii.quantity AS inventory_quantity,
                wii.lot_number,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/PrintReportMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/PrintReportMapper.xml
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/PrintReportMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/PrintReportMapper.xml
index 742ba41f0..eb8b4d4c3 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/PrintReportMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/PrintReportMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.reportmanage.mapper.PrintReportMapper">
+<mapper namespace="com.healthlink.his.web.reportmanage.mapper.PrintReportMapper">
 
     <!-- 打印——处置单 -->
-    <select id="getDisposalList" resultType="com.openhis.web.reportmanage.dto.DisposalDto">
+    <select id="getDisposalList" resultType="com.healthlink.his.web.reportmanage.dto.DisposalDto">
         SELECT wsr.bus_no,                                                                   -- 服务请求编码
                ap.name                                                  AS patient_name,     -- 患者名字
                ap.birth_date,                                                                -- 患者出生日期
@@ -41,7 +41,7 @@
     </select>
 
     <!-- 打印——检验,检查申请单 -->
-    <select id="getCheckInspectionList" resultType="com.openhis.web.reportmanage.dto.CkInspAppDto">
+    <select id="getCheckInspectionList" resultType="com.healthlink.his.web.reportmanage.dto.CkInspAppDto">
         SELECT wsr.bus_no,                           -- 服务请求编码
                ap.name          AS patient_name,     -- 患者名字
                ap.birth_date,                        -- 患者出生日期
@@ -81,7 +81,7 @@
     </select>
 
     <!-- 打印——处方单 -->
-    <select id="getPrescriptionList" resultType="com.openhis.web.reportmanage.dto.PrescriptionPrintDto">
+    <select id="getPrescriptionList" resultType="com.healthlink.his.web.reportmanage.dto.PrescriptionPrintDto">
 
         SELECT mmr.prescription_no,                                                          -- 处方号
                mmr.group_id,                                                                 -- 组号
@@ -161,7 +161,7 @@
     </select>
 
     <!-- 打印——护士输液的瓶签  -->
-    <select id="getBottleLabelList" resultType="com.openhis.web.reportmanage.dto.BottleLabelDto">
+    <select id="getBottleLabelList" resultType="com.healthlink.his.web.reportmanage.dto.BottleLabelDto">
 
         SELECT
         pt.name AS patient_name, --病人姓名
@@ -205,7 +205,7 @@
         mr.create_time desc
 
     </select>
-    <select id="getBottleLabelBatchList" resultType="com.openhis.web.reportmanage.dto.BottleLabelDto">
+    <select id="getBottleLabelBatchList" resultType="com.healthlink.his.web.reportmanage.dto.BottleLabelDto">
         SELECT
         pt.name AS patient_name, -- 病人姓名
         pt.gender_enum, -- 病人性别
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/PurchaseReturnReportMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/PurchaseReturnReportMapper.xml
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/PurchaseReturnReportMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/PurchaseReturnReportMapper.xml
index 85af6fedd..a9d51818e 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/PurchaseReturnReportMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/PurchaseReturnReportMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.reportmanage.mapper.PurchaseReturnReportMapper">
+<mapper namespace="com.healthlink.his.web.reportmanage.mapper.PurchaseReturnReportMapper">
 
     <select id="selectPurchaseReturnReportPage"
-            resultType="com.openhis.web.reportmanage.dto.PurchaseReturnReportPageDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.PurchaseReturnReportPageDto">
         SELECT T10.supply_bus_no,                                 --单据号
                T10.name,                                          --药品名称
                T10.bus_no,                                        --药品编码
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/RegisterReportMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/RegisterReportMapper.xml
similarity index 97%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/RegisterReportMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/RegisterReportMapper.xml
index a3f55f221..a64062025 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/RegisterReportMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/RegisterReportMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.reportmanage.mapper.RegisterReportMapper">
+<mapper namespace="com.healthlink.his.web.reportmanage.mapper.RegisterReportMapper">
 
     <select id="selectRegisterReportPage"
-            resultType="com.openhis.web.reportmanage.dto.RegisterReportPageDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.RegisterReportPageDto">
         SELECT T10.bus_no,          --患者院内编码/病历号
                T10.name,            --患者姓名
                T10.department_id,   --科室
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/ReportMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/ReportMapper.xml
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/ReportMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/ReportMapper.xml
index 2d661740c..5d8246cdf 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/ReportMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/ReportMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.reportmanage.mapper.ReportMapper">
+<mapper namespace="com.healthlink.his.web.reportmanage.mapper.ReportMapper">
     <!--患者明细报表-->
     <select id="selectPatientDetailsPage"
-            resultType="com.openhis.web.reportmanage.dto.ReportPatientDetailsDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.ReportPatientDetailsDto">
         SELECT T6.tenant_id,
                T6.encounter_bus_no,
                T6.med_name,
@@ -47,7 +47,7 @@
             ${ew.customSqlSegment}
     </select>
     <select id="selectMedicationInboundDetailsPage"
-            resultType="com.openhis.web.reportmanage.dto.ReportMedicationInboundDetailsDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.ReportMedicationInboundDetailsDto">
         SELECT T2.med_name       AS product_name,
                T2.unit_label,
                T2.min_unit_label AS min_unit,
@@ -86,7 +86,7 @@
 
     <!--患者明细主表做成-->
     <select id="selectPatientMasterDetailPage"
-            resultType="com.openhis.web.reportmanage.dto.ReportPatientMasterDetailDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.ReportPatientMasterDetailDto">
         SELECT T7.tenant_id,
                T7.encounter_bus_no,
                T7.patient_name,
@@ -140,7 +140,7 @@
             ${ew.customSqlSegment}
     </select>
     <select id="selectMedicationUsagePage"
-            resultType="com.openhis.web.reportmanage.dto.ReportMedicationUsageDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.ReportMedicationUsageDto">
         SELECT
         mmde.yb_no AS national_drugCode,
         md.medication_def_id AS bus_no,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/ReportStatisticsMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/ReportStatisticsMapper.xml
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/ReportStatisticsMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/ReportStatisticsMapper.xml
index 6a4a589d4..1e3ffb1ff 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/ReportStatisticsMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/ReportStatisticsMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.reportmanage.mapper.ReportStatisticsMapper">
+<mapper namespace="com.healthlink.his.web.reportmanage.mapper.ReportStatisticsMapper">
     <!--月报明细-->
     <select id="getStaffStat"
-            resultType="com.openhis.web.reportmanage.dto.DailyReportStatisticsPageDto$StaffStatDTO">
+            resultType="com.healthlink.his.web.reportmanage.dto.DailyReportStatisticsPageDto$StaffStatDTO">
         SELECT COUNT(DISTINCT T1.id)  AS total_medical_staff,--卫生技术人员总数
                SUM(CASE WHEN EXISTS (
                    SELECT 1 FROM adm_practitioner_role T2
@@ -23,7 +23,7 @@
           AND T1.name != '超级管理员'
     </select>
     <select id="getBedStat"
-            resultType="com.openhis.web.reportmanage.dto.DailyReportStatisticsPageDto$BedStatDTO">
+            resultType="com.healthlink.his.web.reportmanage.dto.DailyReportStatisticsPageDto$BedStatDTO">
         SELECT COUNT(DISTINCT T1.id) AS actual_bedCount --实有床位（单位：张）
         --             AS total_open_bed_days,--实际开放总床日数
 --             AS total_occupied_bed_days,--实际占用总床日数
@@ -33,7 +33,7 @@
           AND T1.delete_flag = '0'
     </select>
     <select id="getRevenueStat"
-            resultType="com.openhis.web.reportmanage.dto.DailyReportStatisticsPageDto$RevenueStatDTO">
+            resultType="com.healthlink.his.web.reportmanage.dto.DailyReportStatisticsPageDto$RevenueStatDTO">
         SELECT
 --                   AS total_revenue,--总收入
 --                   AS total_medical_revenue,--医疗收入合计
@@ -79,7 +79,7 @@
           AND T1.delete_flag = '0'
     </select>
     <select id="getTreatmentStat"
-            resultType="com.openhis.web.reportmanage.dto.DailyReportStatisticsPageDto$TreatmentStatDTO">
+            resultType="com.healthlink.his.web.reportmanage.dto.DailyReportStatisticsPageDto$TreatmentStatDTO">
         SELECT -- AS total_treatment_count,--总诊疗人次数
                COUNT(DISTINCT T1.id) AS total_outpatient_emergency_count--门诊和急诊人次数合计
         --                          AS  reserved_outpatient_count,--预约门诊人次数
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/ReturnIssueReportMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/ReturnIssueReportMapper.xml
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/ReturnIssueReportMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/ReturnIssueReportMapper.xml
index 60c05b84f..1b7efe7e0 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/ReturnIssueReportMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/ReturnIssueReportMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.reportmanage.mapper.ReturnIssueReportMapper">
+<mapper namespace="com.healthlink.his.web.reportmanage.mapper.ReturnIssueReportMapper">
 
     <select id="selectReturnIssueReportPage"
-            resultType="com.openhis.web.reportmanage.dto.ReturnIssueReportPageDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.ReturnIssueReportPageDto">
         select T10.supply_bus_no,                                            --单据号
                T10.name,                                                    --药品名称
                T10.bus_no,                                                  --编码
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/StocktakingReportMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/StocktakingReportMapper.xml
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/StocktakingReportMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/StocktakingReportMapper.xml
index c7160fdb9..79b9c3177 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/StocktakingReportMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/StocktakingReportMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.reportmanage.mapper.StocktakingReportMapper">
+<mapper namespace="com.healthlink.his.web.reportmanage.mapper.StocktakingReportMapper">
 
     <select id="selectStocktakingReportPage"
-            resultType="com.openhis.web.reportmanage.dto.StocktakingReportPageDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.StocktakingReportPageDto">
         SELECT T9.id,                 --ID
                T9.bus_no,             --编码
                T9.name,               --名称
@@ -112,7 +112,7 @@
     </select>
 
     <select id="selectAutoStocktakingReportPage"
-            resultType="com.openhis.web.reportmanage.dto.StocktakingReportPageDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.StocktakingReportPageDto">
         SELECT T9.id,                 --ID
                T9.bus_no,             --编码
                T9.name,               --名称
@@ -214,7 +214,7 @@
     </select>
 
     <select id="excelStocktakingReportPage"
-            resultType="com.openhis.web.reportmanage.dto.StocktakingReportPageDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.StocktakingReportPageDto">
         SELECT T9.id,                 --ID
             T9.bus_no,             --编码
             T9.name,               --名称
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/TransferReportMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/TransferReportMapper.xml
similarity index 98%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/TransferReportMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/TransferReportMapper.xml
index 77a6fb326..1a43ae152 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/TransferReportMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/reportmanage/TransferReportMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.reportmanage.mapper.TransferReportMapper">
+<mapper namespace="com.healthlink.his.web.reportmanage.mapper.TransferReportMapper">
 
     <select id="selectTransferReportPage"
-            resultType="com.openhis.web.reportmanage.dto.TransferReportPageDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.TransferReportPageDto">
         SELECT T6.id,
                T6.supply_bus_no,               -- 商品调拨单据号
                T6.name,                        -- 药品名称
@@ -127,7 +127,7 @@
     </select>
 
     <select id="excelTransferReportPage"
-            resultType="com.openhis.web.reportmanage.dto.TransferReportPageDto">
+            resultType="com.healthlink.his.web.reportmanage.dto.TransferReportPageDto">
         SELECT T6.id,
                T6.supply_bus_no,               -- 商品调拨单据号
                T6.name,                        -- 药品名称
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/tencentJH/TencentAppMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/tencentJH/TencentAppMapper.xml
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/tencentJH/TencentAppMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/tencentJH/TencentAppMapper.xml
index 3b19750d6..79ee93247 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/tencentJH/TencentAppMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/tencentJH/TencentAppMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.tencentJH.mapper.TencentAppMapper">
+<mapper namespace="com.healthlink.his.web.tencentJH.mapper.TencentAppMapper">
 
-    <select id="getCurrentDayEncounter" resultType="com.openhis.web.tencentJH.dto.CurrentDayEncounterTencentDto">
+    <select id="getCurrentDayEncounter" resultType="com.healthlink.his.web.tencentJH.dto.CurrentDayEncounterTencentDto">
         SELECT T9.tenant_id,
                T9.encounter_id,
                T9.organization_id,
@@ -105,7 +105,7 @@
         ORDER BY T9.register_time DESC
     </select>
 
-    <select id="getPatientInfo" resultType="com.openhis.web.tencentJH.dto.PatientInfoTencentDto">
+    <select id="getPatientInfo" resultType="com.healthlink.his.web.tencentJH.dto.PatientInfoTencentDto">
         SELECT
         T10.encounter_id,
         T10.patient_id,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/ybmanage/MedicalInsuranceMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/ybmanage/MedicalInsuranceMapper.xml
similarity index 91%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/ybmanage/MedicalInsuranceMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/ybmanage/MedicalInsuranceMapper.xml
index 2e0745382..11dfac0d1 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/ybmanage/MedicalInsuranceMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/ybmanage/MedicalInsuranceMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.ybmanage.mapper.MedicalInsuranceMapper">
+<mapper namespace="com.healthlink.his.web.ybmanage.mapper.MedicalInsuranceMapper">
 
-    <select id="get3201Param" resultType="com.openhis.web.ybmanage.vo.Settlement3201VO">
+    <select id="get3201Param" resultType="com.healthlink.his.web.ybmanage.vo.Settlement3201VO">
         SELECT sum(T1.tendered_amount)    AS med_fee_sum_amt,
                sum(case T5.pay_enum = #{ybFund} THEN T5.amount ELSE 0 END)  AS fund_pay_sum_amt,
                sum(case T5.pay_enum = #{zhPay} THEN T5.amount ELSE 0 END) AS acct_pay,
@@ -21,7 +21,7 @@
         AND T1.tenant_id = #{tenantId}
         GROUP BY t1.id
     </select>
-    <select id="get3202Param" resultType="com.openhis.web.ybmanage.vo.Settlement3202VO">
+    <select id="get3202Param" resultType="com.healthlink.his.web.ybmanage.vo.Settlement3202VO">
         SELECT sum(T1.tendered_amount)    AS med_fee_sum_amt,
                sum(case T5.pay_enum = #{ybFund} THEN T5.amount ELSE 0 END)  AS fund_pay_sum_amt,
                sum(case T5.pay_enum = #{zhPay} THEN T5.amount ELSE 0 END) AS acct_pay,
@@ -43,7 +43,7 @@
         AND T1.tenant_id = #{tenantId}
         GROUP BY t1.id
     </select>
-    <select id="get3203Param" resultType="com.openhis.web.ybmanage.vo.Financial3203VO">
+    <select id="get3203Param" resultType="com.healthlink.his.web.ybmanage.vo.Financial3203VO">
         SELECT sum(T1.tendered_amount)    AS medFeeSumAmt,
                sum(case T5.pay_enum = #{ybFund} THEN T5.amount ELSE 0 END)  AS fund_pay_sum_amt,
                sum(case T5.pay_enum = #{zhPay} THEN T5.amount ELSE 0 END) AS acct_pay,
@@ -68,7 +68,7 @@
         GROUP BY t1.id
     </select>
 
-    <select id="get3201ParamList" resultType="com.openhis.web.ybmanage.vo.Settlement3201DetailVO">
+    <select id="get3201ParamList" resultType="com.healthlink.his.web.ybmanage.vo.Settlement3201DetailVO">
         SELECT
         T2.insutype,
         T4.clr_optins,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/ybmanage/YbElepMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/ybmanage/YbElepMapper.xml
similarity index 96%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/ybmanage/YbElepMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/ybmanage/YbElepMapper.xml
index 75c566e6a..dcf68c026 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/ybmanage/YbElepMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/ybmanage/YbElepMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.ybmanage.mapper.YbElepMapper">
-    <select id="getVeriPrescriptionInfo" resultType="com.openhis.web.ybmanage.dto.VeriPrescriptionInfoDto">
+<mapper namespace="com.healthlink.his.web.ybmanage.mapper.YbElepMapper">
+    <select id="getVeriPrescriptionInfo" resultType="com.healthlink.his.web.ybmanage.dto.VeriPrescriptionInfoDto">
         SELECT tenant_id,
                prescription_no, --处方号
                practitioner_id,
@@ -66,7 +66,7 @@
                  hi_rxno
         ORDER BY prsc_time DESC
     </select>
-    <select id="getVeriPrescriptionDetailInfo" resultType="com.openhis.web.ybmanage.dto.VeriPrescriptionDetailInfoDto">
+    <select id="getVeriPrescriptionDetailInfo" resultType="com.healthlink.his.web.ybmanage.dto.VeriPrescriptionDetailInfoDto">
         SELECT DISTINCT T1.prescription_no,                          --处方号
                         T1.ipt_otp_no,                               --门诊号
                         T1.quantity,                                 --请求数量
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/ybmanage/YbMapper.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/ybmanage/YbMapper.xml
similarity index 94%
rename from openhis-server-new/openhis-application/src/main/resources/mapper/ybmanage/YbMapper.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mapper/ybmanage/YbMapper.xml
index 8ffb73eb1..8ba1e9986 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/ybmanage/YbMapper.xml
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/mapper/ybmanage/YbMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.web.ybmanage.mapper.YbMapper">
+<mapper namespace="com.healthlink.his.web.ybmanage.mapper.YbMapper">
 
     <select id="yb3101SelectEncounterPatientInfo"
-            resultType="com.openhis.yb.dto.Yb3101AdapterEncounterPatientInfo">
+            resultType="com.healthlink.his.yb.dto.Yb3101AdapterEncounterPatientInfo">
         SELECT MAX(T5.psn_no)                               AS patnId
              , MAX(T5.psn_name)                             AS patnName
              , MAX(T5.gend)                                 AS gend
@@ -67,7 +67,7 @@
     </select>
 
     <select id="yb3101SelectEncounterDiagnoseInfo"
-            resultType="com.openhis.yb.dto.Yb3101AdapterEncounterDiagnoseInfo">
+            resultType="com.healthlink.his.yb.dto.Yb3101AdapterEncounterDiagnoseInfo">
         SELECT T1.id                 AS diseId
              , T1.ipt_dise_type_code AS iptDiseTypeCode
              , T1.maindise_flag      AS maindiseFlag
@@ -84,7 +84,7 @@
           AND T1.encounter_id = #{encounterId}
     </select>
 
-    <select id="yb3101SelectOrderInfo" resultType="com.openhis.yb.dto.Yb3101AdapterOrderInfo">
+    <select id="yb3101SelectOrderInfo" resultType="com.healthlink.his.yb.dto.Yb3101AdapterOrderInfo">
         SELECT T3.bus_no                                                  AS rxId
              , T3.prescription_no                                         AS rxno
              , T3.group_id                                                AS grpno
@@ -138,7 +138,7 @@
           AND T1.encounter_id = #{encounterId}
     </select>
 
-    <select id="yb4101aSelectSettleInfo" resultType="com.openhis.yb.dto.Yb4101AAdapterSettleInfo">
+    <select id="yb4101aSelectSettleInfo" resultType="com.healthlink.his.yb.dto.Yb4101AAdapterSettleInfo">
         SELECT T4.psn_no          AS psnNo
              , T6.mdtrt_id        AS mdtrtId
              , T2.setl_id         AS setlId
@@ -170,7 +170,7 @@
         WHERE T1.id = #{paymentId}
     </select>
 
-    <select id="yb4101aSelectOpspdiseinfo" resultType="com.openhis.yb.dto.Yb4101AInputOpspdiseinfo">
+    <select id="yb4101aSelectOpspdiseinfo" resultType="com.healthlink.his.yb.dto.Yb4101AInputOpspdiseinfo">
         SELECT T5."name" AS diagName
              , T5.yb_no  AS diagCode
         FROM fin_payment_reconciliation T1
@@ -186,7 +186,7 @@
         GROUP BY T5."name", T5.yb_no
     </select>
     <select id="getInHospitalRegisterInfo"
-            resultType="com.openhis.web.ybmanage.dto.YbInHospitalRegisterQueryDto">
+            resultType="com.healthlink.his.web.ybmanage.dto.YbInHospitalRegisterQueryDto">
         SELECT ihri.tenant_id,
         ihri.encounter_id,
         ihri.amb_encounter_id,
@@ -231,7 +231,7 @@
         ) AS ihri
         ${ew.customSqlSegment}
     </select>
-    <select id="getDiagnosisList" resultType="com.openhis.web.ybmanage.dto.EncounterDiagnosisDto">
+    <select id="getDiagnosisList" resultType="com.healthlink.his.web.ybmanage.dto.EncounterDiagnosisDto">
         SELECT
             endi.id,
             endi.encounter_id,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mybatis/mybatis-config.xml b/openhis-server-new/healthlink-his-application/src/main/resources/mybatis/mybatis-config.xml
similarity index 100%
rename from openhis-server-new/openhis-application/src/main/resources/mybatis/mybatis-config.xml
rename to openhis-server-new/healthlink-his-application/src/main/resources/mybatis/mybatis-config.xml
diff --git a/openhis-server-new/healthlink-his-application/src/main/resources/properties/yb.properties b/openhis-server-new/healthlink-his-application/src/main/resources/properties/yb.properties
new file mode 100755
index 000000000..aba3099b6
--- /dev/null
+++ b/openhis-server-new/healthlink-his-application/src/main/resources/properties/yb.properties
@@ -0,0 +1,5 @@
+ybapp.config.url=http://localhost:18079/healthlink-his/yb/yb
+ybapp.config.api.key=your_api_key_123
+ybapp.config.timeout=5000
+ybapp.config.fixmedinsCode=H22010402403
+ybapp.config.eleUrl=http://localhost:18079/healthlink-his/yb/ybElep
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/vm/invoice/invoice.vm b/openhis-server-new/healthlink-his-application/src/main/resources/vm/invoice/invoice.vm
similarity index 100%
rename from openhis-server-new/openhis-application/src/main/resources/vm/invoice/invoice.vm
rename to openhis-server-new/healthlink-his-application/src/main/resources/vm/invoice/invoice.vm
diff --git a/openhis-server-new/openhis-application/src/test/java/com/openhis/MedicationApplicationTests.java b/openhis-server-new/healthlink-his-application/src/test/java/com/healthlink/his/MedicationApplicationTests.java
similarity index 87%
rename from openhis-server-new/openhis-application/src/test/java/com/openhis/MedicationApplicationTests.java
rename to openhis-server-new/healthlink-his-application/src/test/java/com/healthlink/his/MedicationApplicationTests.java
index 4f97a9bd9..b60c075ef 100755
--- a/openhis-server-new/openhis-application/src/test/java/com/openhis/MedicationApplicationTests.java
+++ b/openhis-server-new/healthlink-his-application/src/test/java/com/healthlink/his/MedicationApplicationTests.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis;
+package com.healthlink.his;
 
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
@@ -17,7 +17,7 @@ import java.io.IOException;
  * @date 2024-12-03
  */
 @Slf4j
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}, scanBasePackages = {"com.openhis"})
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}, scanBasePackages = {"com.healthlink.his"})
 public class MedicationApplicationTests {
     @Test
     public void contextLoads() throws IOException {
diff --git a/openhis-server-new/openhis-common/pom.xml b/openhis-server-new/healthlink-his-common/pom.xml
similarity index 93%
rename from openhis-server-new/openhis-common/pom.xml
rename to openhis-server-new/healthlink-his-common/pom.xml
index 4f32268fa..68926a335 100755
--- a/openhis-server-new/openhis-common/pom.xml
+++ b/openhis-server-new/healthlink-his-common/pom.xml
@@ -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-common</artifactId>
+    <artifactId>healthlink-his-common</artifactId>
     <version>0.0.1-SNAPSHOT</version>
 
     <description>
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/annotation/Dict.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/annotation/Dict.java
similarity index 91%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/annotation/Dict.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/annotation/Dict.java
index 1d5b0200a..29563c4d5 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/annotation/Dict.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/annotation/Dict.java
@@ -1,4 +1,4 @@
-package com.openhis.common.annotation;
+package com.healthlink.his.common.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/aspectj/DictAspect.java
similarity index 98%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/aspectj/DictAspect.java
index 47c9cdc96..1b677f0e5 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/aspectj/DictAspect.java
@@ -1,9 +1,9 @@
-package com.openhis.common.aspectj;
+package com.healthlink.his.common.aspectj;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.DictUtils;
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/OperLogAspect.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/aspectj/OperLogAspect.java
similarity index 97%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/OperLogAspect.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/aspectj/OperLogAspect.java
index fb1e88eba..486b72a0e 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/OperLogAspect.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/aspectj/OperLogAspect.java
@@ -1,5 +1,5 @@
 
-package com.openhis.common.aspectj;
+package com.healthlink.his.common.aspectj;
 
 import com.alibaba.fastjson2.JSON;
 import com.core.common.core.domain.R;
@@ -41,8 +41,8 @@ public class OperLogAspect {
     /**
      * 定义切点：所有Controller包下的方法，排除login接口
      */
-    @Pointcut("execution(* com.openhis.web..controller..*.*(..)) "
-        + "&& !execution(* com.openhis.web..controller..*.login(..)) ")
+    @Pointcut("execution(* com.healthlink.his.web..controller..*.*(..)) "
+        + "&& !execution(* com.healthlink.his.web..controller..*.login(..)) ")
     public void operLogPointCut() {}
 
     /**
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/constant/CommonConstants.java
similarity index 99%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/constant/CommonConstants.java
index 36df4ff09..48e29054f 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/constant/CommonConstants.java
@@ -1,4 +1,4 @@
-package com.openhis.common.constant;
+package com.healthlink.his.common.constant;
 
 import java.math.BigDecimal;
 
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/constant/PromptMsgConstant.java
similarity index 99%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/constant/PromptMsgConstant.java
index 6a830da82..f799381ca 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/constant/PromptMsgConstant.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.constant;
+package com.healthlink.his.common.constant;
 
 /**
  * APL消息ID常量类
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/constant/YbCommonConstants.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/constant/YbCommonConstants.java
similarity index 98%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/constant/YbCommonConstants.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/constant/YbCommonConstants.java
index 2f3f2af22..184d380f2 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/constant/YbCommonConstants.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/constant/YbCommonConstants.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.constant;
+package com.healthlink.his.common.constant;
 
 /**
  * 常量
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AcceptanceResult.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AcceptanceResult.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AcceptanceResult.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AcceptanceResult.java
index 52748e790..aea93b235 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AcceptanceResult.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AcceptanceResult.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountBillingStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AccountBillingStatus.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountBillingStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AccountBillingStatus.java
index 59490f35c..5fcc1ed1f 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountBillingStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AccountBillingStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AccountStatus.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AccountStatus.java
index 01d2cdcf5..2f21b289b 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AccountStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AccountType.java
similarity index 97%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AccountType.java
index a238dde8e..26be778a4 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AccountType.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.core.common.utils.StringUtils;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActPriority.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ActPriority.java
similarity index 98%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActPriority.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ActPriority.java
index d9e04e63f..a896ad7cc 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActPriority.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ActPriority.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActivityDefCategory.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ActivityDefCategory.java
similarity index 98%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActivityDefCategory.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ActivityDefCategory.java
index 073b06a07..6425e33af 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActivityDefCategory.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ActivityDefCategory.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActivityType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ActivityType.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActivityType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ActivityType.java
index 07ad5cd3b..f5f93d10e 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActivityType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ActivityType.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdministrativeGender.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AdministrativeGender.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdministrativeGender.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AdministrativeGender.java
index 2a632eea9..da6f56171 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdministrativeGender.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AdministrativeGender.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdmissionMethod.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AdmissionMethod.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdmissionMethod.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AdmissionMethod.java
index 6c1801946..8ffaec83f 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdmissionMethod.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AdmissionMethod.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdmissionType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AdmissionType.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdmissionType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AdmissionType.java
index 0178375af..d8311ab8f 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdmissionType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AdmissionType.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdviceOpType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AdviceOpType.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdviceOpType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AdviceOpType.java
index 68b87fca2..1fc29a170 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdviceOpType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AdviceOpType.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AnesthesiaTypeEnum.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AnesthesiaTypeEnum.java
similarity index 93%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AnesthesiaTypeEnum.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AnesthesiaTypeEnum.java
index 0158a854c..500a754b4 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AnesthesiaTypeEnum.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AnesthesiaTypeEnum.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ApplicableScope.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ApplicableScope.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ApplicableScope.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ApplicableScope.java
index fde2aef0b..760f4d44c 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ApplicableScope.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ApplicableScope.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AssignSeqEnum.java
similarity index 99%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AssignSeqEnum.java
index 5f1ba97e1..c26813a29 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/AssignSeqEnum.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.Getter;
 
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BindingType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/BindingType.java
similarity index 94%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BindingType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/BindingType.java
index 36f2017ab..ae7089dec 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BindingType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/BindingType.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeABO.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/BloodTypeABO.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeABO.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/BloodTypeABO.java
index 6701441d2..d3fe99212 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeABO.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/BloodTypeABO.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeRH.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/BloodTypeRH.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeRH.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/BloodTypeRH.java
index 84bfc4012..1c3399163 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeRH.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/BloodTypeRH.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/CallType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/CallType.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/CallType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/CallType.java
index 6de73d39c..2c1f74911 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/CallType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/CallType.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/CatalogType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/CatalogType.java
similarity index 98%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/CatalogType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/CatalogType.java
index 050128529..df9b2afc5 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/CatalogType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/CatalogType.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Category.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/Category.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Category.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/Category.java
index 4fc01f090..5e7dc3af2 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Category.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/Category.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/CategoryType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/CategoryType.java
similarity index 97%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/CategoryType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/CategoryType.java
index 05cc6b95c..a3f6399f4 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/CategoryType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/CategoryType.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemContext.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ChargeItemContext.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemContext.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ChargeItemContext.java
index 61ce45e0f..571010c88 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemContext.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ChargeItemContext.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemEnum.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ChargeItemEnum.java
similarity index 97%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemEnum.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ChargeItemEnum.java
index 5b45bcff6..428bad9fa 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemEnum.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ChargeItemEnum.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 /**
  * 收费项目
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ChargeItemStatus.java
similarity index 97%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ChargeItemStatus.java
index cba68c322..c1ce01f83 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ChargeItemStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClaimType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ClaimType.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClaimType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ClaimType.java
index bdd232472..9888c6df6 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClaimType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ClaimType.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClaimUse.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ClaimUse.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClaimUse.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ClaimUse.java
index ee740bfce..52a5de603 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClaimUse.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ClaimUse.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClinicalStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ClinicalStatus.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClinicalStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ClinicalStatus.java
index febbc175c..ae41132a7 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClinicalStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ClinicalStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionCategory.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ConditionCategory.java
similarity index 94%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionCategory.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ConditionCategory.java
index c737518d1..0d9e491c4 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionCategory.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ConditionCategory.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionClinicalStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ConditionClinicalStatus.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionClinicalStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ConditionClinicalStatus.java
index 7381dfc5c..6fd7e15fb 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionClinicalStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ConditionClinicalStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionCode.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ConditionCode.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionCode.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ConditionCode.java
index 10a9c14d6..1c9997f1c 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionCode.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ConditionCode.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionDefinitionSource.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ConditionDefinitionSource.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionDefinitionSource.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ConditionDefinitionSource.java
index a75ee5c65..220807c66 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionDefinitionSource.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ConditionDefinitionSource.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionSeverity.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ConditionSeverity.java
similarity index 94%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionSeverity.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ConditionSeverity.java
index bcff67d89..872bf1599 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionSeverity.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ConditionSeverity.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionVerificationStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ConditionVerificationStatus.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionVerificationStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ConditionVerificationStatus.java
index a5f90de16..4e6427767 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionVerificationStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ConditionVerificationStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ContractCategory.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ContractCategory.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ContractCategory.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ContractCategory.java
index c0cf942c0..302893d96 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ContractCategory.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ContractCategory.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ContrastTypeEnum.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ContrastTypeEnum.java
similarity index 94%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ContrastTypeEnum.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ContrastTypeEnum.java
index 476c18a94..abdd26fb1 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ContrastTypeEnum.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ContrastTypeEnum.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Criticality.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/Criticality.java
similarity index 93%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Criticality.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/Criticality.java
index 7d09ae4ce..b4c7be6a0 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Criticality.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/Criticality.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DbOpType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DbOpType.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DbOpType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DbOpType.java
index 82a6ab251..ba7c88ba7 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DbOpType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DbOpType.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DeviceSafety.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DeviceSafety.java
similarity index 97%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DeviceSafety.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DeviceSafety.java
index 51ef5bccc..e5f1b2ab2 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DeviceSafety.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DeviceSafety.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DeviceStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DeviceStatus.java
similarity index 94%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DeviceStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DeviceStatus.java
index f4de20874..ab9736ec6 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DeviceStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DeviceStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DiagnosisCertainty.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DiagnosisCertainty.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DiagnosisCertainty.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DiagnosisCertainty.java
index a8d8a1011..4099186ab 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DiagnosisCertainty.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DiagnosisCertainty.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DispenseStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DispenseStatus.java
similarity index 97%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DispenseStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DispenseStatus.java
index 2ab809f96..3fc0ddb92 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DispenseStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DispenseStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocDefinitionEnum.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DocDefinitionEnum.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocDefinitionEnum.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DocDefinitionEnum.java
index c5bcea9e1..3094493fa 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocDefinitionEnum.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DocDefinitionEnum.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocPermissionEnum.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DocPermissionEnum.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocPermissionEnum.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DocPermissionEnum.java
index 7f3fe03ea..b7aec7f04 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocPermissionEnum.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DocPermissionEnum.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocStatisticsDefinitionTypeEnum.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DocStatisticsDefinitionTypeEnum.java
similarity index 98%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocStatisticsDefinitionTypeEnum.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DocStatisticsDefinitionTypeEnum.java
index c4762b05c..6208e8bf8 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocStatisticsDefinitionTypeEnum.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DocStatisticsDefinitionTypeEnum.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocStatusEnum.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DocStatusEnum.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocStatusEnum.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DocStatusEnum.java
index f6cb2264b..43598e010 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocStatusEnum.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DocStatusEnum.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocTypeEnum.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DocTypeEnum.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocTypeEnum.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DocTypeEnum.java
index 44d5fef8c..93dd54141 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocTypeEnum.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DocTypeEnum.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocUseRangeEnum.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DocUseRangeEnum.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocUseRangeEnum.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DocUseRangeEnum.java
index 14bf7ddb2..9d45754d4 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocUseRangeEnum.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/DocUseRangeEnum.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EducationLevel.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/EducationLevel.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EducationLevel.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/EducationLevel.java
index 48487542c..c753336d5 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EducationLevel.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/EducationLevel.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ElePrescriptionType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ElePrescriptionType.java
similarity index 97%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ElePrescriptionType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ElePrescriptionType.java
index d6ad7fd8f..318b08679 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ElePrescriptionType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ElePrescriptionType.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterActivityStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/EncounterActivityStatus.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterActivityStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/EncounterActivityStatus.java
index 5e0515298..85a77c387 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterActivityStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/EncounterActivityStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterClass.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/EncounterClass.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterClass.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/EncounterClass.java
index 1fc1991e9..9e04c40ef 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterClass.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/EncounterClass.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/EncounterStatus.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/EncounterStatus.java
index 1fceaebbc..064c7a3c8 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/EncounterStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterSubjectStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/EncounterSubjectStatus.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterSubjectStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/EncounterSubjectStatus.java
index 777e0c578..e5487108c 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterSubjectStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/EncounterSubjectStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/EncounterType.java
similarity index 94%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/EncounterType.java
index 3b6298b5c..dc6315369 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/EncounterType.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterYbClass.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/EncounterYbClass.java
similarity index 98%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterYbClass.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/EncounterYbClass.java
index 6c8424bc0..17003427a 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterYbClass.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/EncounterYbClass.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterZyStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/EncounterZyStatus.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterZyStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/EncounterZyStatus.java
index 5546ed2be..8fb9559a4 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterZyStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/EncounterZyStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EventStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/EventStatus.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EventStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/EventStatus.java
index c9d224eb3..b9a9e8244 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EventStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/EventStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FamilyRelationshipType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/FamilyRelationshipType.java
similarity index 99%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FamilyRelationshipType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/FamilyRelationshipType.java
index c7cd03de2..13e4e4a1a 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FamilyRelationshipType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/FamilyRelationshipType.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FeeTypeClass.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/FeeTypeClass.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FeeTypeClass.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/FeeTypeClass.java
index 2f0af6a31..7c7f00b5d 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FeeTypeClass.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/FeeTypeClass.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FinCategory.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/FinCategory.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FinCategory.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/FinCategory.java
index 439ed3321..950cff886 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FinCategory.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/FinCategory.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FinancialResourceStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/FinancialResourceStatus.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FinancialResourceStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/FinancialResourceStatus.java
index 2ce36527b..9fb6079a8 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FinancialResourceStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/FinancialResourceStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FrequencyType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/FrequencyType.java
similarity index 94%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FrequencyType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/FrequencyType.java
index 2a426ee88..cc575052e 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FrequencyType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/FrequencyType.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GenerateSource.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/GenerateSource.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GenerateSource.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/GenerateSource.java
index 2f9123f91..abe5f1bb7 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GenerateSource.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/GenerateSource.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfApplicationStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/GfApplicationStatus.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfApplicationStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/GfApplicationStatus.java
index 09644e578..49786e95b 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfApplicationStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/GfApplicationStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfApprovalRole.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/GfApprovalRole.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfApprovalRole.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/GfApprovalRole.java
index d4cca7a69..b79d1ca02 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfApprovalRole.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/GfApprovalRole.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfItemType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/GfItemType.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfItemType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/GfItemType.java
index ac4958e61..036a4a55d 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfItemType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/GfItemType.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfRatioType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/GfRatioType.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfRatioType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/GfRatioType.java
index 8e8721c6a..38097ade8 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfRatioType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/GfRatioType.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/HealingLevelEnum.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/HealingLevelEnum.java
similarity index 90%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/HealingLevelEnum.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/HealingLevelEnum.java
index 29fa1982b..8e1c16234 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/HealingLevelEnum.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/HealingLevelEnum.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/HisEnumInterface.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/HisEnumInterface.java
similarity index 77%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/HisEnumInterface.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/HisEnumInterface.java
index 9be054e41..870894475 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/HisEnumInterface.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/HisEnumInterface.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 /**
  * 枚举类通用接口
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/HospitalCodeEnum.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/HospitalCodeEnum.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/HospitalCodeEnum.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/HospitalCodeEnum.java
index 55b7fc4e3..156af078b 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/HospitalCodeEnum.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/HospitalCodeEnum.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/IdentifierStatusEnum.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/IdentifierStatusEnum.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/IdentifierStatusEnum.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/IdentifierStatusEnum.java
index 1f77489cf..dc91f47ea 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/IdentifierStatusEnum.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/IdentifierStatusEnum.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/IdentityDocumentType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/IdentityDocumentType.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/IdentityDocumentType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/IdentityDocumentType.java
index 12e53bc4b..ca0343989 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/IdentityDocumentType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/IdentityDocumentType.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/IncisionLevelEnum.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/IncisionLevelEnum.java
similarity index 91%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/IncisionLevelEnum.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/IncisionLevelEnum.java
index c7d814289..52be44b24 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/IncisionLevelEnum.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/IncisionLevelEnum.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InstrumentCategory.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/InstrumentCategory.java
similarity index 98%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InstrumentCategory.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/InstrumentCategory.java
index 9cca15155..ebe05bb7f 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InstrumentCategory.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/InstrumentCategory.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InstrumentStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/InstrumentStatus.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InstrumentStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/InstrumentStatus.java
index 38e40d3b0..a1a8da313 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InstrumentStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/InstrumentStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InsuranceLevel.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/InsuranceLevel.java
similarity index 92%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InsuranceLevel.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/InsuranceLevel.java
index c20379917..ba4b1b2e3 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InsuranceLevel.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/InsuranceLevel.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InventoryType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/InventoryType.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InventoryType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/InventoryType.java
index c5cb87df5..8bf545192 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InventoryType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/InventoryType.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InvoiceStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/InvoiceStatus.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InvoiceStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/InvoiceStatus.java
index 212173ef1..10eca18c4 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InvoiceStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/InvoiceStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InvoiceType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/InvoiceType.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InvoiceType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/InvoiceType.java
index d3b0d178c..147042682 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InvoiceType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/InvoiceType.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ItemCategoryCode.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ItemCategoryCode.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ItemCategoryCode.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ItemCategoryCode.java
index c9cdbe5dd..bd3923bfa 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ItemCategoryCode.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ItemCategoryCode.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ItemType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ItemType.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ItemType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ItemType.java
index 9aa6dcc70..1a5a57076 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ItemType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ItemType.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationBedStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/LocationBedStatus.java
similarity index 94%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationBedStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/LocationBedStatus.java
index 09ac53da9..370a361ff 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationBedStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/LocationBedStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationForm.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/LocationForm.java
similarity index 97%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationForm.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/LocationForm.java
index 2a222f7cb..ec2443d13 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationForm.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/LocationForm.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationMode.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/LocationMode.java
similarity index 94%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationMode.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/LocationMode.java
index 5fb16b63a..d2c473cb2 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationMode.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/LocationMode.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationOperational.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/LocationOperational.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationOperational.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/LocationOperational.java
index e62997842..07fda3a94 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationOperational.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/LocationOperational.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/LocationStatus.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/LocationStatus.java
index a837d92d0..288eb1e46 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/LocationStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/MaritalStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/MaritalStatus.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/MaritalStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/MaritalStatus.java
index 379a3f7fa..7c6ea758b 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/MaritalStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/MaritalStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/MedCategoryCode.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/MedCategoryCode.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/MedCategoryCode.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/MedCategoryCode.java
index 3a376d4f9..d4be47854 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/MedCategoryCode.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/MedCategoryCode.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 /**
  * medCategoryCode
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/MedicalRecordStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/MedicalRecordStatus.java
similarity index 92%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/MedicalRecordStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/MedicalRecordStatus.java
index 179c1d2f4..324e40f21 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/MedicalRecordStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/MedicalRecordStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/NotPerformedReason.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/NotPerformedReason.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/NotPerformedReason.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/NotPerformedReason.java
index 4af98b205..67e969450 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/NotPerformedReason.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/NotPerformedReason.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/NotPerformedReasonEnum.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/NotPerformedReasonEnum.java
similarity index 98%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/NotPerformedReasonEnum.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/NotPerformedReasonEnum.java
index e9eb52889..4c1d2e118 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/NotPerformedReasonEnum.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/NotPerformedReasonEnum.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/NursingOrdersClass.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/NursingOrdersClass.java
similarity index 97%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/NursingOrdersClass.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/NursingOrdersClass.java
index 67ae0ddab..edf3ca64c 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/NursingOrdersClass.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/NursingOrdersClass.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.core.common.utils.StringUtils;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ObservationType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ObservationType.java
similarity index 97%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ObservationType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ObservationType.java
index 9506f46eb..78bf1f0bc 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ObservationType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ObservationType.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OccupationType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/OccupationType.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OccupationType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/OccupationType.java
index 93c2c69eb..7e2674e77 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OccupationType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/OccupationType.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrderGroupType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/OrderGroupType.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrderGroupType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/OrderGroupType.java
index 0256a3a21..564dff5af 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrderGroupType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/OrderGroupType.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrderPricingSource.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/OrderPricingSource.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrderPricingSource.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/OrderPricingSource.java
index 6cffbc67c..b8eed1b0d 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrderPricingSource.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/OrderPricingSource.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.core.common.utils.StringUtils;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrderStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/OrderStatus.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrderStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/OrderStatus.java
index 3458eac56..a4291cdbc 100644
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrderStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/OrderStatus.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrganizationClass.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/OrganizationClass.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrganizationClass.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/OrganizationClass.java
index 34d6cf735..aec8a8f90 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrganizationClass.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/OrganizationClass.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrganizationType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/OrganizationType.java
similarity index 98%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrganizationType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/OrganizationType.java
index 56f15fc96..d2f1db2fa 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrganizationType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/OrganizationType.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OutpatientClass.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/OutpatientClass.java
similarity index 97%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OutpatientClass.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/OutpatientClass.java
index 01e406062..d38fba7ab 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OutpatientClass.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/OutpatientClass.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PackagingCondition.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PackagingCondition.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PackagingCondition.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PackagingCondition.java
index 3c94fbdd4..05224c44b 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PackagingCondition.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PackagingCondition.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ParticipantType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ParticipantType.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ParticipantType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ParticipantType.java
index 3fc7ae8de..c347ed06e 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ParticipantType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ParticipantType.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentKind.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PaymentKind.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentKind.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PaymentKind.java
index 0bebf2c40..11d370310 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentKind.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PaymentKind.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentOutcome.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PaymentOutcome.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentOutcome.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PaymentOutcome.java
index 7e1e8d7dc..47a211b12 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentOutcome.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PaymentOutcome.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentResult.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PaymentResult.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentResult.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PaymentResult.java
index 3029959d5..8351e990b 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentResult.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PaymentResult.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentStatisticalMethod.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PaymentStatisticalMethod.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentStatisticalMethod.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PaymentStatisticalMethod.java
index c4cea69de..bd12a6fa9 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentStatisticalMethod.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PaymentStatisticalMethod.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PaymentStatus.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PaymentStatus.java
index 598c586b7..6858868be 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PaymentStatus.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PaymentType.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PaymentType.java
index 6b344fe3d..ae422046a 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PaymentType.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PermissionLimit.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PermissionLimit.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PermissionLimit.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PermissionLimit.java
index 8dd7e633b..cfffad8a4 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PermissionLimit.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PermissionLimit.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PhysicalExamResult.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PhysicalExamResult.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PhysicalExamResult.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PhysicalExamResult.java
index c1f1ec499..c0cef6001 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PhysicalExamResult.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PhysicalExamResult.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PractitionerRoles.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PractitionerRoles.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PractitionerRoles.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PractitionerRoles.java
index 5d83d6709..c5ac292d1 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PractitionerRoles.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PractitionerRoles.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PrescriptionCategory.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PrescriptionCategory.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PrescriptionCategory.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PrescriptionCategory.java
index ebed17a77..c9b037f40 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PrescriptionCategory.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PrescriptionCategory.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PrescriptionType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PrescriptionType.java
similarity index 97%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PrescriptionType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PrescriptionType.java
index 014fce063..4c52ecd4f 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PrescriptionType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PrescriptionType.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PriorityLevel.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PriorityLevel.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PriorityLevel.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PriorityLevel.java
index 2c8c8acf4..bbb7a4d21 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PriorityLevel.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PriorityLevel.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ProcedureCategory.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ProcedureCategory.java
similarity index 97%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ProcedureCategory.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ProcedureCategory.java
index ee6e5fc9c..18660e970 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ProcedureCategory.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ProcedureCategory.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PublicationStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PublicationStatus.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PublicationStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PublicationStatus.java
index 3476a5b6b..7c714f061 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PublicationStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/PublicationStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ReportCardStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ReportCardStatus.java
similarity index 97%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ReportCardStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ReportCardStatus.java
index 9e388cba3..d703c7bb7 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ReportCardStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ReportCardStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ReportCodeEnum.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ReportCodeEnum.java
similarity index 91%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ReportCodeEnum.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ReportCodeEnum.java
index 5338d38f9..a41db637a 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ReportCodeEnum.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ReportCodeEnum.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/RequestStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/RequestStatus.java
similarity index 97%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/RequestStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/RequestStatus.java
index 4d4ed3c38..5e2eba36b 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/RequestStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/RequestStatus.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ReviewReasonEnum.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ReviewReasonEnum.java
similarity index 97%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ReviewReasonEnum.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ReviewReasonEnum.java
index 0563553d7..cf4477b8b 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ReviewReasonEnum.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ReviewReasonEnum.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ReviewReasonableStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ReviewReasonableStatus.java
similarity index 93%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ReviewReasonableStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ReviewReasonableStatus.java
index 9135d27c3..dc3fa973e 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ReviewReasonableStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ReviewReasonableStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SettleUpStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SettleUpStatus.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SettleUpStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SettleUpStatus.java
index 942d07aaf..3c84a1bbd 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SettleUpStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SettleUpStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Severity.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/Severity.java
similarity index 92%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Severity.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/Severity.java
index a00887282..9aabb7539 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Severity.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/Severity.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SlotStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SlotStatus.java
similarity index 97%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SlotStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SlotStatus.java
index a168d952e..4554eaad4 100644
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SlotStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SlotStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SpecCollectStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SpecCollectStatus.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SpecCollectStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SpecCollectStatus.java
index d4e7a57b9..048d03309 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SpecCollectStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SpecCollectStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SpecimenType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SpecimenType.java
similarity index 97%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SpecimenType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SpecimenType.java
index 64f298f40..ea47012f3 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SpecimenType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SpecimenType.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SplitPropertyCode.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SplitPropertyCode.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SplitPropertyCode.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SplitPropertyCode.java
index 7bde3fea4..6ecdf9b47 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SplitPropertyCode.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SplitPropertyCode.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/StatisticsType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/StatisticsType.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/StatisticsType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/StatisticsType.java
index 9d1ce5f34..23535d9b2 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/StatisticsType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/StatisticsType.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/StudentStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/StudentStatus.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/StudentStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/StudentStatus.java
index eaabe6fc8..b3e4e2a86 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/StudentStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/StudentStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/StudyMode.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/StudyMode.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/StudyMode.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/StudyMode.java
index b7052553f..b2901602a 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/StudyMode.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/StudyMode.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplierType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SupplierType.java
similarity index 94%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplierType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SupplierType.java
index 6b74fdb24..ea78795e7 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplierType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SupplierType.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyCategory.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SupplyCategory.java
similarity index 98%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyCategory.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SupplyCategory.java
index 92f0a6663..6cee452d4 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyCategory.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SupplyCategory.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyRequestType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SupplyRequestType.java
similarity index 94%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyRequestType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SupplyRequestType.java
index 44ff571d4..1b5650631 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyRequestType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SupplyRequestType.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SupplyStatus.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SupplyStatus.java
index 240e3fb6d..ce8fb98c5 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SupplyStatus.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SupplyType.java
similarity index 99%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SupplyType.java
index 161a1e3c2..b36239743 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SupplyType.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SurgeryAppStatusEnum.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SurgeryAppStatusEnum.java
similarity index 98%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SurgeryAppStatusEnum.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SurgeryAppStatusEnum.java
index c67225399..95d6a3983 100644
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SurgeryAppStatusEnum.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SurgeryAppStatusEnum.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SurgeryLevelEnum.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SurgeryLevelEnum.java
similarity index 92%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SurgeryLevelEnum.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SurgeryLevelEnum.java
index ea7a4ebf5..0b1391a90 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SurgeryLevelEnum.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SurgeryLevelEnum.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SurgeryStatusEnum.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SurgeryStatusEnum.java
similarity index 93%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SurgeryStatusEnum.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SurgeryStatusEnum.java
index 77a0144b3..697f5c61a 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SurgeryStatusEnum.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SurgeryStatusEnum.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SurgeryTypeEnum.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SurgeryTypeEnum.java
similarity index 91%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SurgeryTypeEnum.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SurgeryTypeEnum.java
index a6190763d..d1025e228 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SurgeryTypeEnum.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SurgeryTypeEnum.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SurgicalStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SurgicalStatus.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SurgicalStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SurgicalStatus.java
index ed46ac969..26c0d7815 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SurgicalStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/SurgicalStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TempOrderSplitPropertyCode.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/TempOrderSplitPropertyCode.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TempOrderSplitPropertyCode.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/TempOrderSplitPropertyCode.java
index 829b2bee8..baa6ca29f 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TempOrderSplitPropertyCode.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/TempOrderSplitPropertyCode.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TemperatureChartEnum.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/TemperatureChartEnum.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TemperatureChartEnum.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/TemperatureChartEnum.java
index c241cff6c..18f9d8671 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TemperatureChartEnum.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/TemperatureChartEnum.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TherapyTimeType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/TherapyTimeType.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TherapyTimeType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/TherapyTimeType.java
index 69059dd79..0b8cd9961 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TherapyTimeType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/TherapyTimeType.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ThreePartPayType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ThreePartPayType.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ThreePartPayType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ThreePartPayType.java
index ec91fb1dd..004ac521a 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ThreePartPayType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ThreePartPayType.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.github.pagehelper.util.StringUtil;
 
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TraceNoStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/TraceNoStatus.java
similarity index 94%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TraceNoStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/TraceNoStatus.java
index 550f34eb5..df6108901 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TraceNoStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/TraceNoStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TriageQueueStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/TriageQueueStatus.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TriageQueueStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/TriageQueueStatus.java
index 928824ce3..617fbbfe3 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TriageQueueStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/TriageQueueStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Whether.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/Whether.java
similarity index 94%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Whether.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/Whether.java
index 5db368379..69055a07b 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Whether.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/Whether.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums;
+package com.healthlink.his.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/PriorityType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/PriorityType.java
similarity index 92%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/PriorityType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/PriorityType.java
index 707748b51..5194c4245 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/PriorityType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/PriorityType.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.core.common.utils.StringUtils;
-import com.openhis.common.enums.HisEnumInterface;
+import com.healthlink.his.common.enums.HisEnumInterface;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbChrgitmLv.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbChrgitmLv.java
similarity index 92%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbChrgitmLv.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbChrgitmLv.java
index b62454fa4..aa71266ea 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbChrgitmLv.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbChrgitmLv.java
@@ -1,11 +1,11 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.core.common.utils.StringUtils;
-import com.openhis.common.enums.HisEnumInterface;
+import com.healthlink.his.common.enums.HisEnumInterface;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrStas.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbClrStas.java
similarity index 94%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrStas.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbClrStas.java
index 14e4ba0f1..11461d5c1 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrStas.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbClrStas.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbClrType.java
similarity index 94%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbClrType.java
index 960d3771f..77a7c122f 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbClrType.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrWay.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbClrWay.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrWay.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbClrWay.java
index ae7285f88..025cd8c04 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrWay.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbClrWay.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDiagType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbDiagType.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDiagType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbDiagType.java
index 3592e4f8b..6546d1f20 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDiagType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbDiagType.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDoctorTitle.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbDoctorTitle.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDoctorTitle.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbDoctorTitle.java
index ac82c878b..ad896fd57 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDoctorTitle.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbDoctorTitle.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrordBhvr.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbDrordBhvr.java
similarity index 94%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrordBhvr.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbDrordBhvr.java
index 045e0b816..fd2809106 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrordBhvr.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbDrordBhvr.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrordType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbDrordType.java
similarity index 89%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrordType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbDrordType.java
index 84bb09ff0..e40f7738a 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrordType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbDrordType.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
-import com.openhis.common.enums.HisEnumInterface;
+import com.healthlink.his.common.enums.HisEnumInterface;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrugDosform.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbDrugDosform.java
similarity index 85%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrugDosform.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbDrugDosform.java
index eb7cb396e..b602861d9 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrugDosform.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbDrugDosform.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrugMedWay.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbDrugMedWay.java
similarity index 97%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrugMedWay.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbDrugMedWay.java
index 4ec48ef53..7d3b826e7 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrugMedWay.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbDrugMedWay.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDspoWay.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbDspoWay.java
similarity index 93%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDspoWay.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbDspoWay.java
index 21c23d594..4b3223089 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDspoWay.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbDspoWay.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbEncounterClass.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbEncounterClass.java
similarity index 93%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbEncounterClass.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbEncounterClass.java
index 7447ce1b2..0a5a63752 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbEncounterClass.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbEncounterClass.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbEncounterZyStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbEncounterZyStatus.java
similarity index 89%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbEncounterZyStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbEncounterZyStatus.java
index fbaebfcc8..fbe004ea7 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbEncounterZyStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbEncounterZyStatus.java
@@ -1,7 +1,7 @@
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
-import com.openhis.common.enums.HisEnumInterface;
+import com.healthlink.his.common.enums.HisEnumInterface;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbGender.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbGender.java
similarity index 94%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbGender.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbGender.java
index f4332c7ed..0334b699d 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbGender.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbGender.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbHiFeesetlType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbHiFeesetlType.java
similarity index 94%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbHiFeesetlType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbHiFeesetlType.java
index 973957dc0..e43973b85 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbHiFeesetlType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbHiFeesetlType.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbHospApprFlag.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbHospApprFlag.java
similarity index 94%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbHospApprFlag.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbHospApprFlag.java
index 8a830db73..8d8d49c39 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbHospApprFlag.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbHospApprFlag.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbIdDocumentType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbIdDocumentType.java
similarity index 98%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbIdDocumentType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbIdDocumentType.java
index 420a6b822..20df5e9fb 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbIdDocumentType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbIdDocumentType.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInOutDiagType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbInOutDiagType.java
similarity index 94%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInOutDiagType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbInOutDiagType.java
index 07246bac8..020c279a3 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInOutDiagType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbInOutDiagType.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInsuType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbInsuType.java
similarity index 97%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInsuType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbInsuType.java
index d73bee35b..e49d5fa49 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInsuType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbInsuType.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInvChgType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbInvChgType.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInvChgType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbInvChgType.java
index 2f731f00f..be30f428d 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInvChgType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbInvChgType.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInvDataType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbInvDataType.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInvDataType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbInvDataType.java
index 09580cf9d..b3a293b6d 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInvDataType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbInvDataType.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbIptDiseTypeCode.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbIptDiseTypeCode.java
similarity index 97%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbIptDiseTypeCode.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbIptDiseTypeCode.java
index ffde1cf5e..36ae24abc 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbIptDiseTypeCode.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbIptDiseTypeCode.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbListType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbListType.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbListType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbListType.java
index 8733444d9..aae00e463 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbListType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbListType.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMatnStas.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbMatnStas.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMatnStas.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbMatnStas.java
index 148f64f8f..472b7734b 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMatnStas.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbMatnStas.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMdcsType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbMdcsType.java
similarity index 97%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMdcsType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbMdcsType.java
index 386d6fa12..6af69ef75 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMdcsType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbMdcsType.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMdtrtCertType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbMdtrtCertType.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMdtrtCertType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbMdtrtCertType.java
index 8e47ef8a7..631e9c25e 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMdtrtCertType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbMdtrtCertType.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedChrgItmType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbMedChrgItmType.java
similarity index 97%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedChrgItmType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbMedChrgItmType.java
index 1033e178b..6224df754 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedChrgItmType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbMedChrgItmType.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedMdtrtType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbMedMdtrtType.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedMdtrtType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbMedMdtrtType.java
index c35cefedf..7f7c56f38 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedMdtrtType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbMedMdtrtType.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbMedType.java
similarity index 98%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbMedType.java
index 832d15c5b..f29daefa7 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbMedType.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedinsLv.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbMedinsLv.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedinsLv.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbMedinsLv.java
index 3b6093089..504cd8db7 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedinsLv.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbMedinsLv.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedinsType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbMedinsType.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedinsType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbMedinsType.java
index f52d7ee81..97f16f965 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedinsType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbMedinsType.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPayLoc.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbPayLoc.java
similarity index 95%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPayLoc.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbPayLoc.java
index e142b9465..2b13c4e83 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPayLoc.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbPayLoc.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPayment.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbPayment.java
similarity index 99%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPayment.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbPayment.java
index 1a977dd03..dc00d1bd3 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPayment.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbPayment.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPharmacistTitle.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbPharmacistTitle.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPharmacistTitle.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbPharmacistTitle.java
index ec01f6b97..f870a6a5a 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPharmacistTitle.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbPharmacistTitle.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPrescriptionItemType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbPrescriptionItemType.java
similarity index 94%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPrescriptionItemType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbPrescriptionItemType.java
index 457a41cec..c63471889 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPrescriptionItemType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbPrescriptionItemType.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPrescriptionStatus.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbPrescriptionStatus.java
similarity index 94%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPrescriptionStatus.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbPrescriptionStatus.java
index 8267b464b..fcd2ca74f 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPrescriptionStatus.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbPrescriptionStatus.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPsnCertType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbPsnCertType.java
similarity index 98%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPsnCertType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbPsnCertType.java
index ecae48e96..291a97309 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPsnCertType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbPsnCertType.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPsnSetlWay.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbPsnSetlWay.java
similarity index 94%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPsnSetlWay.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbPsnSetlWay.java
index 4dddca78b..1f2f1d04b 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPsnSetlWay.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbPsnSetlWay.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbRxFlag.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbRxFlag.java
similarity index 94%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbRxFlag.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbRxFlag.java
index fb6fc20da..a37c6ebd9 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbRxFlag.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbRxFlag.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbRxItemTypeCode.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbRxItemTypeCode.java
similarity index 97%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbRxItemTypeCode.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbRxItemTypeCode.java
index 4de2b83e4..c667bf36b 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbRxItemTypeCode.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbRxItemTypeCode.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbTrigScen.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbTrigScen.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbTrigScen.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbTrigScen.java
index 4452c7b0e..4a18b61db 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbTrigScen.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbTrigScen.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbUsedFrqu.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbUsedFrqu.java
similarity index 97%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbUsedFrqu.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbUsedFrqu.java
index 665cebef7..7723ea826 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbUsedFrqu.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbUsedFrqu.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 /**
  * UsedFrquEnum
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbWarnType.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbWarnType.java
similarity index 93%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbWarnType.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbWarnType.java
index 82bf0fdaf..265cdfe4d 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbWarnType.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/enums/ybenums/YbWarnType.java
@@ -1,4 +1,4 @@
-package com.openhis.common.enums.ybenums;
+package com.healthlink.his.common.enums.ybenums;
 
 import com.github.pagehelper.util.StringUtil;
 import lombok.AllArgsConstructor;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/CommonUtil.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/CommonUtil.java
similarity index 98%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/CommonUtil.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/CommonUtil.java
index 48b7d6496..be88f8a47 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/CommonUtil.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/CommonUtil.java
@@ -1,4 +1,4 @@
-package com.openhis.common.utils;
+package com.healthlink.his.common.utils;
 
 import com.core.common.core.domain.R;
 import com.core.common.utils.poi.ExcelUtil;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/DateTimeUtils.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/DateTimeUtils.java
similarity index 92%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/DateTimeUtils.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/DateTimeUtils.java
index 61fc87711..1825d8970 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/DateTimeUtils.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/DateTimeUtils.java
@@ -1,4 +1,4 @@
-package com.openhis.common.utils;
+package com.healthlink.his.common.utils;
 
 import java.util.Date;
 
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/EnumUtils.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/EnumUtils.java
similarity index 91%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/EnumUtils.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/EnumUtils.java
index 6888b5c5f..e77647302 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/EnumUtils.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/EnumUtils.java
@@ -1,6 +1,6 @@
-package com.openhis.common.utils;
+package com.healthlink.his.common.utils;
 
-import com.openhis.common.enums.HisEnumInterface;
+import com.healthlink.his.common.enums.HisEnumInterface;
 
 import java.util.Arrays;
 
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/HisPageUtils.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/HisPageUtils.java
similarity index 98%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/HisPageUtils.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/HisPageUtils.java
index ad83f533d..636e3769c 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/HisPageUtils.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/HisPageUtils.java
@@ -1,4 +1,4 @@
-package com.openhis.common.utils;
+package com.healthlink.his.common.utils;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/HisQueryUtils.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/HisQueryUtils.java
similarity index 98%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/HisQueryUtils.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/HisQueryUtils.java
index 9a7c0c92e..9c111a2ee 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/HisQueryUtils.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/HisQueryUtils.java
@@ -1,10 +1,10 @@
-package com.openhis.common.utils;
+package com.healthlink.his.common.utils;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.SecurityUtils;
 import com.core.framework.config.TenantContext;
-import com.openhis.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.CommonConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/IdCardAgeCalculator.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/IdCardAgeCalculator.java
similarity index 99%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/IdCardAgeCalculator.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/IdCardAgeCalculator.java
index 8e9cbc081..c0d26f0ef 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/IdCardAgeCalculator.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/IdCardAgeCalculator.java
@@ -1,4 +1,4 @@
-package com.openhis.common.utils;
+package com.healthlink.his.common.utils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/IdCardUtil.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/IdCardUtil.java
similarity index 98%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/IdCardUtil.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/IdCardUtil.java
index 2b71a2fcf..580caa44d 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/IdCardUtil.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/IdCardUtil.java
@@ -1,9 +1,9 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.common.utils;
+package com.healthlink.his.common.utils;
 
-import com.openhis.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.CommonConstants;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/PageUtils.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/PageUtils.java
similarity index 97%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/PageUtils.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/PageUtils.java
index e4fbf1fec..c3d402b27 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/PageUtils.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/PageUtils.java
@@ -1,4 +1,4 @@
-package com.openhis.common.utils;
+package com.healthlink.his.common.utils;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/RedisKeys.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/RedisKeys.java
similarity index 96%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/RedisKeys.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/RedisKeys.java
index 3d0a341ea..2fe76973e 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/RedisKeys.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/RedisKeys.java
@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.openhis.common.utils;
+package com.healthlink.his.common.utils;
 
 /**
  * Redis所有Keys
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/RedisUtil.java b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/RedisUtil.java
similarity index 99%
rename from openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/RedisUtil.java
rename to openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/RedisUtil.java
index 9e3f3dccf..735853c99 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/RedisUtil.java
+++ b/openhis-server-new/healthlink-his-common/src/main/java/com/healthlink/his/common/utils/RedisUtil.java
@@ -1,4 +1,4 @@
-package com.openhis.common.utils;
+package com.healthlink.his.common.utils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/openhis-server-new/openhis-domain/pom.xml b/openhis-server-new/healthlink-his-domain/pom.xml
similarity index 92%
rename from openhis-server-new/openhis-domain/pom.xml
rename to openhis-server-new/healthlink-his-domain/pom.xml
index 4fa8572c4..b9c94e705 100755
--- a/openhis-server-new/openhis-domain/pom.xml
+++ b/openhis-server-new/healthlink-his-domain/pom.xml
@@ -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-domain</artifactId>
+    <artifactId>healthlink-his-domain</artifactId>
     <version>0.0.1-SNAPSHOT</version>
 
     <description>
@@ -50,8 +50,8 @@
         </dependency>
         <!-- 共通-->
         <dependency>
-            <groupId>com.openhis</groupId>
-            <artifactId>openhis-common</artifactId>
+            <groupId>com.healthlink.his</groupId>
+            <artifactId>healthlink-his-common</artifactId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Account.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Account.java
index 43cd1eb01..dd645d10b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Account.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BizUser.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/BizUser.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BizUser.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/BizUser.java
index fb6fb49c1..d8cfdc999 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BizUser.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/BizUser.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BizUserRole.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/BizUserRole.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BizUserRole.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/BizUserRole.java
index c4947916b..d0f78f2d9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BizUserRole.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/BizUserRole.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BodyStructure.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/BodyStructure.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BodyStructure.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/BodyStructure.java
index b7ef51344..2efb94d11 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BodyStructure.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/BodyStructure.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChangePriceRecord.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/ChangePriceRecord.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChangePriceRecord.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/ChangePriceRecord.java
index 780860736..2f10d8a05 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChangePriceRecord.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/ChangePriceRecord.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/ChargeItem.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/ChargeItem.java
index 25a717cdf..6ec2acd30 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/ChargeItem.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefDetail.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/ChargeItemDefDetail.java
similarity index 91%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefDetail.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/ChargeItemDefDetail.java
index 4290c369a..af6e2f4bc 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefDetail.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/ChargeItemDefDetail.java
@@ -1,10 +1,10 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
-import com.openhis.common.enums.ActPriority;
+import com.healthlink.his.common.enums.ActPriority;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/ChargeItemDefinition.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/ChargeItemDefinition.java
index b9db51742..25512ab97 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/ChargeItemDefinition.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Device.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Device.java
index 2c2bba2cb..29039ac86 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Device.java
@@ -1,10 +1,10 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
-import com.openhis.common.enums.DeviceSafety;
+import com.healthlink.his.common.enums.DeviceSafety;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/DeviceDefinition.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/DeviceDefinition.java
index 9bfe08bd3..b920dd31a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/DeviceDefinition.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Encounter.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Encounter.java
index 4e374b7df..fe8baa1aa 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Encounter.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.core.common.core.domain.HisBaseEntity;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/EncounterDiagnosis.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/EncounterDiagnosis.java
index aab9408a6..2c604d59b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/EncounterDiagnosis.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterLocation.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/EncounterLocation.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterLocation.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/EncounterLocation.java
index 193d46e13..2d1e8bb8c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterLocation.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/EncounterLocation.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/EncounterParticipant.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/EncounterParticipant.java
index d89fa9f6a..83a29585a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/EncounterParticipant.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterReason.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/EncounterReason.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterReason.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/EncounterReason.java
index 46265037f..97e8a7083 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterReason.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/EncounterReason.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Frequency.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Frequency.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Frequency.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Frequency.java
index 0c285344a..9fd59c1a1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Frequency.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Frequency.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain
+package com.healthlink.his.administration.domain
         ;
 
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/HealthcareService.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/HealthcareService.java
index 9ef2eac9b..7764900a3 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/HealthcareService.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/IdentifierUse.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/IdentifierUse.java
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/IdentifierUse.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/IdentifierUse.java
index 7a3c9301e..e7a650e27 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/IdentifierUse.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/IdentifierUse.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/InfectiousDiseaseReport.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/InfectiousDiseaseReport.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/InfectiousDiseaseReport.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/InfectiousDiseaseReport.java
index 3755e3386..86781b2f9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/InfectiousDiseaseReport.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/InfectiousDiseaseReport.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Instrument.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Instrument.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Instrument.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Instrument.java
index b19b82ee2..f8915bff2 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Instrument.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Instrument.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Invoice.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Invoice.java
index d18d99820..bfe1d36f6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Invoice.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.ObjectIdGenerators;
-import com.openhis.common.enums.InvoiceStatus;
+import com.healthlink.his.common.enums.InvoiceStatus;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/InvoiceSegment.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/InvoiceSegment.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/InvoiceSegment.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/InvoiceSegment.java
index 7bc467bb4..610a777d7 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/InvoiceSegment.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/InvoiceSegment.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Location.java
similarity index 90%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Location.java
index 28e65ea25..368fd74fa 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Location.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.ObjectIdGenerators;
-import com.openhis.common.enums.LocationMode;
-import com.openhis.common.enums.LocationStatus;
+import com.healthlink.his.common.enums.LocationMode;
+import com.healthlink.his.common.enums.LocationStatus;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ObservationDefinition.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/ObservationDefinition.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ObservationDefinition.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/ObservationDefinition.java
index 57476f3c8..84948b2ec 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ObservationDefinition.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/ObservationDefinition.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OperatingRoom.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/OperatingRoom.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OperatingRoom.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/OperatingRoom.java
index 7b96ac25d..29c4ccc26 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OperatingRoom.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/OperatingRoom.java
@@ -1,12 +1,12 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
-import com.openhis.common.annotation.Dict;
-import com.openhis.common.enums.LocationStatus;
+import com.healthlink.his.common.annotation.Dict;
+import com.healthlink.his.common.enums.LocationStatus;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OrgContrast.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/OrgContrast.java
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OrgContrast.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/OrgContrast.java
index e89950d23..a101a5a6b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OrgContrast.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/OrgContrast.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Organization.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Organization.java
index 5539a54e4..7e9b58fac 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Organization.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OrganizationLocation.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/OrganizationLocation.java
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OrganizationLocation.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/OrganizationLocation.java
index ed039ebbc..712891aa8 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OrganizationLocation.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/OrganizationLocation.java
@@ -1,10 +1,10 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OutpatientNoSegment.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/OutpatientNoSegment.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OutpatientNoSegment.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/OutpatientNoSegment.java
index ed3f966d4..fe1287b30 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OutpatientNoSegment.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/OutpatientNoSegment.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Patient.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Patient.java
index a04191def..2e5081b00 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Patient.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/PatientIdentifier.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/PatientIdentifier.java
index 61b2ac952..11cfda894 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/PatientIdentifier.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PatientStudent.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/PatientStudent.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PatientStudent.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/PatientStudent.java
index 9800d5416..eb37c3870 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PatientStudent.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/PatientStudent.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Practitioner.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Practitioner.java
index 752a3f698..fc45019af 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Practitioner.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerPatient.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/PractitionerPatient.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerPatient.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/PractitionerPatient.java
index 34a8075e2..fe516328a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerPatient.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/PractitionerPatient.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerRole.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/PractitionerRole.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerRole.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/PractitionerRole.java
index b3b0b4ceb..bb720754f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerRole.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/PractitionerRole.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PrescriptionReviewRecord.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/PrescriptionReviewRecord.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PrescriptionReviewRecord.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/PrescriptionReviewRecord.java
index 9178358cf..cb6d64b55 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PrescriptionReviewRecord.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/PrescriptionReviewRecord.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/SpecimenDefinition.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/SpecimenDefinition.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/SpecimenDefinition.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/SpecimenDefinition.java
index 49decf5de..13951a061 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/SpecimenDefinition.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/SpecimenDefinition.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Supplier.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Supplier.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Supplier.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Supplier.java
index 2c5253705..92ea245ef 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Supplier.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/Supplier.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/TraceNoManage.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/TraceNoManage.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/TraceNoManage.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/TraceNoManage.java
index 455ea06f6..abf262619 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/TraceNoManage.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/domain/TraceNoManage.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.domain;
+package com.healthlink.his.administration.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChangePriceDataDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/ChangePriceDataDto.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChangePriceDataDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/ChangePriceDataDto.java
index 2ab7b1705..54a6c1f5a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChangePriceDataDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/ChangePriceDataDto.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.dto;
+package com.healthlink.his.administration.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemBaseInfoDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/ChargeItemBaseInfoDto.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemBaseInfoDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/ChargeItemBaseInfoDto.java
index fb68affcc..2e2b86f31 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemBaseInfoDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/ChargeItemBaseInfoDto.java
@@ -1,6 +1,6 @@
-package com.openhis.administration.dto;
+package com.healthlink.his.administration.dto;
 
-import com.openhis.administration.domain.ChargeItem;
+import com.healthlink.his.administration.domain.ChargeItem;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemDefDetailPriceDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/ChargeItemDefDetailPriceDto.java
similarity index 90%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemDefDetailPriceDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/ChargeItemDefDetailPriceDto.java
index 35501d065..834499ade 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemDefDetailPriceDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/ChargeItemDefDetailPriceDto.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.dto;
+package com.healthlink.his.administration.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemDefInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/ChargeItemDefInfo.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemDefInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/ChargeItemDefInfo.java
index d0355f769..414f4e3f1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemDefInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/ChargeItemDefInfo.java
@@ -1,9 +1,9 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.administration.dto;
+package com.healthlink.his.administration.dto;
 
-import com.openhis.administration.domain.ChargeItem;
+import com.healthlink.his.administration.domain.ChargeItem;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/CostDetailDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/CostDetailDto.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/CostDetailDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/CostDetailDto.java
index ed761ac48..d3223d252 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/CostDetailDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/CostDetailDto.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.dto;
+package com.healthlink.his.administration.dto;
 
 import com.core.common.annotation.Excel;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/CostDetailSearchParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/CostDetailSearchParam.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/CostDetailSearchParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/CostDetailSearchParam.java
index 6cda0c6af..3c6c2cdcc 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/CostDetailSearchParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/CostDetailSearchParam.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.dto;
+package com.healthlink.his.administration.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterAccountDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/EncounterAccountDto.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterAccountDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/EncounterAccountDto.java
index fdfadc596..2fefeb842 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterAccountDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/EncounterAccountDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.administration.dto;
+package com.healthlink.his.administration.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterDataDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/EncounterDataDto.java
similarity index 91%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterDataDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/EncounterDataDto.java
index 36a87477d..7bacaa0e5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterDataDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/EncounterDataDto.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.dto;
+package com.healthlink.his.administration.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterLocationDataDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/EncounterLocationDataDto.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterLocationDataDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/EncounterLocationDataDto.java
index 48c1c540d..339001524 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterLocationDataDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/EncounterLocationDataDto.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.dto;
+package com.healthlink.his.administration.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/HealthcareDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/HealthcareDto.java
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/HealthcareDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/HealthcareDto.java
index 94d775fac..afc9dc3e9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/HealthcareDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/HealthcareDto.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.dto;
+package com.healthlink.his.administration.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/LocationDataDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/LocationDataDto.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/LocationDataDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/LocationDataDto.java
index 2317b9261..e499bc248 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/LocationDataDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/LocationDataDto.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.dto;
+package com.healthlink.his.administration.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/OrgDataDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/OrgDataDto.java
similarity index 84%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/OrgDataDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/OrgDataDto.java
index 56f3ce3f8..a18471993 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/OrgDataDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/OrgDataDto.java
@@ -1,8 +1,8 @@
-package com.openhis.administration.dto;
+package com.healthlink.his.administration.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.medication.dto.AdjustPriceMedListDto;
+import com.healthlink.his.medication.dto.AdjustPriceMedListDto;
 import lombok.Data;
 
 import java.util.List;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/OutpatientManageDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/OutpatientManageDto.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/OutpatientManageDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/OutpatientManageDto.java
index 48836af35..048fa965a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/OutpatientManageDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/OutpatientManageDto.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.dto;
+package com.healthlink.his.administration.dto;
 
 import java.util.Date;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/PatientBedInfoDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/PatientBedInfoDto.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/PatientBedInfoDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/PatientBedInfoDto.java
index dc77e751b..551195572 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/PatientBedInfoDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/PatientBedInfoDto.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.dto;
+package com.healthlink.his.administration.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/PatientDataDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/PatientDataDto.java
similarity index 91%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/PatientDataDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/PatientDataDto.java
index dde4dc37a..41c6440db 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/PatientDataDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/PatientDataDto.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.dto;
+package com.healthlink.his.administration.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/PractitionerPatientDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/PractitionerPatientDto.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/PractitionerPatientDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/PractitionerPatientDto.java
index 38061dc6e..17a7f3fc1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/PractitionerPatientDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/PractitionerPatientDto.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.dto;
+package com.healthlink.his.administration.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/PrescriptionReviewRecordDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/PrescriptionReviewRecordDto.java
similarity index 88%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/PrescriptionReviewRecordDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/PrescriptionReviewRecordDto.java
index d758029a0..69a03ecce 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/PrescriptionReviewRecordDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/PrescriptionReviewRecordDto.java
@@ -1,9 +1,9 @@
-package com.openhis.administration.dto;
+package com.healthlink.his.administration.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.common.annotation.Dict;
-import com.openhis.common.enums.ReviewReasonableStatus;
+import com.healthlink.his.common.annotation.Dict;
+import com.healthlink.his.common.enums.ReviewReasonableStatus;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/RoleDataDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/RoleDataDto.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/RoleDataDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/RoleDataDto.java
index 41db68b68..b9c374a5f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/RoleDataDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/RoleDataDto.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.dto;
+package com.healthlink.his.administration.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/TracePatientInfoDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/TracePatientInfoDto.java
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/TracePatientInfoDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/TracePatientInfoDto.java
index ff50c6c95..bb2619e1b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/TracePatientInfoDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/dto/TracePatientInfoDto.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.dto;
+package com.healthlink.his.administration.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/AccountMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/AccountMapper.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/AccountMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/AccountMapper.java
index 3f4305788..7d82349a1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/AccountMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/AccountMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.Account;
+import com.healthlink.his.administration.domain.Account;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/BizUserMapper.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/BizUserMapper.java
index e4db6525c..c0041903b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/BizUserMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.BizUser;
+import com.healthlink.his.administration.domain.BizUser;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserRoleMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/BizUserRoleMapper.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserRoleMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/BizUserRoleMapper.java
index f8c308d0a..3fd998a61 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserRoleMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/BizUserRoleMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.BizUserRole;
+import com.healthlink.his.administration.domain.BizUserRole;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BodyStructureMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/BodyStructureMapper.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BodyStructureMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/BodyStructureMapper.java
index 6c9a3d9b7..982824802 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BodyStructureMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/BodyStructureMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.BodyStructure;
+import com.healthlink.his.administration.domain.BodyStructure;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChangePriceRecordMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/ChangePriceRecordMapper.java
similarity index 78%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChangePriceRecordMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/ChangePriceRecordMapper.java
index 2bd548bea..5730a76c4 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChangePriceRecordMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/ChangePriceRecordMapper.java
@@ -1,8 +1,8 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.ChangePriceRecord;
-import com.openhis.administration.dto.ChangePriceDataDto;
+import com.healthlink.his.administration.domain.ChangePriceRecord;
+import com.healthlink.his.administration.dto.ChangePriceDataDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -23,7 +23,7 @@ public interface ChangePriceRecordMapper extends BaseMapper<ChangePriceRecord> {
      * @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);
     /**
@@ -33,7 +33,7 @@ public interface ChangePriceRecordMapper extends BaseMapper<ChangePriceRecord> {
      * @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);
     /**
@@ -43,7 +43,7 @@ public interface ChangePriceRecordMapper extends BaseMapper<ChangePriceRecord> {
      * @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);
     /**
@@ -53,7 +53,7 @@ public interface ChangePriceRecordMapper extends BaseMapper<ChangePriceRecord> {
      * @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);
 
@@ -64,7 +64,7 @@ public interface ChangePriceRecordMapper extends BaseMapper<ChangePriceRecord> {
      * @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);
     /**
@@ -74,7 +74,7 @@ public interface ChangePriceRecordMapper extends BaseMapper<ChangePriceRecord> {
      * @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);
 
@@ -85,7 +85,7 @@ public interface ChangePriceRecordMapper extends BaseMapper<ChangePriceRecord> {
      * @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);
     /**
@@ -95,7 +95,7 @@ public interface ChangePriceRecordMapper extends BaseMapper<ChangePriceRecord> {
      * @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);
     /**
@@ -104,7 +104,7 @@ public interface ChangePriceRecordMapper extends BaseMapper<ChangePriceRecord> {
      * @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);
     /**
@@ -112,7 +112,7 @@ public interface ChangePriceRecordMapper extends BaseMapper<ChangePriceRecord> {
      * @param busNo
      * @Author raymond
      * @Date 09:39 2025/11/5
-     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     * @return java.util.List<com.healthlink.his.administration.dto.ChangePriceDataDto>
      **/
     List<ChangePriceRecord> searchChangePriceDataGroupByBusNo(@Param("busNo") String busNo);
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefDetailAppMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/ChargeItemDefDetailAppMapper.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefDetailAppMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/ChargeItemDefDetailAppMapper.java
index 6cdf67b91..a211d30ed 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefDetailAppMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/ChargeItemDefDetailAppMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.ChargeItemDefDetail;
+import com.healthlink.his.administration.domain.ChargeItemDefDetail;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -22,7 +22,7 @@ public interface ChargeItemDefDetailAppMapper extends BaseMapper<ChargeItemDefDe
      * @param code
      * @Author raymond
      * @Date 08:13 2025/10/29
-     * @return java.util.List<com.openhis.administration.domain.ChargeItemDefDetail>
+     * @return java.util.List<com.healthlink.his.administration.domain.ChargeItemDefDetail>
      **/
     List<ChargeItemDefDetail> searchChargeDetailDataByBusNo(@Param("value") String value, @Param("code") String code);
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefinitionMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/ChargeItemDefinitionMapper.java
similarity index 76%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefinitionMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/ChargeItemDefinitionMapper.java
index a72d58f95..75a201045 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefinitionMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/ChargeItemDefinitionMapper.java
@@ -1,8 +1,8 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.ChargeItemDefinition;
-import com.openhis.administration.dto.ChargeItemDefDetailPriceDto;
+import com.healthlink.his.administration.domain.ChargeItemDefinition;
+import com.healthlink.his.administration.dto.ChargeItemDefDetailPriceDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -21,7 +21,7 @@ public interface ChargeItemDefinitionMapper extends BaseMapper<ChargeItemDefinit
      * @param instanceId
      * @Author raymond
      * @Date 21:44 2025/11/1
-     * @return com.openhis.administration.domain.ChargeItemDefinition
+     * @return com.healthlink.his.administration.domain.ChargeItemDefinition
      **/
     ChargeItemDefDetailPriceDto getMedPriceByParam(@Param("conditionCode") String conditionCode,
         @Param("instanceId") Long instanceId);
@@ -33,7 +33,7 @@ public interface ChargeItemDefinitionMapper extends BaseMapper<ChargeItemDefinit
      * @param instanceId
      * @Author raymond
      * @Date 07:23 2025/11/4
-     * @return com.openhis.administration.dto.ChargeItemDefDetailPriceDto
+     * @return com.healthlink.his.administration.dto.ChargeItemDefDetailPriceDto
      **/
     ChargeItemDefDetailPriceDto getDevicePriceByParam(@Param("conditionCode") String conditionCode,
         @Param("instanceId") Long instanceId);
@@ -45,7 +45,7 @@ public interface ChargeItemDefinitionMapper extends BaseMapper<ChargeItemDefinit
      * @param instanceId
      * @Author raymond
      * @Date 22:02 2025/11/1
-     * @return com.openhis.administration.dto.ChargeItemDefDetailPriceDto
+     * @return com.healthlink.his.administration.dto.ChargeItemDefDetailPriceDto
      **/
     ChargeItemDefDetailPriceDto getProductPrice(@Param("statusEnum") Integer statusEnum,
         @Param("instanceId") Long instanceId);
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/ChargeItemMapper.java
similarity index 82%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/ChargeItemMapper.java
index 2e115958e..b5202ff24 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/ChargeItemMapper.java
@@ -1,13 +1,13 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.openhis.administration.domain.ChargeItem;
-import com.openhis.administration.dto.ChargeItemBaseInfoDto;
-import com.openhis.administration.dto.ChargeItemDefInfo;
-import com.openhis.administration.dto.CostDetailDto;
-import com.openhis.administration.dto.CostDetailSearchParam;
+import com.healthlink.his.administration.domain.ChargeItem;
+import com.healthlink.his.administration.dto.ChargeItemBaseInfoDto;
+import com.healthlink.his.administration.dto.ChargeItemDefInfo;
+import com.healthlink.his.administration.dto.CostDetailDto;
+import com.healthlink.his.administration.dto.CostDetailSearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DeviceDefinitionMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/DeviceDefinitionMapper.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DeviceDefinitionMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/DeviceDefinitionMapper.java
index 5299614b8..d7fc3ee37 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DeviceDefinitionMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/DeviceDefinitionMapper.java
@@ -1,8 +1,8 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.DeviceDefinition;
-import com.openhis.medication.dto.AdjustPriceMedListDto;
+import com.healthlink.his.administration.domain.DeviceDefinition;
+import com.healthlink.his.medication.dto.AdjustPriceMedListDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -21,7 +21,7 @@ public interface DeviceDefinitionMapper extends BaseMapper<DeviceDefinition> {
      * @param keyWord
      * @Author raymond
      * @Date 20:23 2025/10/21
-     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     * @return java.util.List<com.healthlink.his.medication.dto.AdjustPriceMedListDto>
      **/
     List<AdjustPriceMedListDto> searchDeviceListByKeyWord(@Param("keyWord") String keyWord);
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DeviceMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/DeviceMapper.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DeviceMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/DeviceMapper.java
index 165627eb8..7f76e6cf6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DeviceMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/DeviceMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.Device;
+import com.healthlink.his.administration.domain.Device;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterDiagnosisMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/EncounterDiagnosisMapper.java
similarity index 89%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterDiagnosisMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/EncounterDiagnosisMapper.java
index 76d10e3e3..d0416a1d0 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterDiagnosisMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/EncounterDiagnosisMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.EncounterDiagnosis;
+import com.healthlink.his.administration.domain.EncounterDiagnosis;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterLocationMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/EncounterLocationMapper.java
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterLocationMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/EncounterLocationMapper.java
index 31bd8b433..0e2ecd5c6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterLocationMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/EncounterLocationMapper.java
@@ -1,8 +1,8 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.EncounterLocation;
-import com.openhis.administration.dto.PatientBedInfoDto;
+import com.healthlink.his.administration.domain.EncounterLocation;
+import com.healthlink.his.administration.dto.PatientBedInfoDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -23,7 +23,7 @@ public interface EncounterLocationMapper extends BaseMapper<EncounterLocation> {
      * @param formEnum
      * @Author raymond
      * @Date 12:20 2025/10/28
-     * @return java.util.List<com.openhis.administration.dto.EncounterDataDto>
+     * @return java.util.List<com.healthlink.his.administration.dto.EncounterDataDto>
      **/
     PatientBedInfoDto searchEncounterDataByLocationId(@Param("locationId") Long locationId,
         @Param("statusEnum") Integer statusEnum,@Param("formEnum") Integer formEnum);
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/EncounterMapper.java
similarity index 77%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/EncounterMapper.java
index 8efca076b..d8089ad85 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/EncounterMapper.java
@@ -1,9 +1,9 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.Encounter;
-import com.openhis.administration.dto.EncounterAccountDto;
-import com.openhis.administration.dto.EncounterDataDto;
+import com.healthlink.his.administration.domain.Encounter;
+import com.healthlink.his.administration.dto.EncounterAccountDto;
+import com.healthlink.his.administration.dto.EncounterDataDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -36,7 +36,7 @@ public interface EncounterMapper extends BaseMapper<Encounter> {
      * @param encounterIds
      * @Author raymond
      * @Date 12:36 2025/10/28
-     * @return java.util.List<com.openhis.administration.dto.EncounterDataDto>
+     * @return java.util.List<com.healthlink.his.administration.dto.EncounterDataDto>
      **/
     List<EncounterDataDto> searchEncounterDataByIds(@Param("imp") Integer imp, @Param("amb") Integer amb,
         @Param("encounterStatus") Long encounterStatus, @Param("encounterIds") List<Long> encounterIds);
@@ -46,7 +46,7 @@ public interface EncounterMapper extends BaseMapper<Encounter> {
      * @param encounterId
      * @Author raymond
      * @Date 12:34 2025/11/3
-     * @return com.openhis.administration.dto.EncounterDataDto
+     * @return com.healthlink.his.administration.dto.EncounterDataDto
      **/
     EncounterDataDto getPatientIdByParam(@Param("classEnum") Integer classEnum,
                                          @Param("encounterId") Long encounterId);
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterParticipantMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/EncounterParticipantMapper.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterParticipantMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/EncounterParticipantMapper.java
index 5f92d868b..4c5f81e0f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterParticipantMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/EncounterParticipantMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.EncounterParticipant;
+import com.healthlink.his.administration.domain.EncounterParticipant;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterReasonMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/EncounterReasonMapper.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterReasonMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/EncounterReasonMapper.java
index 91f75a15a..01dba70d4 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterReasonMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/EncounterReasonMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.EncounterReason;
+import com.healthlink.his.administration.domain.EncounterReason;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/FrequencyMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/FrequencyMapper.java
similarity index 64%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/FrequencyMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/FrequencyMapper.java
index 5c75152df..7569b9964 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/FrequencyMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/FrequencyMapper.java
@@ -1,12 +1,12 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.Frequency;
+import com.healthlink.his.administration.domain.Frequency;
 
 /**
 * @author 47826
 * @description 针对表【adm_frequency(频次配置表，用于频次、周期和相关信息)】的数据库操作Mapper
 * @createDate 2025-08-21 14:22:11
-* @Entity com/openhis/administration.domain.Frequency
+* @Entity com/healthlink/his/administration.domain.Frequency
 */
 public interface FrequencyMapper extends BaseMapper<Frequency> {
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/HealthcareServiceMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/HealthcareServiceMapper.java
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/HealthcareServiceMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/HealthcareServiceMapper.java
index ed55610a6..03fad3808 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/HealthcareServiceMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/HealthcareServiceMapper.java
@@ -1,9 +1,9 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.HealthcareService;
-import com.openhis.administration.dto.HealthcareDto;
-import com.openhis.medication.dto.AdjustPriceMedListDto;
+import com.healthlink.his.administration.domain.HealthcareService;
+import com.healthlink.his.administration.dto.HealthcareDto;
+import com.healthlink.his.medication.dto.AdjustPriceMedListDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -23,7 +23,7 @@ public interface HealthcareServiceMapper extends BaseMapper<HealthcareService> {
      * @param itemIds
      * @Author raymond
      * @Date 15:36 2025/10/18
-     * @return java.util.List<com.openhis.administration.dto.HealthcareDto>
+     * @return java.util.List<com.healthlink.his.administration.dto.HealthcareDto>
      **/
     List<HealthcareDto> searchHealthByIds(@Param("itemIds") List<Long> itemIds);
     /**
@@ -31,7 +31,7 @@ public interface HealthcareServiceMapper extends BaseMapper<HealthcareService> {
      * @param orgId
      * @Author raymond
      * @Date 08:32 2025/10/22
-     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     * @return java.util.List<com.healthlink.his.medication.dto.AdjustPriceMedListDto>
      **/
     List<AdjustPriceMedListDto> searchAllHeathData(@Param("orgId") Long orgId,@Param("statusEnum") Integer statusEnum);
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/InfectiousDiseaseReportMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/InfectiousDiseaseReportMapper.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/InfectiousDiseaseReportMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/InfectiousDiseaseReportMapper.java
index f88e75e42..7033cba40 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/InfectiousDiseaseReportMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/InfectiousDiseaseReportMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.InfectiousDiseaseReport;
+import com.healthlink.his.administration.domain.InfectiousDiseaseReport;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/InstrumentMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/InstrumentMapper.java
similarity index 75%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/InstrumentMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/InstrumentMapper.java
index 008e483ca..e06560c1d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/InstrumentMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/InstrumentMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.Instrument;
+import com.healthlink.his.administration.domain.Instrument;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/InvoiceMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/InvoiceMapper.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/InvoiceMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/InvoiceMapper.java
index ce5dcecfc..3e0b34c36 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/InvoiceMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/InvoiceMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.Invoice;
+import com.healthlink.his.administration.domain.Invoice;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/InvoiceSegmentMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/InvoiceSegmentMapper.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/InvoiceSegmentMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/InvoiceSegmentMapper.java
index bd5d09f53..701a45f8a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/InvoiceSegmentMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/InvoiceSegmentMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.InvoiceSegment;
+import com.healthlink.his.administration.domain.InvoiceSegment;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/LocationMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/LocationMapper.java
similarity index 76%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/LocationMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/LocationMapper.java
index 1498c94e4..80f7023c1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/LocationMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/LocationMapper.java
@@ -1,9 +1,9 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.Location;
-import com.openhis.administration.dto.LocationDataDto;
-import com.openhis.administration.dto.PatientBedInfoDto;
+import com.healthlink.his.administration.domain.Location;
+import com.healthlink.his.administration.dto.LocationDataDto;
+import com.healthlink.his.administration.dto.PatientBedInfoDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -24,7 +24,7 @@ public interface LocationMapper extends BaseMapper<Location> {
      * @param locationIds
      * @Author raymond
      * @Date 07:46 2025/10/28
-     * @return java.util.List<com.openhis.administration.dto.LocationDataDto>
+     * @return java.util.List<com.healthlink.his.administration.dto.LocationDataDto>
      *
      */
     List<LocationDataDto> searchLocationDataByIds(@Param("locationIds") List<Long> locationIds);
@@ -36,7 +36,7 @@ public interface LocationMapper extends BaseMapper<Location> {
      * @param formEnum
      * @Author raymond
      * @Date 14:01 2025/10/28
-     * @return java.util.List<com.openhis.administration.dto.LocationDataDto>
+     * @return java.util.List<com.healthlink.his.administration.dto.LocationDataDto>
      *
      */
     List<PatientBedInfoDto> searchLocationDataByBusNo(@Param("busNo") String busNo, @Param("formEnum") Integer formEnum,
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ObservationDefinitionMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/ObservationDefinitionMapper.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ObservationDefinitionMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/ObservationDefinitionMapper.java
index 75c7ce7a3..cd6a4234c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ObservationDefinitionMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/ObservationDefinitionMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.ObservationDefinition;
+import com.healthlink.his.administration.domain.ObservationDefinition;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OperatingRoomMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/OperatingRoomMapper.java
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OperatingRoomMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/OperatingRoomMapper.java
index 6cbc0de4c..d0270c612 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OperatingRoomMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/OperatingRoomMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.OperatingRoom;
+import com.healthlink.his.administration.domain.OperatingRoom;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OrgContrastMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/OrgContrastMapper.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OrgContrastMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/OrgContrastMapper.java
index 061681509..d7858de00 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OrgContrastMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/OrgContrastMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.OrgContrast;
+import com.healthlink.his.administration.domain.OrgContrast;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OrganizationLocationMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/OrganizationLocationMapper.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OrganizationLocationMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/OrganizationLocationMapper.java
index 3147ed423..2a0172f80 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OrganizationLocationMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/OrganizationLocationMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.OrganizationLocation;
+import com.healthlink.his.administration.domain.OrganizationLocation;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OrganizationMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/OrganizationMapper.java
similarity index 88%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OrganizationMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/OrganizationMapper.java
index e32f25feb..878a149fd 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OrganizationMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/OrganizationMapper.java
@@ -1,10 +1,10 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.openhis.administration.domain.Organization;
-import com.openhis.administration.dto.OrgDataDto;
+import com.healthlink.his.administration.domain.Organization;
+import com.healthlink.his.administration.dto.OrgDataDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OutpatientNoSegmentMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/OutpatientNoSegmentMapper.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OutpatientNoSegmentMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/OutpatientNoSegmentMapper.java
index 6af59db40..5e0f3358c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OutpatientNoSegmentMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/OutpatientNoSegmentMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.OutpatientNoSegment;
+import com.healthlink.his.administration.domain.OutpatientNoSegment;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientIdentifierMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/PatientIdentifierMapper.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientIdentifierMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/PatientIdentifierMapper.java
index b28ba92de..789393491 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientIdentifierMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/PatientIdentifierMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.PatientIdentifier;
+import com.healthlink.his.administration.domain.PatientIdentifier;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/PatientMapper.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/PatientMapper.java
index e7a914963..3530ac095 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/PatientMapper.java
@@ -1,8 +1,8 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.Patient;
-import com.openhis.administration.dto.PatientDataDto;
+import com.healthlink.his.administration.domain.Patient;
+import com.healthlink.his.administration.dto.PatientDataDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -22,7 +22,7 @@ public interface PatientMapper extends BaseMapper<Patient> {
      * @param activeFlag
      * @Author raymond
      * @Date 12:53 2025/10/28
-     * @return java.util.List<com.openhis.administration.dto.PatientDataDto>
+     * @return java.util.List<com.healthlink.his.administration.dto.PatientDataDto>
      **/
     List<PatientDataDto> searchPatientDataByPatientId(@Param("patientId") Long patientId,@Param("activeFlag") Integer activeFlag);
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientStudentMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/PatientStudentMapper.java
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientStudentMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/PatientStudentMapper.java
index ee8307ebe..b1047cfd6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientStudentMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/PatientStudentMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.PatientStudent;
+import com.healthlink.his.administration.domain.PatientStudent;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PractitionerMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/PractitionerMapper.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PractitionerMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/PractitionerMapper.java
index 0e133b05b..c1fc41f43 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PractitionerMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/PractitionerMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.Practitioner;
+import com.healthlink.his.administration.domain.Practitioner;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PractitionerPatientMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/PractitionerPatientMapper.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PractitionerPatientMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/PractitionerPatientMapper.java
index c991019e5..c0b2f632d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PractitionerPatientMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/PractitionerPatientMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.PractitionerPatient;
+import com.healthlink.his.administration.domain.PractitionerPatient;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PractitionerRoleMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/PractitionerRoleMapper.java
similarity index 78%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PractitionerRoleMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/PractitionerRoleMapper.java
index 5784426a7..810f871cc 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PractitionerRoleMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/PractitionerRoleMapper.java
@@ -1,8 +1,8 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.PractitionerRole;
-import com.openhis.administration.dto.RoleDataDto;
+import com.healthlink.his.administration.domain.PractitionerRole;
+import com.healthlink.his.administration.dto.RoleDataDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -22,7 +22,7 @@ public interface PractitionerRoleMapper extends BaseMapper<PractitionerRole> {
      * @param roleCode
      * @Author raymond
      * @Date 16:43 2025/10/27
-     * @return java.util.List<com.openhis.administration.dto.RoleDataDto>
+     * @return java.util.List<com.healthlink.his.administration.dto.RoleDataDto>
      **/
     List<RoleDataDto> searchPractitionerRoleByPractitionerId(@Param("practitionerId") Long practitionerId,@Param("roleCode") String roleCode);
     /**
@@ -30,7 +30,7 @@ public interface PractitionerRoleMapper extends BaseMapper<PractitionerRole> {
      * @param practitionerIds
      * @Author raymond
      * @Date 16:49 2025/10/27
-     * @return java.util.List<com.openhis.administration.dto.RoleDataDto>
+     * @return java.util.List<com.healthlink.his.administration.dto.RoleDataDto>
      **/
     List<RoleDataDto> searchPractitionerRoleByPractitionerIds(@Param("practitionerIds") Long practitionerIds);
     /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PrescriptionReviewRecordMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/PrescriptionReviewRecordMapper.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PrescriptionReviewRecordMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/PrescriptionReviewRecordMapper.java
index eb22e6557..7d43641da 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PrescriptionReviewRecordMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/PrescriptionReviewRecordMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.PrescriptionReviewRecord;
+import com.healthlink.his.administration.domain.PrescriptionReviewRecord;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/SpecimenDefinitionMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/SpecimenDefinitionMapper.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/SpecimenDefinitionMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/SpecimenDefinitionMapper.java
index 02f67549e..ef90ced4e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/SpecimenDefinitionMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/SpecimenDefinitionMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.SpecimenDefinition;
+import com.healthlink.his.administration.domain.SpecimenDefinition;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/SupplierMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/SupplierMapper.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/SupplierMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/SupplierMapper.java
index 2e0fdddf1..f3dbe52fb 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/SupplierMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/SupplierMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.Supplier;
+import com.healthlink.his.administration.domain.Supplier;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/TraceNoManageMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/TraceNoManageMapper.java
similarity index 85%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/TraceNoManageMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/TraceNoManageMapper.java
index b07d51c0b..86762cbc5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/TraceNoManageMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/mapper/TraceNoManageMapper.java
@@ -1,8 +1,8 @@
-package com.openhis.administration.mapper;
+package com.healthlink.his.administration.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.administration.domain.TraceNoManage;
-import com.openhis.administration.dto.TracePatientInfoDto;
+import com.healthlink.his.administration.domain.TraceNoManage;
+import com.healthlink.his.administration.dto.TracePatientInfoDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IAccountService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IAccountService.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IAccountService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IAccountService.java
index 549d1c814..d552c1877 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IAccountService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IAccountService.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.Account;
+import com.healthlink.his.administration.domain.Account;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IBizUserRoleService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IBizUserRoleService.java
similarity index 65%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IBizUserRoleService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IBizUserRoleService.java
index a8f0e80f2..e2a3761fe 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IBizUserRoleService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IBizUserRoleService.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.BizUserRole;
+import com.healthlink.his.administration.domain.BizUserRole;
 
 /**
  * 用户角色Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IBizUserService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IBizUserService.java
similarity index 65%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IBizUserService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IBizUserService.java
index d1cd92d27..ee3b4ae58 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IBizUserService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IBizUserService.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.BizUser;
+import com.healthlink.his.administration.domain.BizUser;
 
 /**
  * 用户管理Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IBodyStructureService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IBodyStructureService.java
similarity index 85%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IBodyStructureService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IBodyStructureService.java
index aed742037..cf4fe50f2 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IBodyStructureService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IBodyStructureService.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.BodyStructure;
+import com.healthlink.his.administration.domain.BodyStructure;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChangePriceRecordService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IChangePriceRecordService.java
similarity index 78%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChangePriceRecordService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IChangePriceRecordService.java
index 065b45742..d7ee5bed3 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChangePriceRecordService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IChangePriceRecordService.java
@@ -1,8 +1,8 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.ChangePriceRecord;
-import com.openhis.administration.dto.ChangePriceDataDto;
+import com.healthlink.his.administration.domain.ChangePriceRecord;
+import com.healthlink.his.administration.dto.ChangePriceDataDto;
 
 import java.util.Date;
 import java.util.List;
@@ -30,7 +30,7 @@ public interface IChangePriceRecordService extends IService<ChangePriceRecord> {
      * @param busNo
      * @Author raymond
      * @Date 08:44 2025/11/2
-     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     * @return java.util.List<com.healthlink.his.administration.dto.ChangePriceDataDto>
      **/
     List<ChangePriceRecord> searchChangePriceDataForBusNo(String busNo);
 
@@ -42,7 +42,7 @@ public interface IChangePriceRecordService extends IService<ChangePriceRecord> {
      * @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(String busNo, Integer categoryEnum, Integer statusEnum);
 
@@ -54,7 +54,7 @@ public interface IChangePriceRecordService extends IService<ChangePriceRecord> {
      * @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(Long itemId, Integer categoryEnum, Integer statusEnum);
 
@@ -66,7 +66,7 @@ public interface IChangePriceRecordService extends IService<ChangePriceRecord> {
      * @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(String busNo, Integer categoryEnum, Integer statusEnum);
 
@@ -78,7 +78,7 @@ public interface IChangePriceRecordService extends IService<ChangePriceRecord> {
      * @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(Long itemId, Integer categoryEnum, Integer statusEnum);
 
@@ -90,7 +90,7 @@ public interface IChangePriceRecordService extends IService<ChangePriceRecord> {
      * @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(String busNo, Integer categoryEnum, Integer statusEnum);
 
@@ -102,7 +102,7 @@ public interface IChangePriceRecordService extends IService<ChangePriceRecord> {
      * @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(Long itemId, Integer categoryEnum, Integer statusEnum);
 
@@ -114,7 +114,7 @@ public interface IChangePriceRecordService extends IService<ChangePriceRecord> {
      * @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(String busNo, Integer categoryEnum, Integer statusEnum);
 
@@ -126,7 +126,7 @@ public interface IChangePriceRecordService extends IService<ChangePriceRecord> {
      * @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(Long itemId, Integer categoryEnum, Integer statusEnum);
 
@@ -158,7 +158,7 @@ public interface IChangePriceRecordService extends IService<ChangePriceRecord> {
      * @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(String busNo, Integer statusEnum);
 
@@ -168,7 +168,7 @@ public interface IChangePriceRecordService extends IService<ChangePriceRecord> {
      * @param busNo
      * @Author raymond
      * @Date 09:39 2025/11/5
-     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     * @return java.util.List<com.healthlink.his.administration.dto.ChangePriceDataDto>
      **/
     List<ChangePriceRecord> searchChangePriceDataGroupByBusNo(String busNo);
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefDetailService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IChargeItemDefDetailService.java
similarity index 85%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefDetailService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IChargeItemDefDetailService.java
index 9c99a9665..613fed7da 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefDetailService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IChargeItemDefDetailService.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.ChargeItemDefDetail;
+import com.healthlink.his.administration.domain.ChargeItemDefDetail;
 
 import java.util.List;
 
@@ -43,7 +43,7 @@ public interface IChargeItemDefDetailService extends IService<ChargeItemDefDetai
      * @param chargeItemId
      * @Author raymond
      * @Date 22:56 2025/10/18
-     * @return java.util.List<com.openhis.administration.domain.ChargeItemDefDetail>
+     * @return java.util.List<com.healthlink.his.administration.domain.ChargeItemDefDetail>
      **/
     List<ChargeItemDefDetail> searchChargeItemDefDetailByIds(Long chargeItemId,String code,String lotNumber);
 
@@ -54,7 +54,7 @@ public interface IChargeItemDefDetailService extends IService<ChargeItemDefDetai
      * @param code
      * @Author raymond
      * @Date 08:13 2025/10/29
-     * @return java.util.List<com.openhis.administration.domain.ChargeItemDefDetail>
+     * @return java.util.List<com.healthlink.his.administration.domain.ChargeItemDefDetail>
      **/
     List<ChargeItemDefDetail> searchChargeDetailDataByBusNo(String value, String code);
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefinitionService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IChargeItemDefinitionService.java
similarity index 83%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefinitionService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IChargeItemDefinitionService.java
index f342cd985..64254349f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefinitionService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IChargeItemDefinitionService.java
@@ -1,10 +1,10 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.ChargeItemDefinition;
-import com.openhis.administration.domain.HealthcareService;
-import com.openhis.administration.dto.ChargeItemDefDetailPriceDto;
+import com.healthlink.his.administration.domain.ChargeItemDefinition;
+import com.healthlink.his.administration.domain.HealthcareService;
+import com.healthlink.his.administration.dto.ChargeItemDefDetailPriceDto;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -77,7 +77,7 @@ public interface IChargeItemDefinitionService extends IService<ChargeItemDefinit
      * @param itemIds
      * @Author raymond
      * @Date 22:39 2025/10/18
-     * @return java.util.List<com.openhis.administration.domain.ChargeItemDefinition>
+     * @return java.util.List<com.healthlink.his.administration.domain.ChargeItemDefinition>
      **/
     List<ChargeItemDefinition> searchChargeItemDefinitionByMedIds(List<Long> itemIds);
 
@@ -89,7 +89,7 @@ public interface IChargeItemDefinitionService extends IService<ChargeItemDefinit
      * @param statusEnum
      * @Author raymond
      * @Date 11:15 2025/10/30
-     * @return com.openhis.administration.domain.ChargeItemDefinition
+     * @return com.healthlink.his.administration.domain.ChargeItemDefinition
      **/
     ChargeItemDefinition getChargeItemDefinitionEntity(Long instanceId, String instanceTable, Integer statusEnum);
 
@@ -100,7 +100,7 @@ public interface IChargeItemDefinitionService extends IService<ChargeItemDefinit
      * @param instanceId
      * @Author raymond
      * @Date 21:44 2025/11/1
-     * @return com.openhis.administration.domain.ChargeItemDefinition
+     * @return com.healthlink.his.administration.domain.ChargeItemDefinition
      **/
     ChargeItemDefDetailPriceDto getMedPriceByParam(String conditionCode, Long instanceId);
 
@@ -111,7 +111,7 @@ public interface IChargeItemDefinitionService extends IService<ChargeItemDefinit
      * @param instanceId
      * @Author raymond
      * @Date 07:23 2025/11/4
-     * @return com.openhis.administration.dto.ChargeItemDefDetailPriceDto
+     * @return com.healthlink.his.administration.dto.ChargeItemDefDetailPriceDto
      **/
     ChargeItemDefDetailPriceDto getDevicePriceByParam(String conditionCode, Long instanceId);
 
@@ -122,7 +122,7 @@ public interface IChargeItemDefinitionService extends IService<ChargeItemDefinit
      * @param instanceId
      * @Author raymond
      * @Date 22:02 2025/11/1
-     * @return com.openhis.administration.dto.ChargeItemDefDetailPriceDto
+     * @return com.healthlink.his.administration.dto.ChargeItemDefDetailPriceDto
      **/
     ChargeItemDefDetailPriceDto getProductPrice(Integer statusEnum, Long instanceId);
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IChargeItemService.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IChargeItemService.java
index 17731db26..a450e2d44 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IChargeItemService.java
@@ -1,12 +1,12 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.ChargeItem;
-import com.openhis.administration.dto.ChargeItemBaseInfoDto;
-import com.openhis.administration.dto.ChargeItemDefInfo;
-import com.openhis.administration.dto.CostDetailDto;
-import com.openhis.administration.dto.CostDetailSearchParam;
+import com.healthlink.his.administration.domain.ChargeItem;
+import com.healthlink.his.administration.dto.ChargeItemBaseInfoDto;
+import com.healthlink.his.administration.dto.ChargeItemDefInfo;
+import com.healthlink.his.administration.dto.CostDetailDto;
+import com.healthlink.his.administration.dto.CostDetailSearchParam;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IDeviceDefinitionService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IDeviceDefinitionService.java
similarity index 76%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IDeviceDefinitionService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IDeviceDefinitionService.java
index 3dbd9b48e..a701caa48 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IDeviceDefinitionService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IDeviceDefinitionService.java
@@ -1,8 +1,8 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.DeviceDefinition;
-import com.openhis.medication.dto.AdjustPriceMedListDto;
+import com.healthlink.his.administration.domain.DeviceDefinition;
+import com.healthlink.his.medication.dto.AdjustPriceMedListDto;
 
 import java.util.List;
 
@@ -35,7 +35,7 @@ public interface IDeviceDefinitionService extends IService<DeviceDefinition> {
      * @param keyWord
      * @Author raymond
      * @Date 20:23 2025/10/21
-     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     * @return java.util.List<com.healthlink.his.medication.dto.AdjustPriceMedListDto>
      **/
     List<AdjustPriceMedListDto> searchDeviceListByKeyWord(String keyWord);
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IDeviceService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IDeviceService.java
similarity index 66%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IDeviceService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IDeviceService.java
index d13c1bb49..66ecdc7be 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IDeviceService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IDeviceService.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.Device;
+import com.healthlink.his.administration.domain.Device;
 
 /**
  * 器材基本信息管理Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterDiagnosisService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IEncounterDiagnosisService.java
similarity index 91%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterDiagnosisService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IEncounterDiagnosisService.java
index 9847de008..efe6b1b98 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterDiagnosisService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IEncounterDiagnosisService.java
@@ -1,8 +1,8 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.EncounterDiagnosis;
-import com.openhis.common.enums.ybenums.YbIptDiseTypeCode;
+import com.healthlink.his.administration.domain.EncounterDiagnosis;
+import com.healthlink.his.common.enums.ybenums.YbIptDiseTypeCode;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterLocationService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IEncounterLocationService.java
similarity index 89%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterLocationService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IEncounterLocationService.java
index 6338f5c63..c6e4f3d7d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterLocationService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IEncounterLocationService.java
@@ -1,9 +1,9 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.EncounterLocation;
-import com.openhis.common.enums.EncounterActivityStatus;
-import com.openhis.common.enums.LocationForm;
+import com.healthlink.his.administration.domain.EncounterLocation;
+import com.healthlink.his.common.enums.EncounterActivityStatus;
+import com.healthlink.his.common.enums.LocationForm;
 
 import java.util.Date;
 import java.util.List;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterParticipantService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IEncounterParticipantService.java
similarity index 88%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterParticipantService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IEncounterParticipantService.java
index 927a971b1..edabcba64 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterParticipantService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IEncounterParticipantService.java
@@ -1,8 +1,8 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.EncounterParticipant;
-import com.openhis.common.enums.ParticipantType;
+import com.healthlink.his.administration.domain.EncounterParticipant;
+import com.healthlink.his.common.enums.ParticipantType;
 
 import java.util.Date;
 import java.util.List;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterReasonService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IEncounterReasonService.java
similarity index 65%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterReasonService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IEncounterReasonService.java
index 17d372273..3d0470bc4 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterReasonService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IEncounterReasonService.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.EncounterReason;
+import com.healthlink.his.administration.domain.EncounterReason;
 
 /**
  * 就诊原因管理Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IEncounterService.java
similarity index 85%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IEncounterService.java
index 00e8b3126..a2790a5be 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IEncounterService.java
@@ -1,9 +1,9 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.Encounter;
-import com.openhis.administration.dto.EncounterAccountDto;
-import com.openhis.administration.dto.EncounterDataDto;
+import com.healthlink.his.administration.domain.Encounter;
+import com.healthlink.his.administration.dto.EncounterAccountDto;
+import com.healthlink.his.administration.dto.EncounterDataDto;
 
 import java.util.Date;
 import java.util.List;
@@ -77,7 +77,7 @@ public interface IEncounterService extends IService<Encounter> {
      * @param encounterId
      * @Author raymond
      * @Date 12:34 2025/11/3
-     * @return com.openhis.administration.dto.EncounterDataDto
+     * @return com.healthlink.his.administration.dto.EncounterDataDto
      **/
     EncounterDataDto getPatientIdByParam(Integer classEnum,Long encounterId);
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IFrequencyService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IFrequencyService.java
similarity index 82%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IFrequencyService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IFrequencyService.java
index 52b67df9a..f28e48a02 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IFrequencyService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IFrequencyService.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.Frequency;
+import com.healthlink.his.administration.domain.Frequency;
 
 import jakarta.servlet.http.HttpServletRequest;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IHealthcareServiceService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IHealthcareServiceService.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IHealthcareServiceService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IHealthcareServiceService.java
index dc1fcb17c..a69713cef 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IHealthcareServiceService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IHealthcareServiceService.java
@@ -1,9 +1,9 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.HealthcareService;
-import com.openhis.administration.dto.HealthcareDto;
-import com.openhis.medication.dto.AdjustPriceMedListDto;
+import com.healthlink.his.administration.domain.HealthcareService;
+import com.healthlink.his.administration.dto.HealthcareDto;
+import com.healthlink.his.medication.dto.AdjustPriceMedListDto;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -34,7 +34,7 @@ public interface IHealthcareServiceService extends IService<HealthcareService> {
      * @param itemIds
      * @Author raymond
      * @Date 15:36 2025/10/18
-     * @return java.util.List<com.openhis.administration.dto.HealthcareDto>
+     * @return java.util.List<com.healthlink.his.administration.dto.HealthcareDto>
      **/
     List<HealthcareDto> searchHealthByIds(@Param("itemIds") List<Long> itemIds);
 
@@ -43,7 +43,7 @@ public interface IHealthcareServiceService extends IService<HealthcareService> {
      * @param
      * @Author raymond
      * @Date 08:32 2025/10/22
-     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     * @return java.util.List<com.healthlink.his.medication.dto.AdjustPriceMedListDto>
      **/
     List<AdjustPriceMedListDto> searchAllHeathData(Long orgId,Integer statusEnum);
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IInfectiousDiseaseReportService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IInfectiousDiseaseReportService.java
similarity index 56%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IInfectiousDiseaseReportService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IInfectiousDiseaseReportService.java
index c2f288056..0e4ffd534 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IInfectiousDiseaseReportService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IInfectiousDiseaseReportService.java
@@ -1,8 +1,8 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import com.openhis.administration.domain.InfectiousDiseaseReport;
+import com.healthlink.his.administration.domain.InfectiousDiseaseReport;
 
 public interface IInfectiousDiseaseReportService extends IService<InfectiousDiseaseReport> {
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IInstrumentService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IInstrumentService.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IInstrumentService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IInstrumentService.java
index 92252309b..b16d6ff69 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IInstrumentService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IInstrumentService.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.Instrument;
+import com.healthlink.his.administration.domain.Instrument;
 
 /**
  * 存储各类仪器的信息，包括设备基本信息、状态、维护记录等Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IInvoiceSegmentService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IInvoiceSegmentService.java
similarity index 89%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IInvoiceSegmentService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IInvoiceSegmentService.java
index dc4c0910a..2fad4e5b0 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IInvoiceSegmentService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IInvoiceSegmentService.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.openhis.administration.domain.InvoiceSegment;
+import com.healthlink.his.administration.domain.InvoiceSegment;
 
 /**
  * 发票段管理Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IInvoiceService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IInvoiceService.java
similarity index 89%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IInvoiceService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IInvoiceService.java
index dd01237a4..c3fa86c96 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IInvoiceService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IInvoiceService.java
@@ -1,9 +1,9 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.Invoice;
+import com.healthlink.his.administration.domain.Invoice;
 
 /**
  * 发票管理Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ILocationService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/ILocationService.java
similarity index 91%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ILocationService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/ILocationService.java
index 2e489764d..ac2567d9a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ILocationService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/ILocationService.java
@@ -1,8 +1,8 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.Location;
-import com.openhis.administration.dto.LocationDataDto;
+import com.healthlink.his.administration.domain.Location;
+import com.healthlink.his.administration.dto.LocationDataDto;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -107,7 +107,7 @@ public interface ILocationService extends IService<Location> {
      * @param locationIds
      * @Author raymond
      * @Date 07:46 2025/10/28
-     * @return java.util.List<com.openhis.administration.dto.LocationDataDto>
+     * @return java.util.List<com.healthlink.his.administration.dto.LocationDataDto>
      *
      */
     List<LocationDataDto> searchLocationDataByIds(@Param("locationIds") List<Long> locationIds);
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IObservationDefinitionService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IObservationDefinitionService.java
similarity index 65%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IObservationDefinitionService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IObservationDefinitionService.java
index 03bb912c2..76acd79b3 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IObservationDefinitionService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IObservationDefinitionService.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.ObservationDefinition;
+import com.healthlink.his.administration.domain.ObservationDefinition;
 
 /**
  * 观测定义Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOperatingRoomService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IOperatingRoomService.java
similarity index 64%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOperatingRoomService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IOperatingRoomService.java
index fe33b6da4..84b7d467d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOperatingRoomService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IOperatingRoomService.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.OperatingRoom;
+import com.healthlink.his.administration.domain.OperatingRoom;
 
 /**
  * 手术室Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrgContrastService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IOrgContrastService.java
similarity index 78%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrgContrastService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IOrgContrastService.java
index 560bed709..1afaf2a90 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrgContrastService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IOrgContrastService.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.OrgContrast;
+import com.healthlink.his.administration.domain.OrgContrast;
 
 /**
  * 【对照表】Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationLocationService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IOrganizationLocationService.java
similarity index 91%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationLocationService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IOrganizationLocationService.java
index 9c82a9fdd..cbddc965e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationLocationService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IOrganizationLocationService.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.OrganizationLocation;
+import com.healthlink.his.administration.domain.OrganizationLocation;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IOrganizationService.java
similarity index 87%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IOrganizationService.java
index c6ab79b21..ce1953933 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IOrganizationService.java
@@ -1,8 +1,8 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.Organization;
-import com.openhis.administration.dto.OrgDataDto;
+import com.healthlink.his.administration.domain.Organization;
+import com.healthlink.his.administration.dto.OrgDataDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOutpatientNoSegmentService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IOutpatientNoSegmentService.java
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOutpatientNoSegmentService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IOutpatientNoSegmentService.java
index 98781f441..c5ce28e67 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOutpatientNoSegmentService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IOutpatientNoSegmentService.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.openhis.administration.domain.OutpatientNoSegment;
+import com.healthlink.his.administration.domain.OutpatientNoSegment;
 
 /**
  * 门诊号码段管理Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPatientIdentifierService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IPatientIdentifierService.java
similarity index 83%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPatientIdentifierService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IPatientIdentifierService.java
index 854733423..716505095 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPatientIdentifierService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IPatientIdentifierService.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.PatientIdentifier;
+import com.healthlink.his.administration.domain.PatientIdentifier;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPatientService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IPatientService.java
similarity index 81%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPatientService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IPatientService.java
index fed84b4ba..5f8b2c438 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPatientService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IPatientService.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.Patient;
+import com.healthlink.his.administration.domain.Patient;
 
 /**
  * 患者管理Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPatientStudentService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IPatientStudentService.java
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPatientStudentService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IPatientStudentService.java
index e34a72360..7f853faa4 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPatientStudentService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IPatientStudentService.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.PatientStudent;
+import com.healthlink.his.administration.domain.PatientStudent;
 
 /**
  * 公费医疗学生名单管理表Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerPatientService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IPractitionerPatientService.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerPatientService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IPractitionerPatientService.java
index e703d78d3..f47a3b2ab 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerPatientService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IPractitionerPatientService.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.PractitionerPatient;
+import com.healthlink.his.administration.domain.PractitionerPatient;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerRoleService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IPractitionerRoleService.java
similarity index 86%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerRoleService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IPractitionerRoleService.java
index 971378ffc..1d7541f2c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerRoleService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IPractitionerRoleService.java
@@ -1,8 +1,8 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.PractitionerRole;
-import com.openhis.administration.dto.RoleDataDto;
+import com.healthlink.his.administration.domain.PractitionerRole;
+import com.healthlink.his.administration.dto.RoleDataDto;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -61,7 +61,7 @@ public interface IPractitionerRoleService extends IService<PractitionerRole> {
      * @param roleCode
      * @Author raymond
      * @Date 16:43 2025/10/27
-     * @return java.util.List<com.openhis.administration.dto.RoleDataDto>
+     * @return java.util.List<com.healthlink.his.administration.dto.RoleDataDto>
      **/
     List<RoleDataDto> searchPractitionerRoleByPractitionerId(@Param("practitionerId") Long practitionerId, @Param("roleCode") String roleCode);
     /**
@@ -69,7 +69,7 @@ public interface IPractitionerRoleService extends IService<PractitionerRole> {
      * @param practitionerIds
      * @Author raymond
      * @Date 16:49 2025/10/27
-     * @return java.util.List<com.openhis.administration.dto.RoleDataDto>
+     * @return java.util.List<com.healthlink.his.administration.dto.RoleDataDto>
      **/
     List<RoleDataDto> searchPractitionerRoleByPractitionerIds(@Param("practitionerIds") Long practitionerIds);
     /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IPractitionerService.java
similarity index 87%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IPractitionerService.java
index 2432c33a6..325b2bb50 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IPractitionerService.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.Practitioner;
+import com.healthlink.his.administration.domain.Practitioner;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPrescriptionReviewRecordService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IPrescriptionReviewRecordService.java
similarity index 81%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPrescriptionReviewRecordService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IPrescriptionReviewRecordService.java
index 05f225414..1fb03b011 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPrescriptionReviewRecordService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/IPrescriptionReviewRecordService.java
@@ -1,10 +1,10 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.PrescriptionReviewRecord;
-import com.openhis.administration.dto.PrescriptionReviewRecordDto;
+import com.healthlink.his.administration.domain.PrescriptionReviewRecord;
+import com.healthlink.his.administration.dto.PrescriptionReviewRecordDto;
 
 /**
  * 处方审方记录 服务类
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ISpecimenDefinitionService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/ISpecimenDefinitionService.java
similarity index 65%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ISpecimenDefinitionService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/ISpecimenDefinitionService.java
index 3ac49a5ca..4b12a3776 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ISpecimenDefinitionService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/ISpecimenDefinitionService.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.SpecimenDefinition;
+import com.healthlink.his.administration.domain.SpecimenDefinition;
 
 /**
  * 样本定义Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ISupplierService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/ISupplierService.java
similarity index 87%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ISupplierService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/ISupplierService.java
index e868ef6d7..7cb62ede9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ISupplierService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/ISupplierService.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.Supplier;
+import com.healthlink.his.administration.domain.Supplier;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ITraceNoManageService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/ITraceNoManageService.java
similarity index 80%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ITraceNoManageService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/ITraceNoManageService.java
index 05553a280..f4498aded 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ITraceNoManageService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/ITraceNoManageService.java
@@ -1,7 +1,7 @@
-package com.openhis.administration.service;
+package com.healthlink.his.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.TraceNoManage;
+import com.healthlink.his.administration.domain.TraceNoManage;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/AccountServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/AccountServiceImpl.java
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/AccountServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/AccountServiceImpl.java
index f26aa3814..12daf0296 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/AccountServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/AccountServiceImpl.java
@@ -1,16 +1,16 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.Account;
-import com.openhis.administration.mapper.AccountMapper;
-import com.openhis.administration.service.IAccountService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.common.enums.AccountStatus;
-import com.openhis.common.enums.AccountType;
-import com.openhis.common.enums.Whether;
+import com.healthlink.his.administration.domain.Account;
+import com.healthlink.his.administration.mapper.AccountMapper;
+import com.healthlink.his.administration.service.IAccountService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.YbCommonConstants;
+import com.healthlink.his.common.enums.AccountStatus;
+import com.healthlink.his.common.enums.AccountType;
+import com.healthlink.his.common.enums.Whether;
 import org.springframework.stereotype.Service;
 
 import jakarta.validation.constraints.NotNull;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserRoleServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/BizUserRoleServiceImpl.java
similarity index 56%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserRoleServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/BizUserRoleServiceImpl.java
index 142e46d25..cd32160f1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserRoleServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/BizUserRoleServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.administration.domain.BizUserRole;
-import com.openhis.administration.mapper.BizUserRoleMapper;
-import com.openhis.administration.service.IBizUserRoleService;
+import com.healthlink.his.administration.domain.BizUserRole;
+import com.healthlink.his.administration.mapper.BizUserRoleMapper;
+import com.healthlink.his.administration.service.IBizUserRoleService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/BizUserServiceImpl.java
similarity index 55%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/BizUserServiceImpl.java
index cef49d45c..134ad7eea 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/BizUserServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.core.common.service.BaseService;
-import com.openhis.administration.domain.BizUser;
-import com.openhis.administration.mapper.BizUserMapper;
-import com.openhis.administration.service.IBizUserService;
+import com.healthlink.his.administration.domain.BizUser;
+import com.healthlink.his.administration.mapper.BizUserMapper;
+import com.healthlink.his.administration.service.IBizUserService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BodyStructureServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/BodyStructureServiceImpl.java
similarity index 84%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BodyStructureServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/BodyStructureServiceImpl.java
index b56adb7e5..30a18dc99 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BodyStructureServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/BodyStructureServiceImpl.java
@@ -1,12 +1,12 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.administration.domain.BodyStructure;
-import com.openhis.administration.mapper.BodyStructureMapper;
-import com.openhis.administration.service.IBodyStructureService;
-import com.openhis.common.enums.PublicationStatus;
+import com.healthlink.his.administration.domain.BodyStructure;
+import com.healthlink.his.administration.mapper.BodyStructureMapper;
+import com.healthlink.his.administration.service.IBodyStructureService;
+import com.healthlink.his.common.enums.PublicationStatus;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChangePriceRecordServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/ChangePriceRecordServiceImpl.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChangePriceRecordServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/ChangePriceRecordServiceImpl.java
index 68aca5ce8..33b440bb2 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChangePriceRecordServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/ChangePriceRecordServiceImpl.java
@@ -1,15 +1,15 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.SecurityUtils;
 import com.core.system.mapper.SysDictDataMapper;
-import com.openhis.administration.domain.ChangePriceRecord;
-import com.openhis.administration.dto.ChangePriceDataDto;
-import com.openhis.administration.mapper.ChangePriceRecordMapper;
-import com.openhis.administration.service.IChangePriceRecordService;
-import com.openhis.common.enums.SupplyStatus;
+import com.healthlink.his.administration.domain.ChangePriceRecord;
+import com.healthlink.his.administration.dto.ChangePriceDataDto;
+import com.healthlink.his.administration.mapper.ChangePriceRecordMapper;
+import com.healthlink.his.administration.service.IChangePriceRecordService;
+import com.healthlink.his.common.enums.SupplyStatus;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefDetailServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/ChargeItemDefDetailServiceImpl.java
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefDetailServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/ChargeItemDefDetailServiceImpl.java
index 2955bfd79..d228d599e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefDetailServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/ChargeItemDefDetailServiceImpl.java
@@ -1,14 +1,14 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.core.domain.model.LoginUser;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.enums.DelFlag;
-import com.openhis.administration.domain.ChargeItemDefDetail;
-import com.openhis.administration.mapper.ChargeItemDefDetailAppMapper;
-import com.openhis.administration.service.IChargeItemDefDetailService;
-import com.openhis.common.enums.ConditionCode;
+import com.healthlink.his.administration.domain.ChargeItemDefDetail;
+import com.healthlink.his.administration.mapper.ChargeItemDefDetailAppMapper;
+import com.healthlink.his.administration.service.IChargeItemDefDetailService;
+import com.healthlink.his.common.enums.ConditionCode;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefinitionServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/ChargeItemDefinitionServiceImpl.java
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefinitionServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/ChargeItemDefinitionServiceImpl.java
index 5334736e0..9b62fb510 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefinitionServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/ChargeItemDefinitionServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,17 +7,17 @@ import com.core.common.core.domain.model.LoginUser;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.enums.DelFlag;
 import com.core.common.utils.DateUtils;
-import com.openhis.administration.domain.ChargeItemDefDetail;
-import com.openhis.administration.domain.ChargeItemDefinition;
-import com.openhis.administration.domain.HealthcareService;
-import com.openhis.administration.dto.ChargeItemDefDetailPriceDto;
-import com.openhis.administration.mapper.ChargeItemDefinitionMapper;
-import com.openhis.administration.service.IChargeItemDefDetailService;
-import com.openhis.administration.service.IChargeItemDefinitionService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.ConditionCode;
-import com.openhis.common.enums.PublicationStatus;
-import com.openhis.common.enums.Whether;
+import com.healthlink.his.administration.domain.ChargeItemDefDetail;
+import com.healthlink.his.administration.domain.ChargeItemDefinition;
+import com.healthlink.his.administration.domain.HealthcareService;
+import com.healthlink.his.administration.dto.ChargeItemDefDetailPriceDto;
+import com.healthlink.his.administration.mapper.ChargeItemDefinitionMapper;
+import com.healthlink.his.administration.service.IChargeItemDefDetailService;
+import com.healthlink.his.administration.service.IChargeItemDefinitionService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.enums.ConditionCode;
+import com.healthlink.his.common.enums.PublicationStatus;
+import com.healthlink.his.common.enums.Whether;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/ChargeItemServiceImpl.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/ChargeItemServiceImpl.java
index dcb8e795b..06717611c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/ChargeItemServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -10,17 +10,17 @@ import com.core.common.exception.ServiceException;
 import com.core.common.utils.AgeCalculatorUtil;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
-import com.openhis.administration.domain.ChargeItem;
-import com.openhis.administration.domain.ChargeItemDefinition;
-import com.openhis.administration.dto.ChargeItemBaseInfoDto;
-import com.openhis.administration.dto.ChargeItemDefInfo;
-import com.openhis.administration.dto.CostDetailDto;
-import com.openhis.administration.dto.CostDetailSearchParam;
-import com.openhis.administration.mapper.ChargeItemDefinitionMapper;
-import com.openhis.administration.mapper.ChargeItemMapper;
-import com.openhis.administration.service.IChargeItemService;
-import com.openhis.common.enums.*;
-import com.openhis.common.utils.EnumUtils;
+import com.healthlink.his.administration.domain.ChargeItem;
+import com.healthlink.his.administration.domain.ChargeItemDefinition;
+import com.healthlink.his.administration.dto.ChargeItemBaseInfoDto;
+import com.healthlink.his.administration.dto.ChargeItemDefInfo;
+import com.healthlink.his.administration.dto.CostDetailDto;
+import com.healthlink.his.administration.dto.CostDetailSearchParam;
+import com.healthlink.his.administration.mapper.ChargeItemDefinitionMapper;
+import com.healthlink.his.administration.mapper.ChargeItemMapper;
+import com.healthlink.his.administration.service.IChargeItemService;
+import com.healthlink.his.common.enums.*;
+import com.healthlink.his.common.utils.EnumUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeviceDefinitionServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/DeviceDefinitionServiceImpl.java
similarity index 82%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeviceDefinitionServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/DeviceDefinitionServiceImpl.java
index 3185fdd5f..d39b1dbc8 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeviceDefinitionServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/DeviceDefinitionServiceImpl.java
@@ -1,11 +1,11 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.administration.domain.DeviceDefinition;
-import com.openhis.administration.mapper.DeviceDefinitionMapper;
-import com.openhis.administration.service.IDeviceDefinitionService;
-import com.openhis.medication.dto.AdjustPriceMedListDto;
+import com.healthlink.his.administration.domain.DeviceDefinition;
+import com.healthlink.his.administration.mapper.DeviceDefinitionMapper;
+import com.healthlink.his.administration.service.IDeviceDefinitionService;
+import com.healthlink.his.medication.dto.AdjustPriceMedListDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeviceServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/DeviceServiceImpl.java
similarity index 57%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeviceServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/DeviceServiceImpl.java
index 0813a20da..8c57106a1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeviceServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/DeviceServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.administration.domain.Device;
-import com.openhis.administration.mapper.DeviceMapper;
-import com.openhis.administration.service.IDeviceService;
+import com.healthlink.his.administration.domain.Device;
+import com.healthlink.his.administration.mapper.DeviceMapper;
+import com.healthlink.his.administration.service.IDeviceService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterDiagnosisServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/EncounterDiagnosisServiceImpl.java
similarity index 90%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterDiagnosisServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/EncounterDiagnosisServiceImpl.java
index 569985fcf..dd2f47569 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterDiagnosisServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/EncounterDiagnosisServiceImpl.java
@@ -1,13 +1,13 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.administration.domain.EncounterDiagnosis;
-import com.openhis.administration.mapper.EncounterDiagnosisMapper;
-import com.openhis.administration.service.IEncounterDiagnosisService;
-import com.openhis.clinical.mapper.ConditionMapper;
-import com.openhis.common.enums.Whether;
-import com.openhis.common.enums.ybenums.YbIptDiseTypeCode;
+import com.healthlink.his.administration.domain.EncounterDiagnosis;
+import com.healthlink.his.administration.mapper.EncounterDiagnosisMapper;
+import com.healthlink.his.administration.service.IEncounterDiagnosisService;
+import com.healthlink.his.clinical.mapper.ConditionMapper;
+import com.healthlink.his.common.enums.Whether;
+import com.healthlink.his.common.enums.ybenums.YbIptDiseTypeCode;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterLocationServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/EncounterLocationServiceImpl.java
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterLocationServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/EncounterLocationServiceImpl.java
index 7c0e84fc8..cf8655656 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterLocationServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/EncounterLocationServiceImpl.java
@@ -1,14 +1,14 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.enums.DelFlag;
-import com.openhis.administration.domain.EncounterLocation;
-import com.openhis.administration.mapper.EncounterLocationMapper;
-import com.openhis.administration.service.IEncounterLocationService;
-import com.openhis.common.enums.EncounterActivityStatus;
-import com.openhis.common.enums.LocationForm;
+import com.healthlink.his.administration.domain.EncounterLocation;
+import com.healthlink.his.administration.mapper.EncounterLocationMapper;
+import com.healthlink.his.administration.service.IEncounterLocationService;
+import com.healthlink.his.common.enums.EncounterActivityStatus;
+import com.healthlink.his.common.enums.LocationForm;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterParticipantServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/EncounterParticipantServiceImpl.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterParticipantServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/EncounterParticipantServiceImpl.java
index c510b476c..db8be7442 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterParticipantServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/EncounterParticipantServiceImpl.java
@@ -1,15 +1,15 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.enums.DelFlag;
-import com.openhis.administration.domain.EncounterParticipant;
-import com.openhis.administration.mapper.EncounterParticipantMapper;
-import com.openhis.administration.service.IEncounterParticipantService;
-import com.openhis.common.enums.EncounterActivityStatus;
-import com.openhis.common.enums.ParticipantType;
+import com.healthlink.his.administration.domain.EncounterParticipant;
+import com.healthlink.his.administration.mapper.EncounterParticipantMapper;
+import com.healthlink.his.administration.service.IEncounterParticipantService;
+import com.healthlink.his.common.enums.EncounterActivityStatus;
+import com.healthlink.his.common.enums.ParticipantType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterReasonServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/EncounterReasonServiceImpl.java
similarity index 57%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterReasonServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/EncounterReasonServiceImpl.java
index 57e46b27a..81a2ee755 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterReasonServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/EncounterReasonServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.administration.domain.EncounterReason;
-import com.openhis.administration.mapper.EncounterReasonMapper;
-import com.openhis.administration.service.IEncounterReasonService;
+import com.healthlink.his.administration.domain.EncounterReason;
+import com.healthlink.his.administration.mapper.EncounterReasonMapper;
+import com.healthlink.his.administration.service.IEncounterReasonService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/EncounterServiceImpl.java
similarity index 90%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/EncounterServiceImpl.java
index eeac2b4e7..6f66ffeb1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/EncounterServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -6,15 +6,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
-import com.openhis.administration.domain.Encounter;
-import com.openhis.administration.dto.EncounterAccountDto;
-import com.openhis.administration.dto.EncounterDataDto;
-import com.openhis.administration.mapper.EncounterMapper;
-import com.openhis.administration.service.IEncounterService;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.common.enums.AssignSeqEnum;
-import com.openhis.common.enums.EncounterStatus;
-import com.openhis.common.enums.EncounterType;
+import com.healthlink.his.administration.domain.Encounter;
+import com.healthlink.his.administration.dto.EncounterAccountDto;
+import com.healthlink.his.administration.dto.EncounterDataDto;
+import com.healthlink.his.administration.mapper.EncounterMapper;
+import com.healthlink.his.administration.service.IEncounterService;
+import com.healthlink.his.common.constant.YbCommonConstants;
+import com.healthlink.his.common.enums.AssignSeqEnum;
+import com.healthlink.his.common.enums.EncounterStatus;
+import com.healthlink.his.common.enums.EncounterType;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/FrequencyServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/FrequencyServiceImpl.java
similarity index 77%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/FrequencyServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/FrequencyServiceImpl.java
index 41780dd75..971849d46 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/FrequencyServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/FrequencyServiceImpl.java
@@ -1,12 +1,12 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.administration.domain.Frequency;
-import com.openhis.administration.mapper.FrequencyMapper;
-import com.openhis.administration.service.IFrequencyService;
-import com.openhis.common.utils.HisPageUtils;
+import com.healthlink.his.administration.domain.Frequency;
+import com.healthlink.his.administration.mapper.FrequencyMapper;
+import com.healthlink.his.administration.service.IFrequencyService;
+import com.healthlink.his.common.utils.HisPageUtils;
 import org.springframework.stereotype.Service;
 
 import jakarta.servlet.http.HttpServletRequest;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/HealthcareServiceServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/HealthcareServiceServiceImpl.java
similarity index 81%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/HealthcareServiceServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/HealthcareServiceServiceImpl.java
index e427e2d41..ca3458edd 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/HealthcareServiceServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/HealthcareServiceServiceImpl.java
@@ -1,11 +1,11 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.administration.domain.HealthcareService;
-import com.openhis.administration.dto.HealthcareDto;
-import com.openhis.administration.mapper.HealthcareServiceMapper;
-import com.openhis.administration.service.IHealthcareServiceService;
-import com.openhis.medication.dto.AdjustPriceMedListDto;
+import com.healthlink.his.administration.domain.HealthcareService;
+import com.healthlink.his.administration.dto.HealthcareDto;
+import com.healthlink.his.administration.mapper.HealthcareServiceMapper;
+import com.healthlink.his.administration.service.IHealthcareServiceService;
+import com.healthlink.his.medication.dto.AdjustPriceMedListDto;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InfectiousDiseaseReportServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/InfectiousDiseaseReportServiceImpl.java
similarity index 52%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InfectiousDiseaseReportServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/InfectiousDiseaseReportServiceImpl.java
index cc06b8453..223b9fdfa 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InfectiousDiseaseReportServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/InfectiousDiseaseReportServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.administration.domain.InfectiousDiseaseReport;
-import com.openhis.administration.mapper.InfectiousDiseaseReportMapper;
-import com.openhis.administration.service.IInfectiousDiseaseReportService;
+import com.healthlink.his.administration.domain.InfectiousDiseaseReport;
+import com.healthlink.his.administration.mapper.InfectiousDiseaseReportMapper;
+import com.healthlink.his.administration.service.IInfectiousDiseaseReportService;
 
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InstrumentServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/InstrumentServiceImpl.java
similarity index 61%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InstrumentServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/InstrumentServiceImpl.java
index 893407c6a..068c8de8e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InstrumentServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/InstrumentServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.administration.domain.Instrument;
-import com.openhis.administration.mapper.InstrumentMapper;
-import com.openhis.administration.service.IInstrumentService;
+import com.healthlink.his.administration.domain.Instrument;
+import com.healthlink.his.administration.mapper.InstrumentMapper;
+import com.healthlink.his.administration.service.IInstrumentService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceSegmentServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/InvoiceSegmentServiceImpl.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceSegmentServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/InvoiceSegmentServiceImpl.java
index 7467544ea..9a10f7a7e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceSegmentServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/InvoiceSegmentServiceImpl.java
@@ -1,13 +1,13 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.openhis.administration.domain.InvoiceSegment;
-import com.openhis.administration.mapper.InvoiceSegmentMapper;
-import com.openhis.administration.service.IInvoiceSegmentService;
+import com.healthlink.his.administration.domain.InvoiceSegment;
+import com.healthlink.his.administration.mapper.InvoiceSegmentMapper;
+import com.healthlink.his.administration.service.IInvoiceSegmentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/InvoiceServiceImpl.java
similarity index 88%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/InvoiceServiceImpl.java
index d3e654870..9d70e6c80 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/InvoiceServiceImpl.java
@@ -1,12 +1,12 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.enums.DelFlag;
-import com.openhis.administration.domain.Invoice;
-import com.openhis.administration.mapper.InvoiceMapper;
-import com.openhis.administration.service.IInvoiceService;
+import com.healthlink.his.administration.domain.Invoice;
+import com.healthlink.his.administration.mapper.InvoiceMapper;
+import com.healthlink.his.administration.service.IInvoiceService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/LocationServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/LocationServiceImpl.java
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/LocationServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/LocationServiceImpl.java
index fc3aff5d5..0f1a021ad 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/LocationServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/LocationServiceImpl.java
@@ -1,15 +1,15 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.enums.DelFlag;
-import com.openhis.administration.domain.Location;
-import com.openhis.administration.dto.LocationDataDto;
-import com.openhis.administration.mapper.LocationMapper;
-import com.openhis.administration.service.ILocationService;
-import com.openhis.common.enums.LocationForm;
-import com.openhis.common.enums.LocationStatus;
+import com.healthlink.his.administration.domain.Location;
+import com.healthlink.his.administration.dto.LocationDataDto;
+import com.healthlink.his.administration.mapper.LocationMapper;
+import com.healthlink.his.administration.service.ILocationService;
+import com.healthlink.his.common.enums.LocationForm;
+import com.healthlink.his.common.enums.LocationStatus;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ObservationDefinitionServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/ObservationDefinitionServiceImpl.java
similarity index 56%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ObservationDefinitionServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/ObservationDefinitionServiceImpl.java
index 6761d196a..d16fa5c8b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ObservationDefinitionServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/ObservationDefinitionServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.administration.domain.ObservationDefinition;
-import com.openhis.administration.mapper.ObservationDefinitionMapper;
-import com.openhis.administration.service.IObservationDefinitionService;
+import com.healthlink.his.administration.domain.ObservationDefinition;
+import com.healthlink.his.administration.mapper.ObservationDefinitionMapper;
+import com.healthlink.his.administration.service.IObservationDefinitionService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OperatingRoomServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/OperatingRoomServiceImpl.java
similarity index 56%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OperatingRoomServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/OperatingRoomServiceImpl.java
index b0f8d425e..2774f3302 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OperatingRoomServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/OperatingRoomServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.administration.domain.OperatingRoom;
-import com.openhis.administration.mapper.OperatingRoomMapper;
-import com.openhis.administration.service.IOperatingRoomService;
+import com.healthlink.his.administration.domain.OperatingRoom;
+import com.healthlink.his.administration.mapper.OperatingRoomMapper;
+import com.healthlink.his.administration.service.IOperatingRoomService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrgContrastServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/OrgContrastServiceImpl.java
similarity index 75%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrgContrastServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/OrgContrastServiceImpl.java
index 4f4f11f2e..7dd908c28 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrgContrastServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/OrgContrastServiceImpl.java
@@ -1,10 +1,10 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.administration.domain.OrgContrast;
-import com.openhis.administration.mapper.OrgContrastMapper;
-import com.openhis.administration.service.IOrgContrastService;
+import com.healthlink.his.administration.domain.OrgContrast;
+import com.healthlink.his.administration.mapper.OrgContrastMapper;
+import com.healthlink.his.administration.service.IOrgContrastService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationLocationServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/OrganizationLocationServiceImpl.java
similarity index 91%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationLocationServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/OrganizationLocationServiceImpl.java
index 225c518a0..a97c1f2e5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationLocationServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/OrganizationLocationServiceImpl.java
@@ -1,10 +1,10 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.administration.domain.OrganizationLocation;
-import com.openhis.administration.mapper.OrganizationLocationMapper;
-import com.openhis.administration.service.IOrganizationLocationService;
+import com.healthlink.his.administration.domain.OrganizationLocation;
+import com.healthlink.his.administration.mapper.OrganizationLocationMapper;
+import com.healthlink.his.administration.service.IOrganizationLocationService;
 import org.springframework.stereotype.Service;
 
 import java.sql.Time;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/OrganizationServiceImpl.java
similarity index 90%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/OrganizationServiceImpl.java
index 78ffd154e..00f344b64 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/OrganizationServiceImpl.java
@@ -1,14 +1,14 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.enums.DelFlag;
-import com.openhis.administration.domain.Organization;
-import com.openhis.administration.dto.OrgDataDto;
-import com.openhis.administration.mapper.OrganizationMapper;
-import com.openhis.administration.service.IOrganizationService;
-import com.openhis.common.enums.AccountStatus;
+import com.healthlink.his.administration.domain.Organization;
+import com.healthlink.his.administration.dto.OrgDataDto;
+import com.healthlink.his.administration.mapper.OrganizationMapper;
+import com.healthlink.his.administration.service.IOrganizationService;
+import com.healthlink.his.common.enums.AccountStatus;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OutpatientNoSegmentServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/OutpatientNoSegmentServiceImpl.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OutpatientNoSegmentServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/OutpatientNoSegmentServiceImpl.java
index 56980bd4d..79fec8fe5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OutpatientNoSegmentServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/OutpatientNoSegmentServiceImpl.java
@@ -1,13 +1,13 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.openhis.administration.domain.OutpatientNoSegment;
-import com.openhis.administration.mapper.OutpatientNoSegmentMapper;
-import com.openhis.administration.service.IOutpatientNoSegmentService;
+import com.healthlink.his.administration.domain.OutpatientNoSegment;
+import com.healthlink.his.administration.mapper.OutpatientNoSegmentMapper;
+import com.healthlink.his.administration.service.IOutpatientNoSegmentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientIdentifierServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/PatientIdentifierServiceImpl.java
similarity index 86%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientIdentifierServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/PatientIdentifierServiceImpl.java
index 57e7ee343..366097d71 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientIdentifierServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/PatientIdentifierServiceImpl.java
@@ -1,11 +1,11 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.administration.domain.PatientIdentifier;
-import com.openhis.administration.mapper.PatientIdentifierMapper;
-import com.openhis.administration.service.IPatientIdentifierService;
+import com.healthlink.his.administration.domain.PatientIdentifier;
+import com.healthlink.his.administration.mapper.PatientIdentifierMapper;
+import com.healthlink.his.administration.service.IPatientIdentifierService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/PatientServiceImpl.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/PatientServiceImpl.java
index 0aa2eb59b..cd74c89a9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/PatientServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -6,10 +6,10 @@ import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.ChineseConvertUtils;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.Patient;
-import com.openhis.administration.mapper.PatientMapper;
-import com.openhis.administration.service.IPatientService;
-import com.openhis.common.enums.AssignSeqEnum;
+import com.healthlink.his.administration.domain.Patient;
+import com.healthlink.his.administration.mapper.PatientMapper;
+import com.healthlink.his.administration.service.IPatientService;
+import com.healthlink.his.common.enums.AssignSeqEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientStudentServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/PatientStudentServiceImpl.java
similarity index 83%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientStudentServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/PatientStudentServiceImpl.java
index 956595f96..13cb8f1a6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientStudentServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/PatientStudentServiceImpl.java
@@ -1,14 +1,14 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.enums.DelFlag;
 import com.core.common.exception.ServiceException;
-import com.openhis.administration.domain.Patient;
-import com.openhis.administration.domain.PatientStudent;
-import com.openhis.administration.mapper.PatientStudentMapper;
-import com.openhis.administration.service.IPatientStudentService;
-import com.openhis.common.enums.PhysicalExamResult;
+import com.healthlink.his.administration.domain.Patient;
+import com.healthlink.his.administration.domain.PatientStudent;
+import com.healthlink.his.administration.mapper.PatientStudentMapper;
+import com.healthlink.his.administration.service.IPatientStudentService;
+import com.healthlink.his.common.enums.PhysicalExamResult;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerPatientServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/PractitionerPatientServiceImpl.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerPatientServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/PractitionerPatientServiceImpl.java
index 3ba27582f..1f6d50496 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerPatientServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/PractitionerPatientServiceImpl.java
@@ -1,10 +1,10 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.administration.domain.PractitionerPatient;
-import com.openhis.administration.mapper.PractitionerPatientMapper;
-import com.openhis.administration.service.IPractitionerPatientService;
+import com.healthlink.his.administration.domain.PractitionerPatient;
+import com.healthlink.his.administration.mapper.PractitionerPatientMapper;
+import com.healthlink.his.administration.service.IPractitionerPatientService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerRoleServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/PractitionerRoleServiceImpl.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerRoleServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/PractitionerRoleServiceImpl.java
index 941af61ab..72f084bd9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerRoleServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/PractitionerRoleServiceImpl.java
@@ -1,13 +1,13 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.administration.domain.PractitionerRole;
-import com.openhis.administration.dto.RoleDataDto;
-import com.openhis.administration.mapper.PractitionerRoleMapper;
-import com.openhis.administration.service.IPractitionerRoleService;
-import com.openhis.common.enums.PractitionerRoles;
+import com.healthlink.his.administration.domain.PractitionerRole;
+import com.healthlink.his.administration.dto.RoleDataDto;
+import com.healthlink.his.administration.mapper.PractitionerRoleMapper;
+import com.healthlink.his.administration.service.IPractitionerRoleService;
+import com.healthlink.his.common.enums.PractitionerRoles;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/PractitionerServiceImpl.java
similarity index 87%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/PractitionerServiceImpl.java
index 95978da70..1578d6a59 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/PractitionerServiceImpl.java
@@ -1,12 +1,12 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.core.common.enums.DelFlag;
 import com.core.common.service.BaseService;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.mapper.PractitionerMapper;
-import com.openhis.administration.service.IPractitionerService;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.mapper.PractitionerMapper;
+import com.healthlink.his.administration.service.IPractitionerService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PrescriptionReviewRecordServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/PrescriptionReviewRecordServiceImpl.java
similarity index 87%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PrescriptionReviewRecordServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/PrescriptionReviewRecordServiceImpl.java
index 9f7014cc5..f7241135e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PrescriptionReviewRecordServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/PrescriptionReviewRecordServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import java.util.List;
 
@@ -8,10 +8,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.enums.DelFlag;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.administration.domain.PrescriptionReviewRecord;
-import com.openhis.administration.dto.PrescriptionReviewRecordDto;
-import com.openhis.administration.mapper.PrescriptionReviewRecordMapper;
-import com.openhis.administration.service.IPrescriptionReviewRecordService;
+import com.healthlink.his.administration.domain.PrescriptionReviewRecord;
+import com.healthlink.his.administration.dto.PrescriptionReviewRecordDto;
+import com.healthlink.his.administration.mapper.PrescriptionReviewRecordMapper;
+import com.healthlink.his.administration.service.IPrescriptionReviewRecordService;
 
 /**
  * 处方点评记录Service业务层处理
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/SpecimenDefinitionServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/SpecimenDefinitionServiceImpl.java
similarity index 57%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/SpecimenDefinitionServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/SpecimenDefinitionServiceImpl.java
index ecdc4cc3f..f23087efc 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/SpecimenDefinitionServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/SpecimenDefinitionServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.administration.domain.SpecimenDefinition;
-import com.openhis.administration.mapper.SpecimenDefinitionMapper;
-import com.openhis.administration.service.ISpecimenDefinitionService;
+import com.healthlink.his.administration.domain.SpecimenDefinition;
+import com.healthlink.his.administration.mapper.SpecimenDefinitionMapper;
+import com.healthlink.his.administration.service.ISpecimenDefinitionService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/SupplierServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/SupplierServiceImpl.java
similarity index 86%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/SupplierServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/SupplierServiceImpl.java
index d2ae7227f..0c75b2957 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/SupplierServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/SupplierServiceImpl.java
@@ -1,13 +1,13 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.enums.DelFlag;
-import com.openhis.administration.domain.Supplier;
-import com.openhis.administration.mapper.SupplierMapper;
-import com.openhis.administration.service.ISupplierService;
-import com.openhis.common.enums.SupplierType;
-import com.openhis.common.enums.Whether;
+import com.healthlink.his.administration.domain.Supplier;
+import com.healthlink.his.administration.mapper.SupplierMapper;
+import com.healthlink.his.administration.service.ISupplierService;
+import com.healthlink.his.common.enums.SupplierType;
+import com.healthlink.his.common.enums.Whether;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/TraceNoManageServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/TraceNoManageServiceImpl.java
similarity index 87%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/TraceNoManageServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/TraceNoManageServiceImpl.java
index ed94ba4a2..8e4787db4 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/TraceNoManageServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/TraceNoManageServiceImpl.java
@@ -1,11 +1,11 @@
-package com.openhis.administration.service.impl;
+package com.healthlink.his.administration.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.administration.domain.TraceNoManage;
-import com.openhis.administration.mapper.TraceNoManageMapper;
-import com.openhis.administration.service.ITraceNoManageService;
-import com.openhis.common.enums.TraceNoStatus;
+import com.healthlink.his.administration.domain.TraceNoManage;
+import com.healthlink.his.administration.mapper.TraceNoManageMapper;
+import com.healthlink.his.administration.service.ITraceNoManageService;
+import com.healthlink.his.common.enums.TraceNoStatus;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/AppointmentBookDTO.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/AppointmentBookDTO.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/AppointmentBookDTO.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/AppointmentBookDTO.java
index 10c3877da..7e3cbb23d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/AppointmentBookDTO.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/AppointmentBookDTO.java
@@ -1,4 +1,4 @@
-package com.openhis.appointmentmanage.domain;
+package com.healthlink.his.appointmentmanage.domain;
 
 import lombok.Data;
 import jakarta.validation.constraints.NotBlank;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/AppointmentConfig.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/AppointmentConfig.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/AppointmentConfig.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/AppointmentConfig.java
index b7c874f8b..18ba36cb6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/AppointmentConfig.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/AppointmentConfig.java
@@ -1,4 +1,4 @@
-package com.openhis.appointmentmanage.domain;
+package com.healthlink.his.appointmentmanage.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/ClinicRoom.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/ClinicRoom.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/ClinicRoom.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/ClinicRoom.java
index 37b5d5892..25cfa57f7 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/ClinicRoom.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/ClinicRoom.java
@@ -1,4 +1,4 @@
-package com.openhis.appointmentmanage.domain;
+package com.healthlink.his.appointmentmanage.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/Dept.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/Dept.java
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/Dept.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/Dept.java
index e99a31115..fc023298c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/Dept.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/Dept.java
@@ -1,4 +1,4 @@
-package com.openhis.appointmentmanage.domain;
+package com.healthlink.his.appointmentmanage.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/DeptAppointmentHours.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/DeptAppointmentHours.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/DeptAppointmentHours.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/DeptAppointmentHours.java
index dab26e3ad..93e4f01fc 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/DeptAppointmentHours.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/DeptAppointmentHours.java
@@ -1,4 +1,4 @@
-package com.openhis.appointmentmanage.domain;
+package com.healthlink.his.appointmentmanage.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/DoctorAvailabilityDTO.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/DoctorAvailabilityDTO.java
similarity index 82%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/DoctorAvailabilityDTO.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/DoctorAvailabilityDTO.java
index 5c149d0e1..e163f35a5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/DoctorAvailabilityDTO.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/DoctorAvailabilityDTO.java
@@ -1,4 +1,4 @@
-package com.openhis.appointmentmanage.domain;
+package com.healthlink.his.appointmentmanage.domain;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/DoctorSchedule.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/DoctorSchedule.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/DoctorSchedule.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/DoctorSchedule.java
index 4c4c3c643..9014ebe5f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/DoctorSchedule.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/DoctorSchedule.java
@@ -1,4 +1,4 @@
-package com.openhis.appointmentmanage.domain;
+package com.healthlink.his.appointmentmanage.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/DoctorScheduleWithDateDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/DoctorScheduleWithDateDto.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/DoctorScheduleWithDateDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/DoctorScheduleWithDateDto.java
index 309aa3801..3ac0a547c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/DoctorScheduleWithDateDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/DoctorScheduleWithDateDto.java
@@ -1,4 +1,4 @@
-package com.openhis.appointmentmanage.domain;
+package com.healthlink.his.appointmentmanage.domain;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/SchedulePool.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/SchedulePool.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/SchedulePool.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/SchedulePool.java
index 6bc768cc5..f69b0fc19 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/SchedulePool.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/SchedulePool.java
@@ -1,4 +1,4 @@
-package com.openhis.appointmentmanage.domain;
+package com.healthlink.his.appointmentmanage.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/ScheduleSlot.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/ScheduleSlot.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/ScheduleSlot.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/ScheduleSlot.java
index 4ea15692a..ee87606f8 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/ScheduleSlot.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/ScheduleSlot.java
@@ -1,4 +1,4 @@
-package com.openhis.appointmentmanage.domain;
+package com.healthlink.his.appointmentmanage.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/TicketSlotDTO.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/TicketSlotDTO.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/TicketSlotDTO.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/TicketSlotDTO.java
index fa778a91e..9a7f859cc 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/TicketSlotDTO.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/domain/TicketSlotDTO.java
@@ -1,4 +1,4 @@
-package com.openhis.appointmentmanage.domain;
+package com.healthlink.his.appointmentmanage.domain;
 
 import lombok.Data;
 import java.time.LocalDate;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/dto/TicketQueryDTO.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/dto/TicketQueryDTO.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/dto/TicketQueryDTO.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/dto/TicketQueryDTO.java
index 458d7ba0a..7c7931fe6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/dto/TicketQueryDTO.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/dto/TicketQueryDTO.java
@@ -1,4 +1,4 @@
-package com.openhis.appointmentmanage.dto;
+package com.healthlink.his.appointmentmanage.dto;
 
 import lombok.Data;
 import java.io.Serializable;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/AppointmentConfigMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/mapper/AppointmentConfigMapper.java
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/AppointmentConfigMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/mapper/AppointmentConfigMapper.java
index 02e78dfce..26b0dec23 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/AppointmentConfigMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/mapper/AppointmentConfigMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.appointmentmanage.mapper;
+package com.healthlink.his.appointmentmanage.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.appointmentmanage.domain.AppointmentConfig;
+import com.healthlink.his.appointmentmanage.domain.AppointmentConfig;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/ClinicRoomMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/mapper/ClinicRoomMapper.java
similarity index 63%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/ClinicRoomMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/mapper/ClinicRoomMapper.java
index 5496d1bde..8f58f0e9a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/ClinicRoomMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/mapper/ClinicRoomMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.appointmentmanage.mapper;
+package com.healthlink.his.appointmentmanage.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.appointmentmanage.domain.ClinicRoom;
+import com.healthlink.his.appointmentmanage.domain.ClinicRoom;
 
 /**
  * 诊室维护Mapper接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/DeptAppointmentHoursMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/mapper/DeptAppointmentHoursMapper.java
similarity index 62%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/DeptAppointmentHoursMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/mapper/DeptAppointmentHoursMapper.java
index 9e2fe1fcf..b60c555f0 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/DeptAppointmentHoursMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/mapper/DeptAppointmentHoursMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.appointmentmanage.mapper;
+package com.healthlink.his.appointmentmanage.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.appointmentmanage.domain.DeptAppointmentHours;
+import com.healthlink.his.appointmentmanage.domain.DeptAppointmentHours;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/DeptMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/mapper/DeptMapper.java
similarity index 61%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/DeptMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/mapper/DeptMapper.java
index dcbf9c614..2578ce8cf 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/DeptMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/mapper/DeptMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.appointmentmanage.mapper;
+package com.healthlink.his.appointmentmanage.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.appointmentmanage.domain.Dept;
+import com.healthlink.his.appointmentmanage.domain.Dept;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/DoctorScheduleMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/mapper/DoctorScheduleMapper.java
similarity index 90%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/DoctorScheduleMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/mapper/DoctorScheduleMapper.java
index a52d1e2a9..e4e227f49 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/DoctorScheduleMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/mapper/DoctorScheduleMapper.java
@@ -1,8 +1,8 @@
-package com.openhis.appointmentmanage.mapper;
+package com.healthlink.his.appointmentmanage.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.appointmentmanage.domain.DoctorSchedule;
-import com.openhis.appointmentmanage.domain.DoctorScheduleWithDateDto;
+import com.healthlink.his.appointmentmanage.domain.DoctorSchedule;
+import com.healthlink.his.appointmentmanage.domain.DoctorScheduleWithDateDto;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/SchedulePoolMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/mapper/SchedulePoolMapper.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/SchedulePoolMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/mapper/SchedulePoolMapper.java
index a6f7fcbb6..beb157693 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/SchedulePoolMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/mapper/SchedulePoolMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.appointmentmanage.mapper;
+package com.healthlink.his.appointmentmanage.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.appointmentmanage.domain.SchedulePool;
+import com.healthlink.his.appointmentmanage.domain.SchedulePool;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 import org.springframework.stereotype.Repository;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/ScheduleSlotMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/mapper/ScheduleSlotMapper.java
similarity index 88%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/ScheduleSlotMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/mapper/ScheduleSlotMapper.java
index 145af650a..56ecd8a69 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/ScheduleSlotMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/mapper/ScheduleSlotMapper.java
@@ -1,11 +1,11 @@
-package com.openhis.appointmentmanage.mapper;
+package com.healthlink.his.appointmentmanage.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.appointmentmanage.domain.DoctorAvailabilityDTO;
-import com.openhis.appointmentmanage.domain.ScheduleSlot;
-import com.openhis.appointmentmanage.domain.TicketSlotDTO;
+import com.healthlink.his.appointmentmanage.domain.DoctorAvailabilityDTO;
+import com.healthlink.his.appointmentmanage.domain.ScheduleSlot;
+import com.healthlink.his.appointmentmanage.domain.TicketSlotDTO;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.openhis.appointmentmanage.dto.TicketQueryDTO;
+import com.healthlink.his.appointmentmanage.dto.TicketQueryDTO;
 import java.util.Date;
 import java.util.List;
 import org.springframework.stereotype.Repository;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/IAppointmentConfigService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/IAppointmentConfigService.java
similarity index 82%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/IAppointmentConfigService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/IAppointmentConfigService.java
index 62d3086a6..0c171ae92 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/IAppointmentConfigService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/IAppointmentConfigService.java
@@ -1,7 +1,7 @@
-package com.openhis.appointmentmanage.service;
+package com.healthlink.his.appointmentmanage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.appointmentmanage.domain.AppointmentConfig;
+import com.healthlink.his.appointmentmanage.domain.AppointmentConfig;
 
 /**
  * 预约配置Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/IClinicRoomService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/IClinicRoomService.java
similarity index 90%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/IClinicRoomService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/IClinicRoomService.java
index 58808be9b..e1c01a8d3 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/IClinicRoomService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/IClinicRoomService.java
@@ -1,8 +1,8 @@
-package com.openhis.appointmentmanage.service;
+package com.healthlink.his.appointmentmanage.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.appointmentmanage.domain.ClinicRoom;
+import com.healthlink.his.appointmentmanage.domain.ClinicRoom;
 
 /**
  * 诊室维护Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/IDeptAppointmentHoursService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/IDeptAppointmentHoursService.java
similarity index 54%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/IDeptAppointmentHoursService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/IDeptAppointmentHoursService.java
index 1552a8e21..490b94791 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/IDeptAppointmentHoursService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/IDeptAppointmentHoursService.java
@@ -1,7 +1,7 @@
-package com.openhis.appointmentmanage.service;
+package com.healthlink.his.appointmentmanage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.appointmentmanage.domain.DeptAppointmentHours;
+import com.healthlink.his.appointmentmanage.domain.DeptAppointmentHours;
 
 public interface IDeptAppointmentHoursService extends IService<DeptAppointmentHours> {
 }
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/IDeptService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/IDeptService.java
similarity index 51%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/IDeptService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/IDeptService.java
index 78710fc1e..065a4c16b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/IDeptService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/IDeptService.java
@@ -1,7 +1,7 @@
-package com.openhis.appointmentmanage.service;
+package com.healthlink.his.appointmentmanage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.appointmentmanage.domain.Dept;
+import com.healthlink.his.appointmentmanage.domain.Dept;
 
 public interface IDeptService extends IService<Dept> {
 }
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/IDoctorScheduleService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/IDoctorScheduleService.java
similarity index 53%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/IDoctorScheduleService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/IDoctorScheduleService.java
index fc125b7d4..9be49bd85 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/IDoctorScheduleService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/IDoctorScheduleService.java
@@ -1,7 +1,7 @@
-package com.openhis.appointmentmanage.service;
+package com.healthlink.his.appointmentmanage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.appointmentmanage.domain.DoctorSchedule;
+import com.healthlink.his.appointmentmanage.domain.DoctorSchedule;
 
 public interface IDoctorScheduleService extends IService<DoctorSchedule> {
 }
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/ISchedulePoolService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/ISchedulePoolService.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/ISchedulePoolService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/ISchedulePoolService.java
index 8463e1ddc..3873fd496 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/ISchedulePoolService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/ISchedulePoolService.java
@@ -1,7 +1,7 @@
-package com.openhis.appointmentmanage.service;
+package com.healthlink.his.appointmentmanage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.appointmentmanage.domain.SchedulePool;
+import com.healthlink.his.appointmentmanage.domain.SchedulePool;
 
 public interface ISchedulePoolService extends IService<SchedulePool> {
     /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/IScheduleSlotService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/IScheduleSlotService.java
similarity index 53%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/IScheduleSlotService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/IScheduleSlotService.java
index fa648b88d..6ac1b4d4e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/IScheduleSlotService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/IScheduleSlotService.java
@@ -1,7 +1,7 @@
-package com.openhis.appointmentmanage.service;
+package com.healthlink.his.appointmentmanage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.appointmentmanage.domain.ScheduleSlot;
+import com.healthlink.his.appointmentmanage.domain.ScheduleSlot;
 
 public interface IScheduleSlotService extends IService<ScheduleSlot> {
 }
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/AppointmentConfigServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/impl/AppointmentConfigServiceImpl.java
similarity index 82%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/AppointmentConfigServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/impl/AppointmentConfigServiceImpl.java
index 03dd63ca2..3af10cba9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/AppointmentConfigServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/impl/AppointmentConfigServiceImpl.java
@@ -1,10 +1,10 @@
-package com.openhis.appointmentmanage.service.impl;
+package com.healthlink.his.appointmentmanage.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.appointmentmanage.domain.AppointmentConfig;
-import com.openhis.appointmentmanage.mapper.AppointmentConfigMapper;
-import com.openhis.appointmentmanage.service.IAppointmentConfigService;
+import com.healthlink.his.appointmentmanage.domain.AppointmentConfig;
+import com.healthlink.his.appointmentmanage.mapper.AppointmentConfigMapper;
+import com.healthlink.his.appointmentmanage.service.IAppointmentConfigService;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/ClinicRoomServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/impl/ClinicRoomServiceImpl.java
similarity index 84%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/ClinicRoomServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/impl/ClinicRoomServiceImpl.java
index cc66e8757..2b42707ef 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/ClinicRoomServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/impl/ClinicRoomServiceImpl.java
@@ -1,11 +1,11 @@
-package com.openhis.appointmentmanage.service.impl;
+package com.healthlink.his.appointmentmanage.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.appointmentmanage.domain.ClinicRoom;
-import com.openhis.appointmentmanage.mapper.ClinicRoomMapper;
-import com.openhis.appointmentmanage.service.IClinicRoomService;
+import com.healthlink.his.appointmentmanage.domain.ClinicRoom;
+import com.healthlink.his.appointmentmanage.mapper.ClinicRoomMapper;
+import com.healthlink.his.appointmentmanage.service.IClinicRoomService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/impl/DeptAppointmentHoursServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/impl/DeptAppointmentHoursServiceImpl.java
new file mode 100755
index 000000000..91a0d3672
--- /dev/null
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/impl/DeptAppointmentHoursServiceImpl.java
@@ -0,0 +1,12 @@
+package com.healthlink.his.appointmentmanage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.healthlink.his.appointmentmanage.domain.DeptAppointmentHours;
+import com.healthlink.his.appointmentmanage.mapper.DeptAppointmentHoursMapper;
+import com.healthlink.his.appointmentmanage.service.IDeptAppointmentHoursService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DeptAppointmentHoursServiceImpl extends ServiceImpl<DeptAppointmentHoursMapper, DeptAppointmentHours> implements IDeptAppointmentHoursService {
+
+}
diff --git a/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/impl/DeptImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/impl/DeptImpl.java
new file mode 100755
index 000000000..5be937d92
--- /dev/null
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/impl/DeptImpl.java
@@ -0,0 +1,11 @@
+package com.healthlink.his.appointmentmanage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.healthlink.his.appointmentmanage.domain.Dept;
+import com.healthlink.his.appointmentmanage.mapper.DeptMapper;
+import com.healthlink.his.appointmentmanage.service.IDeptService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DeptImpl extends ServiceImpl<DeptMapper, Dept> implements IDeptService {
+}
diff --git a/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/impl/DoctorScheduleServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/impl/DoctorScheduleServiceImpl.java
new file mode 100755
index 000000000..eaeeecd44
--- /dev/null
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/impl/DoctorScheduleServiceImpl.java
@@ -0,0 +1,11 @@
+package com.healthlink.his.appointmentmanage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.healthlink.his.appointmentmanage.domain.DoctorSchedule;
+import com.healthlink.his.appointmentmanage.mapper.DoctorScheduleMapper;
+import com.healthlink.his.appointmentmanage.service.IDoctorScheduleService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DoctorScheduleServiceImpl extends ServiceImpl<DoctorScheduleMapper, DoctorSchedule> implements IDoctorScheduleService {
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/SchedulePoolServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/impl/SchedulePoolServiceImpl.java
similarity index 58%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/SchedulePoolServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/impl/SchedulePoolServiceImpl.java
index 048c40885..d88da9d9a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/SchedulePoolServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/impl/SchedulePoolServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.appointmentmanage.service.impl;
+package com.healthlink.his.appointmentmanage.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.appointmentmanage.domain.SchedulePool;
-import com.openhis.appointmentmanage.mapper.SchedulePoolMapper;
-import com.openhis.appointmentmanage.service.ISchedulePoolService;
+import com.healthlink.his.appointmentmanage.domain.SchedulePool;
+import com.healthlink.his.appointmentmanage.mapper.SchedulePoolMapper;
+import com.healthlink.his.appointmentmanage.service.ISchedulePoolService;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/impl/ScheduleSlotServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/impl/ScheduleSlotServiceImpl.java
new file mode 100755
index 000000000..f317d492d
--- /dev/null
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/appointmentmanage/service/impl/ScheduleSlotServiceImpl.java
@@ -0,0 +1,11 @@
+package com.healthlink.his.appointmentmanage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.healthlink.his.appointmentmanage.domain.ScheduleSlot;
+import com.healthlink.his.appointmentmanage.mapper.ScheduleSlotMapper;
+import com.healthlink.his.appointmentmanage.service.IScheduleSlotService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ScheduleSlotServiceImpl extends ServiceImpl<ScheduleSlotMapper, ScheduleSlot> implements IScheduleSlotService {
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckMethod.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/domain/CheckMethod.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckMethod.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/domain/CheckMethod.java
index c996fea7b..d16119f9d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckMethod.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/domain/CheckMethod.java
@@ -1,4 +1,4 @@
-package com.openhis.check.domain;
+package com.healthlink.his.check.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckPackage.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/domain/CheckPackage.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckPackage.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/domain/CheckPackage.java
index 25bda9dde..a8807d333 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckPackage.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/domain/CheckPackage.java
@@ -1,4 +1,4 @@
-package com.openhis.check.domain;
+package com.healthlink.his.check.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckPackageDetail.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/domain/CheckPackageDetail.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckPackageDetail.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/domain/CheckPackageDetail.java
index 8cef7578a..e4f4db32e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckPackageDetail.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/domain/CheckPackageDetail.java
@@ -1,4 +1,4 @@
-package com.openhis.check.domain;
+package com.healthlink.his.check.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckPart.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/domain/CheckPart.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckPart.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/domain/CheckPart.java
index ebf0450ae..71627450e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckPart.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/domain/CheckPart.java
@@ -1,4 +1,4 @@
-package com.openhis.check.domain;
+package com.healthlink.his.check.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckType.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/domain/CheckType.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckType.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/domain/CheckType.java
index e0173bc32..4062f3f1e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckType.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/domain/CheckType.java
@@ -1,4 +1,4 @@
-package com.openhis.check.domain;
+package com.healthlink.his.check.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/ExamApply.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/domain/ExamApply.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/ExamApply.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/domain/ExamApply.java
index 120d2807d..d60576f09 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/ExamApply.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/domain/ExamApply.java
@@ -1,4 +1,4 @@
-package com.openhis.check.domain;
+package com.healthlink.his.check.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/ExamApplyItem.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/domain/ExamApplyItem.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/ExamApplyItem.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/domain/ExamApplyItem.java
index e13b8d77d..1a91e9506 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/ExamApplyItem.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/domain/ExamApplyItem.java
@@ -1,4 +1,4 @@
-package com.openhis.check.domain;
+package com.healthlink.his.check.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/LisGroupInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/domain/LisGroupInfo.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/LisGroupInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/domain/LisGroupInfo.java
index b73510465..8355f4ed0 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/LisGroupInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/domain/LisGroupInfo.java
@@ -1,4 +1,4 @@
-package com.openhis.check.domain;
+package com.healthlink.his.check.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/PackageItem.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/domain/PackageItem.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/PackageItem.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/domain/PackageItem.java
index 7707f798b..caaed0dc6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/PackageItem.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/domain/PackageItem.java
@@ -1,4 +1,4 @@
-package com.openhis.check.domain;
+package com.healthlink.his.check.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/CheckMethodMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/mapper/CheckMethodMapper.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/CheckMethodMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/mapper/CheckMethodMapper.java
index c8af0d783..48e10bf67 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/CheckMethodMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/mapper/CheckMethodMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.check.mapper;
+package com.healthlink.his.check.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.check.domain.CheckMethod;
+import com.healthlink.his.check.domain.CheckMethod;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/CheckPackageDetailMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/mapper/CheckPackageDetailMapper.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/CheckPackageDetailMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/mapper/CheckPackageDetailMapper.java
index b6d2fd1e7..af5ba1b56 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/CheckPackageDetailMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/mapper/CheckPackageDetailMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.check.mapper;
+package com.healthlink.his.check.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.check.domain.CheckPackageDetail;
+import com.healthlink.his.check.domain.CheckPackageDetail;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/CheckPackageMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/mapper/CheckPackageMapper.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/CheckPackageMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/mapper/CheckPackageMapper.java
index 2916aac0a..297910deb 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/CheckPackageMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/mapper/CheckPackageMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.check.mapper;
+package com.healthlink.his.check.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.check.domain.CheckPackage;
+import com.healthlink.his.check.domain.CheckPackage;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/CheckPartMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/mapper/CheckPartMapper.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/CheckPartMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/mapper/CheckPartMapper.java
index 32ee06f58..282b44344 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/CheckPartMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/mapper/CheckPartMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.check.mapper;
+package com.healthlink.his.check.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.check.domain.CheckPart;
+import com.healthlink.his.check.domain.CheckPart;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/CheckTypeMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/mapper/CheckTypeMapper.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/CheckTypeMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/mapper/CheckTypeMapper.java
index 8c647cacb..65374840a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/CheckTypeMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/mapper/CheckTypeMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.check.mapper;
+package com.healthlink.his.check.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.check.domain.CheckType;
+import com.healthlink.his.check.domain.CheckType;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/ExamApplyItemMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/mapper/ExamApplyItemMapper.java
similarity index 65%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/ExamApplyItemMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/mapper/ExamApplyItemMapper.java
index 2a6a64c2c..25e33b181 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/ExamApplyItemMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/mapper/ExamApplyItemMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.check.mapper;
+package com.healthlink.his.check.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.check.domain.ExamApplyItem;
+import com.healthlink.his.check.domain.ExamApplyItem;
 
 /**
  * 检查申请明细表 Mapper 接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/ExamApplyMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/mapper/ExamApplyMapper.java
similarity index 65%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/ExamApplyMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/mapper/ExamApplyMapper.java
index 5f1e8863f..064ea3c56 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/ExamApplyMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/mapper/ExamApplyMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.check.mapper;
+package com.healthlink.his.check.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.check.domain.ExamApply;
+import com.healthlink.his.check.domain.ExamApply;
 
 /**
  * 检查申请主表 Mapper 接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/LisGroupInfoMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/mapper/LisGroupInfoMapper.java
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/LisGroupInfoMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/mapper/LisGroupInfoMapper.java
index 6a85c74d4..7aa2c07fe 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/LisGroupInfoMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/mapper/LisGroupInfoMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.check.mapper;
+package com.healthlink.his.check.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.check.domain.LisGroupInfo;
+import com.healthlink.his.check.domain.LisGroupInfo;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/PackageItemMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/mapper/PackageItemMapper.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/PackageItemMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/mapper/PackageItemMapper.java
index aba27c0ee..3c6ba5418 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/PackageItemMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/mapper/PackageItemMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.check.mapper;
+package com.healthlink.his.check.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.check.domain.PackageItem;
+import com.healthlink.his.check.domain.PackageItem;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/ICheckMethodService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/ICheckMethodService.java
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/ICheckMethodService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/ICheckMethodService.java
index 49778bb60..51c1fb1bd 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/ICheckMethodService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/ICheckMethodService.java
@@ -1,7 +1,7 @@
-package com.openhis.check.service;
+package com.healthlink.his.check.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.check.domain.CheckMethod;
+import com.healthlink.his.check.domain.CheckMethod;
 
 /**
  * 检查方法Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/ICheckPackageDetailService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/ICheckPackageDetailService.java
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/ICheckPackageDetailService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/ICheckPackageDetailService.java
index 9c77098b5..91c857ebe 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/ICheckPackageDetailService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/ICheckPackageDetailService.java
@@ -1,7 +1,7 @@
-package com.openhis.check.service;
+package com.healthlink.his.check.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.check.domain.CheckPackageDetail;
+import com.healthlink.his.check.domain.CheckPackageDetail;
 
 /**
  * 检查套餐明细Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/ICheckPackageService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/ICheckPackageService.java
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/ICheckPackageService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/ICheckPackageService.java
index ad046395c..e4e600d81 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/ICheckPackageService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/ICheckPackageService.java
@@ -1,7 +1,7 @@
-package com.openhis.check.service;
+package com.healthlink.his.check.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.check.domain.CheckPackage;
+import com.healthlink.his.check.domain.CheckPackage;
 
 /**
  * 检查套餐Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/ICheckPartService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/ICheckPartService.java
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/ICheckPartService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/ICheckPartService.java
index 00862af67..6b02b04db 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/ICheckPartService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/ICheckPartService.java
@@ -1,7 +1,7 @@
-package com.openhis.check.service;
+package com.healthlink.his.check.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.check.domain.CheckPart;
+import com.healthlink.his.check.domain.CheckPart;
 
 /**
  * 检查部位Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/ICheckTypeService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/ICheckTypeService.java
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/ICheckTypeService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/ICheckTypeService.java
index 3ab4e5506..fa1d5fbd9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/ICheckTypeService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/ICheckTypeService.java
@@ -1,7 +1,7 @@
-package com.openhis.check.service;
+package com.healthlink.his.check.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.check.domain.CheckType;
+import com.healthlink.his.check.domain.CheckType;
 
 /**
  * 检查类型Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/IExamApplyItemService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/IExamApplyItemService.java
similarity index 65%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/IExamApplyItemService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/IExamApplyItemService.java
index 57f194b48..491cbde29 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/IExamApplyItemService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/IExamApplyItemService.java
@@ -1,7 +1,7 @@
-package com.openhis.check.service;
+package com.healthlink.his.check.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.check.domain.ExamApplyItem;
+import com.healthlink.his.check.domain.ExamApplyItem;
 
 /**
  * 检查申请明细表 服务层接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/IExamApplyService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/IExamApplyService.java
similarity index 65%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/IExamApplyService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/IExamApplyService.java
index 156639a44..39ffc5499 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/IExamApplyService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/IExamApplyService.java
@@ -1,7 +1,7 @@
-package com.openhis.check.service;
+package com.healthlink.his.check.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.check.domain.ExamApply;
+import com.healthlink.his.check.domain.ExamApply;
 
 /**
  * 检查申请主表 服务层接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/ILisGroupInfoService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/ILisGroupInfoService.java
similarity index 58%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/ILisGroupInfoService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/ILisGroupInfoService.java
index 1f0d60ed0..0dfd08c84 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/ILisGroupInfoService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/ILisGroupInfoService.java
@@ -1,6 +1,6 @@
-package com.openhis.check.service;
+package com.healthlink.his.check.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.check.domain.LisGroupInfo;
+import com.healthlink.his.check.domain.LisGroupInfo;
 public interface ILisGroupInfoService extends IService<LisGroupInfo>{
 }
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/IPackageItemService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/IPackageItemService.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/IPackageItemService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/IPackageItemService.java
index 9b301bdff..341a0bbb2 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/IPackageItemService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/IPackageItemService.java
@@ -1,7 +1,7 @@
-package com.openhis.check.service;
+package com.healthlink.his.check.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.check.domain.PackageItem;
+import com.healthlink.his.check.domain.PackageItem;
 
 /**
  * 套餐项目关系表Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/CheckMethodServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/impl/CheckMethodServiceImpl.java
similarity index 60%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/CheckMethodServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/impl/CheckMethodServiceImpl.java
index d49597a03..b02d66f24 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/CheckMethodServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/impl/CheckMethodServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.check.service.impl;
+package com.healthlink.his.check.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.check.domain.CheckMethod;
-import com.openhis.check.mapper.CheckMethodMapper;
-import com.openhis.check.service.ICheckMethodService;
+import com.healthlink.his.check.domain.CheckMethod;
+import com.healthlink.his.check.mapper.CheckMethodMapper;
+import com.healthlink.his.check.service.ICheckMethodService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/CheckPackageDetailServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/impl/CheckPackageDetailServiceImpl.java
similarity index 60%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/CheckPackageDetailServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/impl/CheckPackageDetailServiceImpl.java
index 2d7a308b3..f510a8191 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/CheckPackageDetailServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/impl/CheckPackageDetailServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.check.service.impl;
+package com.healthlink.his.check.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.check.domain.CheckPackageDetail;
-import com.openhis.check.mapper.CheckPackageDetailMapper;
-import com.openhis.check.service.ICheckPackageDetailService;
+import com.healthlink.his.check.domain.CheckPackageDetail;
+import com.healthlink.his.check.mapper.CheckPackageDetailMapper;
+import com.healthlink.his.check.service.ICheckPackageDetailService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/CheckPackageServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/impl/CheckPackageServiceImpl.java
similarity index 60%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/CheckPackageServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/impl/CheckPackageServiceImpl.java
index ff13d5e84..aa93c3042 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/CheckPackageServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/impl/CheckPackageServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.check.service.impl;
+package com.healthlink.his.check.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.check.domain.CheckPackage;
-import com.openhis.check.mapper.CheckPackageMapper;
-import com.openhis.check.service.ICheckPackageService;
+import com.healthlink.his.check.domain.CheckPackage;
+import com.healthlink.his.check.mapper.CheckPackageMapper;
+import com.healthlink.his.check.service.ICheckPackageService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/CheckPartServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/impl/CheckPartServiceImpl.java
similarity index 60%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/CheckPartServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/impl/CheckPartServiceImpl.java
index eef6deb76..cb45b26ea 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/CheckPartServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/impl/CheckPartServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.check.service.impl;
+package com.healthlink.his.check.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.check.domain.CheckPart;
-import com.openhis.check.mapper.CheckPartMapper;
-import com.openhis.check.service.ICheckPartService;
+import com.healthlink.his.check.domain.CheckPart;
+import com.healthlink.his.check.mapper.CheckPartMapper;
+import com.healthlink.his.check.service.ICheckPartService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/CheckTypeServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/impl/CheckTypeServiceImpl.java
similarity index 60%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/CheckTypeServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/impl/CheckTypeServiceImpl.java
index 39a4c45dc..cd879d1a1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/CheckTypeServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/impl/CheckTypeServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.check.service.impl;
+package com.healthlink.his.check.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.check.domain.CheckType;
-import com.openhis.check.mapper.CheckTypeMapper;
-import com.openhis.check.service.ICheckTypeService;
+import com.healthlink.his.check.domain.CheckType;
+import com.healthlink.his.check.mapper.CheckTypeMapper;
+import com.healthlink.his.check.service.ICheckTypeService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/ExamApplyItemServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/impl/ExamApplyItemServiceImpl.java
similarity index 58%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/ExamApplyItemServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/impl/ExamApplyItemServiceImpl.java
index 5aea71dbe..9fc0af924 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/ExamApplyItemServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/impl/ExamApplyItemServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.check.service.impl;
+package com.healthlink.his.check.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.check.domain.ExamApplyItem;
-import com.openhis.check.mapper.ExamApplyItemMapper;
-import com.openhis.check.service.IExamApplyItemService;
+import com.healthlink.his.check.domain.ExamApplyItem;
+import com.healthlink.his.check.mapper.ExamApplyItemMapper;
+import com.healthlink.his.check.service.IExamApplyItemService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/ExamApplyServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/impl/ExamApplyServiceImpl.java
similarity index 57%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/ExamApplyServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/impl/ExamApplyServiceImpl.java
index 76db42ca7..ee3941ce5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/ExamApplyServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/impl/ExamApplyServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.check.service.impl;
+package com.healthlink.his.check.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.check.domain.ExamApply;
-import com.openhis.check.mapper.ExamApplyMapper;
-import com.openhis.check.service.IExamApplyService;
+import com.healthlink.his.check.domain.ExamApply;
+import com.healthlink.his.check.mapper.ExamApplyMapper;
+import com.healthlink.his.check.service.IExamApplyService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/LisGroupInfoServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/impl/LisGroupInfoServiceImpl.java
similarity index 53%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/LisGroupInfoServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/impl/LisGroupInfoServiceImpl.java
index cc91ff5aa..a40185943 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/LisGroupInfoServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/impl/LisGroupInfoServiceImpl.java
@@ -1,10 +1,10 @@
-package com.openhis.check.service.impl;
+package com.healthlink.his.check.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.check.domain.LisGroupInfo;
-import com.openhis.check.mapper.LisGroupInfoMapper;
-import com.openhis.check.service.ILisGroupInfoService;
+import com.healthlink.his.check.domain.LisGroupInfo;
+import com.healthlink.his.check.mapper.LisGroupInfoMapper;
+import com.healthlink.his.check.service.ILisGroupInfoService;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/PackageItemServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/impl/PackageItemServiceImpl.java
similarity index 60%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/PackageItemServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/impl/PackageItemServiceImpl.java
index cbc5a4174..7799ef6f3 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/PackageItemServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/check/service/impl/PackageItemServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.check.service.impl;
+package com.healthlink.his.check.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.check.domain.PackageItem;
-import com.openhis.check.mapper.PackageItemMapper;
-import com.openhis.check.service.IPackageItemService;
+import com.healthlink.his.check.domain.PackageItem;
+import com.healthlink.his.check.mapper.PackageItemMapper;
+import com.healthlink.his.check.service.IPackageItemService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/AllergyIntolerance.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/AllergyIntolerance.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/AllergyIntolerance.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/AllergyIntolerance.java
index fd7e15809..6fd0cdcca 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/AllergyIntolerance.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/AllergyIntolerance.java
@@ -1,4 +1,4 @@
-package com.openhis.clinical.domain;
+package com.healthlink.his.clinical.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/Condition.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/Condition.java
index 3ad69a0c2..d7533f685 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/Condition.java
@@ -1,4 +1,4 @@
-package com.openhis.clinical.domain;
+package com.healthlink.his.clinical.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/ConditionDefinition.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/ConditionDefinition.java
index 0db6c9c77..6af2968cf 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/ConditionDefinition.java
@@ -1,4 +1,4 @@
-package com.openhis.clinical.domain;
+package com.healthlink.his.clinical.domain;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionNoDefinition.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/ConditionNoDefinition.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionNoDefinition.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/ConditionNoDefinition.java
index 6e5448626..dfb2e7256 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionNoDefinition.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/ConditionNoDefinition.java
@@ -1,4 +1,4 @@
-package com.openhis.clinical.domain;
+package com.healthlink.his.clinical.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/DiagnosisBelongBinding.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/DiagnosisBelongBinding.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/DiagnosisBelongBinding.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/DiagnosisBelongBinding.java
index 5f6dc617e..0160813b1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/DiagnosisBelongBinding.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/DiagnosisBelongBinding.java
@@ -1,4 +1,4 @@
-package com.openhis.clinical.domain;
+package com.healthlink.his.clinical.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Order.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/Order.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Order.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/Order.java
index 456d4d345..46af91598 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Order.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/Order.java
@@ -1,4 +1,4 @@
-package com.openhis.clinical.domain;
+package com.healthlink.his.clinical.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/Procedure.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/Procedure.java
index ec98bbbf4..a4d785d40 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/Procedure.java
@@ -1,4 +1,4 @@
-package com.openhis.clinical.domain;
+package com.healthlink.his.clinical.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ProcedurePerformer.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/ProcedurePerformer.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ProcedurePerformer.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/ProcedurePerformer.java
index 1df84e570..c8a5173d9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ProcedurePerformer.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/ProcedurePerformer.java
@@ -1,4 +1,4 @@
-package com.openhis.clinical.domain;
+package com.healthlink.his.clinical.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ReservationRecord.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/ReservationRecord.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ReservationRecord.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/ReservationRecord.java
index b76def9f3..6e0df79bc 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ReservationRecord.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/ReservationRecord.java
@@ -1,4 +1,4 @@
-package com.openhis.clinical.domain;
+package com.healthlink.his.clinical.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Surgery.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/Surgery.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Surgery.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/Surgery.java
index 562c7ec35..0452bc99b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Surgery.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/Surgery.java
@@ -1,4 +1,4 @@
-package com.openhis.clinical.domain;
+package com.healthlink.his.clinical.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Ticket.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/Ticket.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Ticket.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/Ticket.java
index c431dab47..cac525c70 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Ticket.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/domain/Ticket.java
@@ -1,4 +1,4 @@
-package com.openhis.clinical.domain;
+package com.healthlink.his.clinical.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/AllergyIntoleranceMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/AllergyIntoleranceMapper.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/AllergyIntoleranceMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/AllergyIntoleranceMapper.java
index b87149987..359d986af 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/AllergyIntoleranceMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/AllergyIntoleranceMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.clinical.mapper;
+package com.healthlink.his.clinical.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.clinical.domain.AllergyIntolerance;
+import com.healthlink.his.clinical.domain.AllergyIntolerance;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionDefinitionMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/ConditionDefinitionMapper.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionDefinitionMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/ConditionDefinitionMapper.java
index 10d32a949..a9e40f1a3 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionDefinitionMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/ConditionDefinitionMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.clinical.mapper;
+package com.healthlink.his.clinical.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.clinical.domain.ConditionDefinition;
+import com.healthlink.his.clinical.domain.ConditionDefinition;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/ConditionMapper.java
similarity index 86%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/ConditionMapper.java
index cd344b89b..97345ced1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/ConditionMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.clinical.mapper;
+package com.healthlink.his.clinical.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.clinical.domain.Condition;
+import com.healthlink.his.clinical.domain.Condition;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionNoDefinitionMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/ConditionNoDefinitionMapper.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionNoDefinitionMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/ConditionNoDefinitionMapper.java
index a53eb696e..ea821c4ff 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionNoDefinitionMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/ConditionNoDefinitionMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.clinical.mapper;
+package com.healthlink.his.clinical.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.clinical.domain.ConditionNoDefinition;
+import com.healthlink.his.clinical.domain.ConditionNoDefinition;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/DiagnosisBelongBindingMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/DiagnosisBelongBindingMapper.java
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/DiagnosisBelongBindingMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/DiagnosisBelongBindingMapper.java
index 209bed049..7588213f1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/DiagnosisBelongBindingMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/DiagnosisBelongBindingMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.clinical.mapper;
+package com.healthlink.his.clinical.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.clinical.domain.DiagnosisBelongBinding;
+import com.healthlink.his.clinical.domain.DiagnosisBelongBinding;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/OrderMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/OrderMapper.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/OrderMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/OrderMapper.java
index 6df707a4f..e99661c18 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/OrderMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/OrderMapper.java
@@ -1,8 +1,8 @@
-package com.openhis.clinical.mapper;
+package com.healthlink.his.clinical.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.openhis.clinical.domain.Order;
+import com.healthlink.his.clinical.domain.Order;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ProcedureMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/ProcedureMapper.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ProcedureMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/ProcedureMapper.java
index ec2ab5de2..14c37cd5b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ProcedureMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/ProcedureMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.clinical.mapper;
+package com.healthlink.his.clinical.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.clinical.domain.Procedure;
+import com.healthlink.his.clinical.domain.Procedure;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ProcedurePerformerMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/ProcedurePerformerMapper.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ProcedurePerformerMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/ProcedurePerformerMapper.java
index 4ee815518..58fe1ca1b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ProcedurePerformerMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/ProcedurePerformerMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.clinical.mapper;
+package com.healthlink.his.clinical.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.clinical.domain.ProcedurePerformer;
+import com.healthlink.his.clinical.domain.ProcedurePerformer;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ReservationRecordMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/ReservationRecordMapper.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ReservationRecordMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/ReservationRecordMapper.java
index c4b141075..6f29821cd 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ReservationRecordMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/ReservationRecordMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.clinical.mapper;
+package com.healthlink.his.clinical.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.clinical.domain.ReservationRecord;
+import com.healthlink.his.clinical.domain.ReservationRecord;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/SurgeryMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/SurgeryMapper.java
similarity index 90%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/SurgeryMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/SurgeryMapper.java
index eb4f66bbb..182797607 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/SurgeryMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/SurgeryMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.clinical.mapper;
+package com.healthlink.his.clinical.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.clinical.domain.Surgery;
+import com.healthlink.his.clinical.domain.Surgery;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/TicketMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/TicketMapper.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/TicketMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/TicketMapper.java
index 5d5cb3430..24db78993 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/TicketMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/mapper/TicketMapper.java
@@ -1,8 +1,8 @@
-package com.openhis.clinical.mapper;
+package com.healthlink.his.clinical.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.openhis.clinical.domain.Ticket;
+import com.healthlink.his.clinical.domain.Ticket;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IAllergyIntoleranceService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/IAllergyIntoleranceService.java
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IAllergyIntoleranceService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/IAllergyIntoleranceService.java
index 40b8b0146..804766fb7 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IAllergyIntoleranceService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/IAllergyIntoleranceService.java
@@ -1,7 +1,7 @@
-package com.openhis.clinical.service;
+package com.healthlink.his.clinical.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.clinical.domain.AllergyIntolerance;
+import com.healthlink.his.clinical.domain.AllergyIntolerance;
 
 /**
  * 过敏与不耐受Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionDefinitionService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/IConditionDefinitionService.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionDefinitionService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/IConditionDefinitionService.java
index adc4a5deb..4d9fdfcf9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionDefinitionService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/IConditionDefinitionService.java
@@ -1,7 +1,7 @@
-package com.openhis.clinical.service;
+package com.healthlink.his.clinical.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.clinical.domain.ConditionDefinition;
+import com.healthlink.his.clinical.domain.ConditionDefinition;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionNoDefinitionService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/IConditionNoDefinitionService.java
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionNoDefinitionService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/IConditionNoDefinitionService.java
index 41cc55250..4634211f9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionNoDefinitionService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/IConditionNoDefinitionService.java
@@ -1,7 +1,7 @@
-package com.openhis.clinical.service;
+package com.healthlink.his.clinical.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.clinical.domain.ConditionNoDefinition;
+import com.healthlink.his.clinical.domain.ConditionNoDefinition;
 
 /**
  * 新增国临码功能单表增删改查
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/IConditionService.java
similarity index 85%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/IConditionService.java
index 5498b16db..e9d6d2788 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/IConditionService.java
@@ -1,7 +1,7 @@
-package com.openhis.clinical.service;
+package com.healthlink.his.clinical.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.clinical.domain.Condition;
+import com.healthlink.his.clinical.domain.Condition;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IDiagnosisBelongBindingService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/IDiagnosisBelongBindingService.java
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IDiagnosisBelongBindingService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/IDiagnosisBelongBindingService.java
index e9ddc3a85..84ed02007 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IDiagnosisBelongBindingService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/IDiagnosisBelongBindingService.java
@@ -1,7 +1,7 @@
-package com.openhis.clinical.service;
+package com.healthlink.his.clinical.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.clinical.domain.DiagnosisBelongBinding;
+import com.healthlink.his.clinical.domain.DiagnosisBelongBinding;
 
 /**
  * 诊断归属绑定Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IOrderService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/IOrderService.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IOrderService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/IOrderService.java
index cf2aa2bad..3478e0fc3 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IOrderService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/IOrderService.java
@@ -1,8 +1,8 @@
-package com.openhis.clinical.service;
+package com.healthlink.his.clinical.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.clinical.domain.Order;
+import com.healthlink.his.clinical.domain.Order;
 
 import java.util.List;
 import java.util.Map;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedurePerformerService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/IProcedurePerformerService.java
similarity index 81%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedurePerformerService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/IProcedurePerformerService.java
index 6f30233c4..3f895c95b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedurePerformerService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/IProcedurePerformerService.java
@@ -1,7 +1,7 @@
-package com.openhis.clinical.service;
+package com.healthlink.his.clinical.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.clinical.domain.ProcedurePerformer;
+import com.healthlink.his.clinical.domain.ProcedurePerformer;
 
 import java.util.Date;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedureService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/IProcedureService.java
similarity index 85%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedureService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/IProcedureService.java
index dda1d4e54..8fafb0aef 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedureService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/IProcedureService.java
@@ -1,10 +1,10 @@
-package com.openhis.clinical.service;
+package com.healthlink.his.clinical.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.clinical.domain.Procedure;
-import com.openhis.common.enums.EventStatus;
-import com.openhis.common.enums.ProcedureCategory;
-import com.openhis.medication.domain.MedicationRequest;
+import com.healthlink.his.clinical.domain.Procedure;
+import com.healthlink.his.common.enums.EventStatus;
+import com.healthlink.his.common.enums.ProcedureCategory;
+import com.healthlink.his.medication.domain.MedicationRequest;
 
 import java.util.Date;
 import java.util.List;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IReservationRecordService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/IReservationRecordService.java
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IReservationRecordService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/IReservationRecordService.java
index 7e22388d2..9f69f2570 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IReservationRecordService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/IReservationRecordService.java
@@ -1,7 +1,7 @@
-package com.openhis.clinical.service;
+package com.healthlink.his.clinical.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.clinical.domain.ReservationRecord;
+import com.healthlink.his.clinical.domain.ReservationRecord;
 
 /**
  * 门诊预约记录Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/ISurgeryService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/ISurgeryService.java
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/ISurgeryService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/ISurgeryService.java
index bfc52ec95..aac370d36 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/ISurgeryService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/ISurgeryService.java
@@ -1,7 +1,7 @@
-package com.openhis.clinical.service;
+package com.healthlink.his.clinical.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.clinical.domain.Surgery;
+import com.healthlink.his.clinical.domain.Surgery;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/ITicketService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/ITicketService.java
similarity index 91%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/ITicketService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/ITicketService.java
index e91b4568b..a359812de 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/ITicketService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/ITicketService.java
@@ -1,8 +1,8 @@
-package com.openhis.clinical.service;
+package com.healthlink.his.clinical.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.clinical.domain.Ticket;
+import com.healthlink.his.clinical.domain.Ticket;
 
 import java.util.List;
 import java.util.Map;
@@ -77,7 +77,7 @@ public interface ITicketService extends IService<Ticket> {
      * @param dto 预约参数
      * @return 结果
      */
-    int bookTicket(com.openhis.appointmentmanage.domain.AppointmentBookDTO dto);
+    int bookTicket(com.healthlink.his.appointmentmanage.domain.AppointmentBookDTO dto);
 
     /**
      * 取消预约
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/AllergyIntoleranceServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/AllergyIntoleranceServiceImpl.java
similarity index 59%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/AllergyIntoleranceServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/AllergyIntoleranceServiceImpl.java
index 88fa2d8cc..df2fc9069 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/AllergyIntoleranceServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/AllergyIntoleranceServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.clinical.service.impl;
+package com.healthlink.his.clinical.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.clinical.domain.AllergyIntolerance;
-import com.openhis.clinical.mapper.AllergyIntoleranceMapper;
-import com.openhis.clinical.service.IAllergyIntoleranceService;
+import com.healthlink.his.clinical.domain.AllergyIntolerance;
+import com.healthlink.his.clinical.mapper.AllergyIntoleranceMapper;
+import com.healthlink.his.clinical.service.IAllergyIntoleranceService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionDefinitionServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/ConditionDefinitionServiceImpl.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionDefinitionServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/ConditionDefinitionServiceImpl.java
index 1cf96100f..6f607d4f7 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionDefinitionServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/ConditionDefinitionServiceImpl.java
@@ -1,13 +1,13 @@
-package com.openhis.clinical.service.impl;
+package com.healthlink.his.clinical.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.enums.DelFlag;
-import com.openhis.clinical.domain.ConditionDefinition;
-import com.openhis.clinical.mapper.ConditionDefinitionMapper;
-import com.openhis.clinical.service.IConditionDefinitionService;
-import com.openhis.common.utils.HisQueryUtils;
+import com.healthlink.his.clinical.domain.ConditionDefinition;
+import com.healthlink.his.clinical.mapper.ConditionDefinitionMapper;
+import com.healthlink.his.clinical.service.IConditionDefinitionService;
+import com.healthlink.his.common.utils.HisQueryUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionNoDefinitionServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/ConditionNoDefinitionServiceImpl.java
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionNoDefinitionServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/ConditionNoDefinitionServiceImpl.java
index 7d3f0923b..7135b9814 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionNoDefinitionServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/ConditionNoDefinitionServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.clinical.service.impl;
+package com.healthlink.his.clinical.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.clinical.domain.ConditionNoDefinition;
-import com.openhis.clinical.mapper.ConditionNoDefinitionMapper;
-import com.openhis.clinical.service.IConditionNoDefinitionService;
+import com.healthlink.his.clinical.domain.ConditionNoDefinition;
+import com.healthlink.his.clinical.mapper.ConditionNoDefinitionMapper;
+import com.healthlink.his.clinical.service.IConditionNoDefinitionService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/ConditionServiceImpl.java
similarity index 86%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/ConditionServiceImpl.java
index 0c531d57e..323eb4ae7 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/ConditionServiceImpl.java
@@ -1,12 +1,12 @@
-package com.openhis.clinical.service.impl;
+package com.healthlink.his.clinical.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.enums.DelFlag;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.clinical.domain.Condition;
-import com.openhis.clinical.mapper.ConditionMapper;
-import com.openhis.clinical.service.IConditionService;
+import com.healthlink.his.clinical.domain.Condition;
+import com.healthlink.his.clinical.mapper.ConditionMapper;
+import com.healthlink.his.clinical.service.IConditionService;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/DiagnosisBelongBindingServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/DiagnosisBelongBindingServiceImpl.java
similarity index 64%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/DiagnosisBelongBindingServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/DiagnosisBelongBindingServiceImpl.java
index 0d88ff633..60a574be8 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/DiagnosisBelongBindingServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/DiagnosisBelongBindingServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.clinical.service.impl;
+package com.healthlink.his.clinical.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.clinical.domain.DiagnosisBelongBinding;
-import com.openhis.clinical.mapper.DiagnosisBelongBindingMapper;
-import com.openhis.clinical.service.IDiagnosisBelongBindingService;
+import com.healthlink.his.clinical.domain.DiagnosisBelongBinding;
+import com.healthlink.his.clinical.mapper.DiagnosisBelongBindingMapper;
+import com.healthlink.his.clinical.service.IDiagnosisBelongBindingService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/OrderServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/OrderServiceImpl.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/OrderServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/OrderServiceImpl.java
index 032e88e42..543990505 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/OrderServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/OrderServiceImpl.java
@@ -1,13 +1,13 @@
-package com.openhis.clinical.service.impl;
+package com.healthlink.his.clinical.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.utils.AssignSeqUtil;
-import com.openhis.clinical.domain.Order;
-import com.openhis.clinical.mapper.OrderMapper;
-import com.openhis.clinical.service.IOrderService;
-import com.openhis.common.enums.AssignSeqEnum;
-import com.openhis.common.enums.OrderStatus;
+import com.healthlink.his.clinical.domain.Order;
+import com.healthlink.his.clinical.mapper.OrderMapper;
+import com.healthlink.his.clinical.service.IOrderService;
+import com.healthlink.his.common.enums.AssignSeqEnum;
+import com.healthlink.his.common.enums.OrderStatus;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedurePerformerServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/ProcedurePerformerServiceImpl.java
similarity index 80%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedurePerformerServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/ProcedurePerformerServiceImpl.java
index e22a477e3..b9bcd6131 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedurePerformerServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/ProcedurePerformerServiceImpl.java
@@ -1,10 +1,10 @@
-package com.openhis.clinical.service.impl;
+package com.healthlink.his.clinical.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.clinical.domain.ProcedurePerformer;
-import com.openhis.clinical.mapper.ProcedurePerformerMapper;
-import com.openhis.clinical.service.IProcedurePerformerService;
+import com.healthlink.his.clinical.domain.ProcedurePerformer;
+import com.healthlink.his.clinical.mapper.ProcedurePerformerMapper;
+import com.healthlink.his.clinical.service.IProcedurePerformerService;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedureServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/ProcedureServiceImpl.java
similarity index 90%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedureServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/ProcedureServiceImpl.java
index 002b12ffa..2c4ae447f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedureServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/ProcedureServiceImpl.java
@@ -1,18 +1,18 @@
-package com.openhis.clinical.service.impl;
+package com.healthlink.his.clinical.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.enums.DelFlag;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.clinical.domain.Procedure;
-import com.openhis.clinical.mapper.ProcedureMapper;
-import com.openhis.clinical.service.IProcedurePerformerService;
-import com.openhis.clinical.service.IProcedureService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.EventStatus;
-import com.openhis.common.enums.ProcedureCategory;
-import com.openhis.medication.domain.MedicationRequest;
+import com.healthlink.his.clinical.domain.Procedure;
+import com.healthlink.his.clinical.mapper.ProcedureMapper;
+import com.healthlink.his.clinical.service.IProcedurePerformerService;
+import com.healthlink.his.clinical.service.IProcedureService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.enums.EventStatus;
+import com.healthlink.his.common.enums.ProcedureCategory;
+import com.healthlink.his.medication.domain.MedicationRequest;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ReservationRecordServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/ReservationRecordServiceImpl.java
similarity index 59%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ReservationRecordServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/ReservationRecordServiceImpl.java
index 18a536a8f..002796814 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ReservationRecordServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/ReservationRecordServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.clinical.service.impl;
+package com.healthlink.his.clinical.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.clinical.domain.ReservationRecord;
-import com.openhis.clinical.mapper.ReservationRecordMapper;
-import com.openhis.clinical.service.IReservationRecordService;
+import com.healthlink.his.clinical.domain.ReservationRecord;
+import com.healthlink.his.clinical.mapper.ReservationRecordMapper;
+import com.healthlink.his.clinical.service.IReservationRecordService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/SurgeryServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/SurgeryServiceImpl.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/SurgeryServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/SurgeryServiceImpl.java
index 4fdfbf1f1..f21d3c5b4 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/SurgeryServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/SurgeryServiceImpl.java
@@ -1,11 +1,11 @@
-package com.openhis.clinical.service.impl;
+package com.healthlink.his.clinical.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.clinical.domain.Surgery;
-import com.openhis.clinical.mapper.SurgeryMapper;
-import com.openhis.clinical.service.ISurgeryService;
-import com.openhis.common.utils.RedisKeys;
+import com.healthlink.his.clinical.domain.Surgery;
+import com.healthlink.his.clinical.mapper.SurgeryMapper;
+import com.healthlink.his.clinical.service.ISurgeryService;
+import com.healthlink.his.common.utils.RedisKeys;
 import com.core.common.core.redis.RedisCache;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/TicketServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/TicketServiceImpl.java
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/TicketServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/TicketServiceImpl.java
index 76a764cba..985a1819f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/TicketServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/TicketServiceImpl.java
@@ -1,22 +1,22 @@
-package com.openhis.clinical.service.impl;
+package com.healthlink.his.clinical.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.appointmentmanage.domain.AppointmentConfig;
-import com.openhis.appointmentmanage.service.IAppointmentConfigService;
-import com.openhis.appointmentmanage.domain.TicketSlotDTO;
-import com.openhis.appointmentmanage.domain.SchedulePool;
-import com.openhis.appointmentmanage.domain.ScheduleSlot;
-import com.openhis.appointmentmanage.mapper.SchedulePoolMapper;
-import com.openhis.appointmentmanage.mapper.ScheduleSlotMapper;
-import com.openhis.clinical.domain.Order;
-import com.openhis.clinical.domain.Ticket;
-import com.openhis.clinical.mapper.TicketMapper;
-import com.openhis.clinical.service.IOrderService;
-import com.openhis.clinical.service.ITicketService;
-import com.openhis.common.enums.SlotStatus;
-import com.openhis.common.enums.OrderStatus;
+import com.healthlink.his.appointmentmanage.domain.AppointmentConfig;
+import com.healthlink.his.appointmentmanage.service.IAppointmentConfigService;
+import com.healthlink.his.appointmentmanage.domain.TicketSlotDTO;
+import com.healthlink.his.appointmentmanage.domain.SchedulePool;
+import com.healthlink.his.appointmentmanage.domain.ScheduleSlot;
+import com.healthlink.his.appointmentmanage.mapper.SchedulePoolMapper;
+import com.healthlink.his.appointmentmanage.mapper.ScheduleSlotMapper;
+import com.healthlink.his.clinical.domain.Order;
+import com.healthlink.his.clinical.domain.Ticket;
+import com.healthlink.his.clinical.mapper.TicketMapper;
+import com.healthlink.his.clinical.service.IOrderService;
+import com.healthlink.his.clinical.service.ITicketService;
+import com.healthlink.his.common.enums.SlotStatus;
+import com.healthlink.his.common.enums.OrderStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -57,7 +57,7 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
     private SchedulePoolMapper schedulePoolMapper;
 
     @Resource
-    private com.openhis.clinical.mapper.OrderMapper orderMapper;
+    private com.healthlink.his.clinical.mapper.OrderMapper orderMapper;
 
     @Resource
     private IAppointmentConfigService appointmentConfigService;
@@ -148,7 +148,7 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int bookTicket(com.openhis.appointmentmanage.domain.AppointmentBookDTO dto) {
+    public int bookTicket(com.healthlink.his.appointmentmanage.domain.AppointmentBookDTO dto) {
         Long slotId = dto.getSlotId();
 
         logger.debug("开始执行纯净打单路线，slotId: {}, patientName: {}", slotId, dto.getPatientName());
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisApplyDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/dto/LisApplyDto.java
similarity index 90%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisApplyDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/dto/LisApplyDto.java
index 47faea03a..360db22eb 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisApplyDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/dto/LisApplyDto.java
@@ -1,8 +1,8 @@
-package com.openhis.crosssystem.dto;
+package com.healthlink.his.crosssystem.dto;
 
-import com.openhis.crosssystem.enums.LisOutsideFlg;
-import com.openhis.crosssystem.enums.LisPatientSex;
-import com.openhis.crosssystem.enums.LisPatientType;
+import com.healthlink.his.crosssystem.enums.LisOutsideFlg;
+import com.healthlink.his.crosssystem.enums.LisPatientSex;
+import com.healthlink.his.crosssystem.enums.LisPatientType;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisApplyGroupDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/dto/LisApplyGroupDto.java
similarity index 88%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisApplyGroupDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/dto/LisApplyGroupDto.java
index 09ff20801..383c4a756 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisApplyGroupDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/dto/LisApplyGroupDto.java
@@ -1,4 +1,4 @@
-package com.openhis.crosssystem.dto;
+package com.healthlink.his.crosssystem.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisGroupInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/dto/LisGroupInfo.java
similarity index 89%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisGroupInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/dto/LisGroupInfo.java
index 1670bcd3c..12f7577cb 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisGroupInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/dto/LisGroupInfo.java
@@ -1,4 +1,4 @@
-package com.openhis.crosssystem.dto;
+package com.healthlink.his.crosssystem.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisPatientInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/dto/LisPatientInfo.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisPatientInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/dto/LisPatientInfo.java
index 5d8d80bc4..05659c9c8 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisPatientInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/dto/LisPatientInfo.java
@@ -1,4 +1,4 @@
-package com.openhis.crosssystem.dto;
+package com.healthlink.his.crosssystem.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/PacsApplyDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/dto/PacsApplyDto.java
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/PacsApplyDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/dto/PacsApplyDto.java
index e812ba5f8..dd8b76b35 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/PacsApplyDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/dto/PacsApplyDto.java
@@ -1,7 +1,7 @@
-package com.openhis.crosssystem.dto;
+package com.healthlink.his.crosssystem.dto;
 
-import com.openhis.crosssystem.enums.PacsPatientSex;
-import com.openhis.crosssystem.enums.PacsPatientType;
+import com.healthlink.his.crosssystem.enums.PacsPatientSex;
+import com.healthlink.his.crosssystem.enums.PacsPatientType;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/PacsGroupInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/dto/PacsGroupInfo.java
similarity index 88%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/PacsGroupInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/dto/PacsGroupInfo.java
index ebe9bd5e4..cf8e967c1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/PacsGroupInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/dto/PacsGroupInfo.java
@@ -1,4 +1,4 @@
-package com.openhis.crosssystem.dto;
+package com.healthlink.his.crosssystem.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/PacsPatientInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/dto/PacsPatientInfo.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/PacsPatientInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/dto/PacsPatientInfo.java
index 9b2ad4e5b..794d17e59 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/PacsPatientInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/dto/PacsPatientInfo.java
@@ -1,4 +1,4 @@
-package com.openhis.crosssystem.dto;
+package com.healthlink.his.crosssystem.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/LisAgeUnit.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/enums/LisAgeUnit.java
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/LisAgeUnit.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/enums/LisAgeUnit.java
index 08fc7deac..494243c1c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/LisAgeUnit.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/enums/LisAgeUnit.java
@@ -1,4 +1,4 @@
-package com.openhis.crosssystem.enums;
+package com.healthlink.his.crosssystem.enums;
 
 /**
  * LIS年龄单位
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/LisOutsideFlg.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/enums/LisOutsideFlg.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/LisOutsideFlg.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/enums/LisOutsideFlg.java
index 62f811d96..2df2352af 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/LisOutsideFlg.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/enums/LisOutsideFlg.java
@@ -1,4 +1,4 @@
-package com.openhis.crosssystem.enums;
+package com.healthlink.his.crosssystem.enums;
 
 /**
  * LIS外检FLG
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/LisPatientSex.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/enums/LisPatientSex.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/LisPatientSex.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/enums/LisPatientSex.java
index 8a4b14f33..1b03045ee 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/LisPatientSex.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/enums/LisPatientSex.java
@@ -1,4 +1,4 @@
-package com.openhis.crosssystem.enums;
+package com.healthlink.his.crosssystem.enums;
 
 /**
  * LIS病人性别
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/LisPatientType.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/enums/LisPatientType.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/LisPatientType.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/enums/LisPatientType.java
index 38f5f6f39..47c5f5332 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/LisPatientType.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/enums/LisPatientType.java
@@ -1,4 +1,4 @@
-package com.openhis.crosssystem.enums;
+package com.healthlink.his.crosssystem.enums;
 
 /**
  * LIS病人类型
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/PacsAgeUnit.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/enums/PacsAgeUnit.java
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/PacsAgeUnit.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/enums/PacsAgeUnit.java
index 88f59238a..c5ec0bd1f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/PacsAgeUnit.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/enums/PacsAgeUnit.java
@@ -1,4 +1,4 @@
-package com.openhis.crosssystem.enums;
+package com.healthlink.his.crosssystem.enums;
 
 /**
  * PACS年龄单位
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/PacsPatientSex.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/enums/PacsPatientSex.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/PacsPatientSex.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/enums/PacsPatientSex.java
index 9c168c355..84e1ff9f1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/PacsPatientSex.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/enums/PacsPatientSex.java
@@ -1,4 +1,4 @@
-package com.openhis.crosssystem.enums;
+package com.healthlink.his.crosssystem.enums;
 
 /**
  * PACS性别
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/PacsPatientType.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/enums/PacsPatientType.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/PacsPatientType.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/enums/PacsPatientType.java
index 144f5740f..c99f7dd34 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/enums/PacsPatientType.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/enums/PacsPatientType.java
@@ -1,4 +1,4 @@
-package com.openhis.crosssystem.enums;
+package com.healthlink.his.crosssystem.enums;
 
 /**
  * PACS患者类型
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/utils/CrossSystemSendApplyUtil.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/utils/CrossSystemSendApplyUtil.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/utils/CrossSystemSendApplyUtil.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/utils/CrossSystemSendApplyUtil.java
index f5f2c99fa..41b385340 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/utils/CrossSystemSendApplyUtil.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/crosssystem/utils/CrossSystemSendApplyUtil.java
@@ -1,4 +1,4 @@
-package com.openhis.crosssystem.utils;
+package com.healthlink.his.crosssystem.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -7,10 +7,10 @@ import com.core.common.exception.ServiceException;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.StringUtils;
 import com.core.web.util.TenantOptionUtil;
-import com.openhis.common.utils.CommonUtil;
-import com.openhis.crosssystem.dto.*;
-import com.openhis.crosssystem.enums.LisAgeUnit;
-import com.openhis.crosssystem.enums.PacsAgeUnit;
+import com.healthlink.his.common.utils.CommonUtil;
+import com.healthlink.his.crosssystem.dto.*;
+import com.healthlink.his.crosssystem.enums.LisAgeUnit;
+import com.healthlink.his.crosssystem.enums.PacsAgeUnit;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.core5.http.ClassicHttpResponse;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocDefinition.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/DocDefinition.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocDefinition.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/DocDefinition.java
index 3dd500a90..7976db23a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocDefinition.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/DocDefinition.java
@@ -1,4 +1,4 @@
-package com.openhis.document.domain;
+package com.healthlink.his.document.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocDefinitionOrganization.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/DocDefinitionOrganization.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocDefinitionOrganization.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/DocDefinitionOrganization.java
index 86fc31a82..a78a1a3bb 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocDefinitionOrganization.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/DocDefinitionOrganization.java
@@ -1,4 +1,4 @@
-package com.openhis.document.domain;
+package com.healthlink.his.document.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocInventoryItemStatic.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/DocInventoryItemStatic.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocInventoryItemStatic.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/DocInventoryItemStatic.java
index 514d0cc47..96d3d1b98 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocInventoryItemStatic.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/DocInventoryItemStatic.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.document.domain;
+package com.healthlink.his.document.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocRecord.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/DocRecord.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocRecord.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/DocRecord.java
index 0be5cb0be..ff05a6d7a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocRecord.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/DocRecord.java
@@ -1,4 +1,4 @@
-package com.openhis.document.domain;
+package com.healthlink.his.document.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatistics.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/DocStatistics.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatistics.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/DocStatistics.java
index 43435fe6d..f9f2a5909 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatistics.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/DocStatistics.java
@@ -1,4 +1,4 @@
-package com.openhis.document.domain;
+package com.healthlink.his.document.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatisticsDefinition.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/DocStatisticsDefinition.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatisticsDefinition.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/DocStatisticsDefinition.java
index aed0b835e..171c35604 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatisticsDefinition.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/DocStatisticsDefinition.java
@@ -1,4 +1,4 @@
-package com.openhis.document.domain;
+package com.healthlink.his.document.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatisticsDefinitionOption.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/DocStatisticsDefinitionOption.java
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatisticsDefinitionOption.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/DocStatisticsDefinitionOption.java
index 5cd737c9d..be461167d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatisticsDefinitionOption.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/DocStatisticsDefinitionOption.java
@@ -1,4 +1,4 @@
-package com.openhis.document.domain;
+package com.healthlink.his.document.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocTemplate.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/DocTemplate.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocTemplate.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/DocTemplate.java
index e52c60f48..e69662e6c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocTemplate.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/DocTemplate.java
@@ -1,4 +1,4 @@
-package com.openhis.document.domain;
+package com.healthlink.his.document.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/Emr.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/Emr.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/Emr.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/Emr.java
index 51728e6e9..050b5b8e8 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/Emr.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/Emr.java
@@ -1,4 +1,4 @@
-package com.openhis.document.domain;
+package com.healthlink.his.document.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrDetail.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/EmrDetail.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrDetail.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/EmrDetail.java
index 1bb44136d..21b5f4b90 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrDetail.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/EmrDetail.java
@@ -1,4 +1,4 @@
-package com.openhis.document.domain;
+package com.healthlink.his.document.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrDict.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/EmrDict.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrDict.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/EmrDict.java
index ce0000321..6816a2ec9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrDict.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/EmrDict.java
@@ -1,4 +1,4 @@
-package com.openhis.document.domain;
+package com.healthlink.his.document.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrTemplate.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/EmrTemplate.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrTemplate.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/EmrTemplate.java
index 87ecffc72..e81f78660 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrTemplate.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/EmrTemplate.java
@@ -1,4 +1,4 @@
-package com.openhis.document.domain;
+package com.healthlink.his.document.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/OrderProcess.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/OrderProcess.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/OrderProcess.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/OrderProcess.java
index 34ea6477f..2c30c10a7 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/OrderProcess.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/OrderProcess.java
@@ -1,4 +1,4 @@
-package com.openhis.document.domain;
+package com.healthlink.his.document.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/RequestForm.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/RequestForm.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/RequestForm.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/RequestForm.java
index 4b0d41021..327a54e49 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/RequestForm.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/RequestForm.java
@@ -1,4 +1,4 @@
-package com.openhis.document.domain;
+package com.healthlink.his.document.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/VitalSigns.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/VitalSigns.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/VitalSigns.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/VitalSigns.java
index d6160a976..c2ea5a1c6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/VitalSigns.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/domain/VitalSigns.java
@@ -1,4 +1,4 @@
-package com.openhis.document.domain;
+package com.healthlink.his.document.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocDefinitionMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/DocDefinitionMapper.java
similarity index 65%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocDefinitionMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/DocDefinitionMapper.java
index 9b2697d65..58029d311 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocDefinitionMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/DocDefinitionMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.document.mapper;
+package com.healthlink.his.document.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.document.domain.DocDefinition;
+import com.healthlink.his.document.domain.DocDefinition;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocDefinitionOrganizationMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/DocDefinitionOrganizationMapper.java
similarity index 65%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocDefinitionOrganizationMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/DocDefinitionOrganizationMapper.java
index c7ff7cae5..0bd8aeeb4 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocDefinitionOrganizationMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/DocDefinitionOrganizationMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.document.mapper;
+package com.healthlink.his.document.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.document.domain.DocDefinitionOrganization;
+import com.healthlink.his.document.domain.DocDefinitionOrganization;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocInventoryItemStaticMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/DocInventoryItemStaticMapper.java
similarity index 76%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocInventoryItemStaticMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/DocInventoryItemStaticMapper.java
index 46e9b83d5..14e0233cf 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocInventoryItemStaticMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/DocInventoryItemStaticMapper.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.document.mapper;
+package com.healthlink.his.document.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.document.domain.DocInventoryItemStatic;
+import com.healthlink.his.document.domain.DocInventoryItemStatic;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocRecordMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/DocRecordMapper.java
similarity index 66%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocRecordMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/DocRecordMapper.java
index fe046dae5..8b89a1dcc 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocRecordMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/DocRecordMapper.java
@@ -1,8 +1,8 @@
 
-package com.openhis.document.mapper;
+package com.healthlink.his.document.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.document.domain.DocRecord;
+import com.healthlink.his.document.domain.DocRecord;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsDefinitionMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/DocStatisticsDefinitionMapper.java
similarity index 66%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsDefinitionMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/DocStatisticsDefinitionMapper.java
index 333788905..021f84f1d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsDefinitionMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/DocStatisticsDefinitionMapper.java
@@ -1,8 +1,8 @@
 
-package com.openhis.document.mapper;
+package com.healthlink.his.document.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.document.domain.DocStatisticsDefinition;
+import com.healthlink.his.document.domain.DocStatisticsDefinition;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsDefinitionOptionMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/DocStatisticsDefinitionOptionMapper.java
similarity index 66%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsDefinitionOptionMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/DocStatisticsDefinitionOptionMapper.java
index baf2940a1..9a9dfdfd3 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsDefinitionOptionMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/DocStatisticsDefinitionOptionMapper.java
@@ -1,8 +1,8 @@
 
-package com.openhis.document.mapper;
+package com.healthlink.his.document.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.document.domain.DocStatisticsDefinitionOption;
+import com.healthlink.his.document.domain.DocStatisticsDefinitionOption;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/DocStatisticsMapper.java
similarity index 87%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/DocStatisticsMapper.java
index 5cdb1bf23..a0346dbd0 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/DocStatisticsMapper.java
@@ -1,8 +1,8 @@
 
-package com.openhis.document.mapper;
+package com.healthlink.his.document.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.document.domain.DocStatistics;
+import com.healthlink.his.document.domain.DocStatistics;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocTemplateMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/DocTemplateMapper.java
similarity index 65%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocTemplateMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/DocTemplateMapper.java
index ba52f97fe..128999813 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocTemplateMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/DocTemplateMapper.java
@@ -1,8 +1,8 @@
 
-package com.openhis.document.mapper;
+package com.healthlink.his.document.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.document.domain.DocTemplate;
+import com.healthlink.his.document.domain.DocTemplate;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrDetailMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/EmrDetailMapper.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrDetailMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/EmrDetailMapper.java
index 603f874ac..a4a87b2b5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrDetailMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/EmrDetailMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.document.mapper;
+package com.healthlink.his.document.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.document.domain.EmrDetail;
+import com.healthlink.his.document.domain.EmrDetail;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrDictMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/EmrDictMapper.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrDictMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/EmrDictMapper.java
index e99414e88..c1905ec01 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrDictMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/EmrDictMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.document.mapper;
+package com.healthlink.his.document.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.document.domain.EmrDict;
+import com.healthlink.his.document.domain.EmrDict;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/EmrMapper.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/EmrMapper.java
index 005adde6d..72439ea49 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/EmrMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.document.mapper;
+package com.healthlink.his.document.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.document.domain.Emr;
+import com.healthlink.his.document.domain.Emr;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrTemplateMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/EmrTemplateMapper.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrTemplateMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/EmrTemplateMapper.java
index 9e6fb8bca..13aa095b1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrTemplateMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/EmrTemplateMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.document.mapper;
+package com.healthlink.his.document.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.document.domain.EmrTemplate;
+import com.healthlink.his.document.domain.EmrTemplate;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/OrderProcessMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/OrderProcessMapper.java
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/OrderProcessMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/OrderProcessMapper.java
index f09cc8799..b958c1f1b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/OrderProcessMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/OrderProcessMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.document.mapper;
+package com.healthlink.his.document.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.document.domain.OrderProcess;
+import com.healthlink.his.document.domain.OrderProcess;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/RequestFormMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/RequestFormMapper.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/RequestFormMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/RequestFormMapper.java
index 1c64b3776..01404d901 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/RequestFormMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/RequestFormMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.document.mapper;
+package com.healthlink.his.document.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.document.domain.RequestForm;
+import com.healthlink.his.document.domain.RequestForm;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/VitalSignsMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/VitalSignsMapper.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/VitalSignsMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/VitalSignsMapper.java
index ab9abe058..f5fb0ab18 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/VitalSignsMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/mapper/VitalSignsMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.document.mapper;
+package com.healthlink.his.document.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.document.domain.VitalSigns;
+import com.healthlink.his.document.domain.VitalSigns;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocDefinitionOrganizationService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IDocDefinitionOrganizationService.java
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocDefinitionOrganizationService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IDocDefinitionOrganizationService.java
index 2d570d290..8b4360e3c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocDefinitionOrganizationService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IDocDefinitionOrganizationService.java
@@ -1,7 +1,7 @@
-package com.openhis.document.service;
+package com.healthlink.his.document.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.document.domain.DocDefinitionOrganization;
+import com.healthlink.his.document.domain.DocDefinitionOrganization;
 
 /**
  * 病历定义服务接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocDefinitionService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IDocDefinitionService.java
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocDefinitionService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IDocDefinitionService.java
index 65cc13d75..bea634dc3 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocDefinitionService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IDocDefinitionService.java
@@ -1,7 +1,7 @@
-package com.openhis.document.service;
+package com.healthlink.his.document.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.document.domain.DocDefinition;
+import com.healthlink.his.document.domain.DocDefinition;
 
 /**
  * 病历定义服务接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocInventoryItemStaticService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IDocInventoryItemStaticService.java
similarity index 85%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocInventoryItemStaticService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IDocInventoryItemStaticService.java
index 3bd6315a7..7b4436dd2 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocInventoryItemStaticService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IDocInventoryItemStaticService.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.document.service;
+package com.healthlink.his.document.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.document.domain.DocInventoryItemStatic;
+import com.healthlink.his.document.domain.DocInventoryItemStatic;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocRecordService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IDocRecordService.java
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocRecordService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IDocRecordService.java
index d6652eb7f..e9210b41d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocRecordService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IDocRecordService.java
@@ -1,7 +1,7 @@
-package com.openhis.document.service;
+package com.healthlink.his.document.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.document.domain.DocRecord;
+import com.healthlink.his.document.domain.DocRecord;
 
 /**
  * 病历定义服务接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsDefinitionOptionService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IDocStatisticsDefinitionOptionService.java
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsDefinitionOptionService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IDocStatisticsDefinitionOptionService.java
index 84df59735..4963b489e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsDefinitionOptionService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IDocStatisticsDefinitionOptionService.java
@@ -1,7 +1,7 @@
-package com.openhis.document.service;
+package com.healthlink.his.document.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.document.domain.DocStatisticsDefinitionOption;
+import com.healthlink.his.document.domain.DocStatisticsDefinitionOption;
 
 /**
  * 病历定义服务接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsDefinitionService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IDocStatisticsDefinitionService.java
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsDefinitionService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IDocStatisticsDefinitionService.java
index 339a317e8..f3c7e2440 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsDefinitionService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IDocStatisticsDefinitionService.java
@@ -1,7 +1,7 @@
-package com.openhis.document.service;
+package com.healthlink.his.document.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.document.domain.DocStatisticsDefinition;
+import com.healthlink.his.document.domain.DocStatisticsDefinition;
 
 /**
  * 病历定义服务接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IDocStatisticsService.java
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IDocStatisticsService.java
index 59b5eca58..9fc8c25c8 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IDocStatisticsService.java
@@ -1,7 +1,7 @@
-package com.openhis.document.service;
+package com.healthlink.his.document.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.document.domain.DocStatistics;
+import com.healthlink.his.document.domain.DocStatistics;
 
 /**
  * 病历定义服务接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocTemplateService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IDocTemplateService.java
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocTemplateService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IDocTemplateService.java
index 52d1fc7b6..174d71d72 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocTemplateService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IDocTemplateService.java
@@ -1,7 +1,7 @@
-package com.openhis.document.service;
+package com.healthlink.his.document.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.document.domain.DocTemplate;
+import com.healthlink.his.document.domain.DocTemplate;
 
 /**
  * 病历定义服务接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IEmrDetailService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IEmrDetailService.java
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IEmrDetailService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IEmrDetailService.java
index 788904229..a73777b45 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IEmrDetailService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IEmrDetailService.java
@@ -1,7 +1,7 @@
-package com.openhis.document.service;
+package com.healthlink.his.document.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.document.domain.EmrDetail;
+import com.healthlink.his.document.domain.EmrDetail;
 
 /**
  * 电子病历详情Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IEmrDictService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IEmrDictService.java
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IEmrDictService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IEmrDictService.java
index f92e8e1c8..63e50d2d6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IEmrDictService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IEmrDictService.java
@@ -1,7 +1,7 @@
-package com.openhis.document.service;
+package com.healthlink.his.document.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.document.domain.EmrDict;
+import com.healthlink.his.document.domain.EmrDict;
 
 /**
  * 电子病历字典Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IEmrService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IEmrService.java
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IEmrService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IEmrService.java
index 18c47a9bd..260d038e3 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IEmrService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IEmrService.java
@@ -1,7 +1,7 @@
-package com.openhis.document.service;
+package com.healthlink.his.document.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.document.domain.Emr;
+import com.healthlink.his.document.domain.Emr;
 
 /**
  * 病历信息Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IEmrTemplateService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IEmrTemplateService.java
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IEmrTemplateService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IEmrTemplateService.java
index 6ac2bfc52..f338f5399 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IEmrTemplateService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IEmrTemplateService.java
@@ -1,7 +1,7 @@
-package com.openhis.document.service;
+package com.healthlink.his.document.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.document.domain.EmrTemplate;
+import com.healthlink.his.document.domain.EmrTemplate;
 
 /**
  * 病历模板Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IOrderProcessService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IOrderProcessService.java
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IOrderProcessService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IOrderProcessService.java
index b9d709fce..693c0b6e6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IOrderProcessService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IOrderProcessService.java
@@ -1,7 +1,7 @@
-package com.openhis.document.service;
+package com.healthlink.his.document.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.document.domain.OrderProcess;
+import com.healthlink.his.document.domain.OrderProcess;
 
 /**
  * 医嘱过程Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IRequestFormService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IRequestFormService.java
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IRequestFormService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IRequestFormService.java
index 3da96509a..053f9436a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IRequestFormService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IRequestFormService.java
@@ -1,7 +1,7 @@
-package com.openhis.document.service;
+package com.healthlink.his.document.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.document.domain.RequestForm;
+import com.healthlink.his.document.domain.RequestForm;
 
 /**
  * 申请单管理Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IVitalSignsService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IVitalSignsService.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IVitalSignsService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IVitalSignsService.java
index c7efe3a91..ee0814a6f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IVitalSignsService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/IVitalSignsService.java
@@ -1,7 +1,7 @@
-package com.openhis.document.service;
+package com.healthlink.his.document.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.document.domain.VitalSigns;
+import com.healthlink.his.document.domain.VitalSigns;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocDefinitionOrganizationServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/DocDefinitionOrganizationServiceImpl.java
similarity index 53%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocDefinitionOrganizationServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/DocDefinitionOrganizationServiceImpl.java
index dfc744192..fa5dded88 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocDefinitionOrganizationServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/DocDefinitionOrganizationServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.document.service.impl;
+package com.healthlink.his.document.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.document.domain.DocDefinitionOrganization;
-import com.openhis.document.mapper.DocDefinitionOrganizationMapper;
-import com.openhis.document.service.IDocDefinitionOrganizationService;
+import com.healthlink.his.document.domain.DocDefinitionOrganization;
+import com.healthlink.his.document.mapper.DocDefinitionOrganizationMapper;
+import com.healthlink.his.document.service.IDocDefinitionOrganizationService;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocDefinitionServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/DocDefinitionServiceImpl.java
similarity index 52%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocDefinitionServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/DocDefinitionServiceImpl.java
index 2b349d0bc..3307f3237 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocDefinitionServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/DocDefinitionServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.document.service.impl;
+package com.healthlink.his.document.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.document.domain.DocDefinition;
-import com.openhis.document.mapper.DocDefinitionMapper;
-import com.openhis.document.service.IDocDefinitionService;
+import com.healthlink.his.document.domain.DocDefinition;
+import com.healthlink.his.document.mapper.DocDefinitionMapper;
+import com.healthlink.his.document.service.IDocDefinitionService;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocInventoryItemStaticServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/DocInventoryItemStaticServiceImpl.java
similarity index 84%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocInventoryItemStaticServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/DocInventoryItemStaticServiceImpl.java
index 711baebfc..478ac2340 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocInventoryItemStaticServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/DocInventoryItemStaticServiceImpl.java
@@ -1,14 +1,14 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.document.service.impl;
+package com.healthlink.his.document.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.enums.DelFlag;
-import com.openhis.document.domain.DocInventoryItemStatic;
-import com.openhis.document.mapper.DocInventoryItemStaticMapper;
-import com.openhis.document.service.IDocInventoryItemStaticService;
+import com.healthlink.his.document.domain.DocInventoryItemStatic;
+import com.healthlink.his.document.mapper.DocInventoryItemStaticMapper;
+import com.healthlink.his.document.service.IDocInventoryItemStaticService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocRecordServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/DocRecordServiceImpl.java
similarity index 51%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocRecordServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/DocRecordServiceImpl.java
index b5124f6a4..faae4ef6c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocRecordServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/DocRecordServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.document.service.impl;
+package com.healthlink.his.document.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.document.domain.DocRecord;
-import com.openhis.document.mapper.DocRecordMapper;
-import com.openhis.document.service.IDocRecordService;
+import com.healthlink.his.document.domain.DocRecord;
+import com.healthlink.his.document.mapper.DocRecordMapper;
+import com.healthlink.his.document.service.IDocRecordService;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsDefinitionOptionServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/DocStatisticsDefinitionOptionServiceImpl.java
similarity index 53%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsDefinitionOptionServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/DocStatisticsDefinitionOptionServiceImpl.java
index 16aedd0ca..15076db11 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsDefinitionOptionServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/DocStatisticsDefinitionOptionServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.document.service.impl;
+package com.healthlink.his.document.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.document.domain.DocStatisticsDefinitionOption;
-import com.openhis.document.mapper.DocStatisticsDefinitionOptionMapper;
-import com.openhis.document.service.IDocStatisticsDefinitionOptionService;
+import com.healthlink.his.document.domain.DocStatisticsDefinitionOption;
+import com.healthlink.his.document.mapper.DocStatisticsDefinitionOptionMapper;
+import com.healthlink.his.document.service.IDocStatisticsDefinitionOptionService;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsDefinitionServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/DocStatisticsDefinitionServiceImpl.java
similarity index 53%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsDefinitionServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/DocStatisticsDefinitionServiceImpl.java
index cc19ef0d4..e04aced51 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsDefinitionServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/DocStatisticsDefinitionServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.document.service.impl;
+package com.healthlink.his.document.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.document.domain.DocStatisticsDefinition;
-import com.openhis.document.mapper.DocStatisticsDefinitionMapper;
-import com.openhis.document.service.IDocStatisticsDefinitionService;
+import com.healthlink.his.document.domain.DocStatisticsDefinition;
+import com.healthlink.his.document.mapper.DocStatisticsDefinitionMapper;
+import com.healthlink.his.document.service.IDocStatisticsDefinitionService;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/DocStatisticsServiceImpl.java
similarity index 52%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/DocStatisticsServiceImpl.java
index 4e7036384..f15865585 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/DocStatisticsServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.document.service.impl;
+package com.healthlink.his.document.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.document.domain.DocStatistics;
-import com.openhis.document.mapper.DocStatisticsMapper;
-import com.openhis.document.service.IDocStatisticsService;
+import com.healthlink.his.document.domain.DocStatistics;
+import com.healthlink.his.document.mapper.DocStatisticsMapper;
+import com.healthlink.his.document.service.IDocStatisticsService;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocTemplateServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/DocTemplateServiceImpl.java
similarity index 52%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocTemplateServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/DocTemplateServiceImpl.java
index eb086d731..b9b7897bc 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocTemplateServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/DocTemplateServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.document.service.impl;
+package com.healthlink.his.document.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.document.domain.DocTemplate;
-import com.openhis.document.mapper.DocTemplateMapper;
-import com.openhis.document.service.IDocTemplateService;
+import com.healthlink.his.document.domain.DocTemplate;
+import com.healthlink.his.document.mapper.DocTemplateMapper;
+import com.healthlink.his.document.service.IDocTemplateService;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrDetailServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/EmrDetailServiceImpl.java
similarity index 59%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrDetailServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/EmrDetailServiceImpl.java
index 01c92b1d7..4c82a1f09 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrDetailServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/EmrDetailServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.document.service.impl;
+package com.healthlink.his.document.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.document.domain.EmrDetail;
-import com.openhis.document.mapper.EmrDetailMapper;
-import com.openhis.document.service.IEmrDetailService;
+import com.healthlink.his.document.domain.EmrDetail;
+import com.healthlink.his.document.mapper.EmrDetailMapper;
+import com.healthlink.his.document.service.IEmrDetailService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrDictServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/EmrDictServiceImpl.java
similarity index 59%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrDictServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/EmrDictServiceImpl.java
index 4f4793f9b..9c5c5e6a9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrDictServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/EmrDictServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.document.service.impl;
+package com.healthlink.his.document.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.document.domain.EmrDict;
-import com.openhis.document.mapper.EmrDictMapper;
-import com.openhis.document.service.IEmrDictService;
+import com.healthlink.his.document.domain.EmrDict;
+import com.healthlink.his.document.mapper.EmrDictMapper;
+import com.healthlink.his.document.service.IEmrDictService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/EmrServiceImpl.java
similarity index 59%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/EmrServiceImpl.java
index 0a69fbdc8..6fc3bdae1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/EmrServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.document.service.impl;
+package com.healthlink.his.document.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.document.domain.Emr;
-import com.openhis.document.mapper.EmrMapper;
-import com.openhis.document.service.IEmrService;
+import com.healthlink.his.document.domain.Emr;
+import com.healthlink.his.document.mapper.EmrMapper;
+import com.healthlink.his.document.service.IEmrService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrTemplateServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/EmrTemplateServiceImpl.java
similarity index 59%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrTemplateServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/EmrTemplateServiceImpl.java
index af0a41051..867716faa 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrTemplateServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/EmrTemplateServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.document.service.impl;
+package com.healthlink.his.document.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.document.domain.EmrTemplate;
-import com.openhis.document.mapper.EmrTemplateMapper;
-import com.openhis.document.service.IEmrTemplateService;
+import com.healthlink.his.document.domain.EmrTemplate;
+import com.healthlink.his.document.mapper.EmrTemplateMapper;
+import com.healthlink.his.document.service.IEmrTemplateService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/OrderProcessServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/OrderProcessServiceImpl.java
similarity index 59%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/OrderProcessServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/OrderProcessServiceImpl.java
index c3aeda257..93191cb14 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/OrderProcessServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/OrderProcessServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.document.service.impl;
+package com.healthlink.his.document.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.document.domain.OrderProcess;
-import com.openhis.document.mapper.OrderProcessMapper;
-import com.openhis.document.service.IOrderProcessService;
+import com.healthlink.his.document.domain.OrderProcess;
+import com.healthlink.his.document.mapper.OrderProcessMapper;
+import com.healthlink.his.document.service.IOrderProcessService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/RequestFormServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/RequestFormServiceImpl.java
similarity index 59%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/RequestFormServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/RequestFormServiceImpl.java
index 15d38533a..2fd1393fb 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/RequestFormServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/RequestFormServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.document.service.impl;
+package com.healthlink.his.document.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.document.domain.RequestForm;
-import com.openhis.document.mapper.RequestFormMapper;
-import com.openhis.document.service.IRequestFormService;
+import com.healthlink.his.document.domain.RequestForm;
+import com.healthlink.his.document.mapper.RequestFormMapper;
+import com.healthlink.his.document.service.IRequestFormService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/VitalSignsServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/VitalSignsServiceImpl.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/VitalSignsServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/VitalSignsServiceImpl.java
index 8d44a6081..25069eeb7 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/VitalSignsServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/VitalSignsServiceImpl.java
@@ -1,10 +1,10 @@
-package com.openhis.document.service.impl;
+package com.healthlink.his.document.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.document.domain.VitalSigns;
-import com.openhis.document.mapper.VitalSignsMapper;
-import com.openhis.document.service.IVitalSignsService;
+import com.healthlink.his.document.domain.VitalSigns;
+import com.healthlink.his.document.mapper.VitalSignsMapper;
+import com.healthlink.his.document.service.IVitalSignsService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/Claim.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/Claim.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/Claim.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/Claim.java
index 2f118f3e7..d47e90204 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/Claim.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/Claim.java
@@ -1,10 +1,10 @@
-package com.openhis.financial.domain;
+package com.healthlink.his.financial.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
-import com.openhis.common.enums.ClaimUse;
+import com.healthlink.his.common.enums.ClaimUse;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/ClaimResponse.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/ClaimResponse.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/ClaimResponse.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/ClaimResponse.java
index aeeb1a08a..acc2dd93b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/ClaimResponse.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/ClaimResponse.java
@@ -1,4 +1,4 @@
-package com.openhis.financial.domain;
+package com.healthlink.his.financial.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/Contract.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/Contract.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/Contract.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/Contract.java
index 17bc5be71..df47cb785 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/Contract.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/Contract.java
@@ -1,4 +1,4 @@
-package com.openhis.financial.domain;
+package com.healthlink.his.financial.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentNotice.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/PaymentNotice.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentNotice.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/PaymentNotice.java
index 024f72423..94753de72 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentNotice.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/PaymentNotice.java
@@ -1,4 +1,4 @@
-package com.openhis.financial.domain;
+package com.healthlink.his.financial.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecDetail.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/PaymentRecDetail.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecDetail.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/PaymentRecDetail.java
index fecbc8b6b..28c55c303 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecDetail.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/PaymentRecDetail.java
@@ -1,4 +1,4 @@
-package com.openhis.financial.domain;
+package com.healthlink.his.financial.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecStatic.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/PaymentRecStatic.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecStatic.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/PaymentRecStatic.java
index f3b46e57d..053cc3a58 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecStatic.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/PaymentRecStatic.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.financial.domain;
+package com.healthlink.his.financial.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/PaymentReconciliation.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/PaymentReconciliation.java
index 141bd0408..befa8a5d8 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/PaymentReconciliation.java
@@ -1,4 +1,4 @@
-package com.openhis.financial.domain;
+package com.healthlink.his.financial.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/RefundLog.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/RefundLog.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/RefundLog.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/RefundLog.java
index c90ec346c..b98d62e27 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/RefundLog.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/RefundLog.java
@@ -1,4 +1,4 @@
-package com.openhis.financial.domain;
+package com.healthlink.his.financial.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/ThreePartPayCallBack.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/ThreePartPayCallBack.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/ThreePartPayCallBack.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/ThreePartPayCallBack.java
index 4682c57ac..e2b29977a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/ThreePartPayCallBack.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/ThreePartPayCallBack.java
@@ -1,4 +1,4 @@
-package com.openhis.financial.domain;
+package com.healthlink.his.financial.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/ThreePartPayRequest.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/ThreePartPayRequest.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/ThreePartPayRequest.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/ThreePartPayRequest.java
index 861b98bc6..a73e9e5e4 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/ThreePartPayRequest.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/domain/ThreePartPayRequest.java
@@ -1,4 +1,4 @@
-package com.openhis.financial.domain;
+package com.healthlink.his.financial.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ClaimMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/mapper/ClaimMapper.java
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ClaimMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/mapper/ClaimMapper.java
index bea049c0c..6c07df386 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ClaimMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/mapper/ClaimMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.financial.mapper;
+package com.healthlink.his.financial.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.financial.domain.Claim;
+import com.healthlink.his.financial.domain.Claim;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ClaimResponseMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/mapper/ClaimResponseMapper.java
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ClaimResponseMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/mapper/ClaimResponseMapper.java
index 713b56c44..230ceb590 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ClaimResponseMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/mapper/ClaimResponseMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.financial.mapper;
+package com.healthlink.his.financial.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.financial.domain.ClaimResponse;
+import com.healthlink.his.financial.domain.ClaimResponse;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ContractMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/mapper/ContractMapper.java
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ContractMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/mapper/ContractMapper.java
index 2042c0ab4..ae7941f2a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ContractMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/mapper/ContractMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.financial.mapper;
+package com.healthlink.his.financial.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.financial.domain.Contract;
+import com.healthlink.his.financial.domain.Contract;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentNoticeMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/mapper/PaymentNoticeMapper.java
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentNoticeMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/mapper/PaymentNoticeMapper.java
index a53534876..0df66f0e0 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentNoticeMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/mapper/PaymentNoticeMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.financial.mapper;
+package com.healthlink.his.financial.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.financial.domain.PaymentNotice;
+import com.healthlink.his.financial.domain.PaymentNotice;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecDetailMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/mapper/PaymentRecDetailMapper.java
similarity index 77%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecDetailMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/mapper/PaymentRecDetailMapper.java
index bf7f057f1..e1067b224 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecDetailMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/mapper/PaymentRecDetailMapper.java
@@ -1,8 +1,8 @@
-package com.openhis.financial.mapper;
+package com.healthlink.his.financial.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.financial.domain.PaymentRecDetail;
-import com.openhis.financial.model.PaymentRecDetailAccountResult;
+import com.healthlink.his.financial.domain.PaymentRecDetail;
+import com.healthlink.his.financial.model.PaymentRecDetailAccountResult;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecStaticMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/mapper/PaymentRecStaticMapper.java
similarity index 76%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecStaticMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/mapper/PaymentRecStaticMapper.java
index 9fa0b8814..acbe3ca7a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecStaticMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/mapper/PaymentRecStaticMapper.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.financial.mapper;
+package com.healthlink.his.financial.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.financial.domain.PaymentRecStatic;
+import com.healthlink.his.financial.domain.PaymentRecStatic;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentReconciliationMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/mapper/PaymentReconciliationMapper.java
similarity index 84%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentReconciliationMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/mapper/PaymentReconciliationMapper.java
index bec35132f..c2da95d23 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentReconciliationMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/mapper/PaymentReconciliationMapper.java
@@ -1,8 +1,8 @@
-package com.openhis.financial.mapper;
+package com.healthlink.his.financial.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.financial.domain.PaymentReconciliation;
-import com.openhis.financial.model.PaymentReconciliationAccountDel;
+import com.healthlink.his.financial.domain.PaymentReconciliation;
+import com.healthlink.his.financial.model.PaymentReconciliationAccountDel;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/RefundLogMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/mapper/RefundLogMapper.java
similarity index 61%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/RefundLogMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/mapper/RefundLogMapper.java
index 731dd82ca..e4799fb63 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/RefundLogMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/mapper/RefundLogMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.financial.mapper;
+package com.healthlink.his.financial.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.financial.domain.RefundLog;
+import com.healthlink.his.financial.domain.RefundLog;
 
 /**
  * 退号日志 Mapper接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ThreePartPayCallBackMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/mapper/ThreePartPayCallBackMapper.java
similarity index 65%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ThreePartPayCallBackMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/mapper/ThreePartPayCallBackMapper.java
index c3d1f6fc2..a99689d3f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ThreePartPayCallBackMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/mapper/ThreePartPayCallBackMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.financial.mapper;
+package com.healthlink.his.financial.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.financial.domain.ThreePartPayCallBack;
+import com.healthlink.his.financial.domain.ThreePartPayCallBack;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentRecDetailAccountResult.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/model/PaymentRecDetailAccountResult.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentRecDetailAccountResult.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/model/PaymentRecDetailAccountResult.java
index 37bca314f..d58512dc4 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentRecDetailAccountResult.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/model/PaymentRecDetailAccountResult.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.financial.model;
+package com.healthlink.his.financial.model;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentRecDetailDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/model/PaymentRecDetailDto.java
similarity index 89%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentRecDetailDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/model/PaymentRecDetailDto.java
index 68d1c73d1..b46875ed6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentRecDetailDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/model/PaymentRecDetailDto.java
@@ -1,4 +1,4 @@
-package com.openhis.financial.model;
+package com.healthlink.his.financial.model;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentReconciliationAccountDel.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/model/PaymentReconciliationAccountDel.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentReconciliationAccountDel.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/model/PaymentReconciliationAccountDel.java
index e441519e7..c2c62969b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentReconciliationAccountDel.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/model/PaymentReconciliationAccountDel.java
@@ -1,4 +1,4 @@
-package com.openhis.financial.model;
+package com.healthlink.his.financial.model;
 
 import com.core.common.core.domain.HisBaseEntity;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentResult.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/model/PaymentResult.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentResult.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/model/PaymentResult.java
index 0122eb710..24d010218 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentResult.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/model/PaymentResult.java
@@ -1,6 +1,6 @@
-package com.openhis.financial.model;
+package com.healthlink.his.financial.model;
 
-import com.openhis.yb.dto.Clinic2206FundPaymentResult;
+import com.healthlink.his.yb.dto.Clinic2206FundPaymentResult;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentedItemModel.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/model/PaymentedItemModel.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentedItemModel.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/model/PaymentedItemModel.java
index ed7444a3b..62d689b26 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentedItemModel.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/model/PaymentedItemModel.java
@@ -1,4 +1,4 @@
-package com.openhis.financial.model;
+package com.healthlink.his.financial.model;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PrePaymentResult.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/model/PrePaymentResult.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PrePaymentResult.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/model/PrePaymentResult.java
index c04004b54..6d64f5e98 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PrePaymentResult.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/model/PrePaymentResult.java
@@ -1,7 +1,7 @@
-package com.openhis.financial.model;
+package com.healthlink.his.financial.model;
 
 import com.alibaba.fastjson2.annotation.JSONField;
-import com.openhis.yb.dto.Clinic2206FundPaymentResult;
+import com.healthlink.his.yb.dto.Clinic2206FundPaymentResult;
 import lombok.Data;
 
 import java.math.BigDecimal;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PrePaymentResultModel.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/model/PrePaymentResultModel.java
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PrePaymentResultModel.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/model/PrePaymentResultModel.java
index f57c83972..67e4850cd 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PrePaymentResultModel.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/model/PrePaymentResultModel.java
@@ -1,6 +1,6 @@
-package com.openhis.financial.model;
+package com.healthlink.his.financial.model;
 
-import com.openhis.financial.domain.PaymentReconciliation;
+import com.healthlink.his.financial.domain.PaymentReconciliation;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/StudentPaymentItemModel.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/model/StudentPaymentItemModel.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/StudentPaymentItemModel.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/model/StudentPaymentItemModel.java
index e5a4145d6..23ea3e543 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/StudentPaymentItemModel.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/model/StudentPaymentItemModel.java
@@ -1,4 +1,4 @@
-package com.openhis.financial.model;
+package com.healthlink.his.financial.model;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IClaimResponseService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/IClaimResponseService.java
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IClaimResponseService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/IClaimResponseService.java
index 36a4c9760..97e9868ff 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IClaimResponseService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/IClaimResponseService.java
@@ -1,7 +1,7 @@
-package com.openhis.financial.service;
+package com.healthlink.his.financial.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.financial.domain.ClaimResponse;
+import com.healthlink.his.financial.domain.ClaimResponse;
 
 /**
  * 索赔响应管理Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IClaimService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/IClaimService.java
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IClaimService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/IClaimService.java
index 6977e694f..ea19e1ac4 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IClaimService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/IClaimService.java
@@ -1,7 +1,7 @@
-package com.openhis.financial.service;
+package com.healthlink.his.financial.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.financial.domain.Claim;
+import com.healthlink.his.financial.domain.Claim;
 
 /**
  * 索赔管理Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IContractService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/IContractService.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IContractService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/IContractService.java
index 454b6ab64..9f5243022 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IContractService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/IContractService.java
@@ -1,8 +1,8 @@
-package com.openhis.financial.service;
+package com.healthlink.his.financial.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.financial.domain.Contract;
+import com.healthlink.his.financial.domain.Contract;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentNoticeService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/IPaymentNoticeService.java
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentNoticeService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/IPaymentNoticeService.java
index 0ffa2bd6e..971d00d3b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentNoticeService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/IPaymentNoticeService.java
@@ -1,7 +1,7 @@
-package com.openhis.financial.service;
+package com.healthlink.his.financial.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.financial.domain.PaymentNotice;
+import com.healthlink.his.financial.domain.PaymentNotice;
 
 /**
  * 合同管理Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentRecDetailService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/IPaymentRecDetailService.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentRecDetailService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/IPaymentRecDetailService.java
index 78144fd19..afaf919dd 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentRecDetailService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/IPaymentRecDetailService.java
@@ -1,9 +1,9 @@
-package com.openhis.financial.service;
+package com.healthlink.his.financial.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.common.enums.PaymentResult;
-import com.openhis.financial.domain.PaymentRecDetail;
-import com.openhis.financial.model.PaymentRecDetailAccountResult;
+import com.healthlink.his.common.enums.PaymentResult;
+import com.healthlink.his.financial.domain.PaymentRecDetail;
+import com.healthlink.his.financial.model.PaymentRecDetailAccountResult;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentRecStaticService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/IPaymentRecStaticService.java
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentRecStaticService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/IPaymentRecStaticService.java
index b61301f50..777c0b68a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentRecStaticService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/IPaymentRecStaticService.java
@@ -1,13 +1,13 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.financial.service;
+package com.healthlink.his.financial.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.dto.ChargeItemDefInfo;
-import com.openhis.common.enums.PaymentStatisticalMethod;
-import com.openhis.common.enums.PaymentType;
-import com.openhis.financial.domain.PaymentRecStatic;
+import com.healthlink.his.administration.dto.ChargeItemDefInfo;
+import com.healthlink.his.common.enums.PaymentStatisticalMethod;
+import com.healthlink.his.common.enums.PaymentType;
+import com.healthlink.his.financial.domain.PaymentRecStatic;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentReconciliationService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/IPaymentReconciliationService.java
similarity index 83%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentReconciliationService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/IPaymentReconciliationService.java
index 4ca41c3fc..df3e85ae1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentReconciliationService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/IPaymentReconciliationService.java
@@ -1,16 +1,16 @@
-package com.openhis.financial.service;
+package com.healthlink.his.financial.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.common.enums.PaymentKind;
-import com.openhis.common.enums.PaymentStatus;
-import com.openhis.common.enums.ybenums.YbMdtrtCertType;
-import com.openhis.financial.domain.Contract;
-import com.openhis.financial.domain.PaymentReconciliation;
-import com.openhis.financial.model.PaymentReconciliationAccountDel;
-import com.openhis.financial.model.PaymentResult;
-import com.openhis.financial.model.PaymentedItemModel;
-import com.openhis.financial.model.PrePaymentResult;
-import com.openhis.yb.dto.PaymentInpatientDto;
+import com.healthlink.his.common.enums.PaymentKind;
+import com.healthlink.his.common.enums.PaymentStatus;
+import com.healthlink.his.common.enums.ybenums.YbMdtrtCertType;
+import com.healthlink.his.financial.domain.Contract;
+import com.healthlink.his.financial.domain.PaymentReconciliation;
+import com.healthlink.his.financial.model.PaymentReconciliationAccountDel;
+import com.healthlink.his.financial.model.PaymentResult;
+import com.healthlink.his.financial.model.PaymentedItemModel;
+import com.healthlink.his.financial.model.PrePaymentResult;
+import com.healthlink.his.yb.dto.PaymentInpatientDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IRefundLogService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/IRefundLogService.java
similarity index 62%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IRefundLogService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/IRefundLogService.java
index 3cf9ee387..9771a86b9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IRefundLogService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/IRefundLogService.java
@@ -1,7 +1,7 @@
-package com.openhis.financial.service;
+package com.healthlink.his.financial.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.financial.domain.RefundLog;
+import com.healthlink.his.financial.domain.RefundLog;
 
 /**
  * 退号日志 Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/ThreePartPayCallBackService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/ThreePartPayCallBackService.java
similarity index 64%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/ThreePartPayCallBackService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/ThreePartPayCallBackService.java
index f610febe9..640e089c9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/ThreePartPayCallBackService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/ThreePartPayCallBackService.java
@@ -1,7 +1,7 @@
-package com.openhis.financial.service;
+package com.healthlink.his.financial.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.financial.domain.ThreePartPayCallBack;
+import com.healthlink.his.financial.domain.ThreePartPayCallBack;
 
 public interface ThreePartPayCallBackService extends IService<ThreePartPayCallBack> {
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ClaimResponseServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/ClaimResponseServiceImpl.java
similarity index 59%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ClaimResponseServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/ClaimResponseServiceImpl.java
index 72241bc9d..e1f764685 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ClaimResponseServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/ClaimResponseServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.financial.service.impl;
+package com.healthlink.his.financial.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.financial.domain.ClaimResponse;
-import com.openhis.financial.mapper.ClaimResponseMapper;
-import com.openhis.financial.service.IClaimResponseService;
+import com.healthlink.his.financial.domain.ClaimResponse;
+import com.healthlink.his.financial.mapper.ClaimResponseMapper;
+import com.healthlink.his.financial.service.IClaimResponseService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ClaimServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/ClaimServiceImpl.java
similarity index 59%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ClaimServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/ClaimServiceImpl.java
index cbe08ec15..d20263223 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ClaimServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/ClaimServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.financial.service.impl;
+package com.healthlink.his.financial.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.financial.domain.Claim;
-import com.openhis.financial.mapper.ClaimMapper;
-import com.openhis.financial.service.IClaimService;
+import com.healthlink.his.financial.domain.Claim;
+import com.healthlink.his.financial.mapper.ClaimMapper;
+import com.healthlink.his.financial.service.IClaimService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ContractServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/ContractServiceImpl.java
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ContractServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/ContractServiceImpl.java
index f7391b129..2d9a3cae1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ContractServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/ContractServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.financial.service.impl;
+package com.healthlink.his.financial.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -8,11 +8,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.core.redis.RedisCache;
 import com.core.common.enums.DelFlag;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.common.enums.Whether;
-import com.openhis.financial.domain.Contract;
-import com.openhis.financial.mapper.ContractMapper;
-import com.openhis.financial.service.IContractService;
+import com.healthlink.his.common.constant.YbCommonConstants;
+import com.healthlink.his.common.enums.Whether;
+import com.healthlink.his.financial.domain.Contract;
+import com.healthlink.his.financial.mapper.ContractMapper;
+import com.healthlink.his.financial.service.IContractService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentNoticeServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/PaymentNoticeServiceImpl.java
similarity index 58%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentNoticeServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/PaymentNoticeServiceImpl.java
index 14c4dd900..13ebcdadb 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentNoticeServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/PaymentNoticeServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.financial.service.impl;
+package com.healthlink.his.financial.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.financial.domain.PaymentNotice;
-import com.openhis.financial.mapper.PaymentNoticeMapper;
-import com.openhis.financial.service.IPaymentNoticeService;
+import com.healthlink.his.financial.domain.PaymentNotice;
+import com.healthlink.his.financial.mapper.PaymentNoticeMapper;
+import com.healthlink.his.financial.service.IPaymentNoticeService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentRecDetailServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/PaymentRecDetailServiceImpl.java
similarity index 76%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentRecDetailServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/PaymentRecDetailServiceImpl.java
index 08ace5863..e947ab06b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentRecDetailServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/PaymentRecDetailServiceImpl.java
@@ -1,12 +1,12 @@
-package com.openhis.financial.service.impl;
+package com.healthlink.his.financial.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.common.enums.PaymentResult;
-import com.openhis.financial.domain.PaymentRecDetail;
-import com.openhis.financial.mapper.PaymentRecDetailMapper;
-import com.openhis.financial.model.PaymentRecDetailAccountResult;
-import com.openhis.financial.service.IPaymentRecDetailService;
+import com.healthlink.his.common.enums.PaymentResult;
+import com.healthlink.his.financial.domain.PaymentRecDetail;
+import com.healthlink.his.financial.mapper.PaymentRecDetailMapper;
+import com.healthlink.his.financial.model.PaymentRecDetailAccountResult;
+import com.healthlink.his.financial.service.IPaymentRecDetailService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentRecStaticServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/PaymentRecStaticServiceImpl.java
similarity index 90%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentRecStaticServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/PaymentRecStaticServiceImpl.java
index 57aec3efd..6f7ad5494 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentRecStaticServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/PaymentRecStaticServiceImpl.java
@@ -1,16 +1,16 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.financial.service.impl;
+package com.healthlink.his.financial.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.administration.dto.ChargeItemDefInfo;
-import com.openhis.common.enums.PaymentStatisticalMethod;
-import com.openhis.common.enums.PaymentType;
-import com.openhis.financial.domain.PaymentRecStatic;
-import com.openhis.financial.mapper.PaymentRecStaticMapper;
-import com.openhis.financial.service.IPaymentRecStaticService;
+import com.healthlink.his.administration.dto.ChargeItemDefInfo;
+import com.healthlink.his.common.enums.PaymentStatisticalMethod;
+import com.healthlink.his.common.enums.PaymentType;
+import com.healthlink.his.financial.domain.PaymentRecStatic;
+import com.healthlink.his.financial.mapper.PaymentRecStaticMapper;
+import com.healthlink.his.financial.service.IPaymentRecStaticService;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentReconciliationServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/PaymentReconciliationServiceImpl.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentReconciliationServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/PaymentReconciliationServiceImpl.java
index da79d6fc0..372f4776d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentReconciliationServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/PaymentReconciliationServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.financial.service.impl;
+package com.healthlink.his.financial.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -8,42 +8,42 @@ import com.core.common.exception.ServiceException;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
-import com.openhis.administration.domain.ChargeItemDefinition;
-import com.openhis.administration.domain.DeviceDefinition;
-import com.openhis.administration.domain.HealthcareService;
-import com.openhis.administration.service.IChargeItemDefinitionService;
-import com.openhis.administration.service.IChargeItemService;
-import com.openhis.administration.service.IDeviceDefinitionService;
-import com.openhis.administration.service.IHealthcareServiceService;
-import com.openhis.administration.service.impl.PatientServiceImpl;
-import com.openhis.administration.service.impl.PatientStudentServiceImpl;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.common.enums.ItemType;
-import com.openhis.common.enums.PaymentKind;
-import com.openhis.common.enums.PaymentStatus;
-import com.openhis.common.enums.ybenums.YbChrgitmLv;
-import com.openhis.common.enums.ybenums.YbMdtrtCertType;
-import com.openhis.common.enums.ybenums.YbMedChrgItmType;
-import com.openhis.common.enums.ybenums.YbMedType;
-import com.openhis.financial.domain.Contract;
-import com.openhis.financial.domain.PaymentReconciliation;
-import com.openhis.financial.mapper.PaymentReconciliationMapper;
-import com.openhis.financial.model.*;
-import com.openhis.financial.service.IContractService;
-import com.openhis.financial.service.IPaymentReconciliationService;
-import com.openhis.medication.domain.MedicationDefinition;
-import com.openhis.medication.service.IMedicationDefinitionService;
-import com.openhis.nenu.dto.GfTypeRatioDto;
-import com.openhis.nenu.service.impl.GfRatioServiceImpl;
-import com.openhis.workflow.domain.ActivityDefinition;
-import com.openhis.workflow.service.IActivityDefinitionService;
-import com.openhis.yb.dto.Clinic2206OrderOutput;
-import com.openhis.yb.dto.ClinicReg2201Output;
-import com.openhis.yb.dto.PaymentInpatientDto;
-import com.openhis.yb.dto.Yb2304OutputSetlInfo;
-import com.openhis.yb.model.Clinic2207OrderModel;
-import com.openhis.yb.service.YbManager;
+import com.healthlink.his.administration.domain.ChargeItemDefinition;
+import com.healthlink.his.administration.domain.DeviceDefinition;
+import com.healthlink.his.administration.domain.HealthcareService;
+import com.healthlink.his.administration.service.IChargeItemDefinitionService;
+import com.healthlink.his.administration.service.IChargeItemService;
+import com.healthlink.his.administration.service.IDeviceDefinitionService;
+import com.healthlink.his.administration.service.IHealthcareServiceService;
+import com.healthlink.his.administration.service.impl.PatientServiceImpl;
+import com.healthlink.his.administration.service.impl.PatientStudentServiceImpl;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.YbCommonConstants;
+import com.healthlink.his.common.enums.ItemType;
+import com.healthlink.his.common.enums.PaymentKind;
+import com.healthlink.his.common.enums.PaymentStatus;
+import com.healthlink.his.common.enums.ybenums.YbChrgitmLv;
+import com.healthlink.his.common.enums.ybenums.YbMdtrtCertType;
+import com.healthlink.his.common.enums.ybenums.YbMedChrgItmType;
+import com.healthlink.his.common.enums.ybenums.YbMedType;
+import com.healthlink.his.financial.domain.Contract;
+import com.healthlink.his.financial.domain.PaymentReconciliation;
+import com.healthlink.his.financial.mapper.PaymentReconciliationMapper;
+import com.healthlink.his.financial.model.*;
+import com.healthlink.his.financial.service.IContractService;
+import com.healthlink.his.financial.service.IPaymentReconciliationService;
+import com.healthlink.his.medication.domain.MedicationDefinition;
+import com.healthlink.his.medication.service.IMedicationDefinitionService;
+import com.healthlink.his.nenu.dto.GfTypeRatioDto;
+import com.healthlink.his.nenu.service.impl.GfRatioServiceImpl;
+import com.healthlink.his.workflow.domain.ActivityDefinition;
+import com.healthlink.his.workflow.service.IActivityDefinitionService;
+import com.healthlink.his.yb.dto.Clinic2206OrderOutput;
+import com.healthlink.his.yb.dto.ClinicReg2201Output;
+import com.healthlink.his.yb.dto.PaymentInpatientDto;
+import com.healthlink.his.yb.dto.Yb2304OutputSetlInfo;
+import com.healthlink.his.yb.model.Clinic2207OrderModel;
+import com.healthlink.his.yb.service.YbManager;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/RefundLogServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/RefundLogServiceImpl.java
similarity index 55%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/RefundLogServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/RefundLogServiceImpl.java
index d8f2381aa..0b2cb167f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/RefundLogServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/RefundLogServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.financial.service.impl;
+package com.healthlink.his.financial.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.financial.domain.RefundLog;
-import com.openhis.financial.mapper.RefundLogMapper;
-import com.openhis.financial.service.IRefundLogService;
+import com.healthlink.his.financial.domain.RefundLog;
+import com.healthlink.his.financial.mapper.RefundLogMapper;
+import com.healthlink.his.financial.service.IRefundLogService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ThreePartPayCallBackServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/ThreePartPayCallBackServiceImpl.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ThreePartPayCallBackServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/ThreePartPayCallBackServiceImpl.java
index fca846fa7..3d35166eb 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ThreePartPayCallBackServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/ThreePartPayCallBackServiceImpl.java
@@ -1,12 +1,12 @@
-package com.openhis.financial.service.impl;
+package com.healthlink.his.financial.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.enums.DelFlag;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.financial.domain.ThreePartPayCallBack;
-import com.openhis.financial.mapper.ThreePartPayCallBackMapper;
-import com.openhis.financial.service.ThreePartPayCallBackService;
+import com.healthlink.his.common.constant.YbCommonConstants;
+import com.healthlink.his.financial.domain.ThreePartPayCallBack;
+import com.healthlink.his.financial.mapper.ThreePartPayCallBackMapper;
+import com.healthlink.his.financial.service.ThreePartPayCallBackService;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/infectious/domain/InfectiousAudit.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/infectious/domain/InfectiousAudit.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/infectious/domain/InfectiousAudit.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/infectious/domain/InfectiousAudit.java
index b9a58bf22..a834e0703 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/infectious/domain/InfectiousAudit.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/infectious/domain/InfectiousAudit.java
@@ -1,4 +1,4 @@
-package com.openhis.infectious.domain;
+package com.healthlink.his.infectious.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/infectious/domain/InfectiousCard.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/infectious/domain/InfectiousCard.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/infectious/domain/InfectiousCard.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/infectious/domain/InfectiousCard.java
index 6fcf2c5fc..f453207b4 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/infectious/domain/InfectiousCard.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/infectious/domain/InfectiousCard.java
@@ -1,4 +1,4 @@
-package com.openhis.infectious.domain;
+package com.healthlink.his.infectious.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/jlau/domain/ReviewPrescriptionRecords.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/jlau/domain/ReviewPrescriptionRecords.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/jlau/domain/ReviewPrescriptionRecords.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/jlau/domain/ReviewPrescriptionRecords.java
index dc7f74edc..d129a93e1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/jlau/domain/ReviewPrescriptionRecords.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/jlau/domain/ReviewPrescriptionRecords.java
@@ -1,4 +1,4 @@
-package com.openhis.jlau.domain;
+package com.healthlink.his.jlau.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/jlau/mapper/ReviewPrescriptionRecordsMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/jlau/mapper/ReviewPrescriptionRecordsMapper.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/jlau/mapper/ReviewPrescriptionRecordsMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/jlau/mapper/ReviewPrescriptionRecordsMapper.java
index d1edd8719..64f43f4cd 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/jlau/mapper/ReviewPrescriptionRecordsMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/jlau/mapper/ReviewPrescriptionRecordsMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.jlau.mapper;
+package com.healthlink.his.jlau.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.jlau.domain.ReviewPrescriptionRecords;
+import com.healthlink.his.jlau.domain.ReviewPrescriptionRecords;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/jlau/service/IReviewPrescriptionRecordsService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/jlau/service/IReviewPrescriptionRecordsService.java
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/jlau/service/IReviewPrescriptionRecordsService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/jlau/service/IReviewPrescriptionRecordsService.java
index 610a4ab15..3e995ead6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/jlau/service/IReviewPrescriptionRecordsService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/jlau/service/IReviewPrescriptionRecordsService.java
@@ -1,7 +1,7 @@
-package com.openhis.jlau.service;
+package com.healthlink.his.jlau.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.jlau.domain.ReviewPrescriptionRecords;
+import com.healthlink.his.jlau.domain.ReviewPrescriptionRecords;
 
 /**
  * 农大审方记录Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/jlau/service/impl/ReviewPrescriptionRecordsServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/jlau/service/impl/ReviewPrescriptionRecordsServiceImpl.java
similarity index 63%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/jlau/service/impl/ReviewPrescriptionRecordsServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/jlau/service/impl/ReviewPrescriptionRecordsServiceImpl.java
index 0c4cd552f..8d09a1618 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/jlau/service/impl/ReviewPrescriptionRecordsServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/jlau/service/impl/ReviewPrescriptionRecordsServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.jlau.service.impl;
+package com.healthlink.his.jlau.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.jlau.domain.ReviewPrescriptionRecords;
-import com.openhis.jlau.mapper.ReviewPrescriptionRecordsMapper;
-import com.openhis.jlau.service.IReviewPrescriptionRecordsService;
+import com.healthlink.his.jlau.domain.ReviewPrescriptionRecords;
+import com.healthlink.his.jlau.mapper.ReviewPrescriptionRecordsMapper;
+import com.healthlink.his.jlau.service.IReviewPrescriptionRecordsService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/ActivityDefDeviceDef.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/ActivityDefDeviceDef.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/ActivityDefDeviceDef.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/ActivityDefDeviceDef.java
index b9176fa4a..c80f8cd6f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/ActivityDefDeviceDef.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/ActivityDefDeviceDef.java
@@ -1,4 +1,4 @@
-package com.openhis.lab.domain;
+package com.healthlink.his.lab.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/ActivityDefObservationDef.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/ActivityDefObservationDef.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/ActivityDefObservationDef.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/ActivityDefObservationDef.java
index 44fc20908..db85c74c1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/ActivityDefObservationDef.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/ActivityDefObservationDef.java
@@ -1,4 +1,4 @@
-package com.openhis.lab.domain;
+package com.healthlink.his.lab.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/ActivityDefSpecimenDef.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/ActivityDefSpecimenDef.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/ActivityDefSpecimenDef.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/ActivityDefSpecimenDef.java
index e4a172553..0b8c04b26 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/ActivityDefSpecimenDef.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/ActivityDefSpecimenDef.java
@@ -1,4 +1,4 @@
-package com.openhis.lab.domain;
+package com.healthlink.his.lab.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/BarCode.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/BarCode.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/BarCode.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/BarCode.java
index 3cc61faa3..2f81c8b0a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/BarCode.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/BarCode.java
@@ -1,4 +1,4 @@
-package com.openhis.lab.domain;
+package com.healthlink.his.lab.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.core.common.core.domain.HisBaseEntity;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionLabApply.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/InspectionLabApply.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionLabApply.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/InspectionLabApply.java
index d2a434677..e25f1dd5e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionLabApply.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/InspectionLabApply.java
@@ -1,4 +1,4 @@
-package com.openhis.lab.domain;
+package com.healthlink.his.lab.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.core.common.core.domain.HisBaseEntity;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionLabApplyItem.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/InspectionLabApplyItem.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionLabApplyItem.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/InspectionLabApplyItem.java
index 9dc831066..c931f0075 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionLabApplyItem.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/InspectionLabApplyItem.java
@@ -1,4 +1,4 @@
-package com.openhis.lab.domain;
+package com.healthlink.his.lab.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionPackage.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/InspectionPackage.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionPackage.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/InspectionPackage.java
index f7e90658b..2e290b2b4 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionPackage.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/InspectionPackage.java
@@ -1,4 +1,4 @@
-package com.openhis.lab.domain;
+package com.healthlink.his.lab.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionPackageDetail.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/InspectionPackageDetail.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionPackageDetail.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/InspectionPackageDetail.java
index c7fc1fa22..452f93b4e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionPackageDetail.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/InspectionPackageDetail.java
@@ -1,4 +1,4 @@
-package com.openhis.lab.domain;
+package com.healthlink.his.lab.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionType.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/InspectionType.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionType.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/InspectionType.java
index a38b1e843..9eb34234a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionType.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/InspectionType.java
@@ -1,4 +1,4 @@
-package com.openhis.lab.domain;
+package com.healthlink.his.lab.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/LabActivityDefinition.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/LabActivityDefinition.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/LabActivityDefinition.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/LabActivityDefinition.java
index 3ec4205d4..a05f5f6ae 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/LabActivityDefinition.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/LabActivityDefinition.java
@@ -1,4 +1,4 @@
-package com.openhis.lab.domain;
+package com.healthlink.his.lab.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/Observation.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/Observation.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/Observation.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/Observation.java
index 1add37bb0..1f6c0d7f8 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/Observation.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/Observation.java
@@ -1,4 +1,4 @@
-package com.openhis.lab.domain;
+package com.healthlink.his.lab.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/Specimen.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/Specimen.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/Specimen.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/Specimen.java
index a5ede5bba..d64018b30 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/Specimen.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/domain/Specimen.java
@@ -1,4 +1,4 @@
-package com.openhis.lab.domain;
+package com.healthlink.his.lab.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.core.common.core.domain.HisBaseEntity;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ActivityDefDeviceDefMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/ActivityDefDeviceDefMapper.java
similarity index 75%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ActivityDefDeviceDefMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/ActivityDefDeviceDefMapper.java
index c75ecbe3d..5c219ed35 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ActivityDefDeviceDefMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/ActivityDefDeviceDefMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.lab.mapper;
+package com.healthlink.his.lab.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.lab.domain.ActivityDefDeviceDef;
+import com.healthlink.his.lab.domain.ActivityDefDeviceDef;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ActivityDefObservationDefMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/ActivityDefObservationDefMapper.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ActivityDefObservationDefMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/ActivityDefObservationDefMapper.java
index 6aa626c57..0aed9a604 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ActivityDefObservationDefMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/ActivityDefObservationDefMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.lab.mapper;
+package com.healthlink.his.lab.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.lab.domain.ActivityDefObservationDef;
+import com.healthlink.his.lab.domain.ActivityDefObservationDef;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ActivityDefSpecimenDefMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/ActivityDefSpecimenDefMapper.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ActivityDefSpecimenDefMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/ActivityDefSpecimenDefMapper.java
index 4598932ec..b2d083fc6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ActivityDefSpecimenDefMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/ActivityDefSpecimenDefMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.lab.mapper;
+package com.healthlink.his.lab.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.lab.domain.ActivityDefSpecimenDef;
+import com.healthlink.his.lab.domain.ActivityDefSpecimenDef;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/InspectionLabApplyItemMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/InspectionLabApplyItemMapper.java
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/InspectionLabApplyItemMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/InspectionLabApplyItemMapper.java
index bf3501cad..4d1a8485e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/InspectionLabApplyItemMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/InspectionLabApplyItemMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.lab.mapper;
+package com.healthlink.his.lab.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.lab.domain.InspectionLabApplyItem;
+import com.healthlink.his.lab.domain.InspectionLabApplyItem;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/InspectionLabApplyMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/InspectionLabApplyMapper.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/InspectionLabApplyMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/InspectionLabApplyMapper.java
index 67dbea85b..4b2a6c967 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/InspectionLabApplyMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/InspectionLabApplyMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.lab.mapper;
+package com.healthlink.his.lab.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.lab.domain.InspectionLabApply;
+import com.healthlink.his.lab.domain.InspectionLabApply;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/InspectionLabBarCodeMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/InspectionLabBarCodeMapper.java
similarity index 75%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/InspectionLabBarCodeMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/InspectionLabBarCodeMapper.java
index 18a18f4af..0dde1805f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/InspectionLabBarCodeMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/InspectionLabBarCodeMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.lab.mapper;
+package com.healthlink.his.lab.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.lab.domain.BarCode;
+import com.healthlink.his.lab.domain.BarCode;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/InspectionPackageDetailMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/InspectionPackageDetailMapper.java
similarity index 89%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/InspectionPackageDetailMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/InspectionPackageDetailMapper.java
index 46bb16c65..c5a879688 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/InspectionPackageDetailMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/InspectionPackageDetailMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.lab.mapper;
+package com.healthlink.his.lab.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.lab.domain.InspectionPackageDetail;
+import com.healthlink.his.lab.domain.InspectionPackageDetail;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/InspectionPackageMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/InspectionPackageMapper.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/InspectionPackageMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/InspectionPackageMapper.java
index ed51e1e13..679c86e69 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/InspectionPackageMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/InspectionPackageMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.lab.mapper;
+package com.healthlink.his.lab.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.lab.domain.InspectionPackage;
+import com.healthlink.his.lab.domain.InspectionPackage;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/InspectionTypeMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/InspectionTypeMapper.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/InspectionTypeMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/InspectionTypeMapper.java
index 01f66a69a..6028dc357 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/InspectionTypeMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/InspectionTypeMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.lab.mapper;
+package com.healthlink.his.lab.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.lab.domain.InspectionType;
+import com.healthlink.his.lab.domain.InspectionType;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/LabActivityDefinitionMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/LabActivityDefinitionMapper.java
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/LabActivityDefinitionMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/LabActivityDefinitionMapper.java
index b2bd6cee4..026758e3f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/LabActivityDefinitionMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/LabActivityDefinitionMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.lab.mapper;
+package com.healthlink.his.lab.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.lab.domain.LabActivityDefinition;
+import com.healthlink.his.lab.domain.LabActivityDefinition;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ObservationMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/ObservationMapper.java
similarity index 76%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ObservationMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/ObservationMapper.java
index 5c387bef0..971ca2163 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ObservationMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/ObservationMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.lab.mapper;
+package com.healthlink.his.lab.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.lab.domain.Observation;
+import com.healthlink.his.lab.domain.Observation;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/SpecimenMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/SpecimenMapper.java
similarity index 75%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/SpecimenMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/SpecimenMapper.java
index bb1987821..238a8a491 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/SpecimenMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/mapper/SpecimenMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.lab.mapper;
+package com.healthlink.his.lab.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.lab.domain.Specimen;
+import com.healthlink.his.lab.domain.Specimen;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IActivityDefDeviceDefService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IActivityDefDeviceDefService.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IActivityDefDeviceDefService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IActivityDefDeviceDefService.java
index 5f349b4e9..48adf9296 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IActivityDefDeviceDefService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IActivityDefDeviceDefService.java
@@ -1,7 +1,7 @@
-package com.openhis.lab.service;
+package com.healthlink.his.lab.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.lab.domain.ActivityDefDeviceDef;
+import com.healthlink.his.lab.domain.ActivityDefDeviceDef;
 
 /**
  * 耗材和设备定义Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IActivityDefObservationDefService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IActivityDefObservationDefService.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IActivityDefObservationDefService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IActivityDefObservationDefService.java
index 76e140a96..2b7986f6a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IActivityDefObservationDefService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IActivityDefObservationDefService.java
@@ -1,7 +1,7 @@
-package com.openhis.lab.service;
+package com.healthlink.his.lab.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.lab.domain.ActivityDefObservationDef;
+import com.healthlink.his.lab.domain.ActivityDefObservationDef;
 
 /**
  * 观测指标定义Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IActivityDefSpecimenDefService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IActivityDefSpecimenDefService.java
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IActivityDefSpecimenDefService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IActivityDefSpecimenDefService.java
index d5aee671c..0aae32322 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IActivityDefSpecimenDefService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IActivityDefSpecimenDefService.java
@@ -1,7 +1,7 @@
-package com.openhis.lab.service;
+package com.healthlink.his.lab.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.lab.domain.ActivityDefSpecimenDef;
+import com.healthlink.his.lab.domain.ActivityDefSpecimenDef;
 
 /**
  * 样本定义Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IInspectionLabApplyItemService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IInspectionLabApplyItemService.java
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IInspectionLabApplyItemService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IInspectionLabApplyItemService.java
index 68fccc879..f11d7ecdf 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IInspectionLabApplyItemService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IInspectionLabApplyItemService.java
@@ -1,7 +1,7 @@
-package com.openhis.lab.service;
+package com.healthlink.his.lab.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.lab.domain.InspectionLabApplyItem;
+import com.healthlink.his.lab.domain.InspectionLabApplyItem;
 
 /**
  * 检验申请单明细表
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IInspectionLabApplyService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IInspectionLabApplyService.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IInspectionLabApplyService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IInspectionLabApplyService.java
index 3eb9d28de..ca127317a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IInspectionLabApplyService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IInspectionLabApplyService.java
@@ -1,7 +1,7 @@
-package com.openhis.lab.service;
+package com.healthlink.his.lab.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.lab.domain.InspectionLabApply;
+import com.healthlink.his.lab.domain.InspectionLabApply;
 
 /**
  * 检验申请单Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IInspectionLabBarCodeService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IInspectionLabBarCodeService.java
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IInspectionLabBarCodeService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IInspectionLabBarCodeService.java
index c3e6fde50..9783b652e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IInspectionLabBarCodeService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IInspectionLabBarCodeService.java
@@ -1,7 +1,7 @@
-package com.openhis.lab.service;
+package com.healthlink.his.lab.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.lab.domain.BarCode;
+import com.healthlink.his.lab.domain.BarCode;
 
 /**
  * 检验申请单条码Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IInspectionPackageDetailService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IInspectionPackageDetailService.java
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IInspectionPackageDetailService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IInspectionPackageDetailService.java
index 49bcf131c..a332f6688 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IInspectionPackageDetailService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IInspectionPackageDetailService.java
@@ -1,7 +1,7 @@
-package com.openhis.lab.service;
+package com.healthlink.his.lab.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.lab.domain.InspectionPackageDetail;
+import com.healthlink.his.lab.domain.InspectionPackageDetail;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IInspectionPackageService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IInspectionPackageService.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IInspectionPackageService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IInspectionPackageService.java
index 3a4192c93..6ae8ade57 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IInspectionPackageService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IInspectionPackageService.java
@@ -1,7 +1,7 @@
-package com.openhis.lab.service;
+package com.healthlink.his.lab.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.lab.domain.InspectionPackage;
+import com.healthlink.his.lab.domain.InspectionPackage;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IInspectionTypeService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IInspectionTypeService.java
similarity index 87%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IInspectionTypeService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IInspectionTypeService.java
index d03dc9806..95101405c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IInspectionTypeService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IInspectionTypeService.java
@@ -1,9 +1,9 @@
-package com.openhis.lab.service;
+package com.healthlink.his.lab.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.lab.domain.InspectionType;
+import com.healthlink.his.lab.domain.InspectionType;
 
 /**
  * 检验类型Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/ILabActivityDefinitionService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/ILabActivityDefinitionService.java
similarity index 80%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/ILabActivityDefinitionService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/ILabActivityDefinitionService.java
index a1dca52ab..15f654813 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/ILabActivityDefinitionService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/ILabActivityDefinitionService.java
@@ -1,7 +1,7 @@
-package com.openhis.lab.service;
+package com.healthlink.his.lab.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.lab.domain.LabActivityDefinition;
+import com.healthlink.his.lab.domain.LabActivityDefinition;
 
 /**
  * 检验项目定义 Service 接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IObservationService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IObservationService.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IObservationService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IObservationService.java
index 1fe4b354d..bdec0380a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IObservationService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/IObservationService.java
@@ -1,7 +1,7 @@
-package com.openhis.lab.service;
+package com.healthlink.his.lab.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.lab.domain.Observation;
+import com.healthlink.his.lab.domain.Observation;
 
 /**
  * 【请填写功能名称】Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/ISpecimenService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/ISpecimenService.java
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/ISpecimenService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/ISpecimenService.java
index 4dc18b2e9..22fbafa01 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/ISpecimenService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/ISpecimenService.java
@@ -1,7 +1,7 @@
-package com.openhis.lab.service;
+package com.healthlink.his.lab.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.lab.domain.Specimen;
+import com.healthlink.his.lab.domain.Specimen;
 
 /**
  * Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ActivityDefDeviceDefServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/ActivityDefDeviceDefServiceImpl.java
similarity index 61%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ActivityDefDeviceDefServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/ActivityDefDeviceDefServiceImpl.java
index 2e96447f7..3b3f7f46c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ActivityDefDeviceDefServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/ActivityDefDeviceDefServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.lab.service.impl;
+package com.healthlink.his.lab.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.lab.domain.ActivityDefDeviceDef;
-import com.openhis.lab.mapper.ActivityDefDeviceDefMapper;
-import com.openhis.lab.service.IActivityDefDeviceDefService;
+import com.healthlink.his.lab.domain.ActivityDefDeviceDef;
+import com.healthlink.his.lab.mapper.ActivityDefDeviceDefMapper;
+import com.healthlink.his.lab.service.IActivityDefDeviceDefService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ActivityDefObservationDefServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/ActivityDefObservationDefServiceImpl.java
similarity index 61%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ActivityDefObservationDefServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/ActivityDefObservationDefServiceImpl.java
index 7ba7b33ce..ce2708ed4 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ActivityDefObservationDefServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/ActivityDefObservationDefServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.lab.service.impl;
+package com.healthlink.his.lab.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.lab.domain.ActivityDefObservationDef;
-import com.openhis.lab.mapper.ActivityDefObservationDefMapper;
-import com.openhis.lab.service.IActivityDefObservationDefService;
+import com.healthlink.his.lab.domain.ActivityDefObservationDef;
+import com.healthlink.his.lab.mapper.ActivityDefObservationDefMapper;
+import com.healthlink.his.lab.service.IActivityDefObservationDefService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ActivityDefSpecimenDefServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/ActivityDefSpecimenDefServiceImpl.java
similarity index 60%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ActivityDefSpecimenDefServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/ActivityDefSpecimenDefServiceImpl.java
index 33e094f1e..0165293c8 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ActivityDefSpecimenDefServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/ActivityDefSpecimenDefServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.lab.service.impl;
+package com.healthlink.his.lab.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.lab.domain.ActivityDefSpecimenDef;
-import com.openhis.lab.mapper.ActivityDefSpecimenDefMapper;
-import com.openhis.lab.service.IActivityDefSpecimenDefService;
+import com.healthlink.his.lab.domain.ActivityDefSpecimenDef;
+import com.healthlink.his.lab.mapper.ActivityDefSpecimenDefMapper;
+import com.healthlink.his.lab.service.IActivityDefSpecimenDefService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/InspectionLabApplyItemServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/InspectionLabApplyItemServiceImpl.java
similarity index 55%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/InspectionLabApplyItemServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/InspectionLabApplyItemServiceImpl.java
index 91e807779..d8b3c3b06 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/InspectionLabApplyItemServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/InspectionLabApplyItemServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.lab.service.impl;
+package com.healthlink.his.lab.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.lab.domain.InspectionLabApplyItem;
-import com.openhis.lab.mapper.InspectionLabApplyItemMapper;
-import com.openhis.lab.service.IInspectionLabApplyItemService;
+import com.healthlink.his.lab.domain.InspectionLabApplyItem;
+import com.healthlink.his.lab.mapper.InspectionLabApplyItemMapper;
+import com.healthlink.his.lab.service.IInspectionLabApplyItemService;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/InspectionLabApplyServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/InspectionLabApplyServiceImpl.java
similarity index 55%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/InspectionLabApplyServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/InspectionLabApplyServiceImpl.java
index 5544cfc28..8bf3fc435 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/InspectionLabApplyServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/InspectionLabApplyServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.lab.service.impl;
+package com.healthlink.his.lab.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.lab.domain.InspectionLabApply;
-import com.openhis.lab.mapper.InspectionLabApplyMapper;
-import com.openhis.lab.service.IInspectionLabApplyService;
+import com.healthlink.his.lab.domain.InspectionLabApply;
+import com.healthlink.his.lab.mapper.InspectionLabApplyMapper;
+import com.healthlink.his.lab.service.IInspectionLabApplyService;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/InspectionLabBarCodeServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/InspectionLabBarCodeServiceImpl.java
similarity index 62%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/InspectionLabBarCodeServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/InspectionLabBarCodeServiceImpl.java
index 9c3a4db86..580861da9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/InspectionLabBarCodeServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/InspectionLabBarCodeServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.lab.service.impl;
+package com.healthlink.his.lab.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.lab.domain.BarCode;
-import com.openhis.lab.mapper.InspectionLabBarCodeMapper;
-import com.openhis.lab.service.IInspectionLabBarCodeService;
+import com.healthlink.his.lab.domain.BarCode;
+import com.healthlink.his.lab.mapper.InspectionLabBarCodeMapper;
+import com.healthlink.his.lab.service.IInspectionLabBarCodeService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/InspectionPackageDetailServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/InspectionPackageDetailServiceImpl.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/InspectionPackageDetailServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/InspectionPackageDetailServiceImpl.java
index fac140c1c..23eea7f29 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/InspectionPackageDetailServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/InspectionPackageDetailServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.lab.service.impl;
+package com.healthlink.his.lab.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.lab.domain.InspectionPackageDetail;
-import com.openhis.lab.mapper.InspectionPackageDetailMapper;
-import com.openhis.lab.service.IInspectionPackageDetailService;
+import com.healthlink.his.lab.domain.InspectionPackageDetail;
+import com.healthlink.his.lab.mapper.InspectionPackageDetailMapper;
+import com.healthlink.his.lab.service.IInspectionPackageDetailService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/InspectionPackageServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/InspectionPackageServiceImpl.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/InspectionPackageServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/InspectionPackageServiceImpl.java
index 7226f199b..67d3e62bf 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/InspectionPackageServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/InspectionPackageServiceImpl.java
@@ -1,11 +1,11 @@
-package com.openhis.lab.service.impl;
+package com.healthlink.his.lab.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.lab.domain.InspectionPackage;
-import com.openhis.lab.mapper.InspectionPackageMapper;
-import com.openhis.lab.service.IInspectionPackageService;
+import com.healthlink.his.lab.domain.InspectionPackage;
+import com.healthlink.his.lab.mapper.InspectionPackageMapper;
+import com.healthlink.his.lab.service.IInspectionPackageService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/InspectionTypeServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/InspectionTypeServiceImpl.java
similarity index 85%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/InspectionTypeServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/InspectionTypeServiceImpl.java
index 265694f57..9d8d56bf6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/InspectionTypeServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/InspectionTypeServiceImpl.java
@@ -1,12 +1,12 @@
-package com.openhis.lab.service.impl;
+package com.healthlink.his.lab.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.lab.domain.InspectionType;
-import com.openhis.lab.mapper.InspectionTypeMapper;
-import com.openhis.lab.service.IInspectionTypeService;
+import com.healthlink.his.lab.domain.InspectionType;
+import com.healthlink.his.lab.mapper.InspectionTypeMapper;
+import com.healthlink.his.lab.service.IInspectionTypeService;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/LabActivityDefinitionServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/LabActivityDefinitionServiceImpl.java
similarity index 89%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/LabActivityDefinitionServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/LabActivityDefinitionServiceImpl.java
index ea118544b..6c869aad8 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/LabActivityDefinitionServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/LabActivityDefinitionServiceImpl.java
@@ -1,12 +1,12 @@
-package com.openhis.lab.service.impl;
+package com.healthlink.his.lab.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.core.domain.model.LoginUser;
-import com.openhis.lab.domain.LabActivityDefinition;
-import com.openhis.lab.mapper.LabActivityDefinitionMapper;
-import com.openhis.lab.service.ILabActivityDefinitionService;
+import com.healthlink.his.lab.domain.LabActivityDefinition;
+import com.healthlink.his.lab.mapper.LabActivityDefinitionMapper;
+import com.healthlink.his.lab.service.ILabActivityDefinitionService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ObservationServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/ObservationServiceImpl.java
similarity index 62%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ObservationServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/ObservationServiceImpl.java
index c26278257..6b64c63b5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ObservationServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/ObservationServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.lab.service.impl;
+package com.healthlink.his.lab.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.lab.domain.Observation;
-import com.openhis.lab.mapper.ObservationMapper;
-import com.openhis.lab.service.IObservationService;
+import com.healthlink.his.lab.domain.Observation;
+import com.healthlink.his.lab.mapper.ObservationMapper;
+import com.healthlink.his.lab.service.IObservationService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/SpecimenServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/SpecimenServiceImpl.java
similarity index 62%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/SpecimenServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/SpecimenServiceImpl.java
index aab8aca01..7f94fe61e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/SpecimenServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/lab/service/impl/SpecimenServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.lab.service.impl;
+package com.healthlink.his.lab.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.lab.domain.Specimen;
-import com.openhis.lab.mapper.SpecimenMapper;
-import com.openhis.lab.service.ISpecimenService;
+import com.healthlink.his.lab.domain.Specimen;
+import com.healthlink.his.lab.mapper.SpecimenMapper;
+import com.healthlink.his.lab.service.ISpecimenService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/domain/Medication.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/domain/Medication.java
index 86fd61ad2..24ab0be21 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/domain/Medication.java
@@ -1,4 +1,4 @@
-package com.openhis.medication.domain;
+package com.healthlink.his.medication.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/domain/MedicationDefinition.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/domain/MedicationDefinition.java
index 8bcf4cdb8..b5929e5a2 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/domain/MedicationDefinition.java
@@ -1,4 +1,4 @@
-package com.openhis.medication.domain;
+package com.healthlink.his.medication.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/domain/MedicationDetail.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/domain/MedicationDetail.java
index 9e468e8fc..aff97c4fc 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/domain/MedicationDetail.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.medication.domain;
+package com.healthlink.his.medication.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDispense.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/domain/MedicationDispense.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDispense.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/domain/MedicationDispense.java
index f1d6e2475..fa66ce21e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDispense.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/domain/MedicationDispense.java
@@ -1,4 +1,4 @@
-package com.openhis.medication.domain;
+package com.healthlink.his.medication.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/domain/MedicationRequest.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/domain/MedicationRequest.java
index 333244653..7091d4544 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/domain/MedicationRequest.java
@@ -1,4 +1,4 @@
-package com.openhis.medication.domain;
+package com.healthlink.his.medication.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/dto/AdjustPriceMedListDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/dto/AdjustPriceMedListDto.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/dto/AdjustPriceMedListDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/dto/AdjustPriceMedListDto.java
index 4e5446606..7a20c0098 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/dto/AdjustPriceMedListDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/dto/AdjustPriceMedListDto.java
@@ -1,4 +1,4 @@
-package com.openhis.medication.dto;
+package com.healthlink.his.medication.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationDefinitionMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/mapper/MedicationDefinitionMapper.java
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationDefinitionMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/mapper/MedicationDefinitionMapper.java
index 5d0f48916..9221fb957 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationDefinitionMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/mapper/MedicationDefinitionMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.medication.mapper;
+package com.healthlink.his.medication.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.medication.domain.MedicationDefinition;
+import com.healthlink.his.medication.domain.MedicationDefinition;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationDispenseMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/mapper/MedicationDispenseMapper.java
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationDispenseMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/mapper/MedicationDispenseMapper.java
index a0003507b..52881ffa5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationDispenseMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/mapper/MedicationDispenseMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.medication.mapper;
+package com.healthlink.his.medication.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.medication.domain.MedicationDispense;
+import com.healthlink.his.medication.domain.MedicationDispense;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/mapper/MedicationMapper.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/mapper/MedicationMapper.java
index 462f1417a..146ed82c3 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/mapper/MedicationMapper.java
@@ -1,9 +1,9 @@
-package com.openhis.medication.mapper;
+package com.healthlink.his.medication.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.medication.domain.Medication;
-import com.openhis.medication.domain.MedicationDetail;
-import com.openhis.medication.dto.AdjustPriceMedListDto;
+import com.healthlink.his.medication.domain.Medication;
+import com.healthlink.his.medication.domain.MedicationDetail;
+import com.healthlink.his.medication.dto.AdjustPriceMedListDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -29,7 +29,7 @@ public interface MedicationMapper extends BaseMapper<Medication> {
      * @param keyWord
      * @Author raymond
      * @Date 10:17 2025/10/20
-     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     * @return java.util.List<com.healthlink.his.medication.dto.AdjustPriceMedListDto>
      **/
     List<AdjustPriceMedListDto> searchMedListByKeyWord(@Param("keyWord") String keyWord);
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationRequestMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/mapper/MedicationRequestMapper.java
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationRequestMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/mapper/MedicationRequestMapper.java
index a449a57b5..ffaf5109a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationRequestMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/mapper/MedicationRequestMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.medication.mapper;
+package com.healthlink.his.medication.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.medication.domain.MedicationRequest;
+import com.healthlink.his.medication.domain.MedicationRequest;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDefinitionService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/service/IMedicationDefinitionService.java
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDefinitionService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/service/IMedicationDefinitionService.java
index 0ecd93586..281d46f78 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDefinitionService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/service/IMedicationDefinitionService.java
@@ -1,8 +1,8 @@
-package com.openhis.medication.service;
+package com.healthlink.his.medication.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.medication.domain.MedicationDefinition;
-import com.openhis.medication.domain.MedicationDetail;
+import com.healthlink.his.medication.domain.MedicationDefinition;
+import com.healthlink.his.medication.domain.MedicationDetail;
 
 /**
  * 药品定义管理Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDispenseService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/service/IMedicationDispenseService.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDispenseService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/service/IMedicationDispenseService.java
index e448c627a..35ae280d7 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDispenseService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/service/IMedicationDispenseService.java
@@ -1,8 +1,8 @@
-package com.openhis.medication.service;
+package com.healthlink.his.medication.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.medication.domain.MedicationDispense;
-import com.openhis.medication.domain.MedicationRequest;
+import com.healthlink.his.medication.domain.MedicationDispense;
+import com.healthlink.his.medication.domain.MedicationRequest;
 
 import java.util.Date;
 import java.util.List;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationRequestService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/service/IMedicationRequestService.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationRequestService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/service/IMedicationRequestService.java
index 96bb1350c..0b4f23743 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationRequestService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/service/IMedicationRequestService.java
@@ -1,7 +1,7 @@
-package com.openhis.medication.service;
+package com.healthlink.his.medication.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.medication.domain.MedicationRequest;
+import com.healthlink.his.medication.domain.MedicationRequest;
 
 import java.util.Date;
 import java.util.List;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/service/IMedicationService.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/service/IMedicationService.java
index 843195eb2..57cc6954d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/service/IMedicationService.java
@@ -1,9 +1,9 @@
-package com.openhis.medication.service;
+package com.healthlink.his.medication.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.medication.domain.Medication;
-import com.openhis.medication.domain.MedicationDetail;
-import com.openhis.medication.dto.AdjustPriceMedListDto;
+import com.healthlink.his.medication.domain.Medication;
+import com.healthlink.his.medication.domain.MedicationDetail;
+import com.healthlink.his.medication.dto.AdjustPriceMedListDto;
 
 import java.util.List;
 
@@ -37,7 +37,7 @@ public interface IMedicationService extends IService<Medication> {
      * @param keyWord
      * @Author raymond
      * @Date 10:18 2025/10/20
-     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     * @return java.util.List<com.healthlink.his.medication.dto.AdjustPriceMedListDto>
      **/
     List<AdjustPriceMedListDto> searchMedListByKeyWord(String keyWord);
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDefinitionServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/service/impl/MedicationDefinitionServiceImpl.java
similarity index 85%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDefinitionServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/service/impl/MedicationDefinitionServiceImpl.java
index a6127286f..35cbb6bdc 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDefinitionServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/service/impl/MedicationDefinitionServiceImpl.java
@@ -1,12 +1,12 @@
-package com.openhis.medication.service.impl;
+package com.healthlink.his.medication.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.medication.domain.MedicationDefinition;
-import com.openhis.medication.domain.MedicationDetail;
-import com.openhis.medication.mapper.MedicationDefinitionMapper;
-import com.openhis.medication.service.IMedicationDefinitionService;
+import com.healthlink.his.medication.domain.MedicationDefinition;
+import com.healthlink.his.medication.domain.MedicationDetail;
+import com.healthlink.his.medication.mapper.MedicationDefinitionMapper;
+import com.healthlink.his.medication.service.IMedicationDefinitionService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDispenseServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/service/impl/MedicationDispenseServiceImpl.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDispenseServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/service/impl/MedicationDispenseServiceImpl.java
index a739f35c9..bf7d14c65 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDispenseServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/service/impl/MedicationDispenseServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.medication.service.impl;
+package com.healthlink.his.medication.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -7,12 +7,12 @@ import com.core.common.enums.DelFlag;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.common.enums.AssignSeqEnum;
-import com.openhis.common.enums.DispenseStatus;
-import com.openhis.medication.domain.MedicationDispense;
-import com.openhis.medication.domain.MedicationRequest;
-import com.openhis.medication.mapper.MedicationDispenseMapper;
-import com.openhis.medication.service.IMedicationDispenseService;
+import com.healthlink.his.common.enums.AssignSeqEnum;
+import com.healthlink.his.common.enums.DispenseStatus;
+import com.healthlink.his.medication.domain.MedicationDispense;
+import com.healthlink.his.medication.domain.MedicationRequest;
+import com.healthlink.his.medication.mapper.MedicationDispenseMapper;
+import com.healthlink.his.medication.service.IMedicationDispenseService;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationRequestServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/service/impl/MedicationRequestServiceImpl.java
similarity index 91%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationRequestServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/service/impl/MedicationRequestServiceImpl.java
index 88e3320be..65348c42d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationRequestServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/service/impl/MedicationRequestServiceImpl.java
@@ -1,13 +1,13 @@
-package com.openhis.medication.service.impl;
+package com.healthlink.his.medication.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.enums.DelFlag;
-import com.openhis.common.enums.RequestStatus;
-import com.openhis.medication.domain.MedicationRequest;
-import com.openhis.medication.mapper.MedicationRequestMapper;
-import com.openhis.medication.service.IMedicationRequestService;
+import com.healthlink.his.common.enums.RequestStatus;
+import com.healthlink.his.medication.domain.MedicationRequest;
+import com.healthlink.his.medication.mapper.MedicationRequestMapper;
+import com.healthlink.his.medication.service.IMedicationRequestService;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/service/impl/MedicationServiceImpl.java
similarity index 87%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/service/impl/MedicationServiceImpl.java
index f76974669..bddbdbfb9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medication/service/impl/MedicationServiceImpl.java
@@ -1,14 +1,14 @@
-package com.openhis.medication.service.impl;
+package com.healthlink.his.medication.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.enums.DelFlag;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.medication.domain.Medication;
-import com.openhis.medication.domain.MedicationDetail;
-import com.openhis.medication.dto.AdjustPriceMedListDto;
-import com.openhis.medication.mapper.MedicationMapper;
-import com.openhis.medication.service.IMedicationService;
+import com.healthlink.his.medication.domain.Medication;
+import com.healthlink.his.medication.domain.MedicationDetail;
+import com.healthlink.his.medication.dto.AdjustPriceMedListDto;
+import com.healthlink.his.medication.mapper.MedicationMapper;
+import com.healthlink.his.medication.service.IMedicationService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medicationmanagement/domain/DayEndSettlement.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medicationmanagement/domain/DayEndSettlement.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/medicationmanagement/domain/DayEndSettlement.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medicationmanagement/domain/DayEndSettlement.java
index 96fffa50b..4190c9957 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medicationmanagement/domain/DayEndSettlement.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medicationmanagement/domain/DayEndSettlement.java
@@ -1,4 +1,4 @@
-package com.openhis.medicationmanagement.domain;
+package com.healthlink.his.medicationmanagement.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medicationmanagement/mapper/DayEndSettlementMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medicationmanagement/mapper/DayEndSettlementMapper.java
similarity index 63%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/medicationmanagement/mapper/DayEndSettlementMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medicationmanagement/mapper/DayEndSettlementMapper.java
index 49b95e57d..e91b157b3 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medicationmanagement/mapper/DayEndSettlementMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medicationmanagement/mapper/DayEndSettlementMapper.java
@@ -1,6 +1,6 @@
-package com.openhis.medicationmanagement.mapper;
+package com.healthlink.his.medicationmanagement.mapper;
 
-import com.openhis.medicationmanagement.domain.DayEndSettlement;
+import com.healthlink.his.medicationmanagement.domain.DayEndSettlement;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medicationmanagement/service/IDayEndSettlementService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medicationmanagement/service/IDayEndSettlementService.java
similarity index 63%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/medicationmanagement/service/IDayEndSettlementService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medicationmanagement/service/IDayEndSettlementService.java
index 57b5a6220..06be17fb2 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medicationmanagement/service/IDayEndSettlementService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medicationmanagement/service/IDayEndSettlementService.java
@@ -1,6 +1,6 @@
-package com.openhis.medicationmanagement.service;
+package com.healthlink.his.medicationmanagement.service;
 
-import com.openhis.medicationmanagement.domain.DayEndSettlement;
+import com.healthlink.his.medicationmanagement.domain.DayEndSettlement;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medicationmanagement/service/impl/DayEndSettlementServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medicationmanagement/service/impl/DayEndSettlementServiceImpl.java
similarity index 55%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/medicationmanagement/service/impl/DayEndSettlementServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medicationmanagement/service/impl/DayEndSettlementServiceImpl.java
index 656a0697b..65d1fc64c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medicationmanagement/service/impl/DayEndSettlementServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/medicationmanagement/service/impl/DayEndSettlementServiceImpl.java
@@ -1,8 +1,8 @@
-package com.openhis.medicationmanagement.service.impl;
+package com.healthlink.his.medicationmanagement.service.impl;
 
-import com.openhis.medicationmanagement.domain.DayEndSettlement;
-import com.openhis.medicationmanagement.mapper.DayEndSettlementMapper;
-import com.openhis.medicationmanagement.service.IDayEndSettlementService;
+import com.healthlink.his.medicationmanagement.domain.DayEndSettlement;
+import com.healthlink.his.medicationmanagement.mapper.DayEndSettlementMapper;
+import com.healthlink.his.medicationmanagement.service.IDayEndSettlementService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/GfRatio.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/domain/GfRatio.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/GfRatio.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/domain/GfRatio.java
index 2acba41ea..d858bec16 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/GfRatio.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/domain/GfRatio.java
@@ -1,4 +1,4 @@
-package com.openhis.nenu.domain;
+package com.healthlink.his.nenu.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/GfRatioApplication.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/domain/GfRatioApplication.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/GfRatioApplication.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/domain/GfRatioApplication.java
index 30e2cf893..921693970 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/GfRatioApplication.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/domain/GfRatioApplication.java
@@ -1,4 +1,4 @@
-package com.openhis.nenu.domain;
+package com.healthlink.his.nenu.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/TransactionResponse.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/domain/TransactionResponse.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/TransactionResponse.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/domain/TransactionResponse.java
index 903ffcaca..53d4d0736 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/TransactionResponse.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/domain/TransactionResponse.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.nenu.domain;
+package com.healthlink.his.nenu.domain;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/dto/GfTypeRatioDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/dto/GfTypeRatioDto.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/dto/GfTypeRatioDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/dto/GfTypeRatioDto.java
index 1b13d1309..ac2fa63dd 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/dto/GfTypeRatioDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/dto/GfTypeRatioDto.java
@@ -1,4 +1,4 @@
-package com.openhis.nenu.dto;
+package com.healthlink.his.nenu.dto;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/GfRatioApplicationMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/mapper/GfRatioApplicationMapper.java
similarity index 75%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/GfRatioApplicationMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/mapper/GfRatioApplicationMapper.java
index 6113c624e..217642b99 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/GfRatioApplicationMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/mapper/GfRatioApplicationMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.nenu.mapper;
+package com.healthlink.his.nenu.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.nenu.domain.GfRatioApplication;
+import com.healthlink.his.nenu.domain.GfRatioApplication;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/GfRatioMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/mapper/GfRatioMapper.java
similarity index 76%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/GfRatioMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/mapper/GfRatioMapper.java
index 49f6df240..2224d245b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/GfRatioMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/mapper/GfRatioMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.nenu.mapper;
+package com.healthlink.his.nenu.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.nenu.domain.GfRatio;
+import com.healthlink.his.nenu.domain.GfRatio;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/TransactionResponseMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/mapper/TransactionResponseMapper.java
similarity index 77%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/TransactionResponseMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/mapper/TransactionResponseMapper.java
index bde712d3a..d00df7e9e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/TransactionResponseMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/mapper/TransactionResponseMapper.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.nenu.mapper;
+package com.healthlink.his.nenu.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.nenu.domain.TransactionResponse;
+import com.healthlink.his.nenu.domain.TransactionResponse;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/IGfRatioApplicationService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/service/IGfRatioApplicationService.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/IGfRatioApplicationService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/service/IGfRatioApplicationService.java
index 554ced943..0e5c422ac 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/IGfRatioApplicationService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/service/IGfRatioApplicationService.java
@@ -1,7 +1,7 @@
-package com.openhis.nenu.service;
+package com.healthlink.his.nenu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.nenu.domain.GfRatioApplication;
+import com.healthlink.his.nenu.domain.GfRatioApplication;
 
 /**
  * 公费医疗自付比例调整申请表Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/IGfRatioService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/service/IGfRatioService.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/IGfRatioService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/service/IGfRatioService.java
index 84518ce5a..5f0e596d2 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/IGfRatioService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/service/IGfRatioService.java
@@ -1,8 +1,8 @@
-package com.openhis.nenu.service;
+package com.healthlink.his.nenu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.nenu.domain.GfRatio;
-import com.openhis.nenu.dto.GfTypeRatioDto;
+import com.healthlink.his.nenu.domain.GfRatio;
+import com.healthlink.his.nenu.dto.GfTypeRatioDto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/ITransactionResponseService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/service/ITransactionResponseService.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/ITransactionResponseService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/service/ITransactionResponseService.java
index e3e2287a0..020887126 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/ITransactionResponseService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/service/ITransactionResponseService.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.nenu.service;
+package com.healthlink.his.nenu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.nenu.domain.TransactionResponse;
+import com.healthlink.his.nenu.domain.TransactionResponse;
 
 /**
  * 中银交易记录Service
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/GfRatioApplicationServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/service/impl/GfRatioApplicationServiceImpl.java
similarity index 62%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/GfRatioApplicationServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/service/impl/GfRatioApplicationServiceImpl.java
index c9a1fb57b..db73646a2 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/GfRatioApplicationServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/service/impl/GfRatioApplicationServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.nenu.service.impl;
+package com.healthlink.his.nenu.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.nenu.domain.GfRatioApplication;
-import com.openhis.nenu.mapper.GfRatioApplicationMapper;
-import com.openhis.nenu.service.IGfRatioApplicationService;
+import com.healthlink.his.nenu.domain.GfRatioApplication;
+import com.healthlink.his.nenu.mapper.GfRatioApplicationMapper;
+import com.healthlink.his.nenu.service.IGfRatioApplicationService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/GfRatioServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/service/impl/GfRatioServiceImpl.java
similarity index 88%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/GfRatioServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/service/impl/GfRatioServiceImpl.java
index 06e4db52e..a4af2061f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/GfRatioServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/service/impl/GfRatioServiceImpl.java
@@ -1,18 +1,18 @@
-package com.openhis.nenu.service.impl;
+package com.healthlink.his.nenu.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.enums.DelFlag;
-import com.openhis.common.enums.GfRatioType;
-import com.openhis.common.enums.ItemType;
-import com.openhis.common.enums.ybenums.YbChrgitmLv;
-import com.openhis.common.enums.ybenums.YbMedChrgItmType;
-import com.openhis.financial.model.PaymentedItemModel;
-import com.openhis.financial.model.StudentPaymentItemModel;
-import com.openhis.nenu.domain.GfRatio;
-import com.openhis.nenu.dto.GfTypeRatioDto;
-import com.openhis.nenu.mapper.GfRatioMapper;
-import com.openhis.nenu.service.IGfRatioService;
+import com.healthlink.his.common.enums.GfRatioType;
+import com.healthlink.his.common.enums.ItemType;
+import com.healthlink.his.common.enums.ybenums.YbChrgitmLv;
+import com.healthlink.his.common.enums.ybenums.YbMedChrgItmType;
+import com.healthlink.his.financial.model.PaymentedItemModel;
+import com.healthlink.his.financial.model.StudentPaymentItemModel;
+import com.healthlink.his.nenu.domain.GfRatio;
+import com.healthlink.his.nenu.dto.GfTypeRatioDto;
+import com.healthlink.his.nenu.mapper.GfRatioMapper;
+import com.healthlink.his.nenu.service.IGfRatioService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/TransactionResponseServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/service/impl/TransactionResponseServiceImpl.java
similarity index 63%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/TransactionResponseServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/service/impl/TransactionResponseServiceImpl.java
index d204c5134..f087182e2 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/TransactionResponseServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/nenu/service/impl/TransactionResponseServiceImpl.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.nenu.service.impl;
+package com.healthlink.his.nenu.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.nenu.domain.TransactionResponse;
-import com.openhis.nenu.mapper.TransactionResponseMapper;
-import com.openhis.nenu.service.ITransactionResponseService;
+import com.healthlink.his.nenu.domain.TransactionResponse;
+import com.healthlink.his.nenu.mapper.TransactionResponseMapper;
+import com.healthlink.his.nenu.service.ITransactionResponseService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/surgicalschedule/domain/OpSchedule.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/surgicalschedule/domain/OpSchedule.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/surgicalschedule/domain/OpSchedule.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/surgicalschedule/domain/OpSchedule.java
index 1a0a5db86..87d54295e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/surgicalschedule/domain/OpSchedule.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/surgicalschedule/domain/OpSchedule.java
@@ -1,4 +1,4 @@
-package com.openhis.surgicalschedule.domain;
+package com.healthlink.his.surgicalschedule.domain;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/surgicalschedule/mapper/OpScheduleMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/surgicalschedule/mapper/OpScheduleMapper.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/surgicalschedule/mapper/OpScheduleMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/surgicalschedule/mapper/OpScheduleMapper.java
index 4e52e178b..6cb94cf72 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/surgicalschedule/mapper/OpScheduleMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/surgicalschedule/mapper/OpScheduleMapper.java
@@ -1,6 +1,6 @@
-package com.openhis.surgicalschedule.mapper;
+package com.healthlink.his.surgicalschedule.mapper;
 
-import com.openhis.surgicalschedule.domain.OpSchedule;
+import com.healthlink.his.surgicalschedule.domain.OpSchedule;
 import org.springframework.stereotype.Repository;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/surgicalschedule/service/IOpScheduleService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/surgicalschedule/service/IOpScheduleService.java
similarity index 64%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/surgicalschedule/service/IOpScheduleService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/surgicalschedule/service/IOpScheduleService.java
index 62bb4d99a..f3f02b20c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/surgicalschedule/service/IOpScheduleService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/surgicalschedule/service/IOpScheduleService.java
@@ -1,7 +1,7 @@
-package com.openhis.surgicalschedule.service;
+package com.healthlink.his.surgicalschedule.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.surgicalschedule.domain.OpSchedule;
+import com.healthlink.his.surgicalschedule.domain.OpSchedule;
 
 /**
  * 手术安排Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/surgicalschedule/service/impl/OpScheduleServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/surgicalschedule/service/impl/OpScheduleServiceImpl.java
similarity index 56%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/surgicalschedule/service/impl/OpScheduleServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/surgicalschedule/service/impl/OpScheduleServiceImpl.java
index 15aadab0d..11f01ab90 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/surgicalschedule/service/impl/OpScheduleServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/surgicalschedule/service/impl/OpScheduleServiceImpl.java
@@ -1,10 +1,10 @@
-package com.openhis.surgicalschedule.service.impl;
+package com.healthlink.his.surgicalschedule.service.impl;
 
-import com.openhis.surgicalschedule.domain.OpSchedule;
-import com.openhis.surgicalschedule.mapper.OpScheduleMapper;
+import com.healthlink.his.surgicalschedule.domain.OpSchedule;
+import com.healthlink.his.surgicalschedule.mapper.OpScheduleMapper;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.surgicalschedule.service.IOpScheduleService;
+import com.healthlink.his.surgicalschedule.service.IOpScheduleService;
 
 /**
  * 手术安排Service业务层处理
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/domain/OperationRecord.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/sys/domain/OperationRecord.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/domain/OperationRecord.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/sys/domain/OperationRecord.java
index fae852c50..db2ccb0bf 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/domain/OperationRecord.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/sys/domain/OperationRecord.java
@@ -1,4 +1,4 @@
-package com.openhis.sys.domain;
+package com.healthlink.his.sys.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/domain/Option.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/sys/domain/Option.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/domain/Option.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/sys/domain/Option.java
index f942c5b8c..359cea689 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/domain/Option.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/sys/domain/Option.java
@@ -1,4 +1,4 @@
-package com.openhis.sys.domain;
+package com.healthlink.his.sys.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/mapper/OperationRecordMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/sys/mapper/OperationRecordMapper.java
similarity index 75%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/mapper/OperationRecordMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/sys/mapper/OperationRecordMapper.java
index 04fbb91df..ee71fb4c3 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/mapper/OperationRecordMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/sys/mapper/OperationRecordMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.sys.mapper;
+package com.healthlink.his.sys.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.sys.domain.OperationRecord;
+import com.healthlink.his.sys.domain.OperationRecord;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/mapper/OptionMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/sys/mapper/OptionMapper.java
similarity index 75%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/mapper/OptionMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/sys/mapper/OptionMapper.java
index c15e1f2fe..104e286c1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/mapper/OptionMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/sys/mapper/OptionMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.sys.mapper;
+package com.healthlink.his.sys.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.sys.domain.Option;
+import com.healthlink.his.sys.domain.Option;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/IOperationRecordService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/sys/service/IOperationRecordService.java
similarity index 88%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/IOperationRecordService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/sys/service/IOperationRecordService.java
index 16bf9ca19..5a622d09a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/IOperationRecordService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/sys/service/IOperationRecordService.java
@@ -1,7 +1,7 @@
-package com.openhis.sys.service;
+package com.healthlink.his.sys.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.sys.domain.OperationRecord;
+import com.healthlink.his.sys.domain.OperationRecord;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/IOptionService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/sys/service/IOptionService.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/IOptionService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/sys/service/IOptionService.java
index 8d5db8913..013cb15c1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/IOptionService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/sys/service/IOptionService.java
@@ -1,7 +1,7 @@
-package com.openhis.sys.service;
+package com.healthlink.his.sys.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.sys.domain.Option;
+import com.healthlink.his.sys.domain.Option;
 
 /**
  * 系统选项配置Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/impl/OperationRecordServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/sys/service/impl/OperationRecordServiceImpl.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/impl/OperationRecordServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/sys/service/impl/OperationRecordServiceImpl.java
index ecc583c1b..e353bd1f9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/impl/OperationRecordServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/sys/service/impl/OperationRecordServiceImpl.java
@@ -1,13 +1,13 @@
-package com.openhis.sys.service.impl;
+package com.healthlink.his.sys.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.core.domain.model.LoginUser;
 import com.core.common.utils.SecurityUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.openhis.sys.domain.OperationRecord;
-import com.openhis.sys.mapper.OperationRecordMapper;
-import com.openhis.sys.service.IOperationRecordService;
+import com.healthlink.his.sys.domain.OperationRecord;
+import com.healthlink.his.sys.mapper.OperationRecordMapper;
+import com.healthlink.his.sys.service.IOperationRecordService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/impl/OptionServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/sys/service/impl/OptionServiceImpl.java
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/impl/OptionServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/sys/service/impl/OptionServiceImpl.java
index 8ee996129..361f29fb7 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/impl/OptionServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/sys/service/impl/OptionServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.sys.service.impl;
+package com.healthlink.his.sys.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.sys.domain.Option;
-import com.openhis.sys.mapper.OptionMapper;
-import com.openhis.sys.service.IOptionService;
+import com.healthlink.his.sys.domain.Option;
+import com.healthlink.his.sys.mapper.OptionMapper;
+import com.healthlink.his.sys.service.IOptionService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/ActivityDevice.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/domain/ActivityDevice.java
similarity index 91%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/ActivityDevice.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/domain/ActivityDevice.java
index ba9a726e4..64cc20ca9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/ActivityDevice.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/domain/ActivityDevice.java
@@ -1,10 +1,10 @@
-package com.openhis.template.domain;
+package com.healthlink.his.template.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
-import com.openhis.common.enums.PublicationStatus;
+import com.healthlink.his.common.enums.PublicationStatus;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/DoctorPhrase.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/domain/DoctorPhrase.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/DoctorPhrase.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/domain/DoctorPhrase.java
index 0ba983a52..ddf06e587 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/DoctorPhrase.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/domain/DoctorPhrase.java
@@ -1,4 +1,4 @@
-package com.openhis.template.domain;
+package com.healthlink.his.template.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/EncounterAutoRoll.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/domain/EncounterAutoRoll.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/EncounterAutoRoll.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/domain/EncounterAutoRoll.java
index de37e1537..f7de23429 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/EncounterAutoRoll.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/domain/EncounterAutoRoll.java
@@ -1,4 +1,4 @@
-package com.openhis.template.domain;
+package com.healthlink.his.template.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrderGroup.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/domain/OrderGroup.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrderGroup.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/domain/OrderGroup.java
index 73e9e2f45..e251da28a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrderGroup.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/domain/OrderGroup.java
@@ -1,4 +1,4 @@
-package com.openhis.template.domain;
+package com.healthlink.his.template.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrdersGroupPackage.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/domain/OrdersGroupPackage.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrdersGroupPackage.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/domain/OrdersGroupPackage.java
index 137904a60..d05e46c13 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrdersGroupPackage.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/domain/OrdersGroupPackage.java
@@ -1,4 +1,4 @@
-package com.openhis.template.domain;
+package com.healthlink.his.template.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrdersGroupPackageDetail.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/domain/OrdersGroupPackageDetail.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrdersGroupPackageDetail.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/domain/OrdersGroupPackageDetail.java
index 54e55e0da..f2f066ee5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrdersGroupPackageDetail.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/domain/OrdersGroupPackageDetail.java
@@ -1,4 +1,4 @@
-package com.openhis.template.domain;
+package com.healthlink.his.template.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/enums/DoctorPhraseBizTypeEnum.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/enums/DoctorPhraseBizTypeEnum.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/template/enums/DoctorPhraseBizTypeEnum.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/enums/DoctorPhraseBizTypeEnum.java
index 71808efad..a48f887e3 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/enums/DoctorPhraseBizTypeEnum.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/enums/DoctorPhraseBizTypeEnum.java
@@ -1,4 +1,4 @@
-package com.openhis.template.enums;
+package com.healthlink.his.template.enums;
 
 // 枚举类不需要任何Lombok注解（@Data/@AllArgsConstructor/@NoArgsConstructor都删掉）
 public enum DoctorPhraseBizTypeEnum {
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/ActivityDeviceMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/mapper/ActivityDeviceMapper.java
similarity index 78%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/ActivityDeviceMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/mapper/ActivityDeviceMapper.java
index ed128e43d..5659a0f66 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/ActivityDeviceMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/mapper/ActivityDeviceMapper.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.template.mapper;
+package com.healthlink.his.template.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.template.domain.ActivityDevice;
+import com.healthlink.his.template.domain.ActivityDevice;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/DoctorPhraseMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/mapper/DoctorPhraseMapper.java
similarity index 65%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/DoctorPhraseMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/mapper/DoctorPhraseMapper.java
index 7c10b3958..92f6e7df7 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/DoctorPhraseMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/mapper/DoctorPhraseMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.template.mapper;
+package com.healthlink.his.template.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.template.domain.DoctorPhrase;
+import com.healthlink.his.template.domain.DoctorPhrase;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/EncounterAutoRollMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/mapper/EncounterAutoRollMapper.java
similarity index 76%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/EncounterAutoRollMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/mapper/EncounterAutoRollMapper.java
index 644bba41e..c7145178b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/EncounterAutoRollMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/mapper/EncounterAutoRollMapper.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.template.mapper;
+package com.healthlink.his.template.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.template.domain.EncounterAutoRoll;
+import com.healthlink.his.template.domain.EncounterAutoRoll;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/OrderGroupMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/mapper/OrderGroupMapper.java
similarity index 76%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/OrderGroupMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/mapper/OrderGroupMapper.java
index 546a5fe73..004b4be94 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/OrderGroupMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/mapper/OrderGroupMapper.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.template.mapper;
+package com.healthlink.his.template.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.template.domain.OrderGroup;
+import com.healthlink.his.template.domain.OrderGroup;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/OrdersGroupPackageDetailMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/mapper/OrdersGroupPackageDetailMapper.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/OrdersGroupPackageDetailMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/mapper/OrdersGroupPackageDetailMapper.java
index 1e331413f..599418c42 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/OrdersGroupPackageDetailMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/mapper/OrdersGroupPackageDetailMapper.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.template.mapper;
+package com.healthlink.his.template.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.template.domain.OrdersGroupPackageDetail;
+import com.healthlink.his.template.domain.OrdersGroupPackageDetail;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/OrdersGroupPackageMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/mapper/OrdersGroupPackageMapper.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/OrdersGroupPackageMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/mapper/OrdersGroupPackageMapper.java
index 93804579c..1a3e5741e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/OrdersGroupPackageMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/mapper/OrdersGroupPackageMapper.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.template.mapper;
+package com.healthlink.his.template.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.template.domain.OrdersGroupPackage;
+import com.healthlink.his.template.domain.OrdersGroupPackage;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/IActivityDeviceService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/IActivityDeviceService.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/IActivityDeviceService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/IActivityDeviceService.java
index 489e081ce..3ddfe0c9a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/IActivityDeviceService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/IActivityDeviceService.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.template.service;
+package com.healthlink.his.template.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.template.domain.ActivityDevice;
+import com.healthlink.his.template.domain.ActivityDevice;
 
 /**
  * TODO:概括描述当前类的主要用途和注意事项
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/IDoctorPhraseService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/IDoctorPhraseService.java
similarity index 57%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/IDoctorPhraseService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/IDoctorPhraseService.java
index 3bff4e9ea..bfcb18d71 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/IDoctorPhraseService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/IDoctorPhraseService.java
@@ -1,7 +1,7 @@
-package com.openhis.template.service;
+package com.healthlink.his.template.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.template.domain.DoctorPhrase;
+import com.healthlink.his.template.domain.DoctorPhrase;
 
 public interface IDoctorPhraseService extends IService<DoctorPhrase> {
 }
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/IEncounterAutoRollService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/IEncounterAutoRollService.java
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/IEncounterAutoRollService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/IEncounterAutoRollService.java
index 8ad69e2b9..be9905c08 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/IEncounterAutoRollService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/IEncounterAutoRollService.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.template.service;
+package com.healthlink.his.template.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.template.domain.EncounterAutoRoll;
+import com.healthlink.his.template.domain.EncounterAutoRoll;
 
 /**
  * 住院就诊滚方绑定
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/IOrdersGroupPackageDetailService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/IOrdersGroupPackageDetailService.java
similarity index 64%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/IOrdersGroupPackageDetailService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/IOrdersGroupPackageDetailService.java
index 229c0d4f7..d1b5f19ab 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/IOrdersGroupPackageDetailService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/IOrdersGroupPackageDetailService.java
@@ -1,7 +1,7 @@
-package com.openhis.template.service;
+package com.healthlink.his.template.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.template.domain.OrdersGroupPackageDetail;
+import com.healthlink.his.template.domain.OrdersGroupPackageDetail;
 
 /**
  *
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/IOrdersGroupPackageService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/IOrdersGroupPackageService.java
similarity index 64%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/IOrdersGroupPackageService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/IOrdersGroupPackageService.java
index 22e971b0a..51c34031b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/IOrdersGroupPackageService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/IOrdersGroupPackageService.java
@@ -1,7 +1,7 @@
-package com.openhis.template.service;
+package com.healthlink.his.template.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.template.domain.OrdersGroupPackage;
+import com.healthlink.his.template.domain.OrdersGroupPackage;
 
 /**
  *
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/OrderGroupService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/OrderGroupService.java
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/OrderGroupService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/OrderGroupService.java
index 696823570..30b1ee8fc 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/OrderGroupService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/OrderGroupService.java
@@ -1,7 +1,7 @@
-package com.openhis.template.service;
+package com.healthlink.his.template.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.template.domain.OrderGroup;
+import com.healthlink.his.template.domain.OrderGroup;
 
 /**
  * 组套Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/ActivityDeviceServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/impl/ActivityDeviceServiceImpl.java
similarity index 64%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/ActivityDeviceServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/impl/ActivityDeviceServiceImpl.java
index fe7e41f30..ebab36f33 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/ActivityDeviceServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/impl/ActivityDeviceServiceImpl.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.template.service.impl;
+package com.healthlink.his.template.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.template.domain.ActivityDevice;
-import com.openhis.template.mapper.ActivityDeviceMapper;
-import com.openhis.template.service.IActivityDeviceService;
+import com.healthlink.his.template.domain.ActivityDevice;
+import com.healthlink.his.template.mapper.ActivityDeviceMapper;
+import com.healthlink.his.template.service.IActivityDeviceService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/DoctorPhraseServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/impl/DoctorPhraseServiceImpl.java
similarity index 52%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/DoctorPhraseServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/impl/DoctorPhraseServiceImpl.java
index 3d46209b4..b59bf3f1e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/DoctorPhraseServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/impl/DoctorPhraseServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.template.service.impl;
+package com.healthlink.his.template.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.template.domain.DoctorPhrase;
-import com.openhis.template.mapper.DoctorPhraseMapper;
-import com.openhis.template.service.IDoctorPhraseService;
+import com.healthlink.his.template.domain.DoctorPhrase;
+import com.healthlink.his.template.mapper.DoctorPhraseMapper;
+import com.healthlink.his.template.service.IDoctorPhraseService;
 import org.springframework.stereotype.Service;
 
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/EncounterAutoRollServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/impl/EncounterAutoRollServiceImpl.java
similarity index 62%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/EncounterAutoRollServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/impl/EncounterAutoRollServiceImpl.java
index 05611a529..e443982fe 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/EncounterAutoRollServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/impl/EncounterAutoRollServiceImpl.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.template.service.impl;
+package com.healthlink.his.template.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.template.domain.EncounterAutoRoll;
-import com.openhis.template.mapper.EncounterAutoRollMapper;
-import com.openhis.template.service.IEncounterAutoRollService;
+import com.healthlink.his.template.domain.EncounterAutoRoll;
+import com.healthlink.his.template.mapper.EncounterAutoRollMapper;
+import com.healthlink.his.template.service.IEncounterAutoRollService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/OrderGroupServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/impl/OrderGroupServiceImpl.java
similarity index 63%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/OrderGroupServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/impl/OrderGroupServiceImpl.java
index ac365bb50..f984feceb 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/OrderGroupServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/impl/OrderGroupServiceImpl.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.template.service.impl;
+package com.healthlink.his.template.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.template.domain.OrderGroup;
-import com.openhis.template.mapper.OrderGroupMapper;
-import com.openhis.template.service.OrderGroupService;
+import com.healthlink.his.template.domain.OrderGroup;
+import com.healthlink.his.template.mapper.OrderGroupMapper;
+import com.healthlink.his.template.service.OrderGroupService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/OrdersGroupPackageDetailServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/impl/OrdersGroupPackageDetailServiceImpl.java
similarity index 60%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/OrdersGroupPackageDetailServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/impl/OrdersGroupPackageDetailServiceImpl.java
index 5ba989e32..4b1db924e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/OrdersGroupPackageDetailServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/impl/OrdersGroupPackageDetailServiceImpl.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.template.service.impl;
+package com.healthlink.his.template.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.template.domain.OrdersGroupPackageDetail;
-import com.openhis.template.mapper.OrdersGroupPackageDetailMapper;
-import com.openhis.template.service.IOrdersGroupPackageDetailService;
+import com.healthlink.his.template.domain.OrdersGroupPackageDetail;
+import com.healthlink.his.template.mapper.OrdersGroupPackageDetailMapper;
+import com.healthlink.his.template.service.IOrdersGroupPackageDetailService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/OrdersGroupPackageServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/impl/OrdersGroupPackageServiceImpl.java
similarity index 60%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/OrdersGroupPackageServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/impl/OrdersGroupPackageServiceImpl.java
index dfa4a6116..aa4ce9b36 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/OrdersGroupPackageServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/template/service/impl/OrdersGroupPackageServiceImpl.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.template.service.impl;
+package com.healthlink.his.template.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.template.domain.OrdersGroupPackage;
-import com.openhis.template.mapper.OrdersGroupPackageMapper;
-import com.openhis.template.service.IOrdersGroupPackageService;
+import com.healthlink.his.template.domain.OrdersGroupPackage;
+import com.healthlink.his.template.mapper.OrdersGroupPackageMapper;
+import com.healthlink.his.template.service.IOrdersGroupPackageService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/CallNumberVoiceConfig.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/domain/CallNumberVoiceConfig.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/CallNumberVoiceConfig.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/domain/CallNumberVoiceConfig.java
index a642cb9b0..76aeac482 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/CallNumberVoiceConfig.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/domain/CallNumberVoiceConfig.java
@@ -1,4 +1,4 @@
-package com.openhis.triageandqueuemanage.domain;
+package com.healthlink.his.triageandqueuemanage.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/CallRecord.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/domain/CallRecord.java
similarity index 86%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/CallRecord.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/domain/CallRecord.java
index c669a68fd..7495e48e1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/CallRecord.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/domain/CallRecord.java
@@ -1,4 +1,4 @@
-package com.openhis.triageandqueuemanage.domain;
+package com.healthlink.his.triageandqueuemanage.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -28,7 +28,7 @@ public class CallRecord {
     private LocalDateTime callTime;
 
     /**
-     * 叫号类型，使用 {@link com.openhis.common.enums.CallType} 枚举值
+     * 叫号类型，使用 {@link com.healthlink.his.common.enums.CallType} 枚举值
      * 10-CALL(选呼), 20-NEXT(下一患者), 30-AUTO_CALL(自动叫号),
      * 40-SKIP(跳过), 50-COMPLETE(完成), 60-REQUEUE(重排)
      */
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/DivLog.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/domain/DivLog.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/DivLog.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/domain/DivLog.java
index b01114873..5dc26ce91 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/DivLog.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/domain/DivLog.java
@@ -1,4 +1,4 @@
-package com.openhis.triageandqueuemanage.domain;
+package com.healthlink.his.triageandqueuemanage.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/TriageCandidateExclusion.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/domain/TriageCandidateExclusion.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/TriageCandidateExclusion.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/domain/TriageCandidateExclusion.java
index 7c7340ee1..f96b8f968 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/TriageCandidateExclusion.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/domain/TriageCandidateExclusion.java
@@ -1,4 +1,4 @@
-package com.openhis.triageandqueuemanage.domain;
+package com.healthlink.his.triageandqueuemanage.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/TriageQueueItem.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/domain/TriageQueueItem.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/TriageQueueItem.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/domain/TriageQueueItem.java
index 38d3a6d32..eaa4ae2ed 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/TriageQueueItem.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/domain/TriageQueueItem.java
@@ -1,4 +1,4 @@
-package com.openhis.triageandqueuemanage.domain;
+package com.healthlink.his.triageandqueuemanage.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/mapper/CallNumberVoiceConfigMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/mapper/CallNumberVoiceConfigMapper.java
similarity index 61%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/mapper/CallNumberVoiceConfigMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/mapper/CallNumberVoiceConfigMapper.java
index be167d9a9..3fc51c618 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/mapper/CallNumberVoiceConfigMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/mapper/CallNumberVoiceConfigMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.triageandqueuemanage.mapper;
+package com.healthlink.his.triageandqueuemanage.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.triageandqueuemanage.domain.CallNumberVoiceConfig;
+import com.healthlink.his.triageandqueuemanage.domain.CallNumberVoiceConfig;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/mapper/CallRecordMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/mapper/CallRecordMapper.java
similarity index 60%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/mapper/CallRecordMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/mapper/CallRecordMapper.java
index 421756aeb..4b8077544 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/mapper/CallRecordMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/mapper/CallRecordMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.triageandqueuemanage.mapper;
+package com.healthlink.his.triageandqueuemanage.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.triageandqueuemanage.domain.CallRecord;
+import com.healthlink.his.triageandqueuemanage.domain.CallRecord;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/mapper/DivLogMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/mapper/DivLogMapper.java
similarity index 60%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/mapper/DivLogMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/mapper/DivLogMapper.java
index a99e34ce8..2314969a7 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/mapper/DivLogMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/mapper/DivLogMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.triageandqueuemanage.mapper;
+package com.healthlink.his.triageandqueuemanage.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.triageandqueuemanage.domain.DivLog;
+import com.healthlink.his.triageandqueuemanage.domain.DivLog;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/mapper/TriageCandidateExclusionMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/mapper/TriageCandidateExclusionMapper.java
similarity index 61%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/mapper/TriageCandidateExclusionMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/mapper/TriageCandidateExclusionMapper.java
index 57cde407a..6d3a3b6fc 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/mapper/TriageCandidateExclusionMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/mapper/TriageCandidateExclusionMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.triageandqueuemanage.mapper;
+package com.healthlink.his.triageandqueuemanage.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.triageandqueuemanage.domain.TriageCandidateExclusion;
+import com.healthlink.his.triageandqueuemanage.domain.TriageCandidateExclusion;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/mapper/TriageQueueItemMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/mapper/TriageQueueItemMapper.java
similarity index 61%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/mapper/TriageQueueItemMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/mapper/TriageQueueItemMapper.java
index 6c36336a5..20d0c115e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/mapper/TriageQueueItemMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/mapper/TriageQueueItemMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.triageandqueuemanage.mapper;
+package com.healthlink.his.triageandqueuemanage.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.triageandqueuemanage.domain.TriageQueueItem;
+import com.healthlink.his.triageandqueuemanage.domain.TriageQueueItem;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/CallNumberVoiceConfigService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/CallNumberVoiceConfigService.java
similarity index 53%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/CallNumberVoiceConfigService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/CallNumberVoiceConfigService.java
index 2b60ec805..bfb788b9d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/CallNumberVoiceConfigService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/CallNumberVoiceConfigService.java
@@ -1,7 +1,7 @@
-package com.openhis.triageandqueuemanage.service;
+package com.healthlink.his.triageandqueuemanage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.triageandqueuemanage.domain.CallNumberVoiceConfig;
+import com.healthlink.his.triageandqueuemanage.domain.CallNumberVoiceConfig;
 
 public interface CallNumberVoiceConfigService extends IService<CallNumberVoiceConfig> {
 }
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/CallRecordService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/CallRecordService.java
similarity index 51%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/CallRecordService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/CallRecordService.java
index 69d8eab67..acc0654ec 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/CallRecordService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/CallRecordService.java
@@ -1,7 +1,7 @@
-package com.openhis.triageandqueuemanage.service;
+package com.healthlink.his.triageandqueuemanage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.triageandqueuemanage.domain.CallRecord;
+import com.healthlink.his.triageandqueuemanage.domain.CallRecord;
 
 public interface CallRecordService extends IService<CallRecord> {
 }
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/DivLogService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/DivLogService.java
similarity index 50%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/DivLogService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/DivLogService.java
index 52828a66e..57b24f98b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/DivLogService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/DivLogService.java
@@ -1,7 +1,7 @@
-package com.openhis.triageandqueuemanage.service;
+package com.healthlink.his.triageandqueuemanage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.triageandqueuemanage.domain.DivLog;
+import com.healthlink.his.triageandqueuemanage.domain.DivLog;
 
 public interface DivLogService extends IService<DivLog> {
 }
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/TriageCandidateExclusionService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/TriageCandidateExclusionService.java
similarity index 53%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/TriageCandidateExclusionService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/TriageCandidateExclusionService.java
index 9745206d9..5b7579de0 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/TriageCandidateExclusionService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/TriageCandidateExclusionService.java
@@ -1,7 +1,7 @@
-package com.openhis.triageandqueuemanage.service;
+package com.healthlink.his.triageandqueuemanage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.triageandqueuemanage.domain.TriageCandidateExclusion;
+import com.healthlink.his.triageandqueuemanage.domain.TriageCandidateExclusion;
 
 public interface TriageCandidateExclusionService extends IService<TriageCandidateExclusion> {
 }
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/TriageQueueItemService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/TriageQueueItemService.java
similarity index 52%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/TriageQueueItemService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/TriageQueueItemService.java
index 77931fd5d..189a8d1b6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/TriageQueueItemService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/TriageQueueItemService.java
@@ -1,7 +1,7 @@
-package com.openhis.triageandqueuemanage.service;
+package com.healthlink.his.triageandqueuemanage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.triageandqueuemanage.domain.TriageQueueItem;
+import com.healthlink.his.triageandqueuemanage.domain.TriageQueueItem;
 
 public interface TriageQueueItemService extends IService<TriageQueueItem> {
 }
diff --git a/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/impl/CallNumberVoiceConfigServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/impl/CallNumberVoiceConfigServiceImpl.java
new file mode 100755
index 000000000..f190bac02
--- /dev/null
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/impl/CallNumberVoiceConfigServiceImpl.java
@@ -0,0 +1,11 @@
+package com.healthlink.his.triageandqueuemanage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.healthlink.his.triageandqueuemanage.domain.CallNumberVoiceConfig;
+import com.healthlink.his.triageandqueuemanage.mapper.CallNumberVoiceConfigMapper;
+import com.healthlink.his.triageandqueuemanage.service.CallNumberVoiceConfigService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class CallNumberVoiceConfigServiceImpl extends ServiceImpl<CallNumberVoiceConfigMapper, CallNumberVoiceConfig> implements CallNumberVoiceConfigService {
+}
diff --git a/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/impl/CallRecordServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/impl/CallRecordServiceImpl.java
new file mode 100755
index 000000000..b32b4a92d
--- /dev/null
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/impl/CallRecordServiceImpl.java
@@ -0,0 +1,11 @@
+package com.healthlink.his.triageandqueuemanage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.healthlink.his.triageandqueuemanage.domain.CallRecord;
+import com.healthlink.his.triageandqueuemanage.mapper.CallRecordMapper;
+import com.healthlink.his.triageandqueuemanage.service.CallRecordService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class CallRecordServiceImpl extends ServiceImpl<CallRecordMapper, CallRecord> implements CallRecordService {
+}
diff --git a/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/impl/DivLogServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/impl/DivLogServiceImpl.java
new file mode 100755
index 000000000..99a23a885
--- /dev/null
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/impl/DivLogServiceImpl.java
@@ -0,0 +1,11 @@
+package com.healthlink.his.triageandqueuemanage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.healthlink.his.triageandqueuemanage.domain.DivLog;
+import com.healthlink.his.triageandqueuemanage.mapper.DivLogMapper;
+import com.healthlink.his.triageandqueuemanage.service.DivLogService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DivLogServiceImpl extends ServiceImpl<DivLogMapper, DivLog> implements DivLogService {
+}
diff --git a/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/impl/TriageCandidateExclusionServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/impl/TriageCandidateExclusionServiceImpl.java
new file mode 100755
index 000000000..d504bde9d
--- /dev/null
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/impl/TriageCandidateExclusionServiceImpl.java
@@ -0,0 +1,12 @@
+package com.healthlink.his.triageandqueuemanage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.healthlink.his.triageandqueuemanage.domain.TriageCandidateExclusion;
+import com.healthlink.his.triageandqueuemanage.mapper.TriageCandidateExclusionMapper;
+import com.healthlink.his.triageandqueuemanage.service.TriageCandidateExclusionService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TriageCandidateExclusionServiceImpl extends ServiceImpl<TriageCandidateExclusionMapper, TriageCandidateExclusion> implements TriageCandidateExclusionService {
+}
+
diff --git a/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/impl/TriageQueueItemServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/impl/TriageQueueItemServiceImpl.java
new file mode 100755
index 000000000..293063720
--- /dev/null
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/triageandqueuemanage/service/impl/TriageQueueItemServiceImpl.java
@@ -0,0 +1,14 @@
+package com.healthlink.his.triageandqueuemanage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.healthlink.his.triageandqueuemanage.domain.TriageQueueItem;
+import com.healthlink.his.triageandqueuemanage.mapper.TriageQueueItemMapper;
+import com.healthlink.his.triageandqueuemanage.service.TriageQueueItemService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TriageQueueItemServiceImpl extends ServiceImpl<TriageQueueItemMapper, TriageQueueItem> implements TriageQueueItemService {
+}
+
+
+
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/ActivityDefinition.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/ActivityDefinition.java
index 8a7b7e2d7..5f808a6b9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/ActivityDefinition.java
@@ -1,4 +1,4 @@
-package com.openhis.workflow.domain;
+package com.healthlink.his.workflow.domain;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceDispense.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/DeviceDispense.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceDispense.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/DeviceDispense.java
index d6559cd73..e80b014e8 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceDispense.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/DeviceDispense.java
@@ -1,4 +1,4 @@
-package com.openhis.workflow.domain;
+package com.healthlink.his.workflow.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/DeviceRequest.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/DeviceRequest.java
index 21ad8ffab..f0af709a3 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/DeviceRequest.java
@@ -1,4 +1,4 @@
-package com.openhis.workflow.domain;
+package com.healthlink.his.workflow.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ElepMedicationRequest.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/ElepMedicationRequest.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ElepMedicationRequest.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/ElepMedicationRequest.java
index 24e562e3a..d78f6c846 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ElepMedicationRequest.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/ElepMedicationRequest.java
@@ -1,4 +1,4 @@
-package com.openhis.workflow.domain;
+package com.healthlink.his.workflow.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/InventoryItem.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/InventoryItem.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/InventoryItem.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/InventoryItem.java
index 0a177c82d..f4ce6bfc7 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/InventoryItem.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/InventoryItem.java
@@ -1,10 +1,10 @@
-package com.openhis.workflow.domain;
+package com.healthlink.his.workflow.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
-import com.openhis.common.enums.PublicationStatus;
+import com.healthlink.his.common.enums.PublicationStatus;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/ServiceRequest.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/ServiceRequest.java
index e268539dd..398ebaaaf 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/ServiceRequest.java
@@ -1,4 +1,4 @@
-package com.openhis.workflow.domain;
+package com.healthlink.his.workflow.domain;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequestDetail.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/ServiceRequestDetail.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequestDetail.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/ServiceRequestDetail.java
index 3fcc145a1..0d43442de 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequestDetail.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/ServiceRequestDetail.java
@@ -1,4 +1,4 @@
-package com.openhis.workflow.domain;
+package com.healthlink.his.workflow.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyDelivery.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/SupplyDelivery.java
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyDelivery.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/SupplyDelivery.java
index f034101b5..814ba93c2 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyDelivery.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/SupplyDelivery.java
@@ -1,11 +1,11 @@
-package com.openhis.workflow.domain;
+package com.healthlink.his.workflow.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
-import com.openhis.common.enums.DispenseStatus;
-import com.openhis.common.enums.SupplyType;
+import com.healthlink.his.common.enums.DispenseStatus;
+import com.healthlink.his.common.enums.SupplyType;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequest.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/SupplyRequest.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequest.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/SupplyRequest.java
index 7835cf667..3a1c07e41 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequest.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/SupplyRequest.java
@@ -1,12 +1,12 @@
-package com.openhis.workflow.domain;
+package com.healthlink.his.workflow.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
-import com.openhis.common.enums.ActPriority;
-import com.openhis.common.enums.SupplyCategory;
-import com.openhis.common.enums.SupplyStatus;
+import com.healthlink.his.common.enums.ActPriority;
+import com.healthlink.his.common.enums.SupplyCategory;
+import com.healthlink.his.common.enums.SupplyStatus;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequestAuto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/SupplyRequestAuto.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequestAuto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/SupplyRequestAuto.java
index 907b76760..9e933f6ec 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequestAuto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/domain/SupplyRequestAuto.java
@@ -1,12 +1,12 @@
-package com.openhis.workflow.domain;
+package com.healthlink.his.workflow.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
-import com.openhis.common.enums.ActPriority;
-import com.openhis.common.enums.SupplyCategory;
-import com.openhis.common.enums.SupplyStatus;
+import com.healthlink.his.common.enums.ActPriority;
+import com.healthlink.his.common.enums.SupplyCategory;
+import com.healthlink.his.common.enums.SupplyStatus;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/dto/ActivityDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/dto/ActivityDto.java
similarity index 87%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/dto/ActivityDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/dto/ActivityDto.java
index 124aa548f..06a991192 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/dto/ActivityDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/dto/ActivityDto.java
@@ -1,4 +1,4 @@
-package com.openhis.workflow.dto;
+package com.healthlink.his.workflow.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/dto/AdjustPriceDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/dto/AdjustPriceDto.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/dto/AdjustPriceDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/dto/AdjustPriceDto.java
index f3c66d8c8..8c6f8fbd4 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/dto/AdjustPriceDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/dto/AdjustPriceDto.java
@@ -1,4 +1,4 @@
-package com.openhis.workflow.dto;
+package com.healthlink.his.workflow.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/dto/ChangePriceDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/dto/ChangePriceDto.java
similarity index 91%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/dto/ChangePriceDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/dto/ChangePriceDto.java
index 122eba03c..742b255d9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/dto/ChangePriceDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/dto/ChangePriceDto.java
@@ -1,4 +1,4 @@
-package com.openhis.workflow.dto;
+package com.healthlink.his.workflow.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ActivityDefinitionMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/ActivityDefinitionMapper.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ActivityDefinitionMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/ActivityDefinitionMapper.java
index 421498503..59d89b285 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ActivityDefinitionMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/ActivityDefinitionMapper.java
@@ -1,9 +1,9 @@
-package com.openhis.workflow.mapper;
+package com.healthlink.his.workflow.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.medication.dto.AdjustPriceMedListDto;
-import com.openhis.workflow.domain.ActivityDefinition;
-import com.openhis.workflow.dto.ActivityDto;
+import com.healthlink.his.medication.dto.AdjustPriceMedListDto;
+import com.healthlink.his.workflow.domain.ActivityDefinition;
+import com.healthlink.his.workflow.dto.ActivityDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -31,7 +31,7 @@ public interface ActivityDefinitionMapper extends BaseMapper<ActivityDefinition>
      * @param itemIds
      * @Author raymond
      * @Date 12:20 2025/10/18
-     * @return java.util.List<com.openhis.workflow.domain.ActivityDefinition>
+     * @return java.util.List<com.healthlink.his.workflow.domain.ActivityDefinition>
      **/
     List<ActivityDto> searchActivityDefinitionByIds(@Param("itemIds") List<Long> itemIds);
     /**
@@ -39,7 +39,7 @@ public interface ActivityDefinitionMapper extends BaseMapper<ActivityDefinition>
      * @param keyWord
      * @Author raymond
      * @Date 07:53 2025/10/22
-     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     * @return java.util.List<com.healthlink.his.medication.dto.AdjustPriceMedListDto>
      **/
     List<AdjustPriceMedListDto> searchActivityListByKeyWord(@Param("keyWord") String keyWord);
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/DeviceDispenseMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/DeviceDispenseMapper.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/DeviceDispenseMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/DeviceDispenseMapper.java
index 3fcbc71ef..7dc47817a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/DeviceDispenseMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/DeviceDispenseMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.workflow.mapper;
+package com.healthlink.his.workflow.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.workflow.domain.DeviceDispense;
+import com.healthlink.his.workflow.domain.DeviceDispense;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/DeviceRequestMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/DeviceRequestMapper.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/DeviceRequestMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/DeviceRequestMapper.java
index 408d517da..79abaf3c5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/DeviceRequestMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/DeviceRequestMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.workflow.mapper;
+package com.healthlink.his.workflow.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.workflow.domain.DeviceRequest;
+import com.healthlink.his.workflow.domain.DeviceRequest;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ElepMedicationRequestMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/ElepMedicationRequestMapper.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ElepMedicationRequestMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/ElepMedicationRequestMapper.java
index 01ca68fd1..5568c2e64 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ElepMedicationRequestMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/ElepMedicationRequestMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.workflow.mapper;
+package com.healthlink.his.workflow.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.workflow.domain.ElepMedicationRequest;
+import com.healthlink.his.workflow.domain.ElepMedicationRequest;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/InventoryItemMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/InventoryItemMapper.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/InventoryItemMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/InventoryItemMapper.java
index 33f4dcaa1..0d9df5c79 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/InventoryItemMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/InventoryItemMapper.java
@@ -1,8 +1,8 @@
-package com.openhis.workflow.mapper;
+package com.healthlink.his.workflow.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.workflow.domain.InventoryItem;
-import com.openhis.workflow.dto.AdjustPriceDto;
+import com.healthlink.his.workflow.domain.InventoryItem;
+import com.healthlink.his.workflow.dto.AdjustPriceDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -21,7 +21,7 @@ public interface InventoryItemMapper extends BaseMapper<InventoryItem> {
      * @param itemIds
      * @Author raymond
      * @Date 21:56 2025/10/16
-     * @return java.util.List<com.openhis.workflow.dto.AdjustPriceDto>
+     * @return java.util.List<com.healthlink.his.workflow.dto.AdjustPriceDto>
      **/
     List<AdjustPriceDto> searchResultDataList(@Param("itemIds") List<Long> itemIds);
     /**
@@ -29,7 +29,7 @@ public interface InventoryItemMapper extends BaseMapper<InventoryItem> {
      * @param itemIds
      * @Author raymond
      * @Date 21:56 2025/10/16
-     * @return java.util.List<com.openhis.workflow.dto.AdjustPriceDto>
+     * @return java.util.List<com.healthlink.his.workflow.dto.AdjustPriceDto>
      **/
     List<AdjustPriceDto> searchResultDataListByGroup(@Param("itemIds") List<Long> itemIds);
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ServiceRequestDetailMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/ServiceRequestDetailMapper.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ServiceRequestDetailMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/ServiceRequestDetailMapper.java
index c2e4b16a7..80b587236 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ServiceRequestDetailMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/ServiceRequestDetailMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.workflow.mapper;
+package com.healthlink.his.workflow.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.workflow.domain.ServiceRequestDetail;
+import com.healthlink.his.workflow.domain.ServiceRequestDetail;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ServiceRequestMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/ServiceRequestMapper.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ServiceRequestMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/ServiceRequestMapper.java
index 58b96dc63..57c7ad5a5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ServiceRequestMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/ServiceRequestMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.workflow.mapper;
+package com.healthlink.his.workflow.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.workflow.domain.ServiceRequest;
+import com.healthlink.his.workflow.domain.ServiceRequest;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyDeliveryMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/SupplyDeliveryMapper.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyDeliveryMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/SupplyDeliveryMapper.java
index 3fc8b8831..1ea02c832 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyDeliveryMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/SupplyDeliveryMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.workflow.mapper;
+package com.healthlink.his.workflow.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.workflow.domain.SupplyDelivery;
+import com.healthlink.his.workflow.domain.SupplyDelivery;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyRequestAutoMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/SupplyRequestAutoMapper.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyRequestAutoMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/SupplyRequestAutoMapper.java
index 85e2b423a..d246eb8c4 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyRequestAutoMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/SupplyRequestAutoMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.workflow.mapper;
+package com.healthlink.his.workflow.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.workflow.domain.SupplyRequestAuto;
+import com.healthlink.his.workflow.domain.SupplyRequestAuto;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyRequestMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/SupplyRequestMapper.java
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyRequestMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/SupplyRequestMapper.java
index 9a44093ff..eb4625677 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyRequestMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/mapper/SupplyRequestMapper.java
@@ -1,9 +1,9 @@
-package com.openhis.workflow.mapper;
+package com.healthlink.his.workflow.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.medication.dto.AdjustPriceMedListDto;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.dto.ChangePriceDto;
+import com.healthlink.his.medication.dto.AdjustPriceMedListDto;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.dto.ChangePriceDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -23,7 +23,7 @@ public interface SupplyRequestMapper extends BaseMapper<SupplyRequest> {
      * @param busNo
      * @Author raymond
      * @Date 10:12 2025/10/19
-     * @return java.util.List<com.openhis.workflow.dto.ChangePriceDto>
+     * @return java.util.List<com.healthlink.his.workflow.dto.ChangePriceDto>
      **/
     List<ChangePriceDto> searchDataForBusNo(@Param("busNo") String busNo);
     /**
@@ -31,7 +31,7 @@ public interface SupplyRequestMapper extends BaseMapper<SupplyRequest> {
      * @param busNo
      * @Author raymond
      * @Date 13:36 2025/10/30
-     * @return java.util.List<com.openhis.workflow.dto.ChangePriceDto>
+     * @return java.util.List<com.healthlink.his.workflow.dto.ChangePriceDto>
      **/
     List<ChangePriceDto> searchGroupDataForBusNo(@Param("busNo") String busNo);
     /**
@@ -39,7 +39,7 @@ public interface SupplyRequestMapper extends BaseMapper<SupplyRequest> {
      * @param busNo
      * @Author raymond
      * @Date 14:10 2025/10/21
-     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     * @return java.util.List<com.healthlink.his.medication.dto.AdjustPriceMedListDto>
      **/
     List<AdjustPriceMedListDto> searchMedInfoDataForBusNo(@Param("busNo") String busNo);
     /**
@@ -48,7 +48,7 @@ public interface SupplyRequestMapper extends BaseMapper<SupplyRequest> {
      * @param createTime
      * @Author raymond
      * @Date 07:22 2025/10/29
-     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     * @return java.util.List<com.healthlink.his.medication.dto.AdjustPriceMedListDto>
      **/
     List<AdjustPriceMedListDto> searchHistoryMedInfoData(@Param("busNo") String busNo, @Param("createTime")Date createTime);
 
@@ -57,7 +57,7 @@ public interface SupplyRequestMapper extends BaseMapper<SupplyRequest> {
      * @param busNo
      * @Author raymond
      * @Date 18:03 2025/10/22
-     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     * @return java.util.List<com.healthlink.his.medication.dto.AdjustPriceMedListDto>
      **/
     List<AdjustPriceMedListDto> searchDeviceInfoDataForBusNo(@Param("busNo") String busNo);
     /**
@@ -66,7 +66,7 @@ public interface SupplyRequestMapper extends BaseMapper<SupplyRequest> {
      * @param createTime
      * @Author raymond
      * @Date 08:57 2025/10/29
-     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     * @return java.util.List<com.healthlink.his.medication.dto.AdjustPriceMedListDto>
      **/
     List<AdjustPriceMedListDto> searchHistoryDeviceInfoDataForBusNo(@Param("busNo") String busNo,@Param("createTime") Date createTime);
     /**
@@ -74,7 +74,7 @@ public interface SupplyRequestMapper extends BaseMapper<SupplyRequest> {
      * @param busNo
      * @Author raymond
      * @Date 18:03 2025/10/22
-     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     * @return java.util.List<com.healthlink.his.medication.dto.AdjustPriceMedListDto>
      **/
     List<AdjustPriceMedListDto> searchActivityInfoDataForBusNo(@Param("busNo") String busNo);
     /**
@@ -82,7 +82,7 @@ public interface SupplyRequestMapper extends BaseMapper<SupplyRequest> {
      * @param busNo
      * @Author raymond
      * @Date 10:01 2025/10/29
-     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     * @return java.util.List<com.healthlink.his.medication.dto.AdjustPriceMedListDto>
      **/
     List<AdjustPriceMedListDto> searchHistoryActivityInfoDataForBusNo(@Param("busNo") String busNo);
 
@@ -91,7 +91,7 @@ public interface SupplyRequestMapper extends BaseMapper<SupplyRequest> {
      * @param busNo
      * @Author raymond
      * @Date 18:03 2025/10/22
-     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     * @return java.util.List<com.healthlink.his.medication.dto.AdjustPriceMedListDto>
      **/
     List<AdjustPriceMedListDto> searchHealthInfoDataForBusNo(@Param("busNo") String busNo);
     /**
@@ -99,7 +99,7 @@ public interface SupplyRequestMapper extends BaseMapper<SupplyRequest> {
      * @param busNo
      * @Author raymond
      * @Date 10:00 2025/10/29
-     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     * @return java.util.List<com.healthlink.his.medication.dto.AdjustPriceMedListDto>
      **/
     List<AdjustPriceMedListDto> searchHistoryHealthInfoDataForBusNo(@Param("busNo") String busNo);
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IActivityDefinitionService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/IActivityDefinitionService.java
similarity index 83%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IActivityDefinitionService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/IActivityDefinitionService.java
index f95744897..07c715a1c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IActivityDefinitionService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/IActivityDefinitionService.java
@@ -1,9 +1,9 @@
-package com.openhis.workflow.service;
+package com.healthlink.his.workflow.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.medication.dto.AdjustPriceMedListDto;
-import com.openhis.workflow.domain.ActivityDefinition;
-import com.openhis.workflow.dto.ActivityDto;
+import com.healthlink.his.medication.dto.AdjustPriceMedListDto;
+import com.healthlink.his.workflow.domain.ActivityDefinition;
+import com.healthlink.his.workflow.dto.ActivityDto;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -46,7 +46,7 @@ public interface IActivityDefinitionService extends IService<ActivityDefinition>
      * @param itemIds
      * @Author raymond
      * @Date 12:20 2025/10/18
-     * @return java.util.List<com.openhis.workflow.domain.ActivityDefinition>
+     * @return java.util.List<com.healthlink.his.workflow.domain.ActivityDefinition>
      *
      */
     List<ActivityDto> searchActivityDefinitionByIds(@Param("itemIds") List<Long> itemIds);
@@ -57,7 +57,7 @@ public interface IActivityDefinitionService extends IService<ActivityDefinition>
      * @param keyWord
      * @Author raymond
      * @Date 07:53 2025/10/22
-     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     * @return java.util.List<com.healthlink.his.medication.dto.AdjustPriceMedListDto>
      *
      */
     List<AdjustPriceMedListDto> searchActivityListByKeyWord(String keyWord);
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceDispenseService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/IDeviceDispenseService.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceDispenseService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/IDeviceDispenseService.java
index ebe0be46e..e0487c73f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceDispenseService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/IDeviceDispenseService.java
@@ -1,9 +1,9 @@
-package com.openhis.workflow.service;
+package com.healthlink.his.workflow.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.workflow.domain.DeviceDispense;
-import com.openhis.workflow.domain.DeviceRequest;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.workflow.domain.DeviceDispense;
+import com.healthlink.his.workflow.domain.DeviceRequest;
 
 import java.math.BigDecimal;
 import java.util.Date;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceRequestService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/IDeviceRequestService.java
similarity index 88%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceRequestService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/IDeviceRequestService.java
index b3edd4bbe..fabf5d9b0 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceRequestService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/IDeviceRequestService.java
@@ -1,8 +1,8 @@
-package com.openhis.workflow.service;
+package com.healthlink.his.workflow.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.workflow.domain.DeviceRequest;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.workflow.domain.DeviceRequest;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IElepMedicationRequestService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/IElepMedicationRequestService.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IElepMedicationRequestService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/IElepMedicationRequestService.java
index 0b3313b1d..11b79a6c3 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IElepMedicationRequestService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/IElepMedicationRequestService.java
@@ -1,7 +1,7 @@
-package com.openhis.workflow.service;
+package com.healthlink.his.workflow.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.workflow.domain.ElepMedicationRequest;
+import com.healthlink.his.workflow.domain.ElepMedicationRequest;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IInventoryItemService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/IInventoryItemService.java
similarity index 84%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IInventoryItemService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/IInventoryItemService.java
index 2b642bf95..f1b50c4aa 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IInventoryItemService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/IInventoryItemService.java
@@ -1,8 +1,8 @@
-package com.openhis.workflow.service;
+package com.healthlink.his.workflow.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.workflow.domain.InventoryItem;
-import com.openhis.workflow.dto.AdjustPriceDto;
+import com.healthlink.his.workflow.domain.InventoryItem;
+import com.healthlink.his.workflow.dto.AdjustPriceDto;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -59,7 +59,7 @@ public interface IInventoryItemService extends IService<InventoryItem> {
      * @param productIds
      * @Author raymond
      * @Date 16:45 2025/10/16
-     * @return java.util.List<com.openhis.workflow.domain.InventoryItem>
+     * @return java.util.List<com.healthlink.his.workflow.domain.InventoryItem>
      **/
     List<AdjustPriceDto> searchResultDataList(List<Long> productIds);
 
@@ -69,7 +69,7 @@ public interface IInventoryItemService extends IService<InventoryItem> {
      * @param productIds
      * @Author raymond
      * @Date 16:45 2025/10/16
-     * @return java.util.List<com.openhis.workflow.domain.InventoryItem>
+     * @return java.util.List<com.healthlink.his.workflow.domain.InventoryItem>
      **/
     List<AdjustPriceDto> searchResultDataListByGroup(List<Long> productIds);
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestDetailService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/IServiceRequestDetailService.java
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestDetailService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/IServiceRequestDetailService.java
index fd3e5e32f..97603ed0b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestDetailService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/IServiceRequestDetailService.java
@@ -1,7 +1,7 @@
-package com.openhis.workflow.service;
+package com.healthlink.his.workflow.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.workflow.domain.ServiceRequestDetail;
+import com.healthlink.his.workflow.domain.ServiceRequestDetail;
 
 /**
  * 服务申请详情管理Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/IServiceRequestService.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/IServiceRequestService.java
index 4a86e0cff..721617ce4 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/IServiceRequestService.java
@@ -1,8 +1,8 @@
-package com.openhis.workflow.service;
+package com.healthlink.his.workflow.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.workflow.domain.ServiceRequest;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.workflow.domain.ServiceRequest;
 
 import java.util.Date;
 import java.util.List;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyDeliveryService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/ISupplyDeliveryService.java
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyDeliveryService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/ISupplyDeliveryService.java
index 7ce1621cf..dc6d8ec25 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyDeliveryService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/ISupplyDeliveryService.java
@@ -1,8 +1,8 @@
-package com.openhis.workflow.service;
+package com.healthlink.his.workflow.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.workflow.domain.SupplyDelivery;
-import com.openhis.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.domain.SupplyDelivery;
+import com.healthlink.his.workflow.domain.SupplyRequest;
 
 import java.math.BigDecimal;
 import java.util.Date;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestAutoService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/ISupplyRequestAutoService.java
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestAutoService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/ISupplyRequestAutoService.java
index 769a097e4..80b247ffe 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestAutoService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/ISupplyRequestAutoService.java
@@ -1,7 +1,7 @@
-package com.openhis.workflow.service;
+package com.healthlink.his.workflow.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.workflow.domain.SupplyRequestAuto;
+import com.healthlink.his.workflow.domain.SupplyRequestAuto;
 
 /**
  * 供应申请管理Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/ISupplyRequestService.java
similarity index 86%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/ISupplyRequestService.java
index 70ee8a61a..56a93a3ff 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/ISupplyRequestService.java
@@ -1,9 +1,9 @@
-package com.openhis.workflow.service;
+package com.healthlink.his.workflow.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.medication.dto.AdjustPriceMedListDto;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.dto.ChangePriceDto;
+import com.healthlink.his.medication.dto.AdjustPriceMedListDto;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.dto.ChangePriceDto;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -165,7 +165,7 @@ public interface ISupplyRequestService extends IService<SupplyRequest> {
      * @param busNo
      * @Author raymond
      * @Date 10:13 2025/10/19
-     * @return java.util.List<com.openhis.workflow.dto.ChangePriceDto>
+     * @return java.util.List<com.healthlink.his.workflow.dto.ChangePriceDto>
      **/
     List<ChangePriceDto> searchDataForBusNo(String busNo);
 
@@ -206,7 +206,7 @@ public interface ISupplyRequestService extends IService<SupplyRequest> {
      * @param busNo
      * @Author raymond
      * @Date 14:10 2025/10/21
-     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     * @return java.util.List<com.healthlink.his.medication.dto.AdjustPriceMedListDto>
      **/
     List<AdjustPriceMedListDto> searchMedInfoDataForBusNo(String busNo);
 
@@ -217,7 +217,7 @@ public interface ISupplyRequestService extends IService<SupplyRequest> {
      * @param createTime
      * @Author raymond
      * @Date 07:22 2025/10/29
-     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     * @return java.util.List<com.healthlink.his.medication.dto.AdjustPriceMedListDto>
      **/
     List<AdjustPriceMedListDto> searchHistoryMedInfoData(String busNo, Date createTime);
 
@@ -227,7 +227,7 @@ public interface ISupplyRequestService extends IService<SupplyRequest> {
      * @param busNo
      * @Author raymond
      * @Date 14:10 2025/10/21
-     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     * @return java.util.List<com.healthlink.his.medication.dto.AdjustPriceMedListDto>
      **/
     List<AdjustPriceMedListDto> searchDeviceInfoDataForBusNo(String busNo);
 
@@ -238,7 +238,7 @@ public interface ISupplyRequestService extends IService<SupplyRequest> {
      * @param createTime
      * @Author raymond
      * @Date 08:57 2025/10/29
-     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     * @return java.util.List<com.healthlink.his.medication.dto.AdjustPriceMedListDto>
      **/
     List<AdjustPriceMedListDto> searchHistoryDeviceInfoDataForBusNo(String busNo, Date createTime);
 
@@ -248,7 +248,7 @@ public interface ISupplyRequestService extends IService<SupplyRequest> {
      * @param busNo
      * @Author raymond
      * @Date 14:10 2025/10/21
-     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     * @return java.util.List<com.healthlink.his.medication.dto.AdjustPriceMedListDto>
      **/
     List<AdjustPriceMedListDto> searchActivityInfoDataForBusNo(String busNo);
 
@@ -258,7 +258,7 @@ public interface ISupplyRequestService extends IService<SupplyRequest> {
      * @param busNo
      * @Author raymond
      * @Date 10:01 2025/10/29
-     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     * @return java.util.List<com.healthlink.his.medication.dto.AdjustPriceMedListDto>
      **/
     List<AdjustPriceMedListDto> searchHistoryActivityInfoDataForBusNo(String busNo);
 
@@ -268,7 +268,7 @@ public interface ISupplyRequestService extends IService<SupplyRequest> {
      * @param busNo
      * @Author raymond
      * @Date 14:10 2025/10/21
-     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     * @return java.util.List<com.healthlink.his.medication.dto.AdjustPriceMedListDto>
      **/
     List<AdjustPriceMedListDto> searchHealthInfoDataForBusNo(String busNo);
 
@@ -278,7 +278,7 @@ public interface ISupplyRequestService extends IService<SupplyRequest> {
      * @param busNo
      * @Author raymond
      * @Date 10:00 2025/10/29
-     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     * @return java.util.List<com.healthlink.his.medication.dto.AdjustPriceMedListDto>
      **/
     List<AdjustPriceMedListDto> searchHistoryHealthInfoDataForBusNo(String busNo);
 
@@ -296,7 +296,7 @@ public interface ISupplyRequestService extends IService<SupplyRequest> {
      * @param busNo
      * @Author raymond
      * @Date 13:36 2025/10/30
-     * @return java.util.List<com.openhis.workflow.dto.ChangePriceDto>
+     * @return java.util.List<com.healthlink.his.workflow.dto.ChangePriceDto>
      **/
     List<ChangePriceDto> searchGroupDataForBusNo(String busNo);
 }
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ActivityDefinitionServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/ActivityDefinitionServiceImpl.java
similarity index 91%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ActivityDefinitionServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/ActivityDefinitionServiceImpl.java
index 16b0b0d18..d196bb35e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ActivityDefinitionServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/ActivityDefinitionServiceImpl.java
@@ -1,16 +1,16 @@
-package com.openhis.workflow.service.impl;
+package com.healthlink.his.workflow.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.core.domain.model.LoginUser;
 import com.core.common.enums.DelFlag;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.common.enums.PublicationStatus;
-import com.openhis.medication.dto.AdjustPriceMedListDto;
-import com.openhis.workflow.domain.ActivityDefinition;
-import com.openhis.workflow.dto.ActivityDto;
-import com.openhis.workflow.mapper.ActivityDefinitionMapper;
-import com.openhis.workflow.service.IActivityDefinitionService;
+import com.healthlink.his.common.enums.PublicationStatus;
+import com.healthlink.his.medication.dto.AdjustPriceMedListDto;
+import com.healthlink.his.workflow.domain.ActivityDefinition;
+import com.healthlink.his.workflow.dto.ActivityDto;
+import com.healthlink.his.workflow.mapper.ActivityDefinitionMapper;
+import com.healthlink.his.workflow.service.IActivityDefinitionService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceDispenseServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/DeviceDispenseServiceImpl.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceDispenseServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/DeviceDispenseServiceImpl.java
index 040e978ff..1db564009 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceDispenseServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/DeviceDispenseServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.workflow.service.impl;
+package com.healthlink.his.workflow.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -6,13 +6,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.core.domain.model.LoginUser;
 import com.core.common.enums.DelFlag;
 import com.core.common.utils.AssignSeqUtil;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.common.enums.AssignSeqEnum;
-import com.openhis.common.enums.DispenseStatus;
-import com.openhis.workflow.domain.DeviceDispense;
-import com.openhis.workflow.domain.DeviceRequest;
-import com.openhis.workflow.mapper.DeviceDispenseMapper;
-import com.openhis.workflow.service.IDeviceDispenseService;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.common.enums.AssignSeqEnum;
+import com.healthlink.his.common.enums.DispenseStatus;
+import com.healthlink.his.workflow.domain.DeviceDispense;
+import com.healthlink.his.workflow.domain.DeviceRequest;
+import com.healthlink.his.workflow.mapper.DeviceDispenseMapper;
+import com.healthlink.his.workflow.service.IDeviceDispenseService;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceRequestServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/DeviceRequestServiceImpl.java
similarity index 90%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceRequestServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/DeviceRequestServiceImpl.java
index ad4b02171..4cfa872f2 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceRequestServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/DeviceRequestServiceImpl.java
@@ -1,14 +1,14 @@
-package com.openhis.workflow.service.impl;
+package com.healthlink.his.workflow.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.enums.DelFlag;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.common.enums.RequestStatus;
-import com.openhis.workflow.domain.DeviceRequest;
-import com.openhis.workflow.mapper.DeviceRequestMapper;
-import com.openhis.workflow.service.IDeviceRequestService;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.common.enums.RequestStatus;
+import com.healthlink.his.workflow.domain.DeviceRequest;
+import com.healthlink.his.workflow.mapper.DeviceRequestMapper;
+import com.healthlink.his.workflow.service.IDeviceRequestService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ElepMedicationRequestServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/ElepMedicationRequestServiceImpl.java
similarity index 91%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ElepMedicationRequestServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/ElepMedicationRequestServiceImpl.java
index 50134b5c1..8fbeb021d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ElepMedicationRequestServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/ElepMedicationRequestServiceImpl.java
@@ -1,10 +1,10 @@
-package com.openhis.workflow.service.impl;
+package com.healthlink.his.workflow.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.workflow.domain.ElepMedicationRequest;
-import com.openhis.workflow.mapper.ElepMedicationRequestMapper;
-import com.openhis.workflow.service.IElepMedicationRequestService;
+import com.healthlink.his.workflow.domain.ElepMedicationRequest;
+import com.healthlink.his.workflow.mapper.ElepMedicationRequestMapper;
+import com.healthlink.his.workflow.service.IElepMedicationRequestService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/InventoryItemServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/InventoryItemServiceImpl.java
similarity index 91%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/InventoryItemServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/InventoryItemServiceImpl.java
index fc0ef76f8..dcf009d1a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/InventoryItemServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/InventoryItemServiceImpl.java
@@ -1,14 +1,14 @@
-package com.openhis.workflow.service.impl;
+package com.healthlink.his.workflow.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.enums.DelFlag;
-import com.openhis.common.enums.PublicationStatus;
-import com.openhis.workflow.domain.InventoryItem;
-import com.openhis.workflow.dto.AdjustPriceDto;
-import com.openhis.workflow.mapper.InventoryItemMapper;
-import com.openhis.workflow.service.IInventoryItemService;
+import com.healthlink.his.common.enums.PublicationStatus;
+import com.healthlink.his.workflow.domain.InventoryItem;
+import com.healthlink.his.workflow.dto.AdjustPriceDto;
+import com.healthlink.his.workflow.mapper.InventoryItemMapper;
+import com.healthlink.his.workflow.service.IInventoryItemService;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestDetailServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/ServiceRequestDetailServiceImpl.java
similarity index 59%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestDetailServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/ServiceRequestDetailServiceImpl.java
index 31781243c..65f580b31 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestDetailServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/ServiceRequestDetailServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.workflow.service.impl;
+package com.healthlink.his.workflow.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.workflow.domain.ServiceRequestDetail;
-import com.openhis.workflow.mapper.ServiceRequestDetailMapper;
-import com.openhis.workflow.service.IServiceRequestDetailService;
+import com.healthlink.his.workflow.domain.ServiceRequestDetail;
+import com.healthlink.his.workflow.mapper.ServiceRequestDetailMapper;
+import com.healthlink.his.workflow.service.IServiceRequestDetailService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/ServiceRequestServiceImpl.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/ServiceRequestServiceImpl.java
index 57cf345e4..eeb977fac 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/ServiceRequestServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.workflow.service.impl;
+package com.healthlink.his.workflow.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -6,12 +6,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.enums.DelFlag;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.RequestStatus;
-import com.openhis.workflow.domain.ServiceRequest;
-import com.openhis.workflow.mapper.ServiceRequestMapper;
-import com.openhis.workflow.service.IServiceRequestService;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.enums.RequestStatus;
+import com.healthlink.his.workflow.domain.ServiceRequest;
+import com.healthlink.his.workflow.mapper.ServiceRequestMapper;
+import com.healthlink.his.workflow.service.IServiceRequestService;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyDeliveryServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/SupplyDeliveryServiceImpl.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyDeliveryServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/SupplyDeliveryServiceImpl.java
index 2030a2185..0960bf842 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyDeliveryServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/SupplyDeliveryServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.workflow.service.impl;
+package com.healthlink.his.workflow.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -6,13 +6,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.enums.DelFlag;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.DispenseStatus;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.workflow.domain.SupplyDelivery;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.mapper.SupplyDeliveryMapper;
-import com.openhis.workflow.service.ISupplyDeliveryService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.enums.DispenseStatus;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.workflow.domain.SupplyDelivery;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.mapper.SupplyDeliveryMapper;
+import com.healthlink.his.workflow.service.ISupplyDeliveryService;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestAutoServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/SupplyRequestAutoServiceImpl.java
similarity index 65%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestAutoServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/SupplyRequestAutoServiceImpl.java
index 976d21058..54cf513f0 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestAutoServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/SupplyRequestAutoServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.workflow.service.impl;
+package com.healthlink.his.workflow.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.workflow.domain.SupplyRequestAuto;
-import com.openhis.workflow.mapper.SupplyRequestAutoMapper;
-import com.openhis.workflow.service.ISupplyRequestAutoService;
+import com.healthlink.his.workflow.domain.SupplyRequestAuto;
+import com.healthlink.his.workflow.mapper.SupplyRequestAutoMapper;
+import com.healthlink.his.workflow.service.ISupplyRequestAutoService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/SupplyRequestServiceImpl.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/SupplyRequestServiceImpl.java
index 6a68f05c9..325260ebe 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/SupplyRequestServiceImpl.java
@@ -1,4 +1,4 @@
-package com.openhis.workflow.service.impl;
+package com.healthlink.his.workflow.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -6,15 +6,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.enums.DelFlag;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.SupplyCategory;
-import com.openhis.common.enums.SupplyStatus;
-import com.openhis.common.enums.SupplyType;
-import com.openhis.medication.dto.AdjustPriceMedListDto;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.dto.ChangePriceDto;
-import com.openhis.workflow.mapper.SupplyRequestMapper;
-import com.openhis.workflow.service.ISupplyRequestService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.enums.SupplyCategory;
+import com.healthlink.his.common.enums.SupplyStatus;
+import com.healthlink.his.common.enums.SupplyType;
+import com.healthlink.his.medication.dto.AdjustPriceMedListDto;
+import com.healthlink.his.workflow.domain.SupplyRequest;
+import com.healthlink.his.workflow.dto.ChangePriceDto;
+import com.healthlink.his.workflow.mapper.SupplyRequestMapper;
+import com.healthlink.his.workflow.service.ISupplyRequestService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicPreSettle.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/ClinicPreSettle.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicPreSettle.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/ClinicPreSettle.java
index 9425c687e..720033901 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicPreSettle.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/ClinicPreSettle.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicReg.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/ClinicReg.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicReg.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/ClinicReg.java
index 69ea47950..92bd57d45 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicReg.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/ClinicReg.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicSettle.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/ClinicSettle.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicSettle.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/ClinicSettle.java
index c13484b4f..e2d82f73b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicSettle.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/ClinicSettle.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicUnReg.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/ClinicUnReg.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicUnReg.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/ClinicUnReg.java
index 975bfe523..810819d32 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicUnReg.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/ClinicUnReg.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicUnSettle.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/ClinicUnSettle.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicUnSettle.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/ClinicUnSettle.java
index d4a2e15b1..ad3cf9635 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/ClinicUnSettle.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/ClinicUnSettle.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/DayEndMedicalInsuranceSettlement.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/DayEndMedicalInsuranceSettlement.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/DayEndMedicalInsuranceSettlement.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/DayEndMedicalInsuranceSettlement.java
index 4a8c3825b..fe7b88ad5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/DayEndMedicalInsuranceSettlement.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/DayEndMedicalInsuranceSettlement.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/DirectoryCheckRecord.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/DirectoryCheckRecord.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/DirectoryCheckRecord.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/DirectoryCheckRecord.java
index 3c6843dcd..5dedb5784 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/DirectoryCheckRecord.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/DirectoryCheckRecord.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/File.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/File.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/File.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/File.java
index df2445a56..a5d1dc151 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/File.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/File.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/FinancialApplyRecord.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/FinancialApplyRecord.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/FinancialApplyRecord.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/FinancialApplyRecord.java
index 5320af9ca..9b7c71363 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/FinancialApplyRecord.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/FinancialApplyRecord.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/FinancialReconcileRecord.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/FinancialReconcileRecord.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/FinancialReconcileRecord.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/FinancialReconcileRecord.java
index 465d37721..7242e1372 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/FinancialReconcileRecord.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/FinancialReconcileRecord.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InfoPerson.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InfoPerson.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InfoPerson.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InfoPerson.java
index c0c8d76e6..172204569 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InfoPerson.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InfoPerson.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
-import com.openhis.yb.dto.Info5301SpecialConditionResult;
+import com.healthlink.his.yb.dto.Info5301SpecialConditionResult;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientDischarge.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientDischarge.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientDischarge.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientDischarge.java
index 14ee33225..a5e0f72db 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientDischarge.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientDischarge.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientFeeDetail.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientFeeDetail.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientFeeDetail.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientFeeDetail.java
index 9d74fdf3e..855ed1ab2 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientFeeDetail.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientFeeDetail.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientPreSettle.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientPreSettle.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientPreSettle.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientPreSettle.java
index 23f2f52aa..325e252e9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientPreSettle.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientPreSettle.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientReg.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientReg.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientReg.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientReg.java
index 7c4448528..c926c4015 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientReg.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientReg.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientRegInfoUpdateRecorde.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientRegInfoUpdateRecorde.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientRegInfoUpdateRecorde.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientRegInfoUpdateRecorde.java
index 38674f685..1f8968efd 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientRegInfoUpdateRecorde.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientRegInfoUpdateRecorde.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientSettle.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientSettle.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientSettle.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientSettle.java
index da34ae5c2..a39a40e54 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientSettle.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientSettle.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnDischarge.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientUnDischarge.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnDischarge.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientUnDischarge.java
index ff641ffb5..10def3451 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnDischarge.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientUnDischarge.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnReg.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientUnReg.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnReg.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientUnReg.java
index 7ea729546..8508fd1c2 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnReg.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientUnReg.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnSettle.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientUnSettle.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnSettle.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientUnSettle.java
index de9f46936..9b6e5921c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnSettle.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientUnSettle.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientcancelFeeDetail.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientcancelFeeDetail.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientcancelFeeDetail.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientcancelFeeDetail.java
index c39326543..7a88b2058 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientcancelFeeDetail.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InpatientcancelFeeDetail.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryChangeRecord.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InventoryChangeRecord.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryChangeRecord.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InventoryChangeRecord.java
index 137fd93a6..f5521ca49 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryChangeRecord.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InventoryChangeRecord.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryCheckRecord.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InventoryCheckRecord.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryCheckRecord.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InventoryCheckRecord.java
index ce8ba8575..dfa0845f8 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryCheckRecord.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InventoryCheckRecord.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryDelRecord.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InventoryDelRecord.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryDelRecord.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InventoryDelRecord.java
index bbca2f962..c2b2b8971 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryDelRecord.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InventoryDelRecord.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryPurchaseRecord.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InventoryPurchaseRecord.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryPurchaseRecord.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InventoryPurchaseRecord.java
index 7cb616b8f..7789a45fb 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryPurchaseRecord.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InventoryPurchaseRecord.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryPurchaseReturnRecord.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InventoryPurchaseReturnRecord.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryPurchaseReturnRecord.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InventoryPurchaseReturnRecord.java
index efb15c047..5d19238d0 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryPurchaseReturnRecord.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InventoryPurchaseReturnRecord.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventorySaleRecord.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InventorySaleRecord.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventorySaleRecord.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InventorySaleRecord.java
index e77514d99..8f7ec6be1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventorySaleRecord.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InventorySaleRecord.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventorySaleReturnRecord.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InventorySaleReturnRecord.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventorySaleReturnRecord.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InventorySaleReturnRecord.java
index 3ae7388fc..2881ecdca 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventorySaleReturnRecord.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/InventorySaleReturnRecord.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/Sign.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/Sign.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/Sign.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/Sign.java
index c8cfe9bd9..1c3218369 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/Sign.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/domain/Sign.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.domain;
+package com.healthlink.his.yb.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/BaseInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/BaseInfo.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/BaseInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/BaseInfo.java
index 968c09363..dd2068d4d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/BaseInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/BaseInfo.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/BaseParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/BaseParam.java
similarity index 82%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/BaseParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/BaseParam.java
index 511bf40c8..8a775abd1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/BaseParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/BaseParam.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/CancelPaymentDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/CancelPaymentDto.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/CancelPaymentDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/CancelPaymentDto.java
index 3c79ae7ff..543768187 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/CancelPaymentDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/CancelPaymentDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/CancelRegPaymentDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/CancelRegPaymentDto.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/CancelRegPaymentDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/CancelRegPaymentDto.java
index 98ce259a4..944e748f5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/CancelRegPaymentDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/CancelRegPaymentDto.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/CatalogFileInput.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/CatalogFileInput.java
similarity index 88%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/CatalogFileInput.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/CatalogFileInput.java
index 2b6c6c300..80a316740 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/CatalogFileInput.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/CatalogFileInput.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Catalogue1312Output.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Catalogue1312Output.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Catalogue1312Output.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Catalogue1312Output.java
index 628da1f19..4de33521e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Catalogue1312Output.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Catalogue1312Output.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.core.common.core.domain.HisBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Catalogue1312QueryParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Catalogue1312QueryParam.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Catalogue1312QueryParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Catalogue1312QueryParam.java
index b4ffe9824..ee6ca2b7e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Catalogue1312QueryParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Catalogue1312QueryParam.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ChargeItemDetailVO.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/ChargeItemDetailVO.java
similarity index 52%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ChargeItemDetailVO.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/ChargeItemDetailVO.java
index eee435e73..d515c8870 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ChargeItemDetailVO.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/ChargeItemDetailVO.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
-import com.openhis.administration.domain.ChargeItem;
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.administration.domain.ChargeItem;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 
 @Data
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ChargeItemDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/ChargeItemDto.java
similarity index 75%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ChargeItemDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/ChargeItemDto.java
index e3891518b..81d441269 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ChargeItemDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/ChargeItemDto.java
@@ -1,9 +1,9 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
-import com.openhis.administration.domain.ChargeItem;
+import com.healthlink.his.administration.domain.ChargeItem;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ChargeItemGroupDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/ChargeItemGroupDto.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ChargeItemGroupDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/ChargeItemGroupDto.java
index 124ce5467..d1174153c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ChargeItemGroupDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/ChargeItemGroupDto.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
-import com.openhis.administration.domain.ChargeItem;
-import com.openhis.financial.domain.Contract;
+import com.healthlink.his.administration.domain.ChargeItem;
+import com.healthlink.his.financial.domain.Contract;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3204AParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clearing3204AParam.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3204AParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clearing3204AParam.java
index 696a69b59..de417a6a1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3204AParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clearing3204AParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AParma.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clearing3205AParma.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AParma.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clearing3205AParma.java
index c02df05e8..d6f157ad6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AParma.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clearing3205AParma.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AResult.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clearing3205AResult.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AResult.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clearing3205AResult.java
index 862f06e25..19ff25883 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AResult.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clearing3205AResult.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AWebParma.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clearing3205AWebParma.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AWebParma.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clearing3205AWebParma.java
index b00aedd96..ad610da9f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AWebParma.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clearing3205AWebParma.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3206AParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clearing3206AParam.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3206AParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clearing3206AParam.java
index 7b3c69e87..7651d7bcd 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3206AParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clearing3206AParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3206AResult.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clearing3206AResult.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3206AResult.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clearing3206AResult.java
index 7d229903f..9bd926a20 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3206AResult.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clearing3206AResult.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203DiseInfoParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2203DiseInfoParam.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203DiseInfoParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2203DiseInfoParam.java
index e22b8b1d6..356d8dd39 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203DiseInfoParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2203DiseInfoParam.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203Medical.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2203Medical.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203Medical.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2203Medical.java
index dbb7bdce7..c4ef8213b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203Medical.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2203Medical.java
@@ -1,11 +1,11 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.core.common.core.domain.HisBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203MedicalParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2203MedicalParam.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203MedicalParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2203MedicalParam.java
index f05e5c224..e429bb4cf 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203MedicalParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2203MedicalParam.java
@@ -1,8 +1,8 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204FeeDetailParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2204FeeDetailParam.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204FeeDetailParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2204FeeDetailParam.java
index 8a57e127c..c2f958afb 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204FeeDetailParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2204FeeDetailParam.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.core.common.annotation.Excel;
 import com.core.common.core.domain.HisBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204FeeDetailResult.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2204FeeDetailResult.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204FeeDetailResult.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2204FeeDetailResult.java
index 800e772ef..07ba667cd 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204FeeDetailResult.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2204FeeDetailResult.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204OrderParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2204OrderParam.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204OrderParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2204OrderParam.java
index 01e02086c..2e86495c4 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204OrderParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2204OrderParam.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204OrderResult.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2204OrderResult.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204OrderResult.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2204OrderResult.java
index 20d511fa9..227ce14d4 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204OrderResult.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2204OrderResult.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2205OrderParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2205OrderParam.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2205OrderParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2205OrderParam.java
index 7f634fc6d..f4da29dee 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2205OrderParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2205OrderParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206FundPaymentResult.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2206FundPaymentResult.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206FundPaymentResult.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2206FundPaymentResult.java
index 61689f529..2aee51e85 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206FundPaymentResult.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2206FundPaymentResult.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderOutput.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2206OrderOutput.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderOutput.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2206OrderOutput.java
index bc6d37be9..6296da70f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderOutput.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2206OrderOutput.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2206OrderParam.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2206OrderParam.java
index a91bf63c3..e0865ecd0 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2206OrderParam.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.core.common.core.domain.HisBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderResult.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2206OrderResult.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderResult.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2206OrderResult.java
index 6aa14ca14..857e8e330 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderResult.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2206OrderResult.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderResultDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2206OrderResultDto.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderResultDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2206OrderResultDto.java
index 34b5d1358..12f7857fb 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderResultDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2206OrderResultDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206SetldetaiResult.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2206SetldetaiResult.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206SetldetaiResult.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2206SetldetaiResult.java
index 8b2ddc616..6866e44e0 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206SetldetaiResult.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2206SetldetaiResult.java
@@ -1,11 +1,11 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.core.common.annotation.Excel;
 import com.core.common.core.domain.HisBaseEntity;
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2207OrderResult.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2207OrderResult.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2207OrderResult.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2207OrderResult.java
index 8bc9eea1b..1acf9700f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2207OrderResult.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2207OrderResult.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2207OrderResultDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2207OrderResultDto.java
similarity index 86%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2207OrderResultDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2207OrderResultDto.java
index f2a738841..86d86e5c2 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2207OrderResultDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2207OrderResultDto.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2207OrderResultInfoDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2207OrderResultInfoDto.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2207OrderResultInfoDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2207OrderResultInfoDto.java
index 56f4bdedc..cc8aa3e7d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2207OrderResultInfoDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2207OrderResultInfoDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2208UnSetlInfoOutput.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2208UnSetlInfoOutput.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2208UnSetlInfoOutput.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2208UnSetlInfoOutput.java
index f939c07b7..43592cc80 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2208UnSetlInfoOutput.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2208UnSetlInfoOutput.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2208UnSetlInfoParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2208UnSetlInfoParam.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2208UnSetlInfoParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2208UnSetlInfoParam.java
index 5534473e8..98ca77b74 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2208UnSetlInfoParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2208UnSetlInfoParam.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.core.common.core.domain.HisBaseEntity;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2208UnSetlInfoResult.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2208UnSetlInfoResult.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2208UnSetlInfoResult.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2208UnSetlInfoResult.java
index c61394129..e659b1c85 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2208UnSetlInfoResult.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Clinic2208UnSetlInfoResult.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ClinicReg.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/ClinicReg.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ClinicReg.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/ClinicReg.java
index 14a739b10..0fe3faa07 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ClinicReg.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/ClinicReg.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.core.common.core.domain.HisBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ClinicReg2201Output.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/ClinicReg2201Output.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ClinicReg2201Output.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/ClinicReg2201Output.java
index 8e215ea84..ae93abf0f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ClinicReg2201Output.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/ClinicReg2201Output.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/DispenseInventory3505Dto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/DispenseInventory3505Dto.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/DispenseInventory3505Dto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/DispenseInventory3505Dto.java
index 3a8a7472a..69d90f81f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/DispenseInventory3505Dto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/DispenseInventory3505Dto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoiceChargeDetailDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/EleInvoiceChargeDetailDto.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoiceChargeDetailDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/EleInvoiceChargeDetailDto.java
index 0cab43db0..efe641610 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoiceChargeDetailDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/EleInvoiceChargeDetailDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoiceListDetailDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/EleInvoiceListDetailDto.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoiceListDetailDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/EleInvoiceListDetailDto.java
index 44b64464a..fc861df00 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoiceListDetailDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/EleInvoiceListDetailDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoicePatientInfoDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/EleInvoicePatientInfoDto.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoicePatientInfoDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/EleInvoicePatientInfoDto.java
index 2e68db0d3..e804a9b23 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoicePatientInfoDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/EleInvoicePatientInfoDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoicePaymentInfoDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/EleInvoicePaymentInfoDto.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoicePaymentInfoDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/EleInvoicePaymentInfoDto.java
index ebceafc86..5e8e746df 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoicePaymentInfoDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/EleInvoicePaymentInfoDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoiceResultDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/EleInvoiceResultDto.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoiceResultDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/EleInvoiceResultDto.java
index d1b7b93be..9d0607ae5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/EleInvoiceResultDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/EleInvoiceResultDto.java
@@ -1,9 +1,9 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
-import com.openhis.common.enums.InvoiceStatus;
+import com.healthlink.his.common.enums.InvoiceStatus;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/File9101Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/File9101Param.java
similarity index 85%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/File9101Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/File9101Param.java
index 4e38f16da..815010505 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/File9101Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/File9101Param.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import org.springframework.web.multipart.MultipartFile;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FileDownload.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FileDownload.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FileDownload.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FileDownload.java
index 5ac1ad951..71a8da7a8 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FileDownload.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FileDownload.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FileResult.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FileResult.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FileResult.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FileResult.java
index 6a3de7195..e68d96cd8 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FileResult.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FileResult.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial13203Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial13203Param.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial13203Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial13203Param.java
index 4585aacb4..4cc03d64c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial13203Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial13203Param.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial13203Result.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial13203Result.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial13203Result.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial13203Result.java
index 18ce42157..550ead50f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial13203Result.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial13203Result.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial13203WebParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial13203WebParam.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial13203WebParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial13203WebParam.java
index 1f1d0107d..72a0fea89 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial13203WebParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial13203WebParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3201Output.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3201Output.java
similarity index 91%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3201Output.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3201Output.java
index 7dd63c76b..7ddcb57f9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3201Output.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3201Output.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3201Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3201Param.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3201Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3201Param.java
index f4e7eaad4..5bc00f3ca 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3201Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3201Param.java
@@ -1,9 +1,9 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.core.common.annotation.Excel;
 import com.core.common.core.domain.HisBaseEntity;
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202FileParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3202FileParam.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202FileParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3202FileParam.java
index 0b68569f3..d676c98fd 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202FileParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3202FileParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Getter;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202FileResult.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3202FileResult.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202FileResult.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3202FileResult.java
index a6865cb99..6a4df8304 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202FileResult.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3202FileResult.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202OtherParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3202OtherParam.java
similarity index 90%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202OtherParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3202OtherParam.java
index 541cf276a..1c84d41bd 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202OtherParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3202OtherParam.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203AParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3203AParam.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203AParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3203AParam.java
index 363cd3a4c..71c71f290 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203AParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3203AParam.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.core.common.core.domain.HisBaseEntity;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203AWebParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3203AWebParam.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203AWebParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3203AWebParam.java
index eafa4b763..b629d3e90 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203AWebParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3203AWebParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203Dto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3203Dto.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203Dto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3203Dto.java
index b7df06bfb..a83f54477 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203Dto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3203Dto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 import lombok.Data;
 
 import java.math.BigDecimal;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3203Param.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3203Param.java
index ba206d9ed..df35b5ce4 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3203Param.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203WebParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3203WebParam.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203WebParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3203WebParam.java
index 7c1c7dae2..e0c704ded 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203WebParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3203WebParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3204Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3204Param.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3204Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3204Param.java
index edf817633..3030808d6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3204Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Financial3204Param.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialClearing3203AWebParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FinancialClearing3203AWebParam.java
similarity index 90%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialClearing3203AWebParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FinancialClearing3203AWebParam.java
index 05b42bcc9..11d9cd756 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialClearing3203AWebParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FinancialClearing3203AWebParam.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3202Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FinancialSettlement3202Param.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3202Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FinancialSettlement3202Param.java
index f6a9d0eb7..4f617fed6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3202Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FinancialSettlement3202Param.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3202Result.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FinancialSettlement3202Result.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3202Result.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FinancialSettlement3202Result.java
index 715010e38..62ed8a590 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3202Result.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FinancialSettlement3202Result.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3209AParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FinancialSettlement3209AParam.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3209AParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FinancialSettlement3209AParam.java
index bc895b4be..46b74e141 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3209AParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FinancialSettlement3209AParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3209AResult.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FinancialSettlement3209AResult.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3209AResult.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FinancialSettlement3209AResult.java
index 3e5d31563..7da54795c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3209AResult.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FinancialSettlement3209AResult.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiConsultation3101Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiConsultation3101Param.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiConsultation3101Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiConsultation3101Param.java
index 3f5e74f3c..a833145ca 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiConsultation3101Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiConsultation3101Param.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiDiagnose3101Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiDiagnose3101Param.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiDiagnose3101Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiDiagnose3101Param.java
index 38b98e47f..1cdaeda87 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiDiagnose3101Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiDiagnose3101Param.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiEncounter3101Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiEncounter3101Param.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiEncounter3101Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiEncounter3101Param.java
index 3707305fa..3cb59d6e5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiEncounter3101Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiEncounter3101Param.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiFeedback3103DataParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiFeedback3103DataParam.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiFeedback3103DataParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiFeedback3103DataParam.java
index bcf99e1fa..8e1c6ff97 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiFeedback3103DataParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiFeedback3103DataParam.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiFeedback3103WarnsParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiFeedback3103WarnsParam.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiFeedback3103WarnsParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiFeedback3103WarnsParam.java
index 78a3cf8a1..0bb14b1d7 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiFeedback3103WarnsParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiFeedback3103WarnsParam.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiOperation3101Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiOperation3101Param.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiOperation3101Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiOperation3101Param.java
index cc1b4fdbe..f428107da 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiOperation3101Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiOperation3101Param.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiOrder3101Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiOrder3101Param.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiOrder3101Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiOrder3101Param.java
index 238bbd97a..fc4642356 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiOrder3101Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiOrder3101Param.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiPatient3101Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiPatient3101Param.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiPatient3101Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiPatient3101Param.java
index a009f0baa..7926a0226 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiPatient3101Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiPatient3101Param.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiViolation3101Result.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiViolation3101Result.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiViolation3101Result.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiViolation3101Result.java
index fa5fb9dd2..26592e72e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiViolation3101Result.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiViolation3101Result.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiViolationDetail3101Result.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiViolationDetail3101Result.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiViolationDetail3101Result.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiViolationDetail3101Result.java
index 048c73afa..f3e8630a9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiViolationDetail3101Result.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/FsiViolationDetail3101Result.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2401DiseInfoParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2401DiseInfoParam.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2401DiseInfoParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2401DiseInfoParam.java
index a03d3a8df..bf13e313a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2401DiseInfoParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2401DiseInfoParam.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2401MdtInfoParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2401MdtInfoParam.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2401MdtInfoParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2401MdtInfoParam.java
index 93c7c127d..507922c98 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2401MdtInfoParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2401MdtInfoParam.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2402DiseInfoParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2402DiseInfoParam.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2402DiseInfoParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2402DiseInfoParam.java
index 187e902a5..1f355ecdf 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2402DiseInfoParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2402DiseInfoParam.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2402DscgInfoParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2402DscgInfoParam.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2402DscgInfoParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2402DscgInfoParam.java
index 5a08e4bae..5733e1cc1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2402DscgInfoParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2402DscgInfoParam.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2403AdmInfoParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2403AdmInfoParam.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2403AdmInfoParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2403AdmInfoParam.java
index 757e9c5d7..28c8fbe75 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2403AdmInfoParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2403AdmInfoParam.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2403DiseInfoParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2403DiseInfoParam.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2403DiseInfoParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2403DiseInfoParam.java
index 287c7f0ee..16847db09 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2403DiseInfoParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2403DiseInfoParam.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2404AdmCnlParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2404AdmCnlParam.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2404AdmCnlParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2404AdmCnlParam.java
index 4b5c5fc00..ac9f395c7 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2404AdmCnlParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2404AdmCnlParam.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2406SmAttrUpParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2406SmAttrUpParam.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2406SmAttrUpParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2406SmAttrUpParam.java
index fc636ad07..240a6e884 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2406SmAttrUpParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2406SmAttrUpParam.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2407SmAttrSelectParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2407SmAttrSelectParam.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2407SmAttrSelectParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2407SmAttrSelectParam.java
index 9ea3d777d..9c11e6e48 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2407SmAttrSelectParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2407SmAttrSelectParam.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2407SmAttrSelectResult.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2407SmAttrSelectResult.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2407SmAttrSelectResult.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2407SmAttrSelectResult.java
index c3c9db41f..a348da9de 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2407SmAttrSelectResult.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospAdm2407SmAttrSelectResult.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3401AParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospDept3401AParam.java
similarity index 88%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3401AParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospDept3401AParam.java
index 98ac88824..4f701dcd8 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3401AParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospDept3401AParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3401Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospDept3401Param.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3401Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospDept3401Param.java
index ca69fb723..5d0b54632 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3401Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospDept3401Param.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3402Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospDept3402Param.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3402Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospDept3402Param.java
index 6e505cf38..ffcc1e790 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3402Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospDept3402Param.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3403Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospDept3403Param.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3403Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospDept3403Param.java
index 092b47081..528294b96 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3403Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospDept3403Param.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrf2501ARefmedinParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospTrf2501ARefmedinParam.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrf2501ARefmedinParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospTrf2501ARefmedinParam.java
index 5027e216c..d51cb3b8f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrf2501ARefmedinParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospTrf2501ARefmedinParam.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrf2501RefmedinParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospTrf2501RefmedinParam.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrf2501RefmedinParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospTrf2501RefmedinParam.java
index 608a2c2c4..defbf7ca8 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrf2501RefmedinParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospTrf2501RefmedinParam.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrfCxl2502Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospTrfCxl2502Param.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrfCxl2502Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospTrfCxl2502Param.java
index b913b1fdc..4d24602c5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrfCxl2502Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/HospTrfCxl2502Param.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101Output.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Info1101Output.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101Output.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Info1101Output.java
index c47a612df..27277914a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101Output.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Info1101Output.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.core.common.core.domain.HisBaseEntity;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101PerinfoResult.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Info1101PerinfoResult.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101PerinfoResult.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Info1101PerinfoResult.java
index 6ea0e4a83..148743a50 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101PerinfoResult.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Info1101PerinfoResult.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.core.common.core.domain.HisBaseEntity;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101ReadcardParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Info1101ReadcardParam.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101ReadcardParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Info1101ReadcardParam.java
index b5df282fe..d22e43d15 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101ReadcardParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Info1101ReadcardParam.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.core.common.core.domain.HisBaseEntity;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info5301Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Info5301Param.java
similarity index 89%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info5301Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Info5301Param.java
index 6249e9eba..f2ba33143 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info5301Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Info5301Param.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info5301SpecialConditionResult.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Info5301SpecialConditionResult.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info5301SpecialConditionResult.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Info5301SpecialConditionResult.java
index 9701b635c..a7833915a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info5301SpecialConditionResult.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Info5301SpecialConditionResult.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/InvoiceBaseInfoDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/InvoiceBaseInfoDto.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/InvoiceBaseInfoDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/InvoiceBaseInfoDto.java
index 2425fb11e..91d6fddd1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/InvoiceBaseInfoDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/InvoiceBaseInfoDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowReg25007Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MatAllowReg25007Param.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowReg25007Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MatAllowReg25007Param.java
index f1100c12f..71d09564c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowReg25007Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MatAllowReg25007Param.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowReg25007Result.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MatAllowReg25007Result.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowReg25007Result.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MatAllowReg25007Result.java
index 7f0f75752..27dc838ce 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowReg25007Result.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MatAllowReg25007Result.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowRegSel25008Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MatAllowRegSel25008Param.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowRegSel25008Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MatAllowRegSel25008Param.java
index 4da4b908e..31ea6e476 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowRegSel25008Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MatAllowRegSel25008Param.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3503Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3503Param.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3503Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3503Param.java
index 495ec6c85..afdab2e8b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3503Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3503Param.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3505Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3505Param.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3505Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3505Param.java
index 728971eef..c8694ad73 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3505Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3505Param.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson2.annotation.JSONField;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3505Result.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3505Result.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3505Result.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3505Result.java
index b678d268c..bb9e39ff9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3505Result.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3505Result.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3506Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3506Param.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3506Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3506Param.java
index 3139861fa..6f7b9ba6d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3506Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3506Param.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson2.annotation.JSONField;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3507Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3507Param.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3507Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3507Param.java
index 1c408ae6b..afe7c8b76 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3507Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3507Param.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3508Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3508Param.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3508Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3508Param.java
index 25f313199..3b4601310 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3508Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3508Param.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3508Result.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3508Result.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3508Result.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3508Result.java
index 98c16c678..54a43d8cc 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3508Result.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Medical3508Result.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalDirectory3301ListParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalDirectory3301ListParam.java
similarity index 86%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalDirectory3301ListParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalDirectory3301ListParam.java
index c8e3a248c..2fb5220f4 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalDirectory3301ListParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalDirectory3301ListParam.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalDirectory3301Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalDirectory3301Param.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalDirectory3301Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalDirectory3301Param.java
index ff6053859..8cf0ba31a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalDirectory3301Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalDirectory3301Param.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalDirectory3302Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalDirectory3302Param.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalDirectory3302Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalDirectory3302Param.java
index e9c50b06e..34e36b96d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalDirectory3302Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalDirectory3302Param.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3501Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3501Param.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3501Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3501Param.java
index 7d7e2cf2b..484cb864b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3501Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3501Param.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3502Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3502Param.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3502Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3502Param.java
index c594bfe9f..11e2447ba 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3502Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3502Param.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson2.annotation.JSONField;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3511Output.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3511Output.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3511Output.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3511Output.java
index 5fc438092..22454c331 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3511Output.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3511Output.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3511Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3511Param.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3511Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3511Param.java
index cc3dafea5..0c1c9a44d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3511Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3511Param.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3512Output.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3512Output.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3512Output.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3512Output.java
index 3930386f0..345c88391 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3512Output.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3512Output.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3512Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3512Param.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3512Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3512Param.java
index f8aea755e..e7e9bb551 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3512Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3512Param.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3513Output.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3513Output.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3513Output.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3513Output.java
index 7e50c6c9a..111321f16 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3513Output.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3513Output.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3513Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3513Param.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3513Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3513Param.java
index d22edc15c..6c551a310 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3513Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalInventory3513Param.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalPurchase3504Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalPurchase3504Param.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalPurchase3504Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalPurchase3504Param.java
index 9143ad87d..7929f65a9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalPurchase3504Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalPurchase3504Param.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalTraceNoDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalTraceNoDto.java
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalTraceNoDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalTraceNoDto.java
index dc638e90d..ad8c0c6c5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalTraceNoDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/MedicalTraceNoDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PatientInfoDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PatientInfoDto.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PatientInfoDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PatientInfoDto.java
index 96aadcfa6..1badcdef8 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PatientInfoDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PatientInfoDto.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDecDetailUniAccountDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PaymentDecDetailUniAccountDto.java
similarity index 84%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDecDetailUniAccountDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PaymentDecDetailUniAccountDto.java
index 538916f59..db706db68 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDecDetailUniAccountDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PaymentDecDetailUniAccountDto.java
@@ -1,6 +1,6 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
-import com.openhis.financial.domain.PaymentRecDetail;
+import com.healthlink.his.financial.domain.PaymentRecDetail;
 import lombok.Data;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDetailDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PaymentDetailDto.java
similarity index 86%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDetailDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PaymentDetailDto.java
index 4857a1caa..a1d2a368f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDetailDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PaymentDetailDto.java
@@ -1,9 +1,9 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PaymentDto.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PaymentDto.java
index d8a848501..c20bd56b5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PaymentDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentInpatientDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PaymentInpatientDto.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentInpatientDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PaymentInpatientDto.java
index ac46266ac..deb497ea3 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentInpatientDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PaymentInpatientDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentSettleDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PaymentSettleDto.java
similarity index 88%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentSettleDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PaymentSettleDto.java
index f9d321d06..6783836e5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentSettleDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PaymentSettleDto.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthApprovalCnl25004Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersBirthApprovalCnl25004Param.java
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthApprovalCnl25004Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersBirthApprovalCnl25004Param.java
index adb2dd173..bee61a689 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthApprovalCnl25004Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersBirthApprovalCnl25004Param.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthApprovalSel25005Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersBirthApprovalSel25005Param.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthApprovalSel25005Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersBirthApprovalSel25005Param.java
index e5711cfb5..d8bd85355 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthApprovalSel25005Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersBirthApprovalSel25005Param.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthRecord25003Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersBirthRecord25003Param.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthRecord25003Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersBirthRecord25003Param.java
index 1ad86e6f3..e1215ca88 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthRecord25003Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersBirthRecord25003Param.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersChrDis2503Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersChrDis2503Param.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersChrDis2503Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersChrDis2503Param.java
index 645eaa6a4..7ca9e6624 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersChrDis2503Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersChrDis2503Param.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersChrDisCxl2504Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersChrDisCxl2504Param.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersChrDisCxl2504Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersChrDisCxl2504Param.java
index fb9c685a1..dd1cd6a22 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersChrDisCxl2504Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersChrDisCxl2504Param.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersDesigPt2505Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersDesigPt2505Param.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersDesigPt2505Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersDesigPt2505Param.java
index 9cfcf6871..4463b388f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersDesigPt2505Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersDesigPt2505Param.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.annotation.JSONField;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersDesigPtCxl2506Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersDesigPtCxl2506Param.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersDesigPtCxl2506Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersDesigPtCxl2506Param.java
index ab2ae99f1..cca045fac 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersDesigPtCxl2506Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersDesigPtCxl2506Param.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedApprovalCnl25006Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersMedApprovalCnl25006Param.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedApprovalCnl25006Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersMedApprovalCnl25006Param.java
index d59921567..ece637e55 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedApprovalCnl25006Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersMedApprovalCnl25006Param.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedRecord25001Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersMedRecord25001Param.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedRecord25001Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersMedRecord25001Param.java
index 0311c3160..40d4194b6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedRecord25001Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersMedRecord25001Param.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedSelect25002Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersMedSelect25002Param.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedSelect25002Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersMedSelect25002Param.java
index 47650ee0d..6a0efc238 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedSelect25002Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersMedSelect25002Param.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedSelect25002Result.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersMedSelect25002Result.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedSelect25002Result.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersMedSelect25002Result.java
index 7c3fc6eef..9d4394466 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedSelect25002Result.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersMedSelect25002Result.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersUnintInj2507Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersUnintInj2507Param.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersUnintInj2507Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersUnintInj2507Param.java
index e100d409a..e53e737e4 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersUnintInj2507Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PersUnintInj2507Param.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PrePaymentDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PrePaymentDto.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PrePaymentDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PrePaymentDto.java
index 860a71675..16debd85c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PrePaymentDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/PrePaymentDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Result.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Result.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Result.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Result.java
index 19f6eb2f1..34bb40fd7 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Result.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Result.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ResultBody.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/ResultBody.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ResultBody.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/ResultBody.java
index 6b1f0eae3..84201a62d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ResultBody.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/ResultBody.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3201DetailDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Settlement3201DetailDto.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3201DetailDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Settlement3201DetailDto.java
index 46ce73f97..fd51bac4d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3201DetailDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Settlement3201DetailDto.java
@@ -1,6 +1,6 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3201Dto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Settlement3201Dto.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3201Dto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Settlement3201Dto.java
index e416133fe..1d4e007d1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3201Dto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Settlement3201Dto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3201WebParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Settlement3201WebParam.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3201WebParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Settlement3201WebParam.java
index b1e07c5e8..54e1ce921 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3201WebParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Settlement3201WebParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3202Dto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Settlement3202Dto.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3202Dto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Settlement3202Dto.java
index 8832bd711..231b768d5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3202Dto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Settlement3202Dto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3202WebParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Settlement3202WebParam.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3202WebParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Settlement3202WebParam.java
index f49876c1f..54a72c9e4 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3202WebParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Settlement3202WebParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3209AWebParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Settlement3209AWebParam.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3209AWebParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Settlement3209AWebParam.java
index 4d666ffe5..64498f9db 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3209AWebParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Settlement3209AWebParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Sign.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Sign.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Sign.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Sign.java
index 88384dc45..f1ce7b010 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Sign.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Sign.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Sign1101Param.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Sign1101Param.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Sign1101Param.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Sign1101Param.java
index 1dc5e821e..131854b90 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Sign1101Param.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Sign1101Param.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Sign9001Result.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Sign9001Result.java
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Sign9001Result.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Sign9001Result.java
index 32f6340b3..4d2aaa18f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Sign9001Result.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Sign9001Result.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/SupplyItemDetail3503Dto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/SupplyItemDetail3503Dto.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/SupplyItemDetail3503Dto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/SupplyItemDetail3503Dto.java
index 77450d724..e684996b6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/SupplyItemDetail3503Dto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/SupplyItemDetail3503Dto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ThreePartPayDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/ThreePartPayDto.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ThreePartPayDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/ThreePartPayDto.java
index 813f9ee3f..f29233fdd 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ThreePartPayDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/ThreePartPayDto.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/VeriPrescriptionDetailInfoDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/VeriPrescriptionDetailInfoDto.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/VeriPrescriptionDetailInfoDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/VeriPrescriptionDetailInfoDto.java
index b11177c52..352487040 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/VeriPrescriptionDetailInfoDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/VeriPrescriptionDetailInfoDto.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.openhis.common.annotation.Dict;
+import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/VeriPrescriptionInfoDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/VeriPrescriptionInfoDto.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/VeriPrescriptionInfoDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/VeriPrescriptionInfoDto.java
index 781adb917..7c29ecd87 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/VeriPrescriptionInfoDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/VeriPrescriptionInfoDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/VeriPrescriptionParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/VeriPrescriptionParam.java
similarity index 90%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/VeriPrescriptionParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/VeriPrescriptionParam.java
index 31508fc4b..d030c89e9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/VeriPrescriptionParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/VeriPrescriptionParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2301InputFeeDetail.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2301InputFeeDetail.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2301InputFeeDetail.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2301InputFeeDetail.java
index 569458568..af301ea0e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2301InputFeeDetail.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2301InputFeeDetail.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2301InputFeeDetailModel.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2301InputFeeDetailModel.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2301InputFeeDetailModel.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2301InputFeeDetailModel.java
index 5682b86af..d6ffa8d79 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2301InputFeeDetailModel.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2301InputFeeDetailModel.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2301OutputResult.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2301OutputResult.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2301OutputResult.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2301OutputResult.java
index e49d91c2a..f87c3b027 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2301OutputResult.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2301OutputResult.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2302InpatientParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2302InpatientParam.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2302InpatientParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2302InpatientParam.java
index 508916ae5..9525bcbbd 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2302InpatientParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2302InpatientParam.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2302InputInpatient.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2302InputInpatient.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2302InputInpatient.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2302InputInpatient.java
index 5884763bc..9e6d923c6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2302InputInpatient.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2302InputInpatient.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2303InputInpatient.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2303InputInpatient.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2303InputInpatient.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2303InputInpatient.java
index 4233bc37f..84ef88947 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2303InputInpatient.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2303InputInpatient.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2303OutputSetInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2303OutputSetInfo.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2303OutputSetInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2303OutputSetInfo.java
index cbc72d856..0f7c7c608 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2303OutputSetInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2303OutputSetInfo.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2304InputExpContent.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2304InputExpContent.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2304InputExpContent.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2304InputExpContent.java
index 2a4bafd39..269b1d3ea 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2304InputExpContent.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2304InputExpContent.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2304InputInpatient.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2304InputInpatient.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2304InputInpatient.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2304InputInpatient.java
index 2dc87b6dc..c2e21e3ec 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2304InputInpatient.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2304InputInpatient.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2304OutputSetlInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2304OutputSetlInfo.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2304OutputSetlInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2304OutputSetlInfo.java
index de2310023..8614fd551 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2304OutputSetlInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2304OutputSetlInfo.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2305InputInpatient.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2305InputInpatient.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2305InputInpatient.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2305InputInpatient.java
index cecb21208..02a664f2b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2305InputInpatient.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2305InputInpatient.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2305OutputSetlInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2305OutputSetlInfo.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2305OutputSetlInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2305OutputSetlInfo.java
index dcd58b4ac..7b4f8bbc4 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2305OutputSetlInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2305OutputSetlInfo.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientDiseInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2401InputInpatientDiseInfo.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientDiseInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2401InputInpatientDiseInfo.java
index d8bfd848f..b2b703f63 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientDiseInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2401InputInpatientDiseInfo.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientMdtrtInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2401InputInpatientMdtrtInfo.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientMdtrtInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2401InputInpatientMdtrtInfo.java
index 631a9e348..e49013215 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientMdtrtInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2401InputInpatientMdtrtInfo.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientTrumContent.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2401InputInpatientTrumContent.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientTrumContent.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2401InputInpatientTrumContent.java
index 95b107c06..522f31c45 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientTrumContent.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2401InputInpatientTrumContent.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2402InputInpatientDiseInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2402InputInpatientDiseInfo.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2402InputInpatientDiseInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2402InputInpatientDiseInfo.java
index c04cdf878..62663279a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2402InputInpatientDiseInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2402InputInpatientDiseInfo.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2402InputInpatientDscgInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2402InputInpatientDscgInfo.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2402InputInpatientDscgInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2402InputInpatientDscgInfo.java
index c937858f2..5885c3151 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2402InputInpatientDscgInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2402InputInpatientDscgInfo.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2402InputParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2402InputParam.java
similarity index 91%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2402InputParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2402InputParam.java
index 5b6ee774b..a7f75071a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2402InputParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2402InputParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputAdmInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2403InputAdmInfo.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputAdmInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2403InputAdmInfo.java
index f15225a1f..f03af1ca0 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputAdmInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2403InputAdmInfo.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputDiseInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2403InputDiseInfo.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputDiseInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2403InputDiseInfo.java
index 527eedda8..f4397d5fb 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputDiseInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2403InputDiseInfo.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputMdtrtGrpContent.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2403InputMdtrtGrpContent.java
similarity index 91%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputMdtrtGrpContent.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2403InputMdtrtGrpContent.java
index ca99e2e75..d4c4b86d3 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputMdtrtGrpContent.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2403InputMdtrtGrpContent.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2403InputParam.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2403InputParam.java
index bbf854d6f..8316581d5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2403InputParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputTrumContent.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2403InputTrumContent.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputTrumContent.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2403InputTrumContent.java
index 99847a6a9..1a92ca5b9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputTrumContent.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2403InputTrumContent.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2404InputInpatient.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2404InputInpatient.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2404InputInpatient.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2404InputInpatient.java
index e847b5a35..cfb85190c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2404InputInpatient.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2404InputInpatient.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2405InputInpatient.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2405InputInpatient.java
similarity index 94%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2405InputInpatient.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2405InputInpatient.java
index 0a9b116ca..7f0ab93ce 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2405InputInpatient.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2405InputInpatient.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2601InputParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2601InputParam.java
similarity index 91%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2601InputParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2601InputParam.java
index 0a31001ca..5de94a9d0 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2601InputParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb2601InputParam.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterEncounterDiagnoseInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101AdapterEncounterDiagnoseInfo.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterEncounterDiagnoseInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101AdapterEncounterDiagnoseInfo.java
index f2d6ee04c..76ae76b16 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterEncounterDiagnoseInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101AdapterEncounterDiagnoseInfo.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterEncounterPatientInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101AdapterEncounterPatientInfo.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterEncounterPatientInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101AdapterEncounterPatientInfo.java
index 43704d912..a55a95814 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterEncounterPatientInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101AdapterEncounterPatientInfo.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterOrderInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101AdapterOrderInfo.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterOrderInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101AdapterOrderInfo.java
index e8a4361b4..794b8eeed 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterOrderInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101AdapterOrderInfo.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputData.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101InputData.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputData.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101InputData.java
index 1baee3787..5e5b3742a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputData.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101InputData.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiDiagnoseDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101InputFsiDiagnoseDto.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiDiagnoseDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101InputFsiDiagnoseDto.java
index 516911581..aac5eb2d3 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiDiagnoseDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101InputFsiDiagnoseDto.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiEncounterDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101InputFsiEncounterDto.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiEncounterDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101InputFsiEncounterDto.java
index b3f872aa6..4e6e43584 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiEncounterDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101InputFsiEncounterDto.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiOperationDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101InputFsiOperationDto.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiOperationDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101InputFsiOperationDto.java
index 9d723e378..e747d0ccd 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiOperationDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101InputFsiOperationDto.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiOrderDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101InputFsiOrderDto.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiOrderDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101InputFsiOrderDto.java
index 28f63f1b0..1a0398342 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiOrderDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101InputFsiOrderDto.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputPatientDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101InputPatientDto.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputPatientDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101InputPatientDto.java
index ec50c1a5c..1b2a02c3c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputPatientDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101InputPatientDto.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101OutputJudgeResultDetailDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101OutputJudgeResultDetailDto.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101OutputJudgeResultDetailDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101OutputJudgeResultDetailDto.java
index 1c87e4232..43616ced7 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101OutputJudgeResultDetailDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101OutputJudgeResultDetailDto.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101OutputResult.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101OutputResult.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101OutputResult.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101OutputResult.java
index 4b4b70c62..5e2ce8b1f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101OutputResult.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3101OutputResult.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3103InputData.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3103InputData.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3103InputData.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3103InputData.java
index 4e95464e6..5330736b5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3103InputData.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3103InputData.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3103InputWarn.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3103InputWarn.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3103InputWarn.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3103InputWarn.java
index 83ed741c8..62cc43015 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3103InputWarn.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb3103InputWarn.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AAdapterSettleInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AAdapterSettleInfo.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AAdapterSettleInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AAdapterSettleInfo.java
index 11a6e5ab2..ec19b83c0 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AAdapterSettleInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AAdapterSettleInfo.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputBldinfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AInputBldinfo.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputBldinfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AInputBldinfo.java
index 125f53b95..9b80e068c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputBldinfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AInputBldinfo.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputData.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AInputData.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputData.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AInputData.java
index 9d789a2d9..3fcd2034c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputData.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AInputData.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputDiseinfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AInputDiseinfo.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputDiseinfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AInputDiseinfo.java
index ffb719bdb..73652f281 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputDiseinfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AInputDiseinfo.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputIcuinfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AInputIcuinfo.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputIcuinfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AInputIcuinfo.java
index b8418fbc5..6030cf1e2 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputIcuinfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AInputIcuinfo.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputIteminfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AInputIteminfo.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputIteminfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AInputIteminfo.java
index fd1692ed2..70a061dfa 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputIteminfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AInputIteminfo.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputOprninfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AInputOprninfo.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputOprninfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AInputOprninfo.java
index dbd40c572..8b52d6a2e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputOprninfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AInputOprninfo.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputOpspdiseinfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AInputOpspdiseinfo.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputOpspdiseinfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AInputOpspdiseinfo.java
index 562079b95..e329b084b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputOpspdiseinfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AInputOpspdiseinfo.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputSetlinfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AInputSetlinfo.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputSetlinfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AInputSetlinfo.java
index dbdc97c7b..afecbf969 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputSetlinfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AInputSetlinfo.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AOutputData.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AOutputData.java
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AOutputData.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AOutputData.java
index c8953d9ec..139da988e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AOutputData.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101AOutputData.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputData.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101InputData.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputData.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101InputData.java
index 6a652c7c8..59d9cfea9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputData.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101InputData.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputDiseinfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101InputDiseinfo.java
similarity index 90%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputDiseinfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101InputDiseinfo.java
index 881ba38b2..f8d37d774 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputDiseinfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101InputDiseinfo.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputIcuinfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101InputIcuinfo.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputIcuinfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101InputIcuinfo.java
index a01fcc7d8..1f7d2d9bd 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputIcuinfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101InputIcuinfo.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputIteminfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101InputIteminfo.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputIteminfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101InputIteminfo.java
index 92f69c13f..547cedce6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputIteminfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101InputIteminfo.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputOprninfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101InputOprninfo.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputOprninfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101InputOprninfo.java
index d9bdbc8bf..dbcd0a8f2 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputOprninfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101InputOprninfo.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputOpspdiseinfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101InputOpspdiseinfo.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputOpspdiseinfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101InputOpspdiseinfo.java
index 7b8a62301..7b001e264 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputOpspdiseinfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101InputOpspdiseinfo.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputPayinfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101InputPayinfo.java
similarity index 87%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputPayinfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101InputPayinfo.java
index 0e04650fe..95bbb16cd 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputPayinfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101InputPayinfo.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputSetlinfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101InputSetlinfo.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputSetlinfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101InputSetlinfo.java
index 56543d71e..50b8c8c76 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputSetlinfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4101InputSetlinfo.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4102InputStastInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4102InputStastInfo.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4102InputStastInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4102InputStastInfo.java
index d193cea92..652b5b9b0 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4102InputStastInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4102InputStastInfo.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4104InputDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4104InputDto.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4104InputDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4104InputDto.java
index 112492e80..73bc8fde6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4104InputDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4104InputDto.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputBaseInfoDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4401InputBaseInfoDto.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputBaseInfoDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4401InputBaseInfoDto.java
index 42cf0c606..b0bf4146b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputBaseInfoDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4401InputBaseInfoDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputDiseInfoDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4401InputDiseInfoDto.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputDiseInfoDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4401InputDiseInfoDto.java
index e62921adb..7a14a797e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputDiseInfoDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4401InputDiseInfoDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4401InputDto.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4401InputDto.java
index 9f367ab9e..2193d8a35 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4401InputDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputIcuInfoDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4401InputIcuInfoDto.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputIcuInfoDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4401InputIcuInfoDto.java
index 9249478fe..0df79cd25 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputIcuInfoDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4401InputIcuInfoDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputOprnInfoDto.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4401InputOprnInfoDto.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputOprnInfoDto.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4401InputOprnInfoDto.java
index 50c54898c..0de8f15f1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputOprnInfoDto.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb4401InputOprnInfoDto.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb5205InputSpecialDisease.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb5205InputSpecialDisease.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb5205InputSpecialDisease.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb5205InputSpecialDisease.java
index a34a809d6..e6716c1fb 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb5205InputSpecialDisease.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb5205InputSpecialDisease.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb5205OutputSpecialDisease.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb5205OutputSpecialDisease.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb5205OutputSpecialDisease.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb5205OutputSpecialDisease.java
index 8c95aa72f..2d62b7d47 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb5205OutputSpecialDisease.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/Yb5205OutputSpecialDisease.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/extData.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/extData.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/extData.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/extData.java
index 776a95042..4bd435d50 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/extData.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/dto/extData.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.dto;
+package com.healthlink.his.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicPreSettleMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/ClinicPreSettleMapper.java
similarity index 76%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicPreSettleMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/ClinicPreSettleMapper.java
index 6b4e603a5..42c7840ca 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicPreSettleMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/ClinicPreSettleMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.mapper;
+package com.healthlink.his.yb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.yb.domain.ClinicPreSettle;
+import com.healthlink.his.yb.domain.ClinicPreSettle;
 import org.springframework.stereotype.Repository;
 
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicSettleMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/ClinicSettleMapper.java
similarity index 76%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicSettleMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/ClinicSettleMapper.java
index 692e2640b..bfd56cbc5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicSettleMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/ClinicSettleMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.mapper;
+package com.healthlink.his.yb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.yb.domain.ClinicSettle;
+import com.healthlink.his.yb.domain.ClinicSettle;
 import org.springframework.stereotype.Repository;
 
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicUnRegMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/ClinicUnRegMapper.java
similarity index 75%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicUnRegMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/ClinicUnRegMapper.java
index ce771801e..b2efc9784 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicUnRegMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/ClinicUnRegMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.mapper;
+package com.healthlink.his.yb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.yb.domain.ClinicUnReg;
+import com.healthlink.his.yb.domain.ClinicUnReg;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicUnSettleMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/ClinicUnSettleMapper.java
similarity index 76%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicUnSettleMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/ClinicUnSettleMapper.java
index 8c0d9c46e..5482d4a3b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicUnSettleMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/ClinicUnSettleMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.mapper;
+package com.healthlink.his.yb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.yb.domain.ClinicUnSettle;
+import com.healthlink.his.yb.domain.ClinicUnSettle;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/DayEndMedicalInsuranceSettlementMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/DayEndMedicalInsuranceSettlementMapper.java
similarity index 77%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/DayEndMedicalInsuranceSettlementMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/DayEndMedicalInsuranceSettlementMapper.java
index 388c4850b..cc1c54793 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/DayEndMedicalInsuranceSettlementMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/DayEndMedicalInsuranceSettlementMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.mapper;
+package com.healthlink.his.yb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.yb.domain.DayEndMedicalInsuranceSettlement;
+import com.healthlink.his.yb.domain.DayEndMedicalInsuranceSettlement;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/DirectoryCheckRecordMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/DirectoryCheckRecordMapper.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/DirectoryCheckRecordMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/DirectoryCheckRecordMapper.java
index 8cede499b..cc9df20a6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/DirectoryCheckRecordMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/DirectoryCheckRecordMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.mapper;
+package com.healthlink.his.yb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.yb.domain.DirectoryCheckRecord;
+import com.healthlink.his.yb.domain.DirectoryCheckRecord;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/FinancialApplyRecordMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/FinancialApplyRecordMapper.java
similarity index 75%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/FinancialApplyRecordMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/FinancialApplyRecordMapper.java
index 7416822e9..7ab620c09 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/FinancialApplyRecordMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/FinancialApplyRecordMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.mapper;
+package com.healthlink.his.yb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.yb.domain.FinancialApplyRecord;
+import com.healthlink.his.yb.domain.FinancialApplyRecord;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/FinancialReconcileRecordMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/FinancialReconcileRecordMapper.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/FinancialReconcileRecordMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/FinancialReconcileRecordMapper.java
index e68754472..f497ba786 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/FinancialReconcileRecordMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/FinancialReconcileRecordMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.mapper;
+package com.healthlink.his.yb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.yb.domain.FinancialReconcileRecord;
+import com.healthlink.his.yb.domain.FinancialReconcileRecord;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientDischargeMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InpatientDischargeMapper.java
similarity index 80%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientDischargeMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InpatientDischargeMapper.java
index f6e57bc99..8f2ecdf08 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientDischargeMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InpatientDischargeMapper.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.mapper;
+package com.healthlink.his.yb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.yb.domain.InpatientDischarge;
+import com.healthlink.his.yb.domain.InpatientDischarge;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientFeeDetailMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InpatientFeeDetailMapper.java
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientFeeDetailMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InpatientFeeDetailMapper.java
index b9b0b4e98..b0c5f5984 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientFeeDetailMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InpatientFeeDetailMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.mapper;
+package com.healthlink.his.yb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.yb.domain.InpatientFeeDetail;
+import com.healthlink.his.yb.domain.InpatientFeeDetail;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientPreSettleMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InpatientPreSettleMapper.java
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientPreSettleMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InpatientPreSettleMapper.java
index 329cfdf3a..17f03666f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientPreSettleMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InpatientPreSettleMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.mapper;
+package com.healthlink.his.yb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.yb.domain.InpatientPreSettle;
+import com.healthlink.his.yb.domain.InpatientPreSettle;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientRegInfoUpdateRecordeMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InpatientRegInfoUpdateRecordeMapper.java
similarity index 79%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientRegInfoUpdateRecordeMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InpatientRegInfoUpdateRecordeMapper.java
index 91c5b55f0..f9bd7c61a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientRegInfoUpdateRecordeMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InpatientRegInfoUpdateRecordeMapper.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.mapper;
+package com.healthlink.his.yb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.yb.domain.InpatientRegInfoUpdateRecorde;
+import com.healthlink.his.yb.domain.InpatientRegInfoUpdateRecorde;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientRegMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InpatientRegMapper.java
similarity index 85%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientRegMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InpatientRegMapper.java
index 3b4e18d49..cd62576b9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientRegMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InpatientRegMapper.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.mapper;
+package com.healthlink.his.yb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.yb.domain.InpatientReg;
+import com.healthlink.his.yb.domain.InpatientReg;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientSettleMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InpatientSettleMapper.java
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientSettleMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InpatientSettleMapper.java
index 39ecc681f..26a3cca88 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientSettleMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InpatientSettleMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.mapper;
+package com.healthlink.his.yb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.yb.domain.InpatientSettle;
+import com.healthlink.his.yb.domain.InpatientSettle;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryChangeRecordMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InventoryChangeRecordMapper.java
similarity index 75%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryChangeRecordMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InventoryChangeRecordMapper.java
index c6892ecfe..5d77fe7a3 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryChangeRecordMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InventoryChangeRecordMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.mapper;
+package com.healthlink.his.yb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.yb.domain.InventoryChangeRecord;
+import com.healthlink.his.yb.domain.InventoryChangeRecord;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryCheckRecordMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InventoryCheckRecordMapper.java
similarity index 75%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryCheckRecordMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InventoryCheckRecordMapper.java
index b7607d385..f2f69cdbb 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryCheckRecordMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InventoryCheckRecordMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.mapper;
+package com.healthlink.his.yb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.yb.domain.InventoryCheckRecord;
+import com.healthlink.his.yb.domain.InventoryCheckRecord;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryDelRecordMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InventoryDelRecordMapper.java
similarity index 75%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryDelRecordMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InventoryDelRecordMapper.java
index 9aff4f0a3..0916c8eb5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryDelRecordMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InventoryDelRecordMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.mapper;
+package com.healthlink.his.yb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.yb.domain.InventoryDelRecord;
+import com.healthlink.his.yb.domain.InventoryDelRecord;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryPurchaseRecordMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InventoryPurchaseRecordMapper.java
similarity index 75%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryPurchaseRecordMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InventoryPurchaseRecordMapper.java
index 542a35326..4f665f8ca 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryPurchaseRecordMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InventoryPurchaseRecordMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.mapper;
+package com.healthlink.his.yb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.yb.domain.InventoryPurchaseRecord;
+import com.healthlink.his.yb.domain.InventoryPurchaseRecord;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryPurchaseReturnRecordMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InventoryPurchaseReturnRecordMapper.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryPurchaseReturnRecordMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InventoryPurchaseReturnRecordMapper.java
index ddfef957b..35d8ad5e0 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryPurchaseReturnRecordMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InventoryPurchaseReturnRecordMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.mapper;
+package com.healthlink.his.yb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.yb.domain.InventoryPurchaseReturnRecord;
+import com.healthlink.his.yb.domain.InventoryPurchaseReturnRecord;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventorySaleRecordMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InventorySaleRecordMapper.java
similarity index 75%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventorySaleRecordMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InventorySaleRecordMapper.java
index 4dd6983b0..cac8c399a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventorySaleRecordMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InventorySaleRecordMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.mapper;
+package com.healthlink.his.yb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.yb.domain.InventorySaleRecord;
+import com.healthlink.his.yb.domain.InventorySaleRecord;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventorySaleReturnRecordMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InventorySaleReturnRecordMapper.java
similarity index 75%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventorySaleReturnRecordMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InventorySaleReturnRecordMapper.java
index 6d111fad2..509b107d2 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventorySaleReturnRecordMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/InventorySaleReturnRecordMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.mapper;
+package com.healthlink.his.yb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.yb.domain.InventorySaleReturnRecord;
+import com.healthlink.his.yb.domain.InventorySaleReturnRecord;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/MedicalInsuranceMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/MedicalInsuranceMapper.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/MedicalInsuranceMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/MedicalInsuranceMapper.java
index c2f984dd1..d40473c39 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/MedicalInsuranceMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/MedicalInsuranceMapper.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.mapper;
+package com.healthlink.his.yb.mapper;
 
 
-import com.openhis.yb.dto.*;
+import com.healthlink.his.yb.dto.*;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/PerinfoMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/PerinfoMapper.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/PerinfoMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/PerinfoMapper.java
index c1168fe7c..6e1136995 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/PerinfoMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/PerinfoMapper.java
@@ -1,6 +1,6 @@
-package com.openhis.yb.mapper;
+package com.healthlink.his.yb.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.yb.domain.InfoPerson;
+import com.healthlink.his.yb.domain.InfoPerson;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/RegMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/RegMapper.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/RegMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/RegMapper.java
index c2f81e557..cfcc84f2e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/RegMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/RegMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.mapper;
+package com.healthlink.his.yb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.yb.domain.ClinicReg;
+import com.healthlink.his.yb.domain.ClinicReg;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/SignMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/SignMapper.java
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/SignMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/SignMapper.java
index 84ad6e3c3..01d2d4298 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/SignMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/mapper/SignMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.mapper;
+package com.healthlink.his.yb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.yb.domain.Sign;
+import com.healthlink.his.yb.domain.Sign;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/CancelRegPaymentModel.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/model/CancelRegPaymentModel.java
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/CancelRegPaymentModel.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/model/CancelRegPaymentModel.java
index 87bacf998..59f43af4a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/CancelRegPaymentModel.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/model/CancelRegPaymentModel.java
@@ -1,8 +1,8 @@
-package com.openhis.yb.model;
+package com.healthlink.his.yb.model;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.yb.dto.PaymentDetailDto;
+import com.healthlink.his.yb.dto.PaymentDetailDto;
 import lombok.Data;
 
 import jakarta.validation.constraints.NotEmpty;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/Clinic2207OrderModel.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/model/Clinic2207OrderModel.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/Clinic2207OrderModel.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/model/Clinic2207OrderModel.java
index 260b0687d..21e64397b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/Clinic2207OrderModel.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/model/Clinic2207OrderModel.java
@@ -1,9 +1,9 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.model;
+package com.healthlink.his.yb.model;
 
-import com.openhis.yb.dto.Clinic2206FundPaymentResult;
+import com.healthlink.his.yb.dto.Clinic2206FundPaymentResult;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/Clinic2207OrderParam.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/model/Clinic2207OrderParam.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/Clinic2207OrderParam.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/model/Clinic2207OrderParam.java
index 51f7075bf..13bca7d26 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/Clinic2207OrderParam.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/model/Clinic2207OrderParam.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.model;
+package com.healthlink.his.yb.model;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/OutpatientRegistrationModel.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/model/OutpatientRegistrationModel.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/OutpatientRegistrationModel.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/model/OutpatientRegistrationModel.java
index 4745a424e..2510856aa 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/OutpatientRegistrationModel.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/model/OutpatientRegistrationModel.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.model;
+package com.healthlink.his.yb.model;
 
 import lombok.Data;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicPreSettleService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IClinicPreSettleService.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicPreSettleService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IClinicPreSettleService.java
index 8008af06e..b6577e42b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicPreSettleService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IClinicPreSettleService.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.service;
+package com.healthlink.his.yb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.yb.domain.ClinicPreSettle;
+import com.healthlink.his.yb.domain.ClinicPreSettle;
 
 /**
  * 【请填写功能名称】Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicSettleService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IClinicSettleService.java
similarity index 88%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicSettleService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IClinicSettleService.java
index bcd1c4178..4c371e7b5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicSettleService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IClinicSettleService.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.service;
+package com.healthlink.his.yb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.yb.domain.ClinicSettle;
+import com.healthlink.his.yb.domain.ClinicSettle;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicUnRegService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IClinicUnRegService.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicUnRegService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IClinicUnRegService.java
index a6fdc5570..00e9d761e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicUnRegService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IClinicUnRegService.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.service;
+package com.healthlink.his.yb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.yb.domain.ClinicUnReg;
+import com.healthlink.his.yb.domain.ClinicUnReg;
 
 /**
  * 撤销挂号记录Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicUnSettleService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IClinicUnSettleService.java
similarity index 82%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicUnSettleService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IClinicUnSettleService.java
index daa98f1f4..16d6dd5d7 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicUnSettleService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IClinicUnSettleService.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.service;
+package com.healthlink.his.yb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.yb.domain.ClinicUnSettle;
+import com.healthlink.his.yb.domain.ClinicUnSettle;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IDayEndMedicalInsuranceSettlementService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IDayEndMedicalInsuranceSettlementService.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IDayEndMedicalInsuranceSettlementService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IDayEndMedicalInsuranceSettlementService.java
index 8678e536a..8c7b6f706 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IDayEndMedicalInsuranceSettlementService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IDayEndMedicalInsuranceSettlementService.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.service;
+package com.healthlink.his.yb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.yb.domain.DayEndMedicalInsuranceSettlement;
+import com.healthlink.his.yb.domain.DayEndMedicalInsuranceSettlement;
 import com.core.common.core.domain.PageResult;
 
 import java.util.List;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IDirectoryCheckRecordService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IDirectoryCheckRecordService.java
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IDirectoryCheckRecordService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IDirectoryCheckRecordService.java
index fd6537680..57d664c6d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IDirectoryCheckRecordService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IDirectoryCheckRecordService.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.service;
+package com.healthlink.his.yb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.yb.domain.DirectoryCheckRecord;
+import com.healthlink.his.yb.domain.DirectoryCheckRecord;
 
 /**
  * 医保Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IFinancialApplyRecordService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IFinancialApplyRecordService.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IFinancialApplyRecordService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IFinancialApplyRecordService.java
index 076c2686b..b33870584 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IFinancialApplyRecordService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IFinancialApplyRecordService.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.service;
+package com.healthlink.his.yb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.yb.domain.FinancialApplyRecord;
+import com.healthlink.his.yb.domain.FinancialApplyRecord;
 
 /**
  * 医保财务申请记录Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IFinancialReconcileRecordService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IFinancialReconcileRecordService.java
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IFinancialReconcileRecordService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IFinancialReconcileRecordService.java
index 841982aed..705c63956 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IFinancialReconcileRecordService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IFinancialReconcileRecordService.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.service;
+package com.healthlink.his.yb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.yb.domain.FinancialReconcileRecord;
+import com.healthlink.his.yb.domain.FinancialReconcileRecord;
 
 /**
  * ybService接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientDischargeService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInpatientDischargeService.java
similarity index 78%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientDischargeService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInpatientDischargeService.java
index 768dfc63e..040f966d3 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientDischargeService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInpatientDischargeService.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.service;
+package com.healthlink.his.yb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.yb.domain.InpatientDischarge;
+import com.healthlink.his.yb.domain.InpatientDischarge;
 
 /**
  * 出院办理服务接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientFeeDetailService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInpatientFeeDetailService.java
similarity index 78%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientFeeDetailService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInpatientFeeDetailService.java
index e06aee56c..8fc617292 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientFeeDetailService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInpatientFeeDetailService.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.service;
+package com.healthlink.his.yb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.yb.domain.InpatientFeeDetail;
+import com.healthlink.his.yb.domain.InpatientFeeDetail;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientPreSettleService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInpatientPreSettleService.java
similarity index 60%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientPreSettleService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInpatientPreSettleService.java
index c0cd9203c..231dae0ae 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientPreSettleService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInpatientPreSettleService.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.service;
+package com.healthlink.his.yb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.yb.domain.InpatientPreSettle;
+import com.healthlink.his.yb.domain.InpatientPreSettle;
 
 public interface IInpatientPreSettleService extends IService<InpatientPreSettle> {
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientRegInfoUpdateRecordeService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInpatientRegInfoUpdateRecordeService.java
similarity index 76%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientRegInfoUpdateRecordeService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInpatientRegInfoUpdateRecordeService.java
index 6ae4482b9..732a2f3d1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientRegInfoUpdateRecordeService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInpatientRegInfoUpdateRecordeService.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.service;
+package com.healthlink.his.yb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.yb.domain.InpatientRegInfoUpdateRecorde;
+import com.healthlink.his.yb.domain.InpatientRegInfoUpdateRecorde;
 
 /**
  * TODO:请概括描述当前接口的主要用途和注意事项
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientRegService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInpatientRegService.java
similarity index 91%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientRegService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInpatientRegService.java
index 0c6322e3a..9c9f94400 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientRegService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInpatientRegService.java
@@ -1,10 +1,10 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.service;
+package com.healthlink.his.yb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.yb.domain.InpatientReg;
+import com.healthlink.his.yb.domain.InpatientReg;
 
 /**
  * TODO:请概括描述当前接口的主要用途和注意事项
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientSettleService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInpatientSettleService.java
similarity index 84%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientSettleService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInpatientSettleService.java
index e65a719d1..aab699ea0 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientSettleService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInpatientSettleService.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.service;
+package com.healthlink.his.yb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.yb.domain.InpatientSettle;
+import com.healthlink.his.yb.domain.InpatientSettle;
 
 import java.util.List;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryChangeRecordService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInventoryChangeRecordService.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryChangeRecordService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInventoryChangeRecordService.java
index b1f46cb1d..c58f37243 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryChangeRecordService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInventoryChangeRecordService.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.service;
+package com.healthlink.his.yb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.yb.domain.InventoryChangeRecord;
+import com.healthlink.his.yb.domain.InventoryChangeRecord;
 
 /**
  * 库存信息变更记录Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryCheckRecordService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInventoryCheckRecordService.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryCheckRecordService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInventoryCheckRecordService.java
index fd40a5b7b..c1fa6df8a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryCheckRecordService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInventoryCheckRecordService.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.service;
+package com.healthlink.his.yb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.yb.domain.InventoryCheckRecord;
+import com.healthlink.his.yb.domain.InventoryCheckRecord;
 
 /**
  * 库存盘点记录Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryDelRecordService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInventoryDelRecordService.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryDelRecordService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInventoryDelRecordService.java
index f3938a7f7..750d773e6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryDelRecordService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInventoryDelRecordService.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.service;
+package com.healthlink.his.yb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.yb.domain.InventoryDelRecord;
+import com.healthlink.his.yb.domain.InventoryDelRecord;
 
 /**
  * 库存删除记录Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryPurchaseRecordService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInventoryPurchaseRecordService.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryPurchaseRecordService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInventoryPurchaseRecordService.java
index 34de41cdb..605bdafe6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryPurchaseRecordService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInventoryPurchaseRecordService.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.service;
+package com.healthlink.his.yb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.yb.domain.InventoryPurchaseRecord;
+import com.healthlink.his.yb.domain.InventoryPurchaseRecord;
 
 /**
  * 库存采购/退货记录Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryPurchaseReturnRecordService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInventoryPurchaseReturnRecordService.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryPurchaseReturnRecordService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInventoryPurchaseReturnRecordService.java
index 0e32daf0e..ab9038069 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventoryPurchaseReturnRecordService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInventoryPurchaseReturnRecordService.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.service;
+package com.healthlink.his.yb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.yb.domain.InventoryPurchaseReturnRecord;
+import com.healthlink.his.yb.domain.InventoryPurchaseReturnRecord;
 
 /**
  * 采购/退货记录Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventorySaleRecordService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInventorySaleRecordService.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventorySaleRecordService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInventorySaleRecordService.java
index dd93de62d..5be3ace77 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventorySaleRecordService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInventorySaleRecordService.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.service;
+package com.healthlink.his.yb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.yb.domain.InventorySaleRecord;
+import com.healthlink.his.yb.domain.InventorySaleRecord;
 
 /**
  * 销售/退货记录Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventorySaleReturnRecordService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInventorySaleReturnRecordService.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventorySaleReturnRecordService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInventorySaleReturnRecordService.java
index a82351e2e..08c99446a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInventorySaleReturnRecordService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IInventorySaleReturnRecordService.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.service;
+package com.healthlink.his.yb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.yb.domain.InventorySaleReturnRecord;
+import com.healthlink.his.yb.domain.InventorySaleReturnRecord;
 
 /**
  * 销售/退货记录Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IPerinfoService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IPerinfoService.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IPerinfoService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IPerinfoService.java
index 1b64a0acc..7ac4a8e6b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IPerinfoService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IPerinfoService.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.service;
+package com.healthlink.his.yb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.yb.domain.InfoPerson;
+import com.healthlink.his.yb.domain.InfoPerson;
 
 /**
  * @Description: 人员基础信息
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IRegService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IRegService.java
similarity index 80%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IRegService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IRegService.java
index 7438c3c6c..a796102b5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IRegService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/IRegService.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.service;
+package com.healthlink.his.yb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.yb.domain.ClinicReg;
+import com.healthlink.his.yb.domain.ClinicReg;
 
 /**
  * 挂号管理-服务接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/ISignService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/ISignService.java
similarity index 65%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/ISignService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/ISignService.java
index ac59b7e17..4cd4e0302 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/ISignService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/ISignService.java
@@ -1,7 +1,7 @@
-package com.openhis.yb.service;
+package com.healthlink.his.yb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.yb.domain.Sign;
+import com.healthlink.his.yb.domain.Sign;
 
 /**
  * 签到管理-服务接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbDao.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/YbDao.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbDao.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/YbDao.java
index 7f5e47de5..ea3c370cc 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbDao.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/YbDao.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.service;
+package com.healthlink.his.yb.service;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,38 +18,38 @@ import com.core.common.utils.DateUtils;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
 import com.core.system.service.impl.SysUserServiceImpl;
-import com.openhis.administration.domain.*;
-import com.openhis.administration.dto.ChargeItemBaseInfoDto;
-import com.openhis.administration.service.*;
-import com.openhis.clinical.domain.Condition;
-import com.openhis.clinical.domain.ConditionDefinition;
-import com.openhis.clinical.service.IConditionDefinitionService;
-import com.openhis.clinical.service.IConditionService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.common.enums.*;
-import com.openhis.common.enums.ybenums.*;
-import com.openhis.common.utils.HisPageUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.financial.domain.Contract;
-import com.openhis.financial.domain.PaymentRecDetail;
-import com.openhis.financial.domain.PaymentReconciliation;
-import com.openhis.financial.model.PaymentedItemModel;
-import com.openhis.financial.service.IContractService;
-import com.openhis.financial.service.IPaymentRecDetailService;
-import com.openhis.financial.service.IPaymentReconciliationService;
-import com.openhis.medication.service.IMedicationDispenseService;
-import com.openhis.workflow.service.IDeviceDispenseService;
-import com.openhis.workflow.service.IServiceRequestService;
-import com.openhis.yb.domain.*;
-import com.openhis.yb.domain.ClinicReg;
-import com.openhis.yb.dto.*;
-import com.openhis.yb.dto.Sign;
-import com.openhis.yb.mapper.MedicalInsuranceMapper;
-import com.openhis.yb.model.Clinic2207OrderModel;
-import com.openhis.yb.model.Clinic2207OrderParam;
-import com.openhis.yb.service.impl.DirectoryCheckRecordServiceImpl;
-import com.openhis.yb.util.YbParamBuilderUtil;
+import com.healthlink.his.administration.domain.*;
+import com.healthlink.his.administration.dto.ChargeItemBaseInfoDto;
+import com.healthlink.his.administration.service.*;
+import com.healthlink.his.clinical.domain.Condition;
+import com.healthlink.his.clinical.domain.ConditionDefinition;
+import com.healthlink.his.clinical.service.IConditionDefinitionService;
+import com.healthlink.his.clinical.service.IConditionService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.YbCommonConstants;
+import com.healthlink.his.common.enums.*;
+import com.healthlink.his.common.enums.ybenums.*;
+import com.healthlink.his.common.utils.HisPageUtils;
+import com.healthlink.his.common.utils.HisQueryUtils;
+import com.healthlink.his.financial.domain.Contract;
+import com.healthlink.his.financial.domain.PaymentRecDetail;
+import com.healthlink.his.financial.domain.PaymentReconciliation;
+import com.healthlink.his.financial.model.PaymentedItemModel;
+import com.healthlink.his.financial.service.IContractService;
+import com.healthlink.his.financial.service.IPaymentRecDetailService;
+import com.healthlink.his.financial.service.IPaymentReconciliationService;
+import com.healthlink.his.medication.service.IMedicationDispenseService;
+import com.healthlink.his.workflow.service.IDeviceDispenseService;
+import com.healthlink.his.workflow.service.IServiceRequestService;
+import com.healthlink.his.yb.domain.*;
+import com.healthlink.his.yb.domain.ClinicReg;
+import com.healthlink.his.yb.dto.*;
+import com.healthlink.his.yb.dto.Sign;
+import com.healthlink.his.yb.mapper.MedicalInsuranceMapper;
+import com.healthlink.his.yb.model.Clinic2207OrderModel;
+import com.healthlink.his.yb.model.Clinic2207OrderParam;
+import com.healthlink.his.yb.service.impl.DirectoryCheckRecordServiceImpl;
+import com.healthlink.his.yb.util.YbParamBuilderUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -681,7 +681,7 @@ public class YbDao {
      * @param signResult 【9001】参数
      */
     public void saveSign(Sign signParam, Sign9001Result signResult) {
-        com.openhis.yb.domain.Sign sign = new com.openhis.yb.domain.Sign();
+        com.healthlink.his.yb.domain.Sign sign = new com.healthlink.his.yb.domain.Sign();
         BeanUtils.copyProperties(signParam, sign);
         BeanUtils.copyProperties(signResult, sign);
         sign.setSignNo(signResult.getSignNo()).setOpterNo(signParam.getOpterNo());
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbHttpUtils.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/YbHttpUtils.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbHttpUtils.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/YbHttpUtils.java
index ae15c21e3..b3431f925 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbHttpUtils.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/YbHttpUtils.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.service;
+package com.healthlink.his.yb.service;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
@@ -14,15 +14,15 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
-import com.openhis.financial.domain.Contract;
-import com.openhis.financial.service.IContractService;
-import com.openhis.financial.service.impl.ContractServiceImpl;
-import com.openhis.yb.domain.ClinicReg;
-import com.openhis.yb.domain.InpatientReg;
-import com.openhis.yb.dto.*;
-import com.openhis.yb.model.Clinic2207OrderModel;
-import com.openhis.yb.model.Clinic2207OrderParam;
-import com.openhis.yb.util.YbParamBuilderUtil;
+import com.healthlink.his.financial.domain.Contract;
+import com.healthlink.his.financial.service.IContractService;
+import com.healthlink.his.financial.service.impl.ContractServiceImpl;
+import com.healthlink.his.yb.domain.ClinicReg;
+import com.healthlink.his.yb.domain.InpatientReg;
+import com.healthlink.his.yb.dto.*;
+import com.healthlink.his.yb.model.Clinic2207OrderModel;
+import com.healthlink.his.yb.model.Clinic2207OrderParam;
+import com.healthlink.his.yb.util.YbParamBuilderUtil;
 import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.client5.http.classic.methods.HttpPost;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbManager.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/YbManager.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbManager.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/YbManager.java
index b149fd855..187dc902d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbManager.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/YbManager.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.service;
+package com.healthlink.his.yb.service;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
@@ -14,41 +14,41 @@ import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
 import com.core.system.service.impl.SysUserServiceImpl;
 import com.core.web.controller.common.CommonController;
-import com.openhis.administration.domain.Encounter;
-import com.openhis.administration.domain.Organization;
-import com.openhis.administration.domain.Patient;
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.dto.ChargeItemBaseInfoDto;
-import com.openhis.administration.service.*;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.common.enums.AssignSeqEnum;
-import com.openhis.common.enums.Whether;
-import com.openhis.common.enums.ybenums.YbHospApprFlag;
-import com.openhis.common.enums.ybenums.YbMdtrtCertType;
-import com.openhis.common.enums.ybenums.YbMedType;
-import com.openhis.common.enums.ybenums.YbPsnSetlWay;
-import com.openhis.financial.domain.Contract;
-import com.openhis.financial.domain.PaymentReconciliation;
-import com.openhis.financial.model.PaymentResult;
-import com.openhis.financial.model.PaymentedItemModel;
-import com.openhis.financial.service.IContractService;
-import com.openhis.financial.service.IPaymentRecDetailService;
-import com.openhis.financial.service.IPaymentReconciliationService;
-import com.openhis.medication.service.IMedicationDispenseService;
-import com.openhis.workflow.service.IDeviceDispenseService;
-import com.openhis.workflow.service.IInventoryItemService;
-import com.openhis.workflow.service.IServiceRequestService;
-import com.openhis.yb.domain.*;
-import com.openhis.yb.domain.ClinicReg;
-import com.openhis.yb.dto.*;
-import com.openhis.yb.model.CancelRegPaymentModel;
-import com.openhis.yb.model.Clinic2207OrderModel;
-import com.openhis.yb.model.Clinic2207OrderParam;
-import com.openhis.yb.model.OutpatientRegistrationModel;
-import com.openhis.yb.service.impl.DirectoryCheckRecordServiceImpl;
-import com.openhis.yb.util.CommonConstant;
-import com.openhis.yb.util.YbParamBuilderUtil;
+import com.healthlink.his.administration.domain.Encounter;
+import com.healthlink.his.administration.domain.Organization;
+import com.healthlink.his.administration.domain.Patient;
+import com.healthlink.his.administration.domain.Practitioner;
+import com.healthlink.his.administration.dto.ChargeItemBaseInfoDto;
+import com.healthlink.his.administration.service.*;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.YbCommonConstants;
+import com.healthlink.his.common.enums.AssignSeqEnum;
+import com.healthlink.his.common.enums.Whether;
+import com.healthlink.his.common.enums.ybenums.YbHospApprFlag;
+import com.healthlink.his.common.enums.ybenums.YbMdtrtCertType;
+import com.healthlink.his.common.enums.ybenums.YbMedType;
+import com.healthlink.his.common.enums.ybenums.YbPsnSetlWay;
+import com.healthlink.his.financial.domain.Contract;
+import com.healthlink.his.financial.domain.PaymentReconciliation;
+import com.healthlink.his.financial.model.PaymentResult;
+import com.healthlink.his.financial.model.PaymentedItemModel;
+import com.healthlink.his.financial.service.IContractService;
+import com.healthlink.his.financial.service.IPaymentRecDetailService;
+import com.healthlink.his.financial.service.IPaymentReconciliationService;
+import com.healthlink.his.medication.service.IMedicationDispenseService;
+import com.healthlink.his.workflow.service.IDeviceDispenseService;
+import com.healthlink.his.workflow.service.IInventoryItemService;
+import com.healthlink.his.workflow.service.IServiceRequestService;
+import com.healthlink.his.yb.domain.*;
+import com.healthlink.his.yb.domain.ClinicReg;
+import com.healthlink.his.yb.dto.*;
+import com.healthlink.his.yb.model.CancelRegPaymentModel;
+import com.healthlink.his.yb.model.Clinic2207OrderModel;
+import com.healthlink.his.yb.model.Clinic2207OrderParam;
+import com.healthlink.his.yb.model.OutpatientRegistrationModel;
+import com.healthlink.his.yb.service.impl.DirectoryCheckRecordServiceImpl;
+import com.healthlink.his.yb.util.CommonConstant;
+import com.healthlink.his.yb.util.YbParamBuilderUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -850,7 +850,7 @@ public class YbManager {
         String paymentNo = assignSeqUtil.getSeqByDay(AssignSeqEnum.PAYMENT_NO.getPrefix(), 20);
         // 业务表中进行操作
         ybBaseService.saveClinic2207Record(paymentNo, clinicOrder, settle);
-        PaymentResult paymentResult = new com.openhis.financial.model.PaymentResult();
+        PaymentResult paymentResult = new com.healthlink.his.financial.model.PaymentResult();
         BeanUtils.copyProperties(settle, paymentResult);
         paymentResult.setPaymentNo(paymentNo);
         return paymentResult;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicPreSettleServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/ClinicPreSettleServiceImpl.java
similarity index 62%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicPreSettleServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/ClinicPreSettleServiceImpl.java
index c10aed8cc..c33ffdbf2 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicPreSettleServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/ClinicPreSettleServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.yb.service.impl;
+package com.healthlink.his.yb.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.yb.domain.ClinicPreSettle;
-import com.openhis.yb.mapper.ClinicPreSettleMapper;
-import com.openhis.yb.service.IClinicPreSettleService;
+import com.healthlink.his.yb.domain.ClinicPreSettle;
+import com.healthlink.his.yb.mapper.ClinicPreSettleMapper;
+import com.healthlink.his.yb.service.IClinicPreSettleService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicSettleServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/ClinicSettleServiceImpl.java
similarity index 84%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicSettleServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/ClinicSettleServiceImpl.java
index e87beeaee..d13290677 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicSettleServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/ClinicSettleServiceImpl.java
@@ -1,10 +1,10 @@
-package com.openhis.yb.service.impl;
+package com.healthlink.his.yb.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.yb.domain.ClinicSettle;
-import com.openhis.yb.mapper.ClinicSettleMapper;
-import com.openhis.yb.service.IClinicSettleService;
+import com.healthlink.his.yb.domain.ClinicSettle;
+import com.healthlink.his.yb.mapper.ClinicSettleMapper;
+import com.healthlink.his.yb.service.IClinicSettleService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicUnRegServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/ClinicUnRegServiceImpl.java
similarity index 62%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicUnRegServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/ClinicUnRegServiceImpl.java
index 298339d6e..35039057a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicUnRegServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/ClinicUnRegServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.yb.service.impl;
+package com.healthlink.his.yb.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.yb.domain.ClinicUnReg;
-import com.openhis.yb.mapper.ClinicUnRegMapper;
-import com.openhis.yb.service.IClinicUnRegService;
+import com.healthlink.his.yb.domain.ClinicUnReg;
+import com.healthlink.his.yb.mapper.ClinicUnRegMapper;
+import com.healthlink.his.yb.service.IClinicUnRegService;
 import org.springframework.stereotype.Service;
 
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicUnSettleServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/ClinicUnSettleServiceImpl.java
similarity index 80%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicUnSettleServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/ClinicUnSettleServiceImpl.java
index bec79cead..4894d30af 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicUnSettleServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/ClinicUnSettleServiceImpl.java
@@ -1,11 +1,11 @@
-package com.openhis.yb.service.impl;
+package com.healthlink.his.yb.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.enums.DelFlag;
-import com.openhis.yb.domain.ClinicUnSettle;
-import com.openhis.yb.mapper.ClinicUnSettleMapper;
-import com.openhis.yb.service.IClinicUnSettleService;
+import com.healthlink.his.yb.domain.ClinicUnSettle;
+import com.healthlink.his.yb.mapper.ClinicUnSettleMapper;
+import com.healthlink.his.yb.service.IClinicUnSettleService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/DayEndMedicalInsuranceSettlementServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/DayEndMedicalInsuranceSettlementServiceImpl.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/DayEndMedicalInsuranceSettlementServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/DayEndMedicalInsuranceSettlementServiceImpl.java
index 3f1ef240c..a5daff5ee 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/DayEndMedicalInsuranceSettlementServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/DayEndMedicalInsuranceSettlementServiceImpl.java
@@ -1,13 +1,13 @@
-package com.openhis.yb.service.impl;
+package com.healthlink.his.yb.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.core.domain.PageResult;
-import com.openhis.yb.domain.DayEndMedicalInsuranceSettlement;
-import com.openhis.yb.mapper.DayEndMedicalInsuranceSettlementMapper;
-import com.openhis.yb.service.IDayEndMedicalInsuranceSettlementService;
+import com.healthlink.his.yb.domain.DayEndMedicalInsuranceSettlement;
+import com.healthlink.his.yb.mapper.DayEndMedicalInsuranceSettlementMapper;
+import com.healthlink.his.yb.service.IDayEndMedicalInsuranceSettlementService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/DirectoryCheckRecordServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/DirectoryCheckRecordServiceImpl.java
similarity index 61%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/DirectoryCheckRecordServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/DirectoryCheckRecordServiceImpl.java
index 489921e31..f0e3d74fd 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/DirectoryCheckRecordServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/DirectoryCheckRecordServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.yb.service.impl;
+package com.healthlink.his.yb.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.yb.domain.DirectoryCheckRecord;
-import com.openhis.yb.mapper.DirectoryCheckRecordMapper;
-import com.openhis.yb.service.IDirectoryCheckRecordService;
+import com.healthlink.his.yb.domain.DirectoryCheckRecord;
+import com.healthlink.his.yb.mapper.DirectoryCheckRecordMapper;
+import com.healthlink.his.yb.service.IDirectoryCheckRecordService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/FinancialApplyRecordServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/FinancialApplyRecordServiceImpl.java
similarity index 62%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/FinancialApplyRecordServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/FinancialApplyRecordServiceImpl.java
index 51564a9cd..ff31a39f1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/FinancialApplyRecordServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/FinancialApplyRecordServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.yb.service.impl;
+package com.healthlink.his.yb.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.yb.domain.FinancialApplyRecord;
-import com.openhis.yb.mapper.FinancialApplyRecordMapper;
-import com.openhis.yb.service.IFinancialApplyRecordService;
+import com.healthlink.his.yb.domain.FinancialApplyRecord;
+import com.healthlink.his.yb.mapper.FinancialApplyRecordMapper;
+import com.healthlink.his.yb.service.IFinancialApplyRecordService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/FinancialReconcileRecordServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/FinancialReconcileRecordServiceImpl.java
similarity index 60%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/FinancialReconcileRecordServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/FinancialReconcileRecordServiceImpl.java
index ce84284a9..9e2c563bd 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/FinancialReconcileRecordServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/FinancialReconcileRecordServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.yb.service.impl;
+package com.healthlink.his.yb.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.yb.domain.FinancialReconcileRecord;
-import com.openhis.yb.mapper.FinancialReconcileRecordMapper;
-import com.openhis.yb.service.IFinancialReconcileRecordService;
+import com.healthlink.his.yb.domain.FinancialReconcileRecord;
+import com.healthlink.his.yb.mapper.FinancialReconcileRecordMapper;
+import com.healthlink.his.yb.service.IFinancialReconcileRecordService;
 import org.springframework.stereotype.Service;
 
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientDischargeServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InpatientDischargeServiceImpl.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientDischargeServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InpatientDischargeServiceImpl.java
index f2d28853d..f9471021f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientDischargeServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InpatientDischargeServiceImpl.java
@@ -1,15 +1,15 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.service.impl;
+package com.healthlink.his.yb.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.enums.DelFlag;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.yb.domain.InpatientDischarge;
-import com.openhis.yb.mapper.InpatientDischargeMapper;
-import com.openhis.yb.service.IInpatientDischargeService;
+import com.healthlink.his.common.constant.YbCommonConstants;
+import com.healthlink.his.yb.domain.InpatientDischarge;
+import com.healthlink.his.yb.mapper.InpatientDischargeMapper;
+import com.healthlink.his.yb.service.IInpatientDischargeService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientFeeDetailServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InpatientFeeDetailServiceImpl.java
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientFeeDetailServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InpatientFeeDetailServiceImpl.java
index dd2a71ae1..ff1790aaa 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientFeeDetailServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InpatientFeeDetailServiceImpl.java
@@ -1,10 +1,10 @@
-package com.openhis.yb.service.impl;
+package com.healthlink.his.yb.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.yb.domain.InpatientFeeDetail;
-import com.openhis.yb.mapper.InpatientFeeDetailMapper;
-import com.openhis.yb.service.IInpatientFeeDetailService;
+import com.healthlink.his.yb.domain.InpatientFeeDetail;
+import com.healthlink.his.yb.mapper.InpatientFeeDetailMapper;
+import com.healthlink.his.yb.service.IInpatientFeeDetailService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientPreSettleServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InpatientPreSettleServiceImpl.java
similarity index 55%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientPreSettleServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InpatientPreSettleServiceImpl.java
index 70c4008c6..a043918cd 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientPreSettleServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InpatientPreSettleServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.yb.service.impl;
+package com.healthlink.his.yb.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.yb.domain.InpatientPreSettle;
-import com.openhis.yb.mapper.InpatientPreSettleMapper;
-import com.openhis.yb.service.IInpatientPreSettleService;
+import com.healthlink.his.yb.domain.InpatientPreSettle;
+import com.healthlink.his.yb.mapper.InpatientPreSettleMapper;
+import com.healthlink.his.yb.service.IInpatientPreSettleService;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientRegInfoUpdateRecordeServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InpatientRegInfoUpdateRecordeServiceImpl.java
similarity index 65%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientRegInfoUpdateRecordeServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InpatientRegInfoUpdateRecordeServiceImpl.java
index b7433cd6e..6fedf7cc8 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientRegInfoUpdateRecordeServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InpatientRegInfoUpdateRecordeServiceImpl.java
@@ -1,12 +1,12 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.service.impl;
+package com.healthlink.his.yb.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.yb.domain.InpatientRegInfoUpdateRecorde;
-import com.openhis.yb.mapper.InpatientRegInfoUpdateRecordeMapper;
-import com.openhis.yb.service.IInpatientRegInfoUpdateRecordeService;
+import com.healthlink.his.yb.domain.InpatientRegInfoUpdateRecorde;
+import com.healthlink.his.yb.mapper.InpatientRegInfoUpdateRecordeMapper;
+import com.healthlink.his.yb.service.IInpatientRegInfoUpdateRecordeService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientRegServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InpatientRegServiceImpl.java
similarity index 85%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientRegServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InpatientRegServiceImpl.java
index a0d9db0c9..93beff7c5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientRegServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InpatientRegServiceImpl.java
@@ -1,14 +1,14 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.service.impl;
+package com.healthlink.his.yb.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.enums.DelFlag;
-import com.openhis.yb.domain.InpatientReg;
-import com.openhis.yb.mapper.InpatientRegMapper;
-import com.openhis.yb.service.IInpatientRegService;
+import com.healthlink.his.yb.domain.InpatientReg;
+import com.healthlink.his.yb.mapper.InpatientRegMapper;
+import com.healthlink.his.yb.service.IInpatientRegService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientSettleServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InpatientSettleServiceImpl.java
similarity index 78%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientSettleServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InpatientSettleServiceImpl.java
index cf89279eb..7c8be3d38 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientSettleServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InpatientSettleServiceImpl.java
@@ -1,12 +1,12 @@
-package com.openhis.yb.service.impl;
+package com.healthlink.his.yb.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.enums.DelFlag;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.yb.domain.InpatientSettle;
-import com.openhis.yb.mapper.InpatientSettleMapper;
-import com.openhis.yb.service.IInpatientSettleService;
+import com.healthlink.his.common.constant.YbCommonConstants;
+import com.healthlink.his.yb.domain.InpatientSettle;
+import com.healthlink.his.yb.mapper.InpatientSettleMapper;
+import com.healthlink.his.yb.service.IInpatientSettleService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryChangeRecordServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InventoryChangeRecordServiceImpl.java
similarity index 62%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryChangeRecordServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InventoryChangeRecordServiceImpl.java
index e4a0a1d5c..f519020b6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryChangeRecordServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InventoryChangeRecordServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.yb.service.impl;
+package com.healthlink.his.yb.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.yb.domain.InventoryChangeRecord;
-import com.openhis.yb.mapper.InventoryChangeRecordMapper;
-import com.openhis.yb.service.IInventoryChangeRecordService;
+import com.healthlink.his.yb.domain.InventoryChangeRecord;
+import com.healthlink.his.yb.mapper.InventoryChangeRecordMapper;
+import com.healthlink.his.yb.service.IInventoryChangeRecordService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryCheckRecordServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InventoryCheckRecordServiceImpl.java
similarity index 61%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryCheckRecordServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InventoryCheckRecordServiceImpl.java
index 7675e9fc8..88d7eb58d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryCheckRecordServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InventoryCheckRecordServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.yb.service.impl;
+package com.healthlink.his.yb.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.yb.domain.InventoryCheckRecord;
-import com.openhis.yb.mapper.InventoryCheckRecordMapper;
-import com.openhis.yb.service.IInventoryCheckRecordService;
+import com.healthlink.his.yb.domain.InventoryCheckRecord;
+import com.healthlink.his.yb.mapper.InventoryCheckRecordMapper;
+import com.healthlink.his.yb.service.IInventoryCheckRecordService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryDelRecordServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InventoryDelRecordServiceImpl.java
similarity index 61%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryDelRecordServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InventoryDelRecordServiceImpl.java
index dd073671b..3e4bf8a33 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryDelRecordServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InventoryDelRecordServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.yb.service.impl;
+package com.healthlink.his.yb.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.yb.domain.InventoryDelRecord;
-import com.openhis.yb.mapper.InventoryDelRecordMapper;
-import com.openhis.yb.service.IInventoryDelRecordService;
+import com.healthlink.his.yb.domain.InventoryDelRecord;
+import com.healthlink.his.yb.mapper.InventoryDelRecordMapper;
+import com.healthlink.his.yb.service.IInventoryDelRecordService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryPurchaseRecordServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InventoryPurchaseRecordServiceImpl.java
similarity index 62%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryPurchaseRecordServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InventoryPurchaseRecordServiceImpl.java
index 01a0857aa..485b228cb 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryPurchaseRecordServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InventoryPurchaseRecordServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.yb.service.impl;
+package com.healthlink.his.yb.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.yb.domain.InventoryPurchaseRecord;
-import com.openhis.yb.mapper.InventoryPurchaseRecordMapper;
-import com.openhis.yb.service.IInventoryPurchaseRecordService;
+import com.healthlink.his.yb.domain.InventoryPurchaseRecord;
+import com.healthlink.his.yb.mapper.InventoryPurchaseRecordMapper;
+import com.healthlink.his.yb.service.IInventoryPurchaseRecordService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryPurchaseReturnRecordServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InventoryPurchaseReturnRecordServiceImpl.java
similarity index 61%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryPurchaseReturnRecordServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InventoryPurchaseReturnRecordServiceImpl.java
index 0d7e4e2f6..eb020d1b6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryPurchaseReturnRecordServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InventoryPurchaseReturnRecordServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.yb.service.impl;
+package com.healthlink.his.yb.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.yb.domain.InventoryPurchaseReturnRecord;
-import com.openhis.yb.mapper.InventoryPurchaseReturnRecordMapper;
-import com.openhis.yb.service.IInventoryPurchaseReturnRecordService;
+import com.healthlink.his.yb.domain.InventoryPurchaseReturnRecord;
+import com.healthlink.his.yb.mapper.InventoryPurchaseReturnRecordMapper;
+import com.healthlink.his.yb.service.IInventoryPurchaseReturnRecordService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventorySaleRecordServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InventorySaleRecordServiceImpl.java
similarity index 61%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventorySaleRecordServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InventorySaleRecordServiceImpl.java
index 4543a96ab..3db26d9e7 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventorySaleRecordServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InventorySaleRecordServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.yb.service.impl;
+package com.healthlink.his.yb.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.yb.domain.InventorySaleRecord;
-import com.openhis.yb.mapper.InventorySaleRecordMapper;
-import com.openhis.yb.service.IInventorySaleRecordService;
+import com.healthlink.his.yb.domain.InventorySaleRecord;
+import com.healthlink.his.yb.mapper.InventorySaleRecordMapper;
+import com.healthlink.his.yb.service.IInventorySaleRecordService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventorySaleReturnRecordServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InventorySaleReturnRecordServiceImpl.java
similarity index 61%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventorySaleReturnRecordServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InventorySaleReturnRecordServiceImpl.java
index 07f9e021a..986be6bf0 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventorySaleReturnRecordServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/InventorySaleReturnRecordServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.yb.service.impl;
+package com.healthlink.his.yb.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.yb.domain.InventorySaleReturnRecord;
-import com.openhis.yb.mapper.InventorySaleReturnRecordMapper;
-import com.openhis.yb.service.IInventorySaleReturnRecordService;
+import com.healthlink.his.yb.domain.InventorySaleReturnRecord;
+import com.healthlink.his.yb.mapper.InventorySaleReturnRecordMapper;
+import com.healthlink.his.yb.service.IInventorySaleReturnRecordService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/PerinfoServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/PerinfoServiceImpl.java
similarity index 89%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/PerinfoServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/PerinfoServiceImpl.java
index 0ee9dbdd5..9ec9cc22f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/PerinfoServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/PerinfoServiceImpl.java
@@ -1,13 +1,13 @@
-package com.openhis.yb.service.impl;
+package com.healthlink.his.yb.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.exception.ServiceException;
 import com.core.common.utils.StringUtils;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.yb.domain.InfoPerson;
-import com.openhis.yb.mapper.PerinfoMapper;
-import com.openhis.yb.service.IPerinfoService;
+import com.healthlink.his.common.constant.YbCommonConstants;
+import com.healthlink.his.yb.domain.InfoPerson;
+import com.healthlink.his.yb.mapper.PerinfoMapper;
+import com.healthlink.his.yb.service.IPerinfoService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/RegServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/RegServiceImpl.java
similarity index 82%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/RegServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/RegServiceImpl.java
index 0fad18089..59e6082ac 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/RegServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/RegServiceImpl.java
@@ -1,10 +1,10 @@
-package com.openhis.yb.service.impl;
+package com.healthlink.his.yb.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.yb.domain.ClinicReg;
-import com.openhis.yb.mapper.RegMapper;
-import com.openhis.yb.service.IRegService;
+import com.healthlink.his.yb.domain.ClinicReg;
+import com.healthlink.his.yb.mapper.RegMapper;
+import com.healthlink.his.yb.service.IRegService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/SignServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/SignServiceImpl.java
similarity index 57%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/SignServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/SignServiceImpl.java
index b0de1aa50..55a110732 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/SignServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/impl/SignServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.yb.service.impl;
+package com.healthlink.his.yb.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.yb.domain.Sign;
-import com.openhis.yb.mapper.SignMapper;
-import com.openhis.yb.service.ISignService;
+import com.healthlink.his.yb.domain.Sign;
+import com.healthlink.his.yb.mapper.SignMapper;
+import com.healthlink.his.yb.service.ISignService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/util/CommonConstant.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/util/CommonConstant.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/util/CommonConstant.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/util/CommonConstant.java
index ffce7919e..fb1df007a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/util/CommonConstant.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/util/CommonConstant.java
@@ -1,4 +1,4 @@
-package com.openhis.yb.util;
+package com.healthlink.his.yb.util;
 
 public interface CommonConstant {
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/util/YbParamBuilderUtil.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/util/YbParamBuilderUtil.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/util/YbParamBuilderUtil.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/util/YbParamBuilderUtil.java
index 28e08b37e..7834867b5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/util/YbParamBuilderUtil.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/yb/util/YbParamBuilderUtil.java
@@ -1,7 +1,7 @@
 /*
  * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
-package com.openhis.yb.util;
+package com.healthlink.his.yb.util;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -14,46 +14,46 @@ import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
 import com.core.system.service.impl.SysUserServiceImpl;
 import com.core.web.util.TenantOptionUtil;
-import com.openhis.administration.domain.*;
-import com.openhis.administration.service.*;
-import com.openhis.clinical.domain.Condition;
-import com.openhis.clinical.domain.ConditionDefinition;
-import com.openhis.clinical.service.IConditionDefinitionService;
-import com.openhis.clinical.service.IConditionService;
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.common.enums.*;
-import com.openhis.common.enums.ybenums.*;
-import com.openhis.financial.domain.Contract;
-import com.openhis.financial.domain.PaymentRecDetail;
-import com.openhis.financial.domain.PaymentReconciliation;
-import com.openhis.financial.model.PaymentedItemModel;
-import com.openhis.financial.service.IContractService;
-import com.openhis.financial.service.IPaymentRecDetailService;
-import com.openhis.financial.service.IPaymentReconciliationService;
-import com.openhis.medication.domain.Medication;
-import com.openhis.medication.domain.MedicationDefinition;
-import com.openhis.medication.domain.MedicationDispense;
-import com.openhis.medication.domain.MedicationRequest;
-import com.openhis.medication.service.IMedicationDefinitionService;
-import com.openhis.medication.service.IMedicationDispenseService;
-import com.openhis.medication.service.IMedicationRequestService;
-import com.openhis.medication.service.IMedicationService;
-import com.openhis.workflow.domain.*;
-import com.openhis.workflow.service.*;
-import com.openhis.workflow.service.impl.InventoryItemServiceImpl;
-import com.openhis.yb.domain.ClinicPreSettle;
-import com.openhis.yb.domain.ClinicReg;
-import com.openhis.yb.domain.ClinicSettle;
-import com.openhis.yb.domain.InfoPerson;
-import com.openhis.yb.dto.*;
-import com.openhis.yb.mapper.MedicalInsuranceMapper;
-import com.openhis.yb.model.Clinic2207OrderParam;
-import com.openhis.yb.service.*;
-import com.openhis.ybcatalog.domain.CatalogDrugInfo;
-import com.openhis.ybcatalog.domain.CatalogMedicalHerbInfo;
-import com.openhis.ybcatalog.service.ICatalogDrugInfoService;
-import com.openhis.ybcatalog.service.ICatalogMedicalHerbInfoService;
+import com.healthlink.his.administration.domain.*;
+import com.healthlink.his.administration.service.*;
+import com.healthlink.his.clinical.domain.Condition;
+import com.healthlink.his.clinical.domain.ConditionDefinition;
+import com.healthlink.his.clinical.service.IConditionDefinitionService;
+import com.healthlink.his.clinical.service.IConditionService;
+import com.healthlink.his.common.constant.CommonConstants;
+import com.healthlink.his.common.constant.YbCommonConstants;
+import com.healthlink.his.common.enums.*;
+import com.healthlink.his.common.enums.ybenums.*;
+import com.healthlink.his.financial.domain.Contract;
+import com.healthlink.his.financial.domain.PaymentRecDetail;
+import com.healthlink.his.financial.domain.PaymentReconciliation;
+import com.healthlink.his.financial.model.PaymentedItemModel;
+import com.healthlink.his.financial.service.IContractService;
+import com.healthlink.his.financial.service.IPaymentRecDetailService;
+import com.healthlink.his.financial.service.IPaymentReconciliationService;
+import com.healthlink.his.medication.domain.Medication;
+import com.healthlink.his.medication.domain.MedicationDefinition;
+import com.healthlink.his.medication.domain.MedicationDispense;
+import com.healthlink.his.medication.domain.MedicationRequest;
+import com.healthlink.his.medication.service.IMedicationDefinitionService;
+import com.healthlink.his.medication.service.IMedicationDispenseService;
+import com.healthlink.his.medication.service.IMedicationRequestService;
+import com.healthlink.his.medication.service.IMedicationService;
+import com.healthlink.his.workflow.domain.*;
+import com.healthlink.his.workflow.service.*;
+import com.healthlink.his.workflow.service.impl.InventoryItemServiceImpl;
+import com.healthlink.his.yb.domain.ClinicPreSettle;
+import com.healthlink.his.yb.domain.ClinicReg;
+import com.healthlink.his.yb.domain.ClinicSettle;
+import com.healthlink.his.yb.domain.InfoPerson;
+import com.healthlink.his.yb.dto.*;
+import com.healthlink.his.yb.mapper.MedicalInsuranceMapper;
+import com.healthlink.his.yb.model.Clinic2207OrderParam;
+import com.healthlink.his.yb.service.*;
+import com.healthlink.his.ybcatalog.domain.CatalogDrugInfo;
+import com.healthlink.his.ybcatalog.domain.CatalogMedicalHerbInfo;
+import com.healthlink.his.ybcatalog.service.ICatalogDrugInfoService;
+import com.healthlink.his.ybcatalog.service.ICatalogMedicalHerbInfoService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogDrugInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogDrugInfo.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogDrugInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogDrugInfo.java
index faf5d67e5..a1bc62968 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogDrugInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogDrugInfo.java
@@ -1,4 +1,4 @@
-package com.openhis.ybcatalog.domain;
+package com.healthlink.his.ybcatalog.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogDrugInfoUsual.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogDrugInfoUsual.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogDrugInfoUsual.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogDrugInfoUsual.java
index a230bc5d6..6b46c8b2e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogDrugInfoUsual.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogDrugInfoUsual.java
@@ -1,4 +1,4 @@
-package com.openhis.ybcatalog.domain;
+package com.healthlink.his.ybcatalog.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalConsumables.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogMedicalConsumables.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalConsumables.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogMedicalConsumables.java
index b8771c8b7..b280c4d75 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalConsumables.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogMedicalConsumables.java
@@ -1,4 +1,4 @@
-package com.openhis.ybcatalog.domain;
+package com.healthlink.his.ybcatalog.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalHerbInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogMedicalHerbInfo.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalHerbInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogMedicalHerbInfo.java
index 114d53323..21f72ca6d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalHerbInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogMedicalHerbInfo.java
@@ -1,4 +1,4 @@
-package com.openhis.ybcatalog.domain;
+package com.healthlink.his.ybcatalog.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogMedicalService.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogMedicalService.java
index a69ae1cc9..2e7283af9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogMedicalService.java
@@ -1,4 +1,4 @@
-package com.openhis.ybcatalog.domain;
+package com.healthlink.his.ybcatalog.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSpecialDisease.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogSpecialDisease.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSpecialDisease.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogSpecialDisease.java
index d1e3bef91..ebe1678de 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSpecialDisease.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogSpecialDisease.java
@@ -1,4 +1,4 @@
-package com.openhis.ybcatalog.domain;
+package com.healthlink.his.ybcatalog.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSpecialInsuranceDisease.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogSpecialInsuranceDisease.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSpecialInsuranceDisease.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogSpecialInsuranceDisease.java
index efeed1f77..e5c870d69 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSpecialInsuranceDisease.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogSpecialInsuranceDisease.java
@@ -1,4 +1,4 @@
-package com.openhis.ybcatalog.domain;
+package com.healthlink.his.ybcatalog.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSurgeryStandardDirectory.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogSurgeryStandardDirectory.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSurgeryStandardDirectory.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogSurgeryStandardDirectory.java
index c84a1c355..52ca805e1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSurgeryStandardDirectory.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogSurgeryStandardDirectory.java
@@ -1,4 +1,4 @@
-package com.openhis.ybcatalog.domain;
+package com.healthlink.his.ybcatalog.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogWesternDisease.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogWesternDisease.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogWesternDisease.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogWesternDisease.java
index 599a9bcb3..6253aecd2 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogWesternDisease.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogWesternDisease.java
@@ -1,4 +1,4 @@
-package com.openhis.ybcatalog.domain;
+package com.healthlink.his.ybcatalog.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogZyDiseaseDiagnosis.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogZyDiseaseDiagnosis.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogZyDiseaseDiagnosis.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogZyDiseaseDiagnosis.java
index ad2b5007a..eb3cc5dd7 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogZyDiseaseDiagnosis.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogZyDiseaseDiagnosis.java
@@ -1,4 +1,4 @@
-package com.openhis.ybcatalog.domain;
+package com.healthlink.his.ybcatalog.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogZySettleUp.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogZySettleUp.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogZySettleUp.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogZySettleUp.java
index ad44e8866..bd3798168 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogZySettleUp.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogZySettleUp.java
@@ -1,4 +1,4 @@
-package com.openhis.ybcatalog.domain;
+package com.healthlink.his.ybcatalog.domain;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogZySyndrome.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogZySyndrome.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogZySyndrome.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogZySyndrome.java
index 8e003f87d..8e7da96be 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogZySyndrome.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/domain/CatalogZySyndrome.java
@@ -1,4 +1,4 @@
-package com.openhis.ybcatalog.domain;
+package com.healthlink.his.ybcatalog.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogDrugInfoMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogDrugInfoMapper.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogDrugInfoMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogDrugInfoMapper.java
index d336c9c33..58e7a0224 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogDrugInfoMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogDrugInfoMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybcatalog.mapper;
+package com.healthlink.his.ybcatalog.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybcatalog.domain.CatalogDrugInfo;
+import com.healthlink.his.ybcatalog.domain.CatalogDrugInfo;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogDrugInfoUsualMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogDrugInfoUsualMapper.java
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogDrugInfoUsualMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogDrugInfoUsualMapper.java
index 1c940d7eb..ad1015ef6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogDrugInfoUsualMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogDrugInfoUsualMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybcatalog.mapper;
+package com.healthlink.his.ybcatalog.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybcatalog.domain.CatalogDrugInfoUsual;
+import com.healthlink.his.ybcatalog.domain.CatalogDrugInfoUsual;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalConsumablesMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogMedicalConsumablesMapper.java
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalConsumablesMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogMedicalConsumablesMapper.java
index 37fe30847..9e0c5e5aa 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalConsumablesMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogMedicalConsumablesMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybcatalog.mapper;
+package com.healthlink.his.ybcatalog.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybcatalog.domain.CatalogMedicalConsumables;
+import com.healthlink.his.ybcatalog.domain.CatalogMedicalConsumables;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalHerbInfoMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogMedicalHerbInfoMapper.java
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalHerbInfoMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogMedicalHerbInfoMapper.java
index ed77d1abe..c52318d64 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalHerbInfoMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogMedicalHerbInfoMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybcatalog.mapper;
+package com.healthlink.his.ybcatalog.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybcatalog.domain.CatalogMedicalHerbInfo;
+import com.healthlink.his.ybcatalog.domain.CatalogMedicalHerbInfo;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalServiceMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogMedicalServiceMapper.java
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalServiceMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogMedicalServiceMapper.java
index e3b017dab..38734633c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalServiceMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogMedicalServiceMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybcatalog.mapper;
+package com.healthlink.his.ybcatalog.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybcatalog.domain.CatalogMedicalService;
+import com.healthlink.his.ybcatalog.domain.CatalogMedicalService;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogSpecialDiseaseMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogSpecialDiseaseMapper.java
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogSpecialDiseaseMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogSpecialDiseaseMapper.java
index 81b31440c..b67cdbaf3 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogSpecialDiseaseMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogSpecialDiseaseMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybcatalog.mapper;
+package com.healthlink.his.ybcatalog.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybcatalog.domain.CatalogSpecialDisease;
+import com.healthlink.his.ybcatalog.domain.CatalogSpecialDisease;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogSpecialInsuranceDiseaseMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogSpecialInsuranceDiseaseMapper.java
similarity index 65%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogSpecialInsuranceDiseaseMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogSpecialInsuranceDiseaseMapper.java
index 8a623d8bb..53e113f14 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogSpecialInsuranceDiseaseMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogSpecialInsuranceDiseaseMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybcatalog.mapper;
+package com.healthlink.his.ybcatalog.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybcatalog.domain.CatalogSpecialInsuranceDisease;
+import com.healthlink.his.ybcatalog.domain.CatalogSpecialInsuranceDisease;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogSurgeryStandardDirectoryMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogSurgeryStandardDirectoryMapper.java
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogSurgeryStandardDirectoryMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogSurgeryStandardDirectoryMapper.java
index 2cf4044f7..c0a9ae59a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogSurgeryStandardDirectoryMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogSurgeryStandardDirectoryMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybcatalog.mapper;
+package com.healthlink.his.ybcatalog.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybcatalog.domain.CatalogSurgeryStandardDirectory;
+import com.healthlink.his.ybcatalog.domain.CatalogSurgeryStandardDirectory;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogWesternDiseaseMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogWesternDiseaseMapper.java
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogWesternDiseaseMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogWesternDiseaseMapper.java
index 31470ace6..680c722a5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogWesternDiseaseMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogWesternDiseaseMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybcatalog.mapper;
+package com.healthlink.his.ybcatalog.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybcatalog.domain.CatalogWesternDisease;
+import com.healthlink.his.ybcatalog.domain.CatalogWesternDisease;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogZyDiseaseDiagnosisMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogZyDiseaseDiagnosisMapper.java
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogZyDiseaseDiagnosisMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogZyDiseaseDiagnosisMapper.java
index 20f460f63..e1183d47a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogZyDiseaseDiagnosisMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogZyDiseaseDiagnosisMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybcatalog.mapper;
+package com.healthlink.his.ybcatalog.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybcatalog.domain.CatalogZyDiseaseDiagnosis;
+import com.healthlink.his.ybcatalog.domain.CatalogZyDiseaseDiagnosis;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogZySyndromeMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogZySyndromeMapper.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogZySyndromeMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogZySyndromeMapper.java
index 5744a1496..55a9ae651 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogZySyndromeMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/mapper/CatalogZySyndromeMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybcatalog.mapper;
+package com.healthlink.his.ybcatalog.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybcatalog.domain.CatalogZySyndrome;
+import com.healthlink.his.ybcatalog.domain.CatalogZySyndrome;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogDrugInfoService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogDrugInfoService.java
similarity index 83%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogDrugInfoService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogDrugInfoService.java
index 667e31b31..6257b6334 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogDrugInfoService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogDrugInfoService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybcatalog.service;
+package com.healthlink.his.ybcatalog.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybcatalog.domain.CatalogDrugInfo;
+import com.healthlink.his.ybcatalog.domain.CatalogDrugInfo;
 
 /**
  * 西药中成药目录Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogDrugInfoUsualService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogDrugInfoUsualService.java
similarity index 83%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogDrugInfoUsualService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogDrugInfoUsualService.java
index 576b659f5..c43f30e92 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogDrugInfoUsualService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogDrugInfoUsualService.java
@@ -1,8 +1,8 @@
-package com.openhis.ybcatalog.service;
+package com.healthlink.his.ybcatalog.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybcatalog.domain.CatalogDrugInfoUsual;
+import com.healthlink.his.ybcatalog.domain.CatalogDrugInfoUsual;
 
 /**
  * 西药中成药目录Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalConsumablesService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogMedicalConsumablesService.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalConsumablesService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogMedicalConsumablesService.java
index 179230b76..b053e4bb4 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalConsumablesService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogMedicalConsumablesService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybcatalog.service;
+package com.healthlink.his.ybcatalog.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybcatalog.domain.CatalogMedicalConsumables;
+import com.healthlink.his.ybcatalog.domain.CatalogMedicalConsumables;
 
 /**
  * 医疗耗材信息Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalHerbInfoService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogMedicalHerbInfoService.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalHerbInfoService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogMedicalHerbInfoService.java
index c81f7e251..7a2f8160d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalHerbInfoService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogMedicalHerbInfoService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybcatalog.service;
+package com.healthlink.his.ybcatalog.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybcatalog.domain.CatalogMedicalHerbInfo;
+import com.healthlink.his.ybcatalog.domain.CatalogMedicalHerbInfo;
 
 /**
  * 中药材信息Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalServiceService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogMedicalServiceService.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalServiceService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogMedicalServiceService.java
index 37fade8e2..6f213ed05 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalServiceService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogMedicalServiceService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybcatalog.service;
+package com.healthlink.his.ybcatalog.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybcatalog.domain.CatalogMedicalService;
+import com.healthlink.his.ybcatalog.domain.CatalogMedicalService;
 
 /**
  * 医疗服务项目Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSpecialDiseaseService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogSpecialDiseaseService.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSpecialDiseaseService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogSpecialDiseaseService.java
index 0e3915759..85f242553 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSpecialDiseaseService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogSpecialDiseaseService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybcatalog.service;
+package com.healthlink.his.ybcatalog.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybcatalog.domain.CatalogSpecialDisease;
+import com.healthlink.his.ybcatalog.domain.CatalogSpecialDisease;
 
 /**
  * 特慢病目录 Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSpecialInsuranceDiseaseService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogSpecialInsuranceDiseaseService.java
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSpecialInsuranceDiseaseService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogSpecialInsuranceDiseaseService.java
index ea0a1eb9c..531236089 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSpecialInsuranceDiseaseService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogSpecialInsuranceDiseaseService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybcatalog.service;
+package com.healthlink.his.ybcatalog.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybcatalog.domain.CatalogSpecialInsuranceDisease;
+import com.healthlink.his.ybcatalog.domain.CatalogSpecialInsuranceDisease;
 
 public interface ICatalogSpecialInsuranceDiseaseService  extends IService<CatalogSpecialInsuranceDisease> {
     CatalogSpecialInsuranceDisease getByYbNo(String medicalCatalogCode, String version);
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSurgeryStandardDirectoryService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogSurgeryStandardDirectoryService.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSurgeryStandardDirectoryService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogSurgeryStandardDirectoryService.java
index 67f412f17..046866028 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSurgeryStandardDirectoryService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogSurgeryStandardDirectoryService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybcatalog.service;
+package com.healthlink.his.ybcatalog.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybcatalog.domain.CatalogSurgeryStandardDirectory;
+import com.healthlink.his.ybcatalog.domain.CatalogSurgeryStandardDirectory;
 
 /**
  * 手术标准目录Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogWesternDiseaseService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogWesternDiseaseService.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogWesternDiseaseService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogWesternDiseaseService.java
index 9cb959b2b..782a0f433 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogWesternDiseaseService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogWesternDiseaseService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybcatalog.service;
+package com.healthlink.his.ybcatalog.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybcatalog.domain.CatalogWesternDisease;
+import com.healthlink.his.ybcatalog.domain.CatalogWesternDisease;
 
 /**
  * 西医疾病诊断信息Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogZyDiseaseDiagnosisService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogZyDiseaseDiagnosisService.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogZyDiseaseDiagnosisService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogZyDiseaseDiagnosisService.java
index 080718481..fb34f4d54 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogZyDiseaseDiagnosisService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogZyDiseaseDiagnosisService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybcatalog.service;
+package com.healthlink.his.ybcatalog.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybcatalog.domain.CatalogZyDiseaseDiagnosis;
+import com.healthlink.his.ybcatalog.domain.CatalogZyDiseaseDiagnosis;
 
 /**
  * 中医疾病诊断Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogZySyndromeService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogZySyndromeService.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogZySyndromeService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogZySyndromeService.java
index 983868954..0e29d268a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogZySyndromeService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/ICatalogZySyndromeService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybcatalog.service;
+package com.healthlink.his.ybcatalog.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybcatalog.domain.CatalogZySyndrome;
+import com.healthlink.his.ybcatalog.domain.CatalogZySyndrome;
 
 /**
  * 【请填写功能名称】Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogDrugInfoServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogDrugInfoServiceImpl.java
similarity index 80%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogDrugInfoServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogDrugInfoServiceImpl.java
index a95d793de..e40ae4bd8 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogDrugInfoServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogDrugInfoServiceImpl.java
@@ -1,11 +1,11 @@
-package com.openhis.ybcatalog.service.impl;
+package com.healthlink.his.ybcatalog.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.ybcatalog.domain.CatalogDrugInfo;
-import com.openhis.ybcatalog.mapper.CatalogDrugInfoMapper;
-import com.openhis.ybcatalog.service.ICatalogDrugInfoService;
+import com.healthlink.his.common.constant.YbCommonConstants;
+import com.healthlink.his.ybcatalog.domain.CatalogDrugInfo;
+import com.healthlink.his.ybcatalog.mapper.CatalogDrugInfoMapper;
+import com.healthlink.his.ybcatalog.service.ICatalogDrugInfoService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogDrugInfoUsualServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogDrugInfoUsualServiceImpl.java
similarity index 82%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogDrugInfoUsualServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogDrugInfoUsualServiceImpl.java
index 37e8d7704..50d0aea2b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogDrugInfoUsualServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogDrugInfoUsualServiceImpl.java
@@ -1,11 +1,11 @@
-package com.openhis.ybcatalog.service.impl;
+package com.healthlink.his.ybcatalog.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.ybcatalog.domain.CatalogDrugInfoUsual;
-import com.openhis.ybcatalog.mapper.CatalogDrugInfoUsualMapper;
-import com.openhis.ybcatalog.service.ICatalogDrugInfoUsualService;
+import com.healthlink.his.ybcatalog.domain.CatalogDrugInfoUsual;
+import com.healthlink.his.ybcatalog.mapper.CatalogDrugInfoUsualMapper;
+import com.healthlink.his.ybcatalog.service.ICatalogDrugInfoUsualService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalConsumablesServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogMedicalConsumablesServiceImpl.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalConsumablesServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogMedicalConsumablesServiceImpl.java
index 8ad9cbfd5..fa98fc25e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalConsumablesServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogMedicalConsumablesServiceImpl.java
@@ -1,11 +1,11 @@
-package com.openhis.ybcatalog.service.impl;
+package com.healthlink.his.ybcatalog.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.ybcatalog.domain.CatalogMedicalConsumables;
-import com.openhis.ybcatalog.mapper.CatalogMedicalConsumablesMapper;
-import com.openhis.ybcatalog.service.ICatalogMedicalConsumablesService;
+import com.healthlink.his.common.constant.YbCommonConstants;
+import com.healthlink.his.ybcatalog.domain.CatalogMedicalConsumables;
+import com.healthlink.his.ybcatalog.mapper.CatalogMedicalConsumablesMapper;
+import com.healthlink.his.ybcatalog.service.ICatalogMedicalConsumablesService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalHerbInfoServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogMedicalHerbInfoServiceImpl.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalHerbInfoServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogMedicalHerbInfoServiceImpl.java
index 1053b2449..2ee5e4462 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalHerbInfoServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogMedicalHerbInfoServiceImpl.java
@@ -1,11 +1,11 @@
-package com.openhis.ybcatalog.service.impl;
+package com.healthlink.his.ybcatalog.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.ybcatalog.domain.CatalogMedicalHerbInfo;
-import com.openhis.ybcatalog.mapper.CatalogMedicalHerbInfoMapper;
-import com.openhis.ybcatalog.service.ICatalogMedicalHerbInfoService;
+import com.healthlink.his.common.constant.YbCommonConstants;
+import com.healthlink.his.ybcatalog.domain.CatalogMedicalHerbInfo;
+import com.healthlink.his.ybcatalog.mapper.CatalogMedicalHerbInfoMapper;
+import com.healthlink.his.ybcatalog.service.ICatalogMedicalHerbInfoService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalServiceServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogMedicalServiceServiceImpl.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalServiceServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogMedicalServiceServiceImpl.java
index a806b0a61..dda1fffe5 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalServiceServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogMedicalServiceServiceImpl.java
@@ -1,11 +1,11 @@
-package com.openhis.ybcatalog.service.impl;
+package com.healthlink.his.ybcatalog.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.ybcatalog.domain.CatalogMedicalService;
-import com.openhis.ybcatalog.mapper.CatalogMedicalServiceMapper;
-import com.openhis.ybcatalog.service.ICatalogMedicalServiceService;
+import com.healthlink.his.common.constant.YbCommonConstants;
+import com.healthlink.his.ybcatalog.domain.CatalogMedicalService;
+import com.healthlink.his.ybcatalog.mapper.CatalogMedicalServiceMapper;
+import com.healthlink.his.ybcatalog.service.ICatalogMedicalServiceService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSpecialDiseaseServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogSpecialDiseaseServiceImpl.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSpecialDiseaseServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogSpecialDiseaseServiceImpl.java
index 7e669902d..3520144e9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSpecialDiseaseServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogSpecialDiseaseServiceImpl.java
@@ -1,11 +1,11 @@
-package com.openhis.ybcatalog.service.impl;
+package com.healthlink.his.ybcatalog.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.ybcatalog.domain.CatalogSpecialDisease;
-import com.openhis.ybcatalog.mapper.CatalogSpecialDiseaseMapper;
-import com.openhis.ybcatalog.service.ICatalogSpecialDiseaseService;
+import com.healthlink.his.common.constant.YbCommonConstants;
+import com.healthlink.his.ybcatalog.domain.CatalogSpecialDisease;
+import com.healthlink.his.ybcatalog.mapper.CatalogSpecialDiseaseMapper;
+import com.healthlink.his.ybcatalog.service.ICatalogSpecialDiseaseService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSpecialInsuranceDiseaseServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogSpecialInsuranceDiseaseServiceImpl.java
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSpecialInsuranceDiseaseServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogSpecialInsuranceDiseaseServiceImpl.java
index 17d8818c6..5e9d0c20c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSpecialInsuranceDiseaseServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogSpecialInsuranceDiseaseServiceImpl.java
@@ -1,11 +1,11 @@
-package com.openhis.ybcatalog.service.impl;
+package com.healthlink.his.ybcatalog.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.ybcatalog.domain.CatalogSpecialInsuranceDisease;
-import com.openhis.ybcatalog.mapper.CatalogSpecialInsuranceDiseaseMapper;
-import com.openhis.ybcatalog.service.ICatalogSpecialInsuranceDiseaseService;
+import com.healthlink.his.common.constant.YbCommonConstants;
+import com.healthlink.his.ybcatalog.domain.CatalogSpecialInsuranceDisease;
+import com.healthlink.his.ybcatalog.mapper.CatalogSpecialInsuranceDiseaseMapper;
+import com.healthlink.his.ybcatalog.service.ICatalogSpecialInsuranceDiseaseService;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSurgeryStandardDirectoryServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogSurgeryStandardDirectoryServiceImpl.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSurgeryStandardDirectoryServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogSurgeryStandardDirectoryServiceImpl.java
index 1ea5ac689..9705e4164 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSurgeryStandardDirectoryServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogSurgeryStandardDirectoryServiceImpl.java
@@ -1,11 +1,11 @@
-package com.openhis.ybcatalog.service.impl;
+package com.healthlink.his.ybcatalog.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.ybcatalog.domain.CatalogSurgeryStandardDirectory;
-import com.openhis.ybcatalog.mapper.CatalogSurgeryStandardDirectoryMapper;
-import com.openhis.ybcatalog.service.ICatalogSurgeryStandardDirectoryService;
+import com.healthlink.his.common.constant.YbCommonConstants;
+import com.healthlink.his.ybcatalog.domain.CatalogSurgeryStandardDirectory;
+import com.healthlink.his.ybcatalog.mapper.CatalogSurgeryStandardDirectoryMapper;
+import com.healthlink.his.ybcatalog.service.ICatalogSurgeryStandardDirectoryService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogWesternDiseaseServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogWesternDiseaseServiceImpl.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogWesternDiseaseServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogWesternDiseaseServiceImpl.java
index eddc97d10..5b81ba511 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogWesternDiseaseServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogWesternDiseaseServiceImpl.java
@@ -1,11 +1,11 @@
-package com.openhis.ybcatalog.service.impl;
+package com.healthlink.his.ybcatalog.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.ybcatalog.domain.CatalogWesternDisease;
-import com.openhis.ybcatalog.mapper.CatalogWesternDiseaseMapper;
-import com.openhis.ybcatalog.service.ICatalogWesternDiseaseService;
+import com.healthlink.his.common.constant.YbCommonConstants;
+import com.healthlink.his.ybcatalog.domain.CatalogWesternDisease;
+import com.healthlink.his.ybcatalog.mapper.CatalogWesternDiseaseMapper;
+import com.healthlink.his.ybcatalog.service.ICatalogWesternDiseaseService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogZyDiseaseDiagnosisServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogZyDiseaseDiagnosisServiceImpl.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogZyDiseaseDiagnosisServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogZyDiseaseDiagnosisServiceImpl.java
index ba8e94a87..d93160ba6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogZyDiseaseDiagnosisServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogZyDiseaseDiagnosisServiceImpl.java
@@ -1,11 +1,11 @@
-package com.openhis.ybcatalog.service.impl;
+package com.healthlink.his.ybcatalog.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.ybcatalog.domain.CatalogZyDiseaseDiagnosis;
-import com.openhis.ybcatalog.mapper.CatalogZyDiseaseDiagnosisMapper;
-import com.openhis.ybcatalog.service.ICatalogZyDiseaseDiagnosisService;
+import com.healthlink.his.common.constant.YbCommonConstants;
+import com.healthlink.his.ybcatalog.domain.CatalogZyDiseaseDiagnosis;
+import com.healthlink.his.ybcatalog.mapper.CatalogZyDiseaseDiagnosisMapper;
+import com.healthlink.his.ybcatalog.service.ICatalogZyDiseaseDiagnosisService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogZySyndromeServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogZySyndromeServiceImpl.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogZySyndromeServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogZySyndromeServiceImpl.java
index 54e5b457d..5377c9b97 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogZySyndromeServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybcatalog/service/impl/CatalogZySyndromeServiceImpl.java
@@ -1,11 +1,11 @@
-package com.openhis.ybcatalog.service.impl;
+package com.healthlink.his.ybcatalog.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.common.constant.YbCommonConstants;
-import com.openhis.ybcatalog.domain.CatalogZySyndrome;
-import com.openhis.ybcatalog.mapper.CatalogZySyndromeMapper;
-import com.openhis.ybcatalog.service.ICatalogZySyndromeService;
+import com.healthlink.his.common.constant.YbCommonConstants;
+import com.healthlink.his.ybcatalog.domain.CatalogZySyndrome;
+import com.healthlink.his.ybcatalog.mapper.CatalogZySyndromeMapper;
+import com.healthlink.his.ybcatalog.service.ICatalogZySyndromeService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultDetail.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepMedresultDetail.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultDetail.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepMedresultDetail.java
index 4bf4d63ea..6fdb4e845 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultDetail.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepMedresultDetail.java
@@ -1,4 +1,4 @@
-package com.openhis.ybelep.domain;
+package com.healthlink.his.ybelep.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepMedresultInfo.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepMedresultInfo.java
index 90f098b36..269863cc8 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepMedresultInfo.java
@@ -1,4 +1,4 @@
-package com.openhis.ybelep.domain;
+package com.healthlink.his.ybelep.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultInput.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepMedresultInput.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultInput.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepMedresultInput.java
index b871c5bf2..299b374a2 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultInput.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepMedresultInput.java
@@ -1,4 +1,4 @@
-package com.openhis.ybelep.domain;
+package com.healthlink.his.ybelep.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerDiagnosisInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepQuerDiagnosisInfo.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerDiagnosisInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepQuerDiagnosisInfo.java
index dc0e7ac32..dba267ecd 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerDiagnosisInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepQuerDiagnosisInfo.java
@@ -1,4 +1,4 @@
-package com.openhis.ybelep.domain;
+package com.healthlink.his.ybelep.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionDetail.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepQuerPrescriptionDetail.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionDetail.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepQuerPrescriptionDetail.java
index b6c376c58..f44755d7e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionDetail.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepQuerPrescriptionDetail.java
@@ -1,4 +1,4 @@
-package com.openhis.ybelep.domain;
+package com.healthlink.his.ybelep.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepQuerPrescriptionInfo.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepQuerPrescriptionInfo.java
index cad588def..e446fbf18 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepQuerPrescriptionInfo.java
@@ -1,4 +1,4 @@
-package com.openhis.ybelep.domain;
+package com.healthlink.his.ybelep.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionInput.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepQuerPrescriptionInput.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionInput.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepQuerPrescriptionInput.java
index 9572d710a..d3e75ad37 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionInput.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepQuerPrescriptionInput.java
@@ -1,4 +1,4 @@
-package com.openhis.ybelep.domain;
+package com.healthlink.his.ybelep.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerVisitInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepQuerVisitInfo.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerVisitInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepQuerVisitInfo.java
index 864a40337..d9ffe1667 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerVisitInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepQuerVisitInfo.java
@@ -1,4 +1,4 @@
-package com.openhis.ybelep.domain;
+package com.healthlink.his.ybelep.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepRevokeInput.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepRevokeInput.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepRevokeInput.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepRevokeInput.java
index c40a59451..8ecbea2ad 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepRevokeInput.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepRevokeInput.java
@@ -1,4 +1,4 @@
-package com.openhis.ybelep.domain;
+package com.healthlink.his.ybelep.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepRevokeOutput.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepRevokeOutput.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepRevokeOutput.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepRevokeOutput.java
index d08418c7b..351240464 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepRevokeOutput.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepRevokeOutput.java
@@ -1,4 +1,4 @@
-package com.openhis.ybelep.domain;
+package com.healthlink.his.ybelep.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepSignatureInput.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepSignatureInput.java
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepSignatureInput.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepSignatureInput.java
index 0aee51912..1796c94ed 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepSignatureInput.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepSignatureInput.java
@@ -1,4 +1,4 @@
-package com.openhis.ybelep.domain;
+package com.healthlink.his.ybelep.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepSignatureOutput.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepSignatureOutput.java
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepSignatureOutput.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepSignatureOutput.java
index 61e734272..9a8c4e912 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepSignatureOutput.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepSignatureOutput.java
@@ -1,4 +1,4 @@
-package com.openhis.ybelep.domain;
+package com.healthlink.his.ybelep.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepUploadInput.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepUploadInput.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepUploadInput.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepUploadInput.java
index f2dd98927..470ccb9f3 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepUploadInput.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepUploadInput.java
@@ -1,4 +1,4 @@
-package com.openhis.ybelep.domain;
+package com.healthlink.his.ybelep.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepUploadOutput.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepUploadOutput.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepUploadOutput.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepUploadOutput.java
index fc7d802c5..a4911fac3 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepUploadOutput.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepUploadOutput.java
@@ -1,4 +1,4 @@
-package com.openhis.ybelep.domain;
+package com.healthlink.his.ybelep.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriDiagnosisInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepVeriDiagnosisInfo.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriDiagnosisInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepVeriDiagnosisInfo.java
index 3580d2144..609def208 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriDiagnosisInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepVeriDiagnosisInfo.java
@@ -1,4 +1,4 @@
-package com.openhis.ybelep.domain;
+package com.healthlink.his.ybelep.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionDetail.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepVeriPrescriptionDetail.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionDetail.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepVeriPrescriptionDetail.java
index a3c4ac9a4..18b23439a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionDetail.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepVeriPrescriptionDetail.java
@@ -1,4 +1,4 @@
-package com.openhis.ybelep.domain;
+package com.healthlink.his.ybelep.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepVeriPrescriptionInfo.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepVeriPrescriptionInfo.java
index 69f501cff..ddedcb6a1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepVeriPrescriptionInfo.java
@@ -1,4 +1,4 @@
-package com.openhis.ybelep.domain;
+package com.healthlink.his.ybelep.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionOutput.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepVeriPrescriptionOutput.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionOutput.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepVeriPrescriptionOutput.java
index 6108377d1..aca84dff8 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionOutput.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepVeriPrescriptionOutput.java
@@ -1,4 +1,4 @@
-package com.openhis.ybelep.domain;
+package com.healthlink.his.ybelep.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriVisitInfo.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepVeriVisitInfo.java
similarity index 99%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriVisitInfo.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepVeriVisitInfo.java
index 5974381b2..41d281b16 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriVisitInfo.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/ElepVeriVisitInfo.java
@@ -1,4 +1,4 @@
-package com.openhis.ybelep.domain;
+package com.healthlink.his.ybelep.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/InformationInquiry.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/InformationInquiry.java
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/InformationInquiry.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/InformationInquiry.java
index b0bb5b597..3a603972d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/InformationInquiry.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/InformationInquiry.java
@@ -1,4 +1,4 @@
-package com.openhis.ybelep.domain;
+package com.healthlink.his.ybelep.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/MedicationResultInquiry.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/MedicationResultInquiry.java
similarity index 95%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/MedicationResultInquiry.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/MedicationResultInquiry.java
index 58f497ff2..e3eb62e1d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/MedicationResultInquiry.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/MedicationResultInquiry.java
@@ -1,4 +1,4 @@
-package com.openhis.ybelep.domain;
+package com.healthlink.his.ybelep.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/PreCheckPrescription.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/PreCheckPrescription.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/PreCheckPrescription.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/PreCheckPrescription.java
index ca719edec..33a5603af 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/PreCheckPrescription.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/PreCheckPrescription.java
@@ -1,4 +1,4 @@
-package com.openhis.ybelep.domain;
+package com.healthlink.his.ybelep.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/QueryPrescription.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/QueryPrescription.java
similarity index 98%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/QueryPrescription.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/QueryPrescription.java
index c905bf3ff..087ec13ad 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/QueryPrescription.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/domain/QueryPrescription.java
@@ -1,4 +1,4 @@
-package com.openhis.ybelep.domain;
+package com.healthlink.his.ybelep.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultDetailMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepMedresultDetailMapper.java
similarity index 77%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultDetailMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepMedresultDetailMapper.java
index 125d55e42..7fd3e45cb 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultDetailMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepMedresultDetailMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.mapper;
+package com.healthlink.his.ybelep.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybelep.domain.ElepMedresultDetail;
+import com.healthlink.his.ybelep.domain.ElepMedresultDetail;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultInfoMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepMedresultInfoMapper.java
similarity index 75%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultInfoMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepMedresultInfoMapper.java
index 20ce4f693..2e2757e8a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultInfoMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepMedresultInfoMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.mapper;
+package com.healthlink.his.ybelep.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybelep.domain.ElepMedresultInfo;
+import com.healthlink.his.ybelep.domain.ElepMedresultInfo;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultInputMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepMedresultInputMapper.java
similarity index 75%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultInputMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepMedresultInputMapper.java
index 480ea55c2..99ce66d27 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultInputMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepMedresultInputMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.mapper;
+package com.healthlink.his.ybelep.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybelep.domain.ElepMedresultInput;
+import com.healthlink.his.ybelep.domain.ElepMedresultInput;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerDiagnosisInfoMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepQuerDiagnosisInfoMapper.java
similarity index 77%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerDiagnosisInfoMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepQuerDiagnosisInfoMapper.java
index 3b449d1d6..2c4ad130e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerDiagnosisInfoMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepQuerDiagnosisInfoMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.mapper;
+package com.healthlink.his.ybelep.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybelep.domain.ElepQuerDiagnosisInfo;
+import com.healthlink.his.ybelep.domain.ElepQuerDiagnosisInfo;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionDetailMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepQuerPrescriptionDetailMapper.java
similarity index 77%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionDetailMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepQuerPrescriptionDetailMapper.java
index b0cc7aca5..5de8137eb 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionDetailMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepQuerPrescriptionDetailMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.mapper;
+package com.healthlink.his.ybelep.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybelep.domain.ElepQuerPrescriptionDetail;
+import com.healthlink.his.ybelep.domain.ElepQuerPrescriptionDetail;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionInfoMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepQuerPrescriptionInfoMapper.java
similarity index 75%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionInfoMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepQuerPrescriptionInfoMapper.java
index a4b43274b..862fbeb64 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionInfoMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepQuerPrescriptionInfoMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.mapper;
+package com.healthlink.his.ybelep.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybelep.domain.ElepQuerPrescriptionInfo;
+import com.healthlink.his.ybelep.domain.ElepQuerPrescriptionInfo;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionInputMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepQuerPrescriptionInputMapper.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionInputMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepQuerPrescriptionInputMapper.java
index d3a1b63cb..e5fb25b4c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionInputMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepQuerPrescriptionInputMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.mapper;
+package com.healthlink.his.ybelep.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybelep.domain.ElepQuerPrescriptionInput;
+import com.healthlink.his.ybelep.domain.ElepQuerPrescriptionInput;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerVisitInfoMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepQuerVisitInfoMapper.java
similarity index 77%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerVisitInfoMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepQuerVisitInfoMapper.java
index ad8dc82f9..b4d73f20a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerVisitInfoMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepQuerVisitInfoMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.mapper;
+package com.healthlink.his.ybelep.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybelep.domain.ElepQuerVisitInfo;
+import com.healthlink.his.ybelep.domain.ElepQuerVisitInfo;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepRevokeInputMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepRevokeInputMapper.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepRevokeInputMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepRevokeInputMapper.java
index 86458778d..ddd0519b8 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepRevokeInputMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepRevokeInputMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.mapper;
+package com.healthlink.his.ybelep.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybelep.domain.ElepRevokeInput;
+import com.healthlink.his.ybelep.domain.ElepRevokeInput;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepRevokeOutputMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepRevokeOutputMapper.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepRevokeOutputMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepRevokeOutputMapper.java
index 2cd3403f2..47ca393d6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepRevokeOutputMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepRevokeOutputMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.mapper;
+package com.healthlink.his.ybelep.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybelep.domain.ElepRevokeOutput;
+import com.healthlink.his.ybelep.domain.ElepRevokeOutput;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepSignatureInputMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepSignatureInputMapper.java
similarity index 75%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepSignatureInputMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepSignatureInputMapper.java
index 8e6745c73..41a3a7e25 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepSignatureInputMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepSignatureInputMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.mapper;
+package com.healthlink.his.ybelep.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybelep.domain.ElepSignatureInput;
+import com.healthlink.his.ybelep.domain.ElepSignatureInput;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepSignatureOutputMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepSignatureOutputMapper.java
similarity index 75%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepSignatureOutputMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepSignatureOutputMapper.java
index e1794f73b..9ea4ae102 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepSignatureOutputMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepSignatureOutputMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.mapper;
+package com.healthlink.his.ybelep.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybelep.domain.ElepSignatureOutput;
+import com.healthlink.his.ybelep.domain.ElepSignatureOutput;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepUploadInputMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepUploadInputMapper.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepUploadInputMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepUploadInputMapper.java
index 5ff7cbe1d..64d631a68 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepUploadInputMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepUploadInputMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.mapper;
+package com.healthlink.his.ybelep.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybelep.domain.ElepUploadInput;
+import com.healthlink.his.ybelep.domain.ElepUploadInput;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepUploadOutputMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepUploadOutputMapper.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepUploadOutputMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepUploadOutputMapper.java
index f860e4360..81adc6e0b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepUploadOutputMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepUploadOutputMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.mapper;
+package com.healthlink.his.ybelep.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybelep.domain.ElepUploadOutput;
+import com.healthlink.his.ybelep.domain.ElepUploadOutput;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriDiagnosisInfoMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepVeriDiagnosisInfoMapper.java
similarity index 77%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriDiagnosisInfoMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepVeriDiagnosisInfoMapper.java
index 840f2bdc1..ef7627a61 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriDiagnosisInfoMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepVeriDiagnosisInfoMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.mapper;
+package com.healthlink.his.ybelep.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybelep.domain.ElepVeriDiagnosisInfo;
+import com.healthlink.his.ybelep.domain.ElepVeriDiagnosisInfo;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionDetailMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepVeriPrescriptionDetailMapper.java
similarity index 77%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionDetailMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepVeriPrescriptionDetailMapper.java
index 7a056fa69..a0dda0ac6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionDetailMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepVeriPrescriptionDetailMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.mapper;
+package com.healthlink.his.ybelep.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybelep.domain.ElepVeriPrescriptionDetail;
+import com.healthlink.his.ybelep.domain.ElepVeriPrescriptionDetail;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionInfoMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepVeriPrescriptionInfoMapper.java
similarity index 75%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionInfoMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepVeriPrescriptionInfoMapper.java
index f856bfdd6..01489e8b2 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionInfoMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepVeriPrescriptionInfoMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.mapper;
+package com.healthlink.his.ybelep.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybelep.domain.ElepVeriPrescriptionInfo;
+import com.healthlink.his.ybelep.domain.ElepVeriPrescriptionInfo;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionOutputMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepVeriPrescriptionOutputMapper.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionOutputMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepVeriPrescriptionOutputMapper.java
index 14f156042..281fdbed7 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionOutputMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepVeriPrescriptionOutputMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.mapper;
+package com.healthlink.his.ybelep.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybelep.domain.ElepVeriPrescriptionOutput;
+import com.healthlink.his.ybelep.domain.ElepVeriPrescriptionOutput;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriVisitInfoMapper.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepVeriVisitInfoMapper.java
similarity index 77%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriVisitInfoMapper.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepVeriVisitInfoMapper.java
index 6bc82bed8..54effd49b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriVisitInfoMapper.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/mapper/ElepVeriVisitInfoMapper.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.mapper;
+package com.healthlink.his.ybelep.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.openhis.ybelep.domain.ElepVeriVisitInfo;
+import com.healthlink.his.ybelep.domain.ElepVeriVisitInfo;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepMedresultDetailService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepMedresultDetailService.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepMedresultDetailService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepMedresultDetailService.java
index a1eebf48d..65c87f978 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepMedresultDetailService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepMedresultDetailService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.service;
+package com.healthlink.his.ybelep.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybelep.domain.ElepMedresultDetail;
+import com.healthlink.his.ybelep.domain.ElepMedresultDetail;
 
 /**
  * 【电子处方取药结果查询-输出（节点标识：seltdelts）】Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepMedresultInfoService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepMedresultInfoService.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepMedresultInfoService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepMedresultInfoService.java
index e6994723c..c217e722e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepMedresultInfoService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepMedresultInfoService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.service;
+package com.healthlink.his.ybelep.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybelep.domain.ElepMedresultInfo;
+import com.healthlink.his.ybelep.domain.ElepMedresultInfo;
 
 /**
  * 【电子处方取药结果查询-输出】Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepMedresultInputService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepMedresultInputService.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepMedresultInputService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepMedresultInputService.java
index 3985b0a7c..fc72bfa2d 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepMedresultInputService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepMedresultInputService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.service;
+package com.healthlink.his.ybelep.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybelep.domain.ElepMedresultInput;
+import com.healthlink.his.ybelep.domain.ElepMedresultInput;
 
 /**
  * 【电子处方取药结果查询-输入】Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerDiagnosisInfoService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepQuerDiagnosisInfoService.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerDiagnosisInfoService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepQuerDiagnosisInfoService.java
index 3a47ee59d..22c126418 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerDiagnosisInfoService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepQuerDiagnosisInfoService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.service;
+package com.healthlink.his.ybelep.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybelep.domain.ElepQuerDiagnosisInfo;
+import com.healthlink.his.ybelep.domain.ElepQuerDiagnosisInfo;
 
 /**
  * 【电子处方信息查询-输出-诊断信息（节点表示： rxDiseList) 】Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerPrescriptionDetailService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepQuerPrescriptionDetailService.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerPrescriptionDetailService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepQuerPrescriptionDetailService.java
index 75b5dab13..43f8e1a4f 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerPrescriptionDetailService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepQuerPrescriptionDetailService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.service;
+package com.healthlink.his.ybelep.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybelep.domain.ElepQuerPrescriptionDetail;
+import com.healthlink.his.ybelep.domain.ElepQuerPrescriptionDetail;
 
 /**
  * 【电子处方信息查询-输出-处方明细信息（节点标识：rxDetlList）】Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerPrescriptionInfoService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepQuerPrescriptionInfoService.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerPrescriptionInfoService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepQuerPrescriptionInfoService.java
index a7f936406..b58c6b568 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerPrescriptionInfoService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepQuerPrescriptionInfoService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.service;
+package com.healthlink.his.ybelep.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybelep.domain.ElepQuerPrescriptionInfo;
+import com.healthlink.his.ybelep.domain.ElepQuerPrescriptionInfo;
 
 /**
  * 【电子处方信息查询-输出-处方信息 】Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerPrescriptionInputService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepQuerPrescriptionInputService.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerPrescriptionInputService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepQuerPrescriptionInputService.java
index f5682adcd..c7e6660dd 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerPrescriptionInputService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepQuerPrescriptionInputService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.service;
+package com.healthlink.his.ybelep.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybelep.domain.ElepQuerPrescriptionInput;
+import com.healthlink.his.ybelep.domain.ElepQuerPrescriptionInput;
 
 /**
  * 【电子处方信息查询-输入】Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerVisitInfoService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepQuerVisitInfoService.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerVisitInfoService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepQuerVisitInfoService.java
index e139469ab..cf836cf19 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepQuerVisitInfoService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepQuerVisitInfoService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.service;
+package com.healthlink.his.ybelep.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybelep.domain.ElepQuerVisitInfo;
+import com.healthlink.his.ybelep.domain.ElepQuerVisitInfo;
 
 /**
  * 【电子处方信息查询-输出-就诊信息（节点标识：rxOtpinfo） 】Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepRevokeInputService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepRevokeInputService.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepRevokeInputService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepRevokeInputService.java
index 61cf14789..ec0fb80c0 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepRevokeInputService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepRevokeInputService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.service;
+package com.healthlink.his.ybelep.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybelep.domain.ElepRevokeInput;
+import com.healthlink.his.ybelep.domain.ElepRevokeInput;
 
 /**
  * 【电子处方撤销-输入】Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepRevokeOutputService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepRevokeOutputService.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepRevokeOutputService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepRevokeOutputService.java
index 5c4d4528e..99281a15e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepRevokeOutputService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepRevokeOutputService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.service;
+package com.healthlink.his.ybelep.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybelep.domain.ElepRevokeOutput;
+import com.healthlink.his.ybelep.domain.ElepRevokeOutput;
 
 /**
  * 【电子处方撤销-输出】Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepSignatureInputService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepSignatureInputService.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepSignatureInputService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepSignatureInputService.java
index b1e241612..e296a126c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepSignatureInputService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepSignatureInputService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.service;
+package com.healthlink.his.ybelep.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybelep.domain.ElepSignatureInput;
+import com.healthlink.his.ybelep.domain.ElepSignatureInput;
 
 /**
  * 【电子处方医保电子签名 -输入】Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepSignatureOutputService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepSignatureOutputService.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepSignatureOutputService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepSignatureOutputService.java
index 22a8a8ca6..fd99fd46a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepSignatureOutputService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepSignatureOutputService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.service;
+package com.healthlink.his.ybelep.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybelep.domain.ElepSignatureOutput;
+import com.healthlink.his.ybelep.domain.ElepSignatureOutput;
 
 /**
  * 【电子处方医保电子签名 -输出】Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepUploadInputService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepUploadInputService.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepUploadInputService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepUploadInputService.java
index 0f9854984..9da2e07bd 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepUploadInputService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepUploadInputService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.service;
+package com.healthlink.his.ybelep.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybelep.domain.ElepUploadInput;
+import com.healthlink.his.ybelep.domain.ElepUploadInput;
 
 /**
  * 【电子处方上传-输入】Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepUploadOutputService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepUploadOutputService.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepUploadOutputService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepUploadOutputService.java
index 4a789dc01..f660373b0 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepUploadOutputService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepUploadOutputService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.service;
+package com.healthlink.his.ybelep.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybelep.domain.ElepUploadOutput;
+import com.healthlink.his.ybelep.domain.ElepUploadOutput;
 
 /**
  * 【电子处方上传-输出】Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriDiagnosisInfoService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepVeriDiagnosisInfoService.java
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriDiagnosisInfoService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepVeriDiagnosisInfoService.java
index 7b2f6fcfb..877b9bd06 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriDiagnosisInfoService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepVeriDiagnosisInfoService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.service;
+package com.healthlink.his.ybelep.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybelep.domain.ElepVeriDiagnosisInfo;
+import com.healthlink.his.ybelep.domain.ElepVeriDiagnosisInfo;
 
 /**
  * 【电子处方上传预核验-输入-诊断信息（节点表示：diseinfo)】Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriPrescriptionDetailService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepVeriPrescriptionDetailService.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriPrescriptionDetailService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepVeriPrescriptionDetailService.java
index bca472bdc..fa82843b9 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriPrescriptionDetailService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepVeriPrescriptionDetailService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.service;
+package com.healthlink.his.ybelep.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybelep.domain.ElepVeriPrescriptionDetail;
+import com.healthlink.his.ybelep.domain.ElepVeriPrescriptionDetail;
 
 /**
  * 【电子处方上传预核验-输入-处方明细信息（节点标识 rxdrugdetail） 】Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriPrescriptionInfoService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepVeriPrescriptionInfoService.java
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriPrescriptionInfoService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepVeriPrescriptionInfoService.java
index e8e69f804..713bfeff6 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriPrescriptionInfoService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepVeriPrescriptionInfoService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.service;
+package com.healthlink.his.ybelep.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybelep.domain.ElepVeriPrescriptionInfo;
+import com.healthlink.his.ybelep.domain.ElepVeriPrescriptionInfo;
 
 /**
  * 【电子处方上传预核验-输入-处方信息】Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriPrescriptionOutputService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepVeriPrescriptionOutputService.java
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriPrescriptionOutputService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepVeriPrescriptionOutputService.java
index 818a12086..4af93ce07 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriPrescriptionOutputService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepVeriPrescriptionOutputService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.service;
+package com.healthlink.his.ybelep.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybelep.domain.ElepVeriPrescriptionOutput;
+import com.healthlink.his.ybelep.domain.ElepVeriPrescriptionOutput;
 
 /**
  * 【电子处方上传预核验-输出】Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriVisitInfoService.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepVeriVisitInfoService.java
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriVisitInfoService.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepVeriVisitInfoService.java
index b8ebd450b..8588e5645 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/IElepVeriVisitInfoService.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/IElepVeriVisitInfoService.java
@@ -1,7 +1,7 @@
-package com.openhis.ybelep.service;
+package com.healthlink.his.ybelep.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.ybelep.domain.ElepVeriVisitInfo;
+import com.healthlink.his.ybelep.domain.ElepVeriVisitInfo;
 
 /**
  * 【电子处方上传预核验-输入-就诊信息（节点标识：mdtrtinfo）】Service接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultDetailServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepMedresultDetailServiceImpl.java
similarity index 63%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultDetailServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepMedresultDetailServiceImpl.java
index d68968684..176ca605e 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultDetailServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepMedresultDetailServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.ybelep.service.impl;
+package com.healthlink.his.ybelep.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.ybelep.domain.ElepMedresultDetail;
-import com.openhis.ybelep.mapper.ElepMedresultDetailMapper;
-import com.openhis.ybelep.service.IElepMedresultDetailService;
+import com.healthlink.his.ybelep.domain.ElepMedresultDetail;
+import com.healthlink.his.ybelep.mapper.ElepMedresultDetailMapper;
+import com.healthlink.his.ybelep.service.IElepMedresultDetailService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultInfoServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepMedresultInfoServiceImpl.java
similarity index 61%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultInfoServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepMedresultInfoServiceImpl.java
index 01d2c7848..c479e1de1 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultInfoServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepMedresultInfoServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.ybelep.service.impl;
+package com.healthlink.his.ybelep.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.ybelep.domain.ElepMedresultInfo;
-import com.openhis.ybelep.mapper.ElepMedresultInfoMapper;
-import com.openhis.ybelep.service.IElepMedresultInfoService;
+import com.healthlink.his.ybelep.domain.ElepMedresultInfo;
+import com.healthlink.his.ybelep.mapper.ElepMedresultInfoMapper;
+import com.healthlink.his.ybelep.service.IElepMedresultInfoService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultInputServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepMedresultInputServiceImpl.java
similarity index 61%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultInputServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepMedresultInputServiceImpl.java
index 8373288aa..5868bfc38 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultInputServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepMedresultInputServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.ybelep.service.impl;
+package com.healthlink.his.ybelep.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.ybelep.domain.ElepMedresultInput;
-import com.openhis.ybelep.mapper.ElepMedresultInputMapper;
-import com.openhis.ybelep.service.IElepMedresultInputService;
+import com.healthlink.his.ybelep.domain.ElepMedresultInput;
+import com.healthlink.his.ybelep.mapper.ElepMedresultInputMapper;
+import com.healthlink.his.ybelep.service.IElepMedresultInputService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerDiagnosisInfoServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepQuerDiagnosisInfoServiceImpl.java
similarity index 63%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerDiagnosisInfoServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepQuerDiagnosisInfoServiceImpl.java
index df5e3d9f6..1a59fedea 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerDiagnosisInfoServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepQuerDiagnosisInfoServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.ybelep.service.impl;
+package com.healthlink.his.ybelep.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.ybelep.domain.ElepQuerDiagnosisInfo;
-import com.openhis.ybelep.mapper.ElepQuerDiagnosisInfoMapper;
-import com.openhis.ybelep.service.IElepQuerDiagnosisInfoService;
+import com.healthlink.his.ybelep.domain.ElepQuerDiagnosisInfo;
+import com.healthlink.his.ybelep.mapper.ElepQuerDiagnosisInfoMapper;
+import com.healthlink.his.ybelep.service.IElepQuerDiagnosisInfoService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionDetailServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepQuerPrescriptionDetailServiceImpl.java
similarity index 63%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionDetailServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepQuerPrescriptionDetailServiceImpl.java
index 33aa78594..584335224 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionDetailServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepQuerPrescriptionDetailServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.ybelep.service.impl;
+package com.healthlink.his.ybelep.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.ybelep.domain.ElepQuerPrescriptionDetail;
-import com.openhis.ybelep.mapper.ElepQuerPrescriptionDetailMapper;
-import com.openhis.ybelep.service.IElepQuerPrescriptionDetailService;
+import com.healthlink.his.ybelep.domain.ElepQuerPrescriptionDetail;
+import com.healthlink.his.ybelep.mapper.ElepQuerPrescriptionDetailMapper;
+import com.healthlink.his.ybelep.service.IElepQuerPrescriptionDetailService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionInfoServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepQuerPrescriptionInfoServiceImpl.java
similarity index 62%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionInfoServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepQuerPrescriptionInfoServiceImpl.java
index 4b2ab2b73..fe114de0c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionInfoServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepQuerPrescriptionInfoServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.ybelep.service.impl;
+package com.healthlink.his.ybelep.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.ybelep.domain.ElepQuerPrescriptionInfo;
-import com.openhis.ybelep.mapper.ElepQuerPrescriptionInfoMapper;
-import com.openhis.ybelep.service.IElepQuerPrescriptionInfoService;
+import com.healthlink.his.ybelep.domain.ElepQuerPrescriptionInfo;
+import com.healthlink.his.ybelep.mapper.ElepQuerPrescriptionInfoMapper;
+import com.healthlink.his.ybelep.service.IElepQuerPrescriptionInfoService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionInputServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepQuerPrescriptionInputServiceImpl.java
similarity index 61%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionInputServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepQuerPrescriptionInputServiceImpl.java
index 650e69fae..172fcb65a 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionInputServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepQuerPrescriptionInputServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.ybelep.service.impl;
+package com.healthlink.his.ybelep.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.ybelep.domain.ElepQuerPrescriptionInput;
-import com.openhis.ybelep.mapper.ElepQuerPrescriptionInputMapper;
-import com.openhis.ybelep.service.IElepQuerPrescriptionInputService;
+import com.healthlink.his.ybelep.domain.ElepQuerPrescriptionInput;
+import com.healthlink.his.ybelep.mapper.ElepQuerPrescriptionInputMapper;
+import com.healthlink.his.ybelep.service.IElepQuerPrescriptionInputService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerVisitInfoServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepQuerVisitInfoServiceImpl.java
similarity index 64%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerVisitInfoServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepQuerVisitInfoServiceImpl.java
index 290194519..254ff095b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerVisitInfoServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepQuerVisitInfoServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.ybelep.service.impl;
+package com.healthlink.his.ybelep.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.ybelep.domain.ElepQuerVisitInfo;
-import com.openhis.ybelep.mapper.ElepQuerVisitInfoMapper;
-import com.openhis.ybelep.service.IElepQuerVisitInfoService;
+import com.healthlink.his.ybelep.domain.ElepQuerVisitInfo;
+import com.healthlink.his.ybelep.mapper.ElepQuerVisitInfoMapper;
+import com.healthlink.his.ybelep.service.IElepQuerVisitInfoService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepRevokeInputServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepRevokeInputServiceImpl.java
similarity index 61%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepRevokeInputServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepRevokeInputServiceImpl.java
index 3614dabce..5c9522847 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepRevokeInputServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepRevokeInputServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.ybelep.service.impl;
+package com.healthlink.his.ybelep.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.ybelep.domain.ElepRevokeInput;
-import com.openhis.ybelep.mapper.ElepRevokeInputMapper;
-import com.openhis.ybelep.service.IElepRevokeInputService;
+import com.healthlink.his.ybelep.domain.ElepRevokeInput;
+import com.healthlink.his.ybelep.mapper.ElepRevokeInputMapper;
+import com.healthlink.his.ybelep.service.IElepRevokeInputService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepRevokeOutputServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepRevokeOutputServiceImpl.java
similarity index 61%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepRevokeOutputServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepRevokeOutputServiceImpl.java
index 6d7b090e5..4e286182b 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepRevokeOutputServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepRevokeOutputServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.ybelep.service.impl;
+package com.healthlink.his.ybelep.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.ybelep.domain.ElepRevokeOutput;
-import com.openhis.ybelep.mapper.ElepRevokeOutputMapper;
-import com.openhis.ybelep.service.IElepRevokeOutputService;
+import com.healthlink.his.ybelep.domain.ElepRevokeOutput;
+import com.healthlink.his.ybelep.mapper.ElepRevokeOutputMapper;
+import com.healthlink.his.ybelep.service.IElepRevokeOutputService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepSignatureInputServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepSignatureInputServiceImpl.java
similarity index 61%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepSignatureInputServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepSignatureInputServiceImpl.java
index 79eb19b98..a9ef4e1a2 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepSignatureInputServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepSignatureInputServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.ybelep.service.impl;
+package com.healthlink.his.ybelep.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.ybelep.domain.ElepSignatureInput;
-import com.openhis.ybelep.mapper.ElepSignatureInputMapper;
-import com.openhis.ybelep.service.IElepSignatureInputService;
+import com.healthlink.his.ybelep.domain.ElepSignatureInput;
+import com.healthlink.his.ybelep.mapper.ElepSignatureInputMapper;
+import com.healthlink.his.ybelep.service.IElepSignatureInputService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepSignatureOutputServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepSignatureOutputServiceImpl.java
similarity index 61%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepSignatureOutputServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepSignatureOutputServiceImpl.java
index c620cdbc5..ed23e13cf 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepSignatureOutputServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepSignatureOutputServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.ybelep.service.impl;
+package com.healthlink.his.ybelep.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.ybelep.domain.ElepSignatureOutput;
-import com.openhis.ybelep.mapper.ElepSignatureOutputMapper;
-import com.openhis.ybelep.service.IElepSignatureOutputService;
+import com.healthlink.his.ybelep.domain.ElepSignatureOutput;
+import com.healthlink.his.ybelep.mapper.ElepSignatureOutputMapper;
+import com.healthlink.his.ybelep.service.IElepSignatureOutputService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepUploadInputServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepUploadInputServiceImpl.java
similarity index 61%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepUploadInputServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepUploadInputServiceImpl.java
index 3347e2487..0b259405c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepUploadInputServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepUploadInputServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.ybelep.service.impl;
+package com.healthlink.his.ybelep.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.ybelep.domain.ElepUploadInput;
-import com.openhis.ybelep.mapper.ElepUploadInputMapper;
-import com.openhis.ybelep.service.IElepUploadInputService;
+import com.healthlink.his.ybelep.domain.ElepUploadInput;
+import com.healthlink.his.ybelep.mapper.ElepUploadInputMapper;
+import com.healthlink.his.ybelep.service.IElepUploadInputService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepUploadOutputServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepUploadOutputServiceImpl.java
similarity index 61%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepUploadOutputServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepUploadOutputServiceImpl.java
index 15a2d6da3..009849f5c 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepUploadOutputServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepUploadOutputServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.ybelep.service.impl;
+package com.healthlink.his.ybelep.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.ybelep.domain.ElepUploadOutput;
-import com.openhis.ybelep.mapper.ElepUploadOutputMapper;
-import com.openhis.ybelep.service.IElepUploadOutputService;
+import com.healthlink.his.ybelep.domain.ElepUploadOutput;
+import com.healthlink.his.ybelep.mapper.ElepUploadOutputMapper;
+import com.healthlink.his.ybelep.service.IElepUploadOutputService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriDiagnosisInfoServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepVeriDiagnosisInfoServiceImpl.java
similarity index 63%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriDiagnosisInfoServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepVeriDiagnosisInfoServiceImpl.java
index d4715fe0b..b91ccd160 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriDiagnosisInfoServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepVeriDiagnosisInfoServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.ybelep.service.impl;
+package com.healthlink.his.ybelep.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.ybelep.domain.ElepVeriDiagnosisInfo;
-import com.openhis.ybelep.mapper.ElepVeriDiagnosisInfoMapper;
-import com.openhis.ybelep.service.IElepVeriDiagnosisInfoService;
+import com.healthlink.his.ybelep.domain.ElepVeriDiagnosisInfo;
+import com.healthlink.his.ybelep.mapper.ElepVeriDiagnosisInfoMapper;
+import com.healthlink.his.ybelep.service.IElepVeriDiagnosisInfoService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionDetailServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepVeriPrescriptionDetailServiceImpl.java
similarity index 64%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionDetailServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepVeriPrescriptionDetailServiceImpl.java
index f707e13ae..98b867c16 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionDetailServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepVeriPrescriptionDetailServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.ybelep.service.impl;
+package com.healthlink.his.ybelep.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.ybelep.domain.ElepVeriPrescriptionDetail;
-import com.openhis.ybelep.mapper.ElepVeriPrescriptionDetailMapper;
-import com.openhis.ybelep.service.IElepVeriPrescriptionDetailService;
+import com.healthlink.his.ybelep.domain.ElepVeriPrescriptionDetail;
+import com.healthlink.his.ybelep.mapper.ElepVeriPrescriptionDetailMapper;
+import com.healthlink.his.ybelep.service.IElepVeriPrescriptionDetailService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionInfoServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepVeriPrescriptionInfoServiceImpl.java
similarity index 62%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionInfoServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepVeriPrescriptionInfoServiceImpl.java
index 33bfe5fc0..7d8588e24 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionInfoServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepVeriPrescriptionInfoServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.ybelep.service.impl;
+package com.healthlink.his.ybelep.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.ybelep.domain.ElepVeriPrescriptionInfo;
-import com.openhis.ybelep.mapper.ElepVeriPrescriptionInfoMapper;
-import com.openhis.ybelep.service.IElepVeriPrescriptionInfoService;
+import com.healthlink.his.ybelep.domain.ElepVeriPrescriptionInfo;
+import com.healthlink.his.ybelep.mapper.ElepVeriPrescriptionInfoMapper;
+import com.healthlink.his.ybelep.service.IElepVeriPrescriptionInfoService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionOutputServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepVeriPrescriptionOutputServiceImpl.java
similarity index 61%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionOutputServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepVeriPrescriptionOutputServiceImpl.java
index 6943a7382..1bc4c9952 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionOutputServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepVeriPrescriptionOutputServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.ybelep.service.impl;
+package com.healthlink.his.ybelep.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.ybelep.domain.ElepVeriPrescriptionOutput;
-import com.openhis.ybelep.mapper.ElepVeriPrescriptionOutputMapper;
-import com.openhis.ybelep.service.IElepVeriPrescriptionOutputService;
+import com.healthlink.his.ybelep.domain.ElepVeriPrescriptionOutput;
+import com.healthlink.his.ybelep.mapper.ElepVeriPrescriptionOutputMapper;
+import com.healthlink.his.ybelep.service.IElepVeriPrescriptionOutputService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriVisitInfoServiceImpl.java b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepVeriVisitInfoServiceImpl.java
similarity index 64%
rename from openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriVisitInfoServiceImpl.java
rename to openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepVeriVisitInfoServiceImpl.java
index b62bc656c..5fac1faa8 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriVisitInfoServiceImpl.java
+++ b/openhis-server-new/healthlink-his-domain/src/main/java/com/healthlink/his/ybelep/service/impl/ElepVeriVisitInfoServiceImpl.java
@@ -1,9 +1,9 @@
-package com.openhis.ybelep.service.impl;
+package com.healthlink.his.ybelep.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.ybelep.domain.ElepVeriVisitInfo;
-import com.openhis.ybelep.mapper.ElepVeriVisitInfoMapper;
-import com.openhis.ybelep.service.IElepVeriVisitInfoService;
+import com.healthlink.his.ybelep.domain.ElepVeriVisitInfo;
+import com.healthlink.his.ybelep.mapper.ElepVeriVisitInfoMapper;
+import com.healthlink.his.ybelep.service.IElepVeriVisitInfoService;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/AccountMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/AccountMapper.xml
new file mode 100755
index 000000000..a0e3aa999
--- /dev/null
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/AccountMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.healthlink.his.administration.mapper.AccountMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/BizUserMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/BizUserMapper.xml
new file mode 100755
index 000000000..26ddeeb6e
--- /dev/null
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/BizUserMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.healthlink.his.administration.mapper.BizUserMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/BizUserRoleMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/BizUserRoleMapper.xml
new file mode 100755
index 000000000..c7b280f46
--- /dev/null
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/BizUserRoleMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.healthlink.his.administration.mapper.BizUserRoleMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChangePriceRecordMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/ChangePriceRecordMapper.xml
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChangePriceRecordMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/ChangePriceRecordMapper.xml
index d75ea2245..e16db521f 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChangePriceRecordMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/ChangePriceRecordMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.ChangePriceRecordMapper">
+<mapper namespace="com.healthlink.his.administration.mapper.ChangePriceRecordMapper">
 
-    <select id="searchMedChangePriceByBusNo" resultType="com.openhis.administration.dto.ChangePriceDataDto">
+    <select id="searchMedChangePriceByBusNo" resultType="com.healthlink.his.administration.dto.ChangePriceDataDto">
         select md.name as itemName,
         record.origin_buying_price as originBuyingPrice,
         record.new_buying_price as newBuyingPrice,
@@ -29,7 +29,7 @@
         record.new_retail_price, record.reason, record.bus_no,record.unit_code,med.total_volume
     </select>
 
-    <select id="searchMedChangePriceByItemId" resultType="com.openhis.administration.dto.ChangePriceDataDto">
+    <select id="searchMedChangePriceByItemId" resultType="com.healthlink.his.administration.dto.ChangePriceDataDto">
         select md.name as itemName,
         record.origin_buying_price as originBuyingPrice,
         record.new_buying_price as newBuyingPrice,
@@ -52,7 +52,7 @@
         record.new_retail_price, record.reason, record.bus_no,record.unit_code,med.total_volume
     </select>
 
-    <select id="searchDeviceChangePriceByBusNo" resultType="com.openhis.administration.dto.ChangePriceDataDto">
+    <select id="searchDeviceChangePriceByBusNo" resultType="com.healthlink.his.administration.dto.ChangePriceDataDto">
         select deivce.name as itemName,
         record.origin_buying_price as originBuyingPrice,
         record.new_buying_price as newBuyingPrice,
@@ -75,7 +75,7 @@
         record.new_retail_price, record.reason, record.bus_no,deivce.size
     </select>
 
-    <select id="searchDeviceChangePriceByItemId" resultType="com.openhis.administration.dto.ChangePriceDataDto">
+    <select id="searchDeviceChangePriceByItemId" resultType="com.healthlink.his.administration.dto.ChangePriceDataDto">
         select deivce.name as itemName,
         record.origin_buying_price as originBuyingPrice,
         record.new_buying_price as newBuyingPrice,
@@ -96,7 +96,7 @@
         record.new_retail_price, record.reason, record.bus_no,deivce.size
     </select>
 
-    <select id="searchActivityChangePriceByBusNo" resultType="com.openhis.administration.dto.ChangePriceDataDto">
+    <select id="searchActivityChangePriceByBusNo" resultType="com.healthlink.his.administration.dto.ChangePriceDataDto">
         select activity.name as itemName,
         record.origin_buying_price as originBuyingPrice,
         record.new_buying_price as newBuyingPrice,
@@ -118,7 +118,7 @@
         record.new_retail_price, record.reason, record.bus_no
     </select>
 
-    <select id="searchActivityChangePriceByItemId" resultType="com.openhis.administration.dto.ChangePriceDataDto">
+    <select id="searchActivityChangePriceByItemId" resultType="com.healthlink.his.administration.dto.ChangePriceDataDto">
         select activity.name as itemName,
         record.origin_buying_price as originBuyingPrice,
         record.new_buying_price as newBuyingPrice,
@@ -138,7 +138,7 @@
         record.new_retail_price, record.reason, record.bus_no
     </select>
 
-    <select id="searchHealthChangePriceByBusNo" resultType="com.openhis.administration.dto.ChangePriceDataDto">
+    <select id="searchHealthChangePriceByBusNo" resultType="com.healthlink.his.administration.dto.ChangePriceDataDto">
         select hearlth.name as itemName,
         org.name as orgName,
         record.origin_buying_price as originBuyingPrice,
@@ -162,7 +162,7 @@
         record.new_retail_price, record.reason, record.bus_no, org.name
     </select>
 
-    <select id="searchHealthChangePriceByItemId" resultType="com.openhis.administration.dto.ChangePriceDataDto">
+    <select id="searchHealthChangePriceByItemId" resultType="com.healthlink.his.administration.dto.ChangePriceDataDto">
         select hearlth.name as itemName,
         org.name as orgName,
         record.origin_buying_price as originBuyingPrice,
@@ -184,7 +184,7 @@
         record.new_retail_price, record.reason, record.bus_no, org.name
     </select>
 
-    <select id="searchChangePriceRecordDataByBusNo" resultType="com.openhis.administration.dto.ChangePriceDataDto">
+    <select id="searchChangePriceRecordDataByBusNo" resultType="com.healthlink.his.administration.dto.ChangePriceDataDto">
         select record.origin_buying_price as originBuyingPrice,
                record.new_buying_price    as newBuyingPrice,
                record.origin_retail_price as originRetailPrice,
@@ -201,7 +201,7 @@
           and cid.status_enum = 2
     </select>
 
-    <select id="searchChangePriceDataGroupByBusNo" resultType="com.openhis.administration.domain.ChangePriceRecord">
+    <select id="searchChangePriceDataGroupByBusNo" resultType="com.healthlink.his.administration.domain.ChangePriceRecord">
         select
             bus_no as busNo,applicant_time as applicantTime,status_enum as statusEnum,item_id as itemId
         from adm_change_price_record where bus_no = #{busNo} group by busNo,applicantTime,statusEnum,item_id
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefDetailAppMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/ChargeItemDefDetailAppMapper.xml
similarity index 64%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefDetailAppMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/ChargeItemDefDetailAppMapper.xml
index 5869030b3..a944cbcf7 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefDetailAppMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/ChargeItemDefDetailAppMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.ChargeItemDefDetailAppMapper">
+<mapper namespace="com.healthlink.his.administration.mapper.ChargeItemDefDetailAppMapper">
 
-    <select id="searchChargeDetailDataByBusNo" resultType="com.openhis.administration.domain.ChargeItemDefDetail">
+    <select id="searchChargeDetailDataByBusNo" resultType="com.healthlink.his.administration.domain.ChargeItemDefDetail">
         select create_time
         from adm_charge_item_def_detail
         where
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefinitionMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/ChargeItemDefinitionMapper.xml
similarity index 76%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefinitionMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/ChargeItemDefinitionMapper.xml
index 0c21cc61d..7090fae4b 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefinitionMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/ChargeItemDefinitionMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.ChargeItemDefinitionMapper">
+<mapper namespace="com.healthlink.his.administration.mapper.ChargeItemDefinitionMapper">
 
-    <select id="getMedPriceByParam" resultType="com.openhis.administration.dto.ChargeItemDefDetailPriceDto">
+    <select id="getMedPriceByParam" resultType="com.healthlink.his.administration.dto.ChargeItemDefDetailPriceDto">
         SELECT cidd.amount as price, mmd.part_percent as partPercent
         from adm_charge_item_definition cid
                  left join adm_charge_item_def_detail cidd on cid.id = cidd.definition_id
@@ -15,7 +15,7 @@
         order by cidd.create_time desc limit 1
     </select>
 
-    <select id="getDevicePriceByParam" resultType="com.openhis.administration.dto.ChargeItemDefDetailPriceDto">
+    <select id="getDevicePriceByParam" resultType="com.healthlink.his.administration.dto.ChargeItemDefDetailPriceDto">
         SELECT cidd.amount as price, device.part_percent as partPercent
         from adm_charge_item_definition cid
                  left join adm_charge_item_def_detail cidd on cid.id = cidd.definition_id
@@ -26,7 +26,7 @@
         order by cidd.create_time desc limit 1
     </select>
 
-    <select id="getProductPrice" resultType="com.openhis.administration.dto.ChargeItemDefDetailPriceDto">
+    <select id="getProductPrice" resultType="com.healthlink.his.administration.dto.ChargeItemDefDetailPriceDto">
         SELECT cid.price as price
         from adm_charge_item_definition cid
         where cid.instance_id = #{instanceId}
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/ChargeItemMapper.xml
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/ChargeItemMapper.xml
index 6752dde59..593e01a4c 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/ChargeItemMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.ChargeItemMapper">
+<mapper namespace="com.healthlink.his.administration.mapper.ChargeItemMapper">
 
-    <select id="getChargeItemBaseInfoByIds" resultType="com.openhis.administration.dto.ChargeItemBaseInfoDto">
+    <select id="getChargeItemBaseInfoByIds" resultType="com.healthlink.his.administration.dto.ChargeItemBaseInfoDto">
         SELECT
         a.id ,
         a.status_enum ,
@@ -119,7 +119,7 @@
             #{item}
         </foreach>
     </select>
-    <select id="getChargeItemDefInfoByIds" resultType="com.openhis.administration.dto.ChargeItemDefInfo">
+    <select id="getChargeItemDefInfoByIds" resultType="com.healthlink.his.administration.dto.ChargeItemDefInfo">
         SELECT
         T1.id,
         T1.status_enum,
@@ -192,7 +192,7 @@
     </select>
 
     <!--  查询费用明细  -->
-    <select id="getCostDetails" resultType="com.openhis.administration.dto.CostDetailDto">
+    <select id="getCostDetails" resultType="com.healthlink.his.administration.dto.CostDetailDto">
         SELECT final_res.charge_name,
                final_res.charge_item_enum,
                final_res.unit_price,
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/DeviceDefinitionMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/DeviceDefinitionMapper.xml
similarity index 89%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/DeviceDefinitionMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/DeviceDefinitionMapper.xml
index 1aed4f8a3..df345de3d 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/DeviceDefinitionMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/DeviceDefinitionMapper.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.DeviceDefinitionMapper">
+<mapper namespace="com.healthlink.his.administration.mapper.DeviceDefinitionMapper">
 
     <!-- 根据关键字查询 如果关键字为空，查询10条，否则返回查询到的所有 -->
-    <select id="searchDeviceListByKeyWord" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
+    <select id="searchDeviceListByKeyWord" resultType="com.healthlink.his.medication.dto.AdjustPriceMedListDto">
         select df.id as targetId, df.name as name, df.size as volume, details.amount as
         originRetailPrice,def_details.amount as originBuyingPrice,df.bus_no as busNo,df.min_unit_code as unitCode
         from adm_device_definition df
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/DeviceMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/DeviceMapper.xml
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/DeviceMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/DeviceMapper.xml
index 21d1ea1e5..d70ed467a 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/DeviceMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/DeviceMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.DeviceMapper">
+<mapper namespace="com.healthlink.his.administration.mapper.DeviceMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterDiagnosisMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/EncounterDiagnosisMapper.xml
similarity index 84%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterDiagnosisMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/EncounterDiagnosisMapper.xml
index a297876df..46d8a6abe 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterDiagnosisMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/EncounterDiagnosisMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.EncounterDiagnosisMapper">
+<mapper namespace="com.healthlink.his.administration.mapper.EncounterDiagnosisMapper">
 
     <delete id="deleteByEncounterId">
         DELETE
@@ -18,7 +18,7 @@
           AND tcm_flag = 0
     </delete>
     <select id="getEncounterDiagnosisByEncounterConDefId"
-            resultType="com.openhis.administration.domain.EncounterDiagnosis">
+            resultType="com.healthlink.his.administration.domain.EncounterDiagnosis">
         SELECT *
         FROM adm_encounter_diagnosis T1
                  INNER JOIN cli_condition T2 ON T1.condition_id = T2.id
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterLocationMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/EncounterLocationMapper.xml
similarity index 76%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterLocationMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/EncounterLocationMapper.xml
index 789f47918..2ce0003ea 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterLocationMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/EncounterLocationMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.EncounterLocationMapper">
+<mapper namespace="com.healthlink.his.administration.mapper.EncounterLocationMapper">
 
-    <select id="searchEncounterDataByLocationId" resultType="com.openhis.administration.dto.PatientBedInfoDto">
+    <select id="searchEncounterDataByLocationId" resultType="com.healthlink.his.administration.dto.PatientBedInfoDto">
         select encounter_id as encounterId , location_id as bedLocationId
         from adm_encounter_location where location_id = #{locationId} and status_enum = #{statusEnum} and form_enum = #{formEnum}
     </select>
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/EncounterMapper.xml
similarity index 83%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/EncounterMapper.xml
index 73972682d..307157f80 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/EncounterMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.EncounterMapper">
+<mapper namespace="com.healthlink.his.administration.mapper.EncounterMapper">
 
-    <select id="getEncounterInfoByTime" resultType="com.openhis.administration.dto.EncounterAccountDto">
+    <select id="getEncounterInfoByTime" resultType="com.healthlink.his.administration.dto.EncounterAccountDto">
         SELECT T1.ID,
                T1.patient_id,
                T1.group_id,
@@ -50,7 +50,7 @@
               #{endDate};
     </select>
 
-    <select id="searchEncounterDataByIds" resultType="com.openhis.administration.dto.EncounterDataDto">
+    <select id="searchEncounterDataByIds" resultType="com.healthlink.his.administration.dto.EncounterDataDto">
         select * from adm_encounter
          where  (class_enum = #{imp} or class_enum = #{amb}) and status_enum = #{encounterStatus}
             and id in
@@ -58,7 +58,7 @@
             #{item}
         </foreach>
     </select>
-    <select id="getPatientIdByParam" resultType="com.openhis.administration.dto.EncounterDataDto">
+    <select id="getPatientIdByParam" resultType="com.healthlink.his.administration.dto.EncounterDataDto">
         select patient_id as patientId,id as encounterId
                from adm_encounter encounter where id = #{encounterId} and class_enum = #{classEnum}
     </select>
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterParticipantMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/EncounterParticipantMapper.xml
similarity index 66%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterParticipantMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/EncounterParticipantMapper.xml
index 89384df4e..426fa7b25 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterParticipantMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/EncounterParticipantMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.EncounterParticipantMapper">
+<mapper namespace="com.healthlink.his.administration.mapper.EncounterParticipantMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterReasonMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/EncounterReasonMapper.xml
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterReasonMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/EncounterReasonMapper.xml
index c2b79a3aa..750433b63 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterReasonMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/EncounterReasonMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.EncounterReasonMapper">
+<mapper namespace="com.healthlink.his.administration.mapper.EncounterReasonMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/FrequencyMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/FrequencyMapper.xml
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/FrequencyMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/FrequencyMapper.xml
index 9b7345f39..04ce61134 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/FrequencyMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/FrequencyMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.FrequencyMapper">
+<mapper namespace="com.healthlink.his.administration.mapper.FrequencyMapper">
 
-    <resultMap id="BaseResultMap" type="com.openhis.administration.domain.Frequency">
+    <resultMap id="BaseResultMap" type="com.healthlink.his.administration.domain.Frequency">
             <id property="id" column="id" jdbcType="BIGINT"/>
             <result property="rateCode" column="rate_code" jdbcType="VARCHAR"/>
             <result property="name" column="name" jdbcType="VARCHAR"/>
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/HealthcareServiceMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/HealthcareServiceMapper.xml
similarity index 78%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/HealthcareServiceMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/HealthcareServiceMapper.xml
index b31d58899..363e4b7f7 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/HealthcareServiceMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/HealthcareServiceMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.HealthcareServiceMapper">
+<mapper namespace="com.healthlink.his.administration.mapper.HealthcareServiceMapper">
 
-    <select id="searchHealthByIds" resultType="com.openhis.administration.dto.HealthcareDto">
+    <select id="searchHealthByIds" resultType="com.healthlink.his.administration.dto.HealthcareDto">
         <!-- 根据项目id数组 加载挂号集合 -->
         SELECT
         health.id as itemId,
@@ -17,7 +17,7 @@
         </foreach>
     </select>
     <!-- 查询所有 挂号数据 -->
-    <select id="searchAllHeathData" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
+    <select id="searchAllHeathData" resultType="com.healthlink.his.medication.dto.AdjustPriceMedListDto">
         SELECT heal.id AS targetId,heal.name AS name,cid.price AS originRetailPrice,org.name as orgName
         FROM public.adm_healthcare_service heal
                  INNER JOIN adm_charge_item_definition cid ON heal.id = cid.instance_id
diff --git a/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/InstrumentMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/InstrumentMapper.xml
new file mode 100755
index 000000000..91de47315
--- /dev/null
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/InstrumentMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.healthlink.his.administration.mapper.InstrumentMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/InvoiceMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/InvoiceMapper.xml
new file mode 100755
index 000000000..d4d16f3ff
--- /dev/null
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/InvoiceMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.healthlink.his.administration.mapper.InvoiceMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/LocationMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/LocationMapper.xml
similarity index 84%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/LocationMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/LocationMapper.xml
index 4bd3bed77..881a244f0 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/LocationMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/LocationMapper.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.LocationMapper">
+<mapper namespace="com.healthlink.his.administration.mapper.LocationMapper">
 
     <!-- 根据区域id数组查询 区域表 -->
-    <select id="searchLocationDataByIds" resultType="com.openhis.administration.dto.LocationDataDto">
+    <select id="searchLocationDataByIds" resultType="com.healthlink.his.administration.dto.LocationDataDto">
         select id               as locationId,
                bus_no           as busNo,
                name             as areaName,
@@ -21,7 +21,7 @@
     </select>
 
     <!-- 根据区域id数组查询 区域表 -->
-    <select id="searchLocationDataByBusNo" resultType="com.openhis.administration.dto.PatientBedInfoDto">
+    <select id="searchLocationDataByBusNo" resultType="com.healthlink.his.administration.dto.PatientBedInfoDto">
         select id               as bedLocationId,
                bus_no           as busNo,
                name             as bedName,
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ObservationDefinitionMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/ObservationDefinitionMapper.xml
similarity index 65%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ObservationDefinitionMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/ObservationDefinitionMapper.xml
index 06ef4df64..1449cb9a2 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ObservationDefinitionMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/ObservationDefinitionMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.ObservationDefinitionMapper">
+<mapper namespace="com.healthlink.his.administration.mapper.ObservationDefinitionMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/OrgContrastMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/OrgContrastMapper.xml
new file mode 100755
index 000000000..175a8e925
--- /dev/null
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/OrgContrastMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.healthlink.his.administration.mapper.OrgContrastMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/OrganizationLocationMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/OrganizationLocationMapper.xml
similarity index 66%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/OrganizationLocationMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/OrganizationLocationMapper.xml
index bb2486cac..6755a5d95 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/OrganizationLocationMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/OrganizationLocationMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.OrganizationLocationMapper">
+<mapper namespace="com.healthlink.his.administration.mapper.OrganizationLocationMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/OrganizationMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/OrganizationMapper.xml
similarity index 89%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/OrganizationMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/OrganizationMapper.xml
index 2c68408bd..bc5a66c80 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/OrganizationMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/OrganizationMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.OrganizationMapper">
+<mapper namespace="com.healthlink.his.administration.mapper.OrganizationMapper">
 
-    <select id="searchOrgDataByHealth" resultType="com.openhis.administration.dto.OrgDataDto">
+    <select id="searchOrgDataByHealth" resultType="com.healthlink.his.administration.dto.OrgDataDto">
         SELECT org.id AS orgId, org.name AS orgName
         FROM adm_organization AS org
         WHERE id IN
@@ -15,7 +15,7 @@
     </select>
 
     <!-- 分页查询挂号科室列表，关联租户表获取租户名称 -->
-    <select id="selectRegisterOrganizationsWithTenant" resultType="com.openhis.administration.domain.Organization">
+    <select id="selectRegisterOrganizationsWithTenant" resultType="com.healthlink.his.administration.domain.Organization">
         SELECT
             org.id,
             org.bus_no,
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PatientIdentifierMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/PatientIdentifierMapper.xml
similarity index 66%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PatientIdentifierMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/PatientIdentifierMapper.xml
index c44f9e432..ec91a65db 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PatientIdentifierMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/PatientIdentifierMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.PatientIdentifierMapper">
+<mapper namespace="com.healthlink.his.administration.mapper.PatientIdentifierMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PatientMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/PatientMapper.xml
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PatientMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/PatientMapper.xml
index ef6fec890..db64b2fc6 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PatientMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/PatientMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.PatientMapper">
+<mapper namespace="com.healthlink.his.administration.mapper.PatientMapper">
 
-    <select id="searchPatientDataByPatientId" resultType="com.openhis.administration.dto.PatientDataDto">
+    <select id="searchPatientDataByPatientId" resultType="com.healthlink.his.administration.dto.PatientDataDto">
         select id as patientId,name as patientName,gender_enum as gender,id_card as idCard from adm_patient
             where delete_flag = '0' and id = #{patientId} and active_flag = #{activeFlag}
     </select>
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PatientStudentMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/PatientStudentMapper.xml
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PatientStudentMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/PatientStudentMapper.xml
index ef22ba844..e1f6a814e 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PatientStudentMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/PatientStudentMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.PatientStudentMapper">
+<mapper namespace="com.healthlink.his.administration.mapper.PatientStudentMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PractitionerMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/PractitionerMapper.xml
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PractitionerMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/PractitionerMapper.xml
index 0c05f8a3f..086e4efd5 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PractitionerMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/PractitionerMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.PractitionerMapper">
+<mapper namespace="com.healthlink.his.administration.mapper.PractitionerMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PractitionerPatientMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/PractitionerPatientMapper.xml
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PractitionerPatientMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/PractitionerPatientMapper.xml
index 355b5099f..0bfe8d238 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PractitionerPatientMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/PractitionerPatientMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.PractitionerPatientMapper">
+<mapper namespace="com.healthlink.his.administration.mapper.PractitionerPatientMapper">
 
-    <resultMap type="com.openhis.administration.domain.PractitionerPatient" id="PractitionerPatientResult">
+    <resultMap type="com.healthlink.his.administration.domain.PractitionerPatient" id="PractitionerPatientResult">
         <result property="id" column="id" />
         <result property="practitionerId" column="practitioner_id" />
         <result property="patientId" column="patient_id" />
@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from adm_practitioner_patient
     </sql>
 
-    <select id="selectPractitionerPatientList" parameterType="com.openhis.administration.domain.PractitionerPatient" resultMap="PractitionerPatientResult">
+    <select id="selectPractitionerPatientList" parameterType="com.healthlink.his.administration.domain.PractitionerPatient" resultMap="PractitionerPatientResult">
         <include refid="selectPractitionerPatientVo"/>
         <where>
             delete_flag = '0'
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PractitionerRoleMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/PractitionerRoleMapper.xml
similarity index 91%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PractitionerRoleMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/PractitionerRoleMapper.xml
index 928b61a03..205ca8d00 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PractitionerRoleMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/PractitionerRoleMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.PractitionerRoleMapper">
+<mapper namespace="com.healthlink.his.administration.mapper.PractitionerRoleMapper">
     <!-- 根据员工ID 查询权限数据集 -->
-    <select id="searchPractitionerRoleByPractitionerId" resultType="com.openhis.administration.dto.RoleDataDto">
+    <select id="searchPractitionerRoleByPractitionerId" resultType="com.healthlink.his.administration.dto.RoleDataDto">
         select id as roleId,org_id as orgId,location_id as locationId,specialty_enum as specialtyEnum,type_code as
         typeCode
         from adm_practitioner_role
@@ -19,7 +19,7 @@
     </select>
 
     <!-- 根据员工ID数组 查询权限数据集 -->
-    <select id="searchPractitionerRoleByPractitionerIds" resultType="com.openhis.administration.dto.RoleDataDto">
+    <select id="searchPractitionerRoleByPractitionerIds" resultType="com.healthlink.his.administration.dto.RoleDataDto">
         select id as roleId,org_id as orgId,location_id as locationId,specialty_enum as specialtyEnum,type_code as
         typeCode
         from adm_practitioner_role
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ScheduleSlotMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/ScheduleSlotMapper.xml
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ScheduleSlotMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/ScheduleSlotMapper.xml
index 8deea84ab..393207c15 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ScheduleSlotMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/ScheduleSlotMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.appointmentmanage.mapper.ScheduleSlotMapper">
+<mapper namespace="com.healthlink.his.appointmentmanage.mapper.ScheduleSlotMapper">
 
     <!--
       统一状态值映射: DB 数值 → 规范化输出
@@ -43,7 +43,7 @@
     </sql>
 
     <!-- 注意这里的 resultType 指向了您刚建好的 DTO 实体类 -->
-    <select id="selectAllTicketSlots" resultType="com.openhis.appointmentmanage.domain.TicketSlotDTO">
+    <select id="selectAllTicketSlots" resultType="com.healthlink.his.appointmentmanage.domain.TicketSlotDTO">
         SELECT
             s.id AS slotId,
             s.seq_no AS seqNo,
@@ -93,7 +93,7 @@
             s.seq_no ASC
     </select>
 
-    <select id="selectTicketSlotById" resultType="com.openhis.appointmentmanage.domain.TicketSlotDTO">
+    <select id="selectTicketSlotById" resultType="com.healthlink.his.appointmentmanage.domain.TicketSlotDTO">
         SELECT
             s.id AS slotId,
             s.seq_no AS seqNo,
@@ -212,7 +212,7 @@
             AND delete_flag = '0'
     </update>
 
-    <select id="selectTicketSlotsPage" resultType="com.openhis.appointmentmanage.domain.TicketSlotDTO">
+    <select id="selectTicketSlotsPage" resultType="com.healthlink.his.appointmentmanage.domain.TicketSlotDTO">
         SELECT
             s.id AS slotId,
             s.seq_no AS seqNo,
@@ -371,7 +371,7 @@
             s.seq_no ASC
     </select>
 
-    <select id="selectDoctorAvailabilitySummary" resultType="com.openhis.appointmentmanage.domain.DoctorAvailabilityDTO">
+    <select id="selectDoctorAvailabilitySummary" resultType="com.healthlink.his.appointmentmanage.domain.DoctorAvailabilityDTO">
         SELECT
             p.doctor_id AS doctorId,
             p.doctor_name AS doctorName,
@@ -447,7 +447,7 @@
             p.doctor_name ASC
     </select>
 
-    <select id="selectSeqNoBySlotIds" resultType="com.openhis.appointmentmanage.domain.ScheduleSlot">
+    <select id="selectSeqNoBySlotIds" resultType="com.healthlink.his.appointmentmanage.domain.ScheduleSlot">
         SELECT id, seq_no
         FROM adm_schedule_slot
         WHERE id IN
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/SpecimenDefinitionMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/SpecimenDefinitionMapper.xml
similarity index 66%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/SpecimenDefinitionMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/SpecimenDefinitionMapper.xml
index f3773627a..9634da3aa 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/SpecimenDefinitionMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/SpecimenDefinitionMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.SpecimenDefinitionMapper">
+<mapper namespace="com.healthlink.his.administration.mapper.SpecimenDefinitionMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/SupplierMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/SupplierMapper.xml
new file mode 100755
index 000000000..0cb821265
--- /dev/null
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/SupplierMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.healthlink.his.administration.mapper.SupplierMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/TraceNoManageMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/TraceNoManageMapper.xml
similarity index 87%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/TraceNoManageMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/TraceNoManageMapper.xml
index dd4150549..927bde9f5 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/TraceNoManageMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/administration/TraceNoManageMapper.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.TraceNoManageMapper">
-    <select id="getItemTraceNoInfo" resultType="com.openhis.administration.domain.TraceNoManage">
+<mapper namespace="com.healthlink.his.administration.mapper.TraceNoManageMapper">
+    <select id="getItemTraceNoInfo" resultType="com.healthlink.his.administration.domain.TraceNoManage">
         SELECT item_table,
                item_id,
                location_id,
@@ -34,7 +34,7 @@
                  trace_no
     </select>
 
-    <select id="tracePatient" resultType="com.openhis.administration.dto.TracePatientInfoDto">
+    <select id="tracePatient" resultType="com.healthlink.his.administration.dto.TracePatientInfoDto">
         SELECT T2.name,
                T2.gender_enum,
                T2.birth_date,
diff --git a/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/AllergyIntoleranceMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/AllergyIntoleranceMapper.xml
new file mode 100755
index 000000000..624fa6920
--- /dev/null
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/AllergyIntoleranceMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.healthlink.his.clinical.mapper.AllergyIntoleranceMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ConditionDefinitionMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/ConditionDefinitionMapper.xml
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ConditionDefinitionMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/ConditionDefinitionMapper.xml
index 6508bf6a0..cd6abcfbf 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ConditionDefinitionMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/ConditionDefinitionMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.clinical.mapper.ConditionDefinitionMapper">
+<mapper namespace="com.healthlink.his.clinical.mapper.ConditionDefinitionMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ConditionMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/ConditionMapper.xml
similarity index 89%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ConditionMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/ConditionMapper.xml
index 86170ce00..edf16933d 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ConditionMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/ConditionMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.clinical.mapper.ConditionMapper">
+<mapper namespace="com.healthlink.his.clinical.mapper.ConditionMapper">
 
     <delete id="deleteByEncounterId">
         DELETE
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ConditionNoDefinitionMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/ConditionNoDefinitionMapper.xml
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ConditionNoDefinitionMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/ConditionNoDefinitionMapper.xml
index eed9436dc..7799e9171 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ConditionNoDefinitionMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/ConditionNoDefinitionMapper.xml
@@ -3,6 +3,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.clinical.mapper.ConditionNoDefinitionMapper">
+<mapper namespace="com.healthlink.his.clinical.mapper.ConditionNoDefinitionMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/DiagnosisBelongBindingMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/DiagnosisBelongBindingMapper.xml
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/DiagnosisBelongBindingMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/DiagnosisBelongBindingMapper.xml
index 5cbf85ddb..2e184f55b 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/DiagnosisBelongBindingMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/DiagnosisBelongBindingMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.clinical.mapper.DiagnosisBelongBindingMapper">
+<mapper namespace="com.healthlink.his.clinical.mapper.DiagnosisBelongBindingMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/OrderMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/OrderMapper.xml
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/OrderMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/OrderMapper.xml
index 0f489868c..2e4f98b0d 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/OrderMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/OrderMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.clinical.mapper.OrderMapper">
+<mapper namespace="com.healthlink.his.clinical.mapper.OrderMapper">
 
-    <resultMap type="com.openhis.clinical.domain.Order" id="OrderResult">
+    <resultMap type="com.healthlink.his.clinical.domain.Order" id="OrderResult">
         <id property="id" column="id"/>
         <result property="orderNo" column="order_no"/>
         <result property="patientId" column="patient_id"/>
@@ -129,7 +129,7 @@
         select * from order_main where slot_id = #{slotId} and status = 1
     </select>
 
-    <insert id="insertOrder" parameterType="com.openhis.clinical.domain.Order" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertOrder" parameterType="com.healthlink.his.clinical.domain.Order" useGeneratedKeys="true" keyProperty="id">
         insert into order_main
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="orderNo != null and orderNo != ''">order_no,</if>
@@ -189,7 +189,7 @@
         </trim>
     </insert>
 
-    <update id="updateOrder" parameterType="com.openhis.clinical.domain.Order">
+    <update id="updateOrder" parameterType="com.healthlink.his.clinical.domain.Order">
         update order_main
         <trim prefix="set" suffixOverrides=",">
             <if test="orderNo != null and orderNo != ''">order_no = #{orderNo},</if>
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepSignatureInputMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/ProcedureMapper.xml
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepSignatureInputMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/ProcedureMapper.xml
index 94d33873b..811eae23b 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepSignatureInputMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/ProcedureMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybelep.mapper.ElepSignatureInputMapper">
+<mapper namespace="com.healthlink.his.clinical.mapper.ProcedureMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ProcedurePerformerMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/ProcedurePerformerMapper.xml
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ProcedurePerformerMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/ProcedurePerformerMapper.xml
index 5b7f4dde7..96baff9d6 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ProcedurePerformerMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/ProcedurePerformerMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.clinical.mapper.ProcedurePerformerMapper">
+<mapper namespace="com.healthlink.his.clinical.mapper.ProcedurePerformerMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ReservationRecordMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/ReservationRecordMapper.xml
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ReservationRecordMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/ReservationRecordMapper.xml
index e663bd76a..01e882c63 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ReservationRecordMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/ReservationRecordMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.clinical.mapper.ReservationRecordMapper">
+<mapper namespace="com.healthlink.his.clinical.mapper.ReservationRecordMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/TicketMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/TicketMapper.xml
similarity index 96%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/TicketMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/TicketMapper.xml
index 3962e573d..4060ab1ed 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/TicketMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/clinical/TicketMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.clinical.mapper.TicketMapper">
+<mapper namespace="com.healthlink.his.clinical.mapper.TicketMapper">
 
-    <resultMap type="com.openhis.clinical.domain.Ticket" id="TicketResult">
+    <resultMap type="com.healthlink.his.clinical.domain.Ticket" id="TicketResult">
         <id property="id" column="id"/>
         <result property="busNo" column="bus_no"/>
         <result property="department" column="department"/>
@@ -27,7 +27,7 @@
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
-    <select id="selectTicketList" parameterType="com.openhis.clinical.domain.Ticket" resultMap="TicketResult">
+    <select id="selectTicketList" parameterType="com.healthlink.his.clinical.domain.Ticket" resultMap="TicketResult">
         select * from clinical_ticket
         <where>
             <!-- 逻辑删除条件 -->
@@ -140,7 +140,7 @@
         select * from clinical_ticket where id = #{id} and delete_flag = '0'
     </select>
 
-    <insert id="insertTicket" parameterType="com.openhis.clinical.domain.Ticket">
+    <insert id="insertTicket" parameterType="com.healthlink.his.clinical.domain.Ticket">
         insert into clinical_ticket
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="busNo != null and busNo != ''">bus_no,</if>
@@ -186,7 +186,7 @@
         </trim>
     </insert>
 
-    <update id="updateTicket" parameterType="com.openhis.clinical.domain.Ticket">
+    <update id="updateTicket" parameterType="com.healthlink.his.clinical.domain.Ticket">
         update clinical_ticket
         <trim prefix="set" suffixOverrides=",">
             <if test="busNo != null and busNo != ''">bus_no = #{busNo},</if>
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocDefinitionMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/DocDefinitionMapper.xml
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocDefinitionMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/DocDefinitionMapper.xml
index c2b427fe8..e19c3b45a 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocDefinitionMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/DocDefinitionMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.document.mapper.DocDefinitionMapper">
+<mapper namespace="com.healthlink.his.document.mapper.DocDefinitionMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocDefinitionOrganizationMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/DocDefinitionOrganizationMapper.xml
similarity index 66%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocDefinitionOrganizationMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/DocDefinitionOrganizationMapper.xml
index de52475c2..34b0c7300 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocDefinitionOrganizationMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/DocDefinitionOrganizationMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.document.mapper.DocDefinitionOrganizationMapper">
+<mapper namespace="com.healthlink.his.document.mapper.DocDefinitionOrganizationMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocInventoryItemStaticMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/DocInventoryItemStaticMapper.xml
similarity index 65%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocInventoryItemStaticMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/DocInventoryItemStaticMapper.xml
index 855598024..fe6e74f78 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocInventoryItemStaticMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/DocInventoryItemStaticMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.document.mapper.DocInventoryItemStaticMapper">
+<mapper namespace="com.healthlink.his.document.mapper.DocInventoryItemStaticMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogDrugInfoMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/DocRecordMapper.xml
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogDrugInfoMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/DocRecordMapper.xml
index 187c2a756..b91dee76d 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogDrugInfoMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/DocRecordMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybcatalog.mapper.CatalogDrugInfoMapper">
+<mapper namespace="com.healthlink.his.document.mapper.DocRecordMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/DocStatisticsDefinitionMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/DocStatisticsDefinitionMapper.xml
new file mode 100755
index 000000000..ee389dd8f
--- /dev/null
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/DocStatisticsDefinitionMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.healthlink.his.document.mapper.DocStatisticsDefinitionMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocStatisticsDefinitionOptionMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/DocStatisticsDefinitionOptionMapper.xml
similarity index 65%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocStatisticsDefinitionOptionMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/DocStatisticsDefinitionOptionMapper.xml
index e79276e1d..39229eed2 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocStatisticsDefinitionOptionMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/DocStatisticsDefinitionOptionMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.document.mapper.DocStatisticsDefinitionOptionMapper">
+<mapper namespace="com.healthlink.his.document.mapper.DocStatisticsDefinitionOptionMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocStatisticsMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/DocStatisticsMapper.xml
similarity index 80%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocStatisticsMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/DocStatisticsMapper.xml
index ed98a1e20..a9ebe4196 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocStatisticsMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/DocStatisticsMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.document.mapper.DocStatisticsMapper">
+<mapper namespace="com.healthlink.his.document.mapper.DocStatisticsMapper">
 
-    <select id="getTempList" resultType="com.openhis.document.domain.DocStatistics">
+    <select id="getTempList" resultType="com.healthlink.his.document.domain.DocStatistics">
         SELECT ds.id,
         ds.record_id,
         ds.value,
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/AllergyIntoleranceMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/DocTemplateMapper.xml
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/AllergyIntoleranceMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/DocTemplateMapper.xml
index f26107eb4..4eb96f118 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/AllergyIntoleranceMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/DocTemplateMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.clinical.mapper.AllergyIntoleranceMapper">
+<mapper namespace="com.healthlink.his.document.mapper.DocTemplateMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/InstrumentMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/EmrDetailMapper.xml
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/InstrumentMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/EmrDetailMapper.xml
index 5bbc3154b..807c8f258 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/InstrumentMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/EmrDetailMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.InstrumentMapper">
+<mapper namespace="com.healthlink.his.document.mapper.EmrDetailMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/SupplierMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/EmrDictMapper.xml
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/SupplierMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/EmrDictMapper.xml
index edde84b24..438705da9 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/SupplierMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/EmrDictMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.SupplierMapper">
+<mapper namespace="com.healthlink.his.document.mapper.EmrDictMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/sys/OperationRecordMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/EmrMapper.xml
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/sys/OperationRecordMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/EmrMapper.xml
index c5fb25a28..e0c77878e 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/sys/OperationRecordMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/EmrMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.sys.mapper.OperationRecordMapper">
+<mapper namespace="com.healthlink.his.document.mapper.EmrMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/template/OrdersGroupPackageMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/EmrTemplateMapper.xml
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/template/OrdersGroupPackageMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/EmrTemplateMapper.xml
index 77e3ded8a..374b0765d 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/template/OrdersGroupPackageMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/EmrTemplateMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.template.mapper.OrdersGroupPackageMapper">
+<mapper namespace="com.healthlink.his.document.mapper.EmrTemplateMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/BizUserRoleMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/OrderProcessMapper.xml
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/BizUserRoleMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/OrderProcessMapper.xml
index 73b709a82..e00e31eb5 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/BizUserRoleMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/OrderProcessMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.BizUserRoleMapper">
+<mapper namespace="com.healthlink.his.document.mapper.OrderProcessMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/RequestFormMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/RequestFormMapper.xml
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/document/RequestFormMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/RequestFormMapper.xml
index 2ef0dbb53..bae37c50a 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/RequestFormMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/RequestFormMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.document.mapper.RequestFormMapper">
+<mapper namespace="com.healthlink.his.document.mapper.RequestFormMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/VitalSignsMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/VitalSignsMapper.xml
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/document/VitalSignsMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/VitalSignsMapper.xml
index bc39dd088..559494c07 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/VitalSignsMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/document/VitalSignsMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.document.mapper.VitalSignsMapper">
+<mapper namespace="com.healthlink.his.document.mapper.VitalSignsMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/BizUserMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/financial/ClaimMapper.xml
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/BizUserMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/financial/ClaimMapper.xml
index f7fd379ca..a18d87461 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/BizUserMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/financial/ClaimMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.BizUserMapper">
+<mapper namespace="com.healthlink.his.financial.mapper.ClaimMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/financial/ClaimResponseMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/financial/ClaimResponseMapper.xml
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/financial/ClaimResponseMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/financial/ClaimResponseMapper.xml
index de3e35137..9f50ed758 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/financial/ClaimResponseMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/financial/ClaimResponseMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.financial.mapper.ClaimResponseMapper">
+<mapper namespace="com.healthlink.his.financial.mapper.ClaimResponseMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepMedresultInputMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/financial/ContractMapper.xml
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepMedresultInputMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/financial/ContractMapper.xml
index 18fa01d3e..0dfdd60c6 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepMedresultInputMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/financial/ContractMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybelep.mapper.ElepMedresultInputMapper">
+<mapper namespace="com.healthlink.his.financial.mapper.ContractMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/financial/PaymentNoticeMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/financial/PaymentNoticeMapper.xml
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/financial/PaymentNoticeMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/financial/PaymentNoticeMapper.xml
index f075ed479..26cd96ea7 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/financial/PaymentNoticeMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/financial/PaymentNoticeMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.financial.mapper.PaymentNoticeMapper">
+<mapper namespace="com.healthlink.his.financial.mapper.PaymentNoticeMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/financial/PaymentRecDetailMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/financial/PaymentRecDetailMapper.xml
similarity index 90%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/financial/PaymentRecDetailMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/financial/PaymentRecDetailMapper.xml
index a7b91206e..3f6032f99 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/financial/PaymentRecDetailMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/financial/PaymentRecDetailMapper.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.financial.mapper.PaymentRecDetailMapper">
+<mapper namespace="com.healthlink.his.financial.mapper.PaymentRecDetailMapper">
 
     <select id="getListByReconciliationIds"
-            resultType="com.openhis.financial.model.PaymentRecDetailAccountResult">
+            resultType="com.healthlink.his.financial.model.PaymentRecDetailAccountResult">
         SELECT
         T1.ID,
         T1.predecessor_id,
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/financial/PaymentReconciliationMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/financial/PaymentReconciliationMapper.xml
similarity index 85%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/financial/PaymentReconciliationMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/financial/PaymentReconciliationMapper.xml
index d0c350814..e274884cf 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/financial/PaymentReconciliationMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/financial/PaymentReconciliationMapper.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.financial.mapper.PaymentReconciliationMapper">
+<mapper namespace="com.healthlink.his.financial.mapper.PaymentReconciliationMapper">
 
     <select id="getPaymentAccountContract"
-            resultType="com.openhis.financial.model.PaymentReconciliationAccountDel">
+            resultType="com.healthlink.his.financial.model.PaymentReconciliationAccountDel">
         SELECT payment.*,
         account.contract_no AS account_contract_no
         FROM fin_payment_reconciliation payment
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/financial/ThreePartPayCallBackMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/financial/ThreePartPayCallBackMapper.xml
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/financial/ThreePartPayCallBackMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/financial/ThreePartPayCallBackMapper.xml
index b066c855e..792bbff0b 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/financial/ThreePartPayCallBackMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/financial/ThreePartPayCallBackMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.financial.mapper.ThreePartPayCallBackMapper">
+<mapper namespace="com.healthlink.his.financial.mapper.ThreePartPayCallBackMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/jlau/ReviewPrescriptionRecordsMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/jlau/ReviewPrescriptionRecordsMapper.xml
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/jlau/ReviewPrescriptionRecordsMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/jlau/ReviewPrescriptionRecordsMapper.xml
index b75994c9b..d83611b05 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/jlau/ReviewPrescriptionRecordsMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/jlau/ReviewPrescriptionRecordsMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.jlau.mapper.ReviewPrescriptionRecordsMapper">
+<mapper namespace="com.healthlink.his.jlau.mapper.ReviewPrescriptionRecordsMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/lab/ActivityDefDeviceDefMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/lab/ActivityDefDeviceDefMapper.xml
new file mode 100755
index 000000000..cb74d17ff
--- /dev/null
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/lab/ActivityDefDeviceDefMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.healthlink.his.lab.mapper.ActivityDefDeviceDefMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/lab/ActivityDefObservationDefMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/lab/ActivityDefObservationDefMapper.xml
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/lab/ActivityDefObservationDefMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/lab/ActivityDefObservationDefMapper.xml
index 779ea7088..c6b9630c9 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/lab/ActivityDefObservationDefMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/lab/ActivityDefObservationDefMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.lab.mapper.ActivityDefObservationDefMapper">
+<mapper namespace="com.healthlink.his.lab.mapper.ActivityDefObservationDefMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/lab/ActivityDefSpecimenDefMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/lab/ActivityDefSpecimenDefMapper.xml
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/lab/ActivityDefSpecimenDefMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/lab/ActivityDefSpecimenDefMapper.xml
index 252b32c66..a850207f5 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/lab/ActivityDefSpecimenDefMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/lab/ActivityDefSpecimenDefMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.lab.mapper.ActivityDefSpecimenDefMapper">
+<mapper namespace="com.healthlink.his.lab.mapper.ActivityDefSpecimenDefMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/lab/InspectionPackageDetailMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/lab/InspectionPackageDetailMapper.xml
similarity index 92%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/lab/InspectionPackageDetailMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/lab/InspectionPackageDetailMapper.xml
index 240e3a935..abc4804b7 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/lab/InspectionPackageDetailMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/lab/InspectionPackageDetailMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.lab.mapper.InspectionPackageDetailMapper">
+<mapper namespace="com.healthlink.his.lab.mapper.InspectionPackageDetailMapper">
 
     <!-- 根据套餐ID删除明细数据 -->
     <delete id="deleteByPackageId">
@@ -9,7 +9,7 @@
     </delete>
 
     <!-- 根据套餐ID查询明细列表 -->
-    <select id="selectByPackageId" resultType="com.openhis.lab.domain.InspectionPackageDetail">
+    <select id="selectByPackageId" resultType="com.healthlink.his.lab.domain.InspectionPackageDetail">
         SELECT
             detail_id,
             basic_information_id,
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocStatisticsDefinitionMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/lab/LabActivityDefinitionMapper.xml
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocStatisticsDefinitionMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/lab/LabActivityDefinitionMapper.xml
index fc439637b..5081f76c8 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocStatisticsDefinitionMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/lab/LabActivityDefinitionMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.document.mapper.DocStatisticsDefinitionMapper">
+<mapper namespace="com.healthlink.his.lab.mapper.LabActivityDefinitionMapper">
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/InvoiceMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/lab/ObservationMapper.xml
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/InvoiceMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/lab/ObservationMapper.xml
index fb4affae5..aeb18be0a 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/InvoiceMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/lab/ObservationMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.InvoiceMapper">
+<mapper namespace="com.healthlink.his.lab.mapper.ObservationMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/lab/SpecimenMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/lab/SpecimenMapper.xml
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/lab/SpecimenMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/lab/SpecimenMapper.xml
index d80d461a9..50ebeedd5 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/lab/SpecimenMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/lab/SpecimenMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.lab.mapper.SpecimenMapper">
+<mapper namespace="com.healthlink.his.lab.mapper.SpecimenMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationDefinitionMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/medication/MedicationDefinitionMapper.xml
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationDefinitionMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/medication/MedicationDefinitionMapper.xml
index 18dc2be1b..52a1f0ad4 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationDefinitionMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/medication/MedicationDefinitionMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.medication.mapper.MedicationDefinitionMapper">
+<mapper namespace="com.healthlink.his.medication.mapper.MedicationDefinitionMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationDispenseMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/medication/MedicationDispenseMapper.xml
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationDispenseMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/medication/MedicationDispenseMapper.xml
index d13fca7c6..245dd5fb4 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationDispenseMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/medication/MedicationDispenseMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.medication.mapper.MedicationDispenseMapper">
+<mapper namespace="com.healthlink.his.medication.mapper.MedicationDispenseMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/medication/MedicationMapper.xml
similarity index 91%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/medication/MedicationMapper.xml
index c713d7a46..39cfb130c 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/medication/MedicationMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.medication.mapper.MedicationMapper">
+<mapper namespace="com.healthlink.his.medication.mapper.MedicationMapper">
 
-    <select id="selectDetailList" resultType="com.openhis.medication.domain.MedicationDetail">
+    <select id="selectDetailList" resultType="com.healthlink.his.medication.domain.MedicationDetail">
         SELECT T1.id,
                T1.medication_product_id,
                T1.status_enum,
@@ -43,7 +43,7 @@
         WHERE T1.delete_flag = 0
     </select>
     <!-- 根据关键字查询 如果关键字为空，查询10条，否则返回查询到的所有 -->
-    <select id="searchMedListByKeyWord" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
+    <select id="searchMedListByKeyWord" resultType="com.healthlink.his.medication.dto.AdjustPriceMedListDto">
         select med_def.id as targetId, med_def.name as name, med.total_volume as volume, details.amount as
         originRetailPrice,def_details.amount as originBuyingPrice,med_def.bus_no as busNo,med_def.min_unit_code as unitCode
         from med_medication med
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationRequestMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/medication/MedicationRequestMapper.xml
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationRequestMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/medication/MedicationRequestMapper.xml
index e0f721493..d37009dc9 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationRequestMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/medication/MedicationRequestMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.medication.mapper.MedicationRequestMapper">
+<mapper namespace="com.healthlink.his.medication.mapper.MedicationRequestMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/nenu/GfRatioApplicationMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/nenu/GfRatioApplicationMapper.xml
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/nenu/GfRatioApplicationMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/nenu/GfRatioApplicationMapper.xml
index 8bafb97d8..49b4759fa 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/nenu/GfRatioApplicationMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/nenu/GfRatioApplicationMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.nenu.mapper.GfRatioApplicationMapper">
+<mapper namespace="com.healthlink.his.nenu.mapper.GfRatioApplicationMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/nenu/GfRatioMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/nenu/GfRatioMapper.xml
similarity index 72%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/nenu/GfRatioMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/nenu/GfRatioMapper.xml
index b70348e5c..7ffa7a249 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/nenu/GfRatioMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/nenu/GfRatioMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.nenu.mapper.GfRatioMapper">
+<mapper namespace="com.healthlink.his.nenu.mapper.GfRatioMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/OrgContrastMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/sys/OperationRecordMapper.xml
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/OrgContrastMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/sys/OperationRecordMapper.xml
index 0e7b64ce4..d588196b0 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/OrgContrastMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/sys/OperationRecordMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.OrgContrastMapper">
+<mapper namespace="com.healthlink.his.sys.mapper.OperationRecordMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/sys/OptionMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/sys/OptionMapper.xml
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/sys/OptionMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/sys/OptionMapper.xml
index 167757171..99a94e86c 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/sys/OptionMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/sys/OptionMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.sys.mapper.OptionMapper">
+<mapper namespace="com.healthlink.his.sys.mapper.OptionMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/template/ActivityDeviceMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/template/ActivityDeviceMapper.xml
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/template/ActivityDeviceMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/template/ActivityDeviceMapper.xml
index cbc51a4e2..63f50e637 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/template/ActivityDeviceMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/template/ActivityDeviceMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.template.mapper.ActivityDeviceMapper">
+<mapper namespace="com.healthlink.his.template.mapper.ActivityDeviceMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/template/EncounterAutoRollMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/template/EncounterAutoRollMapper.xml
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/template/EncounterAutoRollMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/template/EncounterAutoRollMapper.xml
index f155920f7..17d22c5b8 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/template/EncounterAutoRollMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/template/EncounterAutoRollMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.template.mapper.EncounterAutoRollMapper">
+<mapper namespace="com.healthlink.his.template.mapper.EncounterAutoRollMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/template/OrderGroupMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/template/OrderGroupMapper.xml
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/template/OrderGroupMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/template/OrderGroupMapper.xml
index f001d0b8f..cf6f0c127 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/template/OrderGroupMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/template/OrderGroupMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.template.mapper.OrderGroupMapper">
+<mapper namespace="com.healthlink.his.template.mapper.OrderGroupMapper">
 
 </mapper>
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/template/OrdersGroupPackageDetailMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/template/OrdersGroupPackageDetailMapper.xml
similarity index 66%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/template/OrdersGroupPackageDetailMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/template/OrdersGroupPackageDetailMapper.xml
index 81ed8741b..2bf37d928 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/template/OrdersGroupPackageDetailMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/template/OrdersGroupPackageDetailMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.template.mapper.OrdersGroupPackageDetailMapper">
+<mapper namespace="com.healthlink.his.template.mapper.OrdersGroupPackageDetailMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/template/OrdersGroupPackageMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/template/OrdersGroupPackageMapper.xml
new file mode 100755
index 000000000..5dc171d7c
--- /dev/null
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/template/OrdersGroupPackageMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.healthlink.his.template.mapper.OrdersGroupPackageMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/ActivityDefinitionMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/ActivityDefinitionMapper.xml
similarity index 80%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/ActivityDefinitionMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/ActivityDefinitionMapper.xml
index 76da7f773..0e634a5d4 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/ActivityDefinitionMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/ActivityDefinitionMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.workflow.mapper.ActivityDefinitionMapper">
+<mapper namespace="com.healthlink.his.workflow.mapper.ActivityDefinitionMapper">
 
     <select id="getAppointActivityDefinitionId" resultType="long">
         SELECT ID
@@ -13,7 +13,7 @@
     </select>
 
     <!-- 根据项目id数组 加载诊疗集合 -->
-    <select id="searchActivityDefinitionByIds" resultType="com.openhis.workflow.dto.ActivityDto">
+    <select id="searchActivityDefinitionByIds" resultType="com.healthlink.his.workflow.dto.ActivityDto">
         SELECT id as itemId, bus_no as busNo, name as name
         FROM wor_activity_definition
         WHERE id IN
@@ -22,7 +22,7 @@
         </foreach>
     </select>
     <!-- 根据关键字查询 如果关键字为空，查询10条，否则返回查询到的所有 -->
-    <select id="searchActivityListByKeyWord" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
+    <select id="searchActivityListByKeyWord" resultType="com.healthlink.his.medication.dto.AdjustPriceMedListDto">
         SELECT cid.price AS originRetailPrice, ad.id AS targetId, ad.bus_no AS busNo, ad.name AS name
         FROM wor_activity_definition ad
                  inner join adm_charge_item_definition cid on ad.id = cid.instance_id
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/DeviceDispenseMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/DeviceDispenseMapper.xml
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/DeviceDispenseMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/DeviceDispenseMapper.xml
index 14b69062e..e1390805c 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/DeviceDispenseMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/DeviceDispenseMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.workflow.mapper.DeviceDispenseMapper">
+<mapper namespace="com.healthlink.his.workflow.mapper.DeviceDispenseMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/DeviceRequestMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/DeviceRequestMapper.xml
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/DeviceRequestMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/DeviceRequestMapper.xml
index 6132f25ff..c4b4609b6 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/DeviceRequestMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/DeviceRequestMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.workflow.mapper.DeviceRequestMapper">
+<mapper namespace="com.healthlink.his.workflow.mapper.DeviceRequestMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/ElepMedicationRequestMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/ElepMedicationRequestMapper.xml
new file mode 100755
index 000000000..3002dc1a9
--- /dev/null
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/ElepMedicationRequestMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.healthlink.his.workflow.mapper.ElepMedicationRequestMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/InventoryItemMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/InventoryItemMapper.xml
similarity index 79%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/InventoryItemMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/InventoryItemMapper.xml
index c1b46cdcb..888812efb 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/InventoryItemMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/InventoryItemMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.workflow.mapper.InventoryItemMapper">
+<mapper namespace="com.healthlink.his.workflow.mapper.InventoryItemMapper">
     <!-- 根据药品、耗材ID数组查询 存库大于 零 并且分组的集合数据 -->
-    <select id="searchResultDataList" resultType="com.openhis.workflow.dto.AdjustPriceDto">
+    <select id="searchResultDataList" resultType="com.healthlink.his.workflow.dto.AdjustPriceDto">
         SELECT item_id as itemId, item_table as itemTable ,location_id as locationId,quantity as totalCount,lot_number as
         lotNumber,unit_code as unitCode
         FROM wor_inventory_item
@@ -17,7 +17,7 @@
     </select>
 
     <!-- 根据药品、耗材ID数组查询 存库大于 零 并且分组的集合数据 -->
-    <select id="searchResultDataListByGroup" resultType="com.openhis.workflow.dto.AdjustPriceDto">
+    <select id="searchResultDataListByGroup" resultType="com.healthlink.his.workflow.dto.AdjustPriceDto">
         SELECT item_id as itemId
         FROM wor_inventory_item
         WHERE
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/ServiceRequestDetailMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/ServiceRequestDetailMapper.xml
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/ServiceRequestDetailMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/ServiceRequestDetailMapper.xml
index 9064d0058..bb0fce8b5 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/ServiceRequestDetailMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/ServiceRequestDetailMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.workflow.mapper.ServiceRequestDetailMapper">
+<mapper namespace="com.healthlink.his.workflow.mapper.ServiceRequestDetailMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/ElepMedicationRequestMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/ServiceRequestMapper.xml
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/ElepMedicationRequestMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/ServiceRequestMapper.xml
index e49a5a100..829edba17 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/ElepMedicationRequestMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/ServiceRequestMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.workflow.mapper.ElepMedicationRequestMapper">
+<mapper namespace="com.healthlink.his.workflow.mapper.ServiceRequestMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/SupplyDeliveryMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/SupplyDeliveryMapper.xml
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/SupplyDeliveryMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/SupplyDeliveryMapper.xml
index 8c82f2c9c..a55b61701 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/SupplyDeliveryMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/SupplyDeliveryMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.workflow.mapper.SupplyDeliveryMapper">
+<mapper namespace="com.healthlink.his.workflow.mapper.SupplyDeliveryMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/SupplyRequestAutoMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/SupplyRequestAutoMapper.xml
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/SupplyRequestAutoMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/SupplyRequestAutoMapper.xml
index 593173067..ddc228642 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/SupplyRequestAutoMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/SupplyRequestAutoMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.workflow.mapper.SupplyRequestAutoMapper">
+<mapper namespace="com.healthlink.his.workflow.mapper.SupplyRequestAutoMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/SupplyRequestMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/SupplyRequestMapper.xml
similarity index 91%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/SupplyRequestMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/SupplyRequestMapper.xml
index c37e65943..6a1e952c4 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/SupplyRequestMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/workflow/SupplyRequestMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.workflow.mapper.SupplyRequestMapper">
+<mapper namespace="com.healthlink.his.workflow.mapper.SupplyRequestMapper">
     <!-- 根据 调价单号 查询 supplyrequest 和 价格主表 -->
-    <select id="searchDataForBusNo" resultType="com.openhis.workflow.dto.ChangePriceDto">
+    <select id="searchDataForBusNo" resultType="com.healthlink.his.workflow.dto.ChangePriceDto">
         SELECT acid.id           as chargeId,
                wsr.item_id       as itemId,
                wsr.price         as newPrice,
@@ -16,14 +16,14 @@
                  INNER JOIN adm_charge_item_definition acid ON wsr.item_id = acid.instance_id
         WHERE wsr.bus_no = #{busNo}
     </select>
-    <select id="searchGroupDataForBusNo" resultType="com.openhis.workflow.dto.ChangePriceDto">
+    <select id="searchGroupDataForBusNo" resultType="com.healthlink.his.workflow.dto.ChangePriceDto">
         SELECT wsr.item_id as itemId, wsr.item_table as itemTable, wsr.retail_price as newPrice
         FROM wor_supply_request wsr
         WHERE wsr.bus_no = #{busNo}
         GROUP BY wsr.item_id, wsr.item_table, wsr.retail_price
     </select>
     <!-- 根据调价单号 查询未审核的详情-->
-    <select id="searchMedInfoDataForBusNo" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
+    <select id="searchMedInfoDataForBusNo" resultType="com.healthlink.his.medication.dto.AdjustPriceMedListDto">
         SELECT sr.item_id            as targetId,
                med_def.name          as name,
                med.total_volume      as volume,
@@ -60,7 +60,7 @@
     </select>
 
     <!-- 根据调价单号 查询已经审核过的详情-->
-    <select id="searchHistoryMedInfoData" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
+    <select id="searchHistoryMedInfoData" resultType="com.healthlink.his.medication.dto.AdjustPriceMedListDto">
         SELECT sr.item_id         as targetId,
                med_def.name       as name,
                med.total_volume   as volume,
@@ -93,7 +93,7 @@
     </select>
 
     <!-- 查询device -->
-    <select id="searchDeviceInfoDataForBusNo" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
+    <select id="searchDeviceInfoDataForBusNo" resultType="com.healthlink.his.medication.dto.AdjustPriceMedListDto">
         SELECT sr.item_id         as targetId,
                ad.name            as name,
                ad.size            as volume,
@@ -126,7 +126,7 @@
         GROUP BY sr.item_id, ad.name, ad.size, sr.price, details.amount, sr.reason, sr.retail_price, def_details.amount
     </select>
     <!-- 查询device 历史记录-->
-    <select id="searchHistoryDeviceInfoDataForBusNo" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
+    <select id="searchHistoryDeviceInfoDataForBusNo" resultType="com.healthlink.his.medication.dto.AdjustPriceMedListDto">
         SELECT sr.item_id         as targetId,
                ad.name            as name,
                ad.size            as volume,
@@ -159,7 +159,7 @@
         GROUP BY sr.item_id, ad.name, ad.size, sr.price, details.amount, sr.reason, def_details.amount, sr.unit_code, sr.retail_price
     </select>
 
-    <select id="searchActivityInfoDataForBusNo" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
+    <select id="searchActivityInfoDataForBusNo" resultType="com.healthlink.his.medication.dto.AdjustPriceMedListDto">
         SELECT sr.id          as targetId,
                ad.name        as name,
                sr.retal_price as newRetailPrice,
@@ -172,7 +172,7 @@
           AND sr.bus_no = #{busNo}
     </select>
 
-    <select id="searchHistoryActivityInfoDataForBusNo" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
+    <select id="searchHistoryActivityInfoDataForBusNo" resultType="com.healthlink.his.medication.dto.AdjustPriceMedListDto">
         SELECT sr.id          as targetId,
                ad.name        as name,
                sr.price       as originBuyingPrice,
@@ -185,7 +185,7 @@
           AND sr.bus_no = #{busNo}
     </select>
 
-    <select id="searchHealthInfoDataForBusNo" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
+    <select id="searchHealthInfoDataForBusNo" resultType="com.healthlink.his.medication.dto.AdjustPriceMedListDto">
         SELECT sr.id           as targetId,
                heal.name       as name,
                sr.retail_price as newRetailPrice,
@@ -199,7 +199,7 @@
         WHERE heal.delete_flag = '0'
           AND sr.bus_no = #{busNo}
     </select>
-    <select id="searchHistoryHealthInfoDataForBusNo" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
+    <select id="searchHistoryHealthInfoDataForBusNo" resultType="com.healthlink.his.medication.dto.AdjustPriceMedListDto">
         SELECT sr.id           as targetId,
                heal.name       as name,
                sr.price        as originBuyingPrice,
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/AccountMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/ClincSettleMapper.xml
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/AccountMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/ClincSettleMapper.xml
index 8d9fdc664..d46b4612b 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/AccountMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/ClincSettleMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.administration.mapper.AccountMapper">
+<mapper namespace="com.healthlink.his.yb.mapper.ClinicSettleMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/lab/ActivityDefDeviceDefMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/ClincUnSettleMapper.xml
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/lab/ActivityDefDeviceDefMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/ClincUnSettleMapper.xml
index 75dd4a91a..2017f2293 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/lab/ActivityDefDeviceDefMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/ClincUnSettleMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.lab.mapper.ActivityDefDeviceDefMapper">
+<mapper namespace="com.healthlink.his.yb.mapper.ClinicUnSettleMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/ClinicPreSettleMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/ClinicPreSettleMapper.xml
new file mode 100755
index 000000000..3f8ec2f32
--- /dev/null
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/ClinicPreSettleMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.healthlink.his.yb.mapper.ClinicPreSettleMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/OrderProcessMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/ClinicUnRegMapper.xml
similarity index 73%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/document/OrderProcessMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/ClinicUnRegMapper.xml
index 22664aa97..c543d2b25 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/OrderProcessMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/ClinicUnRegMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.document.mapper.OrderProcessMapper">
+<mapper namespace="com.healthlink.his.yb.mapper.ClinicUnRegMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/DirectoryCheckRecordMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/DirectoryCheckRecordMapper.xml
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/yb/DirectoryCheckRecordMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/DirectoryCheckRecordMapper.xml
index 4d45f579e..6e2d96cf4 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/DirectoryCheckRecordMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/DirectoryCheckRecordMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.yb.mapper.DirectoryCheckRecordMapper">
+<mapper namespace="com.healthlink.his.yb.mapper.DirectoryCheckRecordMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/FinancialApplyRecordMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/FinancialApplyRecordMapper.xml
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/yb/FinancialApplyRecordMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/FinancialApplyRecordMapper.xml
index 2aaeed2fa..ceb45c32e 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/FinancialApplyRecordMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/FinancialApplyRecordMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.yb.mapper.FinancialApplyRecordMapper">
+<mapper namespace="com.healthlink.his.yb.mapper.FinancialApplyRecordMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/FinancialReconcileRecordMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/FinancialReconcileRecordMapper.xml
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/yb/FinancialReconcileRecordMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/FinancialReconcileRecordMapper.xml
index 869c36e9b..f1c0c59f9 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/FinancialReconcileRecordMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/FinancialReconcileRecordMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.yb.mapper.FinancialReconcileRecordMapper">
+<mapper namespace="com.healthlink.his.yb.mapper.FinancialReconcileRecordMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InpatientDischargeMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InpatientDischargeMapper.xml
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InpatientDischargeMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InpatientDischargeMapper.xml
index a144804bc..71b115831 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InpatientDischargeMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InpatientDischargeMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.yb.mapper.InpatientDischargeMapper">
+<mapper namespace="com.healthlink.his.yb.mapper.InpatientDischargeMapper">
 
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InpatientFeeDetailMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InpatientFeeDetailMapper.xml
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InpatientFeeDetailMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InpatientFeeDetailMapper.xml
index f2844361b..003fef381 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InpatientFeeDetailMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InpatientFeeDetailMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.yb.mapper.InpatientFeeDetailMapper">
+<mapper namespace="com.healthlink.his.yb.mapper.InpatientFeeDetailMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InpatientPreSettleMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InpatientPreSettleMapper.xml
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InpatientPreSettleMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InpatientPreSettleMapper.xml
index df32e5596..e0eb24906 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InpatientPreSettleMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InpatientPreSettleMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.yb.mapper.InpatientPreSettleMapper">
+<mapper namespace="com.healthlink.his.yb.mapper.InpatientPreSettleMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InpatientRegInfoUpdateRecordeMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InpatientRegInfoUpdateRecordeMapper.xml
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InpatientRegInfoUpdateRecordeMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InpatientRegInfoUpdateRecordeMapper.xml
index 88dc40204..29b165826 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InpatientRegInfoUpdateRecordeMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InpatientRegInfoUpdateRecordeMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.yb.mapper.InpatientRegInfoUpdateRecordeMapper">
+<mapper namespace="com.healthlink.his.yb.mapper.InpatientRegInfoUpdateRecordeMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InpatientRegMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InpatientRegMapper.xml
similarity index 91%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InpatientRegMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InpatientRegMapper.xml
index 7bcac5038..bdbc4dc4c 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InpatientRegMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InpatientRegMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.yb.mapper.InpatientRegMapper">
+<mapper namespace="com.healthlink.his.yb.mapper.InpatientRegMapper">
 
-    <select id="selectInpatientInfoByEncounterId" resultType="com.openhis.yb.domain.InpatientReg">
+    <select id="selectInpatientInfoByEncounterId" resultType="com.healthlink.his.yb.domain.InpatientReg">
         SELECT
         id,
         psn_no,
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InpatientSettleMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InpatientSettleMapper.xml
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InpatientSettleMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InpatientSettleMapper.xml
index 15937ace0..816f01c11 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InpatientSettleMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InpatientSettleMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.yb.mapper.InpatientSettleMapper">
+<mapper namespace="com.healthlink.his.yb.mapper.InpatientSettleMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventoryChangeRecordMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InventoryChangeRecordMapper.xml
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventoryChangeRecordMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InventoryChangeRecordMapper.xml
index 37108a9d4..ffe3e8635 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventoryChangeRecordMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InventoryChangeRecordMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.yb.mapper.InventoryChangeRecordMapper">
+<mapper namespace="com.healthlink.his.yb.mapper.InventoryChangeRecordMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventoryCheckRecordMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InventoryCheckRecordMapper.xml
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventoryCheckRecordMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InventoryCheckRecordMapper.xml
index e2bdf4ac9..992fe27ee 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventoryCheckRecordMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InventoryCheckRecordMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.yb.mapper.InventoryCheckRecordMapper">
+<mapper namespace="com.healthlink.his.yb.mapper.InventoryCheckRecordMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventorySaleReturnRecordMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InventoryDelRecordMapper.xml
similarity index 74%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventorySaleReturnRecordMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InventoryDelRecordMapper.xml
index b03922443..96f65f6ff 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventorySaleReturnRecordMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InventoryDelRecordMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.yb.mapper.InventorySaleReturnRecordMapper">
+<mapper namespace="com.healthlink.his.yb.mapper.InventoryDelRecordMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventoryPurchaseRecordMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InventoryPurchaseRecordMapper.xml
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventoryPurchaseRecordMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InventoryPurchaseRecordMapper.xml
index 5f321a895..f6e22048f 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventoryPurchaseRecordMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InventoryPurchaseRecordMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.yb.mapper.InventoryPurchaseRecordMapper">
+<mapper namespace="com.healthlink.his.yb.mapper.InventoryPurchaseRecordMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventoryPurchaseReturnRecordMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InventoryPurchaseReturnRecordMapper.xml
similarity index 66%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventoryPurchaseReturnRecordMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InventoryPurchaseReturnRecordMapper.xml
index e9a66a5b2..171fd0ef2 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventoryPurchaseReturnRecordMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InventoryPurchaseReturnRecordMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.yb.mapper.InventoryPurchaseReturnRecordMapper">
+<mapper namespace="com.healthlink.his.yb.mapper.InventoryPurchaseReturnRecordMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventorySaleRecordMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InventorySaleRecordMapper.xml
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventorySaleRecordMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InventorySaleRecordMapper.xml
index ae1e5f140..bee9d4289 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventorySaleRecordMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InventorySaleRecordMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.yb.mapper.InventorySaleRecordMapper">
+<mapper namespace="com.healthlink.his.yb.mapper.InventorySaleRecordMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InventorySaleReturnRecordMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InventorySaleReturnRecordMapper.xml
new file mode 100755
index 000000000..3288299c5
--- /dev/null
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/InventorySaleReturnRecordMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.healthlink.his.yb.mapper.InventorySaleReturnRecordMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/MedicalInsuranceMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/MedicalInsuranceMapper.xml
similarity index 93%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/yb/MedicalInsuranceMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/MedicalInsuranceMapper.xml
index d72d163fc..e34230d08 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/MedicalInsuranceMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/MedicalInsuranceMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.yb.mapper.MedicalInsuranceMapper">
+<mapper namespace="com.healthlink.his.yb.mapper.MedicalInsuranceMapper">
 
-    <select id="get3201Param" resultType="com.openhis.yb.dto.Settlement3201Dto">
+    <select id="get3201Param" resultType="com.healthlink.his.yb.dto.Settlement3201Dto">
         SELECT sum(T1.tendered_amount)                                           AS med_fee_sum_amt,
                sum(case when T5.pay_enum = #{ybFund} THEN T5.amount ELSE 0 END)  AS fund_pay_sum_amt,
                sum(case when T5.pay_enum = #{zhPay} THEN T5.amount ELSE 0 END)   AS acct_Pay,
@@ -21,7 +21,7 @@
           AND T1.tenant_id = #{tenantId}
         GROUP BY t1.id
     </select>
-    <select id="get3202Param" resultType="com.openhis.yb.dto.Settlement3202Dto">
+    <select id="get3202Param" resultType="com.healthlink.his.yb.dto.Settlement3202Dto">
         SELECT sum(T1.tendered_amount)                                            AS med_fee_sum_amt,
                sum(case when T5.pay_enum = #{ybFund} THEN T5.amount ELSE 0 END)   AS fund_pay_sum_amt,
                sum(case when T5.pay_enum = #{zhPay} THEN T5.amount ELSE 0 END)    AS acct_pay,
@@ -43,7 +43,7 @@
           AND T1.tenant_id = #{tenantId}
         GROUP BY t1.id
     </select>
-    <select id="get3203Param" resultType="com.openhis.yb.dto.Financial3203Dto">
+    <select id="get3203Param" resultType="com.healthlink.his.yb.dto.Financial3203Dto">
         SELECT sum(T1.tendered_amount)                                            AS med_fee_sum_amt,
                sum(case when T5.pay_enum = #{ybFund} THEN T5.amount ELSE 0 END)   AS fund_pay_sum_amt,
                sum(case when T5.pay_enum = #{zhPay} THEN T5.amount ELSE 0 END)    AS acct_pay,
@@ -68,7 +68,7 @@
         GROUP BY t1.id
     </select>
 
-    <select id="get3201ParamList" resultType="com.openhis.yb.dto.Settlement3201DetailDto">
+    <select id="get3201ParamList" resultType="com.healthlink.his.yb.dto.Settlement3201DetailDto">
         SELECT
         T2.insutype,
         T4.clr_optins,
@@ -101,7 +101,7 @@
     </select>
 
     <select id="getPaymentDecDetailUniAccountDtoListByPaymentIdList"
-            resultType="com.openhis.yb.dto.PaymentDecDetailUniAccountDto">
+            resultType="com.healthlink.his.yb.dto.PaymentDecDetailUniAccountDto">
         SELECT
         t1.id,
         t1.predecessor_id,
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/PerinfoMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/PerinfoMapper.xml
similarity index 70%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/yb/PerinfoMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/PerinfoMapper.xml
index 217833cdb..27df9a0bf 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/PerinfoMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/PerinfoMapper.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.yb.mapper.PerinfoMapper">
+<mapper namespace="com.healthlink.his.yb.mapper.PerinfoMapper">
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/RegMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/RegMapper.xml
similarity index 97%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/yb/RegMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/RegMapper.xml
index 9228b5746..8aed55c19 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/RegMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/RegMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.yb.mapper.RegMapper">
-    <resultMap id="RegMap" type="com.openhis.yb.domain.ClinicReg">
+<mapper namespace="com.healthlink.his.yb.mapper.RegMapper">
+    <resultMap id="RegMap" type="com.healthlink.his.yb.domain.ClinicReg">
         <id property="id" column="id" jdbcType="VARCHAR"/>
         <result property="medicalNo" column="medical_no" jdbcType="VARCHAR"/>
         <result property="mdtrtId" column="mdtrt_id" jdbcType="VARCHAR"/>
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/SignMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/SignMapper.xml
similarity index 71%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/yb/SignMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/SignMapper.xml
index 07e77f444..c19305b30 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/SignMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/yb/SignMapper.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.yb.mapper.SignMapper">
+<mapper namespace="com.healthlink.his.yb.mapper.SignMapper">
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogDrugInfoMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogDrugInfoMapper.xml
new file mode 100755
index 000000000..ab1a51906
--- /dev/null
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogDrugInfoMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.healthlink.his.ybcatalog.mapper.CatalogDrugInfoMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogDrugInfoUsualMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogDrugInfoUsualMapper.xml
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogDrugInfoUsualMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogDrugInfoUsualMapper.xml
index 50b3009b6..838bfb093 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogDrugInfoUsualMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogDrugInfoUsualMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybcatalog.mapper.CatalogDrugInfoUsualMapper">
+<mapper namespace="com.healthlink.his.ybcatalog.mapper.CatalogDrugInfoUsualMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalConsumablesMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalConsumablesMapper.xml
similarity index 66%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalConsumablesMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalConsumablesMapper.xml
index f14e792cd..65e4dbf3d 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalConsumablesMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalConsumablesMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybcatalog.mapper.CatalogMedicalConsumablesMapper">
+<mapper namespace="com.healthlink.his.ybcatalog.mapper.CatalogMedicalConsumablesMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalHerbInfoMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalHerbInfoMapper.xml
similarity index 66%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalHerbInfoMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalHerbInfoMapper.xml
index e3b92a578..31db9a438 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalHerbInfoMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalHerbInfoMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybcatalog.mapper.CatalogMedicalHerbInfoMapper">
+<mapper namespace="com.healthlink.his.ybcatalog.mapper.CatalogMedicalHerbInfoMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalServiceMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalServiceMapper.xml
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalServiceMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalServiceMapper.xml
index 377f386b4..a28996edc 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalServiceMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogMedicalServiceMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybcatalog.mapper.CatalogMedicalServiceMapper">
+<mapper namespace="com.healthlink.his.ybcatalog.mapper.CatalogMedicalServiceMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogSpecialDiseaseMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogSpecialDiseaseMapper.xml
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogSpecialDiseaseMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogSpecialDiseaseMapper.xml
index 56addf377..78a97cd82 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogSpecialDiseaseMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogSpecialDiseaseMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybcatalog.mapper.CatalogSpecialDiseaseMapper">
+<mapper namespace="com.healthlink.his.ybcatalog.mapper.CatalogSpecialDiseaseMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogSurgeryStandardDirectoryMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogSurgeryStandardDirectoryMapper.xml
similarity index 64%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogSurgeryStandardDirectoryMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogSurgeryStandardDirectoryMapper.xml
index 1699204b9..01f0feff9 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogSurgeryStandardDirectoryMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogSurgeryStandardDirectoryMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybcatalog.mapper.CatalogSurgeryStandardDirectoryMapper">
+<mapper namespace="com.healthlink.his.ybcatalog.mapper.CatalogSurgeryStandardDirectoryMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogWesternDiseaseMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogWesternDiseaseMapper.xml
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogWesternDiseaseMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogWesternDiseaseMapper.xml
index f26b423c5..f3a184f63 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogWesternDiseaseMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogWesternDiseaseMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybcatalog.mapper.CatalogWesternDiseaseMapper">
+<mapper namespace="com.healthlink.his.ybcatalog.mapper.CatalogWesternDiseaseMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogZyDiseaseDiagnosisMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogZyDiseaseDiagnosisMapper.xml
similarity index 66%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogZyDiseaseDiagnosisMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogZyDiseaseDiagnosisMapper.xml
index 994378f38..985382c4e 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogZyDiseaseDiagnosisMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogZyDiseaseDiagnosisMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybcatalog.mapper.CatalogZyDiseaseDiagnosisMapper">
+<mapper namespace="com.healthlink.his.ybcatalog.mapper.CatalogZyDiseaseDiagnosisMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogZySyndromeMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogZySyndromeMapper.xml
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogZySyndromeMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogZySyndromeMapper.xml
index 138516bce..c7757e2d9 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybcatalog/CatalogZySyndromeMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybcatalog/CatalogZySyndromeMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybcatalog.mapper.CatalogZySyndromeMapper">
+<mapper namespace="com.healthlink.his.ybcatalog.mapper.CatalogZySyndromeMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepMedresultDetailMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepMedresultDetailMapper.xml
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepMedresultDetailMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepMedresultDetailMapper.xml
index b86c1d7b4..eb2363b06 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepMedresultDetailMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepMedresultDetailMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybelep.mapper.ElepMedresultDetailMapper">
+<mapper namespace="com.healthlink.his.ybelep.mapper.ElepMedresultDetailMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepMedresultInfoMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepMedresultInfoMapper.xml
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepMedresultInfoMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepMedresultInfoMapper.xml
index b48fb282b..bec70573d 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepMedresultInfoMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepMedresultInfoMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybelep.mapper.ElepMedresultInfoMapper">
+<mapper namespace="com.healthlink.his.ybelep.mapper.ElepMedresultInfoMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepMedresultInputMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepMedresultInputMapper.xml
new file mode 100755
index 000000000..38cdabe67
--- /dev/null
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepMedresultInputMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.healthlink.his.ybelep.mapper.ElepMedresultInputMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerDiagnosisInfoMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepQuerDiagnosisInfoMapper.xml
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerDiagnosisInfoMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepQuerDiagnosisInfoMapper.xml
index 638551e55..703068130 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerDiagnosisInfoMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepQuerDiagnosisInfoMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybelep.mapper.ElepQuerDiagnosisInfoMapper">
+<mapper namespace="com.healthlink.his.ybelep.mapper.ElepQuerDiagnosisInfoMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionDetailMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionDetailMapper.xml
similarity index 66%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionDetailMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionDetailMapper.xml
index 40f20a68a..131158ad5 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionDetailMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionDetailMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybelep.mapper.ElepQuerPrescriptionDetailMapper">
+<mapper namespace="com.healthlink.his.ybelep.mapper.ElepQuerPrescriptionDetailMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionInfoMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionInfoMapper.xml
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionInfoMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionInfoMapper.xml
index 80a424454..dfe588663 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionInfoMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionInfoMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybelep.mapper.ElepQuerPrescriptionInfoMapper">
+<mapper namespace="com.healthlink.his.ybelep.mapper.ElepQuerPrescriptionInfoMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionInputMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionInputMapper.xml
similarity index 66%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionInputMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionInputMapper.xml
index b52b51102..530462653 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionInputMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepQuerPrescriptionInputMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybelep.mapper.ElepQuerPrescriptionInputMapper">
+<mapper namespace="com.healthlink.his.ybelep.mapper.ElepQuerPrescriptionInputMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerVisitInfoMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepQuerVisitInfoMapper.xml
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerVisitInfoMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepQuerVisitInfoMapper.xml
index cae2c2c67..5596f2333 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepQuerVisitInfoMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepQuerVisitInfoMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybelep.mapper.ElepQuerVisitInfoMapper">
+<mapper namespace="com.healthlink.his.ybelep.mapper.ElepQuerVisitInfoMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepRevokeInputMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepRevokeInputMapper.xml
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepRevokeInputMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepRevokeInputMapper.xml
index c5cb71d76..5c53af670 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepRevokeInputMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepRevokeInputMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybelep.mapper.ElepRevokeInputMapper">
+<mapper namespace="com.healthlink.his.ybelep.mapper.ElepRevokeInputMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepRevokeOutputMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepRevokeOutputMapper.xml
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepRevokeOutputMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepRevokeOutputMapper.xml
index db3024aa6..29760a0ab 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepRevokeOutputMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepRevokeOutputMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybelep.mapper.ElepRevokeOutputMapper">
+<mapper namespace="com.healthlink.his.ybelep.mapper.ElepRevokeOutputMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepSignatureInputMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepSignatureInputMapper.xml
new file mode 100755
index 000000000..abe4a8925
--- /dev/null
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepSignatureInputMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.healthlink.his.ybelep.mapper.ElepSignatureInputMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepSignatureOutputMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepSignatureOutputMapper.xml
similarity index 68%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepSignatureOutputMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepSignatureOutputMapper.xml
index f001a5920..fbc878e21 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepSignatureOutputMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepSignatureOutputMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybelep.mapper.ElepSignatureOutputMapper">
+<mapper namespace="com.healthlink.his.ybelep.mapper.ElepSignatureOutputMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepUploadInputMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepUploadInputMapper.xml
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepUploadInputMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepUploadInputMapper.xml
index 56e1c50f5..30312fff7 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepUploadInputMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepUploadInputMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybelep.mapper.ElepUploadInputMapper">
+<mapper namespace="com.healthlink.his.ybelep.mapper.ElepUploadInputMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepUploadOutputMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepUploadOutputMapper.xml
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepUploadOutputMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepUploadOutputMapper.xml
index 85beae8a9..c6873bebb 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepUploadOutputMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepUploadOutputMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybelep.mapper.ElepUploadOutputMapper">
+<mapper namespace="com.healthlink.his.ybelep.mapper.ElepUploadOutputMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriDiagnosisInfoMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepVeriDiagnosisInfoMapper.xml
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriDiagnosisInfoMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepVeriDiagnosisInfoMapper.xml
index 14ccdf46f..69c40b760 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriDiagnosisInfoMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepVeriDiagnosisInfoMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybelep.mapper.ElepVeriDiagnosisInfoMapper">
+<mapper namespace="com.healthlink.his.ybelep.mapper.ElepVeriDiagnosisInfoMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionDetailMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionDetailMapper.xml
similarity index 66%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionDetailMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionDetailMapper.xml
index 29fa9f5dc..655720455 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionDetailMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionDetailMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybelep.mapper.ElepVeriPrescriptionDetailMapper">
+<mapper namespace="com.healthlink.his.ybelep.mapper.ElepVeriPrescriptionDetailMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionInfoMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionInfoMapper.xml
similarity index 67%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionInfoMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionInfoMapper.xml
index 0e2283cad..dc0415e2e 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionInfoMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionInfoMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybelep.mapper.ElepVeriPrescriptionInfoMapper">
+<mapper namespace="com.healthlink.his.ybelep.mapper.ElepVeriPrescriptionInfoMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionOutputMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionOutputMapper.xml
similarity index 66%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionOutputMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionOutputMapper.xml
index 014c16288..469806fc2 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionOutputMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepVeriPrescriptionOutputMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybelep.mapper.ElepVeriPrescriptionOutputMapper">
+<mapper namespace="com.healthlink.his.ybelep.mapper.ElepVeriPrescriptionOutputMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriVisitInfoMapper.xml b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepVeriVisitInfoMapper.xml
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriVisitInfoMapper.xml
rename to openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepVeriVisitInfoMapper.xml
index cf07e7ecc..e555c9579 100755
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/ybelep/ElepVeriVisitInfoMapper.xml
+++ b/openhis-server-new/healthlink-his-domain/src/main/resources/mapper/ybelep/ElepVeriVisitInfoMapper.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.ybelep.mapper.ElepVeriVisitInfoMapper">
+<mapper namespace="com.healthlink.his.ybelep.mapper.ElepVeriVisitInfoMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-miniapp/pom.xml b/openhis-server-new/healthlink-his-miniapp/pom.xml
similarity index 91%
rename from openhis-server-new/openhis-miniapp/pom.xml
rename to openhis-server-new/healthlink-his-miniapp/pom.xml
index 4d111211f..318581dc0 100755
--- a/openhis-server-new/openhis-miniapp/pom.xml
+++ b/openhis-server-new/healthlink-his-miniapp/pom.xml
@@ -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>
 
@@ -19,8 +19,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>
 
diff --git a/openhis-server-new/openhis-miniapp/src/main/java/com/openhis/OpenHisMiniApp.java b/openhis-server-new/healthlink-his-miniapp/src/main/java/com/healthlink/his/OpenHisMiniApp.java
similarity index 94%
rename from openhis-server-new/openhis-miniapp/src/main/java/com/openhis/OpenHisMiniApp.java
rename to openhis-server-new/healthlink-his-miniapp/src/main/java/com/healthlink/his/OpenHisMiniApp.java
index 0b1c78391..1041cb1b4 100755
--- a/openhis-server-new/openhis-miniapp/src/main/java/com/openhis/OpenHisMiniApp.java
+++ b/openhis-server-new/healthlink-his-miniapp/src/main/java/com/healthlink/his/OpenHisMiniApp.java
@@ -1,4 +1,4 @@
-package com.openhis;
+package com.healthlink.his;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -12,7 +12,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.Environment;
 
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}, scanBasePackages = {"com.core", "com.openhis"})
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}, scanBasePackages = {"com.core", "com.healthlink.his"})
 public class OpenHisMiniApp {
     private static final Logger log = LoggerFactory.getLogger(OpenHisMiniApp.class);
     public static void main(String[] args) throws UnknownHostException {
diff --git a/openhis-server-new/openhis-miniapp/src/main/resources/META-INF/spring-devtools.properties b/openhis-server-new/healthlink-his-miniapp/src/main/resources/META-INF/spring-devtools.properties
similarity index 100%
rename from openhis-server-new/openhis-miniapp/src/main/resources/META-INF/spring-devtools.properties
rename to openhis-server-new/healthlink-his-miniapp/src/main/resources/META-INF/spring-devtools.properties
diff --git a/openhis-server-new/openhis-miniapp/src/main/resources/application-druid.yml b/openhis-server-new/healthlink-his-miniapp/src/main/resources/application-druid.yml
similarity index 90%
rename from openhis-server-new/openhis-miniapp/src/main/resources/application-druid.yml
rename to openhis-server-new/healthlink-his-miniapp/src/main/resources/application-druid.yml
index aedc76396..0628684ad 100755
--- a/openhis-server-new/openhis-miniapp/src/main/resources/application-druid.yml
+++ b/openhis-server-new/healthlink-his-miniapp/src/main/resources/application-druid.yml
@@ -6,7 +6,7 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:postgresql://od32215110g.vicp.fun:15008/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
+        url: jdbc:postgresql://od32215110g.vicp.fun:15008/healthlink_his?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
         username: postgres
         password: root
       # 从库数据源
@@ -47,7 +47,7 @@ spring:
         allow:
         url-pattern: /druid/*
         # 控制台管理用户名和密码
-        login-username: openhis
+        login-username: healthlink-his
         login-password: 123456
       filter:
         stat:
diff --git a/openhis-server-new/openhis-miniapp/src/main/resources/application.yml b/openhis-server-new/healthlink-his-miniapp/src/main/resources/application.yml
similarity index 95%
rename from openhis-server-new/openhis-miniapp/src/main/resources/application.yml
rename to openhis-server-new/healthlink-his-miniapp/src/main/resources/application.yml
index 1dcf8b5e9..e21449666 100755
--- a/openhis-server-new/openhis-miniapp/src/main/resources/application.yml
+++ b/openhis-server-new/healthlink-his-miniapp/src/main/resources/application.yml
@@ -1,7 +1,7 @@
 # 项目相关配置
 core:
   # 名称
-  name: OpenHis-MiniApp
+  name: HealthLink-HIS-MiniApp
   # 版本
   version: 0.0.1
   # 版权年份
@@ -19,7 +19,7 @@ server:
   port: 18081
   servlet:
     # 应用的访问路径
-    context-path: /openhis
+    context-path: /healthlink-his
   tomcat:
     # tomcat的URI编码
     uri-encoding: UTF-8
@@ -34,7 +34,7 @@ server:
 # 日志配置
 logging:
   level:
-    com.openhis: debug
+    com.healthlink.his: debug
     org.springframework: warn
 
 # 用户配置
@@ -106,7 +106,7 @@ token:
 # MyBatis配置
 mybatis-plus:
   # 搜索指定包别名
-  typeAliasesPackage: com.core.**.domain,com.openhis.**.domain
+  typeAliasesPackage: com.core.**.domain,com.healthlink.his.**.domain
   # 配置mapper的扫描，找到所有的mapper.xml映射文件
   mapperLocations: classpath*:mapper/**/*Mapper.xml
   # 加载全局的配置文件
diff --git a/openhis-server-new/openhis-miniapp/src/main/resources/banner.txt b/openhis-server-new/healthlink-his-miniapp/src/main/resources/banner.txt
similarity index 100%
rename from openhis-server-new/openhis-miniapp/src/main/resources/banner.txt
rename to openhis-server-new/healthlink-his-miniapp/src/main/resources/banner.txt
diff --git a/openhis-server-new/openhis-miniapp/src/main/resources/i18n/messages.properties b/openhis-server-new/healthlink-his-miniapp/src/main/resources/i18n/messages.properties
similarity index 100%
rename from openhis-server-new/openhis-miniapp/src/main/resources/i18n/messages.properties
rename to openhis-server-new/healthlink-his-miniapp/src/main/resources/i18n/messages.properties
diff --git a/openhis-server-new/openhis-miniapp/src/main/resources/logback.xml b/openhis-server-new/healthlink-his-miniapp/src/main/resources/logback.xml
similarity index 100%
rename from openhis-server-new/openhis-miniapp/src/main/resources/logback.xml
rename to openhis-server-new/healthlink-his-miniapp/src/main/resources/logback.xml
diff --git a/openhis-server-new/openhis-miniapp/src/main/resources/mybatis/mybatis-config.xml b/openhis-server-new/healthlink-his-miniapp/src/main/resources/mybatis/mybatis-config.xml
similarity index 100%
rename from openhis-server-new/openhis-miniapp/src/main/resources/mybatis/mybatis-config.xml
rename to openhis-server-new/healthlink-his-miniapp/src/main/resources/mybatis/mybatis-config.xml
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IScheduleSlotAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IScheduleSlotAppService.java
deleted file mode 100755
index 750908936..000000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IScheduleSlotAppService.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.openhis.web.appointmentmanage.appservice;
-
-public interface IScheduleSlotAppService {
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/ScheduleSlotAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/ScheduleSlotAppServiceImpl.java
deleted file mode 100755
index 83d7cbfb8..000000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/ScheduleSlotAppServiceImpl.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.openhis.web.appointmentmanage.appservice.impl;
-
-import com.openhis.web.appointmentmanage.appservice.IScheduleSlotAppService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class ScheduleSlotAppServiceImpl implements IScheduleSlotAppService {
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/assembler/AdmissionAssembler.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/assembler/AdmissionAssembler.java
deleted file mode 100755
index f0cda0d5e..000000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/assembler/AdmissionAssembler.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.openhis.web.inpatientmanage.assembler;
-
-public class AdmissionAssembler {}
diff --git a/openhis-server-new/openhis-application/src/main/resources/properties/yb.properties b/openhis-server-new/openhis-application/src/main/resources/properties/yb.properties
deleted file mode 100755
index b96d8c96b..000000000
--- a/openhis-server-new/openhis-application/src/main/resources/properties/yb.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-ybapp.config.url=http://localhost:18079/openhis/yb/yb
-ybapp.config.api.key=your_api_key_123
-ybapp.config.timeout=5000
-ybapp.config.fixmedinsCode=H22010402403
-ybapp.config.eleUrl=http://localhost:18079/openhis/yb/ybElep
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/DeptAppointmentHoursServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/DeptAppointmentHoursServiceImpl.java
deleted file mode 100755
index 513def263..000000000
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/DeptAppointmentHoursServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.openhis.appointmentmanage.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.appointmentmanage.domain.DeptAppointmentHours;
-import com.openhis.appointmentmanage.mapper.DeptAppointmentHoursMapper;
-import com.openhis.appointmentmanage.service.IDeptAppointmentHoursService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class DeptAppointmentHoursServiceImpl extends ServiceImpl<DeptAppointmentHoursMapper, DeptAppointmentHours> implements IDeptAppointmentHoursService {
-
-}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/DeptImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/DeptImpl.java
deleted file mode 100755
index dd16bd301..000000000
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/DeptImpl.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.openhis.appointmentmanage.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.appointmentmanage.domain.Dept;
-import com.openhis.appointmentmanage.mapper.DeptMapper;
-import com.openhis.appointmentmanage.service.IDeptService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class DeptImpl extends ServiceImpl<DeptMapper, Dept> implements IDeptService {
-}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/DoctorScheduleServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/DoctorScheduleServiceImpl.java
deleted file mode 100755
index fba1de35d..000000000
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/DoctorScheduleServiceImpl.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.openhis.appointmentmanage.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.appointmentmanage.domain.DoctorSchedule;
-import com.openhis.appointmentmanage.mapper.DoctorScheduleMapper;
-import com.openhis.appointmentmanage.service.IDoctorScheduleService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class DoctorScheduleServiceImpl extends ServiceImpl<DoctorScheduleMapper, DoctorSchedule> implements IDoctorScheduleService {
-}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/ScheduleSlotServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/ScheduleSlotServiceImpl.java
deleted file mode 100755
index a9c62120b..000000000
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/ScheduleSlotServiceImpl.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.openhis.appointmentmanage.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.appointmentmanage.domain.ScheduleSlot;
-import com.openhis.appointmentmanage.mapper.ScheduleSlotMapper;
-import com.openhis.appointmentmanage.service.IScheduleSlotService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class ScheduleSlotServiceImpl extends ServiceImpl<ScheduleSlotMapper, ScheduleSlot> implements IScheduleSlotService {
-}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/impl/CallNumberVoiceConfigServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/impl/CallNumberVoiceConfigServiceImpl.java
deleted file mode 100755
index 7f899ece6..000000000
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/impl/CallNumberVoiceConfigServiceImpl.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.openhis.triageandqueuemanage.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.triageandqueuemanage.domain.CallNumberVoiceConfig;
-import com.openhis.triageandqueuemanage.mapper.CallNumberVoiceConfigMapper;
-import com.openhis.triageandqueuemanage.service.CallNumberVoiceConfigService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class CallNumberVoiceConfigServiceImpl extends ServiceImpl<CallNumberVoiceConfigMapper, CallNumberVoiceConfig> implements CallNumberVoiceConfigService {
-}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/impl/CallRecordServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/impl/CallRecordServiceImpl.java
deleted file mode 100755
index d31a3c17d..000000000
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/impl/CallRecordServiceImpl.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.openhis.triageandqueuemanage.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.triageandqueuemanage.domain.CallRecord;
-import com.openhis.triageandqueuemanage.mapper.CallRecordMapper;
-import com.openhis.triageandqueuemanage.service.CallRecordService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class CallRecordServiceImpl extends ServiceImpl<CallRecordMapper, CallRecord> implements CallRecordService {
-}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/impl/DivLogServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/impl/DivLogServiceImpl.java
deleted file mode 100755
index 8cb0ed45a..000000000
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/impl/DivLogServiceImpl.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.openhis.triageandqueuemanage.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.triageandqueuemanage.domain.DivLog;
-import com.openhis.triageandqueuemanage.mapper.DivLogMapper;
-import com.openhis.triageandqueuemanage.service.DivLogService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class DivLogServiceImpl extends ServiceImpl<DivLogMapper, DivLog> implements DivLogService {
-}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/impl/TriageCandidateExclusionServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/impl/TriageCandidateExclusionServiceImpl.java
deleted file mode 100755
index 4acb082fb..000000000
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/impl/TriageCandidateExclusionServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.openhis.triageandqueuemanage.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.triageandqueuemanage.domain.TriageCandidateExclusion;
-import com.openhis.triageandqueuemanage.mapper.TriageCandidateExclusionMapper;
-import com.openhis.triageandqueuemanage.service.TriageCandidateExclusionService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class TriageCandidateExclusionServiceImpl extends ServiceImpl<TriageCandidateExclusionMapper, TriageCandidateExclusion> implements TriageCandidateExclusionService {
-}
-
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/impl/TriageQueueItemServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/impl/TriageQueueItemServiceImpl.java
deleted file mode 100755
index 159df9c49..000000000
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/impl/TriageQueueItemServiceImpl.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.openhis.triageandqueuemanage.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.triageandqueuemanage.domain.TriageQueueItem;
-import com.openhis.triageandqueuemanage.mapper.TriageQueueItemMapper;
-import com.openhis.triageandqueuemanage.service.TriageQueueItemService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class TriageQueueItemServiceImpl extends ServiceImpl<TriageQueueItemMapper, TriageQueueItem> implements TriageQueueItemService {
-}
-
-
-
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ProcedureMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ProcedureMapper.xml
deleted file mode 100755
index 9b0e510f5..000000000
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ProcedureMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.clinical.mapper.ProcedureMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocRecordMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocRecordMapper.xml
deleted file mode 100755
index abd4bac5b..000000000
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocRecordMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.document.mapper.DocRecordMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocTemplateMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocTemplateMapper.xml
deleted file mode 100755
index a72ef10fc..000000000
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocTemplateMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.document.mapper.DocTemplateMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/EmrDetailMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/EmrDetailMapper.xml
deleted file mode 100755
index 37edf49dc..000000000
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/EmrDetailMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.document.mapper.EmrDetailMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/EmrDictMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/EmrDictMapper.xml
deleted file mode 100755
index b86c2015f..000000000
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/EmrDictMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.document.mapper.EmrDictMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/EmrMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/EmrMapper.xml
deleted file mode 100755
index 585ae144e..000000000
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/EmrMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.document.mapper.EmrMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/EmrTemplateMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/EmrTemplateMapper.xml
deleted file mode 100755
index 71629289e..000000000
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/EmrTemplateMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.document.mapper.EmrTemplateMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/financial/ClaimMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/financial/ClaimMapper.xml
deleted file mode 100755
index 79f3dfefc..000000000
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/financial/ClaimMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.financial.mapper.ClaimMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/financial/ContractMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/financial/ContractMapper.xml
deleted file mode 100755
index f1c020f75..000000000
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/financial/ContractMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.financial.mapper.ContractMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/lab/LabActivityDefinitionMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/lab/LabActivityDefinitionMapper.xml
deleted file mode 100755
index 0a34849f0..000000000
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/lab/LabActivityDefinitionMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.lab.mapper.LabActivityDefinitionMapper">
-
-</mapper>
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/lab/ObservationMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/lab/ObservationMapper.xml
deleted file mode 100755
index c18cec64a..000000000
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/lab/ObservationMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.lab.mapper.ObservationMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/ServiceRequestMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/ServiceRequestMapper.xml
deleted file mode 100755
index 6a2325582..000000000
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/ServiceRequestMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.workflow.mapper.ServiceRequestMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/ClincSettleMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/ClincSettleMapper.xml
deleted file mode 100755
index fa0cdb99f..000000000
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/ClincSettleMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.yb.mapper.ClinicSettleMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/ClincUnSettleMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/ClincUnSettleMapper.xml
deleted file mode 100755
index d474e89a6..000000000
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/ClincUnSettleMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.yb.mapper.ClinicUnSettleMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/ClinicPreSettleMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/ClinicPreSettleMapper.xml
deleted file mode 100755
index a731e0526..000000000
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/ClinicPreSettleMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.yb.mapper.ClinicPreSettleMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/ClinicUnRegMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/ClinicUnRegMapper.xml
deleted file mode 100755
index 3d13d9fe9..000000000
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/ClinicUnRegMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.yb.mapper.ClinicUnRegMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventoryDelRecordMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventoryDelRecordMapper.xml
deleted file mode 100755
index 9b7ca7632..000000000
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InventoryDelRecordMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.openhis.yb.mapper.InventoryDelRecordMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/pom.xml b/openhis-server-new/pom.xml
index a275247dc..205d6ce33 100755
--- a/openhis-server-new/pom.xml
+++ b/openhis-server-new/pom.xml
@@ -11,15 +11,15 @@
         <relativePath />
     </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>
 
-    <name>openhis-server</name>
+    <name>healthlink-his-server</name>
     <description>开放医疗管理系统</description>
 
     <properties>
-        <openhis.version>0.0.1-SNAPSHOT</openhis.version>
+        <healthlink-his.version>0.0.1-SNAPSHOT</healthlink-his.version>
         <core.version>0.0.1-SNAPSHOT</core.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -145,30 +145,30 @@
 
             <!-- 小程序应用 -->
             <dependency>
-                <groupId>com.openhis</groupId>
-                <artifactId>openhis-miniapp</artifactId>
-                <version>${openhis.version}</version>
+                <groupId>com.healthlink.his</groupId>
+                <artifactId>healthlink-his-miniapp</artifactId>
+                <version>${healthlink-his.version}</version>
             </dependency>
 
             <!-- 应用 -->
             <dependency>
-                <groupId>com.openhis</groupId>
-                <artifactId>openhis-application</artifactId>
-                <version>${openhis.version}</version>
+                <groupId>com.healthlink.his</groupId>
+                <artifactId>healthlink-his-application</artifactId>
+                <version>${healthlink-his.version}</version>
             </dependency>
 
             <!-- 领域 -->
             <dependency>
-                <groupId>com.openhis</groupId>
-                <artifactId>openhis-domain</artifactId>
-                <version>${openhis.version}</version>
+                <groupId>com.healthlink.his</groupId>
+                <artifactId>healthlink-his-domain</artifactId>
+                <version>${healthlink-his.version}</version>
             </dependency>
 
             <!-- 共通 -->
             <dependency>
-                <groupId>com.openhis</groupId>
-                <artifactId>openhis-common</artifactId>
-                <version>${openhis.version}</version>
+                <groupId>com.healthlink.his</groupId>
+                <artifactId>healthlink-his-common</artifactId>
+                <version>${healthlink-his.version}</version>
             </dependency>
 
             <!-- 定时任务-->
@@ -359,10 +359,10 @@
     </dependencyManagement>
 
     <modules>
-        <!-- <module>openhis-miniapp</module> -->
-        <module>openhis-application</module>
-        <module>openhis-domain</module>
-        <module>openhis-common</module>
+        <!-- <module>healthlink-his-miniapp</module> -->
+        <module>healthlink-his-application</module>
+        <module>healthlink-his-domain</module>
+        <module>healthlink-his-common</module>
         <module>core-admin</module>
         <module>core-framework</module>
         <module>core-system</module>
@@ -370,7 +370,7 @@
         <module>core-generator</module>
         <module>core-common</module>
         <module>core-flowable</module>
-        <!-- <module>openhis-einvoiceapp</module> -->
+        <!-- <module>healthlink-his-einvoiceapp</module> -->
     </modules>
     <packaging>pom</packaging>
 
diff --git a/openhis-ui-vue3/src/api/system/user.js b/openhis-ui-vue3/src/api/system/user.js
index 19c0717b4..b2c279be3 100755
--- a/openhis-ui-vue3/src/api/system/user.js
+++ b/openhis-ui-vue3/src/api/system/user.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import {parseStrEmpty} from "@/utils/openhis";
+import {parseStrEmpty} from "@/utils/healthlink-his";
 
 // 查询用户列表
 export function listUser(query) {
diff --git a/openhis-ui-vue3/src/components/HeaderSearch/index.vue b/openhis-ui-vue3/src/components/HeaderSearch/index.vue
index 95fffa33e..2d195f2b9 100755
--- a/openhis-ui-vue3/src/components/HeaderSearch/index.vue
+++ b/openhis-ui-vue3/src/components/HeaderSearch/index.vue
@@ -33,7 +33,7 @@
 
 <script setup>
 import Fuse from 'fuse.js';
-import {getNormalPath} from '@/utils/openhis';
+import {getNormalPath} from '@/utils/healthlink-his';
 import {isHttp} from '@/utils/validate';
 import usePermissionStore from '@/store/modules/permission';
 
diff --git a/openhis-ui-vue3/src/layout/components/Sidebar/SidebarItem.vue b/openhis-ui-vue3/src/layout/components/Sidebar/SidebarItem.vue
index ecd3a8a49..4cb5e1c33 100755
--- a/openhis-ui-vue3/src/layout/components/Sidebar/SidebarItem.vue
+++ b/openhis-ui-vue3/src/layout/components/Sidebar/SidebarItem.vue
@@ -57,7 +57,7 @@
 <script setup>
 import {isExternal} from '@/utils/validate'
 import AppLink from './Link'
-import {getNormalPath} from '@/utils/openhis'
+import {getNormalPath} from '@/utils/healthlink-his'
 
 const props = defineProps({
   // route object
diff --git a/openhis-ui-vue3/src/layout/components/TagsView/index.vue b/openhis-ui-vue3/src/layout/components/TagsView/index.vue
index a77ca3023..02c97bcaa 100755
--- a/openhis-ui-vue3/src/layout/components/TagsView/index.vue
+++ b/openhis-ui-vue3/src/layout/components/TagsView/index.vue
@@ -70,7 +70,7 @@
 
 <script setup>
 import ScrollPane from './ScrollPane';
-import {getNormalPath} from '@/utils/openhis';
+import {getNormalPath} from '@/utils/healthlink-his';
 import useTagsViewStore from '@/store/modules/tagsView';
 import useSettingsStore from '@/store/modules/settings';
 import usePermissionStore from '@/store/modules/permission';
diff --git a/openhis-ui-vue3/src/main.js b/openhis-ui-vue3/src/main.js
index b9e307ac1..0b263cb58 100755
--- a/openhis-ui-vue3/src/main.js
+++ b/openhis-ui-vue3/src/main.js
@@ -27,7 +27,7 @@ import elementIcons from '@/components/SvgIcon/svgicon';
 
 import './permission'; // permission control
 import {useDict} from '@/utils/dict';
-import {addDateRange, handleTree, parseTime, resetForm, selectDictLabel, selectDictLabels,} from '@/utils/openhis';
+import {addDateRange, handleTree, parseTime, resetForm, selectDictLabel, selectDictLabels,} from '@/utils/healthlink-his';
 
 import {formatDateStr} from '@/utils/index';
 
diff --git a/openhis-ui-vue3/src/plugins/download.js b/openhis-ui-vue3/src/plugins/download.js
index d9a214e6b..984afce9b 100755
--- a/openhis-ui-vue3/src/plugins/download.js
+++ b/openhis-ui-vue3/src/plugins/download.js
@@ -3,7 +3,7 @@ import {ElLoading, ElMessage} from 'element-plus'
 import {saveAs} from 'file-saver'
 import {getToken} from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
-import {blobValidate, tansParams} from '@/utils/openhis'
+import {blobValidate, tansParams} from '@/utils/healthlink-his'
 
 const baseURL = import.meta.env.VITE_APP_BASE_API
 let downloadLoadingInstance;
diff --git a/openhis-ui-vue3/src/utils/index.js b/openhis-ui-vue3/src/utils/index.js
index 8009d14c0..a4f4cc873 100755
--- a/openhis-ui-vue3/src/utils/index.js
+++ b/openhis-ui-vue3/src/utils/index.js
@@ -1,4 +1,4 @@
-import { parseTime } from './openhis'
+import { parseTime } from './healthlink-his'
 
 // 导出 parseTime 函数以供其他模块使用
 export { parseTime }
diff --git a/openhis-ui-vue3/src/utils/request.js b/openhis-ui-vue3/src/utils/request.js
index e59770a0e..f4f97e03f 100755
--- a/openhis-ui-vue3/src/utils/request.js
+++ b/openhis-ui-vue3/src/utils/request.js
@@ -2,7 +2,7 @@ import axios from 'axios'
 import {ElLoading, ElMessage, ElMessageBox, ElNotification} from 'element-plus'
 import {getToken} from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
-import {blobValidate, tansParams} from '@/utils/openhis'
+import {blobValidate, tansParams} from '@/utils/healthlink-his'
 import cache from '@/plugins/cache'
 import {saveAs} from 'file-saver'
 import useUserStore from '@/store/modules/user'
diff --git a/openhis-ui-vue3/src/views/clinicmanagement/skinrecord/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/skinrecord/index.vue
index 28744035b..031eab8f2 100755
--- a/openhis-ui-vue3/src/views/clinicmanagement/skinrecord/index.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/skinrecord/index.vue
@@ -304,7 +304,7 @@ import {
   updateNurseSign,
   updateSkinTestRecord,
 } from './component/api';
-import {parseTime} from '@/utils/openhis';
+import {parseTime} from '@/utils/healthlink-his';
 import {formatDateStr} from '@/utils/index';
 import useUserStore from '@/store/modules/user';
 
diff --git a/openhis-ui-vue3/src/views/inHospitalManagement/charge/settleAccounts/index.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settleAccounts/index.vue
index aab816801..318b321e6 100755
--- a/openhis-ui-vue3/src/views/inHospitalManagement/charge/settleAccounts/index.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/settleAccounts/index.vue
@@ -4,7 +4,7 @@
  * @LastEditTime: 2025-08-15 14:18:01
  * @LastEditors: X_bo v-hss@tbpartners.local
  * @Description: 
- * @FilePath: \openhis-ui-vue3\src\views\inHospitalManagement\charge\settleAccounts\index.vue
+ * @FilePath: \healthlink-his-ui-vue3\src\views\inHospitalManagement\charge\settleAccounts\index.vue
 -->
 <template>
   <div class="app-continer">
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentApprovalManagement/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentApprovalManagement/index.vue
index bd9046fcf..b4827f24b 100755
--- a/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentApprovalManagement/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentApprovalManagement/index.vue
@@ -128,7 +128,7 @@
 <script setup>
 import {onMounted, reactive, ref} from 'vue';
 import {ElMessage, ElMessageBox} from 'element-plus';
-import {parseTime} from '@/utils/openhis';
+import {parseTime} from '@/utils/healthlink-his';
 import Pagination from '@/components/Pagination';
 import {
   cancelSupplyRequestData,
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentFormApproval/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentFormApproval/index.vue
index f17514987..c9c2d8c08 100755
--- a/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentFormApproval/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentFormApproval/index.vue
@@ -159,7 +159,7 @@
 <script setup>
 import {onMounted, reactive, ref} from 'vue';
 import {ElMessage} from 'element-plus';
-import {parseTime} from '@/utils/openhis';
+import {parseTime} from '@/utils/healthlink-his';
 import Pagination from '@/components/Pagination';
 import request from '@/utils/request';
 //import { getPriceAdjustmentPage, getPriceAdjustmentDetail, cancelPriceAdjustment } from './components/api';
diff --git a/openhis-ui-vue3/src/views/medicineStorage/documentManagement/index.vue b/openhis-ui-vue3/src/views/medicineStorage/documentManagement/index.vue
index 86b681466..cb6489d77 100755
--- a/openhis-ui-vue3/src/views/medicineStorage/documentManagement/index.vue
+++ b/openhis-ui-vue3/src/views/medicineStorage/documentManagement/index.vue
@@ -230,7 +230,7 @@
 import {computed, ref, watch} from 'vue';
 import {useRouter} from 'vue-router';
 import {getInit, getOrderList} from './components/api';
-import {parseTime} from '@/utils/openhis';
+import {parseTime} from '@/utils/healthlink-his';
 
 const router = useRouter();
 // 制单日期
diff --git a/openhis-ui-vue3/src/views/monitor/job/index.vue b/openhis-ui-vue3/src/views/monitor/job/index.vue
index e13727cb1..ab3848d13 100755
--- a/openhis-ui-vue3/src/views/monitor/job/index.vue
+++ b/openhis-ui-vue3/src/views/monitor/job/index.vue
@@ -336,8 +336,8 @@
                   <el-tooltip placement="top">
                     <template #content>
                       <div>
-                        Bean调用示例：ryTask.ryParams('openhis')
-                        <br>Class类调用示例：com.openhis.quartz.task.RyTask.ryParams('openhis')
+                        Bean调用示例：ryTask.ryParams('healthlink-his')
+                        <br>Class类调用示例：com.healthlink-his.quartz.task.RyTask.ryParams('healthlink-his')
                         <br>参数说明：支持字符串，布尔类型，长整型，浮点型，整型
                       </div>
                     </template>
diff --git a/openhis-ui-vue3/src/views/register.vue b/openhis-ui-vue3/src/views/register.vue
index 244be1dce..73dd23576 100755
--- a/openhis-ui-vue3/src/views/register.vue
+++ b/openhis-ui-vue3/src/views/register.vue
@@ -109,7 +109,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-register-footer">
-      <span>Copyright © 2018-2024 openhis.vip All Rights Reserved.</span>
+      <span>Copyright © 2018-2024 healthlink-his.vip All Rights Reserved.</span>
     </div>
   </div>
 </template>
diff --git a/openhis-ui-vue3/src/views/surgicalschedule/index.vue b/openhis-ui-vue3/src/views/surgicalschedule/index.vue
index 4d96337c5..00ab6b1dc 100755
--- a/openhis-ui-vue3/src/views/surgicalschedule/index.vue
+++ b/openhis-ui-vue3/src/views/surgicalschedule/index.vue
@@ -1645,7 +1645,7 @@
 <script setup name="SurgicalSchedule">
 import { ref, reactive, onMounted, nextTick, computed, watch } from 'vue'
 import { getCurrentInstance } from 'vue'
-import { parseTime } from '@/utils/openhis'
+import { parseTime } from '@/utils/healthlink-his'
 import { useDict } from '@/utils/dict'
 import download from '@/plugins/download'
 import Prescriptionlist from '@/views/clinicmanagement/bargain/component/prescriptionlist.vue'
diff --git a/openhis-ui-vue3/src/views/surgicalschedule/temporaryMedical.vue b/openhis-ui-vue3/src/views/surgicalschedule/temporaryMedical.vue
index e63c1b178..bc1a92383 100755
--- a/openhis-ui-vue3/src/views/surgicalschedule/temporaryMedical.vue
+++ b/openhis-ui-vue3/src/views/surgicalschedule/temporaryMedical.vue
@@ -399,7 +399,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import useUserStore from '@/store/modules/user'
 import { checkPassword } from '@/api/surgicalschedule'
 import { savePrescription } from '@/views/clinicmanagement/bargain/component/api.js'
-import { parseTime } from '@/utils/openhis'
+import { parseTime } from '@/utils/healthlink-his'
 
 // 定义props
 const props = defineProps({
diff --git a/openhis-ui-vue3/src/views/system/menu/index.vue b/openhis-ui-vue3/src/views/system/menu/index.vue
index 2f3e12a99..98a6e43e5 100755
--- a/openhis-ui-vue3/src/views/system/menu/index.vue
+++ b/openhis-ui-vue3/src/views/system/menu/index.vue
@@ -585,7 +585,7 @@
 import {addMenu, delMenu, getMenu, listMenu, updateMenu, treeselect, refreshMenuCache} from "@/api/system/menu";
 import SvgIcon from "@/components/SvgIcon";
 import IconSelect from "@/components/IconSelect";
-import {getNormalPath} from "@/utils/openhis";
+import {getNormalPath} from "@/utils/healthlink-his";
 
 const { proxy } = getCurrentInstance();
 const { sys_show_hide, sys_normal_disable } = proxy.useDict("sys_show_hide", "sys_normal_disable");
diff --git a/openhis-ui-vue3/src/views/tool/gen/genInfoForm.vue b/openhis-ui-vue3/src/views/tool/gen/genInfoForm.vue
index f74d5067f..4eda5bde3 100755
--- a/openhis-ui-vue3/src/views/tool/gen/genInfoForm.vue
+++ b/openhis-ui-vue3/src/views/tool/gen/genInfoForm.vue
@@ -54,7 +54,7 @@
           <template #label>
             生成包路径
             <el-tooltip
-              content="生成在哪个java包下，例如 com.openhis.system"
+              content="生成在哪个java包下，例如 com.healthlink-his.system"
               placement="top"
             >
               <el-icon><question-filled /></el-icon>
diff --git a/openhis-ui-vue3/src/views/tool/gen/index.vue b/openhis-ui-vue3/src/views/tool/gen/index.vue
index 9d3569ec9..c57a10dd8 100755
--- a/openhis-ui-vue3/src/views/tool/gen/index.vue
+++ b/openhis-ui-vue3/src/views/tool/gen/index.vue
@@ -369,7 +369,7 @@ function handleGenTable(row) {
       proxy.$modal.msgSuccess("成功生成到自定义路径：" + row.genPath);
     });
   } else {
-    proxy.$download.zip("/tool/gen/batchGenCode?tables=" + tbNames, "openhis.zip");
+    proxy.$download.zip("/tool/gen/batchGenCode?tables=" + tbNames, "healthlink-his.zip");
   }
 }
 /** 同步数据库操作 */
diff --git a/openhis-ui-vue3/tests/e2e/specs/bug-630.spec.ts b/openhis-ui-vue3/tests/e2e/specs/bug-630.spec.ts
index a3dab16a5..24cea49c8 100644
--- a/openhis-ui-vue3/tests/e2e/specs/bug-630.spec.ts
+++ b/openhis-ui-vue3/tests/e2e/specs/bug-630.spec.ts
@@ -10,7 +10,7 @@ test.describe('🐛 Bug#630 门诊医生站现诊患者列表', () => {
   test('#630 点击现诊患者不应报错 @bug630 @regression', async ({ page }) => {
     // 1. 登录
     await page.goto('http://localhost:81/');
-    const loginResp = await page.request.post('http://localhost:18082/openhis/login', {
+    const loginResp = await page.request.post('http://localhost:18082/healthlink-his/login', {
       data: { username: 'doctor1', password: '123456', tenantId: '1', code: '', uuid: '' }
     });
     const loginData = await loginResp.json();
diff --git a/openhis-ui-vue3/tests/e2e/specs/debug-console.spec.ts b/openhis-ui-vue3/tests/e2e/specs/debug-console.spec.ts
index c9d7c4b89..8aeb81f22 100644
--- a/openhis-ui-vue3/tests/e2e/specs/debug-console.spec.ts
+++ b/openhis-ui-vue3/tests/e2e/specs/debug-console.spec.ts
@@ -17,7 +17,7 @@ test('debug console', async ({ page }) => {
   });
 
   await page.goto('http://localhost:81/');
-  const loginResp = await page.request.post('http://localhost:18082/openhis/login', {
+  const loginResp = await page.request.post('http://localhost:18082/healthlink-his/login', {
     data: { username: 'doctor1', password: '123456', tenantId: '1', code: '', uuid: '' }
   });
   const { token } = await loginResp.json();
diff --git a/openhis-ui-vue3/tests/e2e/specs/debug-login.spec.ts b/openhis-ui-vue3/tests/e2e/specs/debug-login.spec.ts
index 214f5db7f..9b44fcc1e 100644
--- a/openhis-ui-vue3/tests/e2e/specs/debug-login.spec.ts
+++ b/openhis-ui-vue3/tests/e2e/specs/debug-login.spec.ts
@@ -6,7 +6,7 @@ test('debug login', async ({ page }) => {
   await page.waitForLoadState('networkidle');
   
   // 2. 调用登录 API
-  const loginResp = await page.request.post('http://localhost:18082/openhis/login', {
+  const loginResp = await page.request.post('http://localhost:18082/healthlink-his/login', {
     data: {
       username: 'doctor1',
       password: '123456',
diff --git a/openhis-ui-vue3/tests/e2e/specs/debug-page.spec.ts b/openhis-ui-vue3/tests/e2e/specs/debug-page.spec.ts
index e85c879fb..bad443901 100644
--- a/openhis-ui-vue3/tests/e2e/specs/debug-page.spec.ts
+++ b/openhis-ui-vue3/tests/e2e/specs/debug-page.spec.ts
@@ -3,7 +3,7 @@ import { test, expect } from '@playwright/test';
 test('debug page load', async ({ page }) => {
   // 登录
   await page.goto('http://localhost:81/');
-  const loginResp = await page.request.post('http://localhost:18082/openhis/login', {
+  const loginResp = await page.request.post('http://localhost:18082/healthlink-his/login', {
     data: { username: 'doctor1', password: '123456', tenantId: '1', code: '', uuid: '' }
   });
   const loginData = await loginResp.json();
diff --git a/openhis-ui-vue3/vite.config.js b/openhis-ui-vue3/vite.config.js
index ffdab3d5b..c0f63ac9e 100755
--- a/openhis-ui-vue3/vite.config.js
+++ b/openhis-ui-vue3/vite.config.js
@@ -18,7 +18,7 @@ export default defineConfig(({ mode, command }) => {
     },
     // 部署生产环境和开发环境下的URL。
     // 默认情况下，vite 会假设你的应用是被部署在一个域名的根路径上
-    // 例如 https://www.openHIS.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.openhis.vip/admin/，则设置 baseUrl 为 /admin/。
+    // 例如 https://www.openHIS.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.healthlink-his.vip/admin/，则设置 baseUrl 为 /admin/。
     base: VITE_APP_ENV === 'production' ? '/' : '/',
     plugins: createVitePlugins(env, command === 'build'),
     resolve: {
@@ -41,7 +41,7 @@ export default defineConfig(({ mode, command }) => {
       proxy: {
         // https://cn.vitejs.dev/config/#server-proxy
         '/dev-api': {
-          target: process.env.VITE_API_PROXY || 'http://localhost:18080/openhis',
+          target: process.env.VITE_API_PROXY || 'http://localhost:18080/healthlink-his',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, ''),
         },
diff --git a/openhis-ui-vue3/vite/plugins/compression.js b/openhis-ui-vue3/vite/plugins/compression.js
index 96ccd30cf..35d1b6ff8 100755
--- a/openhis-ui-vue3/vite/plugins/compression.js
+++ b/openhis-ui-vue3/vite/plugins/compression.js
@@ -6,7 +6,7 @@ export default function createCompression(env) {
     if (VITE_BUILD_COMPRESS) {
         const compressList = VITE_BUILD_COMPRESS.split(',')
         if (compressList.includes('gzip')) {
-            // http://doc.openhisis.vip/openhis-vue/other/faq.html#使用gzip解压缩静态文件
+            // http://doc.healthlink-hisis.vip/healthlink-his-vue/other/faq.html#使用gzip解压缩静态文件
             plugin.push(
                 compression({
                     ext: '.gz',