修改套餐管理页面操作图标设置

2、将出诊医生字段选中‘内科医生1’，点击【确认】按钮，重新打开出诊医生字段的内容保存成功

.github/copilot-instructions.md

@@ -0,0 +1,76 @@
+# 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 包说明）展开，请告诉我要增强哪一节。

TestDeleteInspectionType.java

@@ -0,0 +1,39 @@
+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();
+        }
+    }
+}

add_organization_fields.sql

@@ -0,0 +1,27 @@
+-- 向adm_organization表添加缺失字段的SQL脚本
+
+-- 添加register_flag字段（对应registerFlag属性）
+ALTER TABLE "adm_organization" 
+ADD COLUMN "register_flag" int4;
+
+-- 添加location字段
+ALTER TABLE "adm_organization" 
+ADD COLUMN "location" varchar(255);
+
+-- 添加intro字段
+ALTER TABLE "adm_organization" 
+ADD COLUMN "intro" varchar(1000);
+
+-- 添加remark字段
+ALTER TABLE "adm_organization" 
+ADD COLUMN "remark" varchar(1000);
+
+-- 添加字段注释
+COMMENT ON COLUMN "adm_organization"."register_flag" IS '挂号标志';
+COMMENT ON COLUMN "adm_organization"."location" IS '科室位置';
+COMMENT ON COLUMN "adm_organization"."intro" IS '科室简介';
+COMMENT ON COLUMN "adm_organization"."remark" IS '备注';
+
+-- 设置register_flag默认值为0（不允许挂号）
+ALTER TABLE "adm_organization" 
+ALTER COLUMN "register_flag" SET DEFAULT 0;

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

@@ -0,0 +1,45 @@
+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-common/src/main/java/com/core/common/utils/AgeCalculatorUtil.java

@@ -37,6 +37,10 @@ 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-framework/src/main/java/com/core/framework/config/FilterConfig.java

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

openhis-server-new/core-generator/src/main/java/com/core/generator/controller/GenController.java

@@ -58,6 +58,7 @@ public class GenController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo genList(GenTable genTable) {
         startPage();
+
         List<GenTable> list = genTableService.selectGenTableList(genTable);
         return getDataTable(list);
     }
@@ -251,12 +252,10 @@ public class GenController extends BaseController {
             InputStream is = file.getInputStream();
             Workbook wb = WorkbookFactory.create(is);
             StringBuilder sb = new StringBuilder();
-
             // 遍历每个sheet页（每个表）
             for (int i = 0; i < wb.getNumberOfSheets(); i++) {
                 sb.append("-- ----------------------------------------------------------------------------------\n");
                 Sheet st = wb.getSheetAt(i);
-
                 // 从第一行读取表名表注释
                 Row row0 = st.getRow(0);// 表名
                 String tableName = row0.getCell(4).toString();// 表名

openhis-server-new/openhis-application/src/main/java/com/openhis/config/HttpConfig.java

@@ -16,7 +16,7 @@ import org.springframework.stereotype.Component;
 @Component
 @ConfigurationProperties(prefix = "http")
 @PropertySource(value = {"classpath:http.yml"})
-public class HttpConfig {
+public class  HttpConfig {
     private String appId;
     private String key;
     private String url;

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationAppServiceImpl.java

@@ -100,7 +100,18 @@ public class OrganizationAppServiceImpl implements IOrganizationAppService {
     @Override
     public R<?> getOrgInfo(Long orgId) {
         Organization organization = organizationService.getById(orgId);
-        return R.ok(organization, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"机构信息查询"}));
+        if (organization == null) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00006, new Object[] {"机构信息"}));
+        }
+        
+        // 转换为DTO对象，确保数据格式一致
+        OrganizationDto organizationDto = new OrganizationDto();
+        BeanUtils.copyProperties(organization, organizationDto);
+        organizationDto.setTypeEnum_dictText(EnumUtils.getInfoByValue(OrganizationType.class, organizationDto.getTypeEnum()));
+        organizationDto.setClassEnum_dictText(EnumUtils.getInfoByValue(OrganizationClass.class, organizationDto.getClassEnum()));
+        organizationDto.setActiveFlag_dictText(EnumUtils.getInfoByValue(AccountStatus.class, organizationDto.getActiveFlag()));
+        
+        return R.ok(organizationDto, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"机构信息查询"}));
     }
 
     /**

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationDto.java

@@ -60,4 +60,16 @@ public class OrganizationDto {
 
     /** 子集合 */
     private List<OrganizationDto> children = new ArrayList<>();
+    
+    /** 挂号科室标记 */
+    private Integer registerFlag;
+    
+    /** 科室位置 */
+    private String location;
+    
+    /** 科室简介 */
+    private String intro;
+    
+    /** 备注 */
+    private String remark;
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/controller/InvoiceController.java

@@ -0,0 +1,53 @@
+package com.openhis.web.basicmanage.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.administration.domain.Invoice;
+import com.openhis.administration.service.IInvoiceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 发票管理控制器
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@RestController
+@RequestMapping("/basicmanage/invoice")
+public class InvoiceController {
+
+    @Autowired
+    private IInvoiceService invoiceService;
+
+    /**
+     * 分页查询发票列表（带用户角色权限过滤）
+     *
+     * @param pageNo   页码
+     * @param pageSize 每页条数
+     * @param request  请求对象
+     * @return 发票列表
+     */
+    @GetMapping("/page")
+    public R<?> selectInvoicePage(
+            @RequestParam(defaultValue = "1") Integer pageNo,
+            @RequestParam(defaultValue = "10") Integer pageSize,
+            HttpServletRequest request) {
+        
+        // 获取当前用户ID
+        Long userId = SecurityUtils.getUserId();
+        
+        // 判断当前用户是否为管理员
+        boolean isAdmin = SecurityUtils.isAdmin(userId);
+        
+        // 分页查询发票列表
+        Page<Invoice> page = new Page<>(pageNo, pageSize);
+        return R.ok(invoiceService.selectInvoicePage(page, isAdmin, userId));
+    }
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/controller/InvoiceSegmentController.java

@@ -0,0 +1,88 @@
+package com.openhis.web.basicmanage.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.administration.domain.InvoiceSegment;
+import com.openhis.administration.service.IInvoiceSegmentService;
+import com.openhis.web.basicmanage.domain.InvoiceSegmentDeleteRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 发票段管理控制器
+ *
+ * @author system
+ * @date 2025-11-18
+ */
+@RestController
+@RequestMapping("/basicmanage/invoice-segment")
+public class InvoiceSegmentController {
+
+    @Autowired
+    private IInvoiceSegmentService invoiceSegmentService;
+
+    /**
+     * 分页查询发票段列表（带用户角色权限过滤）
+     *
+     * @param pageNo   页码
+     * @param pageSize 每页条数
+     * @param request  请求对象
+     * @return 发票段列表
+     */
+    @GetMapping("/page")
+    public R<?> selectInvoiceSegmentPage(
+            @RequestParam(defaultValue = "1") Integer pageNo,
+            @RequestParam(defaultValue = "100") Integer pageSize,
+            HttpServletRequest request) {
+        
+        // 获取当前用户ID
+        Long userId = SecurityUtils.getUserId();
+        
+        // 判断当前用户是否为管理员
+        boolean isAdmin = SecurityUtils.isAdmin(userId);
+        
+        // 分页查询发票段列表
+        Page<InvoiceSegment> page = new Page<>(pageNo, pageSize);
+        return R.ok(invoiceSegmentService.selectInvoiceSegmentPage(page, isAdmin, userId));
+    }
+    
+    /**
+     * 新增发票段
+     *
+     * @param invoiceSegment 发票段信息
+     * @return 操作结果
+     */
+    @PostMapping("/add")
+    public R<?> addInvoiceSegment(@RequestBody InvoiceSegment invoiceSegment) {
+        // 设置创建人信息
+        invoiceSegment.setCreateBy(SecurityUtils.getUsername());
+        int result = invoiceSegmentService.insertInvoiceSegment(invoiceSegment);
+        return result > 0 ? R.ok() : R.fail();
+    }
+    
+    /**
+     * 修改发票段
+     *
+     * @param invoiceSegment 发票段信息
+     * @return 操作结果
+     */
+    @PostMapping("/update")
+    public R<?> updateInvoiceSegment(@RequestBody InvoiceSegment invoiceSegment) {
+        // 设置更新人信息
+        invoiceSegment.setUpdateBy(SecurityUtils.getUsername());
+        int result = invoiceSegmentService.updateInvoiceSegment(invoiceSegment);
+        return result > 0 ? R.ok() : R.fail();
+    }
+    
+    /**
+     * 删除发票段
+     */
+    @PostMapping("/delete")
+    public R<?> delete(@RequestBody InvoiceSegmentDeleteRequest request) {
+        int rows = invoiceSegmentService.deleteInvoiceSegmentByIds(request.getIds());
+        return rows > 0 ? R.ok("删除成功") : R.fail("删除失败");
+    }
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/controller/OutpatientNoSegmentController.java

@@ -0,0 +1,219 @@
+package com.openhis.web.basicmanage.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.annotation.Log;
+import com.core.common.core.domain.R;
+import com.core.common.enums.BusinessType;
+import com.core.common.utils.SecurityUtils;
+import com.core.common.utils.StringUtils;
+import com.openhis.administration.domain.OutpatientNoSegment;
+import com.openhis.administration.service.IOutpatientNoSegmentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 门诊号码段管理控制器
+ *
+ * @author system
+ * @date 2025-01-XX
+ */
+@RestController
+@RequestMapping("/business-rule/outpatient-no")
+public class OutpatientNoSegmentController {
+
+    @Autowired
+    private IOutpatientNoSegmentService outpatientNoSegmentService;
+
+    /**
+     * 分页查询门诊号码段列表
+     *
+     * @param pageNo   页码
+     * @param pageSize 每页条数
+     * @param onlySelf 是否只查询自己的（true=只查询自己的，false=查询所有）
+     * @return 门诊号码段列表
+     */
+    @GetMapping("/page")
+    public R<?> selectOutpatientNoSegmentPage(
+            @RequestParam(defaultValue = "1") Integer pageNo,
+            @RequestParam(defaultValue = "10") Integer pageSize,
+            @RequestParam(required = false) Boolean onlySelf) {
+        
+        // 获取当前用户ID
+        Long userId = SecurityUtils.getUserId();
+        
+        // 如果onlySelf为null，默认只查询自己的
+        boolean onlySelfFlag = onlySelf != null ? onlySelf : true;
+        
+        // 分页查询门诊号码段列表
+        Page<OutpatientNoSegment> page = new Page<>(pageNo, pageSize);
+        Page<OutpatientNoSegment> result = outpatientNoSegmentService.selectOutpatientNoSegmentPage(page, onlySelfFlag, userId);
+        
+        return R.ok(result);
+    }
+    
+    /**
+     * 新增门诊号码段
+     *
+     * @param outpatientNoSegment 门诊号码段信息
+     * @return 操作结果
+     */
+    @Log(title = "门诊号码管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<?> addOutpatientNoSegment(@RequestBody OutpatientNoSegment outpatientNoSegment) {
+        // 校验必填字段
+        if (StringUtils.isEmpty(outpatientNoSegment.getStartNo()) || 
+            StringUtils.isEmpty(outpatientNoSegment.getEndNo()) ||
+            StringUtils.isEmpty(outpatientNoSegment.getUsedNo())) {
+            return R.fail("起始号码、终止号码和使用号码不能为空");
+        }
+        
+        // 校验号码段是否重复
+        if (outpatientNoSegmentService.checkNumberSegmentOverlap(
+                outpatientNoSegment.getStartNo(), 
+                outpatientNoSegment.getEndNo(), 
+                null)) {
+            return R.fail("门诊号码设置重复");
+        }
+        
+        // 设置创建人信息
+        outpatientNoSegment.setOperatorId(SecurityUtils.getUserId());
+        if (StringUtils.isEmpty(outpatientNoSegment.getOperatorName())) {
+            outpatientNoSegment.setOperatorName(SecurityUtils.getUsername());
+        }
+        outpatientNoSegment.setCreateBy(SecurityUtils.getUsername());
+        
+        int result = outpatientNoSegmentService.insertOutpatientNoSegment(outpatientNoSegment);
+        return result > 0 ? R.ok("保存成功") : R.fail("保存失败");
+    }
+    
+    /**
+     * 修改门诊号码段
+     *
+     * @param outpatientNoSegment 门诊号码段信息
+     * @return 操作结果
+     */
+    @Log(title = "门诊号码管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<?> updateOutpatientNoSegment(@RequestBody OutpatientNoSegment outpatientNoSegment) {
+        // 校验必填字段
+        if (StringUtils.isEmpty(outpatientNoSegment.getStartNo()) || 
+            StringUtils.isEmpty(outpatientNoSegment.getEndNo()) ||
+            StringUtils.isEmpty(outpatientNoSegment.getUsedNo())) {
+            return R.fail("起始号码、终止号码和使用号码不能为空");
+        }
+        
+        // 校验号码段是否重复（排除自身）
+        if (outpatientNoSegmentService.checkNumberSegmentOverlap(
+                outpatientNoSegment.getStartNo(), 
+                outpatientNoSegment.getEndNo(), 
+                outpatientNoSegment.getId())) {
+            return R.fail("门诊号码设置重复");
+        }
+        
+        // 设置更新人信息
+        outpatientNoSegment.setUpdateBy(SecurityUtils.getUsername());
+        
+        int result = outpatientNoSegmentService.updateOutpatientNoSegment(outpatientNoSegment);
+        return result > 0 ? R.ok("保存成功") : R.fail("保存失败");
+    }
+    
+    /**
+     * 删除门诊号码段
+     *
+     * @param request 包含ids数组的请求对象
+     * @return 操作结果
+     */
+    @Log(title = "门诊号码管理", businessType = BusinessType.DELETE)
+    @DeleteMapping
+    public R<?> deleteOutpatientNoSegment(@RequestBody java.util.Map<String, Object> request) {
+        // 支持接收 Long[] 或 String[] 或混合类型，处理大整数ID
+        Object idsObj = request.get("ids");
+        System.out.println("删除请求 - 接收到的ids原始数据: " + idsObj);
+        System.out.println("删除请求 - 接收到的ids类型: " + (idsObj != null ? idsObj.getClass().getName() : "null"));
+        
+        if (idsObj == null) {
+            return R.fail("请选择要删除的数据");
+        }
+        
+        // 转换为 Long[] 数组
+        Long[] ids = null;
+        if (idsObj instanceof java.util.List) {
+            java.util.List<?> idList = (java.util.List<?>) idsObj;
+            ids = new Long[idList.size()];
+            for (int i = 0; i < idList.size(); i++) {
+                Object idObj = idList.get(i);
+                if (idObj instanceof Long) {
+                    ids[i] = (Long) idObj;
+                } else if (idObj instanceof Integer) {
+                    ids[i] = ((Integer) idObj).longValue();
+                } else if (idObj instanceof String) {
+                    try {
+                        String idStr = (String) idObj;
+                        System.out.println("删除请求 - 转换字符串ID: " + idStr);
+                        ids[i] = Long.parseLong(idStr);
+                        System.out.println("删除请求 - 转换后的Long ID: " + ids[i]);
+                        // 验证转换是否正确
+                        if (!String.valueOf(ids[i]).equals(idStr)) {
+                            System.out.println("删除请求 - 警告：ID转换后值不匹配！原始: " + idStr + ", 转换后: " + ids[i]);
+                        }
+                    } catch (NumberFormatException e) {
+                        System.out.println("删除请求 - ID转换失败: " + idObj + ", 错误: " + e.getMessage());
+                        return R.fail("无效的ID格式: " + idObj);
+                    }
+                } else if (idObj instanceof Number) {
+                    ids[i] = ((Number) idObj).longValue();
+                } else {
+                    return R.fail("无效的ID类型: " + (idObj != null ? idObj.getClass().getName() : "null"));
+                }
+            }
+        } else if (idsObj instanceof Long[]) {
+            ids = (Long[]) idsObj;
+        } else {
+            return R.fail("无效的ID数组格式");
+        }
+        
+        System.out.println("删除请求 - 转换后的ids: " + java.util.Arrays.toString(ids));
+        
+        if (ids == null || ids.length == 0) {
+            return R.fail("请选择要删除的数据");
+        }
+        
+        // 获取当前用户ID
+        Long userId = SecurityUtils.getUserId();
+        System.out.println("删除请求 - 当前用户ID: " + userId);
+        
+        // 校验删除权限和使用状态
+        for (Long id : ids) {
+            System.out.println("删除验证 - 检查ID: " + id);
+            OutpatientNoSegment segment = outpatientNoSegmentService.getById(id);
+            
+            if (segment == null) {
+                // 记录日志以便调试
+                System.out.println("删除失败：记录不存在，ID=" + id + "，可能已被软删除或不存在");
+                return R.fail("数据不存在，ID: " + id);
+            }
+            
+            System.out.println("删除验证 - 找到记录: ID=" + segment.getId() + ", operatorId=" + segment.getOperatorId() + ", usedNo=" + segment.getUsedNo() + ", startNo=" + segment.getStartNo());
+            
+            // 校验归属权
+            if (!segment.getOperatorId().equals(userId)) {
+                System.out.println("删除验证 - 权限检查失败: segment.operatorId=" + segment.getOperatorId() + ", userId=" + userId);
+                return R.fail("只能删除自己维护的门诊号码段");
+            }
+            
+            // 校验使用状态（使用号码=起始号码表示未使用）
+            if (!segment.getUsedNo().equals(segment.getStartNo())) {
+                System.out.println("删除验证 - 使用状态检查失败: usedNo=" + segment.getUsedNo() + ", startNo=" + segment.getStartNo());
+                return R.fail("已有门诊号码段已有使用的门诊号码，请核对！");
+            }
+        }
+        
+        System.out.println("删除验证 - 所有检查通过，开始执行删除");
+        int rows = outpatientNoSegmentService.deleteOutpatientNoSegmentByIds(ids);
+        System.out.println("删除执行 - 影响行数: " + rows);
+        return rows > 0 ? R.ok("删除成功") : R.fail("删除失败");
+    }
+}
+

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/domain/InvoiceSegmentDeleteRequest.java

@@ -0,0 +1,23 @@
+package com.openhis.web.basicmanage.domain;
+
+import java.io.Serializable;
+
+/**
+ * 发票段删除请求类
+ *
+ * @author system
+ * @date 2024-06-19
+ */
+public class InvoiceSegmentDeleteRequest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Long[] ids;
+
+    public Long[] getIds() {
+        return ids;
+    }
+
+    public void setIds(Long[] ids) {
+        this.ids = ids;
+    }
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceDto.java

@@ -90,6 +90,14 @@ public class HealthcareServiceDto {
     private Integer appointmentRequiredFlag;
     private String appointmentRequiredFlag_enumText;
 
+    /**
+     * 出诊医生ID
+     */
+    @Dict(dictTable = "adm_practitioner", dictCode = "id", dictText = "name")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long practitionerId;
+    private String practitionerId_dictText;
+
     /**
      * 费用定价ID
      */

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceFormData.java

@@ -82,6 +82,11 @@ public class HealthcareServiceFormData {
     @NotBlank(message = "预约要求不能为空")
     private Integer appointmentRequiredFlag;
 
+    /**
+     * 出诊医生ID
+     */
+    private Long practitionerId;
+
     /** 医保编码 */
     private String ybNo;
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/charge/patientcardrenewal/PatientCardRenewalController.java

@@ -0,0 +1,53 @@
+package com.openhis.web.charge.patientcardrenewal;
+
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.core.common.core.domain.R;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 患者换卡控制器
+ * 
+ * @author system
+ * @date 2024-01-01
+ */
+@RestController
+@RequestMapping("/charge/patientCardRenewal")
+@Slf4j
+public class PatientCardRenewalController {
+
+    @Autowired
+    private PatientCardRenewalService patientCardRenewalService;
+
+    /**
+     * 执行患者换卡操作
+     * 
+     * @param request 换卡请求参数
+     * @return 换卡结果
+     */
+    @PostMapping("/renewCard")
+    public R<?> renewCard(@RequestBody RenewalRequest request) {
+        try {
+            log.info("患者换卡请求: 旧卡号={}, 新卡号={}, 患者ID={}", 
+                     request.getOldCardNo(), request.getNewCardNo(), request.getPatientId());
+            
+            // 执行换卡操作
+            boolean success = patientCardRenewalService.renewCard(request);
+            
+            if (success) {
+                log.info("患者换卡成功: 旧卡号={} -> 新卡号={}", 
+                         request.getOldCardNo(), request.getNewCardNo());
+                return R.ok("换卡成功");
+            } else {
+                return R.fail("换卡失败");
+            }
+        } catch (Exception e) {
+            log.error("患者换卡异常: ", e);
+            return R.fail("换卡操作异常: " + e.getMessage());
+        }
+    }
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/charge/patientcardrenewal/PatientCardRenewalService.java

@@ -0,0 +1,18 @@
+package com.openhis.web.charge.patientcardrenewal;
+
+/**
+ * 患者换卡服务接口
+ * 
+ * @author system
+ * @date 2024-01-01
+ */
+public interface PatientCardRenewalService {
+    
+    /**
+     * 执行患者换卡操作
+     * 
+     * @param request 换卡请求参数
+     * @return 是否换卡成功
+     */
+    boolean renewCard(RenewalRequest request);
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/charge/patientcardrenewal/PatientCardRenewalServiceImpl.java

@@ -0,0 +1,73 @@
+package com.openhis.web.charge.patientcardrenewal;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+
+import com.openhis.administration.domain.PatientIdentifier;
+import com.openhis.administration.service.IPatientIdentifierService;
+import com.openhis.common.enums.IdentifierStatusEnum;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+
+/**
+ * 患者换卡服务实现类
+ * 
+ * @author system
+ * @date 2024-01-01
+ */
+@Service
+@Slf4j
+public class PatientCardRenewalServiceImpl implements PatientCardRenewalService {
+    
+    @Autowired
+    private IPatientIdentifierService patientIdentifierService;
+    
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean renewCard(RenewalRequest request) {
+        log.info("执行患者换卡操作: 患者ID={}, 旧卡号={}, 新卡号={}, 原因={}", 
+                 request.getPatientId(), request.getOldCardNo(), request.getNewCardNo(), request.getReason());
+        
+        // 1. 验证参数合法性
+        if (StringUtils.isEmpty(request.getPatientId())) {
+            throw new IllegalArgumentException("患者ID不能为空");
+        }
+
+        if (StringUtils.isEmpty(request.getNewCardNo())) {
+            throw new IllegalArgumentException("新卡号不能为空");
+        }
+        
+        // 2. 检查新卡号是否已被使用
+        LambdaQueryWrapper<PatientIdentifier> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(PatientIdentifier::getIdentifierNo, request.getNewCardNo());
+        List<PatientIdentifier> existingIdentifiers = patientIdentifierService.list(queryWrapper);
+        if (existingIdentifiers != null && !existingIdentifiers.isEmpty()) {
+            throw new IllegalArgumentException("新卡号已被其他患者使用，请更换新卡号");
+        }
+        
+        // 3. 直接使用患者ID作为查询条件
+        Long patientId = Long.parseLong(request.getPatientId());
+        // 4. 通过患者ID查询现有标识信息
+        PatientIdentifier patientIdentifier = patientIdentifierService.selectByPatientId(patientId);
+
+        if (patientIdentifier != null) {
+            // 5. 只更新就诊卡号这一个参数
+
+            patientIdentifier.setIdentifierNo(request.getNewCardNo());
+            patientIdentifierService.updateById(patientIdentifier);
+            log.info("患者ID={} 换卡成功，已更新就诊卡号", patientId);
+        } else {
+            throw new IllegalArgumentException("未找到患者标识信息，无法进行换卡操作");
+        }
+        
+        // 4. 记录换卡日志 - 可以根据需要扩展日志记录功能
+        // 5. 处理相关业务系统的卡号更新 - 可以根据需要扩展
+        
+        return true;
+    }
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/charge/patientcardrenewal/RenewalRequest.java

@@ -0,0 +1,38 @@
+package com.openhis.web.charge.patientcardrenewal;
+
+import lombok.Data;
+
+/**
+ * 换卡请求参数类
+ * 
+ * @author system
+ * @date 2024-01-01
+ */
+@Data
+public class RenewalRequest {
+    
+    /**
+     * 旧门诊号码
+     */
+    private String oldCardNo;
+    
+    /**
+     * 新门诊号码
+     */
+    private String newCardNo;
+    
+    /**
+     * 患者ID
+     */
+    private String patientId;
+    
+    /**
+     * 换卡原因
+     */
+    private String reason;
+    
+    /**
+     * 备注信息
+     */
+    private String remark;
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java

@@ -91,17 +91,27 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
      */
     @Override
     public Page<PatientMetadata> getPatientMetadataBySearchKey(String searchKey, Integer pageNo, Integer pageSize) {
-        // 构建查询条件
+        // 构建查询条件，添加phone字段支持手机号搜索
         QueryWrapper<Patient> queryWrapper = HisQueryUtils.buildQueryWrapper(null, searchKey,
-            new HashSet<>(Arrays.asList("id_card", "name", "py_str", "wb_str")), null);
+            new HashSet<>(Arrays.asList("id_card", "name", "py_str", "wb_str", "phone")), null);
         // 设置排序
         queryWrapper.orderByDesc("update_time");
         // 通过证件号匹配 patient
         if (StringUtils.isNotEmpty(searchKey)) {
-            PatientIdentifier patientIdentifier = patientIdentifierService
-                .getOne(new LambdaQueryWrapper<PatientIdentifier>().eq(PatientIdentifier::getIdentifierNo, searchKey));
-            if (patientIdentifier != null) {
-                queryWrapper.or(q -> q.eq("id", patientIdentifier.getPatientId()));
+            List<PatientIdentifier> patientIdentifiers = patientIdentifierService
+                .list(new LambdaQueryWrapper<PatientIdentifier>().eq(PatientIdentifier::getIdentifierNo, searchKey));
+            if (patientIdentifiers != null && !patientIdentifiers.isEmpty()) {
+                // 如果有多个匹配结果，将它们全部添加到查询条件中
+                if (patientIdentifiers.size() == 1) {
+                    // 单个结果时直接添加条件
+                    queryWrapper.or(q -> q.eq("id", patientIdentifiers.get(0).getPatientId()));
+                } else {
+                    // 多个结果时使用in条件
+                    List<Long> patientIds = patientIdentifiers.stream()
+                        .map(PatientIdentifier::getPatientId)
+                        .collect(Collectors.toList());
+                    queryWrapper.or(q -> q.in("id", patientIds));
+                }
             }
         }
         // 患者信息
@@ -120,10 +130,11 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
             e.setFirstEnum_enumText(patientIdList.contains(e.getId()) ? EncounterType.FOLLOW_UP.getInfo()
                 : EncounterType.INITIAL.getInfo());
             // 患者标识
-            PatientIdentifier patientIdentifier = patientIdentifierService
-                    .getOne(new LambdaQueryWrapper<PatientIdentifier>().eq(PatientIdentifier::getPatientId, e.getId()));
-            if (patientIdentifier != null) {
-                e.setIdentifierNo(patientIdentifier.getIdentifierNo());
+            List<PatientIdentifier> patientIdentifiers = patientIdentifierService
+                    .list(new LambdaQueryWrapper<PatientIdentifier>().eq(PatientIdentifier::getPatientId, e.getId()));
+            if (patientIdentifiers != null && !patientIdentifiers.isEmpty()) {
+                // 取第一个标识号，如果需要可以根据业务需求选择其他逻辑
+                e.setIdentifierNo(patientIdentifiers.get(0).getIdentifierNo());
             }
 
         });
@@ -267,6 +278,23 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
             new HashSet<>(Arrays.asList("patient_name", "organization_name", "practitioner_name", "healthcare_name")),
             request);
 
+        // 手动处理 statusEnum 参数（用于过滤退号记录）
+        String statusEnumParam = request.getParameter("statusEnum");
+        if (statusEnumParam != null && !statusEnumParam.isEmpty()) {
+            try {
+                Integer statusEnum = Integer.parseInt(statusEnumParam);
+                if (statusEnum == -1) {
+                    // -1 表示排除退号记录（正常挂号）
+                    queryWrapper.ne("status_enum", 6);
+                } else {
+                    // 其他值表示精确匹配
+                    queryWrapper.eq("status_enum", statusEnum);
+                }
+            } catch (NumberFormatException e) {
+                // 忽略无效的参数值
+            }
+        }
+
         IPage<CurrentDayEncounterDto> currentDayEncounter = outpatientRegistrationAppMapper.getCurrentDayEncounter(
             new Page<>(pageNo, pageSize), EncounterClass.AMB.getValue(), ParticipantType.ADMITTER.getCode(),
             queryWrapper, ChargeItemContext.REGISTER.getValue(), PaymentStatus.SUCCESS.getValue());

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java

@@ -131,4 +131,39 @@ public class CurrentDayEncounterDto {
      */
     private Date birthDate;
 
+    /**
+     * 退号日期/时间
+     */
+    private Date returnDate;
+
+    /**
+     * 退号原因
+     */
+    private String returnReason;
+
+    /**
+     * 退号操作人
+     */
+    private String operatorName;
+
+    /**
+     * 退号操作工号（用户账号）
+     */
+    private String operatorId;
+
+    /**
+     * 退款金额
+     */
+    private BigDecimal refundAmount;
+
+    /**
+     * 合同编码（费用性质代码）
+     */
+    private String contractNo;
+
+    /**
+     * 退款方式（多个支付方式用逗号分隔）
+     */
+    private String refundMethod;
+
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemDto.java

@@ -81,5 +81,11 @@ public class RefundItemDto {
 
     /** 项目名 */
     private String itemName;
+    
+    /** 费用支付方式编码 */
+    private String medfeePaymtdCode;
+    
+    /** 费用类型 */
+    private String feeType;
 
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckMethodAppService.java

@@ -0,0 +1,29 @@
+package com.openhis.web.check.appservice;
+
+
+import com.core.common.core.domain.R;
+import com.openhis.check.domain.CheckMethod;
+import io.swagger.models.auth.In;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 检查方法Service接口
+ *
+ * @author system
+ * @date 2025-07-22
+ */
+public interface ICheckMethodAppService{
+
+    R<?> getCheckMethodList();
+
+    R<?> addCheckMethod(CheckMethod checkMethod);
+
+    R<?> updateCheckMethod(CheckMethod checkPart);
+
+    R<?> removeCheckMethod(Integer checkMethodId);
+
+    R<?> searchCheckMethodList(Integer pageNo, Integer pageSize, String checkType, String name, String packageName);
+
+    R<?> exportCheckMethod(String checkType, String name, String packageName, HttpServletResponse response);
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckPackageAppService.java

@@ -0,0 +1,48 @@
+package com.openhis.web.check.appservice;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.check.dto.CheckPackageDto;
+
+/**
+ * 检查套餐AppService接口
+ * 
+ * @author system
+ * @date 2025-11-26
+ */
+public interface ICheckPackageAppService {
+
+    /**
+     * 获取检查套餐列表
+     * @return 检查套餐列表
+     */
+    R<?> getCheckPackageList();
+
+    /**
+     * 根据ID获取检查套餐详情
+     * @param id 套餐ID
+     * @return 套餐详情
+     */
+    R<?> getCheckPackageById(Long id);
+
+    /**
+     * 新增检查套餐
+     * @param checkPackageDto 套餐信息
+     * @return 新增结果
+     */
+    R<?> addCheckPackage(CheckPackageDto checkPackageDto);
+
+    /**
+     * 更新检查套餐
+     * @param checkPackageDto 套餐信息
+     * @return 更新结果
+     */
+    R<?> updateCheckPackage(CheckPackageDto checkPackageDto);
+
+    /**
+     * 删除检查套餐
+     * @param id 套餐ID
+     * @return 删除结果
+     */
+    R<?> deleteCheckPackage(Long id);
+}
+

openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckPartAppService.java

@@ -0,0 +1,20 @@
+package com.openhis.web.check.appservice;
+
+import com.core.common.core.domain.R;
+import com.openhis.check.domain.CheckPart;
+
+import javax.servlet.http.HttpServletResponse;
+
+public interface ICheckPartAppService {
+    R<?> getCheckPartList();
+
+    R<?> addCheckPart(CheckPart checkPart);
+
+    R<?> removeCheckPart(Integer checkPartId);
+
+    R<?> updateCheckPart(CheckPart checkPart);
+
+    R<?> searchCheckPartList(Integer pageNo, Integer pageSize, String checkType, String name, String packageName);
+
+    R<?> exportCheckPart(String checkType, String name, String packageName, HttpServletResponse response);
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ILisGroupInfoAppService.java

@@ -0,0 +1,14 @@
+package com.openhis.web.check.appservice;
+
+import com.core.common.core.domain.R;
+import com.openhis.check.domain.LisGroupInfo;
+
+public interface ILisGroupInfoAppService {
+    R<?> getLisGroupInfoList();
+
+    R<?> add(LisGroupInfo lisGroupInfo);
+
+    R<?> update(LisGroupInfo lisGroupInfo);
+
+    R<?> delete(Integer lisGroupInfoId);
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckMethodAppServiceImpl.java

@@ -0,0 +1,129 @@
+package com.openhis.web.check.appservice.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.core.common.core.domain.R;
+import com.openhis.check.domain.CheckMethod;
+import com.openhis.check.service.ICheckMethodService;
+import com.openhis.web.check.appservice.ICheckMethodAppService;
+import com.openhis.web.reportmanage.utils.ExcelFillerUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@Slf4j
+public class CheckMethodAppServiceImpl implements ICheckMethodAppService {
+
+    @Resource
+    private ICheckMethodService checkMethodService;
+
+    @Override
+    public R<?> getCheckMethodList() {
+        List<CheckMethod> list = checkMethodService.list();
+        return R.ok(list);
+    }
+
+    @Override
+    public R<?> searchCheckMethodList(Integer pageNo, Integer pageSize, String checkType, String name, String packageName) {
+        LambdaQueryWrapper<CheckMethod> wrapper = new LambdaQueryWrapper<>();
+        if (checkType != null && ObjectUtil.isNotEmpty(checkType)) {
+            wrapper.eq(CheckMethod::getCheckType, checkType);
+        }
+        if (name != null && ObjectUtil.isNotEmpty(name)) {
+            wrapper.like(CheckMethod::getName, name);
+        }
+        if (packageName != null && ObjectUtil.isNotEmpty(packageName)) {
+            wrapper.eq(CheckMethod::getPackageName, packageName);
+        }
+        List<CheckMethod> list = checkMethodService.list(wrapper);
+        return R.ok(list);
+    }
+
+    @Override
+    public R<?> addCheckMethod(CheckMethod checkMethod) {
+        //1.数据校验
+        if (ObjectUtil.isEmpty(checkMethod.getName())) {
+            return R.fail("检查方法名称不能为空！");
+        }
+        if (ObjectUtil.isEmpty(checkMethod.getCode())) {
+            return R.fail("检查方法代码不能为空！");
+        }
+        if (ObjectUtil.isEmpty(checkMethod.getCheckType())) {
+            return R.fail("检查方法的检查类型不能为空！");
+        }
+        //2.保存
+        boolean save = checkMethodService.save(checkMethod);
+        return R.ok(save);
+    }
+
+    @Override
+    public R<?> updateCheckMethod(CheckMethod checkMethod) {
+        //1.数据校验
+        if (ObjectUtil.isEmpty(checkMethod.getName())) {
+            return R.fail("检查方法名称不能为空！");
+        }
+        if (ObjectUtil.isEmpty(checkMethod.getCode())) {
+            return R.fail("检查方法代码不能为空！");
+        }
+        if (ObjectUtil.isEmpty(checkMethod.getCheckType())) {
+            return R.fail("检查方法的检查类型不能为空！");
+        }
+        //2.更新
+        boolean b = checkMethodService.updateById(checkMethod);
+        return R.ok(b);
+    }
+
+    @Override
+    public R<?> removeCheckMethod(Integer checkMethodId) {
+        boolean remove = checkMethodService.removeById(checkMethodId);
+        return R.ok(remove);
+    }
+
+    @Override
+    public R<?> exportCheckMethod(String checkType, String name, String packageName, HttpServletResponse response) {
+        LambdaQueryWrapper<CheckMethod> wrapper = new LambdaQueryWrapper<>();
+        if (checkType != null && ObjectUtil.isNotEmpty(checkType)) {
+            wrapper.eq(CheckMethod::getCheckType, checkType);
+        }
+        if (name != null && ObjectUtil.isNotEmpty(name)) {
+            wrapper.like(CheckMethod::getName, name);
+        }
+        if (packageName != null && ObjectUtil.isNotEmpty(packageName)) {
+            wrapper.eq(CheckMethod::getPackageName, packageName);
+        }
+        List<CheckMethod> list = checkMethodService.list(wrapper);
+        
+        if (list.isEmpty()) {
+            return R.fail("导出Excel失败,无数据。");
+        }
+        
+        try {
+            // 准备表头（key对应实体的字段名）
+            Map<String, String> headers = new LinkedHashMap<>();
+            headers.put("checkType", "检查类型");
+            headers.put("code", "方法代码");
+            headers.put("name", "方法名称");
+            headers.put("packageName", "套餐名称");
+            headers.put("exposureNum", "曝光次数");
+            headers.put("orderNum", "序号");
+            headers.put("remark", "备注");
+
+            // 文件名，只传文字部分
+            String excelName = "检查方法列表";
+            // 导出到Excel
+            ExcelFillerUtil.makeExcelFile(response, list, headers, excelName, null);
+        } catch (IOException | IllegalAccessException e) {
+            e.printStackTrace();
+            return R.fail("导出Excel失败：" + e.getMessage());
+        }
+
+        return R.ok(null, "导出Excel成功");
+    }
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckPackageAppServiceImpl.java

@@ -0,0 +1,206 @@
+package com.openhis.web.check.appservice.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.core.common.core.domain.R;
+import com.openhis.check.domain.CheckPackage;
+import com.openhis.check.domain.CheckPackageDetail;
+import com.openhis.check.service.ICheckPackageDetailService;
+import com.openhis.check.service.ICheckPackageService;
+import com.openhis.web.check.appservice.ICheckPackageAppService;
+import com.openhis.web.check.dto.CheckPackageDetailDto;
+import com.openhis.web.check.dto.CheckPackageDto;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 检查套餐AppService实现
+ * 
+ * @author system
+ * @date 2025-11-26
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class CheckPackageAppServiceImpl implements ICheckPackageAppService {
+
+    private final ICheckPackageService checkPackageService;
+    private final ICheckPackageDetailService checkPackageDetailService;
+
+    @Override
+    public R<?> getCheckPackageList() {
+        try {
+            List<CheckPackage> list = checkPackageService.list();
+            return R.ok(list);
+        } catch (Exception e) {
+            log.error("获取检查套餐列表失败", e);
+            return R.fail("获取检查套餐列表失败");
+        }
+    }
+
+    @Override
+    public R<?> getCheckPackageById(Long id) {
+        try {
+            CheckPackage checkPackage = checkPackageService.getById(id);
+            if (checkPackage == null) {
+                return R.fail("套餐不存在");
+            }
+
+            // 获取套餐明细
+            List<CheckPackageDetail> details = checkPackageDetailService.list(
+                    new LambdaQueryWrapper<CheckPackageDetail>()
+                            .eq(CheckPackageDetail::getPackageId, id)
+                            .orderByAsc(CheckPackageDetail::getOrderNum)
+            );
+
+            // 转换为DTO
+            CheckPackageDto dto = new CheckPackageDto();
+            BeanUtils.copyProperties(checkPackage, dto);
+            
+            List<CheckPackageDetailDto> detailDtos = details.stream().map(detail -> {
+                CheckPackageDetailDto detailDto = new CheckPackageDetailDto();
+                BeanUtils.copyProperties(detail, detailDto);
+                return detailDto;
+            }).collect(Collectors.toList());
+            
+            dto.setItems(detailDtos);
+            
+            return R.ok(dto);
+        } catch (Exception e) {
+            log.error("获取检查套餐详情失败", e);
+            return R.fail("获取检查套餐详情失败");
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> addCheckPackage(CheckPackageDto checkPackageDto) {
+        try {
+            // 创建套餐主表数据
+            CheckPackage checkPackage = new CheckPackage();
+            BeanUtils.copyProperties(checkPackageDto, checkPackage);
+            
+            // 设置套餐维护日期为当前系统日期
+            checkPackage.setMaintainDate(LocalDate.now());
+            checkPackage.setCreateTime(LocalDateTime.now());
+            checkPackage.setUpdateTime(LocalDateTime.now());
+            
+            // 保存套餐主表
+            boolean saveResult = checkPackageService.save(checkPackage);
+            if (!saveResult) {
+                return R.fail("保存套餐失败");
+            }
+
+            // 保存套餐明细
+            if (checkPackageDto.getItems() != null && !checkPackageDto.getItems().isEmpty()) {
+                List<CheckPackageDetail> details = new ArrayList<>();
+                int orderNum = 1;
+                for (CheckPackageDetailDto detailDto : checkPackageDto.getItems()) {
+                    CheckPackageDetail detail = new CheckPackageDetail();
+                    BeanUtils.copyProperties(detailDto, detail);
+                    detail.setPackageId(checkPackage.getId());
+                    detail.setOrderNum(orderNum++);
+                    detail.setCreateTime(LocalDateTime.now());
+                    detail.setUpdateTime(LocalDateTime.now());
+                    details.add(detail);
+                }
+                checkPackageDetailService.saveBatch(details);
+            }
+
+            return R.ok(checkPackage.getId(), "保存成功");
+        } catch (Exception e) {
+            log.error("新增检查套餐失败", e);
+            return R.fail("新增检查套餐失败: " + e.getMessage());
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> updateCheckPackage(CheckPackageDto checkPackageDto) {
+        try {
+            // 检查套餐是否存在
+            CheckPackage existPackage = checkPackageService.getById(checkPackageDto.getId());
+            if (existPackage == null) {
+                return R.fail("套餐不存在");
+            }
+
+            // 更新套餐主表数据
+            CheckPackage checkPackage = new CheckPackage();
+            BeanUtils.copyProperties(checkPackageDto, checkPackage);
+            
+            // 更新套餐维护日期为当前系统日期
+            checkPackage.setMaintainDate(LocalDate.now());
+            checkPackage.setUpdateTime(LocalDateTime.now());
+            
+            boolean updateResult = checkPackageService.updateById(checkPackage);
+            if (!updateResult) {
+                return R.fail("更新套餐失败");
+            }
+
+            // 删除原有明细
+            checkPackageDetailService.remove(
+                    new LambdaQueryWrapper<CheckPackageDetail>()
+                            .eq(CheckPackageDetail::getPackageId, checkPackage.getId())
+            );
+
+            // 保存新的套餐明细
+            if (checkPackageDto.getItems() != null && !checkPackageDto.getItems().isEmpty()) {
+                List<CheckPackageDetail> details = new ArrayList<>();
+                int orderNum = 1;
+                for (CheckPackageDetailDto detailDto : checkPackageDto.getItems()) {
+                    CheckPackageDetail detail = new CheckPackageDetail();
+                    BeanUtils.copyProperties(detailDto, detail);
+                    detail.setPackageId(checkPackage.getId());
+                    detail.setOrderNum(orderNum++);
+                    detail.setCreateTime(LocalDateTime.now());
+                    detail.setUpdateTime(LocalDateTime.now());
+                    details.add(detail);
+                }
+                checkPackageDetailService.saveBatch(details);
+            }
+
+            return R.ok("更新成功");
+        } catch (Exception e) {
+            log.error("更新检查套餐失败", e);
+            return R.fail("更新检查套餐失败: " + e.getMessage());
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> deleteCheckPackage(Long id) {
+        try {
+            // 检查套餐是否存在
+            CheckPackage existPackage = checkPackageService.getById(id);
+            if (existPackage == null) {
+                return R.fail("套餐不存在");
+            }
+
+            // 删除套餐明细
+            checkPackageDetailService.remove(
+                    new LambdaQueryWrapper<CheckPackageDetail>()
+                            .eq(CheckPackageDetail::getPackageId, id)
+            );
+
+            // 删除套餐主表
+            boolean deleteResult = checkPackageService.removeById(id);
+            if (!deleteResult) {
+                return R.fail("删除套餐失败");
+            }
+
+            return R.ok("删除成功");
+        } catch (Exception e) {
+            log.error("删除检查套餐失败", e);
+            return R.fail("删除检查套餐失败: " + e.getMessage());
+        }
+    }
+}
+

openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckPartAppServiceImpl.java

@@ -0,0 +1,109 @@
+package com.openhis.web.check.appservice.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.core.common.core.domain.R;
+import com.openhis.check.domain.CheckPart;
+import com.openhis.check.service.ICheckPartService;
+import com.openhis.web.check.appservice.ICheckPartAppService;
+import com.openhis.web.reportmanage.utils.ExcelFillerUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+@Service
+@Slf4j
+public class CheckPartAppServiceImpl implements ICheckPartAppService {
+    @Resource
+    private ICheckPartService checkPartService;
+    @Override
+    public R<?> getCheckPartList() {
+        List<CheckPart> list = checkPartService.list();
+        return R.ok(list);
+    }
+
+    @Override
+    public R<?> searchCheckPartList(Integer pageNo, Integer pageSize, String checkType, String name, String packageName) {
+        LambdaQueryWrapper<CheckPart> wrapper = new LambdaQueryWrapper<>();
+        if (checkType != null && ObjectUtil.isNotEmpty(checkType)) {
+            wrapper.eq(CheckPart::getCheckType, checkType);
+        }
+        if (name != null && ObjectUtil.isNotEmpty(name)) {
+            wrapper.like(CheckPart::getName, name);
+        }
+        if (packageName != null && ObjectUtil.isNotEmpty(packageName)) {
+            wrapper.eq(CheckPart::getPackageName, packageName);
+        }
+        List<CheckPart> list = checkPartService.list(wrapper);
+        return R.ok(list);
+    }
+
+    @Override
+    public R<?> addCheckPart(CheckPart checkPart) {
+        //数据检验
+
+        //保存
+        boolean save = checkPartService.save(checkPart);
+        return R.ok(save);
+    }
+
+    @Override
+    public R<?> removeCheckPart(Integer checkPartId) {
+        boolean remove = checkPartService.removeById(checkPartId);
+        return R.ok(remove);
+    }
+
+    @Override
+    public R<?> updateCheckPart(CheckPart checkPart) {
+        boolean b = checkPartService.updateById(checkPart);
+        return R.ok(b);
+    }
+
+    @Override
+    public R<?> exportCheckPart(String checkType, String name, String packageName, HttpServletResponse response) {
+        LambdaQueryWrapper<CheckPart> wrapper = new LambdaQueryWrapper<>();
+        if (checkType != null && ObjectUtil.isNotEmpty(checkType)) {
+            wrapper.eq(CheckPart::getCheckType, checkType);
+        }
+        if (name != null && ObjectUtil.isNotEmpty(name)) {
+            wrapper.like(CheckPart::getName, name);
+        }
+        if (packageName != null && ObjectUtil.isNotEmpty(packageName)) {
+            wrapper.eq(CheckPart::getPackageName, packageName);
+        }
+        List<CheckPart> list = checkPartService.list(wrapper);
+
+        if (list.isEmpty()) {
+            return R.fail("导出Excel失败,无数据。");
+        }
+
+        try {
+            // 准备表头（key对应实体的字段名）
+            Map<String, String> headers = new LinkedHashMap<>();
+            headers.put("checkType", "检查类型");
+            headers.put("code", "部位代码");
+            headers.put("name", "部位名称");
+            headers.put("packageName", "套餐名称");
+            headers.put("exposureNum", "曝光次数");
+            headers.put("price", "金额");
+            headers.put("number", "序号");
+            headers.put("serviceScope", "服务范围");
+            headers.put("subType", "下级医技类型");
+            headers.put("remark", "备注");
+
+            // 文件名，只传文字部分
+            String excelName = "检查部位列表";
+            // 导出到Excel
+            ExcelFillerUtil.makeExcelFile(response, list, headers, excelName, null);
+        } catch (IOException | IllegalAccessException e) {
+            e.printStackTrace();
+            return R.fail("导出Excel失败：" + e.getMessage());
+        }
+        return R.ok(null, "导出Excel成功");
+    }
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/LisGroupInfoAppServiceImpl.java

@@ -0,0 +1,48 @@
+package com.openhis.web.check.appservice.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.core.common.core.domain.R;
+import com.openhis.check.domain.LisGroupInfo;
+import com.openhis.check.service.ILisGroupInfoService;
+import com.openhis.web.check.appservice.ILisGroupInfoAppService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+@Slf4j
+public class LisGroupInfoAppServiceImpl implements ILisGroupInfoAppService {
+    @Resource
+    private ILisGroupInfoService lisGroupInfoService;
+    @Override
+    public R<?> getLisGroupInfoList() {
+        List<LisGroupInfo> list = lisGroupInfoService.list();
+        return R.ok(list);
+    }
+
+    @Override
+    public R<?> add(LisGroupInfo lisGroupInfo) {
+        if (ObjectUtil.isEmpty(lisGroupInfo)) {
+            return R.fail("信息不能为空");
+        }
+        boolean save = lisGroupInfoService.save(lisGroupInfo);
+        return R.ok(save);
+    }
+
+    @Override
+    public R<?> update(LisGroupInfo lisGroupInfo) {
+        if (ObjectUtil.isEmpty(lisGroupInfo)) {
+            return R.fail("信息不能为空");
+        }
+        boolean update = lisGroupInfoService.updateById(lisGroupInfo);
+        return R.ok( update);
+    }
+
+    @Override
+    public R<?> delete(Integer lisGroupInfoId) {
+        boolean b = lisGroupInfoService.removeById(lisGroupInfoId);
+        return R.ok(b);
+    }
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckMethodController.java

@@ -0,0 +1,82 @@
+package com.openhis.web.check.controller;
+
+import com.core.common.core.domain.R;
+import com.openhis.check.domain.CheckMethod;
+import com.openhis.web.check.appservice.ICheckMethodAppService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+
+
+@RestController
+@Slf4j
+@RequestMapping("/check/method")
+public class CheckMethodController {
+    @Resource
+    private ICheckMethodAppService checkMethodAppService;
+
+    /*
+     * 获取检查方法
+     * @Param    此处参数注释有问题，完全是按照需求给的图来注释的
+     */
+    @GetMapping("/list")
+    public R<?> getCheckMethodList(){
+        return R.ok(checkMethodAppService.getCheckMethodList());
+    }
+
+    /*
+    * 条件查询检查方法
+    * @Para
+    * */
+    @GetMapping("/search")
+    public R<?> searchCheckMethodList(
+            @RequestParam(required = false) Integer pageNo,
+            @RequestParam(required = false) Integer pageSize,
+            @RequestParam(required = false) String checkType,
+            @RequestParam(required = false) String name,
+            @RequestParam(required = false) String packageName) {
+        return R.ok(checkMethodAppService.searchCheckMethodList(pageNo,pageSize,checkType,name,packageName));
+    }
+
+    /*
+     * 新增检查方法
+     * @Param
+     */
+    @PostMapping("/add")
+    public R<?> addCheckMethod(@RequestBody CheckMethod checkMethod){
+        return R.ok(checkMethodAppService.addCheckMethod(checkMethod));
+    }
+
+    /*
+     * 删除检查方法
+     * @Param code代码
+     */
+    @DeleteMapping("/delete/{checkMethodId}")
+    public R<?> deleteCheckMethod(@PathVariable Integer checkMethodId){
+        return R.ok(checkMethodAppService.removeCheckMethod(checkMethodId));
+    }
+
+    /*
+     * 更新检查方法
+     * @Param
+     */
+    @PutMapping("/update")
+    public R<?> updateCheckMethod(@RequestBody CheckMethod checkMethod){
+        return R.ok(checkMethodAppService.updateCheckMethod(checkMethod));
+    }
+
+    /*
+     * 导出检查方法列表
+     * @Param
+     */
+    @GetMapping("/export")
+    public void exportCheckMethod(
+            @RequestParam(required = false) String checkType,
+            @RequestParam(required = false) String name,
+            @RequestParam(required = false) String packageName,
+            HttpServletResponse response) {
+        checkMethodAppService.exportCheckMethod(checkType, name, packageName, response);
+    }
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckPartController.java

@@ -0,0 +1,80 @@
+package com.openhis.web.check.controller;
+
+import com.core.common.core.domain.R;
+import com.openhis.check.domain.CheckPart;
+import com.openhis.web.check.appservice.ICheckPartAppService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+
+@RestController
+@Slf4j
+@RequestMapping("/check/part")
+public class CheckPartController {
+    @Resource
+    private ICheckPartAppService checkPartAppService;
+
+    /*
+     * 获取检查部位
+     * @Param检查方法    此处参数注释有问题，完全是按照需求给的图来注释的
+     */
+    @GetMapping("/list")
+    public R<?> getCheckPartList(){
+        return R.ok(checkPartAppService.getCheckPartList());
+    }
+
+    /*
+    * 条件搜索检查部位
+    * @Param
+    * */
+    @GetMapping("/search")
+    public R<?> searchCheckPartList(@RequestParam(required = false) Integer pageNo,
+                                    @RequestParam(required = false) Integer pageSize,
+                                    @RequestParam(required = false) String checkType,
+                                    @RequestParam(required = false) String name,
+                                    @RequestParam(required = false) String packageName){
+        return R.ok(checkPartAppService.searchCheckPartList(pageNo,pageSize,checkType,name,packageName));
+    }
+
+    /*
+     * 新增检查部位
+     * @Param
+     */
+    @PostMapping("/add")
+    public R<?> addCheckPart(@RequestBody CheckPart checkPart){
+        return R.ok(checkPartAppService.addCheckPart(checkPart));
+    }
+
+    /*
+     * 删除检查部位
+     * @Param code代码
+     */
+    @DeleteMapping("/delete/{checkPartId}")
+    public R<?> deleteCheckPart(@PathVariable Integer checkPartId){
+        return R.ok(checkPartAppService.removeCheckPart(checkPartId));
+    }
+
+    /*
+     * 更新检查部位
+     * @Param
+     */
+    @PutMapping("/update")
+    public R<?> updateCheckPart(@RequestBody CheckPart checkPart){
+        return R.ok(checkPartAppService.updateCheckPart(checkPart));
+    }
+
+    /*
+     * 导出检查部位列表
+     * @Param
+     */
+    @GetMapping("/export")
+    public void exportCheckPart(
+            @RequestParam(required = false) String checkType,
+            @RequestParam(required = false) String name,
+            @RequestParam(required = false) String packageName,
+            HttpServletResponse response) {
+        checkPartAppService.exportCheckPart(checkType, name, packageName, response);
+    }
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckTypeController.java

@@ -0,0 +1,186 @@
+package com.openhis.web.check.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.core.common.core.controller.BaseController;
+import com.core.common.core.domain.AjaxResult;
+import com.core.common.core.domain.R;
+import com.openhis.check.domain.CheckMethod;
+import com.openhis.check.domain.CheckPackage;
+import com.openhis.check.domain.CheckPart;
+import com.openhis.check.domain.CheckType;
+import com.openhis.check.service.ICheckMethodService;
+import com.openhis.check.service.ICheckPackageService;
+import com.openhis.check.service.ICheckPartService;
+import com.openhis.check.service.ICheckTypeService;
+import com.openhis.web.check.appservice.ICheckPackageAppService;
+import com.openhis.web.check.dto.CheckPackageDto;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * 检查类型管理Controller
+ *
+ * @author system
+ * @date 2025-07-22
+ * @updated 2025-11-26 - 增加套餐设置相关接口
+ */
+@RestController
+@RequestMapping({"/system/check-type", "/system"})
+@Slf4j
+@AllArgsConstructor
+public class CheckTypeController extends BaseController {
+
+    private final ICheckTypeService checkTypeService;
+    private final ICheckMethodService checkMethodService;
+    private final ICheckPartService checkPartService;
+    private final ICheckPackageService checkPackageService;
+    private final ICheckPackageAppService checkPackageAppService;
+
+    /**
+     * 获取检查类型列表
+     */
+    @GetMapping("/list")
+    public AjaxResult list() {
+        List<CheckType> list = checkTypeService.list();
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 获取检查方法列表
+     */
+    @GetMapping({"/method/list", "/check-method/list"})
+    public AjaxResult methodList() {
+        List<CheckMethod> list = checkMethodService.list();
+        return AjaxResult.success(list);
+    }
+    
+    /**
+     * 获取检查部位列表
+     */
+    @GetMapping({"/part/list", "/check-part/list"})
+    public AjaxResult partList() {
+        List<CheckPart> list = checkPartService.list();
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 获取检查套餐列表（支持分页和筛选）
+     */
+    @GetMapping({"/package/list", "/check-package/list"})
+    public AjaxResult packageList(
+            @RequestParam(required = false) Integer pageNo,
+            @RequestParam(required = false) Integer pageSize,
+            @RequestParam(required = false) String organization,
+            @RequestParam(required = false) String packageName,
+            @RequestParam(required = false) String packageLevel,
+            @RequestParam(required = false) String packageType,
+            @RequestParam(required = false) String department,
+            @RequestParam(required = false) String user,
+            @RequestParam(required = false) String startDate,
+            @RequestParam(required = false) String endDate) {
+        
+        LambdaQueryWrapper<CheckPackage> wrapper = new LambdaQueryWrapper<>();
+        
+        // 添加筛选条件
+        if (organization != null && !organization.isEmpty()) {
+            wrapper.eq(CheckPackage::getOrganization, organization);
+        }
+        if (packageName != null && !packageName.isEmpty()) {
+            wrapper.like(CheckPackage::getPackageName, packageName);
+        }
+        if (packageLevel != null && !packageLevel.isEmpty()) {
+            wrapper.eq(CheckPackage::getPackageLevel, packageLevel);
+        }
+        if (packageType != null && !packageType.isEmpty()) {
+            wrapper.eq(CheckPackage::getPackageType, packageType);
+        }
+        if (department != null && !department.isEmpty()) {
+            wrapper.like(CheckPackage::getDepartment, department);
+        }
+        if (user != null && !user.isEmpty()) {
+            wrapper.like(CheckPackage::getUser, user);
+        }
+        if (startDate != null && !startDate.isEmpty()) {
+            wrapper.ge(CheckPackage::getMaintainDate, LocalDate.parse(startDate));
+        }
+        if (endDate != null && !endDate.isEmpty()) {
+            wrapper.le(CheckPackage::getMaintainDate, LocalDate.parse(endDate));
+        }
+        
+        // 按更新时间倒序排列
+        wrapper.orderByDesc(CheckPackage::getUpdateTime);
+        
+        // 如果需要分页
+        if (pageNo != null && pageSize != null) {
+            com.baomidou.mybatisplus.extension.plugins.pagination.Page<CheckPackage> page = 
+                new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(pageNo, pageSize);
+            com.baomidou.mybatisplus.extension.plugins.pagination.Page<CheckPackage> result = 
+                checkPackageService.page(page, wrapper);
+            return AjaxResult.success(result);
+        } else {
+            List<CheckPackage> list = checkPackageService.list(wrapper);
+        return AjaxResult.success(list);
+        }
+    }
+
+    /**
+     * 新增检查类型
+     */
+    @PostMapping
+    public AjaxResult add(@RequestBody CheckType checkType) {
+        return toAjax(checkTypeService.save(checkType));
+    }
+
+    /**
+     * 修改检查类型
+     */
+    @PutMapping
+    public AjaxResult edit(@RequestBody CheckType checkType) {
+        return toAjax(checkTypeService.updateById(checkType));
+    }
+
+    /**
+     * 删除检查类型
+     */
+    @DeleteMapping("/{checkTypeId}")
+    public AjaxResult remove(@PathVariable Long checkTypeId) {
+        return toAjax(checkTypeService.removeById(checkTypeId));
+    }
+
+    /**
+     * 根据ID获取检查套餐详情
+     */
+    @GetMapping({"/package/{id}", "/check-package/{id}"})
+    public R<?> getCheckPackageById(@PathVariable Long id) {
+        return checkPackageAppService.getCheckPackageById(id);
+    }
+
+    /**
+     * 新增检查套餐
+     */
+    @PostMapping({"/package", "/check-package"})
+    public R<?> addCheckPackage(@Valid @RequestBody CheckPackageDto checkPackageDto) {
+        return checkPackageAppService.addCheckPackage(checkPackageDto);
+    }
+
+    /**
+     * 更新检查套餐
+     */
+    @PutMapping({"/package", "/check-package"})
+    public R<?> updateCheckPackage(@Valid @RequestBody CheckPackageDto checkPackageDto) {
+        return checkPackageAppService.updateCheckPackage(checkPackageDto);
+    }
+
+    /**
+     * 删除检查套餐
+     */
+    @DeleteMapping({"/package/{id}", "/check-package/{id}"})
+    public R<?> deleteCheckPackage(@PathVariable Long id) {
+        return checkPackageAppService.deleteCheckPackage(id);
+    }
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/LisGroupInfoController.java

@@ -0,0 +1,56 @@
+package com.openhis.web.check.controller;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.check.appservice.ILisGroupInfoAppService;
+import org.springframework.web.bind.annotation.*;
+import com.openhis.check.domain.LisGroupInfo;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/check/lisGroupInfo")
+public class LisGroupInfoController {
+    @Resource
+    private ILisGroupInfoAppService lisGroupInfoAppService;
+
+    /*
+    *
+    * 获取Lis分组信息
+    *
+    * */
+    @GetMapping("/list")
+    public R<?> getLisGroupInfoList(){
+        return R.ok(lisGroupInfoAppService.getLisGroupInfoList());
+    }
+
+    /*
+     *
+     * 新增Lis分组信息
+     *
+     * */
+    @PostMapping("/add")
+    public R<?> addLisGroupInfo(@RequestBody LisGroupInfo lisGroupInfo){
+        return R.ok(lisGroupInfoAppService.add(lisGroupInfo));
+    }
+
+    /*
+     *
+     * 修改Lis分组信息
+     *
+     * */
+    @PutMapping("/update")
+    public R<?> updateLisGroupInfo(@RequestBody LisGroupInfo lisGroupInfo){
+        return R.ok(lisGroupInfoAppService.update(lisGroupInfo));
+    }
+
+    /*
+     *
+     * 删除Lis分组信息
+     *
+     * */
+    @DeleteMapping("/{lisGroupInfoId}")
+    public R<?> deleteLisGroupInfo(@PathVariable Integer lisGroupInfoId){
+        return R.ok(lisGroupInfoAppService.delete(lisGroupInfoId));
+    }
+
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckMethodDto.java

@@ -0,0 +1,46 @@
+package com.openhis.web.check.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+@Data
+@Accessors(chain = true)
+public class CheckMethodDto {
+
+    /**
+     * 检查方法ID
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /* 检查类型 */
+    private String checkType;
+
+    /* 方法代码 */
+    private String code;
+
+    /* 方法名称 */
+    private String name;
+
+    /* 套餐名称 */
+    private String packageName;
+
+    /* 曝光次数 */
+    private Integer exposureNum;
+
+    /* 序号 */
+    private Integer orderNum;
+
+    /* 备注 */
+    private String remark;
+
+    /** 创建时间 */
+    private LocalDateTime createTime;
+
+    /** 更新时间 */
+    private LocalDateTime updateTime;
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckPackageDetailDto.java

@@ -0,0 +1,71 @@
+package com.openhis.web.check.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * 检查套餐明细DTO
+ * 
+ * @author system
+ * @date 2025-11-26
+ */
+@Data
+@Accessors(chain = true)
+public class CheckPackageDetailDto {
+
+    /** 套餐明细ID */
+    private Long id;
+
+    /** 套餐ID */
+    private Long packageId;
+
+    /** 项目编号 */
+    private String itemCode;
+
+    /** 项目名称/规格 */
+    @NotBlank(message = "项目名称不能为空")
+    private String itemName;
+
+    /** 检查项目ID(诊疗项目ID) */
+    private Long checkItemId;
+
+    /** 剂量 */
+    private String dose;
+
+    /** 途径 */
+    private String method;
+
+    /** 频次 */
+    private String frequency;
+
+    /** 天数 */
+    private String days;
+
+    /** 数量 */
+    @NotNull(message = "数量不能为空")
+    private Integer quantity;
+
+    /** 单价 */
+    @NotNull(message = "单价不能为空")
+    private BigDecimal unitPrice;
+
+    /** 金额 */
+    private BigDecimal amount;
+
+    /** 服务费 */
+    private BigDecimal serviceCharge;
+
+    /** 总金额 */
+    private BigDecimal total;
+
+    /** 产地 */
+    private String origin;
+
+    /** 序号 */
+    private Integer orderNum;
+}
+

openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckPackageDto.java

@@ -0,0 +1,86 @@
+package com.openhis.web.check.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * 检查套餐DTO
+ * 
+ * @author system
+ * @date 2025-11-26
+ */
+@Data
+@Accessors(chain = true)
+public class CheckPackageDto {
+
+    /** 检查套餐ID */
+    private Long id;
+
+    /** 套餐名称 */
+    @NotBlank(message = "套餐名称不能为空")
+    private String packageName;
+
+    /** 套餐编码 */
+    private String code;
+
+    /** 套餐类别 */
+    @NotBlank(message = "套餐类别不能为空")
+    private String packageType;
+
+    /** 套餐级别 */
+    @NotBlank(message = "套餐级别不能为空")
+    private String packageLevel;
+
+    /** 适用科室 */
+    private String department;
+
+    /** 适用用户 */
+    private String user;
+
+    /** 卫生机构 */
+    private String organization;
+
+    /** 套餐金额 */
+    private BigDecimal packagePrice;
+
+    /** 折扣 */
+    private BigDecimal discount;
+
+    /** 制单人 */
+    private String creator;
+
+    /** 是否停用 */
+    private Integer isDisabled;
+
+    /** 显示套餐名 */
+    private Integer showPackageName;
+
+    /** 生成服务费 */
+    private Integer generateServiceFee;
+
+    /** 套餐价格启用状态 */
+    private Integer packagePriceEnabled;
+
+    /** 服务费 */
+    private BigDecimal serviceFee;
+
+    /** 备注 */
+    private String remark;
+
+    /** 描述 */
+    private String description;
+
+    /** 套餐维护日期 */
+    private LocalDate createDate;
+
+    /** 套餐明细列表 */
+    @NotNull(message = "套餐明细不能为空")
+    private List<CheckPackageDetailDto> items;
+}
+

openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckPartDto.java

@@ -0,0 +1,41 @@
+package com.openhis.web.check.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class CheckPartDto {
+    /** 检查部位id */
+    private Long id;
+
+    /** 检查部位名称 */
+    private String name;
+
+    /** 检查部位编码 */
+    private String code;
+
+    /** 检查部位检查类型 */
+    private String checkType;
+
+    /** 曝光次数 */
+    private Integer exposureNum;
+
+    /** 费用套餐 */
+    private String packageName;
+
+    /** 金额 */
+    private Double price;
+
+    /** 序号 */
+    private Integer number;
+
+    /** 服务范围 */
+    private String serviceScope;
+
+    /** 下级医技类型 */
+    private String subType;
+
+    /** 备注 */
+    private String remark;
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/mapper/CheckMethodAppMapper.java

@@ -0,0 +1,10 @@
+package com.openhis.web.check.mapper;
+
+
+import org.springframework.stereotype.Repository;
+
+
+@Repository
+public interface CheckMethodAppMapper{
+
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/mapper/CheckPartAppMapper.java

@@ -0,0 +1,7 @@
+package com.openhis.web.check.mapper;
+
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface CheckPartAppMapper {
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/mapper/LisGroupInfoAppMapper.java

@@ -0,0 +1,7 @@
+package com.openhis.web.check.mapper;
+
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface LisGroupInfoAppMapper {
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/controller/CommonAppController.java

@@ -91,7 +91,7 @@ public class CommonAppController {
     /**
      * 病区列表
      *
-     * @return 病区列表
+     * @return 病区列表       
      */
     @GetMapping(value = "/ward-list")
     public R<?> getWardList(@RequestParam(value = "orgId", required = false) Long orgId) {
@@ -105,7 +105,7 @@ public class CommonAppController {
      */
     @GetMapping(value = "/department-list")
     public R<?> getDepartmentList() {
-        return commonService.getDepartmentList();
+        return  commonService.getDepartmentList();
     }
 
     /**

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationMainAppService.java

@@ -52,6 +52,14 @@ public interface IDoctorStationMainAppService {
      */
     R<?> completeEncounter(Long encounterId);
 
+    /**
+     * 取消完成
+     *
+     * @param encounterId 就诊id
+     * @return 结果
+     */
+    R<?> cancelEncounter(Long encounterId);
+
     /**
      * 查询处方号列表信息
      *

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java

@@ -140,6 +140,17 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             adviceUtils.subtractInventory(adviceInventoryList, adviceDraftInventoryList);
         // 查询取药科室配置
         List<AdviceInventoryDto> medLocationConfig = doctorStationAdviceAppMapper.getMedLocationConfig(organizationId);
+        // 将配置转为 {categoryCode -> 允许的locationId集合}
+        Map<String, Set<Long>> allowedLocByCategory = new HashMap<>();
+        if (medLocationConfig != null && !medLocationConfig.isEmpty()) {
+            for (AdviceInventoryDto cfg : medLocationConfig) {
+                if (cfg.getCategoryCode() == null || cfg.getLocationId() == null) {
+                    continue;
+                }
+                allowedLocByCategory.computeIfAbsent(String.valueOf(cfg.getCategoryCode()), k -> new HashSet<>())
+                    .add(cfg.getLocationId());
+            }
+        }
         // 费用定价子表信息
         List<AdvicePriceDto> childCharge = doctorStationAdviceAppMapper
             .getChildCharge(ConditionCode.LOT_NUMBER_COST.getCode(), chargeItemDefinitionIdList);
@@ -163,6 +174,19 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                                 .filter(e -> baseDto.getAdviceDefinitionId().equals(e.getItemId())
                                     && baseDto.getAdviceTableName().equals(e.getItemTable()))
                                 .collect(Collectors.toList());
+                    // 当存在按科室配置时：仅保留被允许的药房/药库的库存；
+                    // 若该药品类别未在配置中出现，则视为不可开立（清空库存以便前端过滤掉）
+                    if (!allowedLocByCategory.isEmpty()) {
+                        Set<Long> allowedLoc =
+                            allowedLocByCategory.get(String.valueOf(baseDto.getCategoryCode()));
+                        if (allowedLoc == null || allowedLoc.isEmpty()) {
+                            inventoryList = Collections.emptyList();
+                        } else {
+                            inventoryList = inventoryList.stream()
+                                .filter(inv -> allowedLoc.contains(inv.getLocationId()))
+                                .collect(Collectors.toList());
+                        }
+                    }
                     // 库存信息
                     baseDto.setInventoryList(inventoryList);
                     // 设置默认产品批号
@@ -174,18 +198,15 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                             baseDto.setDefaultLotNumber(hasInventoryList.get(0).getLotNumber());
                         }
                     }
-                    if (!inventoryList.isEmpty() && !medLocationConfig.isEmpty()) {
-                        // 第一步：在medLocationConfig中匹配categoryCode
-                        AdviceInventoryDto result1 = medLocationConfig.stream()
-                            .filter(dto -> baseDto.getCategoryCode().equals(dto.getCategoryCode())).findFirst()
-                            .orElse(null);
-                        if (result1 != null) {
-                            // 第二步：在inventoryList中匹配locationId
-                            AdviceInventoryDto result2 = inventoryList.stream()
-                                .filter(dto -> result1.getLocationId().equals(dto.getLocationId())).findFirst()
-                                .orElse(null);
-                            if (result2 != null && result2.getLotNumber() != null) {
-                                baseDto.setDefaultLotNumber(result2.getLotNumber());
+                    if (!inventoryList.isEmpty() && !allowedLocByCategory.isEmpty()) {
+                        Set<Long> allowedLoc =
+                            allowedLocByCategory.get(String.valueOf(baseDto.getCategoryCode()));
+                        if (allowedLoc != null && !allowedLoc.isEmpty()) {
+                            AdviceInventoryDto hit = inventoryList.stream()
+                                .filter(inv -> allowedLoc.contains(inv.getLocationId()))
+                                .findFirst().orElse(null);
+                            if (hit != null && hit.getLotNumber() != null) {
+                                baseDto.setDefaultLotNumber(hit.getLotNumber());
                             }
                         }
                     }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java

@@ -1,14 +1,13 @@
 package com.openhis.web.doctorstation.appservice.impl;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.openhis.web.doctorstation.appservice.*;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -25,7 +24,6 @@ import com.openhis.administration.service.IEncounterParticipantService;
 import com.openhis.common.enums.*;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.doctorstation.appservice.IDoctorStationMainAppService;
 import com.openhis.web.doctorstation.dto.PatientInfoDto;
 import com.openhis.web.doctorstation.dto.PrescriptionInfoBaseDto;
 import com.openhis.web.doctorstation.dto.PrescriptionInfoDetailDto;
@@ -46,6 +44,17 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
     @Resource
     IEncounterParticipantService iEncounterParticipantService;
 
+    @Resource
+    IDoctorStationAdviceAppService iDoctorStationAdviceAppService;
+
+    @Resource
+    IDoctorStationEmrAppService iDoctorStationEmrAppService;
+
+    @Resource
+    IDoctorStationDiagnosisAppService  iDoctorStationDiagnosisAppService;
+
+    @Resource
+    IDoctorStationChineseMedicalAppService iDoctorStationChineseMedicalAppService;
     /**
      * 查询就诊患者信息
      *
@@ -154,6 +163,45 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
         return update > 0 ? R.ok() : R.fail();
     }
 
+    /**
+     * 取消接诊
+     *
+     * @param encounterId 就诊id
+     * @return 结果
+     */
+    @Override
+    public R<?> cancelEncounter(Long encounterId) {
+        //1.判断是否已经产生业务，如医生已经开有病历、处方、诊断、检验检查或相关项目已收费、执行等，
+        //如果有则提示:需要医生删除、作废、退费才能【取消接诊】。
+        //1.1病历
+        Object emrDetailResult = iDoctorStationEmrAppService.getEmrDetail(encounterId).getData();
+
+        //1.2诊断
+        Object diagnosisResult = iDoctorStationDiagnosisAppService.getEncounterDiagnosis(encounterId).getData();
+
+        //1.3处方
+        Object adviceResult = iDoctorStationAdviceAppService.getRequestBaseInfo(encounterId).getData();
+
+        //1.4中医诊断、处方
+        Map<?,?> tcmDiagnosisResult = (Map<?,?>) iDoctorStationChineseMedicalAppService.getTcmEncounterDiagnosis(encounterId).getData();
+        Object symptom = tcmDiagnosisResult.get("symptom");
+        Object illness = tcmDiagnosisResult.get("illness");
+        Object tcmPrescriptionResult = iDoctorStationChineseMedicalAppService.getTcmRequestBaseInfo(encounterId).getData();
+
+        boolean isEmpty = ObjectUtil.isAllEmpty(emrDetailResult, diagnosisResult, adviceResult, symptom,illness, tcmPrescriptionResult);
+
+        if (!isEmpty) {
+            return R.fail();
+        }
+
+        //2.取消接诊，患者重新回到患者队列待诊中
+        int update = encounterMapper.update(null,
+                new LambdaUpdateWrapper<Encounter>().eq(Encounter::getId, encounterId)
+                        .set(Encounter::getStatusEnum, EncounterStatus.PLANNED.getValue())
+                        .set(Encounter::getSubjectStatusEnum, EncounterSubjectStatus.TRIAGED.getValue()));
+        return update > 0 ? R.ok() : R.fail();
+    }
+
     /**
      * 查询处方号列表信息
      *

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationMainController.java

@@ -92,6 +92,17 @@ public class DoctorStationMainController {
         return iDoctorStationMainAppService.completeEncounter(encounterId);
     }
 
+    /**
+     * 取消接诊
+     *
+     * @param encounterId 就诊id
+     * @return 结果
+     */
+    @GetMapping(value = "/cancel-encounter")
+    public R<?> cancelEncounter(@RequestParam Long encounterId) {
+        return iDoctorStationMainAppService.cancelEncounter(encounterId);
+    }
+
     /**
      * 查询处方号列表信息
      * 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java

@@ -233,7 +233,7 @@ public class PurchaseInventoryAppServiceImpl implements IPurchaseInventoryAppSer
                 // 申请时间
                 .setApplyTime(DateUtils.getNowDate());
             supplyRequestList.add(supplyRequest);
-
+            
         }
 
         // 保存
@@ -245,7 +245,7 @@ public class PurchaseInventoryAppServiceImpl implements IPurchaseInventoryAppSer
         List<Long> requestIdList = supplyRequestIdList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
         for (Long list : requestIdList) {
             idList.add(list.toString());
-        }
+        }         
 
         // 返回请求id
         return R.ok(idList, null);

openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/controller/InspectionTypeController.java

@@ -0,0 +1,190 @@
+package com.openhis.web.lab.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.core.common.core.controller.BaseController;
+import com.core.common.core.domain.AjaxResult;
+import com.openhis.lab.domain.InspectionType;
+import com.openhis.lab.service.IInspectionTypeService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.support.TransactionTemplate;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 检验类型管理Controller
+ *
+ * @author system
+ * @date 2025-12-09
+ */
+@RestController
+@RequestMapping("/system/inspection-type")
+@Slf4j
+@AllArgsConstructor
+public class InspectionTypeController extends BaseController {
+    
+    // 辅助方法：将字节数组转换为十六进制字符串
+    private static String bytesToHex(byte[] bytes) {
+        StringBuilder sb = new StringBuilder();
+        for (byte b : bytes) {
+            sb.append(String.format("%02X ", b));
+        }
+        return sb.toString().trim();
+    }
+
+    private final IInspectionTypeService inspectionTypeService;
+    private final TransactionTemplate transactionTemplate;
+
+    /**
+     * 获取检验类型列表
+     */
+    @GetMapping("/list")
+    public AjaxResult list(InspectionType inspectionType) {
+        // 使用Wrapper构建查询条件，确保order字段被正确处理
+        QueryWrapper<InspectionType> queryWrapper = new QueryWrapper<>(inspectionType);
+        List<InspectionType> list = inspectionTypeService.list(queryWrapper);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 获取检验类型详细
+     */
+    @GetMapping("/{inspectionTypeId}")
+    public AjaxResult getInfo(@PathVariable Long inspectionTypeId) {
+        return AjaxResult.success(inspectionTypeService.getById(inspectionTypeId));
+    }
+
+    /**
+     * 新增检验类型
+     */
+    @PostMapping
+    public AjaxResult add(@RequestBody InspectionType inspectionType) {
+        // 确保新增时ID为null，强制使用数据库自增序列
+        inspectionType.setId(null);
+        
+        // 去除code字段的前后空格，确保唯一性验证准确
+        if (inspectionType.getCode() != null) {
+            inspectionType.setCode(inspectionType.getCode().trim());
+        }
+        
+        // 验证code字段是否唯一
+        QueryWrapper<InspectionType> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("code", inspectionType.getCode());
+        
+        // 输出调试信息
+        System.out.println("检查编码唯一性：code=" + inspectionType.getCode() + ", 长度=" + inspectionType.getCode().length());
+        System.out.println("code的十六进制表示：" + bytesToHex(inspectionType.getCode().getBytes()));
+        
+        // 直接查询具体记录，而不仅仅是计数
+        List<InspectionType> existingRecords = inspectionTypeService.list(queryWrapper);
+        System.out.println("数据库中存在的记录数：" + existingRecords.size());
+        for (InspectionType record : existingRecords) {
+            System.out.println("已存在记录：id=" + record.getId() + ", code=" + record.getCode() + ", code长度=" + record.getCode().length() + ", code十六进制=" + bytesToHex(record.getCode().getBytes()));
+        }
+        
+        if (!existingRecords.isEmpty()) {
+            return AjaxResult.error("检验类型编码已存在");
+        }
+        
+        // 保存前再次验证
+        System.out.println("准备保存数据：" + inspectionType);
+        
+        try {
+            // 使用事务确保一致性
+            return transactionTemplate.execute(status -> {
+                // 再次检查，防止并发问题
+                QueryWrapper<InspectionType> checkWrapper = new QueryWrapper<>();
+                checkWrapper.eq("code", inspectionType.getCode());
+                List<InspectionType> finalCheck = inspectionTypeService.list(checkWrapper);
+                if (!finalCheck.isEmpty()) {
+                    return AjaxResult.error("检验类型编码已存在");
+                }
+                
+                boolean result = inspectionTypeService.save(inspectionType);
+                System.out.println("保存结果：" + result);
+                return toAjax(result);
+            });
+        } catch (Exception e) {
+            System.out.println("保存失败，错误信息：" + e.getMessage());
+            
+            // 捕获唯一性约束冲突异常
+            if (e.getMessage().contains("uk_inspection_type_code") || 
+                e.getMessage().contains("duplicate key value") || 
+                e.getMessage().contains("检验类型编码已存在")) {
+                return AjaxResult.error("检验类型编码已存在");
+            }
+            
+            return AjaxResult.error("保存失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 修改检验类型
+     */
+    @PutMapping
+    public AjaxResult edit(@RequestBody InspectionType inspectionType) {
+        // 去除code字段的前后空格，确保唯一性验证准确
+        if (inspectionType.getCode() != null) {
+            inspectionType.setCode(inspectionType.getCode().trim());
+        }
+        
+        // 验证code字段是否唯一（排除自身）
+        QueryWrapper<InspectionType> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("code", inspectionType.getCode())
+                   .ne("id", inspectionType.getId());
+        if (inspectionTypeService.count(queryWrapper) > 0) {
+            return AjaxResult.error("检验类型编码已存在");
+        }
+        
+        try {
+            boolean result = inspectionTypeService.updateById(inspectionType);
+            return toAjax(result);
+        } catch (Exception e) {
+            // 捕获唯一性约束冲突异常
+            if (e.getMessage().contains("uk_inspection_type_code") || 
+                e.getMessage().contains("duplicate key value") || 
+                e.getMessage().contains("检验类型编码已存在")) {
+                return AjaxResult.error("检验类型编码已存在");
+            }
+            
+            return AjaxResult.error("更新失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 删除检验类型
+     */
+    @DeleteMapping("/{inspectionTypeId}")
+    public AjaxResult remove(@PathVariable Long inspectionTypeId) {
+        log.info("删除检验类型，ID: {}", inspectionTypeId);
+        try {
+            // 检查记录是否存在
+            InspectionType existing = inspectionTypeService.getById(inspectionTypeId);
+            log.info("删除前检查记录是否存在: {}", existing != null);
+            
+            if (existing == null) {
+                log.warn("删除失败：检验类型ID: {} 不存在", inspectionTypeId);
+                return AjaxResult.error("删除失败: 记录不存在");
+            }
+            
+            // 使用MyBatis Plus的removeById方法执行逻辑删除
+            boolean result = inspectionTypeService.removeById(inspectionTypeId);
+            log.info("逻辑删除检验类型结果: {}", result);
+            
+            AjaxResult response = toAjax(result);
+            log.info("删除响应: {}", response);
+            return response;
+        } catch (Exception e) {
+            log.error("删除检验类型失败，ID: {}, 错误: {}", inspectionTypeId, e.getMessage(), e);
+            return AjaxResult.error("删除失败: " + e.getMessage());
+        }
+    }
+    
+    // 测试删除接口，直接返回成功
+    @DeleteMapping("/test-delete/{id}")
+    public AjaxResult testDelete(@PathVariable Long id) {
+        log.info("测试删除接口，ID: {}", id);
+        return AjaxResult.success("测试删除成功");
+    }
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java

@@ -128,10 +128,11 @@ public class PatientInformationServiceImpl implements IPatientInformationService
     public IPage<PatientInformationDto> getPatientInfo(PatientInfoSearchParam patientInfoSearchParam, String searchKey,
         Integer pageNo, Integer pageSize, HttpServletRequest request) {
 
-        // 构建查询条件
+        // 构建查询条件 - 添加phone字段到搜索条件中
         QueryWrapper<PatientInformationDto> queryWrapper = HisQueryUtils.buildQueryWrapper(
             patientInfoSearchParam, searchKey, new HashSet<>(Arrays.asList(CommonConstants.FieldName.Name,
-                CommonConstants.FieldName.BusNo, CommonConstants.FieldName.PyStr, CommonConstants.FieldName.WbStr)),
+                CommonConstants.FieldName.BusNo, CommonConstants.FieldName.PyStr, CommonConstants.FieldName.WbStr,
+                CommonConstants.FieldName.Phone)), // 添加phone字段支持手机号搜索
             request);
 
         IPage<PatientInformationDto> patientInformationPage =

openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java

@@ -597,7 +597,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
 
         // 全退
         String ybSettleIds = paymentReconciliation.getYbSettleIds();
-        PaymentReconciliation unPaymentReconciliation = normalUnCharge(paymentReconciliation, PaymentRecDetails, null);
+        PaymentReconciliation unPaymentReconciliation = normalUnCharge(paymentReconciliation, PaymentRecDetails, null, null);
         if (!StringUtils.isEmpty(ybSettleIds)) {
             // 医保结算信息
             List<String> ybSettleIdList = Arrays.asList(ybSettleIds.split(","));
@@ -734,7 +734,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         }
 
         PaymentReconciliation unPaymentReconciliation =
-            normalUnCharge(paymentReconciliation, paymentRecDetails, cancelPaymentDto.getSetlId());
+            normalUnCharge(paymentReconciliation, paymentRecDetails, cancelPaymentDto.getSetlId(), cancelPaymentDto.getReason());
 
         return R.ok(unPaymentReconciliation);
     }
@@ -792,10 +792,12 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
      *
      * @param paymentReconciliation 付款实体
      * @param paymentRecDetails 付款详情
+     * @param setlIds 医保结算ID
+     * @param reason 退号/退费原因
      * @return 结果
      */
     private PaymentReconciliation normalUnCharge(PaymentReconciliation paymentReconciliation,
-        List<PaymentRecDetail> paymentRecDetails, String setlIds) {
+        List<PaymentRecDetail> paymentRecDetails, String setlIds, String reason) {
 
         // 获取原ID
         Long id = paymentReconciliation.getId();
@@ -805,7 +807,8 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
             .setEntererId(SecurityUtils.getLoginUser().getPractitionerId()).setBillDate(new Date())
             .setTenderedAmount(paymentReconciliation.getTenderedAmount().negate())
             .setReturnedAmount(paymentReconciliation.getReturnedAmount().negate())
-            .setDisplayAmount(paymentReconciliation.getDisplayAmount().negate());
+            .setDisplayAmount(paymentReconciliation.getDisplayAmount().negate())
+            .setRefundReason(reason); // 保存退号/退费原因
         if (setlIds != null) {
             paymentReconciliation.setYbSettleIds(setlIds);
         }
@@ -2232,7 +2235,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         }
 
         // 全退
-        PaymentReconciliation unPaymentReconciliation = normalUnCharge(paymentReconciliation, paymentRecDetails, null);
+        PaymentReconciliation unPaymentReconciliation = normalUnCharge(paymentReconciliation, paymentRecDetails, null, null);
 
         // 取医保结算数据
         String ybSettleIds = paymentReconciliation.getYbSettleIds();

openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentReconciliationController.java

@@ -172,13 +172,13 @@ public class PaymentReconciliationController {
     /**
      * 挂号收费（挂号收费先医保挂号，收费成功后再本系统挂号）
      *
-     * @param outpatientRegistrationAddParam 挂号信息
+     * @param outpatientRegistrationSettleParam 挂号信息
      * @return 操做结果
      */
     @PostMapping("/reg-pay")
-    public R<?> regPay(@Valid @RequestBody OutpatientRegistrationSettleParam outpatientRegistrationAddParam) {
-        R<?> result = paymentReconciliationService.regPay(outpatientRegistrationAddParam,
-                outpatientRegistrationAddParam.getChrgBchno(), outpatientRegistrationAddParam.getPaymentDetails());
+    public R<?> regPay(@Valid @RequestBody OutpatientRegistrationSettleParam outpatientRegistrationSettleParam) {
+        R<?> result = paymentReconciliationService.regPay(outpatientRegistrationSettleParam,
+                outpatientRegistrationSettleParam.getChrgBchno(), outpatientRegistrationSettleParam.getPaymentDetails());
         // 付款成功后，开具发票
         if (result.getCode() == 200) {
             PaymentReconciliation paymentRecon = null;

openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InventoryProductReportAppServiceImpl.java

@@ -68,6 +68,11 @@ public class InventoryProductReportAppServiceImpl implements IInventoryProductRe
     public R<?> getPage(InventoryProductReportSearchParam inventoryProductReportSearchParam, Integer pageNo,
         Integer pageSize, String searchKey, HttpServletRequest request) {
 
+        // 数据初始化，不使用eq条件拼接
+        // 库存范围
+        Integer inventoryScope = inventoryProductReportSearchParam.getInventoryScope();
+        inventoryProductReportSearchParam.setInventoryScope(null);
+
         // 设置模糊查询的字段名
         HashSet<String> searchFields = new HashSet<>();
         searchFields.add(CommonConstants.FieldName.BusNo);
@@ -78,7 +83,8 @@ public class InventoryProductReportAppServiceImpl implements IInventoryProductRe
 
         // 查询库存商品明细分页列表
         Page<InventoryProductReportPageDto> productReportPage = inventoryProductReportMapper.selectProductReportPage(
-            new Page<>(pageNo, pageSize), queryWrapper, ConditionCode.LOT_NUMBER_COST.getValue().toString());
+            new Page<>(pageNo, pageSize), queryWrapper, ConditionCode.LOT_NUMBER_COST.getValue().toString(),
+            inventoryScope);
 
         productReportPage.getRecords().forEach(e -> {
             // 药品类型
@@ -104,6 +110,11 @@ public class InventoryProductReportAppServiceImpl implements IInventoryProductRe
         Integer pageSize, String searchKey, HttpServletRequest request, HttpServletResponse response) {
         pageNo = 1;
         pageSize = 10000;
+        // 数据初始化，不使用eq条件拼接
+        // 库存范围
+        Integer inventoryScope = inventoryProductReportSearchParam.getInventoryScope();
+        inventoryProductReportSearchParam.setInventoryScope(null);
+
         // 设置模糊查询的字段名
         HashSet<String> searchFields = new HashSet<>();
         searchFields.add(CommonConstants.FieldName.BusNo);
@@ -114,7 +125,8 @@ public class InventoryProductReportAppServiceImpl implements IInventoryProductRe
 
         // 查询库存商品明细分页列表
         Page<InventoryProductReportPageDto> productReportPage = inventoryProductReportMapper.selectProductReportPage(
-            new Page<>(pageNo, pageSize), queryWrapper, ConditionCode.LOT_NUMBER_COST.getValue().toString());
+            new Page<>(pageNo, pageSize), queryWrapper, ConditionCode.LOT_NUMBER_COST.getValue().toString(),
+            inventoryScope);
 
         productReportPage.getRecords().forEach(e -> {
             // 药品类型

openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportSearchParam.java

@@ -38,4 +38,10 @@ public class InventoryProductReportSearchParam {
 
     /** 供应商 */
     private Long supplierId;
+
+    /** 厂家/产地（供应商名称） */
+    private String manufacturerText;
+
+    /** 仓库ID（药房ID） */
+    private Long purposeLocationId;
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InventoryProductReportMapper.java

@@ -27,9 +27,11 @@ public interface InventoryProductReportMapper {
      * @param page 分页
      * @param queryWrapper 查询条件
      * @param lotNumber 命中条件枚举类型：产品批号
+     * @param inventoryScope 库存范围：无限制（1）、数量等于0（2）、数量大于0（3）、数量小于等于20（4）、数量小于等于50（5）
      * @return 库存商品明细
      */
     Page<InventoryProductReportPageDto> selectProductReportPage(@Param("page") Page<InventoryProductReportPageDto> page,
         @Param(Constants.WRAPPER) QueryWrapper<InventoryProductReportSearchParam> queryWrapper,
-        @Param("lotNumber") String lotNumber);
+        @Param("lotNumber") String lotNumber,
+        @Param("inventoryScope") Integer inventoryScope);
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3202VO.java

@@ -5,43 +5,32 @@ package com.openhis.web.ybmanage.vo;
 
 import java.math.BigDecimal;
 
-import javax.validation.constraints.NotNull;
-
 import lombok.Data;
 
 /**
- * 【3201】后台计算结果 DB映射实体
+ * Settlement3202 Result DB mapping entity
  *
  * @author SunJQ
  * @date 2025-04-15
  */
 @Data
 public class Settlement3202VO {
-    /** 医疗费用总额 */
-
+    /** Medical Fee Sum */
     private BigDecimal medFeeSumAmt;
-    /** 基金支付总额 */
-
+    /** Fund Pay Sum */
     private BigDecimal fundPaySumAmt;
-    /** 个人账户支付总额 */
-
+    /** Account Pay */
     private BigDecimal acctPay;
-    /** 个人账户支付总额 */
-
+    /** Account Gj Pay */
     private BigDecimal acctGjPay;
-    /** 现金支付总额 */
-
+    /** Self Pay Cash */
     private BigDecimal selfPayCash;
-    /** 微信支付总额 */
-
+    /** Self Pay WeChat */
     private BigDecimal selfPayVx;
-    /** 阿里支付总额 */
-
+    /** Self Pay Alipay */
     private BigDecimal selfPayAli;
-    /** 银行卡支付总额 */
-
+    /** Self Pay Bank Card */
     private BigDecimal selfPayUnion;
-    /** 定点医药机构结算笔数 */
-
+    /** Settlement Count */
     private Integer fixMedInsSetlCnt;
 }

openhis-server-new/openhis-application/src/main/resources/application-dev.yml

@@ -6,13 +6,13 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:postgresql://192.168.110.252:15432/postgresql?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
+        url: jdbc:postgresql://192.168.110.252:15432/postgresql?currentSchema=hisdev&characterEncoding=UTF-8&client_encoding=UTF-8
         username: postgresql
         password: Jchl1528
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
-        enabled: false
+        enabled:
         url:
         username:
         password:
@@ -59,6 +59,8 @@ spring:
         wall:
           config:
             multi-statement-allow: true
+
+
   # redis 配置
   redis:
     # 地址
@@ -84,4 +86,10 @@ spring:
     # 文言
     messages:
       basename: i18n/general_message/messages
-      encoding: utf-8
+      encoding: utf-8
+server:
+  # 服务器的HTTP端口，默认为18080
+  port: 18080
+  servlet:
+    # 应用的访问路径
+    context-path: /openhis

openhis-server-new/openhis-application/src/main/resources/application-prd.yml

@@ -6,7 +6,7 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:postgresql://192.168.110.252:15432/postgresql?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
+        url: jdbc:postgresql://192.168.110.252:15432/postgresql?currentSchema=hisprd&characterEncoding=UTF-8&client_encoding=UTF-8
         username: postgresql
         password: Jchl1528
       # 从库数据源
@@ -84,4 +84,10 @@ spring:
     # 文言
     messages:
       basename: i18n/general_message/messages
-      encoding: utf-8
+      encoding: utf-8
+server:
+  # 服务器的HTTP端口，默认为18080
+  port: 18082
+  servlet:
+    # 应用的访问路径
+    context-path: /openhis

openhis-server-new/openhis-application/src/main/resources/application-test.yml

@@ -0,0 +1,93 @@
+# 数据源配置
+spring:
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driverClassName: org.postgresql.Driver
+    druid:
+      # 主库数据源
+      master:
+        url: jdbc:postgresql://192.168.110.252:15432/postgresql?currentSchema=histest&characterEncoding=UTF-8&client_encoding=UTF-8
+        username: postgresql
+        password: Jchl1528
+      # 从库数据源
+      slave:
+        # 从数据源开关/默认关闭
+        enabled:
+        url:
+        username:
+        password:
+      # 初始连接数
+      initialSize: 5
+      # 最小连接池数量
+      minIdle: 10
+      # 最大连接池数量
+      maxActive: 20
+      # 配置获取连接等待超时的时间
+      maxWait: 60000
+      # 配置连接超时时间
+      connectTimeout: 30000
+      # 配置网络超时时间
+      socketTimeout: 60000
+      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      timeBetweenEvictionRunsMillis: 60000
+      # 配置一个连接在池中最小生存的时间，单位是毫秒
+      minEvictableIdleTimeMillis: 300000
+      # 配置一个连接在池中最大生存的时间，单位是毫秒
+      maxEvictableIdleTimeMillis: 900000
+      # 配置检测连接是否有效
+      validationQuery: SELECT 1 # FROM DUAL
+      testWhileIdle: true
+      testOnBorrow: false
+      testOnReturn: false
+      webStatFilter:
+        enabled: true
+      statViewServlet:
+        enabled: true
+        # 设置白名单，不填则允许所有访问
+        allow:
+        url-pattern: /druid/*
+        # 控制台管理用户名和密码
+        login-username: openhis
+        login-password: 123456
+      filter:
+        stat:
+          enabled: true
+          # 慢SQL记录
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true
+  # redis 配置
+  redis:
+    # 地址
+    host: 192.168.110.252
+    # 端口，默认为6379
+    port: 6379
+    # 数据库索引
+    database: 1
+    # 密码
+    password: Jchl1528
+    # 连接超时时间
+    timeout: 10s
+    lettuce:
+      pool:
+        # 连接池中的最小空闲连接
+        min-idle: 0
+        # 连接池中的最大空闲连接
+        max-idle: 8
+        # 连接池的最大数据库连接数
+        max-active: 8
+        # #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1ms
+    # 文言
+    messages:
+      basename: i18n/general_message/messages
+      encoding: utf-8
+server:
+  # 服务器的HTTP端口，默认为18080
+  port: 18081
+  servlet:
+    # 应用的访问路径
+    context-path: /openhis

openhis-server-new/openhis-application/src/main/resources/application.yml

@@ -15,11 +15,6 @@ core:
 
 # 开发环境配置
 server:
-  # 服务器的HTTP端口，默认为18080
-  port: 18080
-  servlet:
-    # 应用的访问路径
-    context-path: /openhis
   tomcat:
     # tomcat的URI编码
     uri-encoding: UTF-8
@@ -54,7 +49,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: local #（本地）local （生产）prod (农大)
+    active: dev
   # 文件上传
   servlet:
     multipart:
@@ -85,6 +80,11 @@ mybatis-plus:
   mapperLocations: classpath*:mapper/**/*Mapper.xml
   # 加载全局的配置文件
   configLocation: classpath:mybatis/mybatis-config.xml
+  global-config:
+    db-config:
+      logic-delete-field: validFlag # 全局逻辑删除的实体字段名
+      logic-delete-value: 0 # 逻辑已删除值(默认为 1)
+      logic-not-delete-value: 1 # 逻辑未删除值(默认为 0)
 
 # PageHelper分页插件
 pagehelper:

openhis-server-new/openhis-application/src/main/resources/mapper/basicservice/HealthcareServiceBizMapper.xml

@@ -18,6 +18,7 @@
                T3.extra_details,
                T3.contact,
                T3.appointment_required_flag,
+               T3.practitioner_id,
                T3.definition_id,
                T3.charge_name,
                T3.price,
@@ -36,6 +37,7 @@
                         T1.extra_details,
                         T1.contact,
                         T1.appointment_required_flag,
+                        T1.practitioner_id,
                         T2.ID                               AS definition_id,
                         T2.charge_name,
                         T2.price,

openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml

@@ -62,7 +62,14 @@
                T9.charge_item_ids,
                T9.payment_id,
                T9.picture_url,
-               T9.birth_date
+               T9.birth_date,
+               T9.return_date,
+               T9.return_reason,
+               T9.operator_name,
+               T9.operator_id,
+               T9.refund_amount,
+               T9.contract_no,
+               T9.refund_method
         from (
                  SELECT T1.tenant_id       AS tenant_id,
                         T1.id              AS encounter_id,
@@ -84,7 +91,15 @@
                         T13.charge_item_ids,
                         T13.id             AS payment_id,
                         ai.picture_url     AS picture_url,
-                        T8.birth_date     AS birth_date
+                        T8.birth_date     AS birth_date,
+                        -- 退号相关信息
+                        T14.bill_date      AS return_date,
+                        T14.refund_reason  AS return_reason,
+                        T15."name"         AS operator_name,
+                        T17.user_name      AS operator_id,
+                        ABS(T14.display_amount) AS refund_amount,
+                        T6.contract_no     AS contract_no,
+                        T16.refund_method  AS refund_method
                  FROM adm_encounter AS T1
                           LEFT JOIN adm_organization AS T2 ON T1.organization_id = T2.ID AND T2.delete_flag = '0'
                           LEFT JOIN adm_healthcare_service AS T3 ON T1.service_type_id = T3.ID AND T3.delete_flag = '0'
@@ -111,9 +126,36 @@
                           LEFT JOIN fin_payment_reconciliation T13
                                     ON T10.id::TEXT = ANY(string_to_array(T13.charge_item_ids,','))
                                         AND T13.delete_flag = '0'
-                 AND T13.status_enum = ${paymentStatus}
-                     LEFT JOIN adm_invoice AS ai
-                 ON ai.reconciliation_id = T13.id AND ai.delete_flag = '0'
+                                        AND T13.status_enum = ${paymentStatus}
+                          -- 关联退号记录（当状态为退号时，通过relation_id关联原支付记录）
+                          LEFT JOIN fin_payment_reconciliation T14
+                                    ON T13.id = T14.relation_id
+                                        AND T14.delete_flag = '0'
+                                        AND T14.status_enum = 3
+                                        AND T14.payment_enum = 1
+                          LEFT JOIN adm_practitioner AS T15 ON T15.ID = T14.enterer_id AND T15.delete_flag = '0'
+                          LEFT JOIN sys_user AS T17 ON T17.user_id = T15.user_id AND T17.delete_flag = '0'
+                          -- 关联退号支付详情，获取退款方式（聚合多个支付方式）
+                          LEFT JOIN (
+                             SELECT reconciliation_id,
+                                    STRING_AGG(
+                                        CASE pay_enum
+                                            WHEN 220400 THEN '现金'
+                                            WHEN 220100 THEN '微信'
+                                            WHEN 220200 THEN '支付宝'
+                                            WHEN 220300 THEN '银联'
+                                        END,
+                                        ','
+                                        ORDER BY pay_enum
+                                    ) AS refund_method
+                             FROM fin_payment_rec_detail
+                             WHERE delete_flag = '0'
+                               AND amount < 0
+                               AND pay_enum IN (220400, 220100, 220200, 220300)
+                             GROUP BY reconciliation_id
+                          ) AS T16 ON T14.id = T16.reconciliation_id
+                          LEFT JOIN adm_invoice AS ai
+                                    ON ai.reconciliation_id = T13.id AND ai.delete_flag = '0'
                  WHERE T1.delete_flag = '0'
                    AND T1.class_enum = #{classEnum}
 --                    AND T1.create_time

openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml

@@ -41,188 +41,366 @@
         abi.restricted_flag,
         abi.restricted_scope
         from (
-        <if test="adviceTypes == null or adviceTypes.contains(1)">
-            SELECT T1.tenant_id,
-            1 AS advice_type,
-            T1.category_code AS category_code,
-            T1.pharmacology_category_code AS pharmacology_category_code,
-            T1.part_percent AS part_percent,
-            T1.unit_conversion_ratio AS unit_conversion_ratio,
-            T1.part_attribute_enum AS part_attribute_enum,
-            T1.tho_part_attribute_enum AS tho_part_attribute_enum,
-            T1.skin_test_flag AS skin_test_flag,
-            T1.inject_flag AS inject_flag,
-            T1.ID AS advice_definition_id,
-            T1.NAME AS advice_name,
-            T1.bus_no AS advice_bus_no,
-            T1.py_str AS py_str,
-            T1.wb_str AS wb_str,
-            T1.yb_no AS yb_no,
-            T1.merchandise_name AS product_name,
-            0 AS activity_type,
-            T1.unit_code AS unit_code,
-            T1.min_unit_code AS min_unit_code,
-            T2.total_volume AS volume,
-            T2.method_code AS method_code,
-            T2.rate_code AS rate_code,
-            T2.org_id AS org_id,
-            T2.location_id AS location_id,
-            CAST(T2.dose AS TEXT) AS dose,
-            T2.dose_unit_code AS dose_unit_code,
-            T3.NAME AS supplier,
-            T3.id AS supplier_id,
-            T1.manufacturer_text AS manufacturer,
-            T5.id AS charge_item_definition_id,
-            T5.instance_table AS advice_table_name,
-            T6.def_location_id AS position_id,
-            t1.restricted_flag AS restricted_flag,
-            t1.restricted_scope AS restricted_scope
-            FROM med_medication_definition AS t1
-            INNER JOIN med_medication AS T2 ON T2.medication_def_id = T1.ID
-            AND T2.delete_flag = '0' AND T2.status_enum = #{statusEnum}
-            LEFT JOIN adm_supplier AS T3
-            ON T3.ID = T1.supply_id
-            AND T3.delete_flag = '0'
-            LEFT JOIN adm_charge_item_definition AS T5 ON T5.instance_id = T1.ID
-            AND T5.delete_flag = '0'
-            LEFT JOIN adm_organization_location AS T6
-            ON T6.distribution_category_code = T1.category_code
-            AND T6.delete_flag = '0' AND T6.organization_id = #{organizationId} AND
-            (CURRENT_TIME :: time (6) BETWEEN T6.start_time AND T6.end_time)
-            WHERE T1.delete_flag = '0'
-            AND T2.status_enum = #{statusEnum}
-            <if test="pricingFlag ==1">
-                AND 1 = 2
-            </if>
-            <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
-                AND T1.id IN
-                <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
-                    #{itemId}
-                </foreach>
-            </if>
-            AND T5.instance_table = #{medicationTableName}
-        </if>
+        <!-- 改进SQL逻辑，确保所有情况都能正确处理，避免空的FROM子查询 -->
+        <!-- 当adviceTypes包含4或不在1-3范围内时，或者adviceTypes为空/null时，查询所有类型 -->
+        <choose>
+            <!-- 检查adviceTypes是否为null、空列表，或者包含4、5或其他不在1-3范围内的值 -->
+            <when test="adviceTypes == null or adviceTypes.isEmpty() or adviceTypes.contains(4) or adviceTypes.contains(5)">
+                <!-- 查询所有类型 -->
+                SELECT T1.tenant_id,
+                1 AS advice_type,
+                T1.category_code AS category_code,
+                T1.pharmacology_category_code AS pharmacology_category_code,
+                T1.part_percent AS part_percent,
+                T1.unit_conversion_ratio AS unit_conversion_ratio,
+                T1.part_attribute_enum AS part_attribute_enum,
+                T1.tho_part_attribute_enum AS tho_part_attribute_enum,
+                T1.skin_test_flag AS skin_test_flag,
+                T1.inject_flag AS inject_flag,
+                T1.ID AS advice_definition_id,
+                T1.NAME AS advice_name,
+                T1.bus_no AS advice_bus_no,
+                T1.py_str AS py_str,
+                T1.wb_str AS wb_str,
+                T1.yb_no AS yb_no,
+                T1.merchandise_name AS product_name,
+                0 AS activity_type,
+                T1.unit_code AS unit_code,
+                T1.min_unit_code AS min_unit_code,
+                T2.total_volume AS volume,
+                T2.method_code AS method_code,
+                T2.rate_code AS rate_code,
+                T2.org_id AS org_id,
+                T2.location_id AS location_id,
+                CAST(T2.dose AS TEXT) AS dose,
+                T2.dose_unit_code AS dose_unit_code,
+                T3.NAME AS supplier,
+                T3.id AS supplier_id,
+                T1.manufacturer_text AS manufacturer,
+                T5.id AS charge_item_definition_id,
+                T5.instance_table AS advice_table_name,
+                T6.def_location_id AS position_id,
+                t1.restricted_flag AS restricted_flag,
+                t1.restricted_scope AS restricted_scope
+                FROM med_medication_definition AS t1
+                INNER JOIN med_medication AS T2 ON T2.medication_def_id = T1.ID
+                AND T2.delete_flag = '0' AND T2.status_enum = #{statusEnum}
+                LEFT JOIN adm_supplier AS T3
+                ON T3.ID = T1.supply_id
+                AND T3.delete_flag = '0'
+                LEFT JOIN adm_charge_item_definition AS T5 ON T5.instance_id = T1.ID
+                AND T5.delete_flag = '0'
+                LEFT JOIN adm_organization_location AS T6
+                ON T6.distribution_category_code = T1.category_code
+                AND T6.delete_flag = '0' AND T6.organization_id = #{organizationId} AND
+                (CURRENT_TIME :: time (6) BETWEEN T6.start_time AND T6.end_time)
+                WHERE T1.delete_flag = '0'
+                AND T2.status_enum = #{statusEnum}
+                <if test="pricingFlag ==1">
+                    AND 1 = 2
+                </if>
+                <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
+                    AND T1.id IN
+                    <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
+                        #{itemId}
+                    </foreach>
+                </if>
+                AND T5.instance_table = #{medicationTableName}
+                UNION ALL
+                SELECT T1.tenant_id,
+                2 AS advice_type,
+                T1.category_code AS category_code,
+                '' AS pharmacology_category_code,
+                T1.part_percent AS part_percent,
+                0 AS unit_conversion_ratio,
+                null AS part_attribute_enum,
+                null AS tho_part_attribute_enum,
+                null AS skin_test_flag,
+                null AS inject_flag,
+                T1.ID AS advice_definition_id,
+                T1.NAME AS advice_name,
+                T1.bus_no AS advice_bus_no,
+                T1.py_str AS py_str,
+                T1.wb_str AS wb_str,
+                T1.yb_no AS yb_no,
+                '' AS product_name,
+                0 AS activity_type,
+                T1.unit_code AS unit_code,
+                T1.min_unit_code AS min_unit_code,
+                T1.SIZE AS volume,
+                '' AS method_code,
+                '' AS rate_code,
+                T1.org_id AS org_id,
+                T1.location_id AS location_id,
+                '' AS dose,
+                '' AS dose_unit_code,
+                T2.NAME AS supplier,
+                T2.id AS supplier_id,
+                T1.manufacturer_text AS manufacturer,
+                T4.id AS charge_item_definition_id,
+                T4.instance_table AS advice_table_name,
+                T5.def_location_id AS position_id,
+                0 AS restricted_flag,
+                '' AS restricted_scope
+                FROM adm_device_definition AS T1
+                LEFT JOIN adm_supplier AS T2
+                ON T2.ID = T1.supply_id
+                AND T2.delete_flag = '0'
+                LEFT JOIN adm_charge_item_definition AS T4 ON T4.instance_id = T1.ID
+                AND T4.delete_flag = '0'
+                LEFT JOIN adm_organization_location AS T5 ON T5.distribution_category_code = T1.category_code
+                AND T5.delete_flag = '0' AND T5.organization_id = #{organizationId} AND
+                (CURRENT_TIME :: time (6) BETWEEN T5.start_time AND T5.end_time)
+                WHERE T1.delete_flag = '0'
+                <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
+                    AND T1.id IN
+                    <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
+                        #{itemId}
+                    </foreach>
+                </if>
+                AND T4.instance_table = #{deviceTableName}
+                AND T1.category_code = #{singleUse}
+                AND T1.status_enum = #{statusEnum}
+                UNION ALL
+                SELECT T1.tenant_id,
+                3 AS advice_type,
+                T1.category_code AS category_code,
+                '' AS pharmacology_category_code,
+                1 AS part_percent,
+                0 AS unit_conversion_ratio,
+                null AS part_attribute_enum,
+                null AS tho_part_attribute_enum,
+                null AS skin_test_flag,
+                null AS inject_flag,
+                T1.ID AS advice_definition_id,
+                T1.NAME AS advice_name,
+                T1.bus_no AS advice_bus_no,
+                T1.py_str AS py_str,
+                T1.wb_str AS wb_str,
+                T1.yb_no AS yb_no,
+                '' AS product_name,
+                T1.type_enum AS activity_type,
+                '' AS unit_code,
+                '' AS min_unit_code,
+                '' AS volume,
+                '' AS method_code,
+                '' AS rate_code,
+                T1.org_id AS org_id,
+                T1.location_id AS location_id,
+                '' AS dose,
+                '' AS dose_unit_code,
+                '' AS supplier,
+                null AS supplier_id,
+                '' AS manufacturer,
+                T2.ID AS charge_item_definition_id,
+                T2.instance_table AS advice_table_name,
+                COALESCE(T3.organization_id, T1.org_id) AS position_id,
+                0 AS restricted_flag,
+                '' AS restricted_scope
+                FROM wor_activity_definition AS T1
+                LEFT JOIN adm_charge_item_definition AS T2
+                ON T2.instance_id = T1.ID
+                AND T2.delete_flag = '0'
+                LEFT JOIN adm_organization_location AS T3 ON T3.activity_definition_id = T1.ID
+                AND T3.delete_flag = '0' AND (CURRENT_TIME :: time (6) BETWEEN T3.start_time AND T3.end_time)
+                WHERE T1.delete_flag = '0'
+                <if test="pricingFlag ==1">
+                    AND T1.pricing_flag = #{pricingFlag}
+                </if>
+                <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
+                    AND T1.id IN
+                    <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
+                        #{itemId}
+                    </foreach>
+                </if>
+                AND T1.status_enum = #{statusEnum}
+                AND T2.instance_table = #{activityTableName}
+            </when>
+            <otherwise>
+                <!-- 当adviceTypes不为null且不为空，且只包含1、2、3时，根据选中的类型查询 -->
+                <!-- 确保至少有一个类型被选中，避免空查询 -->
+                <if test="adviceTypes.contains(1) or adviceTypes.contains(2) or adviceTypes.contains(3)">
+                    <if test="adviceTypes.contains(1)">
+                        SELECT T1.tenant_id,
+                        1 AS advice_type,
+                        T1.category_code AS category_code,
+                        T1.pharmacology_category_code AS pharmacology_category_code,
+                        T1.part_percent AS part_percent,
+                        T1.unit_conversion_ratio AS unit_conversion_ratio,
+                        T1.part_attribute_enum AS part_attribute_enum,
+                        T1.tho_part_attribute_enum AS tho_part_attribute_enum,
+                        T1.skin_test_flag AS skin_test_flag,
+                        T1.inject_flag AS inject_flag,
+                        T1.ID AS advice_definition_id,
+                        T1.NAME AS advice_name,
+                        T1.bus_no AS advice_bus_no,
+                        T1.py_str AS py_str,
+                        T1.wb_str AS wb_str,
+                        T1.yb_no AS yb_no,
+                        T1.merchandise_name AS product_name,
+                        0 AS activity_type,
+                        T1.unit_code AS unit_code,
+                        T1.min_unit_code AS min_unit_code,
+                        T2.total_volume AS volume,
+                        T2.method_code AS method_code,
+                        T2.rate_code AS rate_code,
+                        T2.org_id AS org_id,
+                        T2.location_id AS location_id,
+                        CAST(T2.dose AS TEXT) AS dose,
+                        T2.dose_unit_code AS dose_unit_code,
+                        T3.NAME AS supplier,
+                        T3.id AS supplier_id,
+                        T1.manufacturer_text AS manufacturer,
+                        T5.id AS charge_item_definition_id,
+                        T5.instance_table AS advice_table_name,
+                        T6.def_location_id AS position_id,
+                        t1.restricted_flag AS restricted_flag,
+                        t1.restricted_scope AS restricted_scope
+                        FROM med_medication_definition AS t1
+                        INNER JOIN med_medication AS T2 ON T2.medication_def_id = T1.ID
+                        AND T2.delete_flag = '0' AND T2.status_enum = #{statusEnum}
+                        LEFT JOIN adm_supplier AS T3
+                        ON T3.ID = T1.supply_id
+                        AND T3.delete_flag = '0'
+                        LEFT JOIN adm_charge_item_definition AS T5 ON T5.instance_id = T1.ID
+                        AND T5.delete_flag = '0'
+                        LEFT JOIN adm_organization_location AS T6
+                        ON T6.distribution_category_code = T1.category_code
+                        AND T6.delete_flag = '0' AND T6.organization_id = #{organizationId} AND
+                        (CURRENT_TIME :: time (6) BETWEEN T6.start_time AND T6.end_time)
+                        WHERE T1.delete_flag = '0'
+                        AND T2.status_enum = #{statusEnum}
+                        <if test="pricingFlag ==1">
+                            AND 1 = 2
+                        </if>
+                        <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
+                            AND T1.id IN
+                            <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
+                                #{itemId}
+                            </foreach>
+                        </if>
+                        AND T5.instance_table = #{medicationTableName}
+                    </if>
 
-        <if test="adviceTypes == null or adviceTypes.contains(1)">
-            <if test="adviceTypes == null or adviceTypes.contains(2) or adviceTypes.contains(3)">UNION ALL</if>
-        </if>
+                    <if test="adviceTypes.contains(1) and (adviceTypes.contains(2) or adviceTypes.contains(3))">UNION ALL</if>
 
-        <if test="adviceTypes == null or adviceTypes.contains(2)">
-            SELECT T1.tenant_id,
-            2 AS advice_type,
-            T1.category_code AS category_code,
-            '' AS pharmacology_category_code,
-            T1.part_percent AS part_percent,
-            0 AS unit_conversion_ratio,
-            null AS part_attribute_enum,
-            null AS tho_part_attribute_enum,
-            null AS skin_test_flag,
-            null AS inject_flag,
-            T1.ID AS advice_definition_id,
-            T1.NAME AS advice_name,
-            T1.bus_no AS advice_bus_no,
-            T1.py_str AS py_str,
-            T1.wb_str AS wb_str,
-            T1.yb_no AS yb_no,
-            '' AS product_name,
-            0 AS activity_type,
-            T1.unit_code AS unit_code,
-            T1.min_unit_code AS min_unit_code,
-            T1.SIZE AS volume,
-            '' AS method_code,
-            '' AS rate_code,
-            T1.org_id AS org_id,
-            T1.location_id AS location_id,
-            '' AS dose,
-            '' AS dose_unit_code,
-            T2.NAME AS supplier,
-            T2.id AS supplier_id,
-            T1.manufacturer_text AS manufacturer,
-            T4.id AS charge_item_definition_id,
-            T4.instance_table AS advice_table_name,
-            T5.def_location_id AS position_id,
-            0 AS restricted_flag,
-            '' AS restricted_scope
-            FROM adm_device_definition AS T1
-            LEFT JOIN adm_supplier AS T2
-            ON T2.ID = T1.supply_id
-            AND T2.delete_flag = '0'
-            LEFT JOIN adm_charge_item_definition AS T4 ON T4.instance_id = T1.ID
-            AND T4.delete_flag = '0'
-            LEFT JOIN adm_organization_location AS T5 ON T5.distribution_category_code = T1.category_code
-            AND T5.delete_flag = '0' AND T5.organization_id = #{organizationId} AND
-            (CURRENT_TIME :: time (6) BETWEEN T5.start_time AND T5.end_time)
-            WHERE T1.delete_flag = '0'
-            <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
-                AND T1.id IN
-                <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
-                    #{itemId}
-                </foreach>
-            </if>
-            AND T4.instance_table = #{deviceTableName}
-            AND T1.category_code = #{singleUse}
-            AND T1.status_enum = #{statusEnum}
-        </if>
+                    <if test="adviceTypes.contains(2)">
+                        SELECT T1.tenant_id,
+                        2 AS advice_type,
+                        T1.category_code AS category_code,
+                        '' AS pharmacology_category_code,
+                        T1.part_percent AS part_percent,
+                        0 AS unit_conversion_ratio,
+                        null AS part_attribute_enum,
+                        null AS tho_part_attribute_enum,
+                        null AS skin_test_flag,
+                        null AS inject_flag,
+                        T1.ID AS advice_definition_id,
+                        T1.NAME AS advice_name,
+                        T1.bus_no AS advice_bus_no,
+                        T1.py_str AS py_str,
+                        T1.wb_str AS wb_str,
+                        T1.yb_no AS yb_no,
+                        '' AS product_name,
+                        0 AS activity_type,
+                        T1.unit_code AS unit_code,
+                        T1.min_unit_code AS min_unit_code,
+                        T1.SIZE AS volume,
+                        '' AS method_code,
+                        '' AS rate_code,
+                        T1.org_id AS org_id,
+                        T1.location_id AS location_id,
+                        '' AS dose,
+                        '' AS dose_unit_code,
+                        T2.NAME AS supplier,
+                        T2.id AS supplier_id,
+                        T1.manufacturer_text AS manufacturer,
+                        T4.id AS charge_item_definition_id,
+                        T4.instance_table AS advice_table_name,
+                        T5.def_location_id AS position_id,
+                        0 AS restricted_flag,
+                        '' AS restricted_scope
+                        FROM adm_device_definition AS T1
+                        LEFT JOIN adm_supplier AS T2
+                        ON T2.ID = T1.supply_id
+                        AND T2.delete_flag = '0'
+                        LEFT JOIN adm_charge_item_definition AS T4 ON T4.instance_id = T1.ID
+                        AND T4.delete_flag = '0'
+                        LEFT JOIN adm_organization_location AS T5 ON T5.distribution_category_code = T1.category_code
+                        AND T5.delete_flag = '0' AND T5.organization_id = #{organizationId} AND
+                        (CURRENT_TIME :: time (6) BETWEEN T5.start_time AND T5.end_time)
+                        WHERE T1.delete_flag = '0'
+                        <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
+                            AND T1.id IN
+                            <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
+                                #{itemId}
+                            </foreach>
+                        </if>
+                        AND T4.instance_table = #{deviceTableName}
+                        AND T1.category_code = #{singleUse}
+                        AND T1.status_enum = #{statusEnum}
+                    </if>
 
-        <if test="adviceTypes == null or adviceTypes.contains(2)">
-            <if test="adviceTypes == null or adviceTypes.contains(3)">UNION ALL</if>
-        </if>
+                    <if test="adviceTypes.contains(2) and adviceTypes.contains(3)">UNION ALL</if>
 
-        <if test="adviceTypes == null or adviceTypes.contains(3)">
-            SELECT T1.tenant_id,
-            3 AS advice_type,
-            T1.category_code AS category_code,
-            '' AS pharmacology_category_code,
-            1 AS part_percent,
-            0 AS unit_conversion_ratio,
-            null AS part_attribute_enum,
-            null AS tho_part_attribute_enum,
-            null AS skin_test_flag,
-            null AS inject_flag,
-            T1.ID AS advice_definition_id,
-            T1.NAME AS advice_name,
-            T1.bus_no AS advice_bus_no,
-            T1.py_str AS py_str,
-            T1.wb_str AS wb_str,
-            T1.yb_no AS yb_no,
-            '' AS product_name,
-            T1.type_enum AS activity_type,
-            '' AS unit_code,
-            '' AS min_unit_code,
-            '' AS volume,
-            '' AS method_code,
-            '' AS rate_code,
-            T1.org_id AS org_id,
-            T1.location_id AS location_id,
-            '' AS dose,
-            '' AS dose_unit_code,
-            '' AS supplier,
-            null AS supplier_id,
-            '' AS manufacturer,
-            T2.ID AS charge_item_definition_id,
-            T2.instance_table AS advice_table_name,
-            T3.organization_id AS position_id,
-            0 AS restricted_flag,
-            '' AS restricted_scope
-            FROM wor_activity_definition AS T1
-            LEFT JOIN adm_charge_item_definition AS T2
-            ON T2.instance_id = T1.ID
-            AND T2.delete_flag = '0'
-            LEFT JOIN adm_organization_location AS T3 ON T3.activity_definition_id = T1.ID
-            AND T3.delete_flag = '0' AND (CURRENT_TIME :: time (6) BETWEEN T3.start_time AND T3.end_time)
-            WHERE T1.delete_flag = '0'
-            <if test="pricingFlag ==1">
-                AND T1.pricing_flag = #{pricingFlag}
-            </if>
-            <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
-                AND T1.id IN
-                <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
-                    #{itemId}
-                </foreach>
-            </if>
-            AND T1.status_enum = #{statusEnum}
-            AND T2.instance_table = #{activityTableName}
-        </if>
+                    <if test="adviceTypes.contains(3)">
+                        SELECT T1.tenant_id,
+                        3 AS advice_type,
+                        T1.category_code AS category_code,
+                        '' AS pharmacology_category_code,
+                        1 AS part_percent,
+                        0 AS unit_conversion_ratio,
+                        null AS part_attribute_enum,
+                        null AS tho_part_attribute_enum,
+                        null AS skin_test_flag,
+                        null AS inject_flag,
+                        T1.ID AS advice_definition_id,
+                        T1.NAME AS advice_name,
+                        T1.bus_no AS advice_bus_no,
+                        T1.py_str AS py_str,
+                        T1.wb_str AS wb_str,
+                        T1.yb_no AS yb_no,
+                        '' AS product_name,
+                        T1.type_enum AS activity_type,
+                        '' AS unit_code,
+                        '' AS min_unit_code,
+                        '' AS volume,
+                        '' AS method_code,
+                        '' AS rate_code,
+                        T1.org_id AS org_id,
+                        T1.location_id AS location_id,
+                        '' AS dose,
+                        '' AS dose_unit_code,
+                        '' AS supplier,
+                        null AS supplier_id,
+                        '' AS manufacturer,
+                        T2.ID AS charge_item_definition_id,
+                        T2.instance_table AS advice_table_name,
+                        COALESCE(T3.organization_id, T1.org_id) AS position_id,
+                        0 AS restricted_flag,
+                        '' AS restricted_scope
+                        FROM wor_activity_definition AS T1
+                        LEFT JOIN adm_charge_item_definition AS T2
+                        ON T2.instance_id = T1.ID
+                        AND T2.delete_flag = '0'
+                        LEFT JOIN adm_organization_location AS T3 ON T3.activity_definition_id = T1.ID
+                        AND T3.delete_flag = '0' AND (CURRENT_TIME :: time (6) BETWEEN T3.start_time AND T3.end_time)
+                        WHERE T1.delete_flag = '0'
+                        <if test="pricingFlag ==1">
+                            AND T1.pricing_flag = #{pricingFlag}
+                        </if>
+                        <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
+                            AND T1.id IN
+                            <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
+                                #{itemId}
+                            </foreach>
+                        </if>
+                        AND T1.status_enum = #{statusEnum}
+                        AND T2.instance_table = #{activityTableName}
+                    </if>
+                </if>
+            </otherwise>
+        </choose>
         ) AS abi
         ${ew.customSqlSegment}
     </select>

openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InventoryProductReportMapper.xml

@@ -4,7 +4,9 @@
 
     <select id="selectProductReportPage"
             resultType="com.openhis.web.reportmanage.dto.InventoryProductReportPageDto">
-        SELECT T8.id,                                                --ID
+        SELECT *
+        FROM (
+               SELECT T8.id,                                                --ID
                T8.bus_no,                                            --药品编码
                T8.name,                                              --药品名称
                T8.lot_number,                                        --批次号
@@ -23,9 +25,11 @@
                T8.purpose_type_enum,                                 --仓库类型
                T8.location_name,                                     --仓库名称
                T8.location_store_name,                               --货位名称
+               T8.purpose_location_id,                               --仓库ID
                T8.expiration_date,                                   --有效期
                T8.yb_no,                                              --医保编码
-               T8.tenant_id                -- 租户ID
+               T8.tenant_id,               -- 租户ID
+               CAST(T8.item_table AS INTEGER) AS category_type          -- 项目类型（按分类编码，整型）
         FROM (SELECT T1.id,                                                 --ID
                      T2.bus_no,                                             --药品编码
                      T2.name,                                               --药品名称
@@ -46,6 +50,7 @@
                      T6.form_enum AS purpose_type_enum,                     --仓库类型
                      T6.name                       AS location_name,        --仓库名称
                      T7.name                       AS location_store_name,  --货位名称
+                     T1.location_id                AS purpose_location_id,  --仓库ID
                      T1.expiration_date,                                    --有效期
                      T2.yb_no,                                               --医保编码
                      T1.tenant_id                -- 租户ID
@@ -86,9 +91,11 @@
                T10.purpose_type_enum,                                  --仓库类型
                T10.location_name,                                      --仓库名称
                T10.location_store_name,                                --货位名称
+               T10.purpose_location_id,                                --仓库ID
                T10.expiration_date,                                    --有效期
                T10.yb_no,                                               --医保编码
-               T10.tenant_id                -- 租户ID
+               T10.tenant_id,               -- 租户ID
+               CAST(T10.item_table AS INTEGER) AS category_type           -- 项目类型（按分类编码，整型）
         FROM (SELECT T1.id,                                                 --ID
                      T9.bus_no,                                           --药品编码
                      T9.name,                                               --药品名称
@@ -109,6 +116,7 @@
                      T6.form_enum AS purpose_type_enum,                     --仓库类型
                      T6.name                       AS location_name,        --仓库名称
                      T7.name                       AS location_store_name,  --货位名称
+                     T1.location_id                AS purpose_location_id,  --仓库ID
                      T1.expiration_date,                                    --有效期
                      T9.yb_no,                                               --医保编码
                      T1.tenant_id                -- 租户ID
@@ -128,7 +136,24 @@
                        LEFT JOIN adm_location T7
                                  ON T1.location_store_id = T7.id
                                      AND T7.delete_flag = '0'
-              WHERE T1.delete_flag = '0') AS T10
+             WHERE T1.delete_flag = '0') AS T10
+            ) AS T
             ${ew.customSqlSegment}
+            <if test="inventoryScope != null">
+                <choose>
+                    <when test="inventoryScope == 2">
+                        AND item_quantity = 0
+                    </when>
+                    <when test="inventoryScope == 3">
+                        AND item_quantity > 0
+                    </when>
+                    <when test="inventoryScope == 4">
+                        AND item_quantity <![CDATA[ <= ]]> 20
+                    </when>
+                    <when test="inventoryScope == 5">
+                        AND item_quantity <![CDATA[ <= ]]> 50
+                    </when>
+                </choose>
+            </if>
     </select>
 </mapper>

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

@@ -142,6 +142,11 @@ public class CommonConstants {
      */
     public interface FieldName {
 
+        /**
+         * 手机号
+         */
+        String Phone = "phone";
+
         /**
          * 单据号
          */

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

@@ -39,7 +39,7 @@ public enum LocationForm implements HisEnumInterface {
 
     PHARMACY(16, "ph", "药房"),
 
-    WAREHOUSE (17, "wa", "仓库"),
+    WAREHOUSE (17, "wa", "耗材库"),
 
     DEPARTMENT (18, "de", "科室");
 

openhis-server-new/openhis-domain/pom.xml

@@ -32,6 +32,11 @@
             <groupId>com.openhis</groupId>
             <artifactId>openhis-common</artifactId>
         </dependency>
+        <!-- 核心共通模块 -->
+        <dependency>
+            <groupId>com.core</groupId>
+            <artifactId>core-common</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java

@@ -60,6 +60,9 @@ public class HealthcareService extends HisBaseEntity {
     /** 预约要求 */
     private Integer appointmentRequiredFlag;
 
+    /** 出诊医生ID */
+    private Long practitionerId;
+
     /** 医保编码 */
     private String ybNo;
 

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/InvoiceSegment.java

@@ -0,0 +1,59 @@
+package com.openhis.administration.domain;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.core.common.core.domain.HisBaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 发票段管理Entity实体
+ *
+ * @author system
+ * @date 2025-11-18
+ */
+@Data
+@TableName("adm_invoice_segment")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class InvoiceSegment extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+    
+    /** 段ID */
+    private Long segmentId;
+
+    /** 开始号码 */
+    private String beginNumber;
+    
+    /** 结束号码 */
+    private String endNumber;
+    
+    /** 员工ID */
+    private Long employeeId;
+    
+    /** 员工姓名 */
+    private String employeeName;
+    
+    /** 开票员ID */
+    private Long invoicingStaffId;
+    
+    /** 开票员姓名 */
+    private String invoicingStaffName;
+    
+    /** 创建日期 */
+    private Date createDate;
+    
+    /** 状态 */
+    private String status;
+    
+    /** 备注 */
+    private String remark;
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java

@@ -77,4 +77,16 @@ public class Organization extends HisBaseEntity {
 
     /** 默认挂号医生 */
     private Long defDoctorId;
+    
+    /** 挂号科室标记 */
+    private Integer registerFlag;
+    
+    /** 科室位置 */
+    private String location;
+    
+    /** 科室简介 */
+    private String intro;
+    
+    /** 备注 */
+    private String remark;
 }

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OutpatientNoSegment.java

@@ -0,0 +1,56 @@
+package com.openhis.administration.domain;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import com.core.common.core.domain.HisBaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 门诊号码段管理Entity实体
+ *
+ * @author system
+ * @date 2025-01-XX
+ */
+@Data
+@TableName("adm_outpatient_no_segment")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class OutpatientNoSegment extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 操作员ID */
+    private Long operatorId;
+
+    /** 操作员姓名 */
+    private String operatorName;
+
+    /** 员工工号 */
+    private String staffNo;
+
+    /** 领用日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date receiveDate;
+
+    /** 起始号码 */
+    private String startNo;
+
+    /** 终止号码 */
+    private String endNo;
+
+    /** 使用号码 */
+    private String usedNo;
+}
+

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/InvoiceSegmentMapper.java

@@ -0,0 +1,17 @@
+package com.openhis.administration.mapper;
+
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.administration.domain.InvoiceSegment;
+
+/**
+ * 发票段管理Mapper接口
+ *
+ * @author system
+ * @date 2025-11-18
+ */
+@Repository
+public interface InvoiceSegmentMapper extends BaseMapper<InvoiceSegment> {
+
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OutpatientNoSegmentMapper.java

@@ -0,0 +1,18 @@
+package com.openhis.administration.mapper;
+
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.administration.domain.OutpatientNoSegment;
+
+/**
+ * 门诊号码段管理Mapper接口
+ *
+ * @author system
+ * @date 2025-01-XX
+ */
+@Repository
+public interface OutpatientNoSegmentMapper extends BaseMapper<OutpatientNoSegment> {
+
+}
+

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IInvoiceSegmentService.java

@@ -0,0 +1,47 @@
+package com.openhis.administration.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.administration.domain.InvoiceSegment;
+
+/**
+ * 发票段管理Service接口
+ *
+ * @author system
+ * @date 2025-11-18
+ */
+public interface IInvoiceSegmentService {
+    
+    /**
+     * 分页查询发票段列表
+     *
+     * @param page 分页对象
+     * @param isAdmin 是否管理员
+     * @param userId 用户ID
+     * @return 分页结果
+     */
+    Page<InvoiceSegment> selectInvoiceSegmentPage(Page<InvoiceSegment> page, boolean isAdmin, Long userId);
+    
+    /**
+     * 新增发票段
+     *
+     * @param invoiceSegment 发票段信息
+     * @return 结果
+     */
+    int insertInvoiceSegment(InvoiceSegment invoiceSegment);
+    
+    /**
+     * 修改发票段
+     *
+     * @param invoiceSegment 发票段信息
+     * @return 结果
+     */
+    int updateInvoiceSegment(InvoiceSegment invoiceSegment);
+    
+    /**
+     * 删除发票段
+     *
+     * @param ids 发票段ID列表
+     * @return 结果
+     */
+    int deleteInvoiceSegmentByIds(Long[] ids);
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IInvoiceService.java

@@ -1,5 +1,7 @@
 package com.openhis.administration.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.administration.domain.Invoice;
 import com.openhis.administration.domain.Supplier;
@@ -18,4 +20,14 @@ public interface IInvoiceService extends IService<Invoice> {
      * @return
      */
     Long addInvoice(Invoice invoice);
+    
+    /**
+     * 分页查询发票列表（带用户角色权限过滤）
+     *
+     * @param page 分页参数
+     * @param isAdmin 是否管理员
+     * @param userId 当前用户ID
+     * @return 发票列表
+     */
+    IPage<Invoice> selectInvoicePage(Page<Invoice> page, boolean isAdmin, Long userId);
 }

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOutpatientNoSegmentService.java

@@ -0,0 +1,66 @@
+package com.openhis.administration.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.administration.domain.OutpatientNoSegment;
+
+/**
+ * 门诊号码段管理Service接口
+ *
+ * @author system
+ * @date 2025-01-XX
+ */
+public interface IOutpatientNoSegmentService {
+    
+    /**
+     * 分页查询门诊号码段列表
+     *
+     * @param page 分页对象
+     * @param onlySelf 是否只查询自己的（true=只查询自己的，false=查询所有）
+     * @param userId 用户ID
+     * @return 分页结果
+     */
+    Page<OutpatientNoSegment> selectOutpatientNoSegmentPage(Page<OutpatientNoSegment> page, boolean onlySelf, Long userId);
+    
+    /**
+     * 新增门诊号码段
+     *
+     * @param outpatientNoSegment 门诊号码段信息
+     * @return 结果
+     */
+    int insertOutpatientNoSegment(OutpatientNoSegment outpatientNoSegment);
+    
+    /**
+     * 修改门诊号码段
+     *
+     * @param outpatientNoSegment 门诊号码段信息
+     * @return 结果
+     */
+    int updateOutpatientNoSegment(OutpatientNoSegment outpatientNoSegment);
+    
+    /**
+     * 删除门诊号码段
+     *
+     * @param ids 门诊号码段ID列表
+     * @return 结果
+     */
+    int deleteOutpatientNoSegmentByIds(Long[] ids);
+    
+    /**
+     * 根据ID查询门诊号码段
+     *
+     * @param id 门诊号码段ID
+     * @return 门诊号码段信息
+     */
+    OutpatientNoSegment getById(Long id);
+    
+    /**
+     * 检查号码段是否重复（全系统范围）
+     *
+     * @param startNo 起始号码
+     * @param endNo 终止号码
+     * @param excludeId 排除的ID（用于更新时排除自身）
+     * @return true=重复，false=不重复
+     */
+    boolean checkNumberSegmentOverlap(String startNo, String endNo, Long excludeId);
+}
+

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceSegmentServiceImpl.java

@@ -0,0 +1,196 @@
+package com.openhis.administration.service.impl;
+
+import java.util.List;
+import java.util.Objects;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.openhis.administration.domain.InvoiceSegment;
+import com.openhis.administration.mapper.InvoiceSegmentMapper;
+import com.openhis.administration.service.IInvoiceSegmentService;
+
+/**
+ * 发票段管理Service实现
+ *
+ * @author system
+ * @date 2025-11-18
+ */
+@Service
+public class InvoiceSegmentServiceImpl implements IInvoiceSegmentService {
+
+    @Autowired
+    private InvoiceSegmentMapper invoiceSegmentMapper;
+
+    /**
+     * 分页查询发票段列表
+     */
+    @Override
+    public Page<InvoiceSegment> selectInvoiceSegmentPage(Page<InvoiceSegment> page, boolean isAdmin, Long userId) {
+        LambdaQueryWrapper<InvoiceSegment> queryWrapper = new LambdaQueryWrapper<>();
+        
+        // 移除数据过滤限制，允许查看所有发票段数据
+        // 按创建时间倒序排列
+        queryWrapper.orderByDesc(InvoiceSegment::getCreateDate);
+        
+        return invoiceSegmentMapper.selectPage(page, queryWrapper);
+    }
+
+    /**
+     * 新增发票段
+     */
+    @Override
+    public int insertInvoiceSegment(InvoiceSegment invoiceSegment) {
+        return invoiceSegmentMapper.insert(invoiceSegment);
+    }
+
+    /**
+     * 修改发票段
+     */
+    @Override
+    public int updateInvoiceSegment(InvoiceSegment invoiceSegment) {
+        System.out.println("===== 开始更新发票段 ====");
+        System.out.println("传入的invoiceSegment对象: id=" + invoiceSegment.getId() + ", segmentId=" + invoiceSegment.getSegmentId());
+        
+        // 确保必填字段存在
+        if (invoiceSegment.getBeginNumber() == null || invoiceSegment.getEndNumber() == null) {
+            System.out.println("错误: beginNumber或endNumber为空，无法更新");
+            return 0;
+        }
+        
+        // 先尝试直接通过id更新
+        int rows = invoiceSegmentMapper.updateById(invoiceSegment);
+        System.out.println("直接通过id更新结果: 影响行数=" + rows);
+        
+        // 如果直接更新失败，尝试多种查询策略
+        if (rows == 0) {
+            // 策略1: 使用传入的id作为segmentId查询（处理前端传入的keyId作为segment_id的情况）
+            if (invoiceSegment.getId() != null) {
+                System.out.println("策略1: 尝试将id=" + invoiceSegment.getId() + "作为segment_id查询");
+                LambdaQueryWrapper<InvoiceSegment> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(InvoiceSegment::getSegmentId, invoiceSegment.getId());
+                queryWrapper.eq(InvoiceSegment::getDeleteFlag, "0");
+                
+                InvoiceSegment existingSegment = invoiceSegmentMapper.selectOne(queryWrapper);
+                if (existingSegment != null) {
+                    System.out.println("策略1成功: 找到匹配的记录，原始id=" + existingSegment.getId() + ", segmentId=" + existingSegment.getSegmentId());
+                    invoiceSegment.setId(existingSegment.getId());
+                    invoiceSegment.setSegmentId(existingSegment.getSegmentId()); // 确保segmentId正确
+                    rows = invoiceSegmentMapper.updateById(invoiceSegment);
+                    System.out.println("更新结果: 影响行数=" + rows);
+                }
+            }
+            
+            // 策略2: 使用传入的segmentId字段查询
+            if (rows == 0 && invoiceSegment.getSegmentId() != null) {
+                System.out.println("策略2: 尝试使用segmentId=" + invoiceSegment.getSegmentId() + "查询");
+                LambdaQueryWrapper<InvoiceSegment> segmentIdWrapper = new LambdaQueryWrapper<>();
+                segmentIdWrapper.eq(InvoiceSegment::getSegmentId, invoiceSegment.getSegmentId());
+                segmentIdWrapper.eq(InvoiceSegment::getDeleteFlag, "0");
+                
+                InvoiceSegment existingSegment = invoiceSegmentMapper.selectOne(segmentIdWrapper);
+                if (existingSegment != null) {
+                    System.out.println("策略2成功: 找到匹配的记录，原始id=" + existingSegment.getId() + ", segmentId=" + existingSegment.getSegmentId());
+                    invoiceSegment.setId(existingSegment.getId());
+                    rows = invoiceSegmentMapper.updateById(invoiceSegment);
+                    System.out.println("更新结果: 影响行数=" + rows);
+                }
+            }
+            
+            // 策略3: 基于业务键查询（beginNumber和endNumber通常是唯一的业务组合）
+            if (rows == 0) {
+                System.out.println("策略3: 尝试根据业务键查询，beginNumber=" + invoiceSegment.getBeginNumber() + ", endNumber=" + invoiceSegment.getEndNumber());
+                LambdaQueryWrapper<InvoiceSegment> businessWrapper = new LambdaQueryWrapper<>();
+                businessWrapper.eq(InvoiceSegment::getBeginNumber, invoiceSegment.getBeginNumber());
+                businessWrapper.eq(InvoiceSegment::getEndNumber, invoiceSegment.getEndNumber());
+                businessWrapper.eq(InvoiceSegment::getDeleteFlag, "0");
+                
+                InvoiceSegment existingSegment = invoiceSegmentMapper.selectOne(businessWrapper);
+                if (existingSegment != null) {
+                    System.out.println("策略3成功: 找到匹配的记录，原始id=" + existingSegment.getId() + ", segmentId=" + existingSegment.getSegmentId());
+                    invoiceSegment.setId(existingSegment.getId());
+                    invoiceSegment.setSegmentId(existingSegment.getSegmentId()); // 确保segmentId正确
+                    rows = invoiceSegmentMapper.updateById(invoiceSegment);
+                    System.out.println("更新结果: 影响行数=" + rows);
+                }
+            }
+            
+            // 策略4: 如果是特定场景下的已知ID问题，添加特殊处理逻辑
+            if (rows == 0) {
+                System.out.println("策略4: 检查是否需要特殊处理");
+                // 检查是否是之前日志中提到的ID问题
+                if ("1990329963367977000".equals(invoiceSegment.getSegmentId() + "")) {
+                    System.out.println("检测到特殊ID模式，尝试替代查询");
+                    // 这里可以添加更具体的替代查询逻辑
+                }
+            }
+            
+            // 增强调试信息：显示当前表中所有可能相关的记录
+            if (rows == 0) {
+                System.out.println("所有查询策略都失败了，显示表中相关记录:");
+                // 查询条件可以根据实际情况调整
+                LambdaQueryWrapper<InvoiceSegment> debugWrapper = new LambdaQueryWrapper<>();
+                debugWrapper.eq(InvoiceSegment::getDeleteFlag, "0");
+                // 可以添加时间范围或其他条件来限制结果数量
+                debugWrapper.last("LIMIT 10");
+                
+                List<InvoiceSegment> segments = invoiceSegmentMapper.selectList(debugWrapper);
+                for (InvoiceSegment seg : segments) {
+                    System.out.println("记录: id=" + seg.getId() + ", segmentId=" + seg.getSegmentId() + ", beginNumber=" + seg.getBeginNumber() + ", endNumber=" + seg.getEndNumber());
+                }
+                
+                System.out.println("提示: 请检查前端传递的ID是否与数据库中的记录匹配");
+            }
+        }
+        
+        System.out.println("===== 更新发票段结束 ==== 最终结果: " + (rows > 0 ? "成功" : "失败"));
+        return rows;
+    }
+    
+    /**
+     * 删除发票段
+     */
+    @Override
+    public int deleteInvoiceSegmentByIds(Long[] ids) {
+        System.out.println("删除发票段IDs: " + java.util.Arrays.toString(ids));
+                    List<Long> idList = java.util.Arrays.asList(ids);
+        System.out.println("删除ID列表: " + idList);
+        
+        // 检查记录是否存在且未被删除 - 先尝试通过id查找
+        LambdaQueryWrapper<InvoiceSegment> checkWrapper = new LambdaQueryWrapper<>();
+        checkWrapper.in(InvoiceSegment::getId, idList);
+        checkWrapper.eq(InvoiceSegment::getDeleteFlag, "0"); // 检查未被删除的记录
+        List<InvoiceSegment> existingRecords = invoiceSegmentMapper.selectList(checkWrapper);
+        
+        System.out.println("通过id检查到的未删除记录数: " + existingRecords.size());
+        
+        // 如果通过id没有找到记录，尝试通过segment_id查找
+        if (existingRecords.isEmpty()) {
+            System.out.println("通过id未找到记录，尝试通过segment_id查找");
+            LambdaQueryWrapper<InvoiceSegment> segmentIdWrapper = new LambdaQueryWrapper<>();
+            segmentIdWrapper.in(InvoiceSegment::getSegmentId, idList);
+            segmentIdWrapper.eq(InvoiceSegment::getDeleteFlag, "0");
+            existingRecords = invoiceSegmentMapper.selectList(segmentIdWrapper);
+            System.out.println("通过segment_id检查到的未删除记录数: " + existingRecords.size());
+            
+            // 如果通过segment_id找到了记录，使用这些记录的id进行删除
+            if (!existingRecords.isEmpty()) {
+                List<Long> actualIds = existingRecords.stream()
+                    .map(InvoiceSegment::getId)
+                    .collect(java.util.stream.Collectors.toList());
+                System.out.println("使用实际id列表进行删除: " + actualIds);
+                int rows = invoiceSegmentMapper.deleteBatchIds(actualIds);
+                System.out.println("删除影响行数: " + rows);
+                return rows;
+            }
+        }
+        
+        // 直接通过id删除
+        int rows = invoiceSegmentMapper.deleteBatchIds(idList);
+        System.out.println("删除影响行数: " + rows);
+        
+        return rows;
+    }
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceServiceImpl.java

@@ -2,17 +2,18 @@ package com.openhis.administration.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.utils.SecurityUtils;
+import com.openhis.administration.domain.Invoice;
 import com.openhis.administration.domain.Supplier;
+import com.openhis.administration.mapper.InvoiceMapper;
+import com.openhis.administration.service.IInvoiceService;
 import com.openhis.common.enums.SupplyStatus;
 import com.openhis.workflow.domain.SupplyRequest;
 import org.springframework.stereotype.Service;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.administration.domain.Invoice;
-import com.openhis.administration.mapper.InvoiceMapper;
-import com.openhis.administration.service.IInvoiceService;
-
 import java.util.Date;
 import java.util.List;
 
@@ -26,11 +27,12 @@ import java.util.List;
 public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> implements IInvoiceService {
     /**
      * 新增发票
-     *
+     *  
      * @param invoice 发票实体
      * @return
      */
-   public Long addInvoice(Invoice invoice){
+    @Override
+    public Long addInvoice(Invoice invoice){
        // 根据编码判断发票是否存在
        List<Invoice> invoices =
            baseMapper.selectList(new LambdaQueryWrapper<Invoice>().eq(Invoice::getBusNo, invoice.getBusNo()));
@@ -46,4 +48,26 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
        return invoice.getId();
    }
 
+    /**
+     * 分页查询发票列表（带用户角色权限过滤）
+     *
+     * @param page 分页参数
+     * @param isAdmin 是否管理员
+     * @param userId 当前用户ID
+     * @return 发票列表
+     */
+    @Override
+    public IPage<Invoice> selectInvoicePage(Page<Invoice> page, boolean isAdmin, Long userId) {
+        LambdaQueryWrapper<Invoice> queryWrapper = new LambdaQueryWrapper<>();
+        
+        // 如果不是管理员，只查询当前用户创建的发票
+        if (!isAdmin) {
+            queryWrapper.eq(Invoice::getInvoicingStaffId, userId);
+        }
+        
+        // 按创建时间降序排序
+        queryWrapper.orderByDesc(Invoice::getCreateTime);
+        
+        return baseMapper.selectPage(page, queryWrapper);
+    }
 }

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/LocationServiceImpl.java

@@ -63,7 +63,7 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
     @Override
     public List<Location> getPharmacyCabinetList() {
         return baseMapper.selectList(new LambdaQueryWrapper<Location>().in(Location::getFormEnum,
-            LocationForm.CABINET.getValue(), LocationForm.PHARMACY.getValue()));
+            LocationForm.CABINET.getValue(), LocationForm.PHARMACY.getValue(), LocationForm.WAREHOUSE.getValue()));
     }
 
     /**

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OutpatientNoSegmentServiceImpl.java

@@ -0,0 +1,241 @@
+package com.openhis.administration.service.impl;
+
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.openhis.administration.domain.OutpatientNoSegment;
+import com.openhis.administration.mapper.OutpatientNoSegmentMapper;
+import com.openhis.administration.service.IOutpatientNoSegmentService;
+
+/**
+ * 门诊号码段管理Service实现
+ *
+ * @author system
+ * @date 2025-01-XX
+ */
+@Service
+public class OutpatientNoSegmentServiceImpl implements IOutpatientNoSegmentService {
+
+    @Autowired
+    private OutpatientNoSegmentMapper outpatientNoSegmentMapper;
+
+    /**
+     * 分页查询门诊号码段列表
+     */
+    @Override
+    public Page<OutpatientNoSegment> selectOutpatientNoSegmentPage(Page<OutpatientNoSegment> page, boolean onlySelf, Long userId) {
+        LambdaQueryWrapper<OutpatientNoSegment> queryWrapper = new LambdaQueryWrapper<>();
+        
+        // 如果不是管理员，只查询自己的号码段
+        if (onlySelf && userId != null) {
+            queryWrapper.eq(OutpatientNoSegment::getOperatorId, userId);
+        }
+        
+        // 按创建时间正序排列（新记录排在后面）
+        queryWrapper.orderByAsc(OutpatientNoSegment::getCreateTime);
+        
+        return outpatientNoSegmentMapper.selectPage(page, queryWrapper);
+    }
+
+    /**
+     * 新增门诊号码段
+     */
+    @Override
+    public int insertOutpatientNoSegment(OutpatientNoSegment outpatientNoSegment) {
+        return outpatientNoSegmentMapper.insert(outpatientNoSegment);
+    }
+
+    /**
+     * 修改门诊号码段
+     */
+    @Override
+    public int updateOutpatientNoSegment(OutpatientNoSegment outpatientNoSegment) {
+        return outpatientNoSegmentMapper.updateById(outpatientNoSegment);
+    }
+    
+    /**
+     * 删除门诊号码段
+     */
+    @Override
+    public int deleteOutpatientNoSegmentByIds(Long[] ids) {
+        if (ids == null || ids.length == 0) {
+            return 0;
+        }
+        return outpatientNoSegmentMapper.deleteBatchIds(java.util.Arrays.asList(ids));
+    }
+    
+    /**
+     * 根据ID查询门诊号码段
+     * 注意：由于 @TableLogic 注解，selectById 会自动过滤已删除的记录（delete_flag = '1'）
+     * 这意味着如果记录已经被软删除，此方法会返回 null
+     */
+    @Override
+    public OutpatientNoSegment getById(Long id) {
+        System.out.println("=== 查询门诊号码段开始 ===");
+        System.out.println("查询ID: " + id);
+        System.out.println("ID类型: " + (id != null ? id.getClass().getName() : "null"));
+        System.out.println("ID值（字符串）: " + String.valueOf(id));
+        
+        // 使用 selectById 查询（会自动过滤 delete_flag = '1' 的记录）
+        OutpatientNoSegment segment = outpatientNoSegmentMapper.selectById(id);
+        
+        if (segment != null) {
+            System.out.println("查询成功 - 找到记录:");
+            System.out.println("  - 记录ID: " + segment.getId());
+            System.out.println("  - 操作员ID: " + segment.getOperatorId());
+            System.out.println("  - 起始号码: " + segment.getStartNo());
+            System.out.println("  - 终止号码: " + segment.getEndNo());
+            System.out.println("  - 使用号码: " + segment.getUsedNo());
+        } else {
+            System.out.println("查询失败 - 未找到记录");
+            System.out.println("可能原因：");
+            System.out.println("  1. 记录不存在");
+            System.out.println("  2. 记录已被软删除（delete_flag = '1'）");
+            System.out.println("  3. ID 不匹配");
+            
+            // 尝试直接查询数据库（包括已删除的记录）来验证记录是否存在
+            try {
+                LambdaQueryWrapper<OutpatientNoSegment> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(OutpatientNoSegment::getId, id);
+                // 注意：这里仍然会受到 @TableLogic 的影响，无法查询已删除的记录
+                // 如果需要查询已删除的记录，需要使用原生 SQL 或禁用逻辑删除
+                OutpatientNoSegment segmentWithDeleted = outpatientNoSegmentMapper.selectOne(queryWrapper);
+                if (segmentWithDeleted != null) {
+                    System.out.println("使用 LambdaQueryWrapper 查询结果: 找到记录，ID=" + segmentWithDeleted.getId());
+                } else {
+                    System.out.println("使用 LambdaQueryWrapper 查询结果: 未找到记录");
+                }
+            } catch (Exception e) {
+                System.out.println("使用 LambdaQueryWrapper 查询时出错: " + e.getMessage());
+            }
+            
+            // 尝试查询所有记录（不限制 delete_flag）来验证 ID 是否存在
+            // 注意：由于 @TableLogic，无法直接查询已删除的记录
+            // 但我们可以查询所有未删除的记录，看看是否有类似的 ID
+            try {
+                LambdaQueryWrapper<OutpatientNoSegment> allQuery = new LambdaQueryWrapper<>();
+                // 查询所有未删除的记录
+                List<OutpatientNoSegment> allSegments = outpatientNoSegmentMapper.selectList(allQuery);
+                System.out.println("数据库中所有未删除的记录数: " + allSegments.size());
+                System.out.println("所有记录的 ID 列表:");
+                for (OutpatientNoSegment seg : allSegments) {
+                    System.out.println("  - ID: " + seg.getId() + " (类型: " + seg.getId().getClass().getName() + ")");
+                    // 检查是否有接近的 ID（可能是精度问题）
+                    if (seg.getId() != null) {
+                        String segIdStr = String.valueOf(seg.getId());
+                        String searchIdStr = String.valueOf(id);
+                        if (segIdStr.length() == searchIdStr.length() && 
+                            segIdStr.substring(0, Math.min(10, segIdStr.length())).equals(
+                                searchIdStr.substring(0, Math.min(10, searchIdStr.length())))) {
+                            System.out.println("    警告：发现相似的 ID！");
+                        }
+                    }
+                }
+            } catch (Exception e) {
+                System.out.println("查询所有记录时出错: " + e.getMessage());
+            }
+        }
+        
+        System.out.println("=== 查询门诊号码段结束 ===");
+        return segment;
+    }
+    
+    /**
+     * 检查号码段是否重复（全系统范围）
+     * 规则：从末位往前找到第一个字母作为前缀，比较前缀和数字范围
+     */
+    @Override
+    public boolean checkNumberSegmentOverlap(String startNo, String endNo, Long excludeId) {
+        if (startNo == null || endNo == null) {
+            return false;
+        }
+        
+        // 提取前缀（从末位往前找到第一个字母）
+        String prefix1 = extractPrefix(startNo);
+        String prefix2 = extractPrefix(endNo);
+        
+        // 前缀必须一致
+        if (!prefix1.equals(prefix2)) {
+            return false;
+        }
+        
+        // 提取尾部数字
+        Long num1 = extractTailNumber(startNo);
+        Long num2 = extractTailNumber(endNo);
+        
+        if (num1 == null || num2 == null || num1 > num2) {
+            return false;
+        }
+        
+        // 查询所有相同前缀的号码段
+        LambdaQueryWrapper<OutpatientNoSegment> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.likeRight(OutpatientNoSegment::getStartNo, prefix1);
+        if (excludeId != null) {
+            queryWrapper.ne(OutpatientNoSegment::getId, excludeId);
+        }
+        
+        List<OutpatientNoSegment> segments = outpatientNoSegmentMapper.selectList(queryWrapper);
+        
+        // 检查是否有重叠
+        for (OutpatientNoSegment segment : segments) {
+            String otherPrefix = extractPrefix(segment.getStartNo());
+            if (!prefix1.equals(otherPrefix)) {
+                continue;
+            }
+            
+            Long otherNum1 = extractTailNumber(segment.getStartNo());
+            Long otherNum2 = extractTailNumber(segment.getEndNo());
+            
+            if (otherNum1 != null && otherNum2 != null) {
+                // 检查范围是否重叠
+                if (Math.max(num1, otherNum1) <= Math.min(num2, otherNum2)) {
+                    return true;
+                }
+            }
+        }
+        
+        return false;
+    }
+    
+    /**
+     * 从末位往前找到第一个字母，返回前缀（包含该字母）
+     */
+    private String extractPrefix(String value) {
+        if (value == null || value.isEmpty()) {
+            return "";
+        }
+        char[] chars = value.toCharArray();
+        for (int i = chars.length - 1; i >= 0; i--) {
+            if (Character.isLetter(chars[i])) {
+                return value.substring(0, i + 1);
+            }
+        }
+        return "";
+    }
+    
+    /**
+     * 提取尾部数字
+     */
+    private Long extractTailNumber(String value) {
+        if (value == null || value.isEmpty()) {
+            return null;
+        }
+        Pattern pattern = Pattern.compile("(\\d+)$");
+        Matcher matcher = pattern.matcher(value);
+        if (matcher.find()) {
+            try {
+                return Long.parseLong(matcher.group(1));
+            } catch (NumberFormatException e) {
+                return null;
+            }
+        }
+        return null;
+    }
+}
+

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerServiceImpl.java

@@ -33,7 +33,10 @@ public class PractitionerServiceImpl extends ServiceImpl<PractitionerMapper, Pra
 
         QueryWrapper<Practitioner> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("user_id", userId);
-        return baseMapper.selectOne(queryWrapper);
+        queryWrapper.orderByDesc("create_time"); // 按创建时间倒序，取最新的一条
+        queryWrapper.last("LIMIT 1"); // 限制只返回一条
+        List<Practitioner> list = baseMapper.selectList(queryWrapper);
+        return list != null && !list.isEmpty() ? list.get(0) : null;
     }
 
     /**

openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckMethod.java

@@ -0,0 +1,74 @@
+package com.openhis.check.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 检查方法
+ * 
+ * @author system
+ * @date 2025-07-22
+ */
+@Data
+@Accessors(chain = true)
+@TableName(value = "check_method", autoResultMap = true)
+public class CheckMethod {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 检查方法ID
+     */
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    /* 检查类型 */
+    private String checkType;
+
+    /* 方法代码 */
+    private String code;
+
+    /* 方法名称 */
+    private String name;
+
+    /* 套餐名称 */
+    private String packageName;
+
+    /* 曝光次数 */
+    private Integer exposureNum;
+
+    /* 序号 */
+    private Integer orderNum;
+
+    /* 备注 */
+    private String remark;
+
+    /** 创建时间 */
+    private LocalDateTime createTime;
+
+    /** 更新时间 */
+    private LocalDateTime updateTime;
+
+    /**
+     * 禁用逻辑删除，因为数据库表中没有delete_flag字段
+     */
+    @TableField(exist = false)
+    private String deleteFlag;
+
+    /**
+     * 以下字段数据库表中不存在，用于禁用MyBatis Plus自动添加的字段
+     */
+    @TableField(exist = false)
+    private String createBy;
+
+    @TableField(exist = false)
+    private String updateBy;
+
+    @TableField(exist = false)
+    private Integer tenantId;
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckPackage.java

@@ -0,0 +1,127 @@
+package com.openhis.check.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * 检查套餐
+ * 
+ * @author system
+ * @date 2025-07-22
+ * @updated 2025-11-26 - 扩展字段以支持套餐设置PRD需求
+ */
+@Data
+@Accessors(chain = true)
+@TableName(value = "check_package", autoResultMap = true)
+public class CheckPackage {
+    private static final long serialVersionUID = 1L;
+
+    /** 检查套餐ID */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /** 套餐名称 */
+    @TableField("package_name")
+    private String packageName;
+
+    /** 套餐编码 */
+    private String code;
+
+    /** 套餐类别 */
+    @TableField("package_type")
+    private String packageType;
+
+    /** 套餐级别 (1:全院套餐 2:科室套餐 3:个人套餐) */
+    @TableField("package_level")
+    private String packageLevel;
+
+    /** 适用科室 (当套餐级别为科室套餐时必填) */
+    @TableField("department")
+    private String department;
+
+    /** 适用用户 (当套餐级别为个人套餐时必填) */
+    @TableField("\"user\"")
+    private String user;
+
+    /** 卫生机构 */
+    @TableField("organization")
+    private String organization;
+
+    /** 套餐金额 */
+    @TableField("package_price")
+    private BigDecimal packagePrice;
+
+    /** 折扣 (百分比) */
+    @TableField("discount")
+    private BigDecimal discount;
+
+    /** 制单人 */
+    @TableField("creator")
+    private String creator;
+
+    /** 是否停用 (0:启用 1:停用) */
+    @TableField("is_disabled")
+    private Integer isDisabled;
+
+    /** 显示套餐名 (0:否 1:是) */
+    @TableField("show_package_name")
+    private Integer showPackageName;
+
+    /** 生成服务费 (0:否 1:是) */
+    @TableField("generate_service_fee")
+    private Integer generateServiceFee;
+
+    /** 套餐价格启用状态 (0:不启用 1:启用) */
+    @TableField("package_price_enabled")
+    private Integer packagePriceEnabled;
+
+    /** 服务费 */
+    @TableField("service_fee")
+    private BigDecimal serviceFee;
+
+    /** 备注 */
+    private String remark;
+
+    /** 描述 */
+    private String description;
+
+    /** 序号 */
+    private Integer number;
+
+    /** 套餐维护日期 (系统自动生成) */
+    @TableField("maintain_date")
+    private LocalDate maintainDate;
+
+    /** 创建时间 */
+    private LocalDateTime createTime;
+
+    /** 更新时间 */
+    private LocalDateTime updateTime;
+
+    /**
+     * 禁用逻辑删除，因为数据库表中没有delete_flag字段
+     */
+    @TableField(exist = false)
+    private String deleteFlag;
+
+    /**
+     * 以下字段数据库表中不存在，用于禁用MyBatis Plus自动添加的字段
+     */
+    @TableField(exist = false)
+    private String createBy;
+
+    @TableField(exist = false)
+    private String updateBy;
+
+    @TableField(exist = false)
+    private Integer tenantId;
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckPackageDetail.java

@@ -0,0 +1,95 @@
+package com.openhis.check.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 检查套餐明细表
+ * 
+ * @author system
+ * @date 2025-11-26
+ */
+@Data
+@Accessors(chain = true)
+@TableName(value = "check_package_detail", autoResultMap = true)
+public class CheckPackageDetail {
+    private static final long serialVersionUID = 1L;
+
+    /** 套餐明细ID */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /** 套餐ID */
+    private Long packageId;
+
+    /** 项目编号 */
+    private String itemCode;
+
+    /** 项目名称/规格 */
+    private String itemName;
+
+    /** 检查项目ID(诊疗项目ID) */
+    private Long checkItemId;
+
+    /** 剂量 */
+    private String dose;
+
+    /** 途径 */
+    private String method;
+
+    /** 频次 */
+    private String frequency;
+
+    /** 天数 */
+    private String days;
+
+    /** 数量 */
+    private Integer quantity;
+
+    /** 单价 */
+    private BigDecimal unitPrice;
+
+    /** 金额 */
+    private BigDecimal amount;
+
+    /** 服务费 */
+    private BigDecimal serviceCharge;
+
+    /** 总金额 */
+    private BigDecimal total;
+
+    /** 产地 */
+    private String origin;
+
+    /** 序号 */
+    private Integer orderNum;
+
+    /** 创建时间 */
+    private LocalDateTime createTime;
+
+    /** 更新时间 */
+    private LocalDateTime updateTime;
+
+    /**
+     * 禁用MyBatis Plus自动添加的字段
+     */
+    @TableField(exist = false)
+    private String createBy;
+
+    @TableField(exist = false)
+    private String updateBy;
+
+    @TableField(exist = false)
+    private Integer tenantId;
+
+    @TableField(exist = false)
+    private String deleteFlag;
+}
+

openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckPart.java

@@ -0,0 +1,81 @@
+package com.openhis.check.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 检查部位
+ * 
+ * @author system
+ * @date 2025-07-22
+ */
+@Data
+@Accessors(chain = true)
+@TableName(value = "check_part", autoResultMap = true)
+public class CheckPart {
+    private static final long serialVersionUID = 1L;
+
+    /** 检查部位ID */
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    /** 检查部位名称 */
+    private String name;
+
+    /** 检查部位编码 */
+    private String code;
+
+    /** 检查部位检查类型 */
+    private String checkType;
+
+    /** 曝光次数 */
+    private Integer exposureNum;
+
+    /** 费用套餐 */
+    private String packageName;
+
+    /** 金额 */
+    private Double price;
+
+    /** 序号 */
+    private Integer number;
+
+    /** 服务范围 */
+    private String serviceScope;
+
+    /** 下级医技类型 */
+    private String subType;
+
+    /** 备注 */
+    private String remark;
+
+    /** 创建时间 */
+    private LocalDateTime createTime;
+
+    /** 更新时间 */
+    private LocalDateTime updateTime;
+
+    /**
+     * 禁用逻辑删除，因为数据库表中没有delete_flag字段
+     */
+    @TableField(exist = false)
+    private String deleteFlag;
+
+    /**
+     * 以下字段数据库表中不存在，用于禁用MyBatis Plus自动添加的字段
+     */
+    @TableField(exist = false)
+    private String createBy;
+
+    @TableField(exist = false)
+    private String updateBy;
+
+    @TableField(exist = false)
+    private Integer tenantId;
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckType.java

@@ -0,0 +1,73 @@
+package com.openhis.check.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 检查类型
+ * 
+ * @author system
+ * @date 2025-07-22
+ */
+@Data
+@Accessors(chain = true)
+@TableName(value = "check_type", autoResultMap = true)
+public class CheckType {
+    private static final long serialVersionUID = 1L;
+
+    /** 检查类型ID */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /** 检查类型名称 */
+    private String name;
+
+    /** 检查类型编码 */
+    private String code;
+
+    /** 检查类型 */
+    private String type;
+
+    /** 是否选中 */
+    private Boolean selected;
+
+    /** 科室 */
+    private String department;
+
+    /** 序号 */
+    private Integer number;
+
+    /** 备注 */
+    private String remark;
+
+    /** 创建时间 */
+    private LocalDateTime createTime;
+
+    /** 更新时间 */
+    private LocalDateTime updateTime;
+
+    /**
+     * 禁用逻辑删除，因为数据库表中没有delete_flag字段
+     */
+    @TableField(exist = false)
+    private String deleteFlag;
+
+    /**
+     * 以下字段数据库表中不存在，用于禁用MyBatis Plus自动添加的字段
+     */
+    @TableField(exist = false)
+    private String createBy;
+
+    @TableField(exist = false)
+    private String updateBy;
+
+    @TableField(exist = false)
+    private Integer tenantId;
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/LisGroupInfo.java

@@ -0,0 +1,40 @@
+package com.openhis.check.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Data
+@Accessors(chain = true)
+@TableName(value = "lis_group_info",autoResultMap = true)
+public class LisGroupInfo {
+
+    /** id */
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    /** 卫生机构 */
+    private String hospital;
+
+    /** 创建日期 */
+    private LocalDate date;
+
+    /** LIS分组名称 */
+    private String groupName;
+
+    /** 采血管类型 */
+    private String tube;
+
+    /** 备注 */
+    private String remark;
+
+    /** 创建时间 */
+    private LocalDateTime createTime;
+
+    /** 更新时间 */
+    private LocalDateTime updateTime;
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/PackageItem.java

@@ -0,0 +1,33 @@
+package com.openhis.check.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 套餐项目关系表
+ * 
+ * @author system
+ * @date 2025-07-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("package_item")
+public class PackageItem extends HisBaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 套餐ID */
+    private Long packageId;
+
+    /** 检查项目ID */
+    private Long checkItemId;
+
+    /** 项目类型（1：检查类型 2：检查方法 3：检查部位） */
+    private Integer itemType;
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/CheckMethodMapper.java

@@ -0,0 +1,16 @@
+package com.openhis.check.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.check.domain.CheckMethod;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 检查方法Mapper接口
+ *
+ * @author system
+ * @date 2025-07-22
+ */
+@Repository
+public interface CheckMethodMapper extends BaseMapper<CheckMethod> {
+
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/CheckPackageDetailMapper.java

@@ -0,0 +1,16 @@
+package com.openhis.check.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.check.domain.CheckPackageDetail;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 检查套餐明细Mapper接口
+ * 
+ * @author system
+ * @date 2025-11-26
+ */
+@Mapper
+public interface CheckPackageDetailMapper extends BaseMapper<CheckPackageDetail> {
+}
+

openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/CheckPackageMapper.java

@@ -0,0 +1,16 @@
+package com.openhis.check.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.check.domain.CheckPackage;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 检查套餐Mapper接口
+ *
+ * @author system
+ * @date 2025-07-22
+ */
+@Repository
+public interface CheckPackageMapper extends BaseMapper<CheckPackage> {
+
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/CheckPartMapper.java

@@ -0,0 +1,16 @@
+package com.openhis.check.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.check.domain.CheckPart;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 检查部位Mapper接口
+ *
+ * @author system
+ * @date 2025-07-22
+ */
+@Repository
+public interface CheckPartMapper extends BaseMapper<CheckPart> {
+
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/CheckTypeMapper.java

@@ -0,0 +1,16 @@
+package com.openhis.check.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.check.domain.CheckType;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 检查类型Mapper接口
+ *
+ * @author system
+ * @date 2025-07-22
+ */
+@Repository
+public interface CheckTypeMapper extends BaseMapper<CheckType> {
+
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/LisGroupInfoMapper.java

@@ -0,0 +1,9 @@
+package com.openhis.check.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.check.domain.LisGroupInfo;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface LisGroupInfoMapper extends BaseMapper<LisGroupInfo> {
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/check/mapper/PackageItemMapper.java

@@ -0,0 +1,16 @@
+package com.openhis.check.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.check.domain.PackageItem;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 套餐项目关系表Mapper接口
+ *
+ * @author system
+ * @date 2025-07-22
+ */
+@Repository
+public interface PackageItemMapper extends BaseMapper<PackageItem> {
+
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/ICheckMethodService.java

@@ -0,0 +1,14 @@
+package com.openhis.check.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.check.domain.CheckMethod;
+
+/**
+ * 检查方法Service接口
+ *
+ * @author system
+ * @date 2025-07-22
+ */
+public interface ICheckMethodService extends IService<CheckMethod> {
+
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/ICheckPackageDetailService.java

@@ -0,0 +1,14 @@
+package com.openhis.check.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.check.domain.CheckPackageDetail;
+
+/**
+ * 检查套餐明细Service接口
+ * 
+ * @author system
+ * @date 2025-11-26
+ */
+public interface ICheckPackageDetailService extends IService<CheckPackageDetail> {
+}
+

openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/ICheckPackageService.java

@@ -0,0 +1,14 @@
+package com.openhis.check.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.check.domain.CheckPackage;
+
+/**
+ * 检查套餐Service接口
+ *
+ * @author system
+ * @date 2025-07-22
+ */
+public interface ICheckPackageService extends IService<CheckPackage> {
+
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/ICheckPartService.java

@@ -0,0 +1,14 @@
+package com.openhis.check.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.check.domain.CheckPart;
+
+/**
+ * 检查部位Service接口
+ *
+ * @author system
+ * @date 2025-07-22
+ */
+public interface ICheckPartService extends IService<CheckPart> {
+
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/ICheckTypeService.java

@@ -0,0 +1,14 @@
+package com.openhis.check.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.check.domain.CheckType;
+
+/**
+ * 检查类型Service接口
+ *
+ * @author system
+ * @date 2025-07-22
+ */
+public interface ICheckTypeService extends IService<CheckType> {
+
+}