!10 Merge branch 'develop' of <a href="https://gitee.com/Ubuntu_925/openhis-itai">https://gitee.com/Ubuntu_925/openhis-itai</a> into develop

Merge pull request !10 from Ubuntu_925/develop

.github/copilot-instructions.md

@@ -1,76 +0,0 @@
-# OpenHIS — AI 编码助手 指南
-
-目的：帮助自动化/AI 编码代理快速上手本仓库，包含架构要点、关键文件、常用构建/运行命令以及项目约定。请只按照仓库内真实可见的内容提出修改建议或补充说明。
-
-- **代码组织**: 本项目是一个 Java 后端（多模块 Maven）+ Vue3 前端（Vite）的大型应用。
-  - 后端主模块目录：`openhis-server-new/`（顶层为 `pom`，包含多个子模块）。关键子模块示例：`openhis-application`, `openhis-domain`, `openhis-common`, `core-*` 系列。
-  - 前端目录：`openhis-ui-vue3/`（Vite + Vue 3，使用 Pinia、Element Plus 等）。
-
-- **大局观（Big Picture）**: 后端以 Spring Boot（Java 17）实现，使用多模块 Maven 管理公共库与业务模块；前端由单独仓库目录通过 Vite 构建并以环境变量（`VITE_APP_BASE_API`）与后端交互。后端扫描 `com.core` 与 `com.openhis` 包（见 `OpenHisApplication.java`），启动类位于：`openhis-server-new/openhis-application/src/main/java/com/openhis/OpenHisApplication.java`。
-
-- **运行/构建（Windows PowerShell 示例）**:
-  - 构建后端（从仓库根执行）：
-
-```powershell
-cd openhis-server-new
-mvn clean package -DskipTests
-```
-
-  - 仅运行后端模块（开发时常用）：
-
-```powershell
-cd openhis-server-new/openhis-application
-mvn spring-boot:run
-# 或在 IDE 中运行 `com.openhis.OpenHisApplication` 的 main()
-```
-
-  - 前端启动与构建（需要 Node.js v16.x，仓库 README 建议 v16.15）：
-
-```powershell
-cd openhis-ui-vue3
-npm install
-npm run dev           # 本地开发（热重载）
-npm run build:prod    # 生产构建
-```
-
-- **环境与配置**:
-  - 后端配置：`openhis-server-new/openhis-application/src/main/resources/application.yml`（数据库、端口、profile 等）。README 还提及 `application-druid.yml`（若存在请优先查看）。
-  - 前端配置：多个 `.env.*` 文件（例如 `.env.development`, `.env.staging`, `.env.production`），关键变量：`VITE_APP_BASE_API`（例如 `/dev-api`），前端通过 `import.meta.env.VITE_APP_BASE_API` 拼接后端 URL（见 `src/utils/request.js`、多个视图与组件）。
-
-- **重要约定 / 模式**:
-  - 后端采用 Java 17、Spring Boot 2.5.x 家族，父 POM在 `openhis-server-new/pom.xml` 定义。常用依赖版本在该 POM 的 `<properties>` 中集中维护。
-  - 模块间以 Maven 模块依赖与 `com.core` / `com.openhis` 包名分层（见 `pom.xml` 的 `<modules>` 与 `dependencyManagement`）。
-  - 前端通过 Vite 插件配置（`openhis-ui-vue3/vite/plugins`）管理 svg、自动导入等。UI 框架为 Element Plus，状态管理为 Pinia。
-
-- **集成点 & 外部依赖**:
-  - 数据库：PostgreSQL（README 建议 v16.2），仓库根含一个大型初始化 SQL：`数据库初始话脚本（请使用navicat16版本导入）.sql`，用于初始化表与演示数据。
-  - 缓存/会话：Redis（需自行配置）。
-  - 其他：Flowable（工作流），Druid（连接池监控），第三方服务通过特定配置类（例如 `YbServiceConfig` 在 `OpenHisApplication` 中启用）。
-
-- **调试与常见位置**:
-  - 启动类：`openhis-server-new/openhis-application/src/main/java/com/openhis/OpenHisApplication.java`。
-  - 全局配置：`openhis-server-new/openhis-application/src/main/resources/`（`application.yml`、profile 文件等）。
-  - 前端入口：`openhis-ui-vue3/src/main.js`、路由在 `openhis-ui-vue3/src/router/index.js`。
-  - API 文档与监控路径（通常由后端暴露并被前端访问）：
-    - Swagger UI: `<VITE_APP_BASE_API>/swagger-ui/index.html`（前端视图在 `src/views/tool/swagger/index.vue`）。
-    - Druid: `<VITE_APP_BASE_API>/druid/login.html`（见前端相关视图引用）。
-
-- **为 AI 代理的具体建议（如何安全、有效地修改代码）**:
-  - 修改后端时：优先在子模块（例如 `openhis-application`）本地运行 `mvn spring-boot:run` 验证启动与基础 API；大量改动前先执行 `mvn -T1C -DskipTests clean package` 在 CI 环境上验证构建（本地机器也可用）。
-  - 修改前端时：检查/调整对应 `.env.*` 文件中的 `VITE_APP_BASE_API`，使用 `npm run dev` 本地联调后端接口（可通过代理或将 `VITE_APP_BASE_API` 指向后端地址）。
-  - 修改数据库结构或 seed：请参考仓库根的 SQL 初始化脚本，任何 DDL/数据变更需同步该脚本并通知数据库管理员/运维。
-
-- **举例（常见任务示例）**:
-  - 本地联调前端 + 后端（PowerShell）:
-
-```powershell
-# 启动后端
-cd openhis-server-new/openhis-application
-mvn spring-boot:run
-
-# 启动前端（另开终端）
-cd openhis-ui-vue3
-npm run dev
-```
-
-如需我把这些内容合并为更短或更详细的版本，或把其中某部分（例如后端模块依赖关系图、关键 Java 包说明）展开，请告诉我要增强哪一节。

.gitignore

@@ -58,8 +58,3 @@
 PostgreSQL/openHis_DB设计书.xlsx
 
 public.sql
-发版记录/2025-11-12/~$发版日志.docx
-发版记录/2025-11-12/~$S-管理系统-调价管理.docx
-发版记录/2025-11-12/发版日志.docx
-.gitignore
-openhis-server-new/openhis-application/src/main/resources/application-dev.yml

README.md

@@ -4,11 +4,11 @@
 
 ![天天开源](https://open.tntlinking.com/assets/logo-b-BzFUYaRU.png) 
 
-天天开源致⼒于打造中国应⽤管理 软件开源⽣态，⾯向医疗、企业、教育三⼤⾏业信息化需求，提供优质的开源软件产品与解决⽅案。平台现已发布OpenHIS、OpenCOM、OpenEDU系列开源产品，并持续招募⽣态合作伙伴，期待共同构建开源创新的⾏业协作模式，加速⾏业的数字化进程。
+天天开源致⼒于打造中国应⽤管理软件开源⽣态，⾯向医疗、企业、教育三⼤⾏业信息化需求，提供优质的开源软件产品与解决⽅案。平台现已发布OpenHIS、OpenCOM、OpenEDU系列开源产品，并持续招募⽣态合作伙伴，期待共同构建开源创新的⾏业协作模式，加速⾏业的数字化进程。
 
 天天开源的前⾝是新致开源，最早于2022年6⽉发布开源医疗软件平台OpenHIS.org.cn，于2023年6⽉发布开源企业软件平台OpenCOM.com.cn。2025年7⽉，新致开源品牌更新为天天开源，我们始终秉持开源、专业、协作的理念，致⼒于为医疗、教育、中⼩企业等⾏业提供优质的开源解决⽅案。
 
-了解我们a：https://open.tntlinking.com/about?site=gitee
+了解我们：https://open.tntlinking.com/about?site=gitee
 
 ## 💾【部署包下载】
 
@@ -16,10 +16,10 @@
 
 ## 📚【支持文档】
 
-技术支持资源：https://open.tntlinking.com/resource/openProductDoc?site=gitee
+技术支持资源：https://open.tntlinking.com/resource/technicalSupport?site=gitee
 （含演示环境、操作手册、部署手册、开发手册、常见问题等）
 
-产品介绍：https://open.tntlinking.com/resource/productPresentation?site=gitee
+产品介绍：https://open.tntlinking.com/resource/industryKnowledge?site=gitee
 
 操作教程：https://open.tntlinking.com/resource/operationTutorial?site=gitee
 

TestDeleteInspectionType.java

@@ -1,39 +0,0 @@
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.Scanner;
-
-public class TestDeleteInspectionType {
-    public static void main(String[] args) {
-        try {
-            // 测试删除ID为1的检验类型
-            long inspectionTypeId = 1;
-            URL url = new URL("http://localhost:8080/system/inspection-type/" + inspectionTypeId);
-            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-            connection.setRequestMethod("DELETE");
-            connection.setRequestProperty("Content-Type", "application/json");
-            connection.setRequestProperty("Accept", "application/json");
-            
-            // 发送请求
-            int responseCode = connection.getResponseCode();
-            System.out.println("响应代码: " + responseCode);
-            
-            // 读取响应
-            Scanner scanner;
-            if (responseCode >= 200 && responseCode < 300) {
-                scanner = new Scanner(connection.getInputStream());
-            } else {
-                scanner = new Scanner(connection.getErrorStream());
-            }
-            
-            String response = scanner.useDelimiter("\\A").next();
-            System.out.println("响应内容: " + response);
-            
-            scanner.close();
-            connection.disconnect();
-            
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-}

openhis-server-new/com/openhis/tool/DatabaseFieldAdder.java

@@ -1,45 +0,0 @@
-package com.openhis.tool;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.Statement;
-
-/**
- * Database field adder tool
- */
-public class DatabaseFieldAdder {
-    public static void main(String[] args) {
-        String url = "jdbc:postgresql://192.168.110.252:15432/postgresql?currentSchema=public";
-        String username = "postgresql";
-        String password = "Jchl1528";
-        
-        try (Connection conn = DriverManager.getConnection(url, username, password);
-             Statement stmt = conn.createStatement()) {
-            
-            // Check if field exists
-            String checkSql = "SELECT column_name FROM information_schema.columns " +
-                             "WHERE table_name = 'adm_healthcare_service' AND column_name = 'practitioner_id'";
-            
-            boolean fieldExists = stmt.executeQuery(checkSql).next();
-            
-            if (!fieldExists) {
-                // Add field
-                String addSql = "ALTER TABLE \"public\".\"adm_healthcare_service\" " +
-                               "ADD COLUMN \"practitioner_id\" int8";
-                stmt.execute(addSql);
-                
-                // Add comment
-                String commentSql = "COMMENT ON COLUMN \"public\".\"adm_healthcare_service\".\"practitioner_id\" IS 'practitioner_id'";
-                stmt.execute(commentSql);
-                
-                System.out.println("Successfully added practitioner_id field to adm_healthcare_service table");
-            } else {
-                System.out.println("practitioner_id field already exists");
-            }
-            
-        } catch (Exception e) {
-            System.err.println("Error executing SQL: " + e.getMessage());
-            e.printStackTrace();
-        }
-    }
-}

openhis-server-new/core-admin/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="http://maven.apache.org/POM/4.0.0"
+         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">
+         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>
@@ -25,11 +25,6 @@
             <artifactId>spring-boot-devtools</artifactId>
             <optional>true</optional> <!-- 表示依赖不会传递 -->
         </dependency>
-        <!-- lombok -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
 
         <!-- swagger3-->
         <dependency>
@@ -43,10 +38,9 @@
             <artifactId>swagger-models</artifactId>
         </dependency>
 
-        <!-- Mysql驱动包 -->
         <dependency>
-            <groupId>mysql</groupId>
+            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <artifactId>mysql-connector-j</artifactId>
         </dependency>
 
         <!-- 核心模块-->
@@ -72,12 +66,45 @@
             <groupId>com.core</groupId>
             <artifactId>core-flowable</artifactId>
         </dependency>
-        <!-- 通用工具-->
+
-        <dependency>
-            <groupId>com.core</groupId>
-            <artifactId>core-common</artifactId>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
+<!--        <build>-->
+<!--            <plugins>-->
+<!--                <plugin>-->
+<!--                    <groupId>org.springframework.boot</groupId>-->
+<!--                    <artifactId>spring-boot-maven-plugin</artifactId>-->
+<!--                    <version>2.5.15</version>-->
+<!--                    <configuration>-->
+<!--                        <fork>true</fork> &lt;!&ndash; 如果没有该配置，devtools不会生效 &ndash;&gt;-->
+<!--                    </configuration>-->
+<!--                    <executions>-->
+<!--                        <execution>-->
+<!--                            <goals>-->
+<!--                                <goal>repackage</goal>-->
+<!--                            </goals>-->
+<!--                        </execution>-->
+<!--                    </executions>-->
+<!--                </plugin>-->
+<!--                <plugin>-->
+<!--                    <groupId>org.apache.maven.plugins</groupId>-->
+<!--                    <artifactId>maven-war-plugin</artifactId>-->
+<!--                    <version>3.1.0</version>-->
+<!--                    <configuration>-->
+<!--                        <failOnMissingWebXml>false</failOnMissingWebXml>-->
+<!--                        <warName>${project.artifactId}</warName>-->
+<!--                    </configuration>-->
+<!--                </plugin>-->
+<!--                <plugin>-->
+<!--                    <groupId>org.apache.maven.plugins</groupId>-->
+<!--                    <artifactId>maven-compiler-plugin</artifactId>-->
+<!--                    <configuration>-->
+<!--                        <source>8</source>-->
+<!--                        <target>8</target>-->
+<!--                    </configuration>-->
+<!--                </plugin>-->
+<!--            </plugins>-->
+<!--            <finalName>${project.artifactId}</finalName>-->
+<!--        </build>-->
+
 </project>

openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/CaptchaController.java

@@ -1,5 +1,18 @@
 package com.core.web.controller.common;
 
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+import javax.annotation.Resource;
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.FastByteArrayOutputStream;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.core.common.config.CoreConfig;
 import com.core.common.constant.CacheConstants;
 import com.core.common.constant.Constants;
@@ -9,17 +22,6 @@ import com.core.common.utils.sign.Base64;
 import com.core.common.utils.uuid.IdUtils;
 import com.core.system.service.ISysConfigService;
 import com.google.code.kaptcha.Producer;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.FastByteArrayOutputStream;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.imageio.ImageIO;
-import javax.servlet.http.HttpServletResponse;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
 
 /**
  * 验证码操作处理

openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/CommonController.java

@@ -1,12 +1,11 @@
 package com.core.web.controller.common;
 
-import com.core.common.config.CoreConfig;
+import java.util.ArrayList;
-import com.core.common.constant.Constants;
+import java.util.List;
-import com.core.common.core.domain.AjaxResult;
+
-import com.core.common.utils.StringUtils;
+import javax.servlet.http.HttpServletRequest;
-import com.core.common.utils.file.FileUploadUtils;
+import javax.servlet.http.HttpServletResponse;
-import com.core.common.utils.file.FileUtils;
+
-import com.core.framework.config.ServerConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,10 +16,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
+import com.core.common.config.CoreConfig;
-import javax.servlet.http.HttpServletResponse;
+import com.core.common.constant.Constants;
-import java.util.ArrayList;
+import com.core.common.core.domain.AjaxResult;
-import java.util.List;
+import com.core.common.utils.StringUtils;
+import com.core.common.utils.file.FileUploadUtils;
+import com.core.common.utils.file.FileUtils;
+import com.core.framework.config.ServerConfig;
 
 /**
  * 通用请求处理

openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/FileUploadController.java

@@ -1,5 +1,13 @@
 package com.core.web.controller.common;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
 import com.core.common.annotation.Anonymous;
 import com.core.common.config.CoreConfig;
 import com.core.common.core.domain.AjaxResult;
@@ -8,13 +16,6 @@ import com.core.common.utils.StringUtils;
 import com.core.common.utils.file.FileUploadUtils;
 import com.core.common.utils.file.FileUtils;
 import com.core.framework.config.ServerConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 
 @RestController
 @RequestMapping("/file")

openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/CacheController.java

@@ -1,16 +1,17 @@
 package com.core.web.controller.monitor;
 
-import com.core.common.constant.CacheConstants;
+import java.util.*;
-import com.core.common.core.domain.AjaxResult;
+
-import com.core.common.utils.StringUtils;
-import com.core.system.domain.SysCache;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisCallback;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.*;
+import com.core.common.constant.CacheConstants;
+import com.core.common.core.domain.AjaxResult;
+import com.core.common.utils.StringUtils;
+import com.core.system.domain.SysCache;
 
 /**
  * 缓存监控

openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/ServerController.java

@@ -1,12 +1,13 @@
 package com.core.web.controller.monitor;
 
-import com.core.common.core.domain.AjaxResult;
-import com.core.framework.web.domain.Server;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.core.common.core.domain.AjaxResult;
+import com.core.framework.web.domain.Server;
+
 /**
  * 服务器监控
  * 

openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysLogininforController.java

@@ -1,5 +1,13 @@
 package com.core.web.controller.monitor;
 
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
 import com.core.common.annotation.Log;
 import com.core.common.core.controller.BaseController;
 import com.core.common.core.domain.AjaxResult;
@@ -9,23 +17,15 @@ import com.core.common.utils.poi.ExcelUtil;
 import com.core.framework.web.service.SysPasswordService;
 import com.core.system.domain.SysLogininfor;
 import com.core.system.service.ISysLogininforService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 
 /**
- *
+ * 系统访问记录
  * 
  * @author system
  */
 @RestController
 @RequestMapping("/monitor/logininfor")
-
 public class SysLogininforController extends BaseController {
-
     @Autowired
     private ISysLogininforService logininforService;
 

openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysOperlogController.java

@@ -1,5 +1,13 @@
 package com.core.web.controller.monitor;
 
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
 import com.core.common.annotation.Log;
 import com.core.common.core.controller.BaseController;
 import com.core.common.core.domain.AjaxResult;
@@ -8,12 +16,6 @@ import com.core.common.enums.BusinessType;
 import com.core.common.utils.poi.ExcelUtil;
 import com.core.system.domain.SysOperLog;
 import com.core.system.service.ISysOperLogService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 
 /**
  * 操作日志记录

openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysUserOnlineController.java

@@ -1,5 +1,14 @@
 package com.core.web.controller.monitor;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
 import com.core.common.annotation.Log;
 import com.core.common.constant.CacheConstants;
 import com.core.common.core.controller.BaseController;
@@ -11,14 +20,6 @@ import com.core.common.enums.BusinessType;
 import com.core.common.utils.StringUtils;
 import com.core.system.domain.SysUserOnline;
 import com.core.system.service.ISysUserOnlineService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
 
 /**
  * 在线用户监控

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysConfigController.java

@@ -1,5 +1,14 @@
 package com.core.web.controller.system;
 
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
 import com.core.common.annotation.Log;
 import com.core.common.core.controller.BaseController;
 import com.core.common.core.domain.AjaxResult;
@@ -8,13 +17,6 @@ import com.core.common.enums.BusinessType;
 import com.core.common.utils.poi.ExcelUtil;
 import com.core.system.domain.SysConfig;
 import com.core.system.service.ISysConfigService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 
 /**
  * 参数配置 信息操作处理

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDeptController.java

@@ -1,5 +1,13 @@
 package com.core.web.controller.system;
 
+import java.util.List;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
 import com.core.common.annotation.Log;
 import com.core.common.constant.UserConstants;
 import com.core.common.core.controller.BaseController;
@@ -8,13 +16,6 @@ import com.core.common.core.domain.entity.SysDept;
 import com.core.common.enums.BusinessType;
 import com.core.common.utils.StringUtils;
 import com.core.system.service.ISysDeptService;
-import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
 
 /**
  * 部门信息

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDictDataController.java

@@ -1,5 +1,15 @@
 package com.core.web.controller.system;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
 import com.core.common.annotation.Log;
 import com.core.common.core.controller.BaseController;
 import com.core.common.core.domain.AjaxResult;
@@ -10,14 +20,6 @@ import com.core.common.utils.StringUtils;
 import com.core.common.utils.poi.ExcelUtil;
 import com.core.system.service.ISysDictDataService;
 import com.core.system.service.ISysDictTypeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * 数据字典信息
@@ -60,12 +62,11 @@ public class SysDictDataController extends BaseController {
     }
 
     /**
-     * 根据字典类型查询字典数据信息（支持拼音搜索）
+     * 根据字典类型查询字典数据信息
      */
     @GetMapping(value = "/type/{dictType}")
-    public AjaxResult dictType(@PathVariable String dictType,
+    public AjaxResult dictType(@PathVariable String dictType) {
-                               @RequestParam(value = "searchKey", required = false) String searchKey) {
+        List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
-        List<SysDictData> data = dictTypeService.selectDictDataByType(dictType, searchKey);
         if (StringUtils.isNull(data)) {
             data = new ArrayList<SysDictData>();
         }

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDictTypeController.java

@@ -1,5 +1,14 @@
 package com.core.web.controller.system;
 
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
 import com.core.common.annotation.Log;
 import com.core.common.core.controller.BaseController;
 import com.core.common.core.domain.AjaxResult;
@@ -8,13 +17,6 @@ import com.core.common.core.page.TableDataInfo;
 import com.core.common.enums.BusinessType;
 import com.core.common.utils.poi.ExcelUtil;
 import com.core.system.service.ISysDictTypeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 
 /**
  * 数据字典信息

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysIndexController.java

@@ -1,11 +1,12 @@
 package com.core.web.controller.system;
 
-import com.core.common.config.CoreConfig;
-import com.core.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.core.common.config.CoreConfig;
+import com.core.common.utils.StringUtils;
+
 /**
  * 首页
  *

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysLoginController.java

@@ -1,5 +1,14 @@
 package com.core.web.controller.system;
 
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.core.common.constant.Constants;
 import com.core.common.core.domain.AjaxResult;
 import com.core.common.core.domain.entity.SysMenu;
@@ -11,14 +20,6 @@ import com.core.framework.web.service.SysLoginService;
 import com.core.framework.web.service.SysPermissionService;
 import com.core.framework.web.service.TokenService;
 import com.core.system.service.ISysMenuService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.Set;
 
 /**已评审
  * 登录验证

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysMenuController.java

@@ -1,5 +1,12 @@
 package com.core.web.controller.system;
 
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
 import com.core.common.annotation.Log;
 import com.core.common.constant.UserConstants;
 import com.core.common.core.controller.BaseController;
@@ -8,12 +15,6 @@ import com.core.common.core.domain.entity.SysMenu;
 import com.core.common.enums.BusinessType;
 import com.core.common.utils.StringUtils;
 import com.core.system.service.ISysMenuService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
 
 /**
  * 菜单信息

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysNoticeController.java

@@ -1,5 +1,12 @@
 package com.core.web.controller.system;
 
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
 import com.core.common.annotation.Log;
 import com.core.common.core.controller.BaseController;
 import com.core.common.core.domain.AjaxResult;
@@ -7,12 +14,6 @@ import com.core.common.core.page.TableDataInfo;
 import com.core.common.enums.BusinessType;
 import com.core.system.domain.SysNotice;
 import com.core.system.service.ISysNoticeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
 
 /**
  * 公告 信息操作处理

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysPostController.java

@@ -1,5 +1,14 @@
 package com.core.web.controller.system;
 
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
 import com.core.common.annotation.Log;
 import com.core.common.core.controller.BaseController;
 import com.core.common.core.domain.AjaxResult;
@@ -8,13 +17,6 @@ import com.core.common.enums.BusinessType;
 import com.core.common.utils.poi.ExcelUtil;
 import com.core.system.domain.SysPost;
 import com.core.system.service.ISysPostService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 
 /**
  * 岗位信息操作处理

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysProfileController.java

@@ -1,5 +1,9 @@
 package com.core.web.controller.system;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
 import com.core.common.annotation.Log;
 import com.core.common.config.CoreConfig;
 import com.core.common.core.controller.BaseController;
@@ -13,9 +17,6 @@ import com.core.common.utils.file.FileUploadUtils;
 import com.core.common.utils.file.MimeTypeUtils;
 import com.core.framework.web.service.TokenService;
 import com.core.system.service.ISysUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 个人信息 业务处理

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysRegisterController.java

@@ -1,15 +1,16 @@
 package com.core.web.controller.system;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.core.common.core.controller.BaseController;
 import com.core.common.core.domain.AjaxResult;
 import com.core.common.core.domain.model.RegisterBody;
 import com.core.common.utils.StringUtils;
 import com.core.framework.web.service.SysRegisterService;
 import com.core.system.service.ISysConfigService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 注册验证

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysRoleController.java

@@ -1,5 +1,14 @@
 package com.core.web.controller.system;
 
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
 import com.core.common.annotation.Log;
 import com.core.common.core.controller.BaseController;
 import com.core.common.core.domain.AjaxResult;
@@ -17,13 +26,6 @@ import com.core.system.domain.SysUserRole;
 import com.core.system.service.ISysDeptService;
 import com.core.system.service.ISysRoleService;
 import com.core.system.service.ISysUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 
 /**
  * 角色信息

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysTenantController.java

@@ -1,5 +1,11 @@
 package com.core.web.controller.system;
 
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.annotation.Anonymous;
 import com.core.common.core.controller.BaseController;
@@ -7,11 +13,6 @@ import com.core.common.core.domain.R;
 import com.core.common.core.domain.entity.SysUser;
 import com.core.system.domain.SysTenant;
 import com.core.system.service.ISysTenantService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
 
 /**
  * 租户信息controller

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysTenantOptionController.java

@@ -1,15 +1,16 @@
 package com.core.web.controller.system;
 
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
 import com.core.common.core.controller.BaseController;
 import com.core.common.core.domain.R;
 import com.core.system.domain.dto.SaveTenantOptionDetailDto;
 import com.core.system.domain.dto.TenantOptionDto;
 import com.core.system.service.ISysTenantOptionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
 
 /**
  * 租户配置项信息controller

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysUserController.java

@@ -1,5 +1,17 @@
 package com.core.web.controller.system;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
 import com.core.common.annotation.Log;
 import com.core.common.core.controller.BaseController;
 import com.core.common.core.domain.AjaxResult;
@@ -15,16 +27,6 @@ import com.core.system.service.ISysDeptService;
 import com.core.system.service.ISysPostService;
 import com.core.system.service.ISysRoleService;
 import com.core.system.service.ISysUserService;
-import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 用户信息

openhis-server-new/core-admin/src/main/java/com/core/web/controller/tool/TestController.java

@@ -1,16 +1,18 @@
 package com.core.web.controller.tool;
 
-import com.core.common.core.controller.BaseController;
-import com.core.common.core.domain.R;
-import com.core.common.utils.StringUtils;
-import io.swagger.annotations.*;
-import org.springframework.web.bind.annotation.*;
-
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.controller.BaseController;
+import com.core.common.core.domain.R;
+import com.core.common.utils.StringUtils;
+
+import io.swagger.annotations.*;
+
 /**
  * swagger 用户测试方法
  * 

openhis-server-new/core-admin/src/main/java/com/core/web/core/config/SwaggerConfig.java

@@ -1,12 +1,17 @@
 package com.core.web.core.config;
 
-import com.core.common.config.CoreConfig;
+import java.util.ArrayList;
-import io.swagger.annotations.ApiOperation;
+import java.util.List;
-import io.swagger.models.auth.In;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+
+import com.core.common.config.CoreConfig;
+
+import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
@@ -15,9 +20,6 @@ import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spi.service.contexts.SecurityContext;
 import springfox.documentation.spring.web.plugins.Docket;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Swagger2的接口配置
  * 

openhis-server-new/core-common/pom.xml

@@ -16,31 +16,6 @@
         common通用工具
     </description>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <source>17</source>
-                    <target>17</target>
-                    <encoding>UTF-8</encoding>
-                    <compilerArgs>
-                        <arg>-parameters</arg>
-                    </compilerArgs>
-                    <annotationProcessorPaths>
-                        <path>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok</artifactId>
-                            <version>1.18.34</version>
-                        </path>
-                    </annotationProcessorPaths>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
 
         <!-- mybatis-plus 增强CRUD -->
@@ -79,12 +54,6 @@
             <artifactId>pagehelper-spring-boot-starter</artifactId>
         </dependency>
 
-        <!-- jsr250 annotations -->
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-        </dependency>
-
         <!-- 自定义验证注解 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -108,6 +77,10 @@
             <groupId>com.alibaba.fastjson2</groupId>
             <artifactId>fastjson2</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
 
         <!-- io常用工具类 -->
         <dependency>
@@ -167,7 +140,6 @@
         <dependency>
             <groupId>com.belerweb</groupId>
             <artifactId>pinyin4j</artifactId>
-            <version>2.5.1</version>
         </dependency>
 
         <dependency>

openhis-server-new/core-common/src/main/java/com/core/common/annotation/DataSource.java

@@ -1,9 +1,9 @@
 package com.core.common.annotation;
 
-import com.core.common.enums.DataSourceType;
-
 import java.lang.annotation.*;
 
+import com.core.common.enums.DataSourceType;
+
 /**
  * 自定义多数据源切换注解
  *

openhis-server-new/core-common/src/main/java/com/core/common/annotation/Excel.java

@@ -1,15 +1,16 @@
 package com.core.common.annotation;
 
-import com.core.common.utils.poi.ExcelHandlerAdapter;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.IndexedColors;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.math.BigDecimal;
 
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.IndexedColors;
+
+import com.core.common.utils.poi.ExcelHandlerAdapter;
+
 /**
  * 自定义导出Excel数据注解
  * 

openhis-server-new/core-common/src/main/java/com/core/common/annotation/ExcelExtra.java

@@ -1,38 +0,0 @@
-package com.core.common.annotation;
-
-import java.lang.annotation.*;
-
-/**
- * Excel额外表头信息注解
- * 
- * @author swb
- */
-@Target(ElementType.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface ExcelExtra {
-    /**
-     * 表头名称
-     */
-    String name();
-
-    /**
-     * 日期格式，如：yyyy-MM-dd HH:mm:ss
-     */
-    String dateFormat() default "";
-
-    /**
-     * 排序（越小越靠前）
-     */
-    int sort() default 0;
-
-    /**
-     * 默认值
-     */
-    String defaultValue() default "";
-
-    /**
-     * 是否导出
-     */
-    boolean isExport() default true;
-}

openhis-server-new/core-common/src/main/java/com/core/common/annotation/Log.java

@@ -1,10 +1,10 @@
 package com.core.common.annotation;
 
+import java.lang.annotation.*;
+
 import com.core.common.enums.BusinessType;
 import com.core.common.enums.OperatorType;
 
-import java.lang.annotation.*;
-
 /**
  * 自定义操作日志记录注解
  * 

openhis-server-new/core-common/src/main/java/com/core/common/annotation/RateLimiter.java

@@ -1,10 +1,10 @@
 package com.core.common.annotation;
 
+import java.lang.annotation.*;
+
 import com.core.common.constant.CacheConstants;
 import com.core.common.enums.LimitType;
 
-import java.lang.annotation.*;
-
 /**
  * 限流注解
  * 

openhis-server-new/core-common/src/main/java/com/core/common/annotation/Sensitive.java

@@ -1,15 +1,15 @@
 package com.core.common.annotation;
 
-import com.core.common.config.serializer.SensitiveJsonSerializer;
-import com.core.common.enums.DesensitizedType;
-import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import com.core.common.config.serializer.SensitiveJsonSerializer;
+import com.core.common.enums.DesensitizedType;
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
 /**
  * 数据脱敏注解
  *

openhis-server-new/core-common/src/main/java/com/core/common/config/serializer/SensitiveJsonSerializer.java

@@ -1,5 +1,8 @@
 package com.core.common.config.serializer;
 
+import java.io.IOException;
+import java.util.Objects;
+
 import com.core.common.annotation.Sensitive;
 import com.core.common.core.domain.model.LoginUser;
 import com.core.common.enums.DesensitizedType;
@@ -11,9 +14,6 @@ import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
 
-import java.io.IOException;
-import java.util.Objects;
-
 /**
  * 数据脱敏序列化过滤
  *

openhis-server-new/core-common/src/main/java/com/core/common/constant/Constants.java

@@ -1,9 +1,9 @@
 package com.core.common.constant;
 
-import io.jsonwebtoken.Claims;
-
 import java.util.Locale;
 
+import io.jsonwebtoken.Claims;
+
 /**
  * 通用常量信息
  * 

openhis-server-new/core-common/src/main/java/com/core/common/core/controller/BaseController.java

@@ -1,5 +1,14 @@
 package com.core.common.core.controller;
 
+import java.beans.PropertyEditorSupport;
+import java.util.Date;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.InitBinder;
+
 import com.core.common.constant.HttpStatus;
 import com.core.common.core.domain.AjaxResult;
 import com.core.common.core.domain.model.LoginUser;
@@ -13,14 +22,6 @@ import com.core.common.utils.StringUtils;
 import com.core.common.utils.sql.SqlUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.InitBinder;
-
-import java.beans.PropertyEditorSupport;
-import java.util.Date;
-import java.util.List;
 
 /**
  * web层通用数据处理

openhis-server-new/core-common/src/main/java/com/core/common/core/domain/AjaxResult.java

@@ -1,11 +1,11 @@
 package com.core.common.core.domain;
 
-import com.core.common.constant.HttpStatus;
-import com.core.common.utils.StringUtils;
-
 import java.util.HashMap;
 import java.util.Objects;
 
+import com.core.common.constant.HttpStatus;
+import com.core.common.utils.StringUtils;
+
 /**
  * 操作消息提醒
  * 

openhis-server-new/core-common/src/main/java/com/core/common/core/domain/BaseEntity.java

@@ -1,15 +1,15 @@
 package com.core.common.core.domain;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-
 import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
 /**
  * Entity基类
  * 

openhis-server-new/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java

@@ -1,15 +1,16 @@
 package com.core.common.core.domain;
 
+import java.io.Serializable;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.io.Serializable;
-import java.util.Date;
-
 /**
  * Entity基类
  * 

openhis-server-new/core-common/src/main/java/com/core/common/core/domain/R.java

@@ -1,9 +1,9 @@
 package com.core.common.core.domain;
 
-import com.core.common.constant.HttpStatus;
-
 import java.io.Serializable;
 
+import com.core.common.constant.HttpStatus;
+
 /**
  * 响应信息主体
  *

openhis-server-new/core-common/src/main/java/com/core/common/core/domain/TreeSelect.java

@@ -1,13 +1,13 @@
 package com.core.common.core.domain;
 
-import com.core.common.core.domain.entity.SysDept;
-import com.core.common.core.domain.entity.SysMenu;
-import com.fasterxml.jackson.annotation.JsonInclude;
-
 import java.io.Serializable;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.core.common.core.domain.entity.SysDept;
+import com.core.common.core.domain.entity.SysMenu;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
 /**
  * Treeselect树结构实体类
  * 

openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDept.java

@@ -1,15 +1,17 @@
 package com.core.common.core.domain.entity;
 
-import com.core.common.core.domain.BaseEntity;
+import java.util.ArrayList;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import java.util.List;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-import java.util.ArrayList;
+
-import java.util.List;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import com.core.common.core.domain.BaseEntity;
 
 /**
  * 部门表 sys_dept

openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDictData.java

@@ -1,14 +1,15 @@
 package com.core.common.core.domain.entity;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import com.core.common.annotation.Excel;
 import com.core.common.annotation.Excel.ColumnType;
 import com.core.common.constant.UserConstants;
 import com.core.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
 
 /**
  * 字典数据表 sys_dict_data
@@ -52,9 +53,6 @@ public class SysDictData extends BaseEntity {
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
-    /** 拼音首字母 */
-    private String pyStr;
-
     public Long getDictCode() {
         return dictCode;
     }
@@ -138,21 +136,13 @@ public class SysDictData extends BaseEntity {
         this.status = status;
     }
 
-    public String getPyStr() {
-        return pyStr;
-    }
-
-    public void setPyStr(String pyStr) {
-        this.pyStr = pyStr;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("dictCode", getDictCode())
             .append("dictSort", getDictSort()).append("dictLabel", getDictLabel()).append("dictValue", getDictValue())
             .append("dictType", getDictType()).append("cssClass", getCssClass()).append("listClass", getListClass())
-            .append("isDefault", getIsDefault()).append("status", getStatus()).append("pyStr", getPyStr())
+            .append("isDefault", getIsDefault()).append("status", getStatus()).append("createBy", getCreateBy())
-            .append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy())
+            .append("createTime", getCreateTime()).append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime()).append("remark", getRemark()).toString();
     }
 }

openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDictType.java

@@ -1,15 +1,16 @@
 package com.core.common.core.domain.entity;
 
-import com.core.common.annotation.Excel;
-import com.core.common.annotation.Excel.ColumnType;
-import com.core.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import com.core.common.annotation.Excel;
+import com.core.common.annotation.Excel.ColumnType;
+import com.core.common.core.domain.BaseEntity;
+
 /**
  * 字典类型表 sys_dict_type
  * 

openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysMenu.java

@@ -1,14 +1,16 @@
 package com.core.common.core.domain.entity;
 
-import com.core.common.core.domain.BaseEntity;
+import java.util.ArrayList;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import java.util.List;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-import java.util.ArrayList;
+
-import java.util.List;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import com.core.common.core.domain.BaseEntity;
 
 /**
  * 菜单权限表 sys_menu

openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysRole.java

@@ -1,15 +1,17 @@
 package com.core.common.core.domain.entity;
 
-import com.core.common.annotation.Excel;
+import java.util.Set;
-import com.core.common.annotation.Excel.ColumnType;
-import com.core.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-import java.util.Set;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import com.core.common.annotation.Excel;
+import com.core.common.annotation.Excel.ColumnType;
+import com.core.common.core.domain.BaseEntity;
 
 /**
  * 角色表 sys_role

openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysUser.java

@@ -1,8 +1,16 @@
 package com.core.common.core.domain.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import java.util.List;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.core.common.annotation.Excel;
 import com.core.common.annotation.Excel.ColumnType;
 import com.core.common.annotation.Excel.Type;
@@ -11,15 +19,8 @@ import com.core.common.core.domain.BaseEntity;
 import com.core.common.xss.Xss;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
-import javax.validation.constraints.Email;
+import lombok.Data;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import java.util.Date;
-import java.util.List;
 
 /**
  * 用户对象 sys_user
@@ -31,7 +32,6 @@ public class SysUser extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /** 用户ID */
-    @TableId(type = IdType.ASSIGN_ID)
     @Excel(name = "用户序号", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "用户编号")
     private Long userId;
 

openhis-server-new/core-common/src/main/java/com/core/common/core/domain/model/LoginUser.java

@@ -1,18 +1,20 @@
 package com.core.common.core.domain.model;
 
-import com.alibaba.fastjson2.JSONObject;
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.core.common.core.domain.entity.SysRole;
-import com.core.common.core.domain.entity.SysUser;
-import lombok.Data;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import com.core.common.core.domain.entity.SysRole;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.core.common.core.domain.entity.SysUser;
+
+import lombok.Data;
+
 /**
  * 登录用户身份权限
  * 

openhis-server-new/core-common/src/main/java/com/core/common/core/redis/RedisCache.java

@@ -1,16 +1,13 @@
 package com.core.common.core.redis;
 
-import com.core.common.exception.UtilException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.BoundSetOperations;
-import org.springframework.data.redis.core.HashOperations;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.ValueOperations;
-import org.springframework.stereotype.Component;
-
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
+import com.core.common.exception.UtilException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.*;
+import org.springframework.stereotype.Component;
+
 /**
  * spring redis 工具类
  *

openhis-server-new/core-common/src/main/java/com/core/common/core/text/CharsetKit.java

@@ -1,10 +1,10 @@
 package com.core.common.core.text;
 
-import com.core.common.utils.StringUtils;
-
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 
+import com.core.common.utils.StringUtils;
+
 /**
  * 字符集工具类
  * 

openhis-server-new/core-common/src/main/java/com/core/common/core/text/Convert.java

@@ -1,8 +1,5 @@
 package com.core.common.core.text;
 
-import com.core.common.utils.StringUtils;
-import org.apache.commons.lang3.ArrayUtils;
-
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.math.RoundingMode;
@@ -11,6 +8,10 @@ import java.nio.charset.Charset;
 import java.text.NumberFormat;
 import java.util.Set;
 
+import org.apache.commons.lang3.ArrayUtils;
+
+import com.core.common.utils.StringUtils;
+
 /**
  * 类型转换器
  *

openhis-server-new/core-common/src/main/java/com/core/common/enums/DeleteFlag.java

@@ -0,0 +1,26 @@
+package com.core.common.enums;
+
+/**
+ * 删除标志
+ * 
+ * @author system
+ */
+public enum DeleteFlag {
+    NOT_DELETED("0", "未删除"), DELETED("1", "已删除");
+
+    private final String code;
+    private final String info;
+
+    DeleteFlag(String code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+}

openhis-server-new/core-common/src/main/java/com/core/common/enums/DesensitizedType.java

@@ -1,9 +1,9 @@
 package com.core.common.enums;
 
-import com.core.common.utils.DesensitizedUtil;
-
 import java.util.function.Function;
 
+import com.core.common.utils.DesensitizedUtil;
+
 /**
  * 脱敏类型
  *

openhis-server-new/core-common/src/main/java/com/core/common/enums/HttpMethod.java

@@ -1,10 +1,10 @@
 package com.core.common.enums;
 
-import org.springframework.lang.Nullable;
-
 import java.util.HashMap;
 import java.util.Map;
 
+import org.springframework.lang.Nullable;
+
 /**
  * 请求方式
  *

openhis-server-new/core-common/src/main/java/com/core/common/enums/TenantOptionDict.java

@@ -11,6 +11,7 @@ public enum TenantOptionDict {
      * 医院名称
      */
     YB_HOSPITAL_NAME("hospitalName", "医保-医院名称", 0),
+
     /**
      * 医保-医疗机构等级(3101接口)
      */
@@ -23,30 +24,37 @@ public enum TenantOptionDict {
      * 电子发票appid
      */
     EINVOICE_APP_ID("app_id", "电子发票-appid", 3),
+
     /**
      * 电子发票key
      */
     EINVOICE_KEY("key", "电子发票-key", 4),
+
     /**
      * 电子发票url
      */
     EINVOICE_URL("url", "电子发票-url", 5),
+
     /**
      * 医保开关
      */
     YB_SWITCH("yb_switch", "医保开关", 6),
+
     /**
      * 电子地址
      */
     ELE_ADDRESS("eleAddress", "电子处方-请求地址", 22),
+
     /**
      * 服务地址
      */
     ADDRESS("address", "服务地址", 23),
+
     /**
      * 超时时间
      */
     TIME("time", "超时时间", 24),
+
     /**
      * 是否加密
      */
@@ -55,26 +63,32 @@ public enum TenantOptionDict {
      * 医保区划
      */
     YB_INSUPLC_ADMDVS("insuplc_admdvs", "医保-区划", 26),
+
     /**
      * 电子处方appId
      */
     ELE_PRE_APP_ID("pre_app_id", "电子处方-appId", 27),
+
     /**
      * 电子处方appSecret
      */
     ELE_PRE_APP_SECRET("pre_app_secret", "电子处方-appSecret", 28),
+
     /**
      * 电子处方私钥
      */
     ELE_APP_PRVKEY("APP_PRVKEY", "电子处方-私钥", 29),
+
     /**
      * 电子处方公钥
      */
     ELE_PLAF_PUBKEY("PLAF_PUBKEY", "电子处方-公钥", 30),
+
     /**
      * 医院等级
      */
     EINVOICE_HOSPITAL_LV("hospital_lv", "电子发票-医院等级", 39),
+
     /**
      * 无视LIS&PACS报错
      */
@@ -104,11 +118,11 @@ public enum TenantOptionDict {
      */
     PACS_APP_SECRET("pacsAppSecret", "PACSAppSecret", 45),
     /**
-     * 电子发票-中转服务的路径
+     * PACSAppSecret
      */
     INVOICE_FORWARD_URL("invoiceUrl", "电子发票-中转服务的路径", 46),
     /**
-     * 电子发票-中转服务开关
+     * PACSAppSecret
      */
     FORWARD_SWITCH("forwardSwitch", "电子发票-中转服务开关", 47),
     /**
@@ -146,160 +160,51 @@ public enum TenantOptionDict {
     /**
      * 电子发票开关
      */
-    INVOICE_SWITCH("invoiceSwitch", "电子发票开关", 56),
+    INVOICE_SWITCH("invoiceSwitch", "电子发票开关 (0:关闭 1:开启)", 56),
+
     /**
      * 医嘱定价来源
      */
     ORDER_PRICING_SOURCE("orderPricingSource", "定价来源 batchSellingPrice/retailPrice", 57),
+
     /**
      * 三方支付（签到）
      */
-    THREE_PART_SIGN_URL("threePartSignUrl", "三方支付【签到】请求路径", 58),
+    THREE_PART_SIGN_URL("threePartSignUrl", "三方支付GET请求", 58),
-    /**
-     * 三方支付（签到）
-     */
-    THREE_PART_SIGN_STATIC_PARAM("threePartSignStaticParam", "三方支付【签到】固定参数", 59),
-    /**
-     * 三方支付（签到）
-     */
-    THREE_PART_SIGN_ACTIVE_PARAM("threePartSignActiveParam", "三方支付【签到】可变参数", 60),
-    /**
-     * 三方支付（签到）
-     */
-    THREE_PART_SIGN_MAPPING_METHOD("threePartSignMappingMethod", "三方支付【签到】请求方式", 61),
     /**
      * 三方支付（消费）
      */
-    THREE_PART_PAY_URL("threePartPayUrl", "三方支付【消费】请求路径", 62),
+    THREE_PART_PAY_URL("threePartPayUrl", "三方支付GET请求", 59),
-    /**
+
-     * 三方支付（消费）
-     */
-    THREE_PART_PAY_STATIC_PARAM("threePartPayStaticParam", "三方支付【消费】固定参数", 63),
-    /**
-     * 三方支付（消费）
-     */
-    THREE_PART_PAY_ACTIVE_PARAM("threePartPayActiveParam", "三方支付【消费】可变参数", 64),
-    /**
-     * 三方支付（消费）
-     */
-    THREE_PART_PAY_MAPPING_METHOD("threePartPayMappingMethod", "三方支付【消费】请求方式", 65),
     /**
      * 三方支付（退费）
      */
-    THREE_PART_RETURN_URL("threePartReturnUrl", "三方支付【退费】请求路径", 66),
+    THREE_PART_RETURN_URL("threePartReturnUrl", "三方支付GET请求", 60),
-    /**
+
-     * 三方支付（退费）
-     */
-    THREE_PART_RETURN_STATIC_PARAM("threePartReturnStaticParam", "三方支付【退费】固定参数", 67),
-    /**
-     * 三方支付（退费）
-     */
-    THREE_PART_RETURN_ACTIVE_PARAM("threePartReturnActiveParam", "三方支付【退费】可变参数", 68),
-    /**
-     * 三方支付（退费）
-     */
-    THREE_PART_RETURN_MAPPING_METHOD("threePartReturnMappingMethod", "三方支付【退费】请求方式", 69),
     /**
      * 三方支付（隔天退费）
      */
-    THREE_PART_NEXT_DAY_RETURN_URL("threePartNextDayReturnUrl", "三方支付【隔天退费】请求路径", 70),
+    THREE_PART_NEXT_DAY_RETURN_URL("threePartNextDayReturnUrl", "三方支付GET请求", 61),
-    /**
+
-     * 三方支付（隔天退费）
-     */
-    THREE_PART_NEXT_DAY_RETURN_STATIC_PARAM("threePartNextDayReturnStaticParam", "三方支付【隔天退费】固定参数", 71),
-    /**
-     * 三方支付（隔天退费）
-     */
-    THREE_PART_NEXT_DAY_RETURN_ACTIVE_PARAM("threePartNextDayReturnActiveParam", "三方支付【隔天退费】可变参数", 72),
-    /**
-     * 三方支付（隔天退费）
-     */
-    THREE_PART_NEXT_DAY_RETURN_MAPPING_METHOD("threePartNextDayReturnMappingMethod", "三方支付【隔天退费】请求方式", 73),
     /**
      * 三方支付路径（支付结果查询）
      */
-    THREE_PART_PAY_QUERY_URL("threePartPayQueryUrl", "三方支付【支付结果查询】请求路径", 74),
+    THREE_PART_PAY_QUERY_URL("threePartPayQueryUrl", "三方支付GET请求", 62),
-    /**
+
-     * 三方支付（支付结果查询）
-     */
-    THREE_PART_PAY_QUERY_STATIC_PARAM("threePartPayQueryStaticParam", "三方支付【支付结果查询】固定参数", 75),
-    /**
-     * 三方支付（支付结果查询）
-     */
-    THREE_PART_PAY_QUERY_ACTIVE_PARAM("threePartPayQueryActiveParam", "三方支付【支付结果查询】可变参数", 76),
-    /**
-     * 三方支付（支付结果查询）
-     */
-    THREE_PART_PAY_QUERY_MAPPING_METHOD("threePartPayQueryMappingMethod", "三方支付【支付结果查询】请求方式", 77),
     /**
      * 三方支付路径（退费结果查询）
      */
-    THREE_PART_RETURN_QUERY_URL("threePartReturnQueryUrl", "三方支付【退费结果查询】请求路径", 78),
+    THREE_PART_RETURN_QUERY_URL("threePartReturnQueryUrl", "三方支付GET请求", 63),
-    /**
+
-     * 三方支付（退费结果查询）
-     */
-    THREE_PART_RETURN_QUERY_STATIC_PARAM("threePartReturnQueryStaticParam", "三方支付【退费结果查询】固定参数", 79),
-    /**
-     * 三方支付（退费结果查询）
-     */
-    THREE_PART_RETURN_QUERY_ACTIVE_PARAM("threePartReturnQueryActiveParam", "三方支付【退费结果查询】可变参数", 80),
-    /**
-     * 三方支付（退费结果查询）
-     */
-    THREE_PART_RETURN_QUERY_MAPPING_METHOD("threePartReturnQueryMappingMethod", "三方支付【退费结果查询】请求方式", 81),
     /**
      * 三方支付路径（隔天退费结果查询）
      */
-    THREE_PART_NEXT_DAY_RETURN_QUERY_URL("threePartNextDayReturnQueryUrl", "三方支付【隔天退费结果查询】请求路径", 82),
+    THREE_PART_NEXT_DAY_RETURN_QUERY_URL("threePartNextDayReturnQueryUrl", "三方支付GET请求", 64),
+
     /**
-     * 三方支付（隔天退费结果查询）
+     * 三方支付参数
      */
-    THREE_PART_NEXT_DAY_RETURN_QUERY_STATIC_PARAM("threePartNextDayReturnQueryStaticParam", "三方支付【隔天退费结果查询】固定参数", 83),
+    THREE_PART_PARAM("threePartParam", "三方支付GET请求", 65);
-    /**
-     * 三方支付（隔天退费结果查询）
-     */
-    THREE_PART_NEXT_DAY_RETURN_QUERY_ACTIVE_PARAM("threePartNextDayReturnQueryActiveParam", "三方支付【隔天退费结果查询】可变参数", 84),
-    /**
-     * 三方支付（隔天退费结果查询）
-     */
-    THREE_PART_NEXT_DAY_RETURN_QUERY_MAPPING_METHOD("threePartNextDayReturnQueryMappingMethod", "三方支付【隔天退费结果查询】请求方式",
-            85),
-    /**
-     * 三方支付（签出）
-     */
-    THREE_PART_SIGN_OUT_URL("threePartSignOutUrl", "三方支付【签出】请求路径", 86),
-    /**
-     * 三方支付（签出）
-     */
-    THREE_PART_SIGN_OUT_STATIC_PARAM("threePartSignOutStaticParam", "三方支付【签出】固定参数", 87),
-    /**
-     * 三方支付（签出）
-     */
-    THREE_PART_SIGN_OUT_ACTIVE_PARAM("threePartSignOutActiveParam", "三方支付【签出】可变参数", 88),
-    /**
-     * 三方支付（签出）
-     */
-    THREE_PART_SIGN_OUT_MAPPING_METHOD("threePartSignOutMappingMethod", "三方支付【签出】请求方式", 89),
-    /**
-     * 三方支付（签出）
-     */
-    YB_INPATIENT_SETTLEMENT_UP_URL("ybInpatientSetlUp", "选填4101或4101A", 90),
-    /**
-     * PACS查看报告地址
-     */
-    PACS_REPORT_URL("pacsReportUrl", "PACS查看报告地址", 91),
-    /**
-     * LIS查看报告地址
-     */
-    LIS_REPORT_URL("lisReportUrl", "LIS查看报告地址", 92),
-    /**
-     * 开药时药房允许多选开关
-     */
-    PHARMACY_MULTIPLE_CHOICE_SWITCH("pharmacyMultipleChoiceSwitch", "开药时药房允许多选开关", 93),
-    /**
-     * PEIS服务地址
-     */
-    PEIS_SERVER_URL("peisServerUrl", "PEIS服务地址", 94);
 
     private final String code;
     private final String name;

openhis-server-new/core-common/src/main/java/com/core/common/filter/RepeatableFilter.java

@@ -1,11 +1,13 @@
 package com.core.common.filter;
 
-import com.core.common.utils.StringUtils;
+import java.io.IOException;
-import org.springframework.http.MediaType;
 
 import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
+
+import org.springframework.http.MediaType;
+
+import com.core.common.utils.StringUtils;
 
 /**
  * Repeatable 过滤器

openhis-server-new/core-common/src/main/java/com/core/common/filter/RepeatedlyRequestWrapper.java

@@ -1,17 +1,18 @@
 package com.core.common.filter;
 
-import com.core.common.constant.Constants;
+import java.io.BufferedReader;
-import com.core.common.utils.http.HttpHelper;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
 
 import javax.servlet.ReadListener;
 import javax.servlet.ServletInputStream;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
-import java.io.BufferedReader;
+
-import java.io.ByteArrayInputStream;
+import com.core.common.constant.Constants;
-import java.io.IOException;
+import com.core.common.utils.http.HttpHelper;
-import java.io.InputStreamReader;
 
 /**
  * 构建可重复读取inputStream的request

openhis-server-new/core-common/src/main/java/com/core/common/filter/XssFilter.java

@@ -1,14 +1,15 @@
 package com.core.common.filter;
 
-import com.core.common.enums.HttpMethod;
+import java.io.IOException;
-import com.core.common.utils.StringUtils;
+import java.util.ArrayList;
+import java.util.List;
 
 import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
+
-import java.util.ArrayList;
+import com.core.common.enums.HttpMethod;
-import java.util.List;
+import com.core.common.utils.StringUtils;
 
 /**
  * 防止XSS攻击的过滤器

openhis-server-new/core-common/src/main/java/com/core/common/filter/XssHttpServletRequestWrapper.java

@@ -1,17 +1,19 @@
 package com.core.common.filter;
 
-import com.core.common.utils.StringUtils;
+import java.io.ByteArrayInputStream;
-import com.core.common.utils.html.EscapeUtil;
+import java.io.IOException;
-import org.apache.commons.io.IOUtils;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
 
 import javax.servlet.ReadListener;
 import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
-import java.io.ByteArrayInputStream;
+
-import java.io.IOException;
+import org.apache.commons.io.IOUtils;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+
+import com.core.common.utils.StringUtils;
+import com.core.common.utils.html.EscapeUtil;
 
 /**
  * XSS过滤处理

openhis-server-new/core-common/src/main/java/com/core/common/utils/AgeCalculatorUtil.java

@@ -37,10 +37,6 @@ public final class AgeCalculatorUtil {
      * 当前年龄取得（床位列表表示年龄用）
      */
     public static String getAge(Date date) {
-        // 添加空值检查
-        if (date == null) {
-            return "";
-        }
         // 将 Date 转换为 LocalDateTime
         LocalDateTime dateTime = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
         LocalDateTime now = LocalDateTime.now();

openhis-server-new/core-common/src/main/java/com/core/common/utils/AssignSeqUtil.java

@@ -3,15 +3,16 @@
  */
 package com.core.common.utils;
 
-import com.core.common.constant.CacheConstants;
+import java.util.ArrayList;
-import com.core.common.core.redis.RedisCache;
+import java.util.List;
-import com.core.common.exception.UtilException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
+import com.core.common.constant.CacheConstants;
-import java.util.List;
+import com.core.common.core.redis.RedisCache;
+import com.core.common.exception.UtilException;
 
 /**
  * 排番组件

openhis-server-new/core-common/src/main/java/com/core/common/utils/DateUtils.java

@@ -1,7 +1,5 @@
 package com.core.common.utils;
 
-import org.apache.commons.lang3.time.DateFormatUtils;
-
 import java.lang.management.ManagementFactory;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -11,6 +9,8 @@ import java.time.format.DateTimeParseException;
 import java.util.Calendar;
 import java.util.Date;
 
+import org.apache.commons.lang3.time.DateFormatUtils;
+
 /**
  * 时间工具类
  * 

openhis-server-new/core-common/src/main/java/com/core/common/utils/DictUtils.java

@@ -1,14 +1,14 @@
 package com.core.common.utils;
 
+import java.util.Collection;
+import java.util.List;
+
 import com.alibaba.fastjson2.JSONArray;
 import com.core.common.constant.CacheConstants;
 import com.core.common.core.domain.entity.SysDictData;
 import com.core.common.core.redis.RedisCache;
 import com.core.common.utils.spring.SpringUtils;
 
-import java.util.Collection;
-import java.util.List;
-
 /**
  * 字典工具类
  * 

openhis-server-new/core-common/src/main/java/com/core/common/utils/ExceptionUtil.java

@@ -1,10 +1,10 @@
 package com.core.common.utils;
 
-import org.apache.commons.lang3.exception.ExceptionUtils;
-
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
+import org.apache.commons.lang3.exception.ExceptionUtils;
+
 /**
  * 错误信息处理类。
  *

openhis-server-new/core-common/src/main/java/com/core/common/utils/MessageUtils.java

@@ -1,8 +1,9 @@
 package com.core.common.utils;
 
-import com.core.common.utils.spring.SpringUtils;
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;
+
+import com.core.common.utils.spring.SpringUtils;
 import org.springframework.lang.Nullable;
 
 import java.util.Locale;

openhis-server-new/core-common/src/main/java/com/core/common/utils/SecurityUtils.java

@@ -1,18 +1,19 @@
 package com.core.common.utils;
 
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.util.PatternMatchUtils;
+
 import com.core.common.constant.Constants;
 import com.core.common.constant.HttpStatus;
 import com.core.common.core.domain.entity.SysRole;
 import com.core.common.core.domain.model.LoginUser;
 import com.core.common.exception.ServiceException;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.util.PatternMatchUtils;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 安全服务工具类

openhis-server-new/core-common/src/main/java/com/core/common/utils/ServletUtils.java

@@ -1,15 +1,5 @@
 package com.core.common.utils;
 
-import com.core.common.constant.Constants;
-import com.core.common.core.text.Convert;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -18,6 +8,18 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import com.core.common.constant.Constants;
+import com.core.common.core.text.Convert;
+
 /**
  * 客户端工具类
  * 

openhis-server-new/core-common/src/main/java/com/core/common/utils/StringUtils.java

@@ -1,10 +1,11 @@
 package com.core.common.utils;
 
+import java.util.*;
+
+import org.springframework.util.AntPathMatcher;
+
 import com.core.common.constant.Constants;
 import com.core.common.core.text.StrFormatter;
-import org.springframework.util.AntPathMatcher;
-
-import java.util.*;
 
 /**
  * 字符串工具类

openhis-server-new/core-common/src/main/java/com/core/common/utils/Threads.java

@@ -1,10 +1,10 @@
 package com.core.common.utils;
 
+import java.util.concurrent.*;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.concurrent.*;
-
 /**
  * 线程相关工具类.
  * 

openhis-server-new/core-common/src/main/java/com/core/common/utils/TimeUtils.java

@@ -1,10 +1,14 @@
 package com.core.common.utils;
 
-import java.time.LocalDate;
+import org.apache.commons.lang3.time.DateFormatUtils;
-import java.time.LocalDateTime;
+
-import java.time.LocalTime;
+import java.lang.management.ManagementFactory;
-import java.time.ZoneId;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.*;
 import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.util.Calendar;
 import java.util.Date;
 
 

openhis-server-new/core-common/src/main/java/com/core/common/utils/bean/BeanValidators.java

@@ -1,9 +1,10 @@
 package com.core.common.utils.bean;
 
+import java.util.Set;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import javax.validation.Validator;
-import java.util.Set;
 
 /**
  * bean对象属性验证

openhis-server-new/core-common/src/main/java/com/core/common/utils/file/FileTypeUtils.java

@@ -1,9 +1,9 @@
 package com.core.common.utils.file;
 
-import org.apache.commons.lang3.StringUtils;
-
 import java.io.File;
 
+import org.apache.commons.lang3.StringUtils;
+
 /**
  * 文件类型工具类
  *

openhis-server-new/core-common/src/main/java/com/core/common/utils/file/FileUploadUtils.java

@@ -1,5 +1,13 @@
 package com.core.common.utils.file;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.util.Objects;
+
+import org.apache.commons.io.FilenameUtils;
+import org.springframework.web.multipart.MultipartFile;
+
 import com.core.common.config.CoreConfig;
 import com.core.common.constant.Constants;
 import com.core.common.exception.file.FileNameLengthLimitExceededException;
@@ -8,13 +16,6 @@ import com.core.common.exception.file.InvalidExtensionException;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.StringUtils;
 import com.core.common.utils.uuid.Seq;
-import org.apache.commons.io.FilenameUtils;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Paths;
-import java.util.Objects;
 
 /**
  * 文件上传工具类

openhis-server-new/core-common/src/main/java/com/core/common/utils/file/FileUtils.java

@@ -1,18 +1,20 @@
 package com.core.common.utils.file;
 
+import java.io.*;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.ArrayUtils;
+
 import com.core.common.config.CoreConfig;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.StringUtils;
 import com.core.common.utils.uuid.IdUtils;
-import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.ArrayUtils;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.*;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 
 /**
  * 文件处理工具类

openhis-server-new/core-common/src/main/java/com/core/common/utils/file/ImageUtils.java

@@ -1,12 +1,5 @@
 package com.core.common.utils.file;
 
-import com.core.common.config.CoreConfig;
-import com.core.common.constant.Constants;
-import com.core.common.utils.StringUtils;
-import org.apache.poi.util.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.ByteArrayInputStream;
 import java.io.FileInputStream;
 import java.io.InputStream;
@@ -14,6 +7,14 @@ import java.net.URL;
 import java.net.URLConnection;
 import java.util.Arrays;
 
+import org.apache.poi.util.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.core.common.config.CoreConfig;
+import com.core.common.constant.Constants;
+import com.core.common.utils.StringUtils;
+
 /**
  * 图片处理工具类
  *

openhis-server-new/core-common/src/main/java/com/core/common/utils/http/HttpHelper.java

@@ -1,16 +1,17 @@
 package com.core.common.utils.http;
 
-import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.ServletRequest;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 
+import javax.servlet.ServletRequest;
+
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * 通用http工具封装
  * 

openhis-server-new/core-common/src/main/java/com/core/common/utils/http/HttpUtils.java

@@ -1,11 +1,5 @@
 package com.core.common.utils.http;
 
-import com.core.common.constant.Constants;
-import com.core.common.utils.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.net.ssl.*;
 import java.io.*;
 import java.net.ConnectException;
 import java.net.SocketTimeoutException;
@@ -14,6 +8,14 @@ import java.net.URLConnection;
 import java.nio.charset.StandardCharsets;
 import java.security.cert.X509Certificate;
 
+import javax.net.ssl.*;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.core.common.constant.Constants;
+import com.core.common.utils.StringUtils;
+
 /**
  * 通用http发送方法
  * 

openhis-server-new/core-common/src/main/java/com/core/common/utils/ip/AddressUtils.java

@@ -1,13 +1,14 @@
 package com.core.common.utils.ip;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.core.common.config.CoreConfig;
 import com.core.common.constant.Constants;
 import com.core.common.utils.StringUtils;
 import com.core.common.utils.http.HttpUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * 获取地址类

openhis-server-new/core-common/src/main/java/com/core/common/utils/ip/IpUtils.java

@@ -1,12 +1,13 @@
 package com.core.common.utils.ip;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+import javax.servlet.http.HttpServletRequest;
+
 import com.core.common.utils.ServletUtils;
 import com.core.common.utils.StringUtils;
 
-import javax.servlet.http.HttpServletRequest;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
 /**
  * 获取IP方法
  * 

openhis-server-new/core-common/src/main/java/com/core/common/utils/poi/ExcelUtil.java

@@ -1,5 +1,33 @@
 package com.core.common.utils.poi;
 
+import java.io.*;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.RegExUtils;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ooxml.POIXMLDocumentPart;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.CellRangeAddressList;
+import org.apache.poi.util.IOUtils;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.apache.poi.xssf.usermodel.*;
+import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.core.common.annotation.Excel;
 import com.core.common.annotation.Excel.ColumnType;
 import com.core.common.annotation.Excel.Type;
@@ -15,32 +43,6 @@ import com.core.common.utils.file.FileTypeUtils;
 import com.core.common.utils.file.FileUtils;
 import com.core.common.utils.file.ImageUtils;
 import com.core.common.utils.reflect.ReflectUtils;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.RegExUtils;
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.ooxml.POIXMLDocumentPart;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellRangeAddressList;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.*;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.*;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.math.BigDecimal;
-import java.text.DecimalFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * Excel相关处理

openhis-server-new/core-common/src/main/java/com/core/common/utils/reflect/ReflectUtils.java

@@ -1,15 +1,16 @@
 package com.core.common.utils.reflect;
 
-import com.core.common.core.text.Convert;
+import java.lang.reflect.*;
-import com.core.common.utils.DateUtils;
+import java.util.Date;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.apache.poi.ss.usermodel.DateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.lang.reflect.*;
+import com.core.common.core.text.Convert;
-import java.util.Date;
+import com.core.common.utils.DateUtils;
 
 /**
  * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.

openhis-server-new/core-common/src/main/java/com/core/common/utils/sign/Md5Utils.java

@@ -1,11 +1,11 @@
 package com.core.common.utils.sign;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * Md5加密方法
  * 

openhis-server-new/core-common/src/main/java/com/core/common/utils/spring/SpringUtils.java

@@ -1,6 +1,5 @@
 package com.core.common.utils.spring;
 
-import com.core.common.utils.StringUtils;
 import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
@@ -10,6 +9,8 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
 
+import com.core.common.utils.StringUtils;
+
 /**
  * spring工具类 方便在非spring管理环境中获取bean
  * 

openhis-server-new/core-common/src/main/java/com/core/common/utils/uuid/Seq.java

@@ -1,10 +1,10 @@
 package com.core.common.utils.uuid;
 
+import java.util.concurrent.atomic.AtomicInteger;
+
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.StringUtils;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
 /**
  * @author system 序列生成类
  */

openhis-server-new/core-common/src/main/java/com/core/common/utils/uuid/UUID.java

@@ -1,13 +1,13 @@
 package com.core.common.utils.uuid;
 
-import com.core.common.exception.UtilException;
-
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.util.Random;
 import java.util.concurrent.ThreadLocalRandom;
 
+import com.core.common.exception.UtilException;
+
 /**
  * 提供通用唯一识别码（universally unique identifier）（UUID）实现
  *

openhis-server-new/core-common/src/main/java/com/core/common/xss/Xss.java

@@ -1,12 +1,13 @@
 package com.core.common.xss;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
 /**
  * 自定义xss校验注解
  * 

openhis-server-new/core-common/src/main/java/com/core/common/xss/XssValidator.java

@@ -1,11 +1,12 @@
 package com.core.common.xss;
 
-import com.core.common.utils.StringUtils;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
-import java.util.regex.Matcher;
+
-import java.util.regex.Pattern;
+import com.core.common.utils.StringUtils;
 
 /**
  * 自定义xss校验注解实现

openhis-server-new/core-flowable/pom.xml

@@ -80,7 +80,6 @@
         <dependency>
             <groupId>com.googlecode.aviator</groupId>
             <artifactId>aviator</artifactId>
-            <version>5.3.3</version>
         </dependency>
 
     </dependencies>

openhis-server-new/core-framework/src/main/java/com/core/framework/config/FilterConfig.java

@@ -22,11 +22,10 @@ import com.core.common.utils.StringUtils;
  */
 @Configuration
 public class FilterConfig {
-    // 添加默认值，避免配置不存在时启动失败
+    @Value("${xss.excludes}")
-    @Value("${xss.excludes:/system/notice}")
     private String excludes;
 
-    @Value("${xss.urlPatterns:/system/*,/monitor/*,/tool/*}")
+    @Value("${xss.urlPatterns}")
     private String urlPatterns;
 
     @SuppressWarnings({"rawtypes", "unchecked"})

openhis-server-new/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java

@@ -99,7 +99,7 @@ public class MybatisPlusConfig {
                 "med_medication_definition", "med_medication_dispense", "med_medication_request",
                 "wor_activity_definition", "wor_device_dispense", "wor_device_request", "wor_inventory_item",
                 "wor_service_request", "wor_service_request_detail", "wor_supply_delivery", "wor_supply_request",
-                "sys_operation_record","doc_inventory_item_static"));
+                "sys_operation_record"));
 
             @Override
             public boolean ignoreTable(String tableName) {
@@ -116,40 +116,37 @@ public class MybatisPlusConfig {
      * 获取当前租户 ID
      */
     private Integer getCurrentTenantId() {
-        Integer result = null;
 
         // 首先尝试从线程局部变量中获取租户ID（适用于定时任务等场景）
         Integer threadLocalTenantId = TenantContext.getCurrentTenant();
         if (threadLocalTenantId != null) {
-            result = threadLocalTenantId;
+            return threadLocalTenantId;
-        } else {
+        }
-            // 获取当前登录用户的租户ID（优先使用SecurityUtils中储存的LoginUser的租户ID）
-            try {
-                if (SecurityUtils.getAuthentication() != null) {
-                    result = SecurityUtils.getLoginUser().getTenantId();
-                }
-            } catch (Exception e) {
-                result = 1; // 默认租户ID
-            }
 
-            if (result == null) {
+        // 获取当前登录用户的租户ID（优先使用SecurityUtils中储存的LoginUser的租户ID）
-                // 尝试从请求头中获取租户ID
+        try {
-                ServletRequestAttributes attributes = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
+            if (SecurityUtils.getAuthentication() != null) {
-                if (attributes != null) {
+                return SecurityUtils.getLoginUser().getTenantId();
-                    HttpServletRequest request = attributes.getRequest();
+            }
-                    // 从请求头获取租户ID，假设header名称为"X-Tenant-ID" ; 登录接口前端把租户id放到请求头里
+        } catch (Exception e) {
-                    String tenantIdHeader = request.getHeader("X-Tenant-ID");
+            return 1; // 默认租户ID
-                    String requestMethodName = request.getHeader("Request-Method-Name");
+        }
-                    // 登录
+
-                    if ("login".equals(requestMethodName)) {
+        // 尝试从请求头中获取租户ID
-                        if (tenantIdHeader != null && !tenantIdHeader.isEmpty()) {
+        ServletRequestAttributes attributes = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
-                            result = Integer.parseInt(tenantIdHeader);
+        if (attributes != null) {
-                        }
+            HttpServletRequest request = attributes.getRequest();
-                    }
+            // 从请求头获取租户ID，假设header名称为"X-Tenant-ID" ; 登录接口前端把租户id放到请求头里
+            String tenantIdHeader = request.getHeader("X-Tenant-ID");
+            String requestMethodName = request.getHeader("Request-Method-Name");
+            // 登录
+            if ("login".equals(requestMethodName)) {
+                if (tenantIdHeader != null && !tenantIdHeader.isEmpty()) {
+                    return Integer.parseInt(tenantIdHeader);
                 }
             }
         }
 
-        return result != null ? result : 1; // 默认租户ID
+        return 1; // 默认租户ID
     }
 }

openhis-server-new/core-framework/src/main/java/com/core/framework/config/SecurityConfig.java

@@ -1,5 +1,9 @@
 package com.core.framework.config;
 
+import com.core.framework.config.properties.PermitAllUrlProperties;
+import com.core.framework.security.filter.JwtAuthenticationTokenFilter;
+import com.core.framework.security.handle.AuthenticationEntryPointImpl;
+import com.core.framework.security.handle.LogoutSuccessHandlerImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -17,11 +21,6 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic
 import org.springframework.security.web.authentication.logout.LogoutFilter;
 import org.springframework.web.filter.CorsFilter;
 
-import com.core.framework.config.properties.PermitAllUrlProperties;
-import com.core.framework.security.filter.JwtAuthenticationTokenFilter;
-import com.core.framework.security.handle.AuthenticationEntryPointImpl;
-import com.core.framework.security.handle.LogoutSuccessHandlerImpl;
-
 /**
  * spring security配置
  *
@@ -86,38 +85,38 @@ public class SecurityConfig {
     @Bean
     protected SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
         return httpSecurity
-            // CSRF禁用，因为不使用session
+                // CSRF禁用，因为不使用session
-            .csrf(csrf -> csrf.disable())
+                .csrf(csrf -> csrf.disable())
-            // 禁用HTTP响应标头
+                // 禁用HTTP响应标头
-            .headers((headersCustomizer) -> {
+                .headers((headersCustomizer) -> {
-                headersCustomizer.cacheControl(cache -> cache.disable()).frameOptions(options -> options.sameOrigin());
+                    headersCustomizer.cacheControl(cache -> cache.disable()).frameOptions(options -> options.sameOrigin());
-            })
+                })
-            // 认证失败处理类
+                // 认证失败处理类
-            .exceptionHandling(exception -> exception.authenticationEntryPoint(unauthorizedHandler))
+                .exceptionHandling(exception -> exception.authenticationEntryPoint(unauthorizedHandler))
-            // 基于token，所以不需要session
+                // 基于token，所以不需要session
-            .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
+                .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
-            // 注解标记允许匿名访问的url
+                // 注解标记允许匿名访问的url
-            .authorizeHttpRequests((requests) -> {
+                .authorizeHttpRequests((requests) -> {
-                permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll());
+                    permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll());
-                // 对于登录login 注册register 验证码captchaImage 允许匿名访问
+                    // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                requests.antMatchers("/login", "/register", "/captchaImage").permitAll()
+                    requests.antMatchers("/login", "/register", "/captchaImage").permitAll()
-                    // 静态资源，可匿名访问
+                            // 静态资源，可匿名访问
-                    .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**")
+                            .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**")
-                    .permitAll()
+                            .permitAll()
-                    .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**")
+                            .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**")
-                    .permitAll()
+                            .permitAll()
-                    .antMatchers("/patientmanage/information/**")
+                            .antMatchers("/patientmanage/information/**")
-                    .permitAll()
+                            .permitAll()
-                    // 除上面外的所有请求全部需要鉴权认证
+                            // 除上面外的所有请求全部需要鉴权认证
-                    .anyRequest().authenticated();
+                            .anyRequest().authenticated();
-            })
+                })
-            // 添加Logout filter
+                // 添加Logout filter
-            .logout(logout -> logout.logoutUrl("/logout").logoutSuccessHandler(logoutSuccessHandler))
+                .logout(logout -> logout.logoutUrl("/logout").logoutSuccessHandler(logoutSuccessHandler))
-            // 添加JWT filter
+                // 添加JWT filter
-            .addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class)
+                .addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class)
-            // 添加CORS filter
+                // 添加CORS filter
-            .addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class)
+                .addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class)
-            .addFilterBefore(corsFilter, LogoutFilter.class).build();
+                .addFilterBefore(corsFilter, LogoutFilter.class).build();
     }
 
     /**

openhis-server-new/core-framework/src/main/java/com/core/framework/handler/MybastisColumnsHandler.java

@@ -2,17 +2,12 @@ package com.core.framework.handler;
 
 import java.util.Date;
 
-import javax.servlet.http.HttpServletRequest;
-
 import org.apache.ibatis.reflection.MetaObject;
 import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.core.common.core.domain.model.LoginUser;
 import com.core.common.utils.SecurityUtils;
-import com.core.framework.config.TenantContext;
 
 @Component
 public class MybastisColumnsHandler implements MetaObjectHandler {
@@ -52,40 +47,10 @@ public class MybastisColumnsHandler implements MetaObjectHandler {
      * 获取当前租户 ID
      */
     private Integer getCurrentTenantId() {
-        Integer result = null;
+        // 获取当前登录用户的租户 ID
-
+        if (SecurityUtils.getAuthentication() != null) {
-        // 首先尝试从线程局部变量中获取租户ID（适用于定时任务等场景）
+            return SecurityUtils.getLoginUser().getTenantId();
-        Integer threadLocalTenantId = TenantContext.getCurrentTenant();
-        if (threadLocalTenantId != null) {
-            result = threadLocalTenantId;
-        } else {
-            // 获取当前登录用户的租户ID（优先使用SecurityUtils中储存的LoginUser的租户ID）
-            try {
-                if (SecurityUtils.getAuthentication() != null) {
-                    result = SecurityUtils.getLoginUser().getTenantId();
-                }
-            } catch (Exception e) {
-                result = 1; // 默认租户ID
-            }
-
-            if (result == null) {
-                // 尝试从请求头中获取租户ID
-                ServletRequestAttributes attributes = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
-                if (attributes != null) {
-                    HttpServletRequest request = attributes.getRequest();
-                    // 从请求头获取租户ID，假设header名称为"X-Tenant-ID" ; 登录接口前端把租户id放到请求头里
-                    String tenantIdHeader = request.getHeader("X-Tenant-ID");
-                    String requestMethodName = request.getHeader("Request-Method-Name");
-                    // 登录
-                    if ("login".equals(requestMethodName)) {
-                        if (tenantIdHeader != null && !tenantIdHeader.isEmpty()) {
-                            result = Integer.parseInt(tenantIdHeader);
-                        }
-                    }
-                }
-            }
         }
-
+        return 0;
-        return result != null ? result : 1; // 默认租户ID
     }
 }

openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysLoginService.java

@@ -6,7 +6,6 @@ import java.util.Optional;
 
 import javax.annotation.Resource;
 
-import com.core.common.enums.DelFlag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;
@@ -24,6 +23,7 @@ import com.core.common.core.domain.entity.SysUser;
 import com.core.common.core.domain.model.LoginUser;
 import com.core.common.core.domain.model.LoginUserExtend;
 import com.core.common.core.redis.RedisCache;
+import com.core.common.enums.DeleteFlag;
 import com.core.common.enums.TenantStatus;
 import com.core.common.exception.ServiceException;
 import com.core.common.exception.user.*;
@@ -281,7 +281,7 @@ public class SysLoginService {
             throw new ServiceException("所属医院停用");
         }
         // 租户删除状态校验
-        if (DelFlag.YES.getCode().equals(currentTenant.getDeleteFlag())) {
+        if (DeleteFlag.DELETED.getCode().equals(currentTenant.getDeleteFlag())) {
             throw new ServiceException("所属医院不存在");
         }