300，301，302预约挂号展示问题

- 修改 OutpatientPricingAppServiceImpl.java，确保仅返回划价标记为“是”的项目
- 修正 VitalSigns.java 中的表名为 "doc_vital_signs"

.agents/skills/ui-ux-pro-max/SKILL.md

@@ -1,386 +0,0 @@
----
-name: ui-ux-pro-max
-description: "UI/UX design intelligence. 50 styles, 21 palettes, 50 font pairings, 20 charts, 9 stacks (React, Next.js, Vue, Svelte, SwiftUI, React Native, Flutter, Tailwind, shadcn/ui). Actions: plan, build, create, design, implement, review, fix, improve, optimize, enhance, refactor, check UI/UX code. Projects: website, landing page, dashboard, admin panel, e-commerce, SaaS, portfolio, blog, mobile app, .html, .tsx, .vue, .svelte. Elements: button, modal, navbar, sidebar, card, table, form, chart. Styles: glassmorphism, claymorphism, minimalism, brutalism, neumorphism, bento grid, dark mode, responsive, skeuomorphism, flat design. Topics: color palette, accessibility, animation, layout, typography, font pairing, spacing, hover, shadow, gradient. Integrations: shadcn/ui MCP for component search and examples."
----
-
-# UI/UX Pro Max - Design Intelligence
-
-Comprehensive design guide for web and mobile applications. Contains 50+ styles, 97 color palettes, 57 font pairings, 99 UX guidelines, and 25 chart types across 9 technology stacks. Searchable database with priority-based recommendations.
-
-## When to Apply
-
-Reference these guidelines when:
-- Designing new UI components or pages
-- Choosing color palettes and typography
-- Reviewing code for UX issues
-- Building landing pages or dashboards
-- Implementing accessibility requirements
-
-## Rule Categories by Priority
-
-| Priority | Category | Impact | Domain |
-|----------|----------|--------|--------|
-| 1 | Accessibility | CRITICAL | `ux` |
-| 2 | Touch & Interaction | CRITICAL | `ux` |
-| 3 | Performance | HIGH | `ux` |
-| 4 | Layout & Responsive | HIGH | `ux` |
-| 5 | Typography & Color | MEDIUM | `typography`, `color` |
-| 6 | Animation | MEDIUM | `ux` |
-| 7 | Style Selection | MEDIUM | `style`, `product` |
-| 8 | Charts & Data | LOW | `chart` |
-
-## Quick Reference
-
-### 1. Accessibility (CRITICAL)
-
-- `color-contrast` - Minimum 4.5:1 ratio for normal text
-- `focus-states` - Visible focus rings on interactive elements
-- `alt-text` - Descriptive alt text for meaningful images
-- `aria-labels` - aria-label for icon-only buttons
-- `keyboard-nav` - Tab order matches visual order
-- `form-labels` - Use label with for attribute
-
-### 2. Touch & Interaction (CRITICAL)
-
-- `touch-target-size` - Minimum 44x44px touch targets
-- `hover-vs-tap` - Use click/tap for primary interactions
-- `loading-buttons` - Disable button during async operations
-- `error-feedback` - Clear error messages near problem
-- `cursor-pointer` - Add cursor-pointer to clickable elements
-
-### 3. Performance (HIGH)
-
-- `image-optimization` - Use WebP, srcset, lazy loading
-- `reduced-motion` - Check prefers-reduced-motion
-- `content-jumping` - Reserve space for async content
-
-### 4. Layout & Responsive (HIGH)
-
-- `viewport-meta` - width=device-width initial-scale=1
-- `readable-font-size` - Minimum 16px body text on mobile
-- `horizontal-scroll` - Ensure content fits viewport width
-- `z-index-management` - Define z-index scale (10, 20, 30, 50)
-
-### 5. Typography & Color (MEDIUM)
-
-- `line-height` - Use 1.5-1.75 for body text
-- `line-length` - Limit to 65-75 characters per line
-- `font-pairing` - Match heading/body font personalities
-
-### 6. Animation (MEDIUM)
-
-- `duration-timing` - Use 150-300ms for micro-interactions
-- `transform-performance` - Use transform/opacity, not width/height
-- `loading-states` - Skeleton screens or spinners
-
-### 7. Style Selection (MEDIUM)
-
-- `style-match` - Match style to product type
-- `consistency` - Use same style across all pages
-- `no-emoji-icons` - Use SVG icons, not emojis
-
-### 8. Charts & Data (LOW)
-
-- `chart-type` - Match chart type to data type
-- `color-guidance` - Use accessible color palettes
-- `data-table` - Provide table alternative for accessibility
-
-## How to Use
-
-Search specific domains using the CLI tool below.
-
----
-
-## Prerequisites
-
-Check if Python is installed:
-
-```bash
-python3 --version || python --version
-```
-
-If Python is not installed, install it based on user's OS:
-
-**macOS:**
-```bash
-brew install python3
-```
-
-**Ubuntu/Debian:**
-```bash
-sudo apt update && sudo apt install python3
-```
-
-**Windows:**
-```powershell
-winget install Python.Python.3.12
-```
-
----
-
-## How to Use This Skill
-
-When user requests UI/UX work (design, build, create, implement, review, fix, improve), follow this workflow:
-
-### Step 1: Analyze User Requirements
-
-Extract key information from user request:
-- **Product type**: SaaS, e-commerce, portfolio, dashboard, landing page, etc.
-- **Style keywords**: minimal, playful, professional, elegant, dark mode, etc.
-- **Industry**: healthcare, fintech, gaming, education, etc.
-- **Stack**: React, Vue, Next.js, or default to `html-tailwind`
-
-### Step 2: Generate Design System (REQUIRED)
-
-**Always start with `--design-system`** to get comprehensive recommendations with reasoning:
-
-```bash
-python3 skills/ui-ux-pro-max/scripts/search.py "<product_type> <industry> <keywords>" --design-system [-p "Project Name"]
-```
-
-This command:
-1. Searches 5 domains in parallel (product, style, color, landing, typography)
-2. Applies reasoning rules from `ui-reasoning.csv` to select best matches
-3. Returns complete design system: pattern, style, colors, typography, effects
-4. Includes anti-patterns to avoid
-
-**Example:**
-```bash
-python3 skills/ui-ux-pro-max/scripts/search.py "beauty spa wellness service" --design-system -p "Serenity Spa"
-```
-
-### Step 2b: Persist Design System (Master + Overrides Pattern)
-
-To save the design system for **hierarchical retrieval across sessions**, add `--persist`:
-
-```bash
-python3 skills/ui-ux-pro-max/scripts/search.py "<query>" --design-system --persist -p "Project Name"
-```
-
-This creates:
-- `design-system/MASTER.md` — Global Source of Truth with all design rules
-- `design-system/pages/` — Folder for page-specific overrides
-
-**With page-specific override:**
-```bash
-python3 skills/ui-ux-pro-max/scripts/search.py "<query>" --design-system --persist -p "Project Name" --page "dashboard"
-```
-
-This also creates:
-- `design-system/pages/dashboard.md` — Page-specific deviations from Master
-
-**How hierarchical retrieval works:**
-1. When building a specific page (e.g., "Checkout"), first check `design-system/pages/checkout.md`
-2. If the page file exists, its rules **override** the Master file
-3. If not, use `design-system/MASTER.md` exclusively
-
-**Context-aware retrieval prompt:**
-```
-I am building the [Page Name] page. Please read design-system/MASTER.md.
-Also check if design-system/pages/[page-name].md exists.
-If the page file exists, prioritize its rules.
-If not, use the Master rules exclusively.
-Now, generate the code...
-```
-
-### Step 3: Supplement with Detailed Searches (as needed)
-
-After getting the design system, use domain searches to get additional details:
-
-```bash
-python3 skills/ui-ux-pro-max/scripts/search.py "<keyword>" --domain <domain> [-n <max_results>]
-```
-
-**When to use detailed searches:**
-
-| Need | Domain | Example |
-|------|--------|---------|
-| More style options | `style` | `--domain style "glassmorphism dark"` |
-| Chart recommendations | `chart` | `--domain chart "real-time dashboard"` |
-| UX best practices | `ux` | `--domain ux "animation accessibility"` |
-| Alternative fonts | `typography` | `--domain typography "elegant luxury"` |
-| Landing structure | `landing` | `--domain landing "hero social-proof"` |
-
-### Step 4: Stack Guidelines (Default: html-tailwind)
-
-Get implementation-specific best practices. If user doesn't specify a stack, **default to `html-tailwind`**.
-
-```bash
-python3 skills/ui-ux-pro-max/scripts/search.py "<keyword>" --stack html-tailwind
-```
-
-Available stacks: `html-tailwind`, `react`, `nextjs`, `vue`, `svelte`, `swiftui`, `react-native`, `flutter`, `shadcn`, `jetpack-compose`
-
----
-
-## Search Reference
-
-### Available Domains
-
-| Domain | Use For | Example Keywords |
-|--------|---------|------------------|
-| `product` | Product type recommendations | SaaS, e-commerce, portfolio, healthcare, beauty, service |
-| `style` | UI styles, colors, effects | glassmorphism, minimalism, dark mode, brutalism |
-| `typography` | Font pairings, Google Fonts | elegant, playful, professional, modern |
-| `color` | Color palettes by product type | saas, ecommerce, healthcare, beauty, fintech, service |
-| `landing` | Page structure, CTA strategies | hero, hero-centric, testimonial, pricing, social-proof |
-| `chart` | Chart types, library recommendations | trend, comparison, timeline, funnel, pie |
-| `ux` | Best practices, anti-patterns | animation, accessibility, z-index, loading |
-| `react` | React/Next.js performance | waterfall, bundle, suspense, memo, rerender, cache |
-| `web` | Web interface guidelines | aria, focus, keyboard, semantic, virtualize |
-| `prompt` | AI prompts, CSS keywords | (style name) |
-
-### Available Stacks
-
-| Stack | Focus |
-|-------|-------|
-| `html-tailwind` | Tailwind utilities, responsive, a11y (DEFAULT) |
-| `react` | State, hooks, performance, patterns |
-| `nextjs` | SSR, routing, images, API routes |
-| `vue` | Composition API, Pinia, Vue Router |
-| `svelte` | Runes, stores, SvelteKit |
-| `swiftui` | Views, State, Navigation, Animation |
-| `react-native` | Components, Navigation, Lists |
-| `flutter` | Widgets, State, Layout, Theming |
-| `shadcn` | shadcn/ui components, theming, forms, patterns |
-| `jetpack-compose` | Composables, Modifiers, State Hoisting, Recomposition |
-
----
-
-## Example Workflow
-
-**User request:** "Làm landing page cho dịch vụ chăm sóc da chuyên nghiệp"
-
-### Step 1: Analyze Requirements
-- Product type: Beauty/Spa service
-- Style keywords: elegant, professional, soft
-- Industry: Beauty/Wellness
-- Stack: html-tailwind (default)
-
-### Step 2: Generate Design System (REQUIRED)
-
-```bash
-python3 skills/ui-ux-pro-max/scripts/search.py "beauty spa wellness service elegant" --design-system -p "Serenity Spa"
-```
-
-**Output:** Complete design system with pattern, style, colors, typography, effects, and anti-patterns.
-
-### Step 3: Supplement with Detailed Searches (as needed)
-
-```bash
-# Get UX guidelines for animation and accessibility
-python3 skills/ui-ux-pro-max/scripts/search.py "animation accessibility" --domain ux
-
-# Get alternative typography options if needed
-python3 skills/ui-ux-pro-max/scripts/search.py "elegant luxury serif" --domain typography
-```
-
-### Step 4: Stack Guidelines
-
-```bash
-python3 skills/ui-ux-pro-max/scripts/search.py "layout responsive form" --stack html-tailwind
-```
-
-**Then:** Synthesize design system + detailed searches and implement the design.
-
----
-
-## Output Formats
-
-The `--design-system` flag supports two output formats:
-
-```bash
-# ASCII box (default) - best for terminal display
-python3 skills/ui-ux-pro-max/scripts/search.py "fintech crypto" --design-system
-
-# Markdown - best for documentation
-python3 skills/ui-ux-pro-max/scripts/search.py "fintech crypto" --design-system -f markdown
-```
-
----
-
-## Tips for Better Results
-
-1. **Be specific with keywords** - "healthcare SaaS dashboard" > "app"
-2. **Search multiple times** - Different keywords reveal different insights
-3. **Combine domains** - Style + Typography + Color = Complete design system
-4. **Always check UX** - Search "animation", "z-index", "accessibility" for common issues
-5. **Use stack flag** - Get implementation-specific best practices
-6. **Iterate** - If first search doesn't match, try different keywords
-
----
-
-## Common Rules for Professional UI
-
-These are frequently overlooked issues that make UI look unprofessional:
-
-### Icons & Visual Elements
-
-| Rule | Do | Don't |
-|------|----|----- |
-| **No emoji icons** | Use SVG icons (Heroicons, Lucide, Simple Icons) | Use emojis like 🎨 🚀 ⚙️ as UI icons |
-| **Stable hover states** | Use color/opacity transitions on hover | Use scale transforms that shift layout |
-| **Correct brand logos** | Research official SVG from Simple Icons | Guess or use incorrect logo paths |
-| **Consistent icon sizing** | Use fixed viewBox (24x24) with w-6 h-6 | Mix different icon sizes randomly |
-
-### Interaction & Cursor
-
-| Rule | Do | Don't |
-|------|----|----- |
-| **Cursor pointer** | Add `cursor-pointer` to all clickable/hoverable cards | Leave default cursor on interactive elements |
-| **Hover feedback** | Provide visual feedback (color, shadow, border) | No indication element is interactive |
-| **Smooth transitions** | Use `transition-colors duration-200` | Instant state changes or too slow (>500ms) |
-
-### Light/Dark Mode Contrast
-
-| Rule | Do | Don't |
-|------|----|----- |
-| **Glass card light mode** | Use `bg-white/80` or higher opacity | Use `bg-white/10` (too transparent) |
-| **Text contrast light** | Use `#0F172A` (slate-900) for text | Use `#94A3B8` (slate-400) for body text |
-| **Muted text light** | Use `#475569` (slate-600) minimum | Use gray-400 or lighter |
-| **Border visibility** | Use `border-gray-200` in light mode | Use `border-white/10` (invisible) |
-
-### Layout & Spacing
-
-| Rule | Do | Don't |
-|------|----|----- |
-| **Floating navbar** | Add `top-4 left-4 right-4` spacing | Stick navbar to `top-0 left-0 right-0` |
-| **Content padding** | Account for fixed navbar height | Let content hide behind fixed elements |
-| **Consistent max-width** | Use same `max-w-6xl` or `max-w-7xl` | Mix different container widths |
-
----
-
-## Pre-Delivery Checklist
-
-Before delivering UI code, verify these items:
-
-### Visual Quality
-- [ ] No emojis used as icons (use SVG instead)
-- [ ] All icons from consistent icon set (Heroicons/Lucide)
-- [ ] Brand logos are correct (verified from Simple Icons)
-- [ ] Hover states don't cause layout shift
-- [ ] Use theme colors directly (bg-primary) not var() wrapper
-
-### Interaction
-- [ ] All clickable elements have `cursor-pointer`
-- [ ] Hover states provide clear visual feedback
-- [ ] Transitions are smooth (150-300ms)
-- [ ] Focus states visible for keyboard navigation
-
-### Light/Dark Mode
-- [ ] Light mode text has sufficient contrast (4.5:1 minimum)
-- [ ] Glass/transparent elements visible in light mode
-- [ ] Borders visible in both modes
-- [ ] Test both modes before delivery
-
-### Layout
-- [ ] Floating elements have proper spacing from edges
-- [ ] No content hidden behind fixed navbars
-- [ ] Responsive at 375px, 768px, 1024px, 1440px
-- [ ] No horizontal scroll on mobile
-
-### Accessibility
-- [ ] All images have alt text
-- [ ] Form inputs have labels
-- [ ] Color is not the only indicator
-- [ ] `prefers-reduced-motion` respected

.agents/skills/ui-ux-pro-max/data

@@ -1 +0,0 @@
-../../../src/ui-ux-pro-max/data

.agents/skills/ui-ux-pro-max/scripts

@@ -1 +0,0 @@
-../../../src/ui-ux-pro-max/scripts

.agents/skills/web-design-guidelines/SKILL.md

@@ -1,39 +0,0 @@
----
-name: web-design-guidelines
-description: Review UI code for Web Interface Guidelines compliance. Use when asked to "review my UI", "check accessibility", "audit design", "review UX", or "check my site against best practices".
-metadata:
-  author: vercel
-  version: "1.0.0"
-  argument-hint: <file-or-pattern>
----
-
-# Web Interface Guidelines
-
-Review files for compliance with Web Interface Guidelines.
-
-## How It Works
-
-1. Fetch the latest guidelines from the source URL below
-2. Read the specified files (or prompt user for files/pattern)
-3. Check against all rules in the fetched guidelines
-4. Output findings in the terse `file:line` format
-
-## Guidelines Source
-
-Fetch fresh guidelines before each review:
-
-```
-https://raw.githubusercontent.com/vercel-labs/web-interface-guidelines/main/command.md
-```
-
-Use WebFetch to retrieve the latest rules. The fetched content contains all the rules and output format instructions.
-
-## Usage
-
-When a user provides a file or pattern argument:
-1. Fetch guidelines from the source URL above
-2. Read the specified files
-3. Apply all rules from the fetched guidelines
-4. Output findings using the format specified in the guidelines
-
-If no files specified, ask the user which files to review.

.agents/skills/xlsx/LICENSE.txt

@@ -1,30 +0,0 @@
-© 2025 Anthropic, PBC. All rights reserved.
-
-LICENSE: Use of these materials (including all code, prompts, assets, files,
-and other components of this Skill) is governed by your agreement with
-Anthropic regarding use of Anthropic's services. If no separate agreement
-exists, use is governed by Anthropic's Consumer Terms of Service or
-Commercial Terms of Service, as applicable:
-https://www.anthropic.com/legal/consumer-terms
-https://www.anthropic.com/legal/commercial-terms
-Your applicable agreement is referred to as the "Agreement." "Services" are
-as defined in the Agreement.
-
-ADDITIONAL RESTRICTIONS: Notwithstanding anything in the Agreement to the
-contrary, users may not:
-
-- Extract these materials from the Services or retain copies of these
-  materials outside the Services
-- Reproduce or copy these materials, except for temporary copies created
-  automatically during authorized use of the Services
-- Create derivative works based on these materials
-- Distribute, sublicense, or transfer these materials to any third party
-- Make, offer to sell, sell, or import any inventions embodied in these
-  materials
-- Reverse engineer, decompile, or disassemble these materials
-
-The receipt, viewing, or possession of these materials does not convey or
-imply any license or right beyond those expressly granted above.
-
-Anthropic retains all right, title, and interest in these materials,
-including all copyrights, patents, and other intellectual property rights.

.agents/skills/xlsx/SKILL.md

@@ -1,292 +0,0 @@
----
-name: xlsx
-description: "Use this skill any time a spreadsheet file is the primary input or output. This means any task where the user wants to: open, read, edit, or fix an existing .xlsx, .xlsm, .csv, or .tsv file (e.g., adding columns, computing formulas, formatting, charting, cleaning messy data); create a new spreadsheet from scratch or from other data sources; or convert between tabular file formats. Trigger especially when the user references a spreadsheet file by name or path — even casually (like \"the xlsx in my downloads\") — and wants something done to it or produced from it. Also trigger for cleaning or restructuring messy tabular data files (malformed rows, misplaced headers, junk data) into proper spreadsheets. The deliverable must be a spreadsheet file. Do NOT trigger when the primary deliverable is a Word document, HTML report, standalone Python script, database pipeline, or Google Sheets API integration, even if tabular data is involved."
-license: Proprietary. LICENSE.txt has complete terms
----
-
-# Requirements for Outputs
-
-## All Excel files
-
-### Professional Font
-- Use a consistent, professional font (e.g., Arial, Times New Roman) for all deliverables unless otherwise instructed by the user
-
-### Zero Formula Errors
-- Every Excel model MUST be delivered with ZERO formula errors (#REF!, #DIV/0!, #VALUE!, #N/A, #NAME?)
-
-### Preserve Existing Templates (when updating templates)
-- Study and EXACTLY match existing format, style, and conventions when modifying files
-- Never impose standardized formatting on files with established patterns
-- Existing template conventions ALWAYS override these guidelines
-
-## Financial models
-
-### Color Coding Standards
-Unless otherwise stated by the user or existing template
-
-#### Industry-Standard Color Conventions
-- **Blue text (RGB: 0,0,255)**: Hardcoded inputs, and numbers users will change for scenarios
-- **Black text (RGB: 0,0,0)**: ALL formulas and calculations
-- **Green text (RGB: 0,128,0)**: Links pulling from other worksheets within same workbook
-- **Red text (RGB: 255,0,0)**: External links to other files
-- **Yellow background (RGB: 255,255,0)**: Key assumptions needing attention or cells that need to be updated
-
-### Number Formatting Standards
-
-#### Required Format Rules
-- **Years**: Format as text strings (e.g., "2024" not "2,024")
-- **Currency**: Use $#,##0 format; ALWAYS specify units in headers ("Revenue ($mm)")
-- **Zeros**: Use number formatting to make all zeros "-", including percentages (e.g., "$#,##0;($#,##0);-")
-- **Percentages**: Default to 0.0% format (one decimal)
-- **Multiples**: Format as 0.0x for valuation multiples (EV/EBITDA, P/E)
-- **Negative numbers**: Use parentheses (123) not minus -123
-
-### Formula Construction Rules
-
-#### Assumptions Placement
-- Place ALL assumptions (growth rates, margins, multiples, etc.) in separate assumption cells
-- Use cell references instead of hardcoded values in formulas
-- Example: Use =B5*(1+$B$6) instead of =B5*1.05
-
-#### Formula Error Prevention
-- Verify all cell references are correct
-- Check for off-by-one errors in ranges
-- Ensure consistent formulas across all projection periods
-- Test with edge cases (zero values, negative numbers)
-- Verify no unintended circular references
-
-#### Documentation Requirements for Hardcodes
-- Comment or in cells beside (if end of table). Format: "Source: [System/Document], [Date], [Specific Reference], [URL if applicable]"
-- Examples:
-  - "Source: Company 10-K, FY2024, Page 45, Revenue Note, [SEC EDGAR URL]"
-  - "Source: Company 10-Q, Q2 2025, Exhibit 99.1, [SEC EDGAR URL]"
-  - "Source: Bloomberg Terminal, 8/15/2025, AAPL US Equity"
-  - "Source: FactSet, 8/20/2025, Consensus Estimates Screen"
-
-# XLSX creation, editing, and analysis
-
-## Overview
-
-A user may ask you to create, edit, or analyze the contents of an .xlsx file. You have different tools and workflows available for different tasks.
-
-## Important Requirements
-
-**LibreOffice Required for Formula Recalculation**: You can assume LibreOffice is installed for recalculating formula values using the `scripts/recalc.py` script. The script automatically configures LibreOffice on first run, including in sandboxed environments where Unix sockets are restricted (handled by `scripts/office/soffice.py`)
-
-## Reading and analyzing data
-
-### Data analysis with pandas
-For data analysis, visualization, and basic operations, use **pandas** which provides powerful data manipulation capabilities:
-
-```python
-import pandas as pd
-
-# Read Excel
-df = pd.read_excel('file.xlsx')  # Default: first sheet
-all_sheets = pd.read_excel('file.xlsx', sheet_name=None)  # All sheets as dict
-
-# Analyze
-df.head()      # Preview data
-df.info()      # Column info
-df.describe()  # Statistics
-
-# Write Excel
-df.to_excel('output.xlsx', index=False)
-```
-
-## Excel File Workflows
-
-## CRITICAL: Use Formulas, Not Hardcoded Values
-
-**Always use Excel formulas instead of calculating values in Python and hardcoding them.** This ensures the spreadsheet remains dynamic and updateable.
-
-### ❌ WRONG - Hardcoding Calculated Values
-```python
-# Bad: Calculating in Python and hardcoding result
-total = df['Sales'].sum()
-sheet['B10'] = total  # Hardcodes 5000
-
-# Bad: Computing growth rate in Python
-growth = (df.iloc[-1]['Revenue'] - df.iloc[0]['Revenue']) / df.iloc[0]['Revenue']
-sheet['C5'] = growth  # Hardcodes 0.15
-
-# Bad: Python calculation for average
-avg = sum(values) / len(values)
-sheet['D20'] = avg  # Hardcodes 42.5
-```
-
-### ✅ CORRECT - Using Excel Formulas
-```python
-# Good: Let Excel calculate the sum
-sheet['B10'] = '=SUM(B2:B9)'
-
-# Good: Growth rate as Excel formula
-sheet['C5'] = '=(C4-C2)/C2'
-
-# Good: Average using Excel function
-sheet['D20'] = '=AVERAGE(D2:D19)'
-```
-
-This applies to ALL calculations - totals, percentages, ratios, differences, etc. The spreadsheet should be able to recalculate when source data changes.
-
-## Common Workflow
-1. **Choose tool**: pandas for data, openpyxl for formulas/formatting
-2. **Create/Load**: Create new workbook or load existing file
-3. **Modify**: Add/edit data, formulas, and formatting
-4. **Save**: Write to file
-5. **Recalculate formulas (MANDATORY IF USING FORMULAS)**: Use the scripts/recalc.py script
-   ```bash
-   python scripts/recalc.py output.xlsx
-   ```
-6. **Verify and fix any errors**: 
-   - The script returns JSON with error details
-   - If `status` is `errors_found`, check `error_summary` for specific error types and locations
-   - Fix the identified errors and recalculate again
-   - Common errors to fix:
-     - `#REF!`: Invalid cell references
-     - `#DIV/0!`: Division by zero
-     - `#VALUE!`: Wrong data type in formula
-     - `#NAME?`: Unrecognized formula name
-
-### Creating new Excel files
-
-```python
-# Using openpyxl for formulas and formatting
-from openpyxl import Workbook
-from openpyxl.styles import Font, PatternFill, Alignment
-
-wb = Workbook()
-sheet = wb.active
-
-# Add data
-sheet['A1'] = 'Hello'
-sheet['B1'] = 'World'
-sheet.append(['Row', 'of', 'data'])
-
-# Add formula
-sheet['B2'] = '=SUM(A1:A10)'
-
-# Formatting
-sheet['A1'].font = Font(bold=True, color='FF0000')
-sheet['A1'].fill = PatternFill('solid', start_color='FFFF00')
-sheet['A1'].alignment = Alignment(horizontal='center')
-
-# Column width
-sheet.column_dimensions['A'].width = 20
-
-wb.save('output.xlsx')
-```
-
-### Editing existing Excel files
-
-```python
-# Using openpyxl to preserve formulas and formatting
-from openpyxl import load_workbook
-
-# Load existing file
-wb = load_workbook('existing.xlsx')
-sheet = wb.active  # or wb['SheetName'] for specific sheet
-
-# Working with multiple sheets
-for sheet_name in wb.sheetnames:
-    sheet = wb[sheet_name]
-    print(f"Sheet: {sheet_name}")
-
-# Modify cells
-sheet['A1'] = 'New Value'
-sheet.insert_rows(2)  # Insert row at position 2
-sheet.delete_cols(3)  # Delete column 3
-
-# Add new sheet
-new_sheet = wb.create_sheet('NewSheet')
-new_sheet['A1'] = 'Data'
-
-wb.save('modified.xlsx')
-```
-
-## Recalculating formulas
-
-Excel files created or modified by openpyxl contain formulas as strings but not calculated values. Use the provided `scripts/recalc.py` script to recalculate formulas:
-
-```bash
-python scripts/recalc.py <excel_file> [timeout_seconds]
-```
-
-Example:
-```bash
-python scripts/recalc.py output.xlsx 30
-```
-
-The script:
-- Automatically sets up LibreOffice macro on first run
-- Recalculates all formulas in all sheets
-- Scans ALL cells for Excel errors (#REF!, #DIV/0!, etc.)
-- Returns JSON with detailed error locations and counts
-- Works on both Linux and macOS
-
-## Formula Verification Checklist
-
-Quick checks to ensure formulas work correctly:
-
-### Essential Verification
-- [ ] **Test 2-3 sample references**: Verify they pull correct values before building full model
-- [ ] **Column mapping**: Confirm Excel columns match (e.g., column 64 = BL, not BK)
-- [ ] **Row offset**: Remember Excel rows are 1-indexed (DataFrame row 5 = Excel row 6)
-
-### Common Pitfalls
-- [ ] **NaN handling**: Check for null values with `pd.notna()`
-- [ ] **Far-right columns**: FY data often in columns 50+ 
-- [ ] **Multiple matches**: Search all occurrences, not just first
-- [ ] **Division by zero**: Check denominators before using `/` in formulas (#DIV/0!)
-- [ ] **Wrong references**: Verify all cell references point to intended cells (#REF!)
-- [ ] **Cross-sheet references**: Use correct format (Sheet1!A1) for linking sheets
-
-### Formula Testing Strategy
-- [ ] **Start small**: Test formulas on 2-3 cells before applying broadly
-- [ ] **Verify dependencies**: Check all cells referenced in formulas exist
-- [ ] **Test edge cases**: Include zero, negative, and very large values
-
-### Interpreting scripts/recalc.py Output
-The script returns JSON with error details:
-```json
-{
-  "status": "success",           // or "errors_found"
-  "total_errors": 0,              // Total error count
-  "total_formulas": 42,           // Number of formulas in file
-  "error_summary": {              // Only present if errors found
-    "#REF!": {
-      "count": 2,
-      "locations": ["Sheet1!B5", "Sheet1!C10"]
-    }
-  }
-}
-```
-
-## Best Practices
-
-### Library Selection
-- **pandas**: Best for data analysis, bulk operations, and simple data export
-- **openpyxl**: Best for complex formatting, formulas, and Excel-specific features
-
-### Working with openpyxl
-- Cell indices are 1-based (row=1, column=1 refers to cell A1)
-- Use `data_only=True` to read calculated values: `load_workbook('file.xlsx', data_only=True)`
-- **Warning**: If opened with `data_only=True` and saved, formulas are replaced with values and permanently lost
-- For large files: Use `read_only=True` for reading or `write_only=True` for writing
-- Formulas are preserved but not evaluated - use scripts/recalc.py to update values
-
-### Working with pandas
-- Specify data types to avoid inference issues: `pd.read_excel('file.xlsx', dtype={'id': str})`
-- For large files, read specific columns: `pd.read_excel('file.xlsx', usecols=['A', 'C', 'E'])`
-- Handle dates properly: `pd.read_excel('file.xlsx', parse_dates=['date_column'])`
-
-## Code Style Guidelines
-**IMPORTANT**: When generating Python code for Excel operations:
-- Write minimal, concise Python code without unnecessary comments
-- Avoid verbose variable names and redundant operations
-- Avoid unnecessary print statements
-
-**For Excel files themselves**:
-- Add comments to cells with complex formulas or important assumptions
-- Document data sources for hardcoded values
-- Include notes for key calculations and model sections

.agents/skills/xlsx/scripts/office/helpers/merge_runs.py

@@ -1,199 +0,0 @@
-"""Merge adjacent runs with identical formatting in DOCX.
-
-Merges adjacent <w:r> elements that have identical <w:rPr> properties.
-Works on runs in paragraphs and inside tracked changes (<w:ins>, <w:del>).
-
-Also:
-- Removes rsid attributes from runs (revision metadata that doesn't affect rendering)
-- Removes proofErr elements (spell/grammar markers that block merging)
-"""
-
-from pathlib import Path
-
-import defusedxml.minidom
-
-
-def merge_runs(input_dir: str) -> tuple[int, str]:
-    doc_xml = Path(input_dir) / "word" / "document.xml"
-
-    if not doc_xml.exists():
-        return 0, f"Error: {doc_xml} not found"
-
-    try:
-        dom = defusedxml.minidom.parseString(doc_xml.read_text(encoding="utf-8"))
-        root = dom.documentElement
-
-        _remove_elements(root, "proofErr")
-        _strip_run_rsid_attrs(root)
-
-        containers = {run.parentNode for run in _find_elements(root, "r")}
-
-        merge_count = 0
-        for container in containers:
-            merge_count += _merge_runs_in(container)
-
-        doc_xml.write_bytes(dom.toxml(encoding="UTF-8"))
-        return merge_count, f"Merged {merge_count} runs"
-
-    except Exception as e:
-        return 0, f"Error: {e}"
-
-
-
-
-def _find_elements(root, tag: str) -> list:
-    results = []
-
-    def traverse(node):
-        if node.nodeType == node.ELEMENT_NODE:
-            name = node.localName or node.tagName
-            if name == tag or name.endswith(f":{tag}"):
-                results.append(node)
-            for child in node.childNodes:
-                traverse(child)
-
-    traverse(root)
-    return results
-
-
-def _get_child(parent, tag: str):
-    for child in parent.childNodes:
-        if child.nodeType == child.ELEMENT_NODE:
-            name = child.localName or child.tagName
-            if name == tag or name.endswith(f":{tag}"):
-                return child
-    return None
-
-
-def _get_children(parent, tag: str) -> list:
-    results = []
-    for child in parent.childNodes:
-        if child.nodeType == child.ELEMENT_NODE:
-            name = child.localName or child.tagName
-            if name == tag or name.endswith(f":{tag}"):
-                results.append(child)
-    return results
-
-
-def _is_adjacent(elem1, elem2) -> bool:
-    node = elem1.nextSibling
-    while node:
-        if node == elem2:
-            return True
-        if node.nodeType == node.ELEMENT_NODE:
-            return False
-        if node.nodeType == node.TEXT_NODE and node.data.strip():
-            return False
-        node = node.nextSibling
-    return False
-
-
-
-
-def _remove_elements(root, tag: str):
-    for elem in _find_elements(root, tag):
-        if elem.parentNode:
-            elem.parentNode.removeChild(elem)
-
-
-def _strip_run_rsid_attrs(root):
-    for run in _find_elements(root, "r"):
-        for attr in list(run.attributes.values()):
-            if "rsid" in attr.name.lower():
-                run.removeAttribute(attr.name)
-
-
-
-
-def _merge_runs_in(container) -> int:
-    merge_count = 0
-    run = _first_child_run(container)
-
-    while run:
-        while True:
-            next_elem = _next_element_sibling(run)
-            if next_elem and _is_run(next_elem) and _can_merge(run, next_elem):
-                _merge_run_content(run, next_elem)
-                container.removeChild(next_elem)
-                merge_count += 1
-            else:
-                break
-
-        _consolidate_text(run)
-        run = _next_sibling_run(run)
-
-    return merge_count
-
-
-def _first_child_run(container):
-    for child in container.childNodes:
-        if child.nodeType == child.ELEMENT_NODE and _is_run(child):
-            return child
-    return None
-
-
-def _next_element_sibling(node):
-    sibling = node.nextSibling
-    while sibling:
-        if sibling.nodeType == sibling.ELEMENT_NODE:
-            return sibling
-        sibling = sibling.nextSibling
-    return None
-
-
-def _next_sibling_run(node):
-    sibling = node.nextSibling
-    while sibling:
-        if sibling.nodeType == sibling.ELEMENT_NODE:
-            if _is_run(sibling):
-                return sibling
-        sibling = sibling.nextSibling
-    return None
-
-
-def _is_run(node) -> bool:
-    name = node.localName or node.tagName
-    return name == "r" or name.endswith(":r")
-
-
-def _can_merge(run1, run2) -> bool:
-    rpr1 = _get_child(run1, "rPr")
-    rpr2 = _get_child(run2, "rPr")
-
-    if (rpr1 is None) != (rpr2 is None):
-        return False
-    if rpr1 is None:
-        return True
-    return rpr1.toxml() == rpr2.toxml()  
-
-
-def _merge_run_content(target, source):
-    for child in list(source.childNodes):
-        if child.nodeType == child.ELEMENT_NODE:
-            name = child.localName or child.tagName
-            if name != "rPr" and not name.endswith(":rPr"):
-                target.appendChild(child)
-
-
-def _consolidate_text(run):
-    t_elements = _get_children(run, "t")
-
-    for i in range(len(t_elements) - 1, 0, -1):
-        curr, prev = t_elements[i], t_elements[i - 1]
-
-        if _is_adjacent(prev, curr):
-            prev_text = prev.firstChild.data if prev.firstChild else ""
-            curr_text = curr.firstChild.data if curr.firstChild else ""
-            merged = prev_text + curr_text
-
-            if prev.firstChild:
-                prev.firstChild.data = merged
-            else:
-                prev.appendChild(run.ownerDocument.createTextNode(merged))
-
-            if merged.startswith(" ") or merged.endswith(" "):
-                prev.setAttribute("xml:space", "preserve")
-            elif prev.hasAttribute("xml:space"):
-                prev.removeAttribute("xml:space")
-
-            run.removeChild(curr)

.agents/skills/xlsx/scripts/office/helpers/simplify_redlines.py

@@ -1,197 +0,0 @@
-"""Simplify tracked changes by merging adjacent w:ins or w:del elements.
-
-Merges adjacent <w:ins> elements from the same author into a single element.
-Same for <w:del> elements. This makes heavily-redlined documents easier to
-work with by reducing the number of tracked change wrappers.
-
-Rules:
-- Only merges w:ins with w:ins, w:del with w:del (same element type)
-- Only merges if same author (ignores timestamp differences)
-- Only merges if truly adjacent (only whitespace between them)
-"""
-
-import xml.etree.ElementTree as ET
-import zipfile
-from pathlib import Path
-
-import defusedxml.minidom
-
-WORD_NS = "http://schemas.openxmlformats.org/wordprocessingml/2006/main"
-
-
-def simplify_redlines(input_dir: str) -> tuple[int, str]:
-    doc_xml = Path(input_dir) / "word" / "document.xml"
-
-    if not doc_xml.exists():
-        return 0, f"Error: {doc_xml} not found"
-
-    try:
-        dom = defusedxml.minidom.parseString(doc_xml.read_text(encoding="utf-8"))
-        root = dom.documentElement
-
-        merge_count = 0
-
-        containers = _find_elements(root, "p") + _find_elements(root, "tc")
-
-        for container in containers:
-            merge_count += _merge_tracked_changes_in(container, "ins")
-            merge_count += _merge_tracked_changes_in(container, "del")
-
-        doc_xml.write_bytes(dom.toxml(encoding="UTF-8"))
-        return merge_count, f"Simplified {merge_count} tracked changes"
-
-    except Exception as e:
-        return 0, f"Error: {e}"
-
-
-def _merge_tracked_changes_in(container, tag: str) -> int:
-    merge_count = 0
-
-    tracked = [
-        child
-        for child in container.childNodes
-        if child.nodeType == child.ELEMENT_NODE and _is_element(child, tag)
-    ]
-
-    if len(tracked) < 2:
-        return 0
-
-    i = 0
-    while i < len(tracked) - 1:
-        curr = tracked[i]
-        next_elem = tracked[i + 1]
-
-        if _can_merge_tracked(curr, next_elem):
-            _merge_tracked_content(curr, next_elem)
-            container.removeChild(next_elem)
-            tracked.pop(i + 1)
-            merge_count += 1
-        else:
-            i += 1
-
-    return merge_count
-
-
-def _is_element(node, tag: str) -> bool:
-    name = node.localName or node.tagName
-    return name == tag or name.endswith(f":{tag}")
-
-
-def _get_author(elem) -> str:
-    author = elem.getAttribute("w:author")
-    if not author:
-        for attr in elem.attributes.values():
-            if attr.localName == "author" or attr.name.endswith(":author"):
-                return attr.value
-    return author
-
-
-def _can_merge_tracked(elem1, elem2) -> bool:
-    if _get_author(elem1) != _get_author(elem2):
-        return False
-
-    node = elem1.nextSibling
-    while node and node != elem2:
-        if node.nodeType == node.ELEMENT_NODE:
-            return False
-        if node.nodeType == node.TEXT_NODE and node.data.strip():
-            return False
-        node = node.nextSibling
-
-    return True
-
-
-def _merge_tracked_content(target, source):
-    while source.firstChild:
-        child = source.firstChild
-        source.removeChild(child)
-        target.appendChild(child)
-
-
-def _find_elements(root, tag: str) -> list:
-    results = []
-
-    def traverse(node):
-        if node.nodeType == node.ELEMENT_NODE:
-            name = node.localName or node.tagName
-            if name == tag or name.endswith(f":{tag}"):
-                results.append(node)
-            for child in node.childNodes:
-                traverse(child)
-
-    traverse(root)
-    return results
-
-
-def get_tracked_change_authors(doc_xml_path: Path) -> dict[str, int]:
-    if not doc_xml_path.exists():
-        return {}
-
-    try:
-        tree = ET.parse(doc_xml_path)
-        root = tree.getroot()
-    except ET.ParseError:
-        return {}
-
-    namespaces = {"w": WORD_NS}
-    author_attr = f"{{{WORD_NS}}}author"
-
-    authors: dict[str, int] = {}
-    for tag in ["ins", "del"]:
-        for elem in root.findall(f".//w:{tag}", namespaces):
-            author = elem.get(author_attr)
-            if author:
-                authors[author] = authors.get(author, 0) + 1
-
-    return authors
-
-
-def _get_authors_from_docx(docx_path: Path) -> dict[str, int]:
-    try:
-        with zipfile.ZipFile(docx_path, "r") as zf:
-            if "word/document.xml" not in zf.namelist():
-                return {}
-            with zf.open("word/document.xml") as f:
-                tree = ET.parse(f)
-                root = tree.getroot()
-
-                namespaces = {"w": WORD_NS}
-                author_attr = f"{{{WORD_NS}}}author"
-
-                authors: dict[str, int] = {}
-                for tag in ["ins", "del"]:
-                    for elem in root.findall(f".//w:{tag}", namespaces):
-                        author = elem.get(author_attr)
-                        if author:
-                            authors[author] = authors.get(author, 0) + 1
-                return authors
-    except (zipfile.BadZipFile, ET.ParseError):
-        return {}
-
-
-def infer_author(modified_dir: Path, original_docx: Path, default: str = "Claude") -> str:
-    modified_xml = modified_dir / "word" / "document.xml"
-    modified_authors = get_tracked_change_authors(modified_xml)
-
-    if not modified_authors:
-        return default
-
-    original_authors = _get_authors_from_docx(original_docx)
-
-    new_changes: dict[str, int] = {}
-    for author, count in modified_authors.items():
-        original_count = original_authors.get(author, 0)
-        diff = count - original_count
-        if diff > 0:
-            new_changes[author] = diff
-
-    if not new_changes:
-        return default
-
-    if len(new_changes) == 1:
-        return next(iter(new_changes))
-
-    raise ValueError(
-        f"Multiple authors added new changes: {new_changes}. "
-        "Cannot infer which author to validate."
-    )

.agents/skills/xlsx/scripts/office/pack.py

@@ -1,159 +0,0 @@
-"""Pack a directory into a DOCX, PPTX, or XLSX file.
-
-Validates with auto-repair, condenses XML formatting, and creates the Office file.
-
-Usage:
-    python pack.py <input_directory> <output_file> [--original <file>] [--validate true|false]
-
-Examples:
-    python pack.py unpacked/ output.docx --original input.docx
-    python pack.py unpacked/ output.pptx --validate false
-"""
-
-import argparse
-import sys
-import shutil
-import tempfile
-import zipfile
-from pathlib import Path
-
-import defusedxml.minidom
-
-from validators import DOCXSchemaValidator, PPTXSchemaValidator, RedliningValidator
-
-def pack(
-    input_directory: str,
-    output_file: str,
-    original_file: str | None = None,
-    validate: bool = True,
-    infer_author_func=None,
-) -> tuple[None, str]:
-    input_dir = Path(input_directory)
-    output_path = Path(output_file)
-    suffix = output_path.suffix.lower()
-
-    if not input_dir.is_dir():
-        return None, f"Error: {input_dir} is not a directory"
-
-    if suffix not in {".docx", ".pptx", ".xlsx"}:
-        return None, f"Error: {output_file} must be a .docx, .pptx, or .xlsx file"
-
-    if validate and original_file:
-        original_path = Path(original_file)
-        if original_path.exists():
-            success, output = _run_validation(
-                input_dir, original_path, suffix, infer_author_func
-            )
-            if output:
-                print(output)
-            if not success:
-                return None, f"Error: Validation failed for {input_dir}"
-
-    with tempfile.TemporaryDirectory() as temp_dir:
-        temp_content_dir = Path(temp_dir) / "content"
-        shutil.copytree(input_dir, temp_content_dir)
-
-        for pattern in ["*.xml", "*.rels"]:
-            for xml_file in temp_content_dir.rglob(pattern):
-                _condense_xml(xml_file)
-
-        output_path.parent.mkdir(parents=True, exist_ok=True)
-        with zipfile.ZipFile(output_path, "w", zipfile.ZIP_DEFLATED) as zf:
-            for f in temp_content_dir.rglob("*"):
-                if f.is_file():
-                    zf.write(f, f.relative_to(temp_content_dir))
-
-    return None, f"Successfully packed {input_dir} to {output_file}"
-
-
-def _run_validation(
-    unpacked_dir: Path,
-    original_file: Path,
-    suffix: str,
-    infer_author_func=None,
-) -> tuple[bool, str | None]:
-    output_lines = []
-    validators = []
-
-    if suffix == ".docx":
-        author = "Claude"
-        if infer_author_func:
-            try:
-                author = infer_author_func(unpacked_dir, original_file)
-            except ValueError as e:
-                print(f"Warning: {e} Using default author 'Claude'.", file=sys.stderr)
-
-        validators = [
-            DOCXSchemaValidator(unpacked_dir, original_file),
-            RedliningValidator(unpacked_dir, original_file, author=author),
-        ]
-    elif suffix == ".pptx":
-        validators = [PPTXSchemaValidator(unpacked_dir, original_file)]
-
-    if not validators:
-        return True, None
-
-    total_repairs = sum(v.repair() for v in validators)
-    if total_repairs:
-        output_lines.append(f"Auto-repaired {total_repairs} issue(s)")
-
-    success = all(v.validate() for v in validators)
-
-    if success:
-        output_lines.append("All validations PASSED!")
-
-    return success, "\n".join(output_lines) if output_lines else None
-
-
-def _condense_xml(xml_file: Path) -> None:
-    try:
-        with open(xml_file, encoding="utf-8") as f:
-            dom = defusedxml.minidom.parse(f)
-
-        for element in dom.getElementsByTagName("*"):
-            if element.tagName.endswith(":t"):
-                continue
-
-            for child in list(element.childNodes):
-                if (
-                    child.nodeType == child.TEXT_NODE
-                    and child.nodeValue
-                    and child.nodeValue.strip() == ""
-                ) or child.nodeType == child.COMMENT_NODE:
-                    element.removeChild(child)
-
-        xml_file.write_bytes(dom.toxml(encoding="UTF-8"))
-    except Exception as e:
-        print(f"ERROR: Failed to parse {xml_file.name}: {e}", file=sys.stderr)
-        raise
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(
-        description="Pack a directory into a DOCX, PPTX, or XLSX file"
-    )
-    parser.add_argument("input_directory", help="Unpacked Office document directory")
-    parser.add_argument("output_file", help="Output Office file (.docx/.pptx/.xlsx)")
-    parser.add_argument(
-        "--original",
-        help="Original file for validation comparison",
-    )
-    parser.add_argument(
-        "--validate",
-        type=lambda x: x.lower() == "true",
-        default=True,
-        metavar="true|false",
-        help="Run validation with auto-repair (default: true)",
-    )
-    args = parser.parse_args()
-
-    _, message = pack(
-        args.input_directory,
-        args.output_file,
-        original_file=args.original,
-        validate=args.validate,
-    )
-    print(message)
-
-    if "Error" in message:
-        sys.exit(1)

.agents/skills/xlsx/scripts/office/schemas/ISO-IEC29500-4_2016/dml-chartDrawing.xsd

@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"
-  xmlns="http://schemas.openxmlformats.org/drawingml/2006/chartDrawing"
-  targetNamespace="http://schemas.openxmlformats.org/drawingml/2006/chartDrawing"
-  elementFormDefault="qualified">
-  <xsd:import namespace="http://schemas.openxmlformats.org/drawingml/2006/main"
-    schemaLocation="dml-main.xsd"/>
-  <xsd:complexType name="CT_ShapeNonVisual">
-    <xsd:sequence>
-      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="cNvSpPr" type="a:CT_NonVisualDrawingShapeProps" minOccurs="1" maxOccurs="1"
-      />
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Shape">
-    <xsd:sequence>
-      <xsd:element name="nvSpPr" type="CT_ShapeNonVisual" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="spPr" type="a:CT_ShapeProperties" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="style" type="a:CT_ShapeStyle" minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="txBody" type="a:CT_TextBody" minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="macro" type="xsd:string" use="optional"/>
-    <xsd:attribute name="textlink" type="xsd:string" use="optional"/>
-    <xsd:attribute name="fLocksText" type="xsd:boolean" use="optional" default="true"/>
-    <xsd:attribute name="fPublished" type="xsd:boolean" use="optional" default="false"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_ConnectorNonVisual">
-    <xsd:sequence>
-      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="cNvCxnSpPr" type="a:CT_NonVisualConnectorProperties" minOccurs="1"
-        maxOccurs="1"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Connector">
-    <xsd:sequence>
-      <xsd:element name="nvCxnSpPr" type="CT_ConnectorNonVisual" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="spPr" type="a:CT_ShapeProperties" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="style" type="a:CT_ShapeStyle" minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="macro" type="xsd:string" use="optional"/>
-    <xsd:attribute name="fPublished" type="xsd:boolean" use="optional" default="false"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_PictureNonVisual">
-    <xsd:sequence>
-      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="cNvPicPr" type="a:CT_NonVisualPictureProperties" minOccurs="1"
-        maxOccurs="1"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Picture">
-    <xsd:sequence>
-      <xsd:element name="nvPicPr" type="CT_PictureNonVisual" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="blipFill" type="a:CT_BlipFillProperties" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="spPr" type="a:CT_ShapeProperties" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="style" type="a:CT_ShapeStyle" minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="macro" type="xsd:string" use="optional" default=""/>
-    <xsd:attribute name="fPublished" type="xsd:boolean" use="optional" default="false"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_GraphicFrameNonVisual">
-    <xsd:sequence>
-      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="cNvGraphicFramePr" type="a:CT_NonVisualGraphicFrameProperties"
-        minOccurs="1" maxOccurs="1"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_GraphicFrame">
-    <xsd:sequence>
-      <xsd:element name="nvGraphicFramePr" type="CT_GraphicFrameNonVisual" minOccurs="1"
-        maxOccurs="1"/>
-      <xsd:element name="xfrm" type="a:CT_Transform2D" minOccurs="1" maxOccurs="1"/>
-      <xsd:element ref="a:graphic" minOccurs="1" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="macro" type="xsd:string" use="optional"/>
-    <xsd:attribute name="fPublished" type="xsd:boolean" use="optional" default="false"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_GroupShapeNonVisual">
-    <xsd:sequence>
-      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="cNvGrpSpPr" type="a:CT_NonVisualGroupDrawingShapeProps" minOccurs="1"
-        maxOccurs="1"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_GroupShape">
-    <xsd:sequence>
-      <xsd:element name="nvGrpSpPr" type="CT_GroupShapeNonVisual" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="grpSpPr" type="a:CT_GroupShapeProperties" minOccurs="1" maxOccurs="1"/>
-      <xsd:choice minOccurs="0" maxOccurs="unbounded">
-        <xsd:element name="sp" type="CT_Shape"/>
-        <xsd:element name="grpSp" type="CT_GroupShape"/>
-        <xsd:element name="graphicFrame" type="CT_GraphicFrame"/>
-        <xsd:element name="cxnSp" type="CT_Connector"/>
-        <xsd:element name="pic" type="CT_Picture"/>
-      </xsd:choice>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:group name="EG_ObjectChoices">
-    <xsd:sequence>
-      <xsd:choice minOccurs="1" maxOccurs="1">
-        <xsd:element name="sp" type="CT_Shape"/>
-        <xsd:element name="grpSp" type="CT_GroupShape"/>
-        <xsd:element name="graphicFrame" type="CT_GraphicFrame"/>
-        <xsd:element name="cxnSp" type="CT_Connector"/>
-        <xsd:element name="pic" type="CT_Picture"/>
-      </xsd:choice>
-    </xsd:sequence>
-  </xsd:group>
-  <xsd:simpleType name="ST_MarkerCoordinate">
-    <xsd:restriction base="xsd:double">
-      <xsd:minInclusive value="0.0"/>
-      <xsd:maxInclusive value="1.0"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="CT_Marker">
-    <xsd:sequence>
-      <xsd:element name="x" type="ST_MarkerCoordinate" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="y" type="ST_MarkerCoordinate" minOccurs="1" maxOccurs="1"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_RelSizeAnchor">
-    <xsd:sequence>
-      <xsd:element name="from" type="CT_Marker"/>
-      <xsd:element name="to" type="CT_Marker"/>
-      <xsd:group ref="EG_ObjectChoices"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_AbsSizeAnchor">
-    <xsd:sequence>
-      <xsd:element name="from" type="CT_Marker"/>
-      <xsd:element name="ext" type="a:CT_PositiveSize2D"/>
-      <xsd:group ref="EG_ObjectChoices"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:group name="EG_Anchor">
-    <xsd:choice>
-      <xsd:element name="relSizeAnchor" type="CT_RelSizeAnchor"/>
-      <xsd:element name="absSizeAnchor" type="CT_AbsSizeAnchor"/>
-    </xsd:choice>
-  </xsd:group>
-  <xsd:complexType name="CT_Drawing">
-    <xsd:sequence>
-      <xsd:group ref="EG_Anchor" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/ISO-IEC29500-4_2016/dml-lockedCanvas.xsd

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns="http://schemas.openxmlformats.org/drawingml/2006/lockedCanvas"
-  xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"
-  xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-  elementFormDefault="qualified"
-  targetNamespace="http://schemas.openxmlformats.org/drawingml/2006/lockedCanvas">
-  <xsd:import namespace="http://schemas.openxmlformats.org/drawingml/2006/main"
-    schemaLocation="dml-main.xsd"/>
-  <xsd:element name="lockedCanvas" type="a:CT_GvmlGroupShape"/>
-</xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/ISO-IEC29500-4_2016/dml-picture.xsd

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns="http://schemas.openxmlformats.org/drawingml/2006/picture"
-  xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" elementFormDefault="qualified"
-  targetNamespace="http://schemas.openxmlformats.org/drawingml/2006/picture">
-  <xsd:import namespace="http://schemas.openxmlformats.org/drawingml/2006/main"
-    schemaLocation="dml-main.xsd"/>
-  <xsd:complexType name="CT_PictureNonVisual">
-    <xsd:sequence>
-      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="cNvPicPr" type="a:CT_NonVisualPictureProperties" minOccurs="1"
-        maxOccurs="1"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Picture">
-    <xsd:sequence minOccurs="1" maxOccurs="1">
-      <xsd:element name="nvPicPr" type="CT_PictureNonVisual" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="blipFill" type="a:CT_BlipFillProperties" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="spPr" type="a:CT_ShapeProperties" minOccurs="1" maxOccurs="1"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:element name="pic" type="CT_Picture"/>
-</xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/ISO-IEC29500-4_2016/dml-spreadsheetDrawing.xsd

@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"
-  xmlns="http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing"
-  xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-  targetNamespace="http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing"
-  elementFormDefault="qualified">
-  <xsd:import namespace="http://schemas.openxmlformats.org/drawingml/2006/main"
-    schemaLocation="dml-main.xsd"/>
-  <xsd:import schemaLocation="shared-relationshipReference.xsd"
-    namespace="http://schemas.openxmlformats.org/officeDocument/2006/relationships"/>
-  <xsd:element name="from" type="CT_Marker"/>
-  <xsd:element name="to" type="CT_Marker"/>
-  <xsd:complexType name="CT_AnchorClientData">
-    <xsd:attribute name="fLocksWithSheet" type="xsd:boolean" use="optional" default="true"/>
-    <xsd:attribute name="fPrintsWithSheet" type="xsd:boolean" use="optional" default="true"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_ShapeNonVisual">
-    <xsd:sequence>
-      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="cNvSpPr" type="a:CT_NonVisualDrawingShapeProps" minOccurs="1" maxOccurs="1"
-      />
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Shape">
-    <xsd:sequence>
-      <xsd:element name="nvSpPr" type="CT_ShapeNonVisual" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="spPr" type="a:CT_ShapeProperties" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="style" type="a:CT_ShapeStyle" minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="txBody" type="a:CT_TextBody" minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="macro" type="xsd:string" use="optional"/>
-    <xsd:attribute name="textlink" type="xsd:string" use="optional"/>
-    <xsd:attribute name="fLocksText" type="xsd:boolean" use="optional" default="true"/>
-    <xsd:attribute name="fPublished" type="xsd:boolean" use="optional" default="false"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_ConnectorNonVisual">
-    <xsd:sequence>
-      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="cNvCxnSpPr" type="a:CT_NonVisualConnectorProperties" minOccurs="1"
-        maxOccurs="1"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Connector">
-    <xsd:sequence>
-      <xsd:element name="nvCxnSpPr" type="CT_ConnectorNonVisual" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="spPr" type="a:CT_ShapeProperties" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="style" type="a:CT_ShapeStyle" minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="macro" type="xsd:string" use="optional"/>
-    <xsd:attribute name="fPublished" type="xsd:boolean" use="optional" default="false"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_PictureNonVisual">
-    <xsd:sequence>
-      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="cNvPicPr" type="a:CT_NonVisualPictureProperties" minOccurs="1"
-        maxOccurs="1"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Picture">
-    <xsd:sequence>
-      <xsd:element name="nvPicPr" type="CT_PictureNonVisual" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="blipFill" type="a:CT_BlipFillProperties" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="spPr" type="a:CT_ShapeProperties" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="style" type="a:CT_ShapeStyle" minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="macro" type="xsd:string" use="optional" default=""/>
-    <xsd:attribute name="fPublished" type="xsd:boolean" use="optional" default="false"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_GraphicalObjectFrameNonVisual">
-    <xsd:sequence>
-      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="cNvGraphicFramePr" type="a:CT_NonVisualGraphicFrameProperties"
-        minOccurs="1" maxOccurs="1"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_GraphicalObjectFrame">
-    <xsd:sequence>
-      <xsd:element name="nvGraphicFramePr" type="CT_GraphicalObjectFrameNonVisual" minOccurs="1"
-        maxOccurs="1"/>
-      <xsd:element name="xfrm" type="a:CT_Transform2D" minOccurs="1" maxOccurs="1"/>
-      <xsd:element ref="a:graphic" minOccurs="1" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="macro" type="xsd:string" use="optional"/>
-    <xsd:attribute name="fPublished" type="xsd:boolean" use="optional" default="false"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_GroupShapeNonVisual">
-    <xsd:sequence>
-      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="cNvGrpSpPr" type="a:CT_NonVisualGroupDrawingShapeProps" minOccurs="1"
-        maxOccurs="1"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_GroupShape">
-    <xsd:sequence>
-      <xsd:element name="nvGrpSpPr" type="CT_GroupShapeNonVisual" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="grpSpPr" type="a:CT_GroupShapeProperties" minOccurs="1" maxOccurs="1"/>
-      <xsd:choice minOccurs="0" maxOccurs="unbounded">
-        <xsd:element name="sp" type="CT_Shape"/>
-        <xsd:element name="grpSp" type="CT_GroupShape"/>
-        <xsd:element name="graphicFrame" type="CT_GraphicalObjectFrame"/>
-        <xsd:element name="cxnSp" type="CT_Connector"/>
-        <xsd:element name="pic" type="CT_Picture"/>
-      </xsd:choice>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:group name="EG_ObjectChoices">
-    <xsd:sequence>
-      <xsd:choice minOccurs="1" maxOccurs="1">
-        <xsd:element name="sp" type="CT_Shape"/>
-        <xsd:element name="grpSp" type="CT_GroupShape"/>
-        <xsd:element name="graphicFrame" type="CT_GraphicalObjectFrame"/>
-        <xsd:element name="cxnSp" type="CT_Connector"/>
-        <xsd:element name="pic" type="CT_Picture"/>
-        <xsd:element name="contentPart" type="CT_Rel"/>
-      </xsd:choice>
-    </xsd:sequence>
-  </xsd:group>
-  <xsd:complexType name="CT_Rel">
-    <xsd:attribute ref="r:id" use="required"/>
-  </xsd:complexType>
-  <xsd:simpleType name="ST_ColID">
-    <xsd:restriction base="xsd:int">
-      <xsd:minInclusive value="0"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_RowID">
-    <xsd:restriction base="xsd:int">
-      <xsd:minInclusive value="0"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="CT_Marker">
-    <xsd:sequence>
-      <xsd:element name="col" type="ST_ColID"/>
-      <xsd:element name="colOff" type="a:ST_Coordinate"/>
-      <xsd:element name="row" type="ST_RowID"/>
-      <xsd:element name="rowOff" type="a:ST_Coordinate"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:simpleType name="ST_EditAs">
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="twoCell"/>
-      <xsd:enumeration value="oneCell"/>
-      <xsd:enumeration value="absolute"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="CT_TwoCellAnchor">
-    <xsd:sequence>
-      <xsd:element name="from" type="CT_Marker"/>
-      <xsd:element name="to" type="CT_Marker"/>
-      <xsd:group ref="EG_ObjectChoices"/>
-      <xsd:element name="clientData" type="CT_AnchorClientData" minOccurs="1" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="editAs" type="ST_EditAs" use="optional" default="twoCell"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_OneCellAnchor">
-    <xsd:sequence>
-      <xsd:element name="from" type="CT_Marker"/>
-      <xsd:element name="ext" type="a:CT_PositiveSize2D"/>
-      <xsd:group ref="EG_ObjectChoices"/>
-      <xsd:element name="clientData" type="CT_AnchorClientData" minOccurs="1" maxOccurs="1"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_AbsoluteAnchor">
-    <xsd:sequence>
-      <xsd:element name="pos" type="a:CT_Point2D"/>
-      <xsd:element name="ext" type="a:CT_PositiveSize2D"/>
-      <xsd:group ref="EG_ObjectChoices"/>
-      <xsd:element name="clientData" type="CT_AnchorClientData" minOccurs="1" maxOccurs="1"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:group name="EG_Anchor">
-    <xsd:choice>
-      <xsd:element name="twoCellAnchor" type="CT_TwoCellAnchor"/>
-      <xsd:element name="oneCellAnchor" type="CT_OneCellAnchor"/>
-      <xsd:element name="absoluteAnchor" type="CT_AbsoluteAnchor"/>
-    </xsd:choice>
-  </xsd:group>
-  <xsd:complexType name="CT_Drawing">
-    <xsd:sequence>
-      <xsd:group ref="EG_Anchor" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:element name="wsDr" type="CT_Drawing"/>
-</xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/ISO-IEC29500-4_2016/dml-wordprocessingDrawing.xsd

@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"
-  xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
-  xmlns:dpct="http://schemas.openxmlformats.org/drawingml/2006/picture"
-  xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-  xmlns="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"
-  targetNamespace="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"
-  elementFormDefault="qualified">
-  <xsd:import namespace="http://schemas.openxmlformats.org/drawingml/2006/main"
-    schemaLocation="dml-main.xsd"/>
-  <xsd:import schemaLocation="wml.xsd"
-    namespace="http://schemas.openxmlformats.org/wordprocessingml/2006/main"/>
-  <xsd:import namespace="http://schemas.openxmlformats.org/drawingml/2006/picture"
-    schemaLocation="dml-picture.xsd"/>
-  <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-    schemaLocation="shared-relationshipReference.xsd"/>
-  <xsd:complexType name="CT_EffectExtent">
-    <xsd:attribute name="l" type="a:ST_Coordinate" use="required"/>
-    <xsd:attribute name="t" type="a:ST_Coordinate" use="required"/>
-    <xsd:attribute name="r" type="a:ST_Coordinate" use="required"/>
-    <xsd:attribute name="b" type="a:ST_Coordinate" use="required"/>
-  </xsd:complexType>
-  <xsd:simpleType name="ST_WrapDistance">
-    <xsd:restriction base="xsd:unsignedInt"/>
-  </xsd:simpleType>
-  <xsd:complexType name="CT_Inline">
-    <xsd:sequence>
-      <xsd:element name="extent" type="a:CT_PositiveSize2D"/>
-      <xsd:element name="effectExtent" type="CT_EffectExtent" minOccurs="0"/>
-      <xsd:element name="docPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="cNvGraphicFramePr" type="a:CT_NonVisualGraphicFrameProperties"
-        minOccurs="0" maxOccurs="1"/>
-      <xsd:element ref="a:graphic" minOccurs="1" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="distT" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="distB" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="distL" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="distR" type="ST_WrapDistance" use="optional"/>
-  </xsd:complexType>
-  <xsd:simpleType name="ST_WrapText">
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="bothSides"/>
-      <xsd:enumeration value="left"/>
-      <xsd:enumeration value="right"/>
-      <xsd:enumeration value="largest"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="CT_WrapPath">
-    <xsd:sequence>
-      <xsd:element name="start" type="a:CT_Point2D" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="lineTo" type="a:CT_Point2D" minOccurs="2" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="edited" type="xsd:boolean" use="optional"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_WrapNone"/>
-  <xsd:complexType name="CT_WrapSquare">
-    <xsd:sequence>
-      <xsd:element name="effectExtent" type="CT_EffectExtent" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="wrapText" type="ST_WrapText" use="required"/>
-    <xsd:attribute name="distT" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="distB" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="distL" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="distR" type="ST_WrapDistance" use="optional"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_WrapTight">
-    <xsd:sequence>
-      <xsd:element name="wrapPolygon" type="CT_WrapPath" minOccurs="1" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="wrapText" type="ST_WrapText" use="required"/>
-    <xsd:attribute name="distL" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="distR" type="ST_WrapDistance" use="optional"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_WrapThrough">
-    <xsd:sequence>
-      <xsd:element name="wrapPolygon" type="CT_WrapPath" minOccurs="1" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="wrapText" type="ST_WrapText" use="required"/>
-    <xsd:attribute name="distL" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="distR" type="ST_WrapDistance" use="optional"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_WrapTopBottom">
-    <xsd:sequence>
-      <xsd:element name="effectExtent" type="CT_EffectExtent" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="distT" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="distB" type="ST_WrapDistance" use="optional"/>
-  </xsd:complexType>
-  <xsd:group name="EG_WrapType">
-    <xsd:sequence>
-      <xsd:choice minOccurs="1" maxOccurs="1">
-        <xsd:element name="wrapNone" type="CT_WrapNone" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="wrapSquare" type="CT_WrapSquare" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="wrapTight" type="CT_WrapTight" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="wrapThrough" type="CT_WrapThrough" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="wrapTopAndBottom" type="CT_WrapTopBottom" minOccurs="1" maxOccurs="1"/>
-      </xsd:choice>
-    </xsd:sequence>
-  </xsd:group>
-  <xsd:simpleType name="ST_PositionOffset">
-    <xsd:restriction base="xsd:int"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_AlignH">
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="left"/>
-      <xsd:enumeration value="right"/>
-      <xsd:enumeration value="center"/>
-      <xsd:enumeration value="inside"/>
-      <xsd:enumeration value="outside"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_RelFromH">
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="margin"/>
-      <xsd:enumeration value="page"/>
-      <xsd:enumeration value="column"/>
-      <xsd:enumeration value="character"/>
-      <xsd:enumeration value="leftMargin"/>
-      <xsd:enumeration value="rightMargin"/>
-      <xsd:enumeration value="insideMargin"/>
-      <xsd:enumeration value="outsideMargin"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="CT_PosH">
-    <xsd:sequence>
-      <xsd:choice minOccurs="1" maxOccurs="1">
-        <xsd:element name="align" type="ST_AlignH" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="posOffset" type="ST_PositionOffset" minOccurs="1" maxOccurs="1"/>
-      </xsd:choice>
-    </xsd:sequence>
-    <xsd:attribute name="relativeFrom" type="ST_RelFromH" use="required"/>
-  </xsd:complexType>
-  <xsd:simpleType name="ST_AlignV">
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="top"/>
-      <xsd:enumeration value="bottom"/>
-      <xsd:enumeration value="center"/>
-      <xsd:enumeration value="inside"/>
-      <xsd:enumeration value="outside"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_RelFromV">
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="margin"/>
-      <xsd:enumeration value="page"/>
-      <xsd:enumeration value="paragraph"/>
-      <xsd:enumeration value="line"/>
-      <xsd:enumeration value="topMargin"/>
-      <xsd:enumeration value="bottomMargin"/>
-      <xsd:enumeration value="insideMargin"/>
-      <xsd:enumeration value="outsideMargin"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="CT_PosV">
-    <xsd:sequence>
-      <xsd:choice minOccurs="1" maxOccurs="1">
-        <xsd:element name="align" type="ST_AlignV" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="posOffset" type="ST_PositionOffset" minOccurs="1" maxOccurs="1"/>
-      </xsd:choice>
-    </xsd:sequence>
-    <xsd:attribute name="relativeFrom" type="ST_RelFromV" use="required"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Anchor">
-    <xsd:sequence>
-      <xsd:element name="simplePos" type="a:CT_Point2D"/>
-      <xsd:element name="positionH" type="CT_PosH"/>
-      <xsd:element name="positionV" type="CT_PosV"/>
-      <xsd:element name="extent" type="a:CT_PositiveSize2D"/>
-      <xsd:element name="effectExtent" type="CT_EffectExtent" minOccurs="0"/>
-      <xsd:group ref="EG_WrapType"/>
-      <xsd:element name="docPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="cNvGraphicFramePr" type="a:CT_NonVisualGraphicFrameProperties"
-        minOccurs="0" maxOccurs="1"/>
-      <xsd:element ref="a:graphic" minOccurs="1" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="distT" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="distB" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="distL" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="distR" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="simplePos" type="xsd:boolean"/>
-    <xsd:attribute name="relativeHeight" type="xsd:unsignedInt" use="required"/>
-    <xsd:attribute name="behindDoc" type="xsd:boolean" use="required"/>
-    <xsd:attribute name="locked" type="xsd:boolean" use="required"/>
-    <xsd:attribute name="layoutInCell" type="xsd:boolean" use="required"/>
-    <xsd:attribute name="hidden" type="xsd:boolean" use="optional"/>
-    <xsd:attribute name="allowOverlap" type="xsd:boolean" use="required"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_TxbxContent">
-    <xsd:group ref="w:EG_BlockLevelElts" minOccurs="1" maxOccurs="unbounded"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_TextboxInfo">
-    <xsd:sequence>
-      <xsd:element name="txbxContent" type="CT_TxbxContent" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="extLst" type="a:CT_OfficeArtExtensionList" minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:unsignedShort" use="optional" default="0"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_LinkedTextboxInformation">
-    <xsd:sequence>
-      <xsd:element name="extLst" type="a:CT_OfficeArtExtensionList" minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:unsignedShort" use="required"/>
-    <xsd:attribute name="seq" type="xsd:unsignedShort" use="required"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_WordprocessingShape">
-    <xsd:sequence minOccurs="1" maxOccurs="1">
-      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="0" maxOccurs="1"/>
-      <xsd:choice minOccurs="1" maxOccurs="1">
-        <xsd:element name="cNvSpPr" type="a:CT_NonVisualDrawingShapeProps" minOccurs="1"
-          maxOccurs="1"/>
-        <xsd:element name="cNvCnPr" type="a:CT_NonVisualConnectorProperties" minOccurs="1"
-          maxOccurs="1"/>
-      </xsd:choice>
-      <xsd:element name="spPr" type="a:CT_ShapeProperties" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="style" type="a:CT_ShapeStyle" minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="extLst" type="a:CT_OfficeArtExtensionList" minOccurs="0" maxOccurs="1"/>
-      <xsd:choice minOccurs="0" maxOccurs="1">
-        <xsd:element name="txbx" type="CT_TextboxInfo" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="linkedTxbx" type="CT_LinkedTextboxInformation" minOccurs="1"
-          maxOccurs="1"/>
-      </xsd:choice>
-      <xsd:element name="bodyPr" type="a:CT_TextBodyProperties" minOccurs="1" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="normalEastAsianFlow" type="xsd:boolean" use="optional" default="false"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_GraphicFrame">
-    <xsd:sequence>
-      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="cNvFrPr" type="a:CT_NonVisualGraphicFrameProperties" minOccurs="1"
-        maxOccurs="1"/>
-      <xsd:element name="xfrm" type="a:CT_Transform2D" minOccurs="1" maxOccurs="1"/>
-      <xsd:element ref="a:graphic" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="extLst" type="a:CT_OfficeArtExtensionList" minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_WordprocessingContentPartNonVisual">
-    <xsd:sequence>
-      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="cNvContentPartPr" type="a:CT_NonVisualContentPartProperties" minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_WordprocessingContentPart">
-    <xsd:sequence>
-      <xsd:element name="nvContentPartPr" type="CT_WordprocessingContentPartNonVisual" minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="xfrm" type="a:CT_Transform2D" minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="extLst" type="a:CT_OfficeArtExtensionList" minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="bwMode" type="a:ST_BlackWhiteMode" use="optional"/>
-    <xsd:attribute ref="r:id" use="required"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_WordprocessingGroup">
-    <xsd:sequence minOccurs="1" maxOccurs="1">
-      <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="cNvGrpSpPr" type="a:CT_NonVisualGroupDrawingShapeProps" minOccurs="1"
-        maxOccurs="1"/>
-      <xsd:element name="grpSpPr" type="a:CT_GroupShapeProperties" minOccurs="1" maxOccurs="1"/>
-      <xsd:choice minOccurs="0" maxOccurs="unbounded">
-        <xsd:element ref="wsp"/>
-        <xsd:element name="grpSp" type="CT_WordprocessingGroup"/>
-        <xsd:element name="graphicFrame" type="CT_GraphicFrame"/>
-        <xsd:element ref="dpct:pic"/>
-        <xsd:element name="contentPart" type="CT_WordprocessingContentPart"/>
-      </xsd:choice>
-      <xsd:element name="extLst" type="a:CT_OfficeArtExtensionList" minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_WordprocessingCanvas">
-    <xsd:sequence minOccurs="1" maxOccurs="1">
-      <xsd:element name="bg" type="a:CT_BackgroundFormatting" minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="whole" type="a:CT_WholeE2oFormatting" minOccurs="0" maxOccurs="1"/>
-      <xsd:choice minOccurs="0" maxOccurs="unbounded">
-        <xsd:element ref="wsp"/>
-        <xsd:element ref="dpct:pic"/>
-        <xsd:element name="contentPart" type="CT_WordprocessingContentPart"/>
-        <xsd:element ref="wgp"/>
-        <xsd:element name="graphicFrame" type="CT_GraphicFrame"/>
-      </xsd:choice>
-      <xsd:element name="extLst" type="a:CT_OfficeArtExtensionList" minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:element name="wpc" type="CT_WordprocessingCanvas"/>
-  <xsd:element name="wgp" type="CT_WordprocessingGroup"/>
-  <xsd:element name="wsp" type="CT_WordprocessingShape"/>
-  <xsd:element name="inline" type="CT_Inline"/>
-  <xsd:element name="anchor" type="CT_Anchor"/>
-</xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/ISO-IEC29500-4_2016/shared-additionalCharacteristics.xsd

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns="http://schemas.openxmlformats.org/officeDocument/2006/characteristics"
-  targetNamespace="http://schemas.openxmlformats.org/officeDocument/2006/characteristics"
-  elementFormDefault="qualified">
-  <xsd:complexType name="CT_AdditionalCharacteristics">
-    <xsd:sequence>
-      <xsd:element name="characteristic" type="CT_Characteristic" minOccurs="0"
-        maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Characteristic">
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="relation" type="ST_Relation" use="required"/>
-    <xsd:attribute name="val" type="xsd:string" use="required"/>
-    <xsd:attribute name="vocabulary" type="xsd:anyURI" use="optional"/>
-  </xsd:complexType>
-  <xsd:simpleType name="ST_Relation">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="ge"/>
-      <xsd:enumeration value="le"/>
-      <xsd:enumeration value="gt"/>
-      <xsd:enumeration value="lt"/>
-      <xsd:enumeration value="eq"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:element name="additionalCharacteristics" type="CT_AdditionalCharacteristics"/>
-</xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/ISO-IEC29500-4_2016/shared-bibliography.xsd

@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns="http://schemas.openxmlformats.org/officeDocument/2006/bibliography"
-  xmlns:s="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
-  targetNamespace="http://schemas.openxmlformats.org/officeDocument/2006/bibliography"
-  elementFormDefault="qualified">
-  <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
-    schemaLocation="shared-commonSimpleTypes.xsd"/>
-  <xsd:simpleType name="ST_SourceType">
-    <xsd:restriction base="s:ST_String">
-      <xsd:enumeration value="ArticleInAPeriodical"/>
-      <xsd:enumeration value="Book"/>
-      <xsd:enumeration value="BookSection"/>
-      <xsd:enumeration value="JournalArticle"/>
-      <xsd:enumeration value="ConferenceProceedings"/>
-      <xsd:enumeration value="Report"/>
-      <xsd:enumeration value="SoundRecording"/>
-      <xsd:enumeration value="Performance"/>
-      <xsd:enumeration value="Art"/>
-      <xsd:enumeration value="DocumentFromInternetSite"/>
-      <xsd:enumeration value="InternetSite"/>
-      <xsd:enumeration value="Film"/>
-      <xsd:enumeration value="Interview"/>
-      <xsd:enumeration value="Patent"/>
-      <xsd:enumeration value="ElectronicSource"/>
-      <xsd:enumeration value="Case"/>
-      <xsd:enumeration value="Misc"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="CT_NameListType">
-    <xsd:sequence>
-      <xsd:element name="Person" type="CT_PersonType" minOccurs="1" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_PersonType">
-    <xsd:sequence>
-      <xsd:element name="Last" type="s:ST_String" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="First" type="s:ST_String" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="Middle" type="s:ST_String" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_NameType">
-    <xsd:sequence>
-      <xsd:element name="NameList" type="CT_NameListType" minOccurs="1" maxOccurs="1"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_NameOrCorporateType">
-    <xsd:sequence>
-      <xsd:choice minOccurs="0" maxOccurs="1">
-        <xsd:element name="NameList" type="CT_NameListType" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="Corporate" minOccurs="1" maxOccurs="1" type="s:ST_String"/>
-      </xsd:choice>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_AuthorType">
-    <xsd:sequence>
-      <xsd:choice minOccurs="0" maxOccurs="unbounded">
-        <xsd:element name="Artist" type="CT_NameType"/>
-        <xsd:element name="Author" type="CT_NameOrCorporateType"/>
-        <xsd:element name="BookAuthor" type="CT_NameType"/>
-        <xsd:element name="Compiler" type="CT_NameType"/>
-        <xsd:element name="Composer" type="CT_NameType"/>
-        <xsd:element name="Conductor" type="CT_NameType"/>
-        <xsd:element name="Counsel" type="CT_NameType"/>
-        <xsd:element name="Director" type="CT_NameType"/>
-        <xsd:element name="Editor" type="CT_NameType"/>
-        <xsd:element name="Interviewee" type="CT_NameType"/>
-        <xsd:element name="Interviewer" type="CT_NameType"/>
-        <xsd:element name="Inventor" type="CT_NameType"/>
-        <xsd:element name="Performer" type="CT_NameOrCorporateType"/>
-        <xsd:element name="ProducerName" type="CT_NameType"/>
-        <xsd:element name="Translator" type="CT_NameType"/>
-        <xsd:element name="Writer" type="CT_NameType"/>
-      </xsd:choice>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_SourceType">
-    <xsd:sequence>
-      <xsd:choice minOccurs="0" maxOccurs="unbounded">
-        <xsd:element name="AbbreviatedCaseNumber" type="s:ST_String"/>
-        <xsd:element name="AlbumTitle" type="s:ST_String"/>
-        <xsd:element name="Author" type="CT_AuthorType"/>
-        <xsd:element name="BookTitle" type="s:ST_String"/>
-        <xsd:element name="Broadcaster" type="s:ST_String"/>
-        <xsd:element name="BroadcastTitle" type="s:ST_String"/>
-        <xsd:element name="CaseNumber" type="s:ST_String"/>
-        <xsd:element name="ChapterNumber" type="s:ST_String"/>
-        <xsd:element name="City" type="s:ST_String"/>
-        <xsd:element name="Comments" type="s:ST_String"/>
-        <xsd:element name="ConferenceName" type="s:ST_String"/>
-        <xsd:element name="CountryRegion" type="s:ST_String"/>
-        <xsd:element name="Court" type="s:ST_String"/>
-        <xsd:element name="Day" type="s:ST_String"/>
-        <xsd:element name="DayAccessed" type="s:ST_String"/>
-        <xsd:element name="Department" type="s:ST_String"/>
-        <xsd:element name="Distributor" type="s:ST_String"/>
-        <xsd:element name="Edition" type="s:ST_String"/>
-        <xsd:element name="Guid" type="s:ST_String"/>
-        <xsd:element name="Institution" type="s:ST_String"/>
-        <xsd:element name="InternetSiteTitle" type="s:ST_String"/>
-        <xsd:element name="Issue" type="s:ST_String"/>
-        <xsd:element name="JournalName" type="s:ST_String"/>
-        <xsd:element name="LCID" type="s:ST_Lang"/>
-        <xsd:element name="Medium" type="s:ST_String"/>
-        <xsd:element name="Month" type="s:ST_String"/>
-        <xsd:element name="MonthAccessed" type="s:ST_String"/>
-        <xsd:element name="NumberVolumes" type="s:ST_String"/>
-        <xsd:element name="Pages" type="s:ST_String"/>
-        <xsd:element name="PatentNumber" type="s:ST_String"/>
-        <xsd:element name="PeriodicalTitle" type="s:ST_String"/>
-        <xsd:element name="ProductionCompany" type="s:ST_String"/>
-        <xsd:element name="PublicationTitle" type="s:ST_String"/>
-        <xsd:element name="Publisher" type="s:ST_String"/>
-        <xsd:element name="RecordingNumber" type="s:ST_String"/>
-        <xsd:element name="RefOrder" type="s:ST_String"/>
-        <xsd:element name="Reporter" type="s:ST_String"/>
-        <xsd:element name="SourceType" type="ST_SourceType"/>
-        <xsd:element name="ShortTitle" type="s:ST_String"/>
-        <xsd:element name="StandardNumber" type="s:ST_String"/>
-        <xsd:element name="StateProvince" type="s:ST_String"/>
-        <xsd:element name="Station" type="s:ST_String"/>
-        <xsd:element name="Tag" type="s:ST_String"/>
-        <xsd:element name="Theater" type="s:ST_String"/>
-        <xsd:element name="ThesisType" type="s:ST_String"/>
-        <xsd:element name="Title" type="s:ST_String"/>
-        <xsd:element name="Type" type="s:ST_String"/>
-        <xsd:element name="URL" type="s:ST_String"/>
-        <xsd:element name="Version" type="s:ST_String"/>
-        <xsd:element name="Volume" type="s:ST_String"/>
-        <xsd:element name="Year" type="s:ST_String"/>
-        <xsd:element name="YearAccessed" type="s:ST_String"/>
-      </xsd:choice>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:element name="Sources" type="CT_Sources"/>
-  <xsd:complexType name="CT_Sources">
-    <xsd:sequence>
-      <xsd:element name="Source" type="CT_SourceType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="SelectedStyle" type="s:ST_String"/>
-    <xsd:attribute name="StyleName" type="s:ST_String"/>
-    <xsd:attribute name="URI" type="s:ST_String"/>
-  </xsd:complexType>
-</xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/ISO-IEC29500-4_2016/shared-commonSimpleTypes.xsd

@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
-  targetNamespace="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
-  elementFormDefault="qualified">
-  <xsd:simpleType name="ST_Lang">
-    <xsd:restriction base="xsd:string"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_HexColorRGB">
-    <xsd:restriction base="xsd:hexBinary">
-      <xsd:length value="3" fixed="true"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_Panose">
-    <xsd:restriction base="xsd:hexBinary">
-      <xsd:length value="10"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_CalendarType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="gregorian"/>
-      <xsd:enumeration value="gregorianUs"/>
-      <xsd:enumeration value="gregorianMeFrench"/>
-      <xsd:enumeration value="gregorianArabic"/>
-      <xsd:enumeration value="hijri"/>
-      <xsd:enumeration value="hebrew"/>
-      <xsd:enumeration value="taiwan"/>
-      <xsd:enumeration value="japan"/>
-      <xsd:enumeration value="thai"/>
-      <xsd:enumeration value="korea"/>
-      <xsd:enumeration value="saka"/>
-      <xsd:enumeration value="gregorianXlitEnglish"/>
-      <xsd:enumeration value="gregorianXlitFrench"/>
-      <xsd:enumeration value="none"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_AlgClass">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="hash"/>
-      <xsd:enumeration value="custom"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_CryptProv">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="rsaAES"/>
-      <xsd:enumeration value="rsaFull"/>
-      <xsd:enumeration value="custom"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_AlgType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="typeAny"/>
-      <xsd:enumeration value="custom"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_ColorType">
-    <xsd:restriction base="xsd:string"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_Guid">
-    <xsd:restriction base="xsd:token">
-      <xsd:pattern value="\{[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}\}"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_OnOff">
-    <xsd:union memberTypes="xsd:boolean ST_OnOff1"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_OnOff1">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="on"/>
-      <xsd:enumeration value="off"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_String">
-    <xsd:restriction base="xsd:string"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_XmlName">
-    <xsd:restriction base="xsd:NCName">
-      <xsd:minLength value="1"/>
-      <xsd:maxLength value="255"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_TrueFalse">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="t"/>
-      <xsd:enumeration value="f"/>
-      <xsd:enumeration value="true"/>
-      <xsd:enumeration value="false"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_TrueFalseBlank">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="t"/>
-      <xsd:enumeration value="f"/>
-      <xsd:enumeration value="true"/>
-      <xsd:enumeration value="false"/>
-      <xsd:enumeration value=""/>
-      <xsd:enumeration value="True"/>
-      <xsd:enumeration value="False"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_UnsignedDecimalNumber">
-    <xsd:restriction base="xsd:decimal">
-      <xsd:minInclusive value="0"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_TwipsMeasure">
-    <xsd:union memberTypes="ST_UnsignedDecimalNumber ST_PositiveUniversalMeasure"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_VerticalAlignRun">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="baseline"/>
-      <xsd:enumeration value="superscript"/>
-      <xsd:enumeration value="subscript"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_Xstring">
-    <xsd:restriction base="xsd:string"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_XAlign">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="left"/>
-      <xsd:enumeration value="center"/>
-      <xsd:enumeration value="right"/>
-      <xsd:enumeration value="inside"/>
-      <xsd:enumeration value="outside"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_YAlign">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="inline"/>
-      <xsd:enumeration value="top"/>
-      <xsd:enumeration value="center"/>
-      <xsd:enumeration value="bottom"/>
-      <xsd:enumeration value="inside"/>
-      <xsd:enumeration value="outside"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_ConformanceClass">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="strict"/>
-      <xsd:enumeration value="transitional"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_UniversalMeasure">
-    <xsd:restriction base="xsd:string">
-      <xsd:pattern value="-?[0-9]+(\.[0-9]+)?(mm|cm|in|pt|pc|pi)"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_PositiveUniversalMeasure">
-    <xsd:restriction base="ST_UniversalMeasure">
-      <xsd:pattern value="[0-9]+(\.[0-9]+)?(mm|cm|in|pt|pc|pi)"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_Percentage">
-    <xsd:restriction base="xsd:string">
-      <xsd:pattern value="-?[0-9]+(\.[0-9]+)?%"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_FixedPercentage">
-    <xsd:restriction base="ST_Percentage">
-      <xsd:pattern value="-?((100)|([0-9][0-9]?))(\.[0-9][0-9]?)?%"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_PositivePercentage">
-    <xsd:restriction base="ST_Percentage">
-      <xsd:pattern value="[0-9]+(\.[0-9]+)?%"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_PositiveFixedPercentage">
-    <xsd:restriction base="ST_Percentage">
-      <xsd:pattern value="((100)|([0-9][0-9]?))(\.[0-9][0-9]?)?%"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-</xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/ISO-IEC29500-4_2016/shared-customXmlDataProperties.xsd

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns="http://schemas.openxmlformats.org/officeDocument/2006/customXml"
-  xmlns:s="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
-  targetNamespace="http://schemas.openxmlformats.org/officeDocument/2006/customXml"
-  elementFormDefault="qualified" attributeFormDefault="qualified" blockDefault="#all">
-  <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
-    schemaLocation="shared-commonSimpleTypes.xsd"/>
-  <xsd:complexType name="CT_DatastoreSchemaRef">
-    <xsd:attribute name="uri" type="xsd:string" use="required"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_DatastoreSchemaRefs">
-    <xsd:sequence>
-      <xsd:element name="schemaRef" type="CT_DatastoreSchemaRef" minOccurs="0" maxOccurs="unbounded"
-      />
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_DatastoreItem">
-    <xsd:sequence>
-      <xsd:element name="schemaRefs" type="CT_DatastoreSchemaRefs" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="itemID" type="s:ST_Guid" use="required"/>
-  </xsd:complexType>
-  <xsd:element name="datastoreItem" type="CT_DatastoreItem"/>
-</xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/ISO-IEC29500-4_2016/shared-customXmlSchemaProperties.xsd

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns="http://schemas.openxmlformats.org/schemaLibrary/2006/main"
-  targetNamespace="http://schemas.openxmlformats.org/schemaLibrary/2006/main"
-  attributeFormDefault="qualified" elementFormDefault="qualified">
-  <xsd:complexType name="CT_Schema">
-    <xsd:attribute name="uri" type="xsd:string" default=""/>
-    <xsd:attribute name="manifestLocation" type="xsd:string"/>
-    <xsd:attribute name="schemaLocation" type="xsd:string"/>
-    <xsd:attribute name="schemaLanguage" type="xsd:token"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_SchemaLibrary">
-    <xsd:sequence>
-      <xsd:element name="schema" type="CT_Schema" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:element name="schemaLibrary" type="CT_SchemaLibrary"/>
-</xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/ISO-IEC29500-4_2016/shared-documentPropertiesCustom.xsd

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns="http://schemas.openxmlformats.org/officeDocument/2006/custom-properties"
-  xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"
-  xmlns:s="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
-  targetNamespace="http://schemas.openxmlformats.org/officeDocument/2006/custom-properties"
-  blockDefault="#all" elementFormDefault="qualified">
-  <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"
-    schemaLocation="shared-documentPropertiesVariantTypes.xsd"/>
-  <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
-    schemaLocation="shared-commonSimpleTypes.xsd"/>
-  <xsd:element name="Properties" type="CT_Properties"/>
-  <xsd:complexType name="CT_Properties">
-    <xsd:sequence>
-      <xsd:element name="property" minOccurs="0" maxOccurs="unbounded" type="CT_Property"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Property">
-    <xsd:choice minOccurs="1" maxOccurs="1">
-      <xsd:element ref="vt:vector"/>
-      <xsd:element ref="vt:array"/>
-      <xsd:element ref="vt:blob"/>
-      <xsd:element ref="vt:oblob"/>
-      <xsd:element ref="vt:empty"/>
-      <xsd:element ref="vt:null"/>
-      <xsd:element ref="vt:i1"/>
-      <xsd:element ref="vt:i2"/>
-      <xsd:element ref="vt:i4"/>
-      <xsd:element ref="vt:i8"/>
-      <xsd:element ref="vt:int"/>
-      <xsd:element ref="vt:ui1"/>
-      <xsd:element ref="vt:ui2"/>
-      <xsd:element ref="vt:ui4"/>
-      <xsd:element ref="vt:ui8"/>
-      <xsd:element ref="vt:uint"/>
-      <xsd:element ref="vt:r4"/>
-      <xsd:element ref="vt:r8"/>
-      <xsd:element ref="vt:decimal"/>
-      <xsd:element ref="vt:lpstr"/>
-      <xsd:element ref="vt:lpwstr"/>
-      <xsd:element ref="vt:bstr"/>
-      <xsd:element ref="vt:date"/>
-      <xsd:element ref="vt:filetime"/>
-      <xsd:element ref="vt:bool"/>
-      <xsd:element ref="vt:cy"/>
-      <xsd:element ref="vt:error"/>
-      <xsd:element ref="vt:stream"/>
-      <xsd:element ref="vt:ostream"/>
-      <xsd:element ref="vt:storage"/>
-      <xsd:element ref="vt:ostorage"/>
-      <xsd:element ref="vt:vstream"/>
-      <xsd:element ref="vt:clsid"/>
-    </xsd:choice>
-    <xsd:attribute name="fmtid" use="required" type="s:ST_Guid"/>
-    <xsd:attribute name="pid" use="required" type="xsd:int"/>
-    <xsd:attribute name="name" use="optional" type="xsd:string"/>
-    <xsd:attribute name="linkTarget" use="optional" type="xsd:string"/>
-  </xsd:complexType>
-</xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/ISO-IEC29500-4_2016/shared-documentPropertiesExtended.xsd

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties"
-  xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"
-  targetNamespace="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties"
-  elementFormDefault="qualified" blockDefault="#all">
-  <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"
-    schemaLocation="shared-documentPropertiesVariantTypes.xsd"/>
-  <xsd:element name="Properties" type="CT_Properties"/>
-  <xsd:complexType name="CT_Properties">
-    <xsd:all>
-      <xsd:element name="Template" minOccurs="0" maxOccurs="1" type="xsd:string"/>
-      <xsd:element name="Manager" minOccurs="0" maxOccurs="1" type="xsd:string"/>
-      <xsd:element name="Company" minOccurs="0" maxOccurs="1" type="xsd:string"/>
-      <xsd:element name="Pages" minOccurs="0" maxOccurs="1" type="xsd:int"/>
-      <xsd:element name="Words" minOccurs="0" maxOccurs="1" type="xsd:int"/>
-      <xsd:element name="Characters" minOccurs="0" maxOccurs="1" type="xsd:int"/>
-      <xsd:element name="PresentationFormat" minOccurs="0" maxOccurs="1" type="xsd:string"/>
-      <xsd:element name="Lines" minOccurs="0" maxOccurs="1" type="xsd:int"/>
-      <xsd:element name="Paragraphs" minOccurs="0" maxOccurs="1" type="xsd:int"/>
-      <xsd:element name="Slides" minOccurs="0" maxOccurs="1" type="xsd:int"/>
-      <xsd:element name="Notes" minOccurs="0" maxOccurs="1" type="xsd:int"/>
-      <xsd:element name="TotalTime" minOccurs="0" maxOccurs="1" type="xsd:int"/>
-      <xsd:element name="HiddenSlides" minOccurs="0" maxOccurs="1" type="xsd:int"/>
-      <xsd:element name="MMClips" minOccurs="0" maxOccurs="1" type="xsd:int"/>
-      <xsd:element name="ScaleCrop" minOccurs="0" maxOccurs="1" type="xsd:boolean"/>
-      <xsd:element name="HeadingPairs" minOccurs="0" maxOccurs="1" type="CT_VectorVariant"/>
-      <xsd:element name="TitlesOfParts" minOccurs="0" maxOccurs="1" type="CT_VectorLpstr"/>
-      <xsd:element name="LinksUpToDate" minOccurs="0" maxOccurs="1" type="xsd:boolean"/>
-      <xsd:element name="CharactersWithSpaces" minOccurs="0" maxOccurs="1" type="xsd:int"/>
-      <xsd:element name="SharedDoc" minOccurs="0" maxOccurs="1" type="xsd:boolean"/>
-      <xsd:element name="HyperlinkBase" minOccurs="0" maxOccurs="1" type="xsd:string"/>
-      <xsd:element name="HLinks" minOccurs="0" maxOccurs="1" type="CT_VectorVariant"/>
-      <xsd:element name="HyperlinksChanged" minOccurs="0" maxOccurs="1" type="xsd:boolean"/>
-      <xsd:element name="DigSig" minOccurs="0" maxOccurs="1" type="CT_DigSigBlob"/>
-      <xsd:element name="Application" minOccurs="0" maxOccurs="1" type="xsd:string"/>
-      <xsd:element name="AppVersion" minOccurs="0" maxOccurs="1" type="xsd:string"/>
-      <xsd:element name="DocSecurity" minOccurs="0" maxOccurs="1" type="xsd:int"/>
-    </xsd:all>
-  </xsd:complexType>
-  <xsd:complexType name="CT_VectorVariant">
-    <xsd:sequence minOccurs="1" maxOccurs="1">
-      <xsd:element ref="vt:vector"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_VectorLpstr">
-    <xsd:sequence minOccurs="1" maxOccurs="1">
-      <xsd:element ref="vt:vector"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_DigSigBlob">
-    <xsd:sequence minOccurs="1" maxOccurs="1">
-      <xsd:element ref="vt:blob"/>
-    </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/ISO-IEC29500-4_2016/shared-documentPropertiesVariantTypes.xsd

@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"
-  xmlns:s="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
-  targetNamespace="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"
-  blockDefault="#all" elementFormDefault="qualified">
-  <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
-    schemaLocation="shared-commonSimpleTypes.xsd"/>
-  <xsd:simpleType name="ST_VectorBaseType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="variant"/>
-      <xsd:enumeration value="i1"/>
-      <xsd:enumeration value="i2"/>
-      <xsd:enumeration value="i4"/>
-      <xsd:enumeration value="i8"/>
-      <xsd:enumeration value="ui1"/>
-      <xsd:enumeration value="ui2"/>
-      <xsd:enumeration value="ui4"/>
-      <xsd:enumeration value="ui8"/>
-      <xsd:enumeration value="r4"/>
-      <xsd:enumeration value="r8"/>
-      <xsd:enumeration value="lpstr"/>
-      <xsd:enumeration value="lpwstr"/>
-      <xsd:enumeration value="bstr"/>
-      <xsd:enumeration value="date"/>
-      <xsd:enumeration value="filetime"/>
-      <xsd:enumeration value="bool"/>
-      <xsd:enumeration value="cy"/>
-      <xsd:enumeration value="error"/>
-      <xsd:enumeration value="clsid"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_ArrayBaseType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="variant"/>
-      <xsd:enumeration value="i1"/>
-      <xsd:enumeration value="i2"/>
-      <xsd:enumeration value="i4"/>
-      <xsd:enumeration value="int"/>
-      <xsd:enumeration value="ui1"/>
-      <xsd:enumeration value="ui2"/>
-      <xsd:enumeration value="ui4"/>
-      <xsd:enumeration value="uint"/>
-      <xsd:enumeration value="r4"/>
-      <xsd:enumeration value="r8"/>
-      <xsd:enumeration value="decimal"/>
-      <xsd:enumeration value="bstr"/>
-      <xsd:enumeration value="date"/>
-      <xsd:enumeration value="bool"/>
-      <xsd:enumeration value="cy"/>
-      <xsd:enumeration value="error"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_Cy">
-    <xsd:restriction base="xsd:string">
-      <xsd:pattern value="\s*[0-9]*\.[0-9]{4}\s*"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_Error">
-    <xsd:restriction base="xsd:string">
-      <xsd:pattern value="\s*0x[0-9A-Za-z]{8}\s*"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="CT_Empty"/>
-  <xsd:complexType name="CT_Null"/>
-  <xsd:complexType name="CT_Vector">
-    <xsd:choice minOccurs="1" maxOccurs="unbounded">
-      <xsd:element ref="variant"/>
-      <xsd:element ref="i1"/>
-      <xsd:element ref="i2"/>
-      <xsd:element ref="i4"/>
-      <xsd:element ref="i8"/>
-      <xsd:element ref="ui1"/>
-      <xsd:element ref="ui2"/>
-      <xsd:element ref="ui4"/>
-      <xsd:element ref="ui8"/>
-      <xsd:element ref="r4"/>
-      <xsd:element ref="r8"/>
-      <xsd:element ref="lpstr"/>
-      <xsd:element ref="lpwstr"/>
-      <xsd:element ref="bstr"/>
-      <xsd:element ref="date"/>
-      <xsd:element ref="filetime"/>
-      <xsd:element ref="bool"/>
-      <xsd:element ref="cy"/>
-      <xsd:element ref="error"/>
-      <xsd:element ref="clsid"/>
-    </xsd:choice>
-    <xsd:attribute name="baseType" type="ST_VectorBaseType" use="required"/>
-    <xsd:attribute name="size" type="xsd:unsignedInt" use="required"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Array">
-    <xsd:choice minOccurs="1" maxOccurs="unbounded">
-      <xsd:element ref="variant"/>
-      <xsd:element ref="i1"/>
-      <xsd:element ref="i2"/>
-      <xsd:element ref="i4"/>
-      <xsd:element ref="int"/>
-      <xsd:element ref="ui1"/>
-      <xsd:element ref="ui2"/>
-      <xsd:element ref="ui4"/>
-      <xsd:element ref="uint"/>
-      <xsd:element ref="r4"/>
-      <xsd:element ref="r8"/>
-      <xsd:element ref="decimal"/>
-      <xsd:element ref="bstr"/>
-      <xsd:element ref="date"/>
-      <xsd:element ref="bool"/>
-      <xsd:element ref="error"/>
-      <xsd:element ref="cy"/>
-    </xsd:choice>
-    <xsd:attribute name="lBounds" type="xsd:int" use="required"/>
-    <xsd:attribute name="uBounds" type="xsd:int" use="required"/>
-    <xsd:attribute name="baseType" type="ST_ArrayBaseType" use="required"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Variant">
-    <xsd:choice minOccurs="1" maxOccurs="1">
-      <xsd:element ref="variant"/>
-      <xsd:element ref="vector"/>
-      <xsd:element ref="array"/>
-      <xsd:element ref="blob"/>
-      <xsd:element ref="oblob"/>
-      <xsd:element ref="empty"/>
-      <xsd:element ref="null"/>
-      <xsd:element ref="i1"/>
-      <xsd:element ref="i2"/>
-      <xsd:element ref="i4"/>
-      <xsd:element ref="i8"/>
-      <xsd:element ref="int"/>
-      <xsd:element ref="ui1"/>
-      <xsd:element ref="ui2"/>
-      <xsd:element ref="ui4"/>
-      <xsd:element ref="ui8"/>
-      <xsd:element ref="uint"/>
-      <xsd:element ref="r4"/>
-      <xsd:element ref="r8"/>
-      <xsd:element ref="decimal"/>
-      <xsd:element ref="lpstr"/>
-      <xsd:element ref="lpwstr"/>
-      <xsd:element ref="bstr"/>
-      <xsd:element ref="date"/>
-      <xsd:element ref="filetime"/>
-      <xsd:element ref="bool"/>
-      <xsd:element ref="cy"/>
-      <xsd:element ref="error"/>
-      <xsd:element ref="stream"/>
-      <xsd:element ref="ostream"/>
-      <xsd:element ref="storage"/>
-      <xsd:element ref="ostorage"/>
-      <xsd:element ref="vstream"/>
-      <xsd:element ref="clsid"/>
-    </xsd:choice>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Vstream">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:base64Binary">
-        <xsd:attribute name="version" type="s:ST_Guid"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:element name="variant" type="CT_Variant"/>
-  <xsd:element name="vector" type="CT_Vector"/>
-  <xsd:element name="array" type="CT_Array"/>
-  <xsd:element name="blob" type="xsd:base64Binary"/>
-  <xsd:element name="oblob" type="xsd:base64Binary"/>
-  <xsd:element name="empty" type="CT_Empty"/>
-  <xsd:element name="null" type="CT_Null"/>
-  <xsd:element name="i1" type="xsd:byte"/>
-  <xsd:element name="i2" type="xsd:short"/>
-  <xsd:element name="i4" type="xsd:int"/>
-  <xsd:element name="i8" type="xsd:long"/>
-  <xsd:element name="int" type="xsd:int"/>
-  <xsd:element name="ui1" type="xsd:unsignedByte"/>
-  <xsd:element name="ui2" type="xsd:unsignedShort"/>
-  <xsd:element name="ui4" type="xsd:unsignedInt"/>
-  <xsd:element name="ui8" type="xsd:unsignedLong"/>
-  <xsd:element name="uint" type="xsd:unsignedInt"/>
-  <xsd:element name="r4" type="xsd:float"/>
-  <xsd:element name="r8" type="xsd:double"/>
-  <xsd:element name="decimal" type="xsd:decimal"/>
-  <xsd:element name="lpstr" type="xsd:string"/>
-  <xsd:element name="lpwstr" type="xsd:string"/>
-  <xsd:element name="bstr" type="xsd:string"/>
-  <xsd:element name="date" type="xsd:dateTime"/>
-  <xsd:element name="filetime" type="xsd:dateTime"/>
-  <xsd:element name="bool" type="xsd:boolean"/>
-  <xsd:element name="cy" type="ST_Cy"/>
-  <xsd:element name="error" type="ST_Error"/>
-  <xsd:element name="stream" type="xsd:base64Binary"/>
-  <xsd:element name="ostream" type="xsd:base64Binary"/>
-  <xsd:element name="storage" type="xsd:base64Binary"/>
-  <xsd:element name="ostorage" type="xsd:base64Binary"/>
-  <xsd:element name="vstream" type="CT_Vstream"/>
-  <xsd:element name="clsid" type="s:ST_Guid"/>
-</xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/ISO-IEC29500-4_2016/shared-math.xsd

@@ -1,582 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns="http://schemas.openxmlformats.org/officeDocument/2006/math"
-  xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math"
-  xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
-  xmlns:s="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
-  elementFormDefault="qualified" attributeFormDefault="qualified" blockDefault="#all"
-  targetNamespace="http://schemas.openxmlformats.org/officeDocument/2006/math">
-  <xsd:import namespace="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
-    schemaLocation="wml.xsd"/>
-  <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
-    schemaLocation="shared-commonSimpleTypes.xsd"/>
-  <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
-  <xsd:simpleType name="ST_Integer255">
-    <xsd:restriction base="xsd:integer">
-      <xsd:minInclusive value="1"/>
-      <xsd:maxInclusive value="255"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="CT_Integer255">
-    <xsd:attribute name="val" type="ST_Integer255" use="required"/>
-  </xsd:complexType>
-  <xsd:simpleType name="ST_Integer2">
-    <xsd:restriction base="xsd:integer">
-      <xsd:minInclusive value="-2"/>
-      <xsd:maxInclusive value="2"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="CT_Integer2">
-    <xsd:attribute name="val" type="ST_Integer2" use="required"/>
-  </xsd:complexType>
-  <xsd:simpleType name="ST_SpacingRule">
-    <xsd:restriction base="xsd:integer">
-      <xsd:minInclusive value="0"/>
-      <xsd:maxInclusive value="4"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="CT_SpacingRule">
-    <xsd:attribute name="val" type="ST_SpacingRule" use="required"/>
-  </xsd:complexType>
-  <xsd:simpleType name="ST_UnSignedInteger">
-    <xsd:restriction base="xsd:unsignedInt"/>
-  </xsd:simpleType>
-  <xsd:complexType name="CT_UnSignedInteger">
-    <xsd:attribute name="val" type="ST_UnSignedInteger" use="required"/>
-  </xsd:complexType>
-  <xsd:simpleType name="ST_Char">
-    <xsd:restriction base="xsd:string">
-      <xsd:maxLength value="1"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="CT_Char">
-    <xsd:attribute name="val" type="ST_Char" use="required"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_OnOff">
-    <xsd:attribute name="val" type="s:ST_OnOff"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_String">
-    <xsd:attribute name="val" type="s:ST_String"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_XAlign">
-    <xsd:attribute name="val" type="s:ST_XAlign" use="required"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_YAlign">
-    <xsd:attribute name="val" type="s:ST_YAlign" use="required"/>
-  </xsd:complexType>
-  <xsd:simpleType name="ST_Shp">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="centered"/>
-      <xsd:enumeration value="match"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="CT_Shp">
-    <xsd:attribute name="val" type="ST_Shp" use="required"/>
-  </xsd:complexType>
-  <xsd:simpleType name="ST_FType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="bar"/>
-      <xsd:enumeration value="skw"/>
-      <xsd:enumeration value="lin"/>
-      <xsd:enumeration value="noBar"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="CT_FType">
-    <xsd:attribute name="val" type="ST_FType" use="required"/>
-  </xsd:complexType>
-  <xsd:simpleType name="ST_LimLoc">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="undOvr"/>
-      <xsd:enumeration value="subSup"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="CT_LimLoc">
-    <xsd:attribute name="val" type="ST_LimLoc" use="required"/>
-  </xsd:complexType>
-  <xsd:simpleType name="ST_TopBot">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="top"/>
-      <xsd:enumeration value="bot"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="CT_TopBot">
-    <xsd:attribute name="val" type="ST_TopBot" use="required"/>
-  </xsd:complexType>
-  <xsd:simpleType name="ST_Script">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="roman"/>
-      <xsd:enumeration value="script"/>
-      <xsd:enumeration value="fraktur"/>
-      <xsd:enumeration value="double-struck"/>
-      <xsd:enumeration value="sans-serif"/>
-      <xsd:enumeration value="monospace"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="CT_Script">
-    <xsd:attribute name="val" type="ST_Script"/>
-  </xsd:complexType>
-  <xsd:simpleType name="ST_Style">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="p"/>
-      <xsd:enumeration value="b"/>
-      <xsd:enumeration value="i"/>
-      <xsd:enumeration value="bi"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="CT_Style">
-    <xsd:attribute name="val" type="ST_Style"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_ManualBreak">
-    <xsd:attribute name="alnAt" type="ST_Integer255"/>
-  </xsd:complexType>
-  <xsd:group name="EG_ScriptStyle">
-    <xsd:sequence>
-      <xsd:element name="scr" minOccurs="0" type="CT_Script"/>
-      <xsd:element name="sty" minOccurs="0" type="CT_Style"/>
-    </xsd:sequence>
-  </xsd:group>
-  <xsd:complexType name="CT_RPR">
-    <xsd:sequence>
-      <xsd:element name="lit" minOccurs="0" type="CT_OnOff"/>
-      <xsd:choice>
-        <xsd:element name="nor" minOccurs="0" type="CT_OnOff"/>
-        <xsd:sequence>
-          <xsd:group ref="EG_ScriptStyle"/>
-        </xsd:sequence>
-      </xsd:choice>
-      <xsd:element name="brk" minOccurs="0" type="CT_ManualBreak"/>
-      <xsd:element name="aln" minOccurs="0" type="CT_OnOff"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Text">
-    <xsd:simpleContent>
-      <xsd:extension base="s:ST_String">
-        <xsd:attribute ref="xml:space" use="optional"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:complexType name="CT_R">
-    <xsd:sequence>
-      <xsd:element name="rPr" type="CT_RPR" minOccurs="0"/>
-      <xsd:group ref="w:EG_RPr" minOccurs="0"/>
-      <xsd:choice minOccurs="0" maxOccurs="unbounded">
-        <xsd:group ref="w:EG_RunInnerContent"/>
-        <xsd:element name="t" type="CT_Text" minOccurs="0"/>
-      </xsd:choice>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_CtrlPr">
-    <xsd:sequence>
-      <xsd:group ref="w:EG_RPrMath" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_AccPr">
-    <xsd:sequence>
-      <xsd:element name="chr" type="CT_Char" minOccurs="0"/>
-      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Acc">
-    <xsd:sequence>
-      <xsd:element name="accPr" type="CT_AccPr" minOccurs="0"/>
-      <xsd:element name="e" type="CT_OMathArg"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_BarPr">
-    <xsd:sequence>
-      <xsd:element name="pos" type="CT_TopBot" minOccurs="0"/>
-      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Bar">
-    <xsd:sequence>
-      <xsd:element name="barPr" type="CT_BarPr" minOccurs="0"/>
-      <xsd:element name="e" type="CT_OMathArg"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_BoxPr">
-    <xsd:sequence>
-      <xsd:element name="opEmu" type="CT_OnOff" minOccurs="0"/>
-      <xsd:element name="noBreak" type="CT_OnOff" minOccurs="0"/>
-      <xsd:element name="diff" type="CT_OnOff" minOccurs="0"/>
-      <xsd:element name="brk" type="CT_ManualBreak" minOccurs="0"/>
-      <xsd:element name="aln" type="CT_OnOff" minOccurs="0"/>
-      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Box">
-    <xsd:sequence>
-      <xsd:element name="boxPr" type="CT_BoxPr" minOccurs="0"/>
-      <xsd:element name="e" type="CT_OMathArg"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_BorderBoxPr">
-    <xsd:sequence>
-      <xsd:element name="hideTop" type="CT_OnOff" minOccurs="0"/>
-      <xsd:element name="hideBot" type="CT_OnOff" minOccurs="0"/>
-      <xsd:element name="hideLeft" type="CT_OnOff" minOccurs="0"/>
-      <xsd:element name="hideRight" type="CT_OnOff" minOccurs="0"/>
-      <xsd:element name="strikeH" type="CT_OnOff" minOccurs="0"/>
-      <xsd:element name="strikeV" type="CT_OnOff" minOccurs="0"/>
-      <xsd:element name="strikeBLTR" type="CT_OnOff" minOccurs="0"/>
-      <xsd:element name="strikeTLBR" type="CT_OnOff" minOccurs="0"/>
-      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_BorderBox">
-    <xsd:sequence>
-      <xsd:element name="borderBoxPr" type="CT_BorderBoxPr" minOccurs="0"/>
-      <xsd:element name="e" type="CT_OMathArg"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_DPr">
-    <xsd:sequence>
-      <xsd:element name="begChr" type="CT_Char" minOccurs="0"/>
-      <xsd:element name="sepChr" type="CT_Char" minOccurs="0"/>
-      <xsd:element name="endChr" type="CT_Char" minOccurs="0"/>
-      <xsd:element name="grow" type="CT_OnOff" minOccurs="0"/>
-      <xsd:element name="shp" type="CT_Shp" minOccurs="0"/>
-      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_D">
-    <xsd:sequence>
-      <xsd:element name="dPr" type="CT_DPr" minOccurs="0"/>
-      <xsd:element name="e" type="CT_OMathArg" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_EqArrPr">
-    <xsd:sequence>
-      <xsd:element name="baseJc" type="CT_YAlign" minOccurs="0"/>
-      <xsd:element name="maxDist" type="CT_OnOff" minOccurs="0"/>
-      <xsd:element name="objDist" type="CT_OnOff" minOccurs="0"/>
-      <xsd:element name="rSpRule" type="CT_SpacingRule" minOccurs="0"/>
-      <xsd:element name="rSp" type="CT_UnSignedInteger" minOccurs="0"/>
-      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_EqArr">
-    <xsd:sequence>
-      <xsd:element name="eqArrPr" type="CT_EqArrPr" minOccurs="0"/>
-      <xsd:element name="e" type="CT_OMathArg" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_FPr">
-    <xsd:sequence>
-      <xsd:element name="type" type="CT_FType" minOccurs="0"/>
-      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_F">
-    <xsd:sequence>
-      <xsd:element name="fPr" type="CT_FPr" minOccurs="0"/>
-      <xsd:element name="num" type="CT_OMathArg"/>
-      <xsd:element name="den" type="CT_OMathArg"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_FuncPr">
-    <xsd:sequence>
-      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Func">
-    <xsd:sequence>
-      <xsd:element name="funcPr" type="CT_FuncPr" minOccurs="0"/>
-      <xsd:element name="fName" type="CT_OMathArg"/>
-      <xsd:element name="e" type="CT_OMathArg"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_GroupChrPr">
-    <xsd:sequence>
-      <xsd:element name="chr" type="CT_Char" minOccurs="0"/>
-      <xsd:element name="pos" type="CT_TopBot" minOccurs="0"/>
-      <xsd:element name="vertJc" type="CT_TopBot" minOccurs="0"/>
-      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_GroupChr">
-    <xsd:sequence>
-      <xsd:element name="groupChrPr" type="CT_GroupChrPr" minOccurs="0"/>
-      <xsd:element name="e" type="CT_OMathArg"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_LimLowPr">
-    <xsd:sequence>
-      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_LimLow">
-    <xsd:sequence>
-      <xsd:element name="limLowPr" type="CT_LimLowPr" minOccurs="0"/>
-      <xsd:element name="e" type="CT_OMathArg"/>
-      <xsd:element name="lim" type="CT_OMathArg"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_LimUppPr">
-    <xsd:sequence>
-      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_LimUpp">
-    <xsd:sequence>
-      <xsd:element name="limUppPr" type="CT_LimUppPr" minOccurs="0"/>
-      <xsd:element name="e" type="CT_OMathArg"/>
-      <xsd:element name="lim" type="CT_OMathArg"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_MCPr">
-    <xsd:sequence>
-      <xsd:element name="count" type="CT_Integer255" minOccurs="0"/>
-      <xsd:element name="mcJc" type="CT_XAlign" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_MC">
-    <xsd:sequence>
-      <xsd:element name="mcPr" type="CT_MCPr" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_MCS">
-    <xsd:sequence>
-      <xsd:element name="mc" type="CT_MC" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_MPr">
-    <xsd:sequence>
-      <xsd:element name="baseJc" type="CT_YAlign" minOccurs="0"/>
-      <xsd:element name="plcHide" type="CT_OnOff" minOccurs="0"/>
-      <xsd:element name="rSpRule" type="CT_SpacingRule" minOccurs="0"/>
-      <xsd:element name="cGpRule" type="CT_SpacingRule" minOccurs="0"/>
-      <xsd:element name="rSp" type="CT_UnSignedInteger" minOccurs="0"/>
-      <xsd:element name="cSp" type="CT_UnSignedInteger" minOccurs="0"/>
-      <xsd:element name="cGp" type="CT_UnSignedInteger" minOccurs="0"/>
-      <xsd:element name="mcs" type="CT_MCS" minOccurs="0"/>
-      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_MR">
-    <xsd:sequence>
-      <xsd:element name="e" type="CT_OMathArg" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_M">
-    <xsd:sequence>
-      <xsd:element name="mPr" type="CT_MPr" minOccurs="0"/>
-      <xsd:element name="mr" type="CT_MR" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_NaryPr">
-    <xsd:sequence>
-      <xsd:element name="chr" type="CT_Char" minOccurs="0"/>
-      <xsd:element name="limLoc" type="CT_LimLoc" minOccurs="0"/>
-      <xsd:element name="grow" type="CT_OnOff" minOccurs="0"/>
-      <xsd:element name="subHide" type="CT_OnOff" minOccurs="0"/>
-      <xsd:element name="supHide" type="CT_OnOff" minOccurs="0"/>
-      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Nary">
-    <xsd:sequence>
-      <xsd:element name="naryPr" type="CT_NaryPr" minOccurs="0"/>
-      <xsd:element name="sub" type="CT_OMathArg"/>
-      <xsd:element name="sup" type="CT_OMathArg"/>
-      <xsd:element name="e" type="CT_OMathArg"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_PhantPr">
-    <xsd:sequence>
-      <xsd:element name="show" type="CT_OnOff" minOccurs="0"/>
-      <xsd:element name="zeroWid" type="CT_OnOff" minOccurs="0"/>
-      <xsd:element name="zeroAsc" type="CT_OnOff" minOccurs="0"/>
-      <xsd:element name="zeroDesc" type="CT_OnOff" minOccurs="0"/>
-      <xsd:element name="transp" type="CT_OnOff" minOccurs="0"/>
-      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Phant">
-    <xsd:sequence>
-      <xsd:element name="phantPr" type="CT_PhantPr" minOccurs="0"/>
-      <xsd:element name="e" type="CT_OMathArg"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_RadPr">
-    <xsd:sequence>
-      <xsd:element name="degHide" type="CT_OnOff" minOccurs="0"/>
-      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Rad">
-    <xsd:sequence>
-      <xsd:element name="radPr" type="CT_RadPr" minOccurs="0"/>
-      <xsd:element name="deg" type="CT_OMathArg"/>
-      <xsd:element name="e" type="CT_OMathArg"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_SPrePr">
-    <xsd:sequence>
-      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_SPre">
-    <xsd:sequence>
-      <xsd:element name="sPrePr" type="CT_SPrePr" minOccurs="0"/>
-      <xsd:element name="sub" type="CT_OMathArg"/>
-      <xsd:element name="sup" type="CT_OMathArg"/>
-      <xsd:element name="e" type="CT_OMathArg"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_SSubPr">
-    <xsd:sequence>
-      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_SSub">
-    <xsd:sequence>
-      <xsd:element name="sSubPr" type="CT_SSubPr" minOccurs="0"/>
-      <xsd:element name="e" type="CT_OMathArg"/>
-      <xsd:element name="sub" type="CT_OMathArg"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_SSubSupPr">
-    <xsd:sequence>
-      <xsd:element name="alnScr" type="CT_OnOff" minOccurs="0"/>
-      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_SSubSup">
-    <xsd:sequence>
-      <xsd:element name="sSubSupPr" type="CT_SSubSupPr" minOccurs="0"/>
-      <xsd:element name="e" type="CT_OMathArg"/>
-      <xsd:element name="sub" type="CT_OMathArg"/>
-      <xsd:element name="sup" type="CT_OMathArg"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_SSupPr">
-    <xsd:sequence>
-      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_SSup">
-    <xsd:sequence>
-      <xsd:element name="sSupPr" type="CT_SSupPr" minOccurs="0"/>
-      <xsd:element name="e" type="CT_OMathArg"/>
-      <xsd:element name="sup" type="CT_OMathArg"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:group name="EG_OMathMathElements">
-    <xsd:choice>
-      <xsd:element name="acc" type="CT_Acc"/>
-      <xsd:element name="bar" type="CT_Bar"/>
-      <xsd:element name="box" type="CT_Box"/>
-      <xsd:element name="borderBox" type="CT_BorderBox"/>
-      <xsd:element name="d" type="CT_D"/>
-      <xsd:element name="eqArr" type="CT_EqArr"/>
-      <xsd:element name="f" type="CT_F"/>
-      <xsd:element name="func" type="CT_Func"/>
-      <xsd:element name="groupChr" type="CT_GroupChr"/>
-      <xsd:element name="limLow" type="CT_LimLow"/>
-      <xsd:element name="limUpp" type="CT_LimUpp"/>
-      <xsd:element name="m" type="CT_M"/>
-      <xsd:element name="nary" type="CT_Nary"/>
-      <xsd:element name="phant" type="CT_Phant"/>
-      <xsd:element name="rad" type="CT_Rad"/>
-      <xsd:element name="sPre" type="CT_SPre"/>
-      <xsd:element name="sSub" type="CT_SSub"/>
-      <xsd:element name="sSubSup" type="CT_SSubSup"/>
-      <xsd:element name="sSup" type="CT_SSup"/>
-      <xsd:element name="r" type="CT_R"/>
-    </xsd:choice>
-  </xsd:group>
-  <xsd:group name="EG_OMathElements">
-    <xsd:choice>
-      <xsd:group ref="EG_OMathMathElements"/>
-      <xsd:group ref="w:EG_PContentMath"/>
-    </xsd:choice>
-  </xsd:group>
-  <xsd:complexType name="CT_OMathArgPr">
-    <xsd:sequence>
-      <xsd:element name="argSz" type="CT_Integer2" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_OMathArg">
-    <xsd:sequence>
-      <xsd:element name="argPr" type="CT_OMathArgPr" minOccurs="0"/>
-      <xsd:group ref="EG_OMathElements" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="ctrlPr" type="CT_CtrlPr" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:simpleType name="ST_Jc">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="left"/>
-      <xsd:enumeration value="right"/>
-      <xsd:enumeration value="center"/>
-      <xsd:enumeration value="centerGroup"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="CT_OMathJc">
-    <xsd:attribute name="val" type="ST_Jc"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_OMathParaPr">
-    <xsd:sequence>
-      <xsd:element name="jc" type="CT_OMathJc" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_TwipsMeasure">
-    <xsd:attribute name="val" type="s:ST_TwipsMeasure" use="required"/>
-  </xsd:complexType>
-  <xsd:simpleType name="ST_BreakBin">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="before"/>
-      <xsd:enumeration value="after"/>
-      <xsd:enumeration value="repeat"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="CT_BreakBin">
-    <xsd:attribute name="val" type="ST_BreakBin"/>
-  </xsd:complexType>
-  <xsd:simpleType name="ST_BreakBinSub">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="--"/>
-      <xsd:enumeration value="-+"/>
-      <xsd:enumeration value="+-"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="CT_BreakBinSub">
-    <xsd:attribute name="val" type="ST_BreakBinSub"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_MathPr">
-    <xsd:sequence>
-      <xsd:element name="mathFont" type="CT_String" minOccurs="0"/>
-      <xsd:element name="brkBin" type="CT_BreakBin" minOccurs="0"/>
-      <xsd:element name="brkBinSub" type="CT_BreakBinSub" minOccurs="0"/>
-      <xsd:element name="smallFrac" type="CT_OnOff" minOccurs="0"/>
-      <xsd:element name="dispDef" type="CT_OnOff" minOccurs="0"/>
-      <xsd:element name="lMargin" type="CT_TwipsMeasure" minOccurs="0"/>
-      <xsd:element name="rMargin" type="CT_TwipsMeasure" minOccurs="0"/>
-      <xsd:element name="defJc" type="CT_OMathJc" minOccurs="0"/>
-      <xsd:element name="preSp" type="CT_TwipsMeasure" minOccurs="0"/>
-      <xsd:element name="postSp" type="CT_TwipsMeasure" minOccurs="0"/>
-      <xsd:element name="interSp" type="CT_TwipsMeasure" minOccurs="0"/>
-      <xsd:element name="intraSp" type="CT_TwipsMeasure" minOccurs="0"/>
-      <xsd:choice minOccurs="0">
-        <xsd:element name="wrapIndent" type="CT_TwipsMeasure"/>
-        <xsd:element name="wrapRight" type="CT_OnOff"/>
-      </xsd:choice>
-      <xsd:element name="intLim" type="CT_LimLoc" minOccurs="0"/>
-      <xsd:element name="naryLim" type="CT_LimLoc" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:element name="mathPr" type="CT_MathPr"/>
-  <xsd:complexType name="CT_OMathPara">
-    <xsd:sequence>
-      <xsd:element name="oMathParaPr" type="CT_OMathParaPr" minOccurs="0"/>
-      <xsd:element name="oMath" type="CT_OMath" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_OMath">
-    <xsd:sequence>
-      <xsd:group ref="EG_OMathElements" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:element name="oMathPara" type="CT_OMathPara"/>
-  <xsd:element name="oMath" type="CT_OMath"/>
-</xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/ISO-IEC29500-4_2016/shared-relationshipReference.xsd

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-  xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-  elementFormDefault="qualified"
-  targetNamespace="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-  blockDefault="#all">
-  <xsd:simpleType name="ST_RelationshipId">
-    <xsd:restriction base="xsd:string"/>
-  </xsd:simpleType>
-  <xsd:attribute name="id" type="ST_RelationshipId"/>
-  <xsd:attribute name="embed" type="ST_RelationshipId"/>
-  <xsd:attribute name="link" type="ST_RelationshipId"/>
-  <xsd:attribute name="dm" type="ST_RelationshipId" default=""/>
-  <xsd:attribute name="lo" type="ST_RelationshipId" default=""/>
-  <xsd:attribute name="qs" type="ST_RelationshipId" default=""/>
-  <xsd:attribute name="cs" type="ST_RelationshipId" default=""/>
-  <xsd:attribute name="blip" type="ST_RelationshipId" default=""/>
-  <xsd:attribute name="pict" type="ST_RelationshipId"/>
-  <xsd:attribute name="href" type="ST_RelationshipId"/>
-  <xsd:attribute name="topLeft" type="ST_RelationshipId"/>
-  <xsd:attribute name="topRight" type="ST_RelationshipId"/>
-  <xsd:attribute name="bottomLeft" type="ST_RelationshipId"/>
-  <xsd:attribute name="bottomRight" type="ST_RelationshipId"/>
-</xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/ISO-IEC29500-4_2016/vml-main.xsd

@@ -1,570 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:schemas-microsoft-com:vml"
-  xmlns:pvml="urn:schemas-microsoft-com:office:powerpoint"
-  xmlns:o="urn:schemas-microsoft-com:office:office"
-  xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
-  xmlns:w10="urn:schemas-microsoft-com:office:word"
-  xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-  xmlns:x="urn:schemas-microsoft-com:office:excel"
-  xmlns:s="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
-  targetNamespace="urn:schemas-microsoft-com:vml" elementFormDefault="qualified"
-  attributeFormDefault="unqualified">
-  <xsd:import namespace="urn:schemas-microsoft-com:office:office"
-    schemaLocation="vml-officeDrawing.xsd"/>
-  <xsd:import namespace="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
-    schemaLocation="wml.xsd"/>
-  <xsd:import namespace="urn:schemas-microsoft-com:office:word"
-    schemaLocation="vml-wordprocessingDrawing.xsd"/>
-  <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-    schemaLocation="shared-relationshipReference.xsd"/>
-  <xsd:import namespace="urn:schemas-microsoft-com:office:excel"
-    schemaLocation="vml-spreadsheetDrawing.xsd"/>
-  <xsd:import namespace="urn:schemas-microsoft-com:office:powerpoint"
-    schemaLocation="vml-presentationDrawing.xsd"/>
-  <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
-    schemaLocation="shared-commonSimpleTypes.xsd"/>
-  <xsd:attributeGroup name="AG_Id">
-    <xsd:attribute name="id" type="xsd:string" use="optional"/>
-  </xsd:attributeGroup>
-  <xsd:attributeGroup name="AG_Style">
-    <xsd:attribute name="style" type="xsd:string" use="optional"/>
-  </xsd:attributeGroup>
-  <xsd:attributeGroup name="AG_Type">
-    <xsd:attribute name="type" type="xsd:string" use="optional"/>
-  </xsd:attributeGroup>
-  <xsd:attributeGroup name="AG_Adj">
-    <xsd:attribute name="adj" type="xsd:string" use="optional"/>
-  </xsd:attributeGroup>
-  <xsd:attributeGroup name="AG_Path">
-    <xsd:attribute name="path" type="xsd:string" use="optional"/>
-  </xsd:attributeGroup>
-  <xsd:attributeGroup name="AG_Fill">
-    <xsd:attribute name="filled" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="fillcolor" type="s:ST_ColorType" use="optional"/>
-  </xsd:attributeGroup>
-  <xsd:attributeGroup name="AG_Chromakey">
-    <xsd:attribute name="chromakey" type="s:ST_ColorType" use="optional"/>
-  </xsd:attributeGroup>
-  <xsd:attributeGroup name="AG_Ext">
-    <xsd:attribute name="ext" form="qualified" type="ST_Ext"/>
-  </xsd:attributeGroup>
-  <xsd:attributeGroup name="AG_CoreAttributes">
-    <xsd:attributeGroup ref="AG_Id"/>
-    <xsd:attributeGroup ref="AG_Style"/>
-    <xsd:attribute name="href" type="xsd:string" use="optional"/>
-    <xsd:attribute name="target" type="xsd:string" use="optional"/>
-    <xsd:attribute name="class" type="xsd:string" use="optional"/>
-    <xsd:attribute name="title" type="xsd:string" use="optional"/>
-    <xsd:attribute name="alt" type="xsd:string" use="optional"/>
-    <xsd:attribute name="coordsize" type="xsd:string" use="optional"/>
-    <xsd:attribute name="coordorigin" type="xsd:string" use="optional"/>
-    <xsd:attribute name="wrapcoords" type="xsd:string" use="optional"/>
-    <xsd:attribute name="print" type="s:ST_TrueFalse" use="optional"/>
-  </xsd:attributeGroup>
-  <xsd:attributeGroup name="AG_ShapeAttributes">
-    <xsd:attributeGroup ref="AG_Chromakey"/>
-    <xsd:attributeGroup ref="AG_Fill"/>
-    <xsd:attribute name="opacity" type="xsd:string" use="optional"/>
-    <xsd:attribute name="stroked" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="strokecolor" type="s:ST_ColorType" use="optional"/>
-    <xsd:attribute name="strokeweight" type="xsd:string" use="optional"/>
-    <xsd:attribute name="insetpen" type="s:ST_TrueFalse" use="optional"/>
-  </xsd:attributeGroup>
-  <xsd:attributeGroup name="AG_OfficeCoreAttributes">
-    <xsd:attribute ref="o:spid"/>
-    <xsd:attribute ref="o:oned"/>
-    <xsd:attribute ref="o:regroupid"/>
-    <xsd:attribute ref="o:doubleclicknotify"/>
-    <xsd:attribute ref="o:button"/>
-    <xsd:attribute ref="o:userhidden"/>
-    <xsd:attribute ref="o:bullet"/>
-    <xsd:attribute ref="o:hr"/>
-    <xsd:attribute ref="o:hrstd"/>
-    <xsd:attribute ref="o:hrnoshade"/>
-    <xsd:attribute ref="o:hrpct"/>
-    <xsd:attribute ref="o:hralign"/>
-    <xsd:attribute ref="o:allowincell"/>
-    <xsd:attribute ref="o:allowoverlap"/>
-    <xsd:attribute ref="o:userdrawn"/>
-    <xsd:attribute ref="o:bordertopcolor"/>
-    <xsd:attribute ref="o:borderleftcolor"/>
-    <xsd:attribute ref="o:borderbottomcolor"/>
-    <xsd:attribute ref="o:borderrightcolor"/>
-    <xsd:attribute ref="o:dgmlayout"/>
-    <xsd:attribute ref="o:dgmnodekind"/>
-    <xsd:attribute ref="o:dgmlayoutmru"/>
-    <xsd:attribute ref="o:insetmode"/>
-  </xsd:attributeGroup>
-  <xsd:attributeGroup name="AG_OfficeShapeAttributes">
-    <xsd:attribute ref="o:spt"/>
-    <xsd:attribute ref="o:connectortype"/>
-    <xsd:attribute ref="o:bwmode"/>
-    <xsd:attribute ref="o:bwpure"/>
-    <xsd:attribute ref="o:bwnormal"/>
-    <xsd:attribute ref="o:forcedash"/>
-    <xsd:attribute ref="o:oleicon"/>
-    <xsd:attribute ref="o:ole"/>
-    <xsd:attribute ref="o:preferrelative"/>
-    <xsd:attribute ref="o:cliptowrap"/>
-    <xsd:attribute ref="o:clip"/>
-  </xsd:attributeGroup>
-  <xsd:attributeGroup name="AG_AllCoreAttributes">
-    <xsd:attributeGroup ref="AG_CoreAttributes"/>
-    <xsd:attributeGroup ref="AG_OfficeCoreAttributes"/>
-  </xsd:attributeGroup>
-  <xsd:attributeGroup name="AG_AllShapeAttributes">
-    <xsd:attributeGroup ref="AG_ShapeAttributes"/>
-    <xsd:attributeGroup ref="AG_OfficeShapeAttributes"/>
-  </xsd:attributeGroup>
-  <xsd:attributeGroup name="AG_ImageAttributes">
-    <xsd:attribute name="src" type="xsd:string" use="optional"/>
-    <xsd:attribute name="cropleft" type="xsd:string" use="optional"/>
-    <xsd:attribute name="croptop" type="xsd:string" use="optional"/>
-    <xsd:attribute name="cropright" type="xsd:string" use="optional"/>
-    <xsd:attribute name="cropbottom" type="xsd:string" use="optional"/>
-    <xsd:attribute name="gain" type="xsd:string" use="optional"/>
-    <xsd:attribute name="blacklevel" type="xsd:string" use="optional"/>
-    <xsd:attribute name="gamma" type="xsd:string" use="optional"/>
-    <xsd:attribute name="grayscale" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="bilevel" type="s:ST_TrueFalse" use="optional"/>
-  </xsd:attributeGroup>
-  <xsd:attributeGroup name="AG_StrokeAttributes">
-    <xsd:attribute name="on" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="weight" type="xsd:string" use="optional"/>
-    <xsd:attribute name="color" type="s:ST_ColorType" use="optional"/>
-    <xsd:attribute name="opacity" type="xsd:string" use="optional"/>
-    <xsd:attribute name="linestyle" type="ST_StrokeLineStyle" use="optional"/>
-    <xsd:attribute name="miterlimit" type="xsd:decimal" use="optional"/>
-    <xsd:attribute name="joinstyle" type="ST_StrokeJoinStyle" use="optional"/>
-    <xsd:attribute name="endcap" type="ST_StrokeEndCap" use="optional"/>
-    <xsd:attribute name="dashstyle" type="xsd:string" use="optional"/>
-    <xsd:attribute name="filltype" type="ST_FillType" use="optional"/>
-    <xsd:attribute name="src" type="xsd:string" use="optional"/>
-    <xsd:attribute name="imageaspect" type="ST_ImageAspect" use="optional"/>
-    <xsd:attribute name="imagesize" type="xsd:string" use="optional"/>
-    <xsd:attribute name="imagealignshape" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="color2" type="s:ST_ColorType" use="optional"/>
-    <xsd:attribute name="startarrow" type="ST_StrokeArrowType" use="optional"/>
-    <xsd:attribute name="startarrowwidth" type="ST_StrokeArrowWidth" use="optional"/>
-    <xsd:attribute name="startarrowlength" type="ST_StrokeArrowLength" use="optional"/>
-    <xsd:attribute name="endarrow" type="ST_StrokeArrowType" use="optional"/>
-    <xsd:attribute name="endarrowwidth" type="ST_StrokeArrowWidth" use="optional"/>
-    <xsd:attribute name="endarrowlength" type="ST_StrokeArrowLength" use="optional"/>
-    <xsd:attribute ref="o:href"/>
-    <xsd:attribute ref="o:althref"/>
-    <xsd:attribute ref="o:title"/>
-    <xsd:attribute ref="o:forcedash"/>
-    <xsd:attribute ref="r:id" use="optional"/>
-    <xsd:attribute name="insetpen" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute ref="o:relid"/>
-  </xsd:attributeGroup>
-  <xsd:group name="EG_ShapeElements">
-    <xsd:choice>
-      <xsd:element ref="path"/>
-      <xsd:element ref="formulas"/>
-      <xsd:element ref="handles"/>
-      <xsd:element ref="fill"/>
-      <xsd:element ref="stroke"/>
-      <xsd:element ref="shadow"/>
-      <xsd:element ref="textbox"/>
-      <xsd:element ref="textpath"/>
-      <xsd:element ref="imagedata"/>
-      <xsd:element ref="o:skew"/>
-      <xsd:element ref="o:extrusion"/>
-      <xsd:element ref="o:callout"/>
-      <xsd:element ref="o:lock"/>
-      <xsd:element ref="o:clippath"/>
-      <xsd:element ref="o:signatureline"/>
-      <xsd:element ref="w10:wrap"/>
-      <xsd:element ref="w10:anchorlock"/>
-      <xsd:element ref="w10:bordertop"/>
-      <xsd:element ref="w10:borderbottom"/>
-      <xsd:element ref="w10:borderleft"/>
-      <xsd:element ref="w10:borderright"/>
-      <xsd:element ref="x:ClientData" minOccurs="0"/>
-      <xsd:element ref="pvml:textdata" minOccurs="0"/>
-    </xsd:choice>
-  </xsd:group>
-  <xsd:element name="shape" type="CT_Shape"/>
-  <xsd:element name="shapetype" type="CT_Shapetype"/>
-  <xsd:element name="group" type="CT_Group"/>
-  <xsd:element name="background" type="CT_Background"/>
-  <xsd:complexType name="CT_Shape">
-    <xsd:choice maxOccurs="unbounded">
-      <xsd:group ref="EG_ShapeElements"/>
-      <xsd:element ref="o:ink"/>
-      <xsd:element ref="pvml:iscomment"/>
-      <xsd:element ref="o:equationxml"/>
-    </xsd:choice>
-    <xsd:attributeGroup ref="AG_AllCoreAttributes"/>
-    <xsd:attributeGroup ref="AG_AllShapeAttributes"/>
-    <xsd:attributeGroup ref="AG_Type"/>
-    <xsd:attributeGroup ref="AG_Adj"/>
-    <xsd:attributeGroup ref="AG_Path"/>
-    <xsd:attribute ref="o:gfxdata"/>
-    <xsd:attribute name="equationxml" type="xsd:string" use="optional"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Shapetype">
-    <xsd:sequence>
-      <xsd:group ref="EG_ShapeElements" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element ref="o:complex" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attributeGroup ref="AG_AllCoreAttributes"/>
-    <xsd:attributeGroup ref="AG_AllShapeAttributes"/>
-    <xsd:attributeGroup ref="AG_Adj"/>
-    <xsd:attributeGroup ref="AG_Path"/>
-    <xsd:attribute ref="o:master"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Group">
-    <xsd:choice maxOccurs="unbounded">
-      <xsd:group ref="EG_ShapeElements"/>
-      <xsd:element ref="group"/>
-      <xsd:element ref="shape"/>
-      <xsd:element ref="shapetype"/>
-      <xsd:element ref="arc"/>
-      <xsd:element ref="curve"/>
-      <xsd:element ref="image"/>
-      <xsd:element ref="line"/>
-      <xsd:element ref="oval"/>
-      <xsd:element ref="polyline"/>
-      <xsd:element ref="rect"/>
-      <xsd:element ref="roundrect"/>
-      <xsd:element ref="o:diagram"/>
-    </xsd:choice>
-    <xsd:attributeGroup ref="AG_AllCoreAttributes"/>
-    <xsd:attributeGroup ref="AG_Fill"/>
-    <xsd:attribute name="editas" type="ST_EditAs" use="optional"/>
-    <xsd:attribute ref="o:tableproperties"/>
-    <xsd:attribute ref="o:tablelimits"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Background">
-    <xsd:sequence>
-      <xsd:element ref="fill" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attributeGroup ref="AG_Id"/>
-    <xsd:attributeGroup ref="AG_Fill"/>
-    <xsd:attribute ref="o:bwmode"/>
-    <xsd:attribute ref="o:bwpure"/>
-    <xsd:attribute ref="o:bwnormal"/>
-    <xsd:attribute ref="o:targetscreensize"/>
-  </xsd:complexType>
-  <xsd:element name="fill" type="CT_Fill"/>
-  <xsd:element name="formulas" type="CT_Formulas"/>
-  <xsd:element name="handles" type="CT_Handles"/>
-  <xsd:element name="imagedata" type="CT_ImageData"/>
-  <xsd:element name="path" type="CT_Path"/>
-  <xsd:element name="textbox" type="CT_Textbox"/>
-  <xsd:element name="shadow" type="CT_Shadow"/>
-  <xsd:element name="stroke" type="CT_Stroke"/>
-  <xsd:element name="textpath" type="CT_TextPath"/>
-  <xsd:complexType name="CT_Fill">
-    <xsd:sequence>
-      <xsd:element ref="o:fill" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attributeGroup ref="AG_Id"/>
-    <xsd:attribute name="type" type="ST_FillType" use="optional"/>
-    <xsd:attribute name="on" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="color" type="s:ST_ColorType" use="optional"/>
-    <xsd:attribute name="opacity" type="xsd:string" use="optional"/>
-    <xsd:attribute name="color2" type="s:ST_ColorType" use="optional"/>
-    <xsd:attribute name="src" type="xsd:string" use="optional"/>
-    <xsd:attribute ref="o:href"/>
-    <xsd:attribute ref="o:althref"/>
-    <xsd:attribute name="size" type="xsd:string" use="optional"/>
-    <xsd:attribute name="origin" type="xsd:string" use="optional"/>
-    <xsd:attribute name="position" type="xsd:string" use="optional"/>
-    <xsd:attribute name="aspect" type="ST_ImageAspect" use="optional"/>
-    <xsd:attribute name="colors" type="xsd:string" use="optional"/>
-    <xsd:attribute name="angle" type="xsd:decimal" use="optional"/>
-    <xsd:attribute name="alignshape" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="focus" type="xsd:string" use="optional"/>
-    <xsd:attribute name="focussize" type="xsd:string" use="optional"/>
-    <xsd:attribute name="focusposition" type="xsd:string" use="optional"/>
-    <xsd:attribute name="method" type="ST_FillMethod" use="optional"/>
-    <xsd:attribute ref="o:detectmouseclick"/>
-    <xsd:attribute ref="o:title"/>
-    <xsd:attribute ref="o:opacity2"/>
-    <xsd:attribute name="recolor" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="rotate" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute ref="r:id" use="optional"/>
-    <xsd:attribute ref="o:relid" use="optional"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Formulas">
-    <xsd:sequence>
-      <xsd:element name="f" type="CT_F" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_F">
-    <xsd:attribute name="eqn" type="xsd:string"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Handles">
-    <xsd:sequence>
-      <xsd:element name="h" type="CT_H" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_H">
-    <xsd:attribute name="position" type="xsd:string"/>
-    <xsd:attribute name="polar" type="xsd:string"/>
-    <xsd:attribute name="map" type="xsd:string"/>
-    <xsd:attribute name="invx" type="s:ST_TrueFalse"/>
-    <xsd:attribute name="invy" type="s:ST_TrueFalse"/>
-    <xsd:attribute name="switch" type="s:ST_TrueFalseBlank"/>
-    <xsd:attribute name="xrange" type="xsd:string"/>
-    <xsd:attribute name="yrange" type="xsd:string"/>
-    <xsd:attribute name="radiusrange" type="xsd:string"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_ImageData">
-    <xsd:attributeGroup ref="AG_Id"/>
-    <xsd:attributeGroup ref="AG_ImageAttributes"/>
-    <xsd:attributeGroup ref="AG_Chromakey"/>
-    <xsd:attribute name="embosscolor" type="s:ST_ColorType" use="optional"/>
-    <xsd:attribute name="recolortarget" type="s:ST_ColorType"/>
-    <xsd:attribute ref="o:href"/>
-    <xsd:attribute ref="o:althref"/>
-    <xsd:attribute ref="o:title"/>
-    <xsd:attribute ref="o:oleid"/>
-    <xsd:attribute ref="o:detectmouseclick"/>
-    <xsd:attribute ref="o:movie"/>
-    <xsd:attribute ref="o:relid"/>
-    <xsd:attribute ref="r:id"/>
-    <xsd:attribute ref="r:pict"/>
-    <xsd:attribute ref="r:href"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Path">
-    <xsd:attributeGroup ref="AG_Id"/>
-    <xsd:attribute name="v" type="xsd:string" use="optional"/>
-    <xsd:attribute name="limo" type="xsd:string" use="optional"/>
-    <xsd:attribute name="textboxrect" type="xsd:string" use="optional"/>
-    <xsd:attribute name="fillok" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="strokeok" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="shadowok" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="arrowok" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="gradientshapeok" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="textpathok" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="insetpenok" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute ref="o:connecttype"/>
-    <xsd:attribute ref="o:connectlocs"/>
-    <xsd:attribute ref="o:connectangles"/>
-    <xsd:attribute ref="o:extrusionok"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Shadow">
-    <xsd:attributeGroup ref="AG_Id"/>
-    <xsd:attribute name="on" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="type" type="ST_ShadowType" use="optional"/>
-    <xsd:attribute name="obscured" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="color" type="s:ST_ColorType" use="optional"/>
-    <xsd:attribute name="opacity" type="xsd:string" use="optional"/>
-    <xsd:attribute name="offset" type="xsd:string" use="optional"/>
-    <xsd:attribute name="color2" type="s:ST_ColorType" use="optional"/>
-    <xsd:attribute name="offset2" type="xsd:string" use="optional"/>
-    <xsd:attribute name="origin" type="xsd:string" use="optional"/>
-    <xsd:attribute name="matrix" type="xsd:string" use="optional"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Stroke">
-    <xsd:sequence>
-      <xsd:element ref="o:left" minOccurs="0"/>
-      <xsd:element ref="o:top" minOccurs="0"/>
-      <xsd:element ref="o:right" minOccurs="0"/>
-      <xsd:element ref="o:bottom" minOccurs="0"/>
-      <xsd:element ref="o:column" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attributeGroup ref="AG_Id"/>
-    <xsd:attributeGroup ref="AG_StrokeAttributes"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Textbox">
-    <xsd:choice>
-      <xsd:element ref="w:txbxContent" minOccurs="0"/>
-      <xsd:any namespace="##local" processContents="skip"/>
-    </xsd:choice>
-    <xsd:attributeGroup ref="AG_Id"/>
-    <xsd:attributeGroup ref="AG_Style"/>
-    <xsd:attribute name="inset" type="xsd:string" use="optional"/>
-    <xsd:attribute ref="o:singleclick"/>
-    <xsd:attribute ref="o:insetmode"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_TextPath">
-    <xsd:attributeGroup ref="AG_Id"/>
-    <xsd:attributeGroup ref="AG_Style"/>
-    <xsd:attribute name="on" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="fitshape" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="fitpath" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="trim" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="xscale" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="string" type="xsd:string" use="optional"/>
-  </xsd:complexType>
-  <xsd:element name="arc" type="CT_Arc"/>
-  <xsd:element name="curve" type="CT_Curve"/>
-  <xsd:element name="image" type="CT_Image"/>
-  <xsd:element name="line" type="CT_Line"/>
-  <xsd:element name="oval" type="CT_Oval"/>
-  <xsd:element name="polyline" type="CT_PolyLine"/>
-  <xsd:element name="rect" type="CT_Rect"/>
-  <xsd:element name="roundrect" type="CT_RoundRect"/>
-  <xsd:complexType name="CT_Arc">
-    <xsd:sequence>
-      <xsd:group ref="EG_ShapeElements" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attributeGroup ref="AG_AllCoreAttributes"/>
-    <xsd:attributeGroup ref="AG_AllShapeAttributes"/>
-    <xsd:attribute name="startAngle" type="xsd:decimal" use="optional"/>
-    <xsd:attribute name="endAngle" type="xsd:decimal" use="optional"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Curve">
-    <xsd:sequence>
-      <xsd:group ref="EG_ShapeElements" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attributeGroup ref="AG_AllCoreAttributes"/>
-    <xsd:attributeGroup ref="AG_AllShapeAttributes"/>
-    <xsd:attribute name="from" type="xsd:string" use="optional"/>
-    <xsd:attribute name="control1" type="xsd:string" use="optional"/>
-    <xsd:attribute name="control2" type="xsd:string" use="optional"/>
-    <xsd:attribute name="to" type="xsd:string" use="optional"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Image">
-    <xsd:sequence>
-      <xsd:group ref="EG_ShapeElements" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attributeGroup ref="AG_AllCoreAttributes"/>
-    <xsd:attributeGroup ref="AG_AllShapeAttributes"/>
-    <xsd:attributeGroup ref="AG_ImageAttributes"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Line">
-    <xsd:sequence>
-      <xsd:group ref="EG_ShapeElements" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attributeGroup ref="AG_AllCoreAttributes"/>
-    <xsd:attributeGroup ref="AG_AllShapeAttributes"/>
-    <xsd:attribute name="from" type="xsd:string" use="optional"/>
-    <xsd:attribute name="to" type="xsd:string" use="optional"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Oval">
-    <xsd:choice maxOccurs="unbounded">
-      <xsd:group ref="EG_ShapeElements" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:choice>
-    <xsd:attributeGroup ref="AG_AllCoreAttributes"/>
-    <xsd:attributeGroup ref="AG_AllShapeAttributes"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_PolyLine">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:group ref="EG_ShapeElements"/>
-      <xsd:element ref="o:ink"/>
-    </xsd:choice>
-    <xsd:attributeGroup ref="AG_AllCoreAttributes"/>
-    <xsd:attributeGroup ref="AG_AllShapeAttributes"/>
-    <xsd:attribute name="points" type="xsd:string" use="optional"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Rect">
-    <xsd:choice maxOccurs="unbounded">
-      <xsd:group ref="EG_ShapeElements" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:choice>
-    <xsd:attributeGroup ref="AG_AllCoreAttributes"/>
-    <xsd:attributeGroup ref="AG_AllShapeAttributes"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_RoundRect">
-    <xsd:choice maxOccurs="unbounded">
-      <xsd:group ref="EG_ShapeElements" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:choice>
-    <xsd:attributeGroup ref="AG_AllCoreAttributes"/>
-    <xsd:attributeGroup ref="AG_AllShapeAttributes"/>
-    <xsd:attribute name="arcsize" type="xsd:string" use="optional"/>
-  </xsd:complexType>
-  <xsd:simpleType name="ST_Ext">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="view"/>
-      <xsd:enumeration value="edit"/>
-      <xsd:enumeration value="backwardCompatible"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_FillType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="solid"/>
-      <xsd:enumeration value="gradient"/>
-      <xsd:enumeration value="gradientRadial"/>
-      <xsd:enumeration value="tile"/>
-      <xsd:enumeration value="pattern"/>
-      <xsd:enumeration value="frame"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_FillMethod">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="none"/>
-      <xsd:enumeration value="linear"/>
-      <xsd:enumeration value="sigma"/>
-      <xsd:enumeration value="any"/>
-      <xsd:enumeration value="linear sigma"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_ShadowType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="single"/>
-      <xsd:enumeration value="double"/>
-      <xsd:enumeration value="emboss"/>
-      <xsd:enumeration value="perspective"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_StrokeLineStyle">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="single"/>
-      <xsd:enumeration value="thinThin"/>
-      <xsd:enumeration value="thinThick"/>
-      <xsd:enumeration value="thickThin"/>
-      <xsd:enumeration value="thickBetweenThin"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_StrokeJoinStyle">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="round"/>
-      <xsd:enumeration value="bevel"/>
-      <xsd:enumeration value="miter"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_StrokeEndCap">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="flat"/>
-      <xsd:enumeration value="square"/>
-      <xsd:enumeration value="round"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_StrokeArrowLength">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="short"/>
-      <xsd:enumeration value="medium"/>
-      <xsd:enumeration value="long"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_StrokeArrowWidth">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="narrow"/>
-      <xsd:enumeration value="medium"/>
-      <xsd:enumeration value="wide"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_StrokeArrowType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="none"/>
-      <xsd:enumeration value="block"/>
-      <xsd:enumeration value="classic"/>
-      <xsd:enumeration value="oval"/>
-      <xsd:enumeration value="diamond"/>
-      <xsd:enumeration value="open"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_ImageAspect">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="ignore"/>
-      <xsd:enumeration value="atMost"/>
-      <xsd:enumeration value="atLeast"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_EditAs">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="canvas"/>
-      <xsd:enumeration value="orgchart"/>
-      <xsd:enumeration value="radial"/>
-      <xsd:enumeration value="cycle"/>
-      <xsd:enumeration value="stacked"/>
-      <xsd:enumeration value="venn"/>
-      <xsd:enumeration value="bullseye"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-</xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/ISO-IEC29500-4_2016/vml-officeDrawing.xsd

@@ -1,509 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns="urn:schemas-microsoft-com:office:office" xmlns:v="urn:schemas-microsoft-com:vml"
-  xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-  xmlns:s="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
-  targetNamespace="urn:schemas-microsoft-com:office:office" elementFormDefault="qualified"
-  attributeFormDefault="unqualified">
-  <xsd:import namespace="urn:schemas-microsoft-com:vml" schemaLocation="vml-main.xsd"/>
-  <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-    schemaLocation="shared-relationshipReference.xsd"/>
-  <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
-    schemaLocation="shared-commonSimpleTypes.xsd"/>
-  <xsd:attribute name="bwmode" type="ST_BWMode"/>
-  <xsd:attribute name="bwpure" type="ST_BWMode"/>
-  <xsd:attribute name="bwnormal" type="ST_BWMode"/>
-  <xsd:attribute name="targetscreensize" type="ST_ScreenSize"/>
-  <xsd:attribute name="insetmode" type="ST_InsetMode" default="custom"/>
-  <xsd:attribute name="spt" type="xsd:float"/>
-  <xsd:attribute name="wrapcoords" type="xsd:string"/>
-  <xsd:attribute name="oned" type="s:ST_TrueFalse"/>
-  <xsd:attribute name="regroupid" type="xsd:integer"/>
-  <xsd:attribute name="doubleclicknotify" type="s:ST_TrueFalse"/>
-  <xsd:attribute name="connectortype" type="ST_ConnectorType" default="straight"/>
-  <xsd:attribute name="button" type="s:ST_TrueFalse"/>
-  <xsd:attribute name="userhidden" type="s:ST_TrueFalse"/>
-  <xsd:attribute name="forcedash" type="s:ST_TrueFalse"/>
-  <xsd:attribute name="oleicon" type="s:ST_TrueFalse"/>
-  <xsd:attribute name="ole" type="s:ST_TrueFalseBlank"/>
-  <xsd:attribute name="preferrelative" type="s:ST_TrueFalse"/>
-  <xsd:attribute name="cliptowrap" type="s:ST_TrueFalse"/>
-  <xsd:attribute name="clip" type="s:ST_TrueFalse"/>
-  <xsd:attribute name="bullet" type="s:ST_TrueFalse"/>
-  <xsd:attribute name="hr" type="s:ST_TrueFalse"/>
-  <xsd:attribute name="hrstd" type="s:ST_TrueFalse"/>
-  <xsd:attribute name="hrnoshade" type="s:ST_TrueFalse"/>
-  <xsd:attribute name="hrpct" type="xsd:float"/>
-  <xsd:attribute name="hralign" type="ST_HrAlign" default="left"/>
-  <xsd:attribute name="allowincell" type="s:ST_TrueFalse"/>
-  <xsd:attribute name="allowoverlap" type="s:ST_TrueFalse"/>
-  <xsd:attribute name="userdrawn" type="s:ST_TrueFalse"/>
-  <xsd:attribute name="bordertopcolor" type="xsd:string"/>
-  <xsd:attribute name="borderleftcolor" type="xsd:string"/>
-  <xsd:attribute name="borderbottomcolor" type="xsd:string"/>
-  <xsd:attribute name="borderrightcolor" type="xsd:string"/>
-  <xsd:attribute name="connecttype" type="ST_ConnectType"/>
-  <xsd:attribute name="connectlocs" type="xsd:string"/>
-  <xsd:attribute name="connectangles" type="xsd:string"/>
-  <xsd:attribute name="master" type="xsd:string"/>
-  <xsd:attribute name="extrusionok" type="s:ST_TrueFalse"/>
-  <xsd:attribute name="href" type="xsd:string"/>
-  <xsd:attribute name="althref" type="xsd:string"/>
-  <xsd:attribute name="title" type="xsd:string"/>
-  <xsd:attribute name="singleclick" type="s:ST_TrueFalse"/>
-  <xsd:attribute name="oleid" type="xsd:float"/>
-  <xsd:attribute name="detectmouseclick" type="s:ST_TrueFalse"/>
-  <xsd:attribute name="movie" type="xsd:float"/>
-  <xsd:attribute name="spid" type="xsd:string"/>
-  <xsd:attribute name="opacity2" type="xsd:string"/>
-  <xsd:attribute name="relid" type="r:ST_RelationshipId"/>
-  <xsd:attribute name="dgmlayout" type="ST_DiagramLayout"/>
-  <xsd:attribute name="dgmnodekind" type="xsd:integer"/>
-  <xsd:attribute name="dgmlayoutmru" type="ST_DiagramLayout"/>
-  <xsd:attribute name="gfxdata" type="xsd:base64Binary"/>
-  <xsd:attribute name="tableproperties" type="xsd:string"/>
-  <xsd:attribute name="tablelimits" type="xsd:string"/>
-  <xsd:element name="shapedefaults" type="CT_ShapeDefaults"/>
-  <xsd:element name="shapelayout" type="CT_ShapeLayout"/>
-  <xsd:element name="signatureline" type="CT_SignatureLine"/>
-  <xsd:element name="ink" type="CT_Ink"/>
-  <xsd:element name="diagram" type="CT_Diagram"/>
-  <xsd:element name="equationxml" type="CT_EquationXml"/>
-  <xsd:complexType name="CT_ShapeDefaults">
-    <xsd:all minOccurs="0">
-      <xsd:element ref="v:fill" minOccurs="0"/>
-      <xsd:element ref="v:stroke" minOccurs="0"/>
-      <xsd:element ref="v:textbox" minOccurs="0"/>
-      <xsd:element ref="v:shadow" minOccurs="0"/>
-      <xsd:element ref="skew" minOccurs="0"/>
-      <xsd:element ref="extrusion" minOccurs="0"/>
-      <xsd:element ref="callout" minOccurs="0"/>
-      <xsd:element ref="lock" minOccurs="0"/>
-      <xsd:element name="colormru" minOccurs="0" type="CT_ColorMru"/>
-      <xsd:element name="colormenu" minOccurs="0" type="CT_ColorMenu"/>
-    </xsd:all>
-    <xsd:attributeGroup ref="v:AG_Ext"/>
-    <xsd:attribute name="spidmax" type="xsd:integer" use="optional"/>
-    <xsd:attribute name="style" type="xsd:string" use="optional"/>
-    <xsd:attribute name="fill" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="fillcolor" type="s:ST_ColorType" use="optional"/>
-    <xsd:attribute name="stroke" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="strokecolor" type="s:ST_ColorType"/>
-    <xsd:attribute name="allowincell" form="qualified" type="s:ST_TrueFalse"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Ink">
-    <xsd:sequence/>
-    <xsd:attribute name="i" type="xsd:string"/>
-    <xsd:attribute name="annotation" type="s:ST_TrueFalse"/>
-    <xsd:attribute name="contentType" type="ST_ContentType" use="optional"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_SignatureLine">
-    <xsd:attributeGroup ref="v:AG_Ext"/>
-    <xsd:attribute name="issignatureline" type="s:ST_TrueFalse"/>
-    <xsd:attribute name="id" type="s:ST_Guid"/>
-    <xsd:attribute name="provid" type="s:ST_Guid"/>
-    <xsd:attribute name="signinginstructionsset" type="s:ST_TrueFalse"/>
-    <xsd:attribute name="allowcomments" type="s:ST_TrueFalse"/>
-    <xsd:attribute name="showsigndate" type="s:ST_TrueFalse"/>
-    <xsd:attribute name="suggestedsigner" type="xsd:string" form="qualified"/>
-    <xsd:attribute name="suggestedsigner2" type="xsd:string" form="qualified"/>
-    <xsd:attribute name="suggestedsigneremail" type="xsd:string" form="qualified"/>
-    <xsd:attribute name="signinginstructions" type="xsd:string"/>
-    <xsd:attribute name="addlxml" type="xsd:string"/>
-    <xsd:attribute name="sigprovurl" type="xsd:string"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_ShapeLayout">
-    <xsd:all>
-      <xsd:element name="idmap" type="CT_IdMap" minOccurs="0"/>
-      <xsd:element name="regrouptable" type="CT_RegroupTable" minOccurs="0"/>
-      <xsd:element name="rules" type="CT_Rules" minOccurs="0"/>
-    </xsd:all>
-    <xsd:attributeGroup ref="v:AG_Ext"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_IdMap">
-    <xsd:attributeGroup ref="v:AG_Ext"/>
-    <xsd:attribute name="data" type="xsd:string" use="optional"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_RegroupTable">
-    <xsd:sequence>
-      <xsd:element name="entry" type="CT_Entry" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attributeGroup ref="v:AG_Ext"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Entry">
-    <xsd:attribute name="new" type="xsd:int" use="optional"/>
-    <xsd:attribute name="old" type="xsd:int" use="optional"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Rules">
-    <xsd:sequence>
-      <xsd:element name="r" type="CT_R" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attributeGroup ref="v:AG_Ext"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_R">
-    <xsd:sequence>
-      <xsd:element name="proxy" type="CT_Proxy" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:string" use="required"/>
-    <xsd:attribute name="type" type="ST_RType" use="optional"/>
-    <xsd:attribute name="how" type="ST_How" use="optional"/>
-    <xsd:attribute name="idref" type="xsd:string" use="optional"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Proxy">
-    <xsd:attribute name="start" type="s:ST_TrueFalseBlank" use="optional" default="false"/>
-    <xsd:attribute name="end" type="s:ST_TrueFalseBlank" use="optional" default="false"/>
-    <xsd:attribute name="idref" type="xsd:string" use="optional"/>
-    <xsd:attribute name="connectloc" type="xsd:int" use="optional"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Diagram">
-    <xsd:sequence>
-      <xsd:element name="relationtable" type="CT_RelationTable" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attributeGroup ref="v:AG_Ext"/>
-    <xsd:attribute name="dgmstyle" type="xsd:integer" use="optional"/>
-    <xsd:attribute name="autoformat" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="reverse" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="autolayout" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="dgmscalex" type="xsd:integer" use="optional"/>
-    <xsd:attribute name="dgmscaley" type="xsd:integer" use="optional"/>
-    <xsd:attribute name="dgmfontsize" type="xsd:integer" use="optional"/>
-    <xsd:attribute name="constrainbounds" type="xsd:string" use="optional"/>
-    <xsd:attribute name="dgmbasetextscale" type="xsd:integer" use="optional"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_EquationXml">
-    <xsd:sequence>
-      <xsd:any namespace="##any"/>
-    </xsd:sequence>
-    <xsd:attribute name="contentType" type="ST_AlternateMathContentType" use="optional"/>
-  </xsd:complexType>
-  <xsd:simpleType name="ST_AlternateMathContentType">
-    <xsd:restriction base="xsd:string"/>
-  </xsd:simpleType>
-  <xsd:complexType name="CT_RelationTable">
-    <xsd:sequence>
-      <xsd:element name="rel" type="CT_Relation" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attributeGroup ref="v:AG_Ext"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Relation">
-    <xsd:attributeGroup ref="v:AG_Ext"/>
-    <xsd:attribute name="idsrc" type="xsd:string" use="optional"/>
-    <xsd:attribute name="iddest" type="xsd:string" use="optional"/>
-    <xsd:attribute name="idcntr" type="xsd:string" use="optional"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_ColorMru">
-    <xsd:attributeGroup ref="v:AG_Ext"/>
-    <xsd:attribute name="colors" type="xsd:string"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_ColorMenu">
-    <xsd:attributeGroup ref="v:AG_Ext"/>
-    <xsd:attribute name="strokecolor" type="s:ST_ColorType"/>
-    <xsd:attribute name="fillcolor" type="s:ST_ColorType"/>
-    <xsd:attribute name="shadowcolor" type="s:ST_ColorType"/>
-    <xsd:attribute name="extrusioncolor" type="s:ST_ColorType"/>
-  </xsd:complexType>
-  <xsd:element name="skew" type="CT_Skew"/>
-  <xsd:element name="extrusion" type="CT_Extrusion"/>
-  <xsd:element name="callout" type="CT_Callout"/>
-  <xsd:element name="lock" type="CT_Lock"/>
-  <xsd:element name="OLEObject" type="CT_OLEObject"/>
-  <xsd:element name="complex" type="CT_Complex"/>
-  <xsd:element name="left" type="CT_StrokeChild"/>
-  <xsd:element name="top" type="CT_StrokeChild"/>
-  <xsd:element name="right" type="CT_StrokeChild"/>
-  <xsd:element name="bottom" type="CT_StrokeChild"/>
-  <xsd:element name="column" type="CT_StrokeChild"/>
-  <xsd:element name="clippath" type="CT_ClipPath"/>
-  <xsd:element name="fill" type="CT_Fill"/>
-  <xsd:complexType name="CT_Skew">
-    <xsd:attributeGroup ref="v:AG_Ext"/>
-    <xsd:attribute name="id" type="xsd:string" use="optional"/>
-    <xsd:attribute name="on" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="offset" type="xsd:string" use="optional"/>
-    <xsd:attribute name="origin" type="xsd:string" use="optional"/>
-    <xsd:attribute name="matrix" type="xsd:string" use="optional"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Extrusion">
-    <xsd:attributeGroup ref="v:AG_Ext"/>
-    <xsd:attribute name="on" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="type" type="ST_ExtrusionType" default="parallel" use="optional"/>
-    <xsd:attribute name="render" type="ST_ExtrusionRender" default="solid" use="optional"/>
-    <xsd:attribute name="viewpointorigin" type="xsd:string" use="optional"/>
-    <xsd:attribute name="viewpoint" type="xsd:string" use="optional"/>
-    <xsd:attribute name="plane" type="ST_ExtrusionPlane" default="XY" use="optional"/>
-    <xsd:attribute name="skewangle" type="xsd:float" use="optional"/>
-    <xsd:attribute name="skewamt" type="xsd:string" use="optional"/>
-    <xsd:attribute name="foredepth" type="xsd:string" use="optional"/>
-    <xsd:attribute name="backdepth" type="xsd:string" use="optional"/>
-    <xsd:attribute name="orientation" type="xsd:string" use="optional"/>
-    <xsd:attribute name="orientationangle" type="xsd:float" use="optional"/>
-    <xsd:attribute name="lockrotationcenter" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="autorotationcenter" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="rotationcenter" type="xsd:string" use="optional"/>
-    <xsd:attribute name="rotationangle" type="xsd:string" use="optional"/>
-    <xsd:attribute name="colormode" type="ST_ColorMode" use="optional"/>
-    <xsd:attribute name="color" type="s:ST_ColorType" use="optional"/>
-    <xsd:attribute name="shininess" type="xsd:float" use="optional"/>
-    <xsd:attribute name="specularity" type="xsd:string" use="optional"/>
-    <xsd:attribute name="diffusity" type="xsd:string" use="optional"/>
-    <xsd:attribute name="metal" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="edge" type="xsd:string" use="optional"/>
-    <xsd:attribute name="facet" type="xsd:string" use="optional"/>
-    <xsd:attribute name="lightface" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="brightness" type="xsd:string" use="optional"/>
-    <xsd:attribute name="lightposition" type="xsd:string" use="optional"/>
-    <xsd:attribute name="lightlevel" type="xsd:string" use="optional"/>
-    <xsd:attribute name="lightharsh" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="lightposition2" type="xsd:string" use="optional"/>
-    <xsd:attribute name="lightlevel2" type="xsd:string" use="optional"/>
-    <xsd:attribute name="lightharsh2" type="s:ST_TrueFalse" use="optional"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Callout">
-    <xsd:attributeGroup ref="v:AG_Ext"/>
-    <xsd:attribute name="on" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="type" type="xsd:string" use="optional"/>
-    <xsd:attribute name="gap" type="xsd:string" use="optional"/>
-    <xsd:attribute name="angle" type="ST_Angle" use="optional"/>
-    <xsd:attribute name="dropauto" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="drop" type="ST_CalloutDrop" use="optional"/>
-    <xsd:attribute name="distance" type="xsd:string" use="optional"/>
-    <xsd:attribute name="lengthspecified" type="s:ST_TrueFalse" default="f" use="optional"/>
-    <xsd:attribute name="length" type="xsd:string" use="optional"/>
-    <xsd:attribute name="accentbar" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="textborder" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="minusx" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="minusy" type="s:ST_TrueFalse" use="optional"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Lock">
-    <xsd:attributeGroup ref="v:AG_Ext"/>
-    <xsd:attribute name="position" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="selection" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="grouping" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="ungrouping" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="rotation" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="cropping" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="verticies" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="adjusthandles" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="text" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="aspectratio" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="shapetype" type="s:ST_TrueFalse" use="optional"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_OLEObject">
-    <xsd:sequence>
-      <xsd:element name="LinkType" type="ST_OLELinkType" minOccurs="0"/>
-      <xsd:element name="LockedField" type="s:ST_TrueFalseBlank" minOccurs="0"/>
-      <xsd:element name="FieldCodes" type="xsd:string" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="Type" type="ST_OLEType" use="optional"/>
-    <xsd:attribute name="ProgID" type="xsd:string" use="optional"/>
-    <xsd:attribute name="ShapeID" type="xsd:string" use="optional"/>
-    <xsd:attribute name="DrawAspect" type="ST_OLEDrawAspect" use="optional"/>
-    <xsd:attribute name="ObjectID" type="xsd:string" use="optional"/>
-    <xsd:attribute ref="r:id" use="optional"/>
-    <xsd:attribute name="UpdateMode" type="ST_OLEUpdateMode" use="optional"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Complex">
-    <xsd:attributeGroup ref="v:AG_Ext"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_StrokeChild">
-    <xsd:attributeGroup ref="v:AG_Ext"/>
-    <xsd:attribute name="on" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="weight" type="xsd:string" use="optional"/>
-    <xsd:attribute name="color" type="s:ST_ColorType" use="optional"/>
-    <xsd:attribute name="color2" type="s:ST_ColorType" use="optional"/>
-    <xsd:attribute name="opacity" type="xsd:string" use="optional"/>
-    <xsd:attribute name="linestyle" type="v:ST_StrokeLineStyle" use="optional"/>
-    <xsd:attribute name="miterlimit" type="xsd:decimal" use="optional"/>
-    <xsd:attribute name="joinstyle" type="v:ST_StrokeJoinStyle" use="optional"/>
-    <xsd:attribute name="endcap" type="v:ST_StrokeEndCap" use="optional"/>
-    <xsd:attribute name="dashstyle" type="xsd:string" use="optional"/>
-    <xsd:attribute name="insetpen" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="filltype" type="v:ST_FillType" use="optional"/>
-    <xsd:attribute name="src" type="xsd:string" use="optional"/>
-    <xsd:attribute name="imageaspect" type="v:ST_ImageAspect" use="optional"/>
-    <xsd:attribute name="imagesize" type="xsd:string" use="optional"/>
-    <xsd:attribute name="imagealignshape" type="s:ST_TrueFalse" use="optional"/>
-    <xsd:attribute name="startarrow" type="v:ST_StrokeArrowType" use="optional"/>
-    <xsd:attribute name="startarrowwidth" type="v:ST_StrokeArrowWidth" use="optional"/>
-    <xsd:attribute name="startarrowlength" type="v:ST_StrokeArrowLength" use="optional"/>
-    <xsd:attribute name="endarrow" type="v:ST_StrokeArrowType" use="optional"/>
-    <xsd:attribute name="endarrowwidth" type="v:ST_StrokeArrowWidth" use="optional"/>
-    <xsd:attribute name="endarrowlength" type="v:ST_StrokeArrowLength" use="optional"/>
-    <xsd:attribute ref="href"/>
-    <xsd:attribute ref="althref"/>
-    <xsd:attribute ref="title"/>
-    <xsd:attribute ref="forcedash"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_ClipPath">
-    <xsd:attribute name="v" type="xsd:string" use="required" form="qualified"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Fill">
-    <xsd:attributeGroup ref="v:AG_Ext"/>
-    <xsd:attribute name="type" type="ST_FillType"/>
-  </xsd:complexType>
-  <xsd:simpleType name="ST_RType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="arc"/>
-      <xsd:enumeration value="callout"/>
-      <xsd:enumeration value="connector"/>
-      <xsd:enumeration value="align"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_How">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="top"/>
-      <xsd:enumeration value="middle"/>
-      <xsd:enumeration value="bottom"/>
-      <xsd:enumeration value="left"/>
-      <xsd:enumeration value="center"/>
-      <xsd:enumeration value="right"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_BWMode">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="color"/>
-      <xsd:enumeration value="auto"/>
-      <xsd:enumeration value="grayScale"/>
-      <xsd:enumeration value="lightGrayscale"/>
-      <xsd:enumeration value="inverseGray"/>
-      <xsd:enumeration value="grayOutline"/>
-      <xsd:enumeration value="highContrast"/>
-      <xsd:enumeration value="black"/>
-      <xsd:enumeration value="white"/>
-      <xsd:enumeration value="hide"/>
-      <xsd:enumeration value="undrawn"/>
-      <xsd:enumeration value="blackTextAndLines"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_ScreenSize">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="544,376"/>
-      <xsd:enumeration value="640,480"/>
-      <xsd:enumeration value="720,512"/>
-      <xsd:enumeration value="800,600"/>
-      <xsd:enumeration value="1024,768"/>
-      <xsd:enumeration value="1152,862"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_InsetMode">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="auto"/>
-      <xsd:enumeration value="custom"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_ColorMode">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="auto"/>
-      <xsd:enumeration value="custom"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_ContentType">
-    <xsd:restriction base="xsd:string"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_DiagramLayout">
-    <xsd:restriction base="xsd:integer">
-      <xsd:enumeration value="0"/>
-      <xsd:enumeration value="1"/>
-      <xsd:enumeration value="2"/>
-      <xsd:enumeration value="3"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_ExtrusionType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="perspective"/>
-      <xsd:enumeration value="parallel"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_ExtrusionRender">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="solid"/>
-      <xsd:enumeration value="wireFrame"/>
-      <xsd:enumeration value="boundingCube"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_ExtrusionPlane">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="XY"/>
-      <xsd:enumeration value="ZX"/>
-      <xsd:enumeration value="YZ"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_Angle">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="any"/>
-      <xsd:enumeration value="30"/>
-      <xsd:enumeration value="45"/>
-      <xsd:enumeration value="60"/>
-      <xsd:enumeration value="90"/>
-      <xsd:enumeration value="auto"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_CalloutDrop">
-    <xsd:restriction base="xsd:string"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_CalloutPlacement">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="top"/>
-      <xsd:enumeration value="center"/>
-      <xsd:enumeration value="bottom"/>
-      <xsd:enumeration value="user"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_ConnectorType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="none"/>
-      <xsd:enumeration value="straight"/>
-      <xsd:enumeration value="elbow"/>
-      <xsd:enumeration value="curved"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_HrAlign">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="left"/>
-      <xsd:enumeration value="right"/>
-      <xsd:enumeration value="center"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_ConnectType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="none"/>
-      <xsd:enumeration value="rect"/>
-      <xsd:enumeration value="segments"/>
-      <xsd:enumeration value="custom"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_OLELinkType">
-    <xsd:restriction base="xsd:string"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_OLEType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="Embed"/>
-      <xsd:enumeration value="Link"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_OLEDrawAspect">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="Content"/>
-      <xsd:enumeration value="Icon"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_OLEUpdateMode">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="Always"/>
-      <xsd:enumeration value="OnCall"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_FillType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="gradientCenter"/>
-      <xsd:enumeration value="solid"/>
-      <xsd:enumeration value="pattern"/>
-      <xsd:enumeration value="tile"/>
-      <xsd:enumeration value="frame"/>
-      <xsd:enumeration value="gradientUnscaled"/>
-      <xsd:enumeration value="gradientRadial"/>
-      <xsd:enumeration value="gradient"/>
-      <xsd:enumeration value="background"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-</xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/ISO-IEC29500-4_2016/vml-presentationDrawing.xsd

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns="urn:schemas-microsoft-com:office:powerpoint"
-  targetNamespace="urn:schemas-microsoft-com:office:powerpoint" elementFormDefault="qualified"
-  attributeFormDefault="unqualified">
-  <xsd:element name="iscomment" type="CT_Empty"/>
-  <xsd:element name="textdata" type="CT_Rel"/>
-  <xsd:complexType name="CT_Empty"/>
-  <xsd:complexType name="CT_Rel">
-    <xsd:attribute name="id" type="xsd:string"/>
-  </xsd:complexType>
-</xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/ISO-IEC29500-4_2016/vml-spreadsheetDrawing.xsd

@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns="urn:schemas-microsoft-com:office:excel"
-  xmlns:s="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
-  targetNamespace="urn:schemas-microsoft-com:office:excel" elementFormDefault="qualified"
-  attributeFormDefault="unqualified">
-  <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
-    schemaLocation="shared-commonSimpleTypes.xsd"/>
-  <xsd:element name="ClientData" type="CT_ClientData"/>
-  <xsd:complexType name="CT_ClientData">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="MoveWithCells" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="SizeWithCells" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="Anchor" type="xsd:string"/>
-      <xsd:element name="Locked" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="DefaultSize" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="PrintObject" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="Disabled" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="AutoFill" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="AutoLine" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="AutoPict" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="FmlaMacro" type="xsd:string"/>
-      <xsd:element name="TextHAlign" type="xsd:string"/>
-      <xsd:element name="TextVAlign" type="xsd:string"/>
-      <xsd:element name="LockText" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="JustLastX" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="SecretEdit" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="Default" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="Help" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="Cancel" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="Dismiss" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="Accel" type="xsd:integer"/>
-      <xsd:element name="Accel2" type="xsd:integer"/>
-      <xsd:element name="Row" type="xsd:integer"/>
-      <xsd:element name="Column" type="xsd:integer"/>
-      <xsd:element name="Visible" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="RowHidden" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="ColHidden" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="VTEdit" type="xsd:integer"/>
-      <xsd:element name="MultiLine" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="VScroll" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="ValidIds" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="FmlaRange" type="xsd:string"/>
-      <xsd:element name="WidthMin" type="xsd:integer"/>
-      <xsd:element name="Sel" type="xsd:integer"/>
-      <xsd:element name="NoThreeD2" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="SelType" type="xsd:string"/>
-      <xsd:element name="MultiSel" type="xsd:string"/>
-      <xsd:element name="LCT" type="xsd:string"/>
-      <xsd:element name="ListItem" type="xsd:string"/>
-      <xsd:element name="DropStyle" type="xsd:string"/>
-      <xsd:element name="Colored" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="DropLines" type="xsd:integer"/>
-      <xsd:element name="Checked" type="xsd:integer"/>
-      <xsd:element name="FmlaLink" type="xsd:string"/>
-      <xsd:element name="FmlaPict" type="xsd:string"/>
-      <xsd:element name="NoThreeD" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="FirstButton" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="FmlaGroup" type="xsd:string"/>
-      <xsd:element name="Val" type="xsd:integer"/>
-      <xsd:element name="Min" type="xsd:integer"/>
-      <xsd:element name="Max" type="xsd:integer"/>
-      <xsd:element name="Inc" type="xsd:integer"/>
-      <xsd:element name="Page" type="xsd:integer"/>
-      <xsd:element name="Horiz" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="Dx" type="xsd:integer"/>
-      <xsd:element name="MapOCX" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="CF" type="ST_CF"/>
-      <xsd:element name="Camera" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="RecalcAlways" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="AutoScale" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="DDE" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="UIObj" type="s:ST_TrueFalseBlank"/>
-      <xsd:element name="ScriptText" type="xsd:string"/>
-      <xsd:element name="ScriptExtended" type="xsd:string"/>
-      <xsd:element name="ScriptLanguage" type="xsd:nonNegativeInteger"/>
-      <xsd:element name="ScriptLocation" type="xsd:nonNegativeInteger"/>
-      <xsd:element name="FmlaTxbx" type="xsd:string"/>
-    </xsd:choice>
-    <xsd:attribute name="ObjectType" type="ST_ObjectType" use="required"/>
-  </xsd:complexType>
-  <xsd:simpleType name="ST_CF">
-    <xsd:restriction base="xsd:string"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_ObjectType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="Button"/>
-      <xsd:enumeration value="Checkbox"/>
-      <xsd:enumeration value="Dialog"/>
-      <xsd:enumeration value="Drop"/>
-      <xsd:enumeration value="Edit"/>
-      <xsd:enumeration value="GBox"/>
-      <xsd:enumeration value="Label"/>
-      <xsd:enumeration value="LineA"/>
-      <xsd:enumeration value="List"/>
-      <xsd:enumeration value="Movie"/>
-      <xsd:enumeration value="Note"/>
-      <xsd:enumeration value="Pict"/>
-      <xsd:enumeration value="Radio"/>
-      <xsd:enumeration value="RectA"/>
-      <xsd:enumeration value="Scroll"/>
-      <xsd:enumeration value="Spin"/>
-      <xsd:enumeration value="Shape"/>
-      <xsd:enumeration value="Group"/>
-      <xsd:enumeration value="Rect"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-</xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/ISO-IEC29500-4_2016/vml-wordprocessingDrawing.xsd

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns="urn:schemas-microsoft-com:office:word"
-  targetNamespace="urn:schemas-microsoft-com:office:word" elementFormDefault="qualified"
-  attributeFormDefault="unqualified">
-  <xsd:element name="bordertop" type="CT_Border"/>
-  <xsd:element name="borderleft" type="CT_Border"/>
-  <xsd:element name="borderright" type="CT_Border"/>
-  <xsd:element name="borderbottom" type="CT_Border"/>
-  <xsd:complexType name="CT_Border">
-    <xsd:attribute name="type" type="ST_BorderType" use="optional"/>
-    <xsd:attribute name="width" type="xsd:positiveInteger" use="optional"/>
-    <xsd:attribute name="shadow" type="ST_BorderShadow" use="optional"/>
-  </xsd:complexType>
-  <xsd:element name="wrap" type="CT_Wrap"/>
-  <xsd:complexType name="CT_Wrap">
-    <xsd:attribute name="type" type="ST_WrapType" use="optional"/>
-    <xsd:attribute name="side" type="ST_WrapSide" use="optional"/>
-    <xsd:attribute name="anchorx" type="ST_HorizontalAnchor" use="optional"/>
-    <xsd:attribute name="anchory" type="ST_VerticalAnchor" use="optional"/>
-  </xsd:complexType>
-  <xsd:element name="anchorlock" type="CT_AnchorLock"/>
-  <xsd:complexType name="CT_AnchorLock"/>
-  <xsd:simpleType name="ST_BorderType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="none"/>
-      <xsd:enumeration value="single"/>
-      <xsd:enumeration value="thick"/>
-      <xsd:enumeration value="double"/>
-      <xsd:enumeration value="hairline"/>
-      <xsd:enumeration value="dot"/>
-      <xsd:enumeration value="dash"/>
-      <xsd:enumeration value="dotDash"/>
-      <xsd:enumeration value="dashDotDot"/>
-      <xsd:enumeration value="triple"/>
-      <xsd:enumeration value="thinThickSmall"/>
-      <xsd:enumeration value="thickThinSmall"/>
-      <xsd:enumeration value="thickBetweenThinSmall"/>
-      <xsd:enumeration value="thinThick"/>
-      <xsd:enumeration value="thickThin"/>
-      <xsd:enumeration value="thickBetweenThin"/>
-      <xsd:enumeration value="thinThickLarge"/>
-      <xsd:enumeration value="thickThinLarge"/>
-      <xsd:enumeration value="thickBetweenThinLarge"/>
-      <xsd:enumeration value="wave"/>
-      <xsd:enumeration value="doubleWave"/>
-      <xsd:enumeration value="dashedSmall"/>
-      <xsd:enumeration value="dashDotStroked"/>
-      <xsd:enumeration value="threeDEmboss"/>
-      <xsd:enumeration value="threeDEngrave"/>
-      <xsd:enumeration value="HTMLOutset"/>
-      <xsd:enumeration value="HTMLInset"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_BorderShadow">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="t"/>
-      <xsd:enumeration value="true"/>
-      <xsd:enumeration value="f"/>
-      <xsd:enumeration value="false"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_WrapType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="topAndBottom"/>
-      <xsd:enumeration value="square"/>
-      <xsd:enumeration value="none"/>
-      <xsd:enumeration value="tight"/>
-      <xsd:enumeration value="through"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_WrapSide">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="both"/>
-      <xsd:enumeration value="left"/>
-      <xsd:enumeration value="right"/>
-      <xsd:enumeration value="largest"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_HorizontalAnchor">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="margin"/>
-      <xsd:enumeration value="page"/>
-      <xsd:enumeration value="text"/>
-      <xsd:enumeration value="char"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_VerticalAnchor">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="margin"/>
-      <xsd:enumeration value="page"/>
-      <xsd:enumeration value="text"/>
-      <xsd:enumeration value="line"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-</xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/ISO-IEC29500-4_2016/xml.xsd

@@ -1,116 +0,0 @@
-<?xml version='1.0'?>
-<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
-
- <xs:annotation>
-  <xs:documentation>
-   See http://www.w3.org/XML/1998/namespace.html and
-   http://www.w3.org/TR/REC-xml for information about this namespace.
-
-    This schema document describes the XML namespace, in a form
-    suitable for import by other schema documents.  
-
-    Note that local names in this namespace are intended to be defined
-    only by the World Wide Web Consortium or its subgroups.  The
-    following names are currently defined in this namespace and should
-    not be used with conflicting semantics by any Working Group,
-    specification, or document instance:
-
-    base (as an attribute name): denotes an attribute whose value
-         provides a URI to be used as the base for interpreting any
-         relative URIs in the scope of the element on which it
-         appears; its value is inherited.  This name is reserved
-         by virtue of its definition in the XML Base specification.
-
-    lang (as an attribute name): denotes an attribute whose value
-         is a language code for the natural language of the content of
-         any element; its value is inherited.  This name is reserved
-         by virtue of its definition in the XML specification.
-  
-    space (as an attribute name): denotes an attribute whose
-         value is a keyword indicating what whitespace processing
-         discipline is intended for the content of the element; its
-         value is inherited.  This name is reserved by virtue of its
-         definition in the XML specification.
-
-    Father (in any context at all): denotes Jon Bosak, the chair of 
-         the original XML Working Group.  This name is reserved by 
-         the following decision of the W3C XML Plenary and 
-         XML Coordination groups:
-
-             In appreciation for his vision, leadership and dedication
-             the W3C XML Plenary on this 10th day of February, 2000
-             reserves for Jon Bosak in perpetuity the XML name
-             xml:Father
-  </xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
-  <xs:documentation>This schema defines attributes and an attribute group
-        suitable for use by
-        schemas wishing to allow xml:base, xml:lang or xml:space attributes
-        on elements they define.
-
-        To enable this, such a schema must import this schema
-        for the XML namespace, e.g. as follows:
-        &lt;schema . . .>
-         . . .
-         &lt;import namespace="http://www.w3.org/XML/1998/namespace"
-                    schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>
-
-        Subsequently, qualified reference to any of the attributes
-        or the group defined below will have the desired effect, e.g.
-
-        &lt;type . . .>
-         . . .
-         &lt;attributeGroup ref="xml:specialAttrs"/>
- 
-         will define a type which will schema-validate an instance
-         element with any of those attributes</xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
-  <xs:documentation>In keeping with the XML Schema WG's standard versioning
-   policy, this schema document will persist at
-   http://www.w3.org/2001/03/xml.xsd.
-   At the date of issue it can also be found at
-   http://www.w3.org/2001/xml.xsd.
-   The schema document at that URI may however change in the future,
-   in order to remain compatible with the latest version of XML Schema
-   itself.  In other words, if the XML Schema namespace changes, the version
-   of this document at
-   http://www.w3.org/2001/xml.xsd will change
-   accordingly; the version at
-   http://www.w3.org/2001/03/xml.xsd will not change.
-  </xs:documentation>
- </xs:annotation>
-
- <xs:attribute name="lang" type="xs:language">
-  <xs:annotation>
-   <xs:documentation>In due course, we should install the relevant ISO 2- and 3-letter
-         codes as the enumerated possible values . . .</xs:documentation>
-  </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="space" default="preserve">
-  <xs:simpleType>
-   <xs:restriction base="xs:NCName">
-    <xs:enumeration value="default"/>
-    <xs:enumeration value="preserve"/>
-   </xs:restriction>
-  </xs:simpleType>
- </xs:attribute>
-
- <xs:attribute name="base" type="xs:anyURI">
-  <xs:annotation>
-   <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
-                     information about this attribute.</xs:documentation>
-  </xs:annotation>
- </xs:attribute>
-
- <xs:attributeGroup name="specialAttrs">
-  <xs:attribute ref="xml:base"/>
-  <xs:attribute ref="xml:lang"/>
-  <xs:attribute ref="xml:space"/>
- </xs:attributeGroup>
-
-</xs:schema>

.agents/skills/xlsx/scripts/office/schemas/ecma/fouth-edition/opc-contentTypes.xsd

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<xs:schema xmlns="http://schemas.openxmlformats.org/package/2006/content-types"
-  xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  targetNamespace="http://schemas.openxmlformats.org/package/2006/content-types"
-  elementFormDefault="qualified" attributeFormDefault="unqualified" blockDefault="#all">
-
-  <xs:element name="Types" type="CT_Types"/>
-  <xs:element name="Default" type="CT_Default"/>
-  <xs:element name="Override" type="CT_Override"/>
-
-  <xs:complexType name="CT_Types">
-    <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:element ref="Default"/>
-      <xs:element ref="Override"/>
-    </xs:choice>
-  </xs:complexType>
-
-  <xs:complexType name="CT_Default">
-    <xs:attribute name="Extension" type="ST_Extension" use="required"/>
-    <xs:attribute name="ContentType" type="ST_ContentType" use="required"/>
-  </xs:complexType>
-
-  <xs:complexType name="CT_Override">
-    <xs:attribute name="ContentType" type="ST_ContentType" use="required"/>
-    <xs:attribute name="PartName" type="xs:anyURI" use="required"/>
-  </xs:complexType>
-
-  <xs:simpleType name="ST_ContentType">
-    <xs:restriction base="xs:string">
-      <xs:pattern
-        value="(((([\p{IsBasicLatin}-[\p{Cc}&#127;\(\)&lt;&gt;@,;:\\&quot;/\[\]\?=\{\}\s\t]])+))/((([\p{IsBasicLatin}-[\p{Cc}&#127;\(\)&lt;&gt;@,;:\\&quot;/\[\]\?=\{\}\s\t]])+))((\s+)*;(\s+)*(((([\p{IsBasicLatin}-[\p{Cc}&#127;\(\)&lt;&gt;@,;:\\&quot;/\[\]\?=\{\}\s\t]])+))=((([\p{IsBasicLatin}-[\p{Cc}&#127;\(\)&lt;&gt;@,;:\\&quot;/\[\]\?=\{\}\s\t]])+)|(&quot;(([\p{IsLatin-1Supplement}\p{IsBasicLatin}-[\p{Cc}&#127;&quot;\n\r]]|(\s+))|(\\[\p{IsBasicLatin}]))*&quot;))))*)"
-      />
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="ST_Extension">
-    <xs:restriction base="xs:string">
-      <xs:pattern
-        value="([!$&amp;'\(\)\*\+,:=]|(%[0-9a-fA-F][0-9a-fA-F])|[:@]|[a-zA-Z0-9\-_~])+"/>
-    </xs:restriction>
-  </xs:simpleType>
-</xs:schema>

.agents/skills/xlsx/scripts/office/schemas/ecma/fouth-edition/opc-coreProperties.xsd

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://schemas.openxmlformats.org/package/2006/metadata/core-properties"
-  xmlns="http://schemas.openxmlformats.org/package/2006/metadata/core-properties"
-  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dc="http://purl.org/dc/elements/1.1/"
-  xmlns:dcterms="http://purl.org/dc/terms/" elementFormDefault="qualified" blockDefault="#all">
-
-  <xs:import namespace="http://purl.org/dc/elements/1.1/"
-    schemaLocation="http://dublincore.org/schemas/xmls/qdc/2003/04/02/dc.xsd"/>
-  <xs:import namespace="http://purl.org/dc/terms/"
-    schemaLocation="http://dublincore.org/schemas/xmls/qdc/2003/04/02/dcterms.xsd"/>
-  <xs:import id="xml" namespace="http://www.w3.org/XML/1998/namespace"/>
-
-  <xs:element name="coreProperties" type="CT_CoreProperties"/>
-
-  <xs:complexType name="CT_CoreProperties">
-    <xs:all>
-      <xs:element name="category" minOccurs="0" maxOccurs="1" type="xs:string"/>
-      <xs:element name="contentStatus" minOccurs="0" maxOccurs="1" type="xs:string"/>
-      <xs:element ref="dcterms:created" minOccurs="0" maxOccurs="1"/>
-      <xs:element ref="dc:creator" minOccurs="0" maxOccurs="1"/>
-      <xs:element ref="dc:description" minOccurs="0" maxOccurs="1"/>
-      <xs:element ref="dc:identifier" minOccurs="0" maxOccurs="1"/>
-      <xs:element name="keywords" minOccurs="0" maxOccurs="1" type="CT_Keywords"/>
-      <xs:element ref="dc:language" minOccurs="0" maxOccurs="1"/>
-      <xs:element name="lastModifiedBy" minOccurs="0" maxOccurs="1" type="xs:string"/>
-      <xs:element name="lastPrinted" minOccurs="0" maxOccurs="1" type="xs:dateTime"/>
-      <xs:element ref="dcterms:modified" minOccurs="0" maxOccurs="1"/>
-      <xs:element name="revision" minOccurs="0" maxOccurs="1" type="xs:string"/>
-      <xs:element ref="dc:subject" minOccurs="0" maxOccurs="1"/>
-      <xs:element ref="dc:title" minOccurs="0" maxOccurs="1"/>
-      <xs:element name="version" minOccurs="0" maxOccurs="1" type="xs:string"/>
-    </xs:all>
-  </xs:complexType>
-
-  <xs:complexType name="CT_Keywords" mixed="true">
-    <xs:sequence>
-      <xs:element name="value" minOccurs="0" maxOccurs="unbounded" type="CT_Keyword"/>
-    </xs:sequence>
-    <xs:attribute ref="xml:lang" use="optional"/>
-  </xs:complexType>
-
-  <xs:complexType name="CT_Keyword">
-    <xs:simpleContent>
-      <xs:extension base="xs:string">
-        <xs:attribute ref="xml:lang" use="optional"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-</xs:schema>

.agents/skills/xlsx/scripts/office/schemas/ecma/fouth-edition/opc-digSig.xsd

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://schemas.openxmlformats.org/package/2006/digital-signature"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  targetNamespace="http://schemas.openxmlformats.org/package/2006/digital-signature"
-  elementFormDefault="qualified" attributeFormDefault="unqualified" blockDefault="#all">
-
-  <xsd:element name="SignatureTime" type="CT_SignatureTime"/>
-  <xsd:element name="RelationshipReference" type="CT_RelationshipReference"/>
-  <xsd:element name="RelationshipsGroupReference" type="CT_RelationshipsGroupReference"/>
-
-  <xsd:complexType name="CT_SignatureTime">
-    <xsd:sequence>
-      <xsd:element name="Format" type="ST_Format"/>
-      <xsd:element name="Value" type="ST_Value"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="CT_RelationshipReference">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-        <xsd:attribute name="SourceId" type="xsd:string" use="required"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-  <xsd:complexType name="CT_RelationshipsGroupReference">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-        <xsd:attribute name="SourceType" type="xsd:anyURI" use="required"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-  <xsd:simpleType name="ST_Format">
-    <xsd:restriction base="xsd:string">
-      <xsd:pattern
-        value="(YYYY)|(YYYY-MM)|(YYYY-MM-DD)|(YYYY-MM-DDThh:mmTZD)|(YYYY-MM-DDThh:mm:ssTZD)|(YYYY-MM-DDThh:mm:ss.sTZD)"
-      />
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="ST_Value">
-    <xsd:restriction base="xsd:string">
-      <xsd:pattern
-        value="(([0-9][0-9][0-9][0-9]))|(([0-9][0-9][0-9][0-9])-((0[1-9])|(1(0|1|2))))|(([0-9][0-9][0-9][0-9])-((0[1-9])|(1(0|1|2)))-((0[1-9])|(1[0-9])|(2[0-9])|(3(0|1))))|(([0-9][0-9][0-9][0-9])-((0[1-9])|(1(0|1|2)))-((0[1-9])|(1[0-9])|(2[0-9])|(3(0|1)))T((0[0-9])|(1[0-9])|(2(0|1|2|3))):((0[0-9])|(1[0-9])|(2[0-9])|(3[0-9])|(4[0-9])|(5[0-9]))(((\+|-)((0[0-9])|(1[0-9])|(2(0|1|2|3))):((0[0-9])|(1[0-9])|(2[0-9])|(3[0-9])|(4[0-9])|(5[0-9])))|Z))|(([0-9][0-9][0-9][0-9])-((0[1-9])|(1(0|1|2)))-((0[1-9])|(1[0-9])|(2[0-9])|(3(0|1)))T((0[0-9])|(1[0-9])|(2(0|1|2|3))):((0[0-9])|(1[0-9])|(2[0-9])|(3[0-9])|(4[0-9])|(5[0-9])):((0[0-9])|(1[0-9])|(2[0-9])|(3[0-9])|(4[0-9])|(5[0-9]))(((\+|-)((0[0-9])|(1[0-9])|(2(0|1|2|3))):((0[0-9])|(1[0-9])|(2[0-9])|(3[0-9])|(4[0-9])|(5[0-9])))|Z))|(([0-9][0-9][0-9][0-9])-((0[1-9])|(1(0|1|2)))-((0[1-9])|(1[0-9])|(2[0-9])|(3(0|1)))T((0[0-9])|(1[0-9])|(2(0|1|2|3))):((0[0-9])|(1[0-9])|(2[0-9])|(3[0-9])|(4[0-9])|(5[0-9])):(((0[0-9])|(1[0-9])|(2[0-9])|(3[0-9])|(4[0-9])|(5[0-9]))\.[0-9])(((\+|-)((0[0-9])|(1[0-9])|(2(0|1|2|3))):((0[0-9])|(1[0-9])|(2[0-9])|(3[0-9])|(4[0-9])|(5[0-9])))|Z))"
-      />
-    </xsd:restriction>
-  </xsd:simpleType>
-</xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/ecma/fouth-edition/opc-relationships.xsd

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<xsd:schema xmlns="http://schemas.openxmlformats.org/package/2006/relationships"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  targetNamespace="http://schemas.openxmlformats.org/package/2006/relationships"
-  elementFormDefault="qualified" attributeFormDefault="unqualified" blockDefault="#all">
-
-  <xsd:element name="Relationships" type="CT_Relationships"/>
-  <xsd:element name="Relationship" type="CT_Relationship"/>
-
-  <xsd:complexType name="CT_Relationships">
-    <xsd:sequence>
-      <xsd:element ref="Relationship" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="CT_Relationship">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-        <xsd:attribute name="TargetMode" type="ST_TargetMode" use="optional"/>
-        <xsd:attribute name="Target" type="xsd:anyURI" use="required"/>
-        <xsd:attribute name="Type" type="xsd:anyURI" use="required"/>
-        <xsd:attribute name="Id" type="xsd:ID" use="required"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-  <xsd:simpleType name="ST_TargetMode">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="External"/>
-      <xsd:enumeration value="Internal"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-</xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/mce/mc.xsd

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsd:schema xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	attributeFormDefault="unqualified" elementFormDefault="qualified"
-	targetNamespace="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <!--
-    This XSD is a modified version of the one found at:
-    https://github.com/plutext/docx4j/blob/master/xsd/mce/markup-compatibility-2006-MINIMAL.xsd
-
-    This XSD has 2 objectives:
-
-        1. round tripping @mc:Ignorable
-
-			<w:document
-			            xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-			            xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
-			            mc:Ignorable="w14 w15 wp14">
-
-        2. enabling AlternateContent to be manipulated in certain elements
-           (in the unusual case where the content model is xsd:any, it doesn't have to be explicitly added)
-
-		See further ECMA-376, 4th Edition, Office Open XML File Formats
-		Part 3 : Markup Compatibility and Extensibility
-   -->
-
-  <!--  Objective 1 -->
-  <xsd:attribute name="Ignorable" type="xsd:string" />
-
-  <!--  Objective 2 -->
-	<xsd:attribute name="MustUnderstand" type="xsd:string"  />
-	<xsd:attribute name="ProcessContent" type="xsd:string"  />
-
-<!-- An AlternateContent element shall contain one or more Choice child elements, optionally followed by a
-Fallback child element. If present, there shall be only one Fallback element, and it shall follow all Choice
-elements. -->
-	<xsd:element name="AlternateContent">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="Choice" minOccurs="0" maxOccurs="unbounded">
-					<xsd:complexType>
-						<xsd:sequence>
-							<xsd:any minOccurs="0" maxOccurs="unbounded"
-								processContents="strict">
-							</xsd:any>
-						</xsd:sequence>
-						<xsd:attribute name="Requires" type="xsd:string" use="required" />
-						<xsd:attribute ref="mc:Ignorable" use="optional" />
-						<xsd:attribute ref="mc:MustUnderstand" use="optional" />
-						<xsd:attribute ref="mc:ProcessContent" use="optional" />
-					</xsd:complexType>
-				</xsd:element>
-				<xsd:element name="Fallback" minOccurs="0" maxOccurs="1">
-					<xsd:complexType>
-						<xsd:sequence>
-							<xsd:any minOccurs="0" maxOccurs="unbounded"
-								processContents="strict">
-							</xsd:any>
-						</xsd:sequence>
-						<xsd:attribute ref="mc:Ignorable" use="optional" />
-						<xsd:attribute ref="mc:MustUnderstand" use="optional" />
-						<xsd:attribute ref="mc:ProcessContent" use="optional" />
-					</xsd:complexType>
-				</xsd:element>
-			</xsd:sequence>
-			<!-- AlternateContent elements might include the attributes Ignorable,
-				MustUnderstand and ProcessContent described in this Part of ECMA-376. These
-				attributes’ qualified names shall be prefixed when associated with an AlternateContent
-				element. -->
-			<xsd:attribute ref="mc:Ignorable" use="optional" />
-			<xsd:attribute ref="mc:MustUnderstand" use="optional" />
-			<xsd:attribute ref="mc:ProcessContent" use="optional" />
-		</xsd:complexType>
-	</xsd:element>
-</xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/microsoft/wml-2010.xsd

@@ -1,560 +0,0 @@
- <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:w12="http://schemas.openxmlformats.org/wordprocessingml/2006/main" elementFormDefault="qualified" attributeFormDefault="qualified" blockDefault="#all" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:s="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns="http://schemas.microsoft.com/office/word/2010/wordml" targetNamespace="http://schemas.microsoft.com/office/word/2010/wordml">
-   <!-- <xsd:import id="rel" namespace="http://schemas.openxmlformats.org/officeDocument/2006/relationships" schemaLocation="orel.xsd"/> -->
-   <xsd:import id="w" namespace="http://schemas.openxmlformats.org/wordprocessingml/2006/main" schemaLocation="../ISO-IEC29500-4_2016/wml.xsd"/>
-   <!-- <xsd:import namespace="http://schemas.openxmlformats.org/drawingml/2006/main" schemaLocation="oartbasetypes.xsd"/>
-   <xsd:import namespace="http://schemas.openxmlformats.org/drawingml/2006/main" schemaLocation="oartsplineproperties.xsd"/> -->
-   <xsd:complexType name="CT_LongHexNumber">
-     <xsd:attribute name="val" type="w:ST_LongHexNumber" use="required"/>
-   </xsd:complexType>
-   <xsd:simpleType name="ST_OnOff">
-     <xsd:restriction base="xsd:string">
-       <xsd:enumeration value="true"/>
-       <xsd:enumeration value="false"/>
-       <xsd:enumeration value="0"/>
-       <xsd:enumeration value="1"/>
-     </xsd:restriction>
-   </xsd:simpleType>
-   <xsd:complexType name="CT_OnOff">
-     <xsd:attribute name="val" type="ST_OnOff"/>
-   </xsd:complexType>
-   <xsd:element name="docId" type="CT_LongHexNumber"/>
-   <xsd:element name="conflictMode" type="CT_OnOff"/>
-   <xsd:attributeGroup name="AG_Parids">
-     <xsd:attribute name="paraId" type="w:ST_LongHexNumber"/>
-     <xsd:attribute name="textId" type="w:ST_LongHexNumber"/>
-   </xsd:attributeGroup>
-   <xsd:attribute name="anchorId" type="w:ST_LongHexNumber"/>
-   <xsd:attribute name="noSpellErr" type="ST_OnOff"/>
-   <xsd:element name="customXmlConflictInsRangeStart" type="w:CT_TrackChange"/>
-   <xsd:element name="customXmlConflictInsRangeEnd" type="w:CT_Markup"/>
-   <xsd:element name="customXmlConflictDelRangeStart" type="w:CT_TrackChange"/>
-   <xsd:element name="customXmlConflictDelRangeEnd" type="w:CT_Markup"/>
-   <xsd:group name="EG_RunLevelConflicts">
-     <xsd:sequence>
-       <xsd:element name="conflictIns" type="w:CT_RunTrackChange" minOccurs="0"/>
-       <xsd:element name="conflictDel" type="w:CT_RunTrackChange" minOccurs="0"/>
-     </xsd:sequence>
-   </xsd:group>
-   <xsd:group name="EG_Conflicts">
-     <xsd:choice>
-       <xsd:element name="conflictIns" type="w:CT_TrackChange" minOccurs="0"/>
-       <xsd:element name="conflictDel" type="w:CT_TrackChange" minOccurs="0"/>
-     </xsd:choice>
-   </xsd:group>
-   <xsd:complexType name="CT_Percentage">
-     <xsd:attribute name="val" type="a:ST_Percentage" use="required"/>
-   </xsd:complexType>
-   <xsd:complexType name="CT_PositiveFixedPercentage">
-     <xsd:attribute name="val" type="a:ST_PositiveFixedPercentage" use="required"/>
-   </xsd:complexType>
-   <xsd:complexType name="CT_PositivePercentage">
-     <xsd:attribute name="val" type="a:ST_PositivePercentage" use="required"/>
-   </xsd:complexType>
-   <xsd:simpleType name="ST_SchemeColorVal">
-     <xsd:restriction base="xsd:string">
-       <xsd:enumeration value="bg1"/>
-       <xsd:enumeration value="tx1"/>
-       <xsd:enumeration value="bg2"/>
-       <xsd:enumeration value="tx2"/>
-       <xsd:enumeration value="accent1"/>
-       <xsd:enumeration value="accent2"/>
-       <xsd:enumeration value="accent3"/>
-       <xsd:enumeration value="accent4"/>
-       <xsd:enumeration value="accent5"/>
-       <xsd:enumeration value="accent6"/>
-       <xsd:enumeration value="hlink"/>
-       <xsd:enumeration value="folHlink"/>
-       <xsd:enumeration value="dk1"/>
-       <xsd:enumeration value="lt1"/>
-       <xsd:enumeration value="dk2"/>
-       <xsd:enumeration value="lt2"/>
-       <xsd:enumeration value="phClr"/>
-     </xsd:restriction>
-   </xsd:simpleType>
-   <xsd:simpleType name="ST_RectAlignment">
-     <xsd:restriction base="xsd:string">
-       <xsd:enumeration value="none"/>
-       <xsd:enumeration value="tl"/>
-       <xsd:enumeration value="t"/>
-       <xsd:enumeration value="tr"/>
-       <xsd:enumeration value="l"/>
-       <xsd:enumeration value="ctr"/>
-       <xsd:enumeration value="r"/>
-       <xsd:enumeration value="bl"/>
-       <xsd:enumeration value="b"/>
-       <xsd:enumeration value="br"/>
-     </xsd:restriction>
-   </xsd:simpleType>
-   <xsd:simpleType name="ST_PathShadeType">
-     <xsd:restriction base="xsd:string">
-       <xsd:enumeration value="shape"/>
-       <xsd:enumeration value="circle"/>
-       <xsd:enumeration value="rect"/>
-     </xsd:restriction>
-   </xsd:simpleType>
-   <xsd:simpleType name="ST_LineCap">
-     <xsd:restriction base="xsd:string">
-       <xsd:enumeration value="rnd"/>
-       <xsd:enumeration value="sq"/>
-       <xsd:enumeration value="flat"/>
-     </xsd:restriction>
-   </xsd:simpleType>
-   <xsd:simpleType name="ST_PresetLineDashVal">
-     <xsd:restriction base="xsd:string">
-       <xsd:enumeration value="solid"/>
-       <xsd:enumeration value="dot"/>
-       <xsd:enumeration value="sysDot"/>
-       <xsd:enumeration value="dash"/>
-       <xsd:enumeration value="sysDash"/>
-       <xsd:enumeration value="lgDash"/>
-       <xsd:enumeration value="dashDot"/>
-       <xsd:enumeration value="sysDashDot"/>
-       <xsd:enumeration value="lgDashDot"/>
-       <xsd:enumeration value="lgDashDotDot"/>
-       <xsd:enumeration value="sysDashDotDot"/>
-     </xsd:restriction>
-   </xsd:simpleType>
-   <xsd:simpleType name="ST_PenAlignment">
-     <xsd:restriction base="xsd:string">
-       <xsd:enumeration value="ctr"/>
-       <xsd:enumeration value="in"/>
-     </xsd:restriction>
-   </xsd:simpleType>
-   <xsd:simpleType name="ST_CompoundLine">
-     <xsd:restriction base="xsd:string">
-       <xsd:enumeration value="sng"/>
-       <xsd:enumeration value="dbl"/>
-       <xsd:enumeration value="thickThin"/>
-       <xsd:enumeration value="thinThick"/>
-       <xsd:enumeration value="tri"/>
-     </xsd:restriction>
-   </xsd:simpleType>
-   <xsd:complexType name="CT_RelativeRect">
-     <xsd:attribute name="l" use="optional" type="a:ST_Percentage"/>
-     <xsd:attribute name="t" use="optional" type="a:ST_Percentage"/>
-     <xsd:attribute name="r" use="optional" type="a:ST_Percentage"/>
-     <xsd:attribute name="b" use="optional" type="a:ST_Percentage"/>
-   </xsd:complexType>
-   <xsd:group name="EG_ColorTransform">
-     <xsd:choice>
-       <xsd:element name="tint" type="CT_PositiveFixedPercentage"/>
-       <xsd:element name="shade" type="CT_PositiveFixedPercentage"/>
-       <xsd:element name="alpha" type="CT_PositiveFixedPercentage"/>
-       <xsd:element name="hueMod" type="CT_PositivePercentage"/>
-       <xsd:element name="sat" type="CT_Percentage"/>
-       <xsd:element name="satOff" type="CT_Percentage"/>
-       <xsd:element name="satMod" type="CT_Percentage"/>
-       <xsd:element name="lum" type="CT_Percentage"/>
-       <xsd:element name="lumOff" type="CT_Percentage"/>
-       <xsd:element name="lumMod" type="CT_Percentage"/>
-     </xsd:choice>
-   </xsd:group>
-   <xsd:complexType name="CT_SRgbColor">
-     <xsd:sequence>
-       <xsd:group ref="EG_ColorTransform" minOccurs="0" maxOccurs="unbounded"/>
-     </xsd:sequence>
-     <xsd:attribute name="val" type="s:ST_HexColorRGB" use="required"/>
-   </xsd:complexType>
-   <xsd:complexType name="CT_SchemeColor">
-     <xsd:sequence>
-       <xsd:group ref="EG_ColorTransform" minOccurs="0" maxOccurs="unbounded"/>
-     </xsd:sequence>
-     <xsd:attribute name="val" type="ST_SchemeColorVal" use="required"/>
-   </xsd:complexType>
-   <xsd:group name="EG_ColorChoice">
-     <xsd:choice>
-       <xsd:element name="srgbClr" type="CT_SRgbColor"/>
-       <xsd:element name="schemeClr" type="CT_SchemeColor"/>
-     </xsd:choice>
-   </xsd:group>
-   <xsd:complexType name="CT_Color">
-     <xsd:sequence>
-       <xsd:group ref="EG_ColorChoice"/>
-     </xsd:sequence>
-   </xsd:complexType>
-   <xsd:complexType name="CT_GradientStop">
-     <xsd:sequence>
-       <xsd:group ref="EG_ColorChoice"/>
-     </xsd:sequence>
-     <xsd:attribute name="pos" type="a:ST_PositiveFixedPercentage" use="required"/>
-   </xsd:complexType>
-   <xsd:complexType name="CT_GradientStopList">
-     <xsd:sequence>
-       <xsd:element name="gs" type="CT_GradientStop" minOccurs="2" maxOccurs="10"/>
-     </xsd:sequence>
-   </xsd:complexType>
-   <xsd:complexType name="CT_LinearShadeProperties">
-     <xsd:attribute name="ang" type="a:ST_PositiveFixedAngle" use="optional"/>
-     <xsd:attribute name="scaled" type="ST_OnOff" use="optional"/>
-   </xsd:complexType>
-   <xsd:complexType name="CT_PathShadeProperties">
-     <xsd:sequence>
-       <xsd:element name="fillToRect" type="CT_RelativeRect" minOccurs="0"/>
-     </xsd:sequence>
-     <xsd:attribute name="path" type="ST_PathShadeType" use="optional"/>
-   </xsd:complexType>
-   <xsd:group name="EG_ShadeProperties">
-     <xsd:choice>
-       <xsd:element name="lin" type="CT_LinearShadeProperties"/>
-       <xsd:element name="path" type="CT_PathShadeProperties"/>
-     </xsd:choice>
-   </xsd:group>
-   <xsd:complexType name="CT_SolidColorFillProperties">
-     <xsd:sequence>
-       <xsd:group ref="EG_ColorChoice" minOccurs="0"/>
-     </xsd:sequence>
-   </xsd:complexType>
-   <xsd:complexType name="CT_GradientFillProperties">
-     <xsd:sequence>
-       <xsd:element name="gsLst" type="CT_GradientStopList" minOccurs="0"/>
-       <xsd:group ref="EG_ShadeProperties" minOccurs="0"/>
-     </xsd:sequence>
-   </xsd:complexType>
-   <xsd:group name="EG_FillProperties">
-     <xsd:choice>
-       <xsd:element name="noFill" type="w:CT_Empty"/>
-       <xsd:element name="solidFill" type="CT_SolidColorFillProperties"/>
-       <xsd:element name="gradFill" type="CT_GradientFillProperties"/>
-     </xsd:choice>
-   </xsd:group>
-   <xsd:complexType name="CT_PresetLineDashProperties">
-     <xsd:attribute name="val" type="ST_PresetLineDashVal" use="optional"/>
-   </xsd:complexType>
-   <xsd:group name="EG_LineDashProperties">
-     <xsd:choice>
-       <xsd:element name="prstDash" type="CT_PresetLineDashProperties"/>
-     </xsd:choice>
-   </xsd:group>
-   <xsd:complexType name="CT_LineJoinMiterProperties">
-     <xsd:attribute name="lim" type="a:ST_PositivePercentage" use="optional"/>
-   </xsd:complexType>
-   <xsd:group name="EG_LineJoinProperties">
-     <xsd:choice>
-       <xsd:element name="round" type="w:CT_Empty"/>
-       <xsd:element name="bevel" type="w:CT_Empty"/>
-       <xsd:element name="miter" type="CT_LineJoinMiterProperties"/>
-     </xsd:choice>
-   </xsd:group>
-   <xsd:simpleType name="ST_PresetCameraType">
-     <xsd:restriction base="xsd:token">
-       <xsd:enumeration value="legacyObliqueTopLeft"/>
-       <xsd:enumeration value="legacyObliqueTop"/>
-       <xsd:enumeration value="legacyObliqueTopRight"/>
-       <xsd:enumeration value="legacyObliqueLeft"/>
-       <xsd:enumeration value="legacyObliqueFront"/>
-       <xsd:enumeration value="legacyObliqueRight"/>
-       <xsd:enumeration value="legacyObliqueBottomLeft"/>
-       <xsd:enumeration value="legacyObliqueBottom"/>
-       <xsd:enumeration value="legacyObliqueBottomRight"/>
-       <xsd:enumeration value="legacyPerspectiveTopLeft"/>
-       <xsd:enumeration value="legacyPerspectiveTop"/>
-       <xsd:enumeration value="legacyPerspectiveTopRight"/>
-       <xsd:enumeration value="legacyPerspectiveLeft"/>
-       <xsd:enumeration value="legacyPerspectiveFront"/>
-       <xsd:enumeration value="legacyPerspectiveRight"/>
-       <xsd:enumeration value="legacyPerspectiveBottomLeft"/>
-       <xsd:enumeration value="legacyPerspectiveBottom"/>
-       <xsd:enumeration value="legacyPerspectiveBottomRight"/>
-       <xsd:enumeration value="orthographicFront"/>
-       <xsd:enumeration value="isometricTopUp"/>
-       <xsd:enumeration value="isometricTopDown"/>
-       <xsd:enumeration value="isometricBottomUp"/>
-       <xsd:enumeration value="isometricBottomDown"/>
-       <xsd:enumeration value="isometricLeftUp"/>
-       <xsd:enumeration value="isometricLeftDown"/>
-       <xsd:enumeration value="isometricRightUp"/>
-       <xsd:enumeration value="isometricRightDown"/>
-       <xsd:enumeration value="isometricOffAxis1Left"/>
-       <xsd:enumeration value="isometricOffAxis1Right"/>
-       <xsd:enumeration value="isometricOffAxis1Top"/>
-       <xsd:enumeration value="isometricOffAxis2Left"/>
-       <xsd:enumeration value="isometricOffAxis2Right"/>
-       <xsd:enumeration value="isometricOffAxis2Top"/>
-       <xsd:enumeration value="isometricOffAxis3Left"/>
-       <xsd:enumeration value="isometricOffAxis3Right"/>
-       <xsd:enumeration value="isometricOffAxis3Bottom"/>
-       <xsd:enumeration value="isometricOffAxis4Left"/>
-       <xsd:enumeration value="isometricOffAxis4Right"/>
-       <xsd:enumeration value="isometricOffAxis4Bottom"/>
-       <xsd:enumeration value="obliqueTopLeft"/>
-       <xsd:enumeration value="obliqueTop"/>
-       <xsd:enumeration value="obliqueTopRight"/>
-       <xsd:enumeration value="obliqueLeft"/>
-       <xsd:enumeration value="obliqueRight"/>
-       <xsd:enumeration value="obliqueBottomLeft"/>
-       <xsd:enumeration value="obliqueBottom"/>
-       <xsd:enumeration value="obliqueBottomRight"/>
-       <xsd:enumeration value="perspectiveFront"/>
-       <xsd:enumeration value="perspectiveLeft"/>
-       <xsd:enumeration value="perspectiveRight"/>
-       <xsd:enumeration value="perspectiveAbove"/>
-       <xsd:enumeration value="perspectiveBelow"/>
-       <xsd:enumeration value="perspectiveAboveLeftFacing"/>
-       <xsd:enumeration value="perspectiveAboveRightFacing"/>
-       <xsd:enumeration value="perspectiveContrastingLeftFacing"/>
-       <xsd:enumeration value="perspectiveContrastingRightFacing"/>
-       <xsd:enumeration value="perspectiveHeroicLeftFacing"/>
-       <xsd:enumeration value="perspectiveHeroicRightFacing"/>
-       <xsd:enumeration value="perspectiveHeroicExtremeLeftFacing"/>
-       <xsd:enumeration value="perspectiveHeroicExtremeRightFacing"/>
-       <xsd:enumeration value="perspectiveRelaxed"/>
-       <xsd:enumeration value="perspectiveRelaxedModerately"/>
-     </xsd:restriction>
-   </xsd:simpleType>
-   <xsd:complexType name="CT_Camera">
-     <xsd:attribute name="prst" use="required" type="ST_PresetCameraType"/>
-   </xsd:complexType>
-   <xsd:complexType name="CT_SphereCoords">
-     <xsd:attribute name="lat" type="a:ST_PositiveFixedAngle" use="required"/>
-     <xsd:attribute name="lon" type="a:ST_PositiveFixedAngle" use="required"/>
-     <xsd:attribute name="rev" type="a:ST_PositiveFixedAngle" use="required"/>
-   </xsd:complexType>
-   <xsd:simpleType name="ST_LightRigType">
-     <xsd:restriction base="xsd:token">
-       <xsd:enumeration value="legacyFlat1"/>
-       <xsd:enumeration value="legacyFlat2"/>
-       <xsd:enumeration value="legacyFlat3"/>
-       <xsd:enumeration value="legacyFlat4"/>
-       <xsd:enumeration value="legacyNormal1"/>
-       <xsd:enumeration value="legacyNormal2"/>
-       <xsd:enumeration value="legacyNormal3"/>
-       <xsd:enumeration value="legacyNormal4"/>
-       <xsd:enumeration value="legacyHarsh1"/>
-       <xsd:enumeration value="legacyHarsh2"/>
-       <xsd:enumeration value="legacyHarsh3"/>
-       <xsd:enumeration value="legacyHarsh4"/>
-       <xsd:enumeration value="threePt"/>
-       <xsd:enumeration value="balanced"/>
-       <xsd:enumeration value="soft"/>
-       <xsd:enumeration value="harsh"/>
-       <xsd:enumeration value="flood"/>
-       <xsd:enumeration value="contrasting"/>
-       <xsd:enumeration value="morning"/>
-       <xsd:enumeration value="sunrise"/>
-       <xsd:enumeration value="sunset"/>
-       <xsd:enumeration value="chilly"/>
-       <xsd:enumeration value="freezing"/>
-       <xsd:enumeration value="flat"/>
-       <xsd:enumeration value="twoPt"/>
-       <xsd:enumeration value="glow"/>
-       <xsd:enumeration value="brightRoom"/>
-     </xsd:restriction>
-   </xsd:simpleType>
-   <xsd:simpleType name="ST_LightRigDirection">
-     <xsd:restriction base="xsd:token">
-       <xsd:enumeration value="tl"/>
-       <xsd:enumeration value="t"/>
-       <xsd:enumeration value="tr"/>
-       <xsd:enumeration value="l"/>
-       <xsd:enumeration value="r"/>
-       <xsd:enumeration value="bl"/>
-       <xsd:enumeration value="b"/>
-       <xsd:enumeration value="br"/>
-     </xsd:restriction>
-   </xsd:simpleType>
-   <xsd:complexType name="CT_LightRig">
-     <xsd:sequence>
-       <xsd:element name="rot" type="CT_SphereCoords" minOccurs="0"/>
-     </xsd:sequence>
-     <xsd:attribute name="rig" type="ST_LightRigType" use="required"/>
-     <xsd:attribute name="dir" type="ST_LightRigDirection" use="required"/>
-   </xsd:complexType>
-   <xsd:simpleType name="ST_BevelPresetType">
-     <xsd:restriction base="xsd:token">
-       <xsd:enumeration value="relaxedInset"/>
-       <xsd:enumeration value="circle"/>
-       <xsd:enumeration value="slope"/>
-       <xsd:enumeration value="cross"/>
-       <xsd:enumeration value="angle"/>
-       <xsd:enumeration value="softRound"/>
-       <xsd:enumeration value="convex"/>
-       <xsd:enumeration value="coolSlant"/>
-       <xsd:enumeration value="divot"/>
-       <xsd:enumeration value="riblet"/>
-       <xsd:enumeration value="hardEdge"/>
-       <xsd:enumeration value="artDeco"/>
-     </xsd:restriction>
-   </xsd:simpleType>
-   <xsd:complexType name="CT_Bevel">
-     <xsd:attribute name="w" type="a:ST_PositiveCoordinate" use="optional"/>
-     <xsd:attribute name="h" type="a:ST_PositiveCoordinate" use="optional"/>
-     <xsd:attribute name="prst" type="ST_BevelPresetType" use="optional"/>
-   </xsd:complexType>
-   <xsd:simpleType name="ST_PresetMaterialType">
-     <xsd:restriction base="xsd:token">
-       <xsd:enumeration value="legacyMatte"/>
-       <xsd:enumeration value="legacyPlastic"/>
-       <xsd:enumeration value="legacyMetal"/>
-       <xsd:enumeration value="legacyWireframe"/>
-       <xsd:enumeration value="matte"/>
-       <xsd:enumeration value="plastic"/>
-       <xsd:enumeration value="metal"/>
-       <xsd:enumeration value="warmMatte"/>
-       <xsd:enumeration value="translucentPowder"/>
-       <xsd:enumeration value="powder"/>
-       <xsd:enumeration value="dkEdge"/>
-       <xsd:enumeration value="softEdge"/>
-       <xsd:enumeration value="clear"/>
-       <xsd:enumeration value="flat"/>
-       <xsd:enumeration value="softmetal"/>
-       <xsd:enumeration value="none"/>
-     </xsd:restriction>
-   </xsd:simpleType>
-   <xsd:complexType name="CT_Glow">
-     <xsd:sequence>
-       <xsd:group ref="EG_ColorChoice"/>
-     </xsd:sequence>
-     <xsd:attribute name="rad" use="optional" type="a:ST_PositiveCoordinate"/>
-   </xsd:complexType>
-   <xsd:complexType name="CT_Shadow">
-     <xsd:sequence>
-       <xsd:group ref="EG_ColorChoice"/>
-     </xsd:sequence>
-     <xsd:attribute name="blurRad" use="optional" type="a:ST_PositiveCoordinate"/>
-     <xsd:attribute name="dist" use="optional" type="a:ST_PositiveCoordinate"/>
-     <xsd:attribute name="dir" use="optional" type="a:ST_PositiveFixedAngle"/>
-     <xsd:attribute name="sx" use="optional" type="a:ST_Percentage"/>
-     <xsd:attribute name="sy" use="optional" type="a:ST_Percentage"/>
-     <xsd:attribute name="kx" use="optional" type="a:ST_FixedAngle"/>
-     <xsd:attribute name="ky" use="optional" type="a:ST_FixedAngle"/>
-     <xsd:attribute name="algn" use="optional" type="ST_RectAlignment"/>
-   </xsd:complexType>
-   <xsd:complexType name="CT_Reflection">
-     <xsd:attribute name="blurRad" use="optional" type="a:ST_PositiveCoordinate"/>
-     <xsd:attribute name="stA" use="optional" type="a:ST_PositiveFixedPercentage"/>
-     <xsd:attribute name="stPos" use="optional" type="a:ST_PositiveFixedPercentage"/>
-     <xsd:attribute name="endA" use="optional" type="a:ST_PositiveFixedPercentage"/>
-     <xsd:attribute name="endPos" use="optional" type="a:ST_PositiveFixedPercentage"/>
-     <xsd:attribute name="dist" use="optional" type="a:ST_PositiveCoordinate"/>
-     <xsd:attribute name="dir" use="optional" type="a:ST_PositiveFixedAngle"/>
-     <xsd:attribute name="fadeDir" use="optional" type="a:ST_PositiveFixedAngle"/>
-     <xsd:attribute name="sx" use="optional" type="a:ST_Percentage"/>
-     <xsd:attribute name="sy" use="optional" type="a:ST_Percentage"/>
-     <xsd:attribute name="kx" use="optional" type="a:ST_FixedAngle"/>
-     <xsd:attribute name="ky" use="optional" type="a:ST_FixedAngle"/>
-     <xsd:attribute name="algn" use="optional" type="ST_RectAlignment"/>
-   </xsd:complexType>
-   <xsd:complexType name="CT_FillTextEffect">
-     <xsd:sequence>
-       <xsd:group ref="EG_FillProperties" minOccurs="0"/>
-     </xsd:sequence>
-   </xsd:complexType>
-   <xsd:complexType name="CT_TextOutlineEffect">
-     <xsd:sequence>
-       <xsd:group ref="EG_FillProperties" minOccurs="0"/>
-       <xsd:group ref="EG_LineDashProperties" minOccurs="0"/>
-       <xsd:group ref="EG_LineJoinProperties" minOccurs="0"/>
-     </xsd:sequence>
-     <xsd:attribute name="w" use="optional" type="a:ST_LineWidth"/>
-     <xsd:attribute name="cap" use="optional" type="ST_LineCap"/>
-     <xsd:attribute name="cmpd" use="optional" type="ST_CompoundLine"/>
-     <xsd:attribute name="algn" use="optional" type="ST_PenAlignment"/>
-   </xsd:complexType>
-   <xsd:complexType name="CT_Scene3D">
-     <xsd:sequence>
-       <xsd:element name="camera" type="CT_Camera"/>
-       <xsd:element name="lightRig" type="CT_LightRig"/>
-     </xsd:sequence>
-   </xsd:complexType>
-   <xsd:complexType name="CT_Props3D">
-     <xsd:sequence>
-       <xsd:element name="bevelT" type="CT_Bevel" minOccurs="0"/>
-       <xsd:element name="bevelB" type="CT_Bevel" minOccurs="0"/>
-       <xsd:element name="extrusionClr" type="CT_Color" minOccurs="0"/>
-       <xsd:element name="contourClr" type="CT_Color" minOccurs="0"/>
-     </xsd:sequence>
-     <xsd:attribute name="extrusionH" type="a:ST_PositiveCoordinate" use="optional"/>
-     <xsd:attribute name="contourW" type="a:ST_PositiveCoordinate" use="optional"/>
-     <xsd:attribute name="prstMaterial" type="ST_PresetMaterialType" use="optional"/>
-   </xsd:complexType>
-   <xsd:group name="EG_RPrTextEffects">
-     <xsd:sequence>
-       <xsd:element name="glow" minOccurs="0" type="CT_Glow"/>
-       <xsd:element name="shadow" minOccurs="0" type="CT_Shadow"/>
-       <xsd:element name="reflection" minOccurs="0" type="CT_Reflection"/>
-       <xsd:element name="textOutline" minOccurs="0" type="CT_TextOutlineEffect"/>
-       <xsd:element name="textFill" minOccurs="0" type="CT_FillTextEffect"/>
-       <xsd:element name="scene3d" minOccurs="0" type="CT_Scene3D"/>
-       <xsd:element name="props3d" minOccurs="0" type="CT_Props3D"/>
-     </xsd:sequence>
-   </xsd:group>
-   <xsd:simpleType name="ST_Ligatures">
-     <xsd:restriction base="xsd:string">
-       <xsd:enumeration value="none"/>
-       <xsd:enumeration value="standard"/>
-       <xsd:enumeration value="contextual"/>
-       <xsd:enumeration value="historical"/>
-       <xsd:enumeration value="discretional"/>
-       <xsd:enumeration value="standardContextual"/>
-       <xsd:enumeration value="standardHistorical"/>
-       <xsd:enumeration value="contextualHistorical"/>
-       <xsd:enumeration value="standardDiscretional"/>
-       <xsd:enumeration value="contextualDiscretional"/>
-       <xsd:enumeration value="historicalDiscretional"/>
-       <xsd:enumeration value="standardContextualHistorical"/>
-       <xsd:enumeration value="standardContextualDiscretional"/>
-       <xsd:enumeration value="standardHistoricalDiscretional"/>
-       <xsd:enumeration value="contextualHistoricalDiscretional"/>
-       <xsd:enumeration value="all"/>
-     </xsd:restriction>
-   </xsd:simpleType>
-   <xsd:complexType name="CT_Ligatures">
-     <xsd:attribute name="val" type="ST_Ligatures" use="required"/>
-   </xsd:complexType>
-   <xsd:simpleType name="ST_NumForm">
-     <xsd:restriction base="xsd:string">
-       <xsd:enumeration value="default"/>
-       <xsd:enumeration value="lining"/>
-       <xsd:enumeration value="oldStyle"/>
-     </xsd:restriction>
-   </xsd:simpleType>
-   <xsd:complexType name="CT_NumForm">
-     <xsd:attribute name="val" type="ST_NumForm" use="required"/>
-   </xsd:complexType>
-   <xsd:simpleType name="ST_NumSpacing">
-     <xsd:restriction base="xsd:string">
-       <xsd:enumeration value="default"/>
-       <xsd:enumeration value="proportional"/>
-       <xsd:enumeration value="tabular"/>
-     </xsd:restriction>
-   </xsd:simpleType>
-   <xsd:complexType name="CT_NumSpacing">
-     <xsd:attribute name="val" type="ST_NumSpacing" use="required"/>
-   </xsd:complexType>
-   <xsd:complexType name="CT_StyleSet">
-     <xsd:attribute name="id" type="s:ST_UnsignedDecimalNumber" use="required"/>
-     <xsd:attribute name="val" type="ST_OnOff" use="optional"/>
-   </xsd:complexType>
-   <xsd:complexType name="CT_StylisticSets">
-     <xsd:sequence minOccurs="0">
-       <xsd:element name="styleSet" minOccurs="0" maxOccurs="unbounded" type="CT_StyleSet"/>
-     </xsd:sequence>
-   </xsd:complexType>
-   <xsd:group name="EG_RPrOpenType">
-     <xsd:sequence>
-       <xsd:element name="ligatures" minOccurs="0" type="CT_Ligatures"/>
-       <xsd:element name="numForm" minOccurs="0" type="CT_NumForm"/>
-       <xsd:element name="numSpacing" minOccurs="0" type="CT_NumSpacing"/>
-       <xsd:element name="stylisticSets" minOccurs="0" type="CT_StylisticSets"/>
-       <xsd:element name="cntxtAlts" minOccurs="0" type="CT_OnOff"/>
-     </xsd:sequence>
-   </xsd:group>
-   <xsd:element name="discardImageEditingData" type="CT_OnOff"/>
-   <xsd:element name="defaultImageDpi" type="CT_DefaultImageDpi"/>
-   <xsd:complexType name="CT_DefaultImageDpi">
-     <xsd:attribute name="val" type="w:ST_DecimalNumber" use="required"/>
-   </xsd:complexType>
-   <xsd:element name="entityPicker" type="w:CT_Empty"/>
-   <xsd:complexType name="CT_SdtCheckboxSymbol">
-     <xsd:attribute name="font" type="s:ST_String"/>
-     <xsd:attribute name="val" type="w:ST_ShortHexNumber"/>
-   </xsd:complexType>
-   <xsd:complexType name="CT_SdtCheckbox">
-     <xsd:sequence>
-       <xsd:element name="checked" type="CT_OnOff" minOccurs="0"/>
-       <xsd:element name="checkedState" type="CT_SdtCheckboxSymbol" minOccurs="0"/>
-       <xsd:element name="uncheckedState" type="CT_SdtCheckboxSymbol" minOccurs="0"/>
-     </xsd:sequence>
-   </xsd:complexType>
-   <xsd:element name="checkbox" type="CT_SdtCheckbox"/>
- </xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/microsoft/wml-2012.xsd

@@ -1,67 +0,0 @@
- <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:w12="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:s="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes" elementFormDefault="qualified" attributeFormDefault="qualified" blockDefault="#all" xmlns="http://schemas.microsoft.com/office/word/2012/wordml" targetNamespace="http://schemas.microsoft.com/office/word/2012/wordml">
-   <xsd:import id="w12" namespace="http://schemas.openxmlformats.org/wordprocessingml/2006/main" schemaLocation="../ISO-IEC29500-4_2016/wml.xsd"/>
-   <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes" schemaLocation="../ISO-IEC29500-4_2016/shared-commonSimpleTypes.xsd"/>
-   <xsd:element name="color" type="w12:CT_Color"/>
-   <xsd:simpleType name="ST_SdtAppearance">
-     <xsd:restriction base="xsd:string">
-       <xsd:enumeration value="boundingBox"/>
-       <xsd:enumeration value="tags"/>
-       <xsd:enumeration value="hidden"/>
-     </xsd:restriction>
-   </xsd:simpleType>
-   <xsd:element name="dataBinding" type="w12:CT_DataBinding"/>
-   <xsd:complexType name="CT_SdtAppearance">
-     <xsd:attribute name="val" type="ST_SdtAppearance"/>
-   </xsd:complexType>
-   <xsd:element name="appearance" type="CT_SdtAppearance"/>
-   <xsd:complexType name="CT_CommentsEx">
-     <xsd:sequence>
-       <xsd:element name="commentEx" type="CT_CommentEx" minOccurs="0" maxOccurs="unbounded"/>
-     </xsd:sequence>
-   </xsd:complexType>
-   <xsd:complexType name="CT_CommentEx">
-     <xsd:attribute name="paraId" type="w12:ST_LongHexNumber" use="required"/>
-     <xsd:attribute name="paraIdParent" type="w12:ST_LongHexNumber" use="optional"/>
-     <xsd:attribute name="done" type="s:ST_OnOff" use="optional"/>
-   </xsd:complexType>
-   <xsd:element name="commentsEx" type="CT_CommentsEx"/>
-   <xsd:complexType name="CT_People">
-     <xsd:sequence>
-       <xsd:element name="person" type="CT_Person" minOccurs="0" maxOccurs="unbounded"/>
-     </xsd:sequence>
-   </xsd:complexType>
-   <xsd:complexType name="CT_PresenceInfo">
-     <xsd:attribute name="providerId" type="xsd:string" use="required"/>
-     <xsd:attribute name="userId" type="xsd:string" use="required"/>
-   </xsd:complexType>
-   <xsd:complexType name="CT_Person">
-     <xsd:sequence>
-       <xsd:element name="presenceInfo" type="CT_PresenceInfo" minOccurs="0" maxOccurs="1"/>
-     </xsd:sequence>
-     <xsd:attribute name="author" type="s:ST_String" use="required"/>
-   </xsd:complexType>
-   <xsd:element name="people" type="CT_People"/>
-   <xsd:complexType name="CT_SdtRepeatedSection">
-     <xsd:sequence>
-       <xsd:element name="sectionTitle" type="w12:CT_String" minOccurs="0"/>
-       <xsd:element name="doNotAllowInsertDeleteSection" type="w12:CT_OnOff" minOccurs="0"/>
-     </xsd:sequence>
-   </xsd:complexType>
-   <xsd:simpleType name="ST_Guid">
-     <xsd:restriction base="xsd:token">
-       <xsd:pattern value="\{[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}\}"/>
-     </xsd:restriction>
-   </xsd:simpleType>
-   <xsd:complexType name="CT_Guid">
-     <xsd:attribute name="val" type="ST_Guid"/>
-   </xsd:complexType>
-   <xsd:element name="repeatingSection" type="CT_SdtRepeatedSection"/>
-   <xsd:element name="repeatingSectionItem" type="w12:CT_Empty"/>
-   <xsd:element name="chartTrackingRefBased" type="w12:CT_OnOff"/>
-   <xsd:element name="collapsed" type="w12:CT_OnOff"/>
-   <xsd:element name="docId" type="CT_Guid"/>
-   <xsd:element name="footnoteColumns" type="w12:CT_DecimalNumber"/>
-   <xsd:element name="webExtensionLinked" type="w12:CT_OnOff"/>
-   <xsd:element name="webExtensionCreated" type="w12:CT_OnOff"/>
-   <xsd:attribute name="restartNumberingAfterBreak" type="s:ST_OnOff"/>
- </xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/microsoft/wml-2018.xsd

@@ -1,14 +0,0 @@
- <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:w12="http://schemas.openxmlformats.org/wordprocessingml/2006/main" elementFormDefault="qualified" attributeFormDefault="qualified" blockDefault="#all" xmlns="http://schemas.microsoft.com/office/word/2018/wordml" targetNamespace="http://schemas.microsoft.com/office/word/2018/wordml">
-   <xsd:import id="w12" namespace="http://schemas.openxmlformats.org/wordprocessingml/2006/main" schemaLocation="../ISO-IEC29500-4_2016/wml.xsd"/>
-   <xsd:complexType name="CT_Extension">
-     <xsd:sequence>
-       <xsd:any processContents="lax"/>
-     </xsd:sequence>
-     <xsd:attribute name="uri" type="xsd:token"/>
-   </xsd:complexType>
-   <xsd:complexType name="CT_ExtensionList">
-     <xsd:sequence>
-       <xsd:element name="ext" type="CT_Extension" minOccurs="0" maxOccurs="unbounded"/>
-     </xsd:sequence>
-   </xsd:complexType>
- </xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/microsoft/wml-cex-2018.xsd

@@ -1,20 +0,0 @@
- <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:s="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes" xmlns:w16="http://schemas.microsoft.com/office/word/2018/wordml" elementFormDefault="qualified" attributeFormDefault="qualified" blockDefault="#all" xmlns="http://schemas.microsoft.com/office/word/2018/wordml/cex" targetNamespace="http://schemas.microsoft.com/office/word/2018/wordml/cex">
-   <xsd:import id="w16" namespace="http://schemas.microsoft.com/office/word/2018/wordml" schemaLocation="wml-2018.xsd"/>
-   <xsd:import id="w" namespace="http://schemas.openxmlformats.org/wordprocessingml/2006/main" schemaLocation="../ISO-IEC29500-4_2016/wml.xsd"/>
-   <xsd:import id="s" namespace="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes" schemaLocation="../ISO-IEC29500-4_2016/shared-commonSimpleTypes.xsd"/>
-   <xsd:complexType name="CT_CommentsExtensible">
-     <xsd:sequence>
-       <xsd:element name="commentExtensible" type="CT_CommentExtensible" minOccurs="0" maxOccurs="unbounded"/>
-       <xsd:element name="extLst" type="w16:CT_ExtensionList" minOccurs="0" maxOccurs="1"/>
-     </xsd:sequence>
-   </xsd:complexType>
-   <xsd:complexType name="CT_CommentExtensible">
-     <xsd:sequence>
-       <xsd:element name="extLst" type="w16:CT_ExtensionList" minOccurs="0" maxOccurs="1"/>
-     </xsd:sequence>
-     <xsd:attribute name="durableId" type="w:ST_LongHexNumber" use="required"/>
-     <xsd:attribute name="dateUtc" type="w:ST_DateTime" use="optional"/>
-     <xsd:attribute name="intelligentPlaceholder" type="s:ST_OnOff" use="optional"/>
-   </xsd:complexType>
-   <xsd:element name="commentsExtensible" type="CT_CommentsExtensible"/>
- </xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/microsoft/wml-cid-2016.xsd

@@ -1,13 +0,0 @@
- <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:w12="http://schemas.openxmlformats.org/wordprocessingml/2006/main" elementFormDefault="qualified" attributeFormDefault="qualified" blockDefault="#all" xmlns="http://schemas.microsoft.com/office/word/2016/wordml/cid" targetNamespace="http://schemas.microsoft.com/office/word/2016/wordml/cid">
-   <xsd:import id="w12" namespace="http://schemas.openxmlformats.org/wordprocessingml/2006/main" schemaLocation="../ISO-IEC29500-4_2016/wml.xsd"/>
-   <xsd:complexType name="CT_CommentsIds">
-     <xsd:sequence>
-       <xsd:element name="commentId" type="CT_CommentId" minOccurs="0" maxOccurs="unbounded"/>
-     </xsd:sequence>
-   </xsd:complexType>
-   <xsd:complexType name="CT_CommentId">
-     <xsd:attribute name="paraId" type="w12:ST_LongHexNumber" use="required"/>
-     <xsd:attribute name="durableId" type="w12:ST_LongHexNumber" use="required"/>
-   </xsd:complexType>
-   <xsd:element name="commentsIds" type="CT_CommentsIds"/>
- </xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/microsoft/wml-sdtdatahash-2020.xsd

@@ -1,4 +0,0 @@
- <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:w12="http://schemas.openxmlformats.org/wordprocessingml/2006/main" elementFormDefault="qualified" attributeFormDefault="qualified" blockDefault="#all" xmlns="http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash" targetNamespace="http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash">
-   <xsd:import id="w12" namespace="http://schemas.openxmlformats.org/wordprocessingml/2006/main" schemaLocation="../ISO-IEC29500-4_2016/wml.xsd"/>
-   <xsd:attribute name="storeItemChecksum" type="w12:ST_String"/>
- </xsd:schema>

.agents/skills/xlsx/scripts/office/schemas/microsoft/wml-symex-2015.xsd

@@ -1,8 +0,0 @@
- <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:w12="http://schemas.openxmlformats.org/wordprocessingml/2006/main" elementFormDefault="qualified" attributeFormDefault="qualified" blockDefault="#all" xmlns="http://schemas.microsoft.com/office/word/2015/wordml/symex" targetNamespace="http://schemas.microsoft.com/office/word/2015/wordml/symex">
-   <xsd:import id="w12" namespace="http://schemas.openxmlformats.org/wordprocessingml/2006/main" schemaLocation="../ISO-IEC29500-4_2016/wml.xsd"/>
-   <xsd:complexType name="CT_SymEx">
-     <xsd:attribute name="font" type="w12:ST_String"/>
-     <xsd:attribute name="char" type="w12:ST_LongHexNumber"/>
-   </xsd:complexType>
-   <xsd:element name="symEx" type="CT_SymEx"/>
- </xsd:schema>

.agents/skills/xlsx/scripts/office/soffice.py

@@ -1,183 +0,0 @@
-"""
-Helper for running LibreOffice (soffice) in environments where AF_UNIX
-sockets may be blocked (e.g., sandboxed VMs).  Detects the restriction
-at runtime and applies an LD_PRELOAD shim if needed.
-
-Usage:
-    from office.soffice import run_soffice, get_soffice_env
-
-    # Option 1 – run soffice directly
-    result = run_soffice(["--headless", "--convert-to", "pdf", "input.docx"])
-
-    # Option 2 – get env dict for your own subprocess calls
-    env = get_soffice_env()
-    subprocess.run(["soffice", ...], env=env)
-"""
-
-import os
-import socket
-import subprocess
-import tempfile
-from pathlib import Path
-
-
-def get_soffice_env() -> dict:
-    env = os.environ.copy()
-    env["SAL_USE_VCLPLUGIN"] = "svp"
-
-    if _needs_shim():
-        shim = _ensure_shim()
-        env["LD_PRELOAD"] = str(shim)
-
-    return env
-
-
-def run_soffice(args: list[str], **kwargs) -> subprocess.CompletedProcess:
-    env = get_soffice_env()
-    return subprocess.run(["soffice"] + args, env=env, **kwargs)
-
-
-
-_SHIM_SO = Path(tempfile.gettempdir()) / "lo_socket_shim.so"
-
-
-def _needs_shim() -> bool:
-    try:
-        s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-        s.close()
-        return False
-    except OSError:
-        return True
-
-
-def _ensure_shim() -> Path:
-    if _SHIM_SO.exists():
-        return _SHIM_SO
-
-    src = Path(tempfile.gettempdir()) / "lo_socket_shim.c"
-    src.write_text(_SHIM_SOURCE)
-    subprocess.run(
-        ["gcc", "-shared", "-fPIC", "-o", str(_SHIM_SO), str(src), "-ldl"],
-        check=True,
-        capture_output=True,
-    )
-    src.unlink()
-    return _SHIM_SO
-
-
-
-_SHIM_SOURCE = r"""
-#define _GNU_SOURCE
-#include <dlfcn.h>
-#include <errno.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/socket.h>
-#include <unistd.h>
-
-static int (*real_socket)(int, int, int);
-static int (*real_socketpair)(int, int, int, int[2]);
-static int (*real_listen)(int, int);
-static int (*real_accept)(int, struct sockaddr *, socklen_t *);
-static int (*real_close)(int);
-static int (*real_read)(int, void *, size_t);
-
-/* Per-FD bookkeeping (FDs >= 1024 are passed through unshimmed). */
-static int is_shimmed[1024];
-static int peer_of[1024];
-static int wake_r[1024];            /* accept() blocks reading this */
-static int wake_w[1024];            /* close()  writes to this      */
-static int listener_fd = -1;        /* FD that received listen()    */
-
-__attribute__((constructor))
-static void init(void) {
-    real_socket     = dlsym(RTLD_NEXT, "socket");
-    real_socketpair = dlsym(RTLD_NEXT, "socketpair");
-    real_listen     = dlsym(RTLD_NEXT, "listen");
-    real_accept     = dlsym(RTLD_NEXT, "accept");
-    real_close      = dlsym(RTLD_NEXT, "close");
-    real_read       = dlsym(RTLD_NEXT, "read");
-    for (int i = 0; i < 1024; i++) {
-        peer_of[i] = -1;
-        wake_r[i]  = -1;
-        wake_w[i]  = -1;
-    }
-}
-
-/* ---- socket ---------------------------------------------------------- */
-int socket(int domain, int type, int protocol) {
-    if (domain == AF_UNIX) {
-        int fd = real_socket(domain, type, protocol);
-        if (fd >= 0) return fd;
-        /* socket(AF_UNIX) blocked – fall back to socketpair(). */
-        int sv[2];
-        if (real_socketpair(domain, type, protocol, sv) == 0) {
-            if (sv[0] >= 0 && sv[0] < 1024) {
-                is_shimmed[sv[0]] = 1;
-                peer_of[sv[0]]    = sv[1];
-                int wp[2];
-                if (pipe(wp) == 0) {
-                    wake_r[sv[0]] = wp[0];
-                    wake_w[sv[0]] = wp[1];
-                }
-            }
-            return sv[0];
-        }
-        errno = EPERM;
-        return -1;
-    }
-    return real_socket(domain, type, protocol);
-}
-
-/* ---- listen ---------------------------------------------------------- */
-int listen(int sockfd, int backlog) {
-    if (sockfd >= 0 && sockfd < 1024 && is_shimmed[sockfd]) {
-        listener_fd = sockfd;
-        return 0;
-    }
-    return real_listen(sockfd, backlog);
-}
-
-/* ---- accept ---------------------------------------------------------- */
-int accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen) {
-    if (sockfd >= 0 && sockfd < 1024 && is_shimmed[sockfd]) {
-        /* Block until close() writes to the wake pipe. */
-        if (wake_r[sockfd] >= 0) {
-            char buf;
-            real_read(wake_r[sockfd], &buf, 1);
-        }
-        errno = ECONNABORTED;
-        return -1;
-    }
-    return real_accept(sockfd, addr, addrlen);
-}
-
-/* ---- close ----------------------------------------------------------- */
-int close(int fd) {
-    if (fd >= 0 && fd < 1024 && is_shimmed[fd]) {
-        int was_listener = (fd == listener_fd);
-        is_shimmed[fd] = 0;
-
-        if (wake_w[fd] >= 0) {              /* unblock accept() */
-            char c = 0;
-            write(wake_w[fd], &c, 1);
-            real_close(wake_w[fd]);
-            wake_w[fd] = -1;
-        }
-        if (wake_r[fd] >= 0) { real_close(wake_r[fd]); wake_r[fd]  = -1; }
-        if (peer_of[fd] >= 0) { real_close(peer_of[fd]); peer_of[fd] = -1; }
-
-        if (was_listener)
-            _exit(0);                        /* conversion done – exit */
-    }
-    return real_close(fd);
-}
-"""
-
-
-
-if __name__ == "__main__":
-    import sys
-    result = run_soffice(sys.argv[1:])
-    sys.exit(result.returncode)

.agents/skills/xlsx/scripts/office/unpack.py

@@ -1,132 +0,0 @@
-"""Unpack Office files (DOCX, PPTX, XLSX) for editing.
-
-Extracts the ZIP archive, pretty-prints XML files, and optionally:
-- Merges adjacent runs with identical formatting (DOCX only)
-- Simplifies adjacent tracked changes from same author (DOCX only)
-
-Usage:
-    python unpack.py <office_file> <output_dir> [options]
-
-Examples:
-    python unpack.py document.docx unpacked/
-    python unpack.py presentation.pptx unpacked/
-    python unpack.py document.docx unpacked/ --merge-runs false
-"""
-
-import argparse
-import sys
-import zipfile
-from pathlib import Path
-
-import defusedxml.minidom
-
-from helpers.merge_runs import merge_runs as do_merge_runs
-from helpers.simplify_redlines import simplify_redlines as do_simplify_redlines
-
-SMART_QUOTE_REPLACEMENTS = {
-    "\u201c": "&#x201C;",  
-    "\u201d": "&#x201D;",  
-    "\u2018": "&#x2018;",  
-    "\u2019": "&#x2019;",  
-}
-
-
-def unpack(
-    input_file: str,
-    output_directory: str,
-    merge_runs: bool = True,
-    simplify_redlines: bool = True,
-) -> tuple[None, str]:
-    input_path = Path(input_file)
-    output_path = Path(output_directory)
-    suffix = input_path.suffix.lower()
-
-    if not input_path.exists():
-        return None, f"Error: {input_file} does not exist"
-
-    if suffix not in {".docx", ".pptx", ".xlsx"}:
-        return None, f"Error: {input_file} must be a .docx, .pptx, or .xlsx file"
-
-    try:
-        output_path.mkdir(parents=True, exist_ok=True)
-
-        with zipfile.ZipFile(input_path, "r") as zf:
-            zf.extractall(output_path)
-
-        xml_files = list(output_path.rglob("*.xml")) + list(output_path.rglob("*.rels"))
-        for xml_file in xml_files:
-            _pretty_print_xml(xml_file)
-
-        message = f"Unpacked {input_file} ({len(xml_files)} XML files)"
-
-        if suffix == ".docx":
-            if simplify_redlines:
-                simplify_count, _ = do_simplify_redlines(str(output_path))
-                message += f", simplified {simplify_count} tracked changes"
-
-            if merge_runs:
-                merge_count, _ = do_merge_runs(str(output_path))
-                message += f", merged {merge_count} runs"
-
-        for xml_file in xml_files:
-            _escape_smart_quotes(xml_file)
-
-        return None, message
-
-    except zipfile.BadZipFile:
-        return None, f"Error: {input_file} is not a valid Office file"
-    except Exception as e:
-        return None, f"Error unpacking: {e}"
-
-
-def _pretty_print_xml(xml_file: Path) -> None:
-    try:
-        content = xml_file.read_text(encoding="utf-8")
-        dom = defusedxml.minidom.parseString(content)
-        xml_file.write_bytes(dom.toprettyxml(indent="  ", encoding="utf-8"))
-    except Exception:
-        pass  
-
-
-def _escape_smart_quotes(xml_file: Path) -> None:
-    try:
-        content = xml_file.read_text(encoding="utf-8")
-        for char, entity in SMART_QUOTE_REPLACEMENTS.items():
-            content = content.replace(char, entity)
-        xml_file.write_text(content, encoding="utf-8")
-    except Exception:
-        pass
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(
-        description="Unpack an Office file (DOCX, PPTX, XLSX) for editing"
-    )
-    parser.add_argument("input_file", help="Office file to unpack")
-    parser.add_argument("output_directory", help="Output directory")
-    parser.add_argument(
-        "--merge-runs",
-        type=lambda x: x.lower() == "true",
-        default=True,
-        metavar="true|false",
-        help="Merge adjacent runs with identical formatting (DOCX only, default: true)",
-    )
-    parser.add_argument(
-        "--simplify-redlines",
-        type=lambda x: x.lower() == "true",
-        default=True,
-        metavar="true|false",
-        help="Merge adjacent tracked changes from same author (DOCX only, default: true)",
-    )
-    args = parser.parse_args()
-
-    _, message = unpack(
-        args.input_file,
-        args.output_directory,
-        merge_runs=args.merge_runs,
-        simplify_redlines=args.simplify_redlines,
-    )
-    print(message)
-
-    if "Error" in message:
-        sys.exit(1)

.agents/skills/xlsx/scripts/office/validate.py

@@ -1,111 +0,0 @@
-"""
-Command line tool to validate Office document XML files against XSD schemas and tracked changes.
-
-Usage:
-    python validate.py <path> [--original <original_file>] [--auto-repair] [--author NAME]
-
-The first argument can be either:
-- An unpacked directory containing the Office document XML files
-- A packed Office file (.docx/.pptx/.xlsx) which will be unpacked to a temp directory
-
-Auto-repair fixes:
-- paraId/durableId values that exceed OOXML limits
-- Missing xml:space="preserve" on w:t elements with whitespace
-"""
-
-import argparse
-import sys
-import tempfile
-import zipfile
-from pathlib import Path
-
-from validators import DOCXSchemaValidator, PPTXSchemaValidator, RedliningValidator
-
-
-def main():
-    parser = argparse.ArgumentParser(description="Validate Office document XML files")
-    parser.add_argument(
-        "path",
-        help="Path to unpacked directory or packed Office file (.docx/.pptx/.xlsx)",
-    )
-    parser.add_argument(
-        "--original",
-        required=False,
-        default=None,
-        help="Path to original file (.docx/.pptx/.xlsx). If omitted, all XSD errors are reported and redlining validation is skipped.",
-    )
-    parser.add_argument(
-        "-v",
-        "--verbose",
-        action="store_true",
-        help="Enable verbose output",
-    )
-    parser.add_argument(
-        "--auto-repair",
-        action="store_true",
-        help="Automatically repair common issues (hex IDs, whitespace preservation)",
-    )
-    parser.add_argument(
-        "--author",
-        default="Claude",
-        help="Author name for redlining validation (default: Claude)",
-    )
-    args = parser.parse_args()
-
-    path = Path(args.path)
-    assert path.exists(), f"Error: {path} does not exist"
-
-    original_file = None
-    if args.original:
-        original_file = Path(args.original)
-        assert original_file.is_file(), f"Error: {original_file} is not a file"
-        assert original_file.suffix.lower() in [".docx", ".pptx", ".xlsx"], (
-            f"Error: {original_file} must be a .docx, .pptx, or .xlsx file"
-        )
-
-    file_extension = (original_file or path).suffix.lower()
-    assert file_extension in [".docx", ".pptx", ".xlsx"], (
-        f"Error: Cannot determine file type from {path}. Use --original or provide a .docx/.pptx/.xlsx file."
-    )
-
-    if path.is_file() and path.suffix.lower() in [".docx", ".pptx", ".xlsx"]:
-        temp_dir = tempfile.mkdtemp()
-        with zipfile.ZipFile(path, "r") as zf:
-            zf.extractall(temp_dir)
-        unpacked_dir = Path(temp_dir)
-    else:
-        assert path.is_dir(), f"Error: {path} is not a directory or Office file"
-        unpacked_dir = path
-
-    match file_extension:
-        case ".docx":
-            validators = [
-                DOCXSchemaValidator(unpacked_dir, original_file, verbose=args.verbose),
-            ]
-            if original_file:
-                validators.append(
-                    RedliningValidator(unpacked_dir, original_file, verbose=args.verbose, author=args.author)  
-                )
-        case ".pptx":
-            validators = [
-                PPTXSchemaValidator(unpacked_dir, original_file, verbose=args.verbose),
-            ]
-        case _:
-            print(f"Error: Validation not supported for file type {file_extension}")
-            sys.exit(1)
-
-    if args.auto_repair:
-        total_repairs = sum(v.repair() for v in validators)
-        if total_repairs:
-            print(f"Auto-repaired {total_repairs} issue(s)")
-
-    success = all(v.validate() for v in validators)
-
-    if success:
-        print("All validations PASSED!")
-
-    sys.exit(0 if success else 1)
-
-
-if __name__ == "__main__":
-    main()

.agents/skills/xlsx/scripts/office/validators/base.py

@@ -1,847 +0,0 @@
-"""
-Base validator with common validation logic for document files.
-"""
-
-import re
-from pathlib import Path
-
-import defusedxml.minidom
-import lxml.etree
-
-
-class BaseSchemaValidator:
-
-    IGNORED_VALIDATION_ERRORS = [
-        "hyphenationZone",
-        "purl.org/dc/terms",
-    ]
-
-    UNIQUE_ID_REQUIREMENTS = {
-        "comment": ("id", "file"),  
-        "commentrangestart": ("id", "file"),  
-        "commentrangeend": ("id", "file"),  
-        "bookmarkstart": ("id", "file"),  
-        "bookmarkend": ("id", "file"),  
-        "sldid": ("id", "file"),  
-        "sldmasterid": ("id", "global"),  
-        "sldlayoutid": ("id", "global"),  
-        "cm": ("authorid", "file"),  
-        "sheet": ("sheetid", "file"),  
-        "definedname": ("id", "file"),  
-        "cxnsp": ("id", "file"),  
-        "sp": ("id", "file"),  
-        "pic": ("id", "file"),  
-        "grpsp": ("id", "file"),  
-    }
-
-    EXCLUDED_ID_CONTAINERS = {
-        "sectionlst",  
-    }
-
-    ELEMENT_RELATIONSHIP_TYPES = {}
-
-    SCHEMA_MAPPINGS = {
-        "word": "ISO-IEC29500-4_2016/wml.xsd",  
-        "ppt": "ISO-IEC29500-4_2016/pml.xsd",  
-        "xl": "ISO-IEC29500-4_2016/sml.xsd",  
-        "[Content_Types].xml": "ecma/fouth-edition/opc-contentTypes.xsd",
-        "app.xml": "ISO-IEC29500-4_2016/shared-documentPropertiesExtended.xsd",
-        "core.xml": "ecma/fouth-edition/opc-coreProperties.xsd",
-        "custom.xml": "ISO-IEC29500-4_2016/shared-documentPropertiesCustom.xsd",
-        ".rels": "ecma/fouth-edition/opc-relationships.xsd",
-        "people.xml": "microsoft/wml-2012.xsd",
-        "commentsIds.xml": "microsoft/wml-cid-2016.xsd",
-        "commentsExtensible.xml": "microsoft/wml-cex-2018.xsd",
-        "commentsExtended.xml": "microsoft/wml-2012.xsd",
-        "chart": "ISO-IEC29500-4_2016/dml-chart.xsd",
-        "theme": "ISO-IEC29500-4_2016/dml-main.xsd",
-        "drawing": "ISO-IEC29500-4_2016/dml-main.xsd",
-    }
-
-    MC_NAMESPACE = "http://schemas.openxmlformats.org/markup-compatibility/2006"
-    XML_NAMESPACE = "http://www.w3.org/XML/1998/namespace"
-
-    PACKAGE_RELATIONSHIPS_NAMESPACE = (
-        "http://schemas.openxmlformats.org/package/2006/relationships"
-    )
-    OFFICE_RELATIONSHIPS_NAMESPACE = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-    )
-    CONTENT_TYPES_NAMESPACE = (
-        "http://schemas.openxmlformats.org/package/2006/content-types"
-    )
-
-    MAIN_CONTENT_FOLDERS = {"word", "ppt", "xl"}
-
-    OOXML_NAMESPACES = {
-        "http://schemas.openxmlformats.org/officeDocument/2006/math",
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
-        "http://schemas.openxmlformats.org/schemaLibrary/2006/main",
-        "http://schemas.openxmlformats.org/drawingml/2006/main",
-        "http://schemas.openxmlformats.org/drawingml/2006/chart",
-        "http://schemas.openxmlformats.org/drawingml/2006/chartDrawing",
-        "http://schemas.openxmlformats.org/drawingml/2006/diagram",
-        "http://schemas.openxmlformats.org/drawingml/2006/picture",
-        "http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing",
-        "http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing",
-        "http://schemas.openxmlformats.org/wordprocessingml/2006/main",
-        "http://schemas.openxmlformats.org/presentationml/2006/main",
-        "http://schemas.openxmlformats.org/spreadsheetml/2006/main",
-        "http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes",
-        "http://www.w3.org/XML/1998/namespace",
-    }
-
-    def __init__(self, unpacked_dir, original_file=None, verbose=False):
-        self.unpacked_dir = Path(unpacked_dir).resolve()
-        self.original_file = Path(original_file) if original_file else None
-        self.verbose = verbose
-
-        self.schemas_dir = Path(__file__).parent.parent / "schemas"
-
-        patterns = ["*.xml", "*.rels"]
-        self.xml_files = [
-            f for pattern in patterns for f in self.unpacked_dir.rglob(pattern)
-        ]
-
-        if not self.xml_files:
-            print(f"Warning: No XML files found in {self.unpacked_dir}")
-
-    def validate(self):
-        raise NotImplementedError("Subclasses must implement the validate method")
-
-    def repair(self) -> int:
-        return self.repair_whitespace_preservation()
-
-    def repair_whitespace_preservation(self) -> int:
-        repairs = 0
-
-        for xml_file in self.xml_files:
-            try:
-                content = xml_file.read_text(encoding="utf-8")
-                dom = defusedxml.minidom.parseString(content)
-                modified = False
-
-                for elem in dom.getElementsByTagName("*"):
-                    if elem.tagName.endswith(":t") and elem.firstChild:
-                        text = elem.firstChild.nodeValue
-                        if text and (text.startswith((' ', '\t')) or text.endswith((' ', '\t'))):
-                            if elem.getAttribute("xml:space") != "preserve":
-                                elem.setAttribute("xml:space", "preserve")
-                                text_preview = repr(text[:30]) + "..." if len(text) > 30 else repr(text)
-                                print(f"  Repaired: {xml_file.name}: Added xml:space='preserve' to {elem.tagName}: {text_preview}")
-                                repairs += 1
-                                modified = True
-
-                if modified:
-                    xml_file.write_bytes(dom.toxml(encoding="UTF-8"))
-
-            except Exception:
-                pass
-
-        return repairs
-
-    def validate_xml(self):
-        errors = []
-
-        for xml_file in self.xml_files:
-            try:
-                lxml.etree.parse(str(xml_file))
-            except lxml.etree.XMLSyntaxError as e:
-                errors.append(
-                    f"  {xml_file.relative_to(self.unpacked_dir)}: "
-                    f"Line {e.lineno}: {e.msg}"
-                )
-            except Exception as e:
-                errors.append(
-                    f"  {xml_file.relative_to(self.unpacked_dir)}: "
-                    f"Unexpected error: {str(e)}"
-                )
-
-        if errors:
-            print(f"FAILED - Found {len(errors)} XML violations:")
-            for error in errors:
-                print(error)
-            return False
-        else:
-            if self.verbose:
-                print("PASSED - All XML files are well-formed")
-            return True
-
-    def validate_namespaces(self):
-        errors = []
-
-        for xml_file in self.xml_files:
-            try:
-                root = lxml.etree.parse(str(xml_file)).getroot()
-                declared = set(root.nsmap.keys()) - {None}  
-
-                for attr_val in [
-                    v for k, v in root.attrib.items() if k.endswith("Ignorable")
-                ]:
-                    undeclared = set(attr_val.split()) - declared
-                    errors.extend(
-                        f"  {xml_file.relative_to(self.unpacked_dir)}: "
-                        f"Namespace '{ns}' in Ignorable but not declared"
-                        for ns in undeclared
-                    )
-            except lxml.etree.XMLSyntaxError:
-                continue
-
-        if errors:
-            print(f"FAILED - {len(errors)} namespace issues:")
-            for error in errors:
-                print(error)
-            return False
-        if self.verbose:
-            print("PASSED - All namespace prefixes properly declared")
-        return True
-
-    def validate_unique_ids(self):
-        errors = []
-        global_ids = {}  
-
-        for xml_file in self.xml_files:
-            try:
-                root = lxml.etree.parse(str(xml_file)).getroot()
-                file_ids = {}  
-
-                mc_elements = root.xpath(
-                    ".//mc:AlternateContent", namespaces={"mc": self.MC_NAMESPACE}
-                )
-                for elem in mc_elements:
-                    elem.getparent().remove(elem)
-
-                for elem in root.iter():
-                    tag = (
-                        elem.tag.split("}")[-1].lower()
-                        if "}" in elem.tag
-                        else elem.tag.lower()
-                    )
-
-                    if tag in self.UNIQUE_ID_REQUIREMENTS:
-                        in_excluded_container = any(
-                            ancestor.tag.split("}")[-1].lower() in self.EXCLUDED_ID_CONTAINERS
-                            for ancestor in elem.iterancestors()
-                        )
-                        if in_excluded_container:
-                            continue
-
-                        attr_name, scope = self.UNIQUE_ID_REQUIREMENTS[tag]
-
-                        id_value = None
-                        for attr, value in elem.attrib.items():
-                            attr_local = (
-                                attr.split("}")[-1].lower()
-                                if "}" in attr
-                                else attr.lower()
-                            )
-                            if attr_local == attr_name:
-                                id_value = value
-                                break
-
-                        if id_value is not None:
-                            if scope == "global":
-                                if id_value in global_ids:
-                                    prev_file, prev_line, prev_tag = global_ids[
-                                        id_value
-                                    ]
-                                    errors.append(
-                                        f"  {xml_file.relative_to(self.unpacked_dir)}: "
-                                        f"Line {elem.sourceline}: Global ID '{id_value}' in <{tag}> "
-                                        f"already used in {prev_file} at line {prev_line} in <{prev_tag}>"
-                                    )
-                                else:
-                                    global_ids[id_value] = (
-                                        xml_file.relative_to(self.unpacked_dir),
-                                        elem.sourceline,
-                                        tag,
-                                    )
-                            elif scope == "file":
-                                key = (tag, attr_name)
-                                if key not in file_ids:
-                                    file_ids[key] = {}
-
-                                if id_value in file_ids[key]:
-                                    prev_line = file_ids[key][id_value]
-                                    errors.append(
-                                        f"  {xml_file.relative_to(self.unpacked_dir)}: "
-                                        f"Line {elem.sourceline}: Duplicate {attr_name}='{id_value}' in <{tag}> "
-                                        f"(first occurrence at line {prev_line})"
-                                    )
-                                else:
-                                    file_ids[key][id_value] = elem.sourceline
-
-            except (lxml.etree.XMLSyntaxError, Exception) as e:
-                errors.append(
-                    f"  {xml_file.relative_to(self.unpacked_dir)}: Error: {e}"
-                )
-
-        if errors:
-            print(f"FAILED - Found {len(errors)} ID uniqueness violations:")
-            for error in errors:
-                print(error)
-            return False
-        else:
-            if self.verbose:
-                print("PASSED - All required IDs are unique")
-            return True
-
-    def validate_file_references(self):
-        errors = []
-
-        rels_files = list(self.unpacked_dir.rglob("*.rels"))
-
-        if not rels_files:
-            if self.verbose:
-                print("PASSED - No .rels files found")
-            return True
-
-        all_files = []
-        for file_path in self.unpacked_dir.rglob("*"):
-            if (
-                file_path.is_file()
-                and file_path.name != "[Content_Types].xml"
-                and not file_path.name.endswith(".rels")
-            ):  
-                all_files.append(file_path.resolve())
-
-        all_referenced_files = set()
-
-        if self.verbose:
-            print(
-                f"Found {len(rels_files)} .rels files and {len(all_files)} target files"
-            )
-
-        for rels_file in rels_files:
-            try:
-                rels_root = lxml.etree.parse(str(rels_file)).getroot()
-
-                rels_dir = rels_file.parent
-
-                referenced_files = set()
-                broken_refs = []
-
-                for rel in rels_root.findall(
-                    ".//ns:Relationship",
-                    namespaces={"ns": self.PACKAGE_RELATIONSHIPS_NAMESPACE},
-                ):
-                    target = rel.get("Target")
-                    if target and not target.startswith(
-                        ("http", "mailto:")
-                    ):  
-                        if target.startswith("/"):
-                            target_path = self.unpacked_dir / target.lstrip("/")
-                        elif rels_file.name == ".rels":
-                            target_path = self.unpacked_dir / target
-                        else:
-                            base_dir = rels_dir.parent
-                            target_path = base_dir / target
-
-                        try:
-                            target_path = target_path.resolve()
-                            if target_path.exists() and target_path.is_file():
-                                referenced_files.add(target_path)
-                                all_referenced_files.add(target_path)
-                            else:
-                                broken_refs.append((target, rel.sourceline))
-                        except (OSError, ValueError):
-                            broken_refs.append((target, rel.sourceline))
-
-                if broken_refs:
-                    rel_path = rels_file.relative_to(self.unpacked_dir)
-                    for broken_ref, line_num in broken_refs:
-                        errors.append(
-                            f"  {rel_path}: Line {line_num}: Broken reference to {broken_ref}"
-                        )
-
-            except Exception as e:
-                rel_path = rels_file.relative_to(self.unpacked_dir)
-                errors.append(f"  Error parsing {rel_path}: {e}")
-
-        unreferenced_files = set(all_files) - all_referenced_files
-
-        if unreferenced_files:
-            for unref_file in sorted(unreferenced_files):
-                unref_rel_path = unref_file.relative_to(self.unpacked_dir)
-                errors.append(f"  Unreferenced file: {unref_rel_path}")
-
-        if errors:
-            print(f"FAILED - Found {len(errors)} relationship validation errors:")
-            for error in errors:
-                print(error)
-            print(
-                "CRITICAL: These errors will cause the document to appear corrupt. "
-                + "Broken references MUST be fixed, "
-                + "and unreferenced files MUST be referenced or removed."
-            )
-            return False
-        else:
-            if self.verbose:
-                print(
-                    "PASSED - All references are valid and all files are properly referenced"
-                )
-            return True
-
-    def validate_all_relationship_ids(self):
-        import lxml.etree
-
-        errors = []
-
-        for xml_file in self.xml_files:
-            if xml_file.suffix == ".rels":
-                continue
-
-            rels_dir = xml_file.parent / "_rels"
-            rels_file = rels_dir / f"{xml_file.name}.rels"
-
-            if not rels_file.exists():
-                continue
-
-            try:
-                rels_root = lxml.etree.parse(str(rels_file)).getroot()
-                rid_to_type = {}
-
-                for rel in rels_root.findall(
-                    f".//{{{self.PACKAGE_RELATIONSHIPS_NAMESPACE}}}Relationship"
-                ):
-                    rid = rel.get("Id")
-                    rel_type = rel.get("Type", "")
-                    if rid:
-                        if rid in rid_to_type:
-                            rels_rel_path = rels_file.relative_to(self.unpacked_dir)
-                            errors.append(
-                                f"  {rels_rel_path}: Line {rel.sourceline}: "
-                                f"Duplicate relationship ID '{rid}' (IDs must be unique)"
-                            )
-                        type_name = (
-                            rel_type.split("/")[-1] if "/" in rel_type else rel_type
-                        )
-                        rid_to_type[rid] = type_name
-
-                xml_root = lxml.etree.parse(str(xml_file)).getroot()
-
-                r_ns = self.OFFICE_RELATIONSHIPS_NAMESPACE
-                rid_attrs_to_check = ["id", "embed", "link"]
-                for elem in xml_root.iter():
-                    for attr_name in rid_attrs_to_check:
-                        rid_attr = elem.get(f"{{{r_ns}}}{attr_name}")
-                        if not rid_attr:
-                            continue
-                        xml_rel_path = xml_file.relative_to(self.unpacked_dir)
-                        elem_name = (
-                            elem.tag.split("}")[-1] if "}" in elem.tag else elem.tag
-                        )
-
-                        if rid_attr not in rid_to_type:
-                            errors.append(
-                                f"  {xml_rel_path}: Line {elem.sourceline}: "
-                                f"<{elem_name}> r:{attr_name} references non-existent relationship '{rid_attr}' "
-                                f"(valid IDs: {', '.join(sorted(rid_to_type.keys())[:5])}{'...' if len(rid_to_type) > 5 else ''})"
-                            )
-                        elif attr_name == "id" and self.ELEMENT_RELATIONSHIP_TYPES:
-                            expected_type = self._get_expected_relationship_type(
-                                elem_name
-                            )
-                            if expected_type:
-                                actual_type = rid_to_type[rid_attr]
-                                if expected_type not in actual_type.lower():
-                                    errors.append(
-                                        f"  {xml_rel_path}: Line {elem.sourceline}: "
-                                        f"<{elem_name}> references '{rid_attr}' which points to '{actual_type}' "
-                                        f"but should point to a '{expected_type}' relationship"
-                                    )
-
-            except Exception as e:
-                xml_rel_path = xml_file.relative_to(self.unpacked_dir)
-                errors.append(f"  Error processing {xml_rel_path}: {e}")
-
-        if errors:
-            print(f"FAILED - Found {len(errors)} relationship ID reference errors:")
-            for error in errors:
-                print(error)
-            print("\nThese ID mismatches will cause the document to appear corrupt!")
-            return False
-        else:
-            if self.verbose:
-                print("PASSED - All relationship ID references are valid")
-            return True
-
-    def _get_expected_relationship_type(self, element_name):
-        elem_lower = element_name.lower()
-
-        if elem_lower in self.ELEMENT_RELATIONSHIP_TYPES:
-            return self.ELEMENT_RELATIONSHIP_TYPES[elem_lower]
-
-        if elem_lower.endswith("id") and len(elem_lower) > 2:
-            prefix = elem_lower[:-2]  
-            if prefix.endswith("master"):
-                return prefix.lower()
-            elif prefix.endswith("layout"):
-                return prefix.lower()
-            else:
-                if prefix == "sld":
-                    return "slide"
-                return prefix.lower()
-
-        if elem_lower.endswith("reference") and len(elem_lower) > 9:
-            prefix = elem_lower[:-9]  
-            return prefix.lower()
-
-        return None
-
-    def validate_content_types(self):
-        errors = []
-
-        content_types_file = self.unpacked_dir / "[Content_Types].xml"
-        if not content_types_file.exists():
-            print("FAILED - [Content_Types].xml file not found")
-            return False
-
-        try:
-            root = lxml.etree.parse(str(content_types_file)).getroot()
-            declared_parts = set()
-            declared_extensions = set()
-
-            for override in root.findall(
-                f".//{{{self.CONTENT_TYPES_NAMESPACE}}}Override"
-            ):
-                part_name = override.get("PartName")
-                if part_name is not None:
-                    declared_parts.add(part_name.lstrip("/"))
-
-            for default in root.findall(
-                f".//{{{self.CONTENT_TYPES_NAMESPACE}}}Default"
-            ):
-                extension = default.get("Extension")
-                if extension is not None:
-                    declared_extensions.add(extension.lower())
-
-            declarable_roots = {
-                "sld",
-                "sldLayout",
-                "sldMaster",
-                "presentation",  
-                "document",  
-                "workbook",
-                "worksheet",  
-                "theme",  
-            }
-
-            media_extensions = {
-                "png": "image/png",
-                "jpg": "image/jpeg",
-                "jpeg": "image/jpeg",
-                "gif": "image/gif",
-                "bmp": "image/bmp",
-                "tiff": "image/tiff",
-                "wmf": "image/x-wmf",
-                "emf": "image/x-emf",
-            }
-
-            all_files = list(self.unpacked_dir.rglob("*"))
-            all_files = [f for f in all_files if f.is_file()]
-
-            for xml_file in self.xml_files:
-                path_str = str(xml_file.relative_to(self.unpacked_dir)).replace(
-                    "\\", "/"
-                )
-
-                if any(
-                    skip in path_str
-                    for skip in [".rels", "[Content_Types]", "docProps/", "_rels/"]
-                ):
-                    continue
-
-                try:
-                    root_tag = lxml.etree.parse(str(xml_file)).getroot().tag
-                    root_name = root_tag.split("}")[-1] if "}" in root_tag else root_tag
-
-                    if root_name in declarable_roots and path_str not in declared_parts:
-                        errors.append(
-                            f"  {path_str}: File with <{root_name}> root not declared in [Content_Types].xml"
-                        )
-
-                except Exception:
-                    continue  
-
-            for file_path in all_files:
-                if file_path.suffix.lower() in {".xml", ".rels"}:
-                    continue
-                if file_path.name == "[Content_Types].xml":
-                    continue
-                if "_rels" in file_path.parts or "docProps" in file_path.parts:
-                    continue
-
-                extension = file_path.suffix.lstrip(".").lower()
-                if extension and extension not in declared_extensions:
-                    if extension in media_extensions:
-                        relative_path = file_path.relative_to(self.unpacked_dir)
-                        errors.append(
-                            f'  {relative_path}: File with extension \'{extension}\' not declared in [Content_Types].xml - should add: <Default Extension="{extension}" ContentType="{media_extensions[extension]}"/>'
-                        )
-
-        except Exception as e:
-            errors.append(f"  Error parsing [Content_Types].xml: {e}")
-
-        if errors:
-            print(f"FAILED - Found {len(errors)} content type declaration errors:")
-            for error in errors:
-                print(error)
-            return False
-        else:
-            if self.verbose:
-                print(
-                    "PASSED - All content files are properly declared in [Content_Types].xml"
-                )
-            return True
-
-    def validate_file_against_xsd(self, xml_file, verbose=False):
-        xml_file = Path(xml_file).resolve()
-        unpacked_dir = self.unpacked_dir.resolve()
-
-        is_valid, current_errors = self._validate_single_file_xsd(
-            xml_file, unpacked_dir
-        )
-
-        if is_valid is None:
-            return None, set()  
-        elif is_valid:
-            return True, set()  
-
-        original_errors = self._get_original_file_errors(xml_file)
-
-        assert current_errors is not None
-        new_errors = current_errors - original_errors
-
-        new_errors = {
-            e for e in new_errors
-            if not any(pattern in e for pattern in self.IGNORED_VALIDATION_ERRORS)
-        }
-
-        if new_errors:
-            if verbose:
-                relative_path = xml_file.relative_to(unpacked_dir)
-                print(f"FAILED - {relative_path}: {len(new_errors)} new error(s)")
-                for error in list(new_errors)[:3]:
-                    truncated = error[:250] + "..." if len(error) > 250 else error
-                    print(f"  - {truncated}")
-            return False, new_errors
-        else:
-            if verbose:
-                print(
-                    f"PASSED - No new errors (original had {len(current_errors)} errors)"
-                )
-            return True, set()
-
-    def validate_against_xsd(self):
-        new_errors = []
-        original_error_count = 0
-        valid_count = 0
-        skipped_count = 0
-
-        for xml_file in self.xml_files:
-            relative_path = str(xml_file.relative_to(self.unpacked_dir))
-            is_valid, new_file_errors = self.validate_file_against_xsd(
-                xml_file, verbose=False
-            )
-
-            if is_valid is None:
-                skipped_count += 1
-                continue
-            elif is_valid and not new_file_errors:
-                valid_count += 1
-                continue
-            elif is_valid:
-                original_error_count += 1
-                valid_count += 1
-                continue
-
-            new_errors.append(f"  {relative_path}: {len(new_file_errors)} new error(s)")
-            for error in list(new_file_errors)[:3]:  
-                new_errors.append(
-                    f"    - {error[:250]}..." if len(error) > 250 else f"    - {error}"
-                )
-
-        if self.verbose:
-            print(f"Validated {len(self.xml_files)} files:")
-            print(f"  - Valid: {valid_count}")
-            print(f"  - Skipped (no schema): {skipped_count}")
-            if original_error_count:
-                print(f"  - With original errors (ignored): {original_error_count}")
-            print(
-                f"  - With NEW errors: {len(new_errors) > 0 and len([e for e in new_errors if not e.startswith('    ')]) or 0}"
-            )
-
-        if new_errors:
-            print("\nFAILED - Found NEW validation errors:")
-            for error in new_errors:
-                print(error)
-            return False
-        else:
-            if self.verbose:
-                print("\nPASSED - No new XSD validation errors introduced")
-            return True
-
-    def _get_schema_path(self, xml_file):
-        if xml_file.name in self.SCHEMA_MAPPINGS:
-            return self.schemas_dir / self.SCHEMA_MAPPINGS[xml_file.name]
-
-        if xml_file.suffix == ".rels":
-            return self.schemas_dir / self.SCHEMA_MAPPINGS[".rels"]
-
-        if "charts/" in str(xml_file) and xml_file.name.startswith("chart"):
-            return self.schemas_dir / self.SCHEMA_MAPPINGS["chart"]
-
-        if "theme/" in str(xml_file) and xml_file.name.startswith("theme"):
-            return self.schemas_dir / self.SCHEMA_MAPPINGS["theme"]
-
-        if xml_file.parent.name in self.MAIN_CONTENT_FOLDERS:
-            return self.schemas_dir / self.SCHEMA_MAPPINGS[xml_file.parent.name]
-
-        return None
-
-    def _clean_ignorable_namespaces(self, xml_doc):
-        xml_string = lxml.etree.tostring(xml_doc, encoding="unicode")
-        xml_copy = lxml.etree.fromstring(xml_string)
-
-        for elem in xml_copy.iter():
-            attrs_to_remove = []
-
-            for attr in elem.attrib:
-                if "{" in attr:
-                    ns = attr.split("}")[0][1:]
-                    if ns not in self.OOXML_NAMESPACES:
-                        attrs_to_remove.append(attr)
-
-            for attr in attrs_to_remove:
-                del elem.attrib[attr]
-
-        self._remove_ignorable_elements(xml_copy)
-
-        return lxml.etree.ElementTree(xml_copy)
-
-    def _remove_ignorable_elements(self, root):
-        elements_to_remove = []
-
-        for elem in list(root):
-            if not hasattr(elem, "tag") or callable(elem.tag):
-                continue
-
-            tag_str = str(elem.tag)
-            if tag_str.startswith("{"):
-                ns = tag_str.split("}")[0][1:]
-                if ns not in self.OOXML_NAMESPACES:
-                    elements_to_remove.append(elem)
-                    continue
-
-            self._remove_ignorable_elements(elem)
-
-        for elem in elements_to_remove:
-            root.remove(elem)
-
-    def _preprocess_for_mc_ignorable(self, xml_doc):
-        root = xml_doc.getroot()
-
-        if f"{{{self.MC_NAMESPACE}}}Ignorable" in root.attrib:
-            del root.attrib[f"{{{self.MC_NAMESPACE}}}Ignorable"]
-
-        return xml_doc
-
-    def _validate_single_file_xsd(self, xml_file, base_path):
-        schema_path = self._get_schema_path(xml_file)
-        if not schema_path:
-            return None, None  
-
-        try:
-            with open(schema_path, "rb") as xsd_file:
-                parser = lxml.etree.XMLParser()
-                xsd_doc = lxml.etree.parse(
-                    xsd_file, parser=parser, base_url=str(schema_path)
-                )
-                schema = lxml.etree.XMLSchema(xsd_doc)
-
-            with open(xml_file, "r") as f:
-                xml_doc = lxml.etree.parse(f)
-
-            xml_doc, _ = self._remove_template_tags_from_text_nodes(xml_doc)
-            xml_doc = self._preprocess_for_mc_ignorable(xml_doc)
-
-            relative_path = xml_file.relative_to(base_path)
-            if (
-                relative_path.parts
-                and relative_path.parts[0] in self.MAIN_CONTENT_FOLDERS
-            ):
-                xml_doc = self._clean_ignorable_namespaces(xml_doc)
-
-            if schema.validate(xml_doc):
-                return True, set()
-            else:
-                errors = set()
-                for error in schema.error_log:
-                    errors.add(error.message)
-                return False, errors
-
-        except Exception as e:
-            return False, {str(e)}
-
-    def _get_original_file_errors(self, xml_file):
-        if self.original_file is None:
-            return set()
-
-        import tempfile
-        import zipfile
-
-        xml_file = Path(xml_file).resolve()
-        unpacked_dir = self.unpacked_dir.resolve()
-        relative_path = xml_file.relative_to(unpacked_dir)
-
-        with tempfile.TemporaryDirectory() as temp_dir:
-            temp_path = Path(temp_dir)
-
-            with zipfile.ZipFile(self.original_file, "r") as zip_ref:
-                zip_ref.extractall(temp_path)
-
-            original_xml_file = temp_path / relative_path
-
-            if not original_xml_file.exists():
-                return set()
-
-            is_valid, errors = self._validate_single_file_xsd(
-                original_xml_file, temp_path
-            )
-            return errors if errors else set()
-
-    def _remove_template_tags_from_text_nodes(self, xml_doc):
-        warnings = []
-        template_pattern = re.compile(r"\{\{[^}]*\}\}")
-
-        xml_string = lxml.etree.tostring(xml_doc, encoding="unicode")
-        xml_copy = lxml.etree.fromstring(xml_string)
-
-        def process_text_content(text, content_type):
-            if not text:
-                return text
-            matches = list(template_pattern.finditer(text))
-            if matches:
-                for match in matches:
-                    warnings.append(
-                        f"Found template tag in {content_type}: {match.group()}"
-                    )
-                return template_pattern.sub("", text)
-            return text
-
-        for elem in xml_copy.iter():
-            if not hasattr(elem, "tag") or callable(elem.tag):
-                continue
-            tag_str = str(elem.tag)
-            if tag_str.endswith("}t") or tag_str == "t":
-                continue
-
-            elem.text = process_text_content(elem.text, "text content")
-            elem.tail = process_text_content(elem.tail, "tail content")
-
-        return lxml.etree.ElementTree(xml_copy), warnings
-
-
-if __name__ == "__main__":
-    raise RuntimeError("This module should not be run directly.")

.agents/skills/xlsx/scripts/office/validators/docx.py

@@ -1,446 +0,0 @@
-"""
-Validator for Word document XML files against XSD schemas.
-"""
-
-import random
-import re
-import tempfile
-import zipfile
-
-import defusedxml.minidom
-import lxml.etree
-
-from .base import BaseSchemaValidator
-
-
-class DOCXSchemaValidator(BaseSchemaValidator):
-
-    WORD_2006_NAMESPACE = "http://schemas.openxmlformats.org/wordprocessingml/2006/main"
-    W14_NAMESPACE = "http://schemas.microsoft.com/office/word/2010/wordml"
-    W16CID_NAMESPACE = "http://schemas.microsoft.com/office/word/2016/wordml/cid"
-
-    ELEMENT_RELATIONSHIP_TYPES = {}
-
-    def validate(self):
-        if not self.validate_xml():
-            return False
-
-        all_valid = True
-        if not self.validate_namespaces():
-            all_valid = False
-
-        if not self.validate_unique_ids():
-            all_valid = False
-
-        if not self.validate_file_references():
-            all_valid = False
-
-        if not self.validate_content_types():
-            all_valid = False
-
-        if not self.validate_against_xsd():
-            all_valid = False
-
-        if not self.validate_whitespace_preservation():
-            all_valid = False
-
-        if not self.validate_deletions():
-            all_valid = False
-
-        if not self.validate_insertions():
-            all_valid = False
-
-        if not self.validate_all_relationship_ids():
-            all_valid = False
-
-        if not self.validate_id_constraints():
-            all_valid = False
-
-        if not self.validate_comment_markers():
-            all_valid = False
-
-        self.compare_paragraph_counts()
-
-        return all_valid
-
-    def validate_whitespace_preservation(self):
-        errors = []
-
-        for xml_file in self.xml_files:
-            if xml_file.name != "document.xml":
-                continue
-
-            try:
-                root = lxml.etree.parse(str(xml_file)).getroot()
-
-                for elem in root.iter(f"{{{self.WORD_2006_NAMESPACE}}}t"):
-                    if elem.text:
-                        text = elem.text
-                        if re.search(r"^[ \t\n\r]", text) or re.search(
-                            r"[ \t\n\r]$", text
-                        ):
-                            xml_space_attr = f"{{{self.XML_NAMESPACE}}}space"
-                            if (
-                                xml_space_attr not in elem.attrib
-                                or elem.attrib[xml_space_attr] != "preserve"
-                            ):
-                                text_preview = (
-                                    repr(text)[:50] + "..."
-                                    if len(repr(text)) > 50
-                                    else repr(text)
-                                )
-                                errors.append(
-                                    f"  {xml_file.relative_to(self.unpacked_dir)}: "
-                                    f"Line {elem.sourceline}: w:t element with whitespace missing xml:space='preserve': {text_preview}"
-                                )
-
-            except (lxml.etree.XMLSyntaxError, Exception) as e:
-                errors.append(
-                    f"  {xml_file.relative_to(self.unpacked_dir)}: Error: {e}"
-                )
-
-        if errors:
-            print(f"FAILED - Found {len(errors)} whitespace preservation violations:")
-            for error in errors:
-                print(error)
-            return False
-        else:
-            if self.verbose:
-                print("PASSED - All whitespace is properly preserved")
-            return True
-
-    def validate_deletions(self):
-        errors = []
-
-        for xml_file in self.xml_files:
-            if xml_file.name != "document.xml":
-                continue
-
-            try:
-                root = lxml.etree.parse(str(xml_file)).getroot()
-                namespaces = {"w": self.WORD_2006_NAMESPACE}
-
-                for t_elem in root.xpath(".//w:del//w:t", namespaces=namespaces):
-                    if t_elem.text:
-                        text_preview = (
-                            repr(t_elem.text)[:50] + "..."
-                            if len(repr(t_elem.text)) > 50
-                            else repr(t_elem.text)
-                        )
-                        errors.append(
-                            f"  {xml_file.relative_to(self.unpacked_dir)}: "
-                            f"Line {t_elem.sourceline}: <w:t> found within <w:del>: {text_preview}"
-                        )
-
-                for instr_elem in root.xpath(
-                    ".//w:del//w:instrText", namespaces=namespaces
-                ):
-                    text_preview = (
-                        repr(instr_elem.text or "")[:50] + "..."
-                        if len(repr(instr_elem.text or "")) > 50
-                        else repr(instr_elem.text or "")
-                    )
-                    errors.append(
-                        f"  {xml_file.relative_to(self.unpacked_dir)}: "
-                        f"Line {instr_elem.sourceline}: <w:instrText> found within <w:del> (use <w:delInstrText>): {text_preview}"
-                    )
-
-            except (lxml.etree.XMLSyntaxError, Exception) as e:
-                errors.append(
-                    f"  {xml_file.relative_to(self.unpacked_dir)}: Error: {e}"
-                )
-
-        if errors:
-            print(f"FAILED - Found {len(errors)} deletion validation violations:")
-            for error in errors:
-                print(error)
-            return False
-        else:
-            if self.verbose:
-                print("PASSED - No w:t elements found within w:del elements")
-            return True
-
-    def count_paragraphs_in_unpacked(self):
-        count = 0
-
-        for xml_file in self.xml_files:
-            if xml_file.name != "document.xml":
-                continue
-
-            try:
-                root = lxml.etree.parse(str(xml_file)).getroot()
-                paragraphs = root.findall(f".//{{{self.WORD_2006_NAMESPACE}}}p")
-                count = len(paragraphs)
-            except Exception as e:
-                print(f"Error counting paragraphs in unpacked document: {e}")
-
-        return count
-
-    def count_paragraphs_in_original(self):
-        original = self.original_file
-        if original is None:
-            return 0
-
-        count = 0
-
-        try:
-            with tempfile.TemporaryDirectory() as temp_dir:
-                with zipfile.ZipFile(original, "r") as zip_ref:
-                    zip_ref.extractall(temp_dir)
-
-                doc_xml_path = temp_dir + "/word/document.xml"
-                root = lxml.etree.parse(doc_xml_path).getroot()
-
-                paragraphs = root.findall(f".//{{{self.WORD_2006_NAMESPACE}}}p")
-                count = len(paragraphs)
-
-        except Exception as e:
-            print(f"Error counting paragraphs in original document: {e}")
-
-        return count
-
-    def validate_insertions(self):
-        errors = []
-
-        for xml_file in self.xml_files:
-            if xml_file.name != "document.xml":
-                continue
-
-            try:
-                root = lxml.etree.parse(str(xml_file)).getroot()
-                namespaces = {"w": self.WORD_2006_NAMESPACE}
-
-                invalid_elements = root.xpath(
-                    ".//w:ins//w:delText[not(ancestor::w:del)]", namespaces=namespaces
-                )
-
-                for elem in invalid_elements:
-                    text_preview = (
-                        repr(elem.text or "")[:50] + "..."
-                        if len(repr(elem.text or "")) > 50
-                        else repr(elem.text or "")
-                    )
-                    errors.append(
-                        f"  {xml_file.relative_to(self.unpacked_dir)}: "
-                        f"Line {elem.sourceline}: <w:delText> within <w:ins>: {text_preview}"
-                    )
-
-            except (lxml.etree.XMLSyntaxError, Exception) as e:
-                errors.append(
-                    f"  {xml_file.relative_to(self.unpacked_dir)}: Error: {e}"
-                )
-
-        if errors:
-            print(f"FAILED - Found {len(errors)} insertion validation violations:")
-            for error in errors:
-                print(error)
-            return False
-        else:
-            if self.verbose:
-                print("PASSED - No w:delText elements within w:ins elements")
-            return True
-
-    def compare_paragraph_counts(self):
-        original_count = self.count_paragraphs_in_original()
-        new_count = self.count_paragraphs_in_unpacked()
-
-        diff = new_count - original_count
-        diff_str = f"+{diff}" if diff > 0 else str(diff)
-        print(f"\nParagraphs: {original_count} → {new_count} ({diff_str})")
-
-    def _parse_id_value(self, val: str, base: int = 16) -> int:
-        return int(val, base)
-
-    def validate_id_constraints(self):
-        errors = []
-        para_id_attr = f"{{{self.W14_NAMESPACE}}}paraId"
-        durable_id_attr = f"{{{self.W16CID_NAMESPACE}}}durableId"
-
-        for xml_file in self.xml_files:
-            try:
-                for elem in lxml.etree.parse(str(xml_file)).iter():
-                    if val := elem.get(para_id_attr):
-                        if self._parse_id_value(val, base=16) >= 0x80000000:
-                            errors.append(
-                                f"  {xml_file.name}:{elem.sourceline}: paraId={val} >= 0x80000000"
-                            )
-
-                    if val := elem.get(durable_id_attr):
-                        if xml_file.name == "numbering.xml":
-                            try:
-                                if self._parse_id_value(val, base=10) >= 0x7FFFFFFF:
-                                    errors.append(
-                                        f"  {xml_file.name}:{elem.sourceline}: "
-                                        f"durableId={val} >= 0x7FFFFFFF"
-                                    )
-                            except ValueError:
-                                errors.append(
-                                    f"  {xml_file.name}:{elem.sourceline}: "
-                                    f"durableId={val} must be decimal in numbering.xml"
-                                )
-                        else:
-                            if self._parse_id_value(val, base=16) >= 0x7FFFFFFF:
-                                errors.append(
-                                    f"  {xml_file.name}:{elem.sourceline}: "
-                                    f"durableId={val} >= 0x7FFFFFFF"
-                                )
-            except Exception:
-                pass
-
-        if errors:
-            print(f"FAILED - {len(errors)} ID constraint violations:")
-            for e in errors:
-                print(e)
-        elif self.verbose:
-            print("PASSED - All paraId/durableId values within constraints")
-        return not errors
-
-    def validate_comment_markers(self):
-        errors = []
-
-        document_xml = None
-        comments_xml = None
-        for xml_file in self.xml_files:
-            if xml_file.name == "document.xml" and "word" in str(xml_file):
-                document_xml = xml_file
-            elif xml_file.name == "comments.xml":
-                comments_xml = xml_file
-
-        if not document_xml:
-            if self.verbose:
-                print("PASSED - No document.xml found (skipping comment validation)")
-            return True
-
-        try:
-            doc_root = lxml.etree.parse(str(document_xml)).getroot()
-            namespaces = {"w": self.WORD_2006_NAMESPACE}
-
-            range_starts = {
-                elem.get(f"{{{self.WORD_2006_NAMESPACE}}}id")
-                for elem in doc_root.xpath(
-                    ".//w:commentRangeStart", namespaces=namespaces
-                )
-            }
-            range_ends = {
-                elem.get(f"{{{self.WORD_2006_NAMESPACE}}}id")
-                for elem in doc_root.xpath(
-                    ".//w:commentRangeEnd", namespaces=namespaces
-                )
-            }
-            references = {
-                elem.get(f"{{{self.WORD_2006_NAMESPACE}}}id")
-                for elem in doc_root.xpath(
-                    ".//w:commentReference", namespaces=namespaces
-                )
-            }
-
-            orphaned_ends = range_ends - range_starts
-            for comment_id in sorted(
-                orphaned_ends, key=lambda x: int(x) if x and x.isdigit() else 0
-            ):
-                errors.append(
-                    f'  document.xml: commentRangeEnd id="{comment_id}" has no matching commentRangeStart'
-                )
-
-            orphaned_starts = range_starts - range_ends
-            for comment_id in sorted(
-                orphaned_starts, key=lambda x: int(x) if x and x.isdigit() else 0
-            ):
-                errors.append(
-                    f'  document.xml: commentRangeStart id="{comment_id}" has no matching commentRangeEnd'
-                )
-
-            comment_ids = set()
-            if comments_xml and comments_xml.exists():
-                comments_root = lxml.etree.parse(str(comments_xml)).getroot()
-                comment_ids = {
-                    elem.get(f"{{{self.WORD_2006_NAMESPACE}}}id")
-                    for elem in comments_root.xpath(
-                        ".//w:comment", namespaces=namespaces
-                    )
-                }
-
-                marker_ids = range_starts | range_ends | references
-                invalid_refs = marker_ids - comment_ids
-                for comment_id in sorted(
-                    invalid_refs, key=lambda x: int(x) if x and x.isdigit() else 0
-                ):
-                    if comment_id:  
-                        errors.append(
-                            f'  document.xml: marker id="{comment_id}" references non-existent comment'
-                        )
-
-        except (lxml.etree.XMLSyntaxError, Exception) as e:
-            errors.append(f"  Error parsing XML: {e}")
-
-        if errors:
-            print(f"FAILED - {len(errors)} comment marker violations:")
-            for error in errors:
-                print(error)
-            return False
-        else:
-            if self.verbose:
-                print("PASSED - All comment markers properly paired")
-            return True
-
-    def repair(self) -> int:
-        repairs = super().repair()
-        repairs += self.repair_durableId()
-        return repairs
-
-    def repair_durableId(self) -> int:
-        repairs = 0
-
-        for xml_file in self.xml_files:
-            try:
-                content = xml_file.read_text(encoding="utf-8")
-                dom = defusedxml.minidom.parseString(content)
-                modified = False
-
-                for elem in dom.getElementsByTagName("*"):
-                    if not elem.hasAttribute("w16cid:durableId"):
-                        continue
-
-                    durable_id = elem.getAttribute("w16cid:durableId")
-                    needs_repair = False
-
-                    if xml_file.name == "numbering.xml":
-                        try:
-                            needs_repair = (
-                                self._parse_id_value(durable_id, base=10) >= 0x7FFFFFFF
-                            )
-                        except ValueError:
-                            needs_repair = True
-                    else:
-                        try:
-                            needs_repair = (
-                                self._parse_id_value(durable_id, base=16) >= 0x7FFFFFFF
-                            )
-                        except ValueError:
-                            needs_repair = True
-
-                    if needs_repair:
-                        value = random.randint(1, 0x7FFFFFFE)
-                        if xml_file.name == "numbering.xml":
-                            new_id = str(value)  
-                        else:
-                            new_id = f"{value:08X}"  
-
-                        elem.setAttribute("w16cid:durableId", new_id)
-                        print(
-                            f"  Repaired: {xml_file.name}: durableId {durable_id} → {new_id}"
-                        )
-                        repairs += 1
-                        modified = True
-
-                if modified:
-                    xml_file.write_bytes(dom.toxml(encoding="UTF-8"))
-
-            except Exception:
-                pass
-
-        return repairs
-
-
-if __name__ == "__main__":
-    raise RuntimeError("This module should not be run directly.")

.agents/skills/xlsx/scripts/office/validators/pptx.py

@@ -1,275 +0,0 @@
-"""
-Validator for PowerPoint presentation XML files against XSD schemas.
-"""
-
-import re
-
-from .base import BaseSchemaValidator
-
-
-class PPTXSchemaValidator(BaseSchemaValidator):
-
-    PRESENTATIONML_NAMESPACE = (
-        "http://schemas.openxmlformats.org/presentationml/2006/main"
-    )
-
-    ELEMENT_RELATIONSHIP_TYPES = {
-        "sldid": "slide",
-        "sldmasterid": "slidemaster",
-        "notesmasterid": "notesmaster",
-        "sldlayoutid": "slidelayout",
-        "themeid": "theme",
-        "tablestyleid": "tablestyles",
-    }
-
-    def validate(self):
-        if not self.validate_xml():
-            return False
-
-        all_valid = True
-        if not self.validate_namespaces():
-            all_valid = False
-
-        if not self.validate_unique_ids():
-            all_valid = False
-
-        if not self.validate_uuid_ids():
-            all_valid = False
-
-        if not self.validate_file_references():
-            all_valid = False
-
-        if not self.validate_slide_layout_ids():
-            all_valid = False
-
-        if not self.validate_content_types():
-            all_valid = False
-
-        if not self.validate_against_xsd():
-            all_valid = False
-
-        if not self.validate_notes_slide_references():
-            all_valid = False
-
-        if not self.validate_all_relationship_ids():
-            all_valid = False
-
-        if not self.validate_no_duplicate_slide_layouts():
-            all_valid = False
-
-        return all_valid
-
-    def validate_uuid_ids(self):
-        import lxml.etree
-
-        errors = []
-        uuid_pattern = re.compile(
-            r"^[\{\(]?[0-9A-Fa-f]{8}-?[0-9A-Fa-f]{4}-?[0-9A-Fa-f]{4}-?[0-9A-Fa-f]{4}-?[0-9A-Fa-f]{12}[\}\)]?$"
-        )
-
-        for xml_file in self.xml_files:
-            try:
-                root = lxml.etree.parse(str(xml_file)).getroot()
-
-                for elem in root.iter():
-                    for attr, value in elem.attrib.items():
-                        attr_name = attr.split("}")[-1].lower()
-                        if attr_name == "id" or attr_name.endswith("id"):
-                            if self._looks_like_uuid(value):
-                                if not uuid_pattern.match(value):
-                                    errors.append(
-                                        f"  {xml_file.relative_to(self.unpacked_dir)}: "
-                                        f"Line {elem.sourceline}: ID '{value}' appears to be a UUID but contains invalid hex characters"
-                                    )
-
-            except (lxml.etree.XMLSyntaxError, Exception) as e:
-                errors.append(
-                    f"  {xml_file.relative_to(self.unpacked_dir)}: Error: {e}"
-                )
-
-        if errors:
-            print(f"FAILED - Found {len(errors)} UUID ID validation errors:")
-            for error in errors:
-                print(error)
-            return False
-        else:
-            if self.verbose:
-                print("PASSED - All UUID-like IDs contain valid hex values")
-            return True
-
-    def _looks_like_uuid(self, value):
-        clean_value = value.strip("{}()").replace("-", "")
-        return len(clean_value) == 32 and all(c.isalnum() for c in clean_value)
-
-    def validate_slide_layout_ids(self):
-        import lxml.etree
-
-        errors = []
-
-        slide_masters = list(self.unpacked_dir.glob("ppt/slideMasters/*.xml"))
-
-        if not slide_masters:
-            if self.verbose:
-                print("PASSED - No slide masters found")
-            return True
-
-        for slide_master in slide_masters:
-            try:
-                root = lxml.etree.parse(str(slide_master)).getroot()
-
-                rels_file = slide_master.parent / "_rels" / f"{slide_master.name}.rels"
-
-                if not rels_file.exists():
-                    errors.append(
-                        f"  {slide_master.relative_to(self.unpacked_dir)}: "
-                        f"Missing relationships file: {rels_file.relative_to(self.unpacked_dir)}"
-                    )
-                    continue
-
-                rels_root = lxml.etree.parse(str(rels_file)).getroot()
-
-                valid_layout_rids = set()
-                for rel in rels_root.findall(
-                    f".//{{{self.PACKAGE_RELATIONSHIPS_NAMESPACE}}}Relationship"
-                ):
-                    rel_type = rel.get("Type", "")
-                    if "slideLayout" in rel_type:
-                        valid_layout_rids.add(rel.get("Id"))
-
-                for sld_layout_id in root.findall(
-                    f".//{{{self.PRESENTATIONML_NAMESPACE}}}sldLayoutId"
-                ):
-                    r_id = sld_layout_id.get(
-                        f"{{{self.OFFICE_RELATIONSHIPS_NAMESPACE}}}id"
-                    )
-                    layout_id = sld_layout_id.get("id")
-
-                    if r_id and r_id not in valid_layout_rids:
-                        errors.append(
-                            f"  {slide_master.relative_to(self.unpacked_dir)}: "
-                            f"Line {sld_layout_id.sourceline}: sldLayoutId with id='{layout_id}' "
-                            f"references r:id='{r_id}' which is not found in slide layout relationships"
-                        )
-
-            except (lxml.etree.XMLSyntaxError, Exception) as e:
-                errors.append(
-                    f"  {slide_master.relative_to(self.unpacked_dir)}: Error: {e}"
-                )
-
-        if errors:
-            print(f"FAILED - Found {len(errors)} slide layout ID validation errors:")
-            for error in errors:
-                print(error)
-            print(
-                "Remove invalid references or add missing slide layouts to the relationships file."
-            )
-            return False
-        else:
-            if self.verbose:
-                print("PASSED - All slide layout IDs reference valid slide layouts")
-            return True
-
-    def validate_no_duplicate_slide_layouts(self):
-        import lxml.etree
-
-        errors = []
-        slide_rels_files = list(self.unpacked_dir.glob("ppt/slides/_rels/*.xml.rels"))
-
-        for rels_file in slide_rels_files:
-            try:
-                root = lxml.etree.parse(str(rels_file)).getroot()
-
-                layout_rels = [
-                    rel
-                    for rel in root.findall(
-                        f".//{{{self.PACKAGE_RELATIONSHIPS_NAMESPACE}}}Relationship"
-                    )
-                    if "slideLayout" in rel.get("Type", "")
-                ]
-
-                if len(layout_rels) > 1:
-                    errors.append(
-                        f"  {rels_file.relative_to(self.unpacked_dir)}: has {len(layout_rels)} slideLayout references"
-                    )
-
-            except Exception as e:
-                errors.append(
-                    f"  {rels_file.relative_to(self.unpacked_dir)}: Error: {e}"
-                )
-
-        if errors:
-            print("FAILED - Found slides with duplicate slideLayout references:")
-            for error in errors:
-                print(error)
-            return False
-        else:
-            if self.verbose:
-                print("PASSED - All slides have exactly one slideLayout reference")
-            return True
-
-    def validate_notes_slide_references(self):
-        import lxml.etree
-
-        errors = []
-        notes_slide_references = {}  
-
-        slide_rels_files = list(self.unpacked_dir.glob("ppt/slides/_rels/*.xml.rels"))
-
-        if not slide_rels_files:
-            if self.verbose:
-                print("PASSED - No slide relationship files found")
-            return True
-
-        for rels_file in slide_rels_files:
-            try:
-                root = lxml.etree.parse(str(rels_file)).getroot()
-
-                for rel in root.findall(
-                    f".//{{{self.PACKAGE_RELATIONSHIPS_NAMESPACE}}}Relationship"
-                ):
-                    rel_type = rel.get("Type", "")
-                    if "notesSlide" in rel_type:
-                        target = rel.get("Target", "")
-                        if target:
-                            normalized_target = target.replace("../", "")
-
-                            slide_name = rels_file.stem.replace(
-                                ".xml", ""
-                            )  
-
-                            if normalized_target not in notes_slide_references:
-                                notes_slide_references[normalized_target] = []
-                            notes_slide_references[normalized_target].append(
-                                (slide_name, rels_file)
-                            )
-
-            except (lxml.etree.XMLSyntaxError, Exception) as e:
-                errors.append(
-                    f"  {rels_file.relative_to(self.unpacked_dir)}: Error: {e}"
-                )
-
-        for target, references in notes_slide_references.items():
-            if len(references) > 1:
-                slide_names = [ref[0] for ref in references]
-                errors.append(
-                    f"  Notes slide '{target}' is referenced by multiple slides: {', '.join(slide_names)}"
-                )
-                for slide_name, rels_file in references:
-                    errors.append(f"    - {rels_file.relative_to(self.unpacked_dir)}")
-
-        if errors:
-            print(
-                f"FAILED - Found {len([e for e in errors if not e.startswith('    ')])} notes slide reference validation errors:"
-            )
-            for error in errors:
-                print(error)
-            print("Each slide may optionally have its own slide file.")
-            return False
-        else:
-            if self.verbose:
-                print("PASSED - All notes slide references are unique")
-            return True
-
-
-if __name__ == "__main__":
-    raise RuntimeError("This module should not be run directly.")

.agents/skills/xlsx/scripts/office/validators/redlining.py

@@ -1,247 +0,0 @@
-"""
-Validator for tracked changes in Word documents.
-"""
-
-import subprocess
-import tempfile
-import zipfile
-from pathlib import Path
-
-
-class RedliningValidator:
-
-    def __init__(self, unpacked_dir, original_docx, verbose=False, author="Claude"):
-        self.unpacked_dir = Path(unpacked_dir)
-        self.original_docx = Path(original_docx)
-        self.verbose = verbose
-        self.author = author
-        self.namespaces = {
-            "w": "http://schemas.openxmlformats.org/wordprocessingml/2006/main"
-        }
-
-    def repair(self) -> int:
-        return 0
-
-    def validate(self):
-        modified_file = self.unpacked_dir / "word" / "document.xml"
-        if not modified_file.exists():
-            print(f"FAILED - Modified document.xml not found at {modified_file}")
-            return False
-
-        try:
-            import xml.etree.ElementTree as ET
-
-            tree = ET.parse(modified_file)
-            root = tree.getroot()
-
-            del_elements = root.findall(".//w:del", self.namespaces)
-            ins_elements = root.findall(".//w:ins", self.namespaces)
-
-            author_del_elements = [
-                elem
-                for elem in del_elements
-                if elem.get(f"{{{self.namespaces['w']}}}author") == self.author
-            ]
-            author_ins_elements = [
-                elem
-                for elem in ins_elements
-                if elem.get(f"{{{self.namespaces['w']}}}author") == self.author
-            ]
-
-            if not author_del_elements and not author_ins_elements:
-                if self.verbose:
-                    print(f"PASSED - No tracked changes by {self.author} found.")
-                return True
-
-        except Exception:
-            pass
-
-        with tempfile.TemporaryDirectory() as temp_dir:
-            temp_path = Path(temp_dir)
-
-            try:
-                with zipfile.ZipFile(self.original_docx, "r") as zip_ref:
-                    zip_ref.extractall(temp_path)
-            except Exception as e:
-                print(f"FAILED - Error unpacking original docx: {e}")
-                return False
-
-            original_file = temp_path / "word" / "document.xml"
-            if not original_file.exists():
-                print(
-                    f"FAILED - Original document.xml not found in {self.original_docx}"
-                )
-                return False
-
-            try:
-                import xml.etree.ElementTree as ET
-
-                modified_tree = ET.parse(modified_file)
-                modified_root = modified_tree.getroot()
-                original_tree = ET.parse(original_file)
-                original_root = original_tree.getroot()
-            except ET.ParseError as e:
-                print(f"FAILED - Error parsing XML files: {e}")
-                return False
-
-            self._remove_author_tracked_changes(original_root)
-            self._remove_author_tracked_changes(modified_root)
-
-            modified_text = self._extract_text_content(modified_root)
-            original_text = self._extract_text_content(original_root)
-
-            if modified_text != original_text:
-                error_message = self._generate_detailed_diff(
-                    original_text, modified_text
-                )
-                print(error_message)
-                return False
-
-            if self.verbose:
-                print(f"PASSED - All changes by {self.author} are properly tracked")
-            return True
-
-    def _generate_detailed_diff(self, original_text, modified_text):
-        error_parts = [
-            f"FAILED - Document text doesn't match after removing {self.author}'s tracked changes",
-            "",
-            "Likely causes:",
-            "  1. Modified text inside another author's <w:ins> or <w:del> tags",
-            "  2. Made edits without proper tracked changes",
-            "  3. Didn't nest <w:del> inside <w:ins> when deleting another's insertion",
-            "",
-            "For pre-redlined documents, use correct patterns:",
-            "  - To reject another's INSERTION: Nest <w:del> inside their <w:ins>",
-            "  - To restore another's DELETION: Add new <w:ins> AFTER their <w:del>",
-            "",
-        ]
-
-        git_diff = self._get_git_word_diff(original_text, modified_text)
-        if git_diff:
-            error_parts.extend(["Differences:", "============", git_diff])
-        else:
-            error_parts.append("Unable to generate word diff (git not available)")
-
-        return "\n".join(error_parts)
-
-    def _get_git_word_diff(self, original_text, modified_text):
-        try:
-            with tempfile.TemporaryDirectory() as temp_dir:
-                temp_path = Path(temp_dir)
-
-                original_file = temp_path / "original.txt"
-                modified_file = temp_path / "modified.txt"
-
-                original_file.write_text(original_text, encoding="utf-8")
-                modified_file.write_text(modified_text, encoding="utf-8")
-
-                result = subprocess.run(
-                    [
-                        "git",
-                        "diff",
-                        "--word-diff=plain",
-                        "--word-diff-regex=.",  
-                        "-U0",  
-                        "--no-index",
-                        str(original_file),
-                        str(modified_file),
-                    ],
-                    capture_output=True,
-                    text=True,
-                )
-
-                if result.stdout.strip():
-                    lines = result.stdout.split("\n")
-                    content_lines = []
-                    in_content = False
-                    for line in lines:
-                        if line.startswith("@@"):
-                            in_content = True
-                            continue
-                        if in_content and line.strip():
-                            content_lines.append(line)
-
-                    if content_lines:
-                        return "\n".join(content_lines)
-
-                result = subprocess.run(
-                    [
-                        "git",
-                        "diff",
-                        "--word-diff=plain",
-                        "-U0",  
-                        "--no-index",
-                        str(original_file),
-                        str(modified_file),
-                    ],
-                    capture_output=True,
-                    text=True,
-                )
-
-                if result.stdout.strip():
-                    lines = result.stdout.split("\n")
-                    content_lines = []
-                    in_content = False
-                    for line in lines:
-                        if line.startswith("@@"):
-                            in_content = True
-                            continue
-                        if in_content and line.strip():
-                            content_lines.append(line)
-                    return "\n".join(content_lines)
-
-        except (subprocess.CalledProcessError, FileNotFoundError, Exception):
-            pass
-
-        return None
-
-    def _remove_author_tracked_changes(self, root):
-        ins_tag = f"{{{self.namespaces['w']}}}ins"
-        del_tag = f"{{{self.namespaces['w']}}}del"
-        author_attr = f"{{{self.namespaces['w']}}}author"
-
-        for parent in root.iter():
-            to_remove = []
-            for child in parent:
-                if child.tag == ins_tag and child.get(author_attr) == self.author:
-                    to_remove.append(child)
-            for elem in to_remove:
-                parent.remove(elem)
-
-        deltext_tag = f"{{{self.namespaces['w']}}}delText"
-        t_tag = f"{{{self.namespaces['w']}}}t"
-
-        for parent in root.iter():
-            to_process = []
-            for child in parent:
-                if child.tag == del_tag and child.get(author_attr) == self.author:
-                    to_process.append((child, list(parent).index(child)))
-
-            for del_elem, del_index in reversed(to_process):
-                for elem in del_elem.iter():
-                    if elem.tag == deltext_tag:
-                        elem.tag = t_tag
-
-                for child in reversed(list(del_elem)):
-                    parent.insert(del_index, child)
-                parent.remove(del_elem)
-
-    def _extract_text_content(self, root):
-        p_tag = f"{{{self.namespaces['w']}}}p"
-        t_tag = f"{{{self.namespaces['w']}}}t"
-
-        paragraphs = []
-        for p_elem in root.findall(f".//{p_tag}"):
-            text_parts = []
-            for t_elem in p_elem.findall(f".//{t_tag}"):
-                if t_elem.text:
-                    text_parts.append(t_elem.text)
-            paragraph_text = "".join(text_parts)
-            if paragraph_text:
-                paragraphs.append(paragraph_text)
-
-        return "\n".join(paragraphs)
-
-
-if __name__ == "__main__":
-    raise RuntimeError("This module should not be run directly.")

.agents/skills/xlsx/scripts/recalc.py

@@ -1,184 +0,0 @@
-"""
-Excel Formula Recalculation Script
-Recalculates all formulas in an Excel file using LibreOffice
-"""
-
-import json
-import os
-import platform
-import subprocess
-import sys
-from pathlib import Path
-
-from office.soffice import get_soffice_env
-
-from openpyxl import load_workbook
-
-MACRO_DIR_MACOS = "~/Library/Application Support/LibreOffice/4/user/basic/Standard"
-MACRO_DIR_LINUX = "~/.config/libreoffice/4/user/basic/Standard"
-MACRO_FILENAME = "Module1.xba"
-
-RECALCULATE_MACRO = """<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Module1" script:language="StarBasic">
-    Sub RecalculateAndSave()
-      ThisComponent.calculateAll()
-      ThisComponent.store()
-      ThisComponent.close(True)
-    End Sub
-</script:module>"""
-
-
-def has_gtimeout():
-    try:
-        subprocess.run(
-            ["gtimeout", "--version"], capture_output=True, timeout=1, check=False
-        )
-        return True
-    except (FileNotFoundError, subprocess.TimeoutExpired):
-        return False
-
-
-def setup_libreoffice_macro():
-    macro_dir = os.path.expanduser(
-        MACRO_DIR_MACOS if platform.system() == "Darwin" else MACRO_DIR_LINUX
-    )
-    macro_file = os.path.join(macro_dir, MACRO_FILENAME)
-
-    if (
-        os.path.exists(macro_file)
-        and "RecalculateAndSave" in Path(macro_file).read_text()
-    ):
-        return True
-
-    if not os.path.exists(macro_dir):
-        subprocess.run(
-            ["soffice", "--headless", "--terminate_after_init"],
-            capture_output=True,
-            timeout=10,
-            env=get_soffice_env(),
-        )
-        os.makedirs(macro_dir, exist_ok=True)
-
-    try:
-        Path(macro_file).write_text(RECALCULATE_MACRO)
-        return True
-    except Exception:
-        return False
-
-
-def recalc(filename, timeout=30):
-    if not Path(filename).exists():
-        return {"error": f"File {filename} does not exist"}
-
-    abs_path = str(Path(filename).absolute())
-
-    if not setup_libreoffice_macro():
-        return {"error": "Failed to setup LibreOffice macro"}
-
-    cmd = [
-        "soffice",
-        "--headless",
-        "--norestore",
-        "vnd.sun.star.script:Standard.Module1.RecalculateAndSave?language=Basic&location=application",
-        abs_path,
-    ]
-
-    if platform.system() == "Linux":
-        cmd = ["timeout", str(timeout)] + cmd
-    elif platform.system() == "Darwin" and has_gtimeout():
-        cmd = ["gtimeout", str(timeout)] + cmd
-
-    result = subprocess.run(cmd, capture_output=True, text=True, env=get_soffice_env())
-
-    if result.returncode != 0 and result.returncode != 124:  
-        error_msg = result.stderr or "Unknown error during recalculation"
-        if "Module1" in error_msg or "RecalculateAndSave" not in error_msg:
-            return {"error": "LibreOffice macro not configured properly"}
-        return {"error": error_msg}
-
-    try:
-        wb = load_workbook(filename, data_only=True)
-
-        excel_errors = [
-            "#VALUE!",
-            "#DIV/0!",
-            "#REF!",
-            "#NAME?",
-            "#NULL!",
-            "#NUM!",
-            "#N/A",
-        ]
-        error_details = {err: [] for err in excel_errors}
-        total_errors = 0
-
-        for sheet_name in wb.sheetnames:
-            ws = wb[sheet_name]
-            for row in ws.iter_rows():
-                for cell in row:
-                    if cell.value is not None and isinstance(cell.value, str):
-                        for err in excel_errors:
-                            if err in cell.value:
-                                location = f"{sheet_name}!{cell.coordinate}"
-                                error_details[err].append(location)
-                                total_errors += 1
-                                break
-
-        wb.close()
-
-        result = {
-            "status": "success" if total_errors == 0 else "errors_found",
-            "total_errors": total_errors,
-            "error_summary": {},
-        }
-
-        for err_type, locations in error_details.items():
-            if locations:
-                result["error_summary"][err_type] = {
-                    "count": len(locations),
-                    "locations": locations[:20],  
-                }
-
-        wb_formulas = load_workbook(filename, data_only=False)
-        formula_count = 0
-        for sheet_name in wb_formulas.sheetnames:
-            ws = wb_formulas[sheet_name]
-            for row in ws.iter_rows():
-                for cell in row:
-                    if (
-                        cell.value
-                        and isinstance(cell.value, str)
-                        and cell.value.startswith("=")
-                    ):
-                        formula_count += 1
-        wb_formulas.close()
-
-        result["total_formulas"] = formula_count
-
-        return result
-
-    except Exception as e:
-        return {"error": str(e)}
-
-
-def main():
-    if len(sys.argv) < 2:
-        print("Usage: python recalc.py <excel_file> [timeout_seconds]")
-        print("\nRecalculates all formulas in an Excel file using LibreOffice")
-        print("\nReturns JSON with error details:")
-        print("  - status: 'success' or 'errors_found'")
-        print("  - total_errors: Total number of Excel errors found")
-        print("  - total_formulas: Number of formulas in the file")
-        print("  - error_summary: Breakdown by error type with locations")
-        print("    - #VALUE!, #DIV/0!, #REF!, #NAME?, #NULL!, #NUM!, #N/A")
-        sys.exit(1)
-
-    filename = sys.argv[1]
-    timeout = int(sys.argv[2]) if len(sys.argv) > 2 else 30
-
-    result = recalc(filename, timeout)
-    print(json.dumps(result, indent=2))
-
-
-if __name__ == "__main__":
-    main()

.qwen/settings.json

@@ -2,5 +2,5 @@
   "tools": {
     "approvalMode": "yolo"
   },
-  "$version": 2
+  "$version": 3
 }

.qwen/settings.json.orig

@@ -0,0 +1,6 @@
+{
+  "tools": {
+    "approvalMode": "yolo"
+  },
+  "$version": 2
+}

CODEBUDDY.md

@@ -1,376 +0,0 @@
-# CODEBUDDY.md
-
-This file provides guidance to CodeBuddy Code when working with code in this repository.
-
-## Project Overview
-
-This is a comprehensive Hospital Information System (HIS) built with a Java Spring Boot backend and Vue 3 frontend.
-
-- **Backend**: Java 17, Spring Boot 2.5.15, multi-module Maven architecture
-- **Frontend**: Vue 3, Vite, Element Plus, Pinia state management
-- **Database**: PostgreSQL (recommended v16.2)
-- **Cache**: Redis
-
-## Repository Structure
-
-```
-.
-├── openhis-server-new/          # Backend multi-module Maven project
-│   ├── openhis-application/    # Main application module with startup class
-│   ├── openhis-domain/          # Business domain modules (administration, clinical, financial, etc.)
-│   ├── openhis-common/          # Shared utilities and common code
-│   ├── core-admin/             # Core administration module
-│   ├── core-framework/         # Framework configuration and security
-│   ├── core-system/            # System management module
-│   ├── core-quartz/            # Scheduled tasks
-│   ├── core-generator/         # Code generation utilities
-│   ├── core-common/            # Core utilities
-│   └── core-flowable/          # Workflow engine integration
-└── openhis-ui-vue3/            # Vue 3 frontend
-    ├── src/
-    │   ├── api/                # API service layer
-    │   ├── components/         # Reusable components
-    │   ├── router/             # Vue Router configuration
-    │   ├── store/              # Pinia state management
-    │   ├── utils/              # Utility functions
-    │   └── views/              # Page components
-    └── vite/                   # Vite plugins configuration
-```
-
-## Build and Development Commands
-
-### Backend (Java)
-
-**Build the entire backend:**
-```bash
-cd openhis-server-new
-mvn clean package -DskipTests
-```
-
-**Run the backend application (development):**
-```bash
-cd openhis-server-new/openhis-application
-mvn spring-boot:run
-```
-
-**Alternative: Run directly from IDE:**
-- Run the main method in `openhis-server-new/openhis-application/src/main/java/com/openhis/OpenHisApplication.java`
-
-**Start scripts:**
-- Linux/Mac: `openhis-server-new/start.sh`
-- Windows: `openhis-server-new/start.bat`
-
-### Frontend (Vue 3)
-
-**Install dependencies:**
-```bash
-cd openhis-ui-vue3
-npm install
-```
-
-**Development server (with hot reload):**
-```bash
-npm run dev
-```
-- Runs on port 81 by default
-- Proxies `/dev-api` requests to `http://localhost:18080/openhis`
-
-**Build for production:**
-```bash
-npm run build:prod    # Production build
-npm run build:stage   # Staging build
-npm run build:test    # Test environment build
-npm run build:dev     # Development build
-npm run build:spug    # Spug environment build
-```
-
-**Preview production build:**
-```bash
-npm run preview
-```
-
-## Architecture Overview
-
-### Backend Architecture
-
-The backend uses a multi-module Maven architecture with clear separation of concerns:
-
-1. **openhis-application**: Entry point with `OpenHisApplication.java` (d:\his\openhis-server-new\openhis-application\src\main\java\com\openhis\OpenHisApplication.java:20)
-   - Scans `com.core` and `com.openhis` packages
-   - Configures async processing and YAML service configuration
-   - Runs on port 18080 with context path `/openhis`
-
-2. **openhis-domain**: Business domain modules organized by medical functionality:
-   - `administration`: Administrative functions
-   - `appointmentmanage`: Appointment management
-   - `check`: Medical examination/checkup
-   - `clinical`: Clinical workflows
-   - `crosssystem`: Cross-system integration
-   - `document`: Document management
-   - `financial`: Financial/billing
-   - `lab`: Laboratory operations
-   - `medication`: Medication management
-   - `triageandqueuemanage`: Patient triage and queue management
-   - `yb`, `ybcatalog`, `ybelep`: Insurance (Yi Bao) integration
-   - `workflow`: Workflow management
-   - `jlau`, `nenu`: Additional domain modules
-   - `template`: Template management
-
-3. **Core Modules** (com.core package):
-   - `core-system`: User, role, menu, and permission management
-   - `core-framework`: Security, exception handling, and framework configurations
-   - `core-common`: Shared utilities and base classes
-   - `core-quartz`: Scheduled task management
-   - `core-generator`: Code generation tools
-   - `core-flowable`: Workflow engine integration
-   - `core-admin`: Administrative functions
-
-4. **openhis-common**: Domain-specific shared code and utilities under `com.openhis.common` package
-
-**Key Technologies:**
-- MyBatis-Plus 3.5.5 for ORM with enhanced CRUD operations
-- Druid 1.2.27 connection pool with monitoring at `/druid/*`
-- Flowable 6.8.0 for workflow management
-- LiteFlow 2.12.4.1 for business rule orchestration
-- Swagger 3.0.0 for API documentation
-- JWT 0.9.1 for authentication
-- Hutool 5.3.8 utility library
-- Fastjson2 2.0.58 for JSON processing
-- Pinyin4j 2.5.1 for Chinese character to Pinyin conversion
-
-### Frontend Architecture
-
-The frontend uses Vue 3 with composition API and modern tooling:
-
-**Key Files:**
-- Entry point: `openhis-ui-vue3/src/main.js`
-- Router configuration: `openhis-ui-vue3/src/router/index.js`
-- Store initialization: `openhis-ui-vue3/src/store/store.js`
-- Vite configuration: `openhis-ui-vue3/vite.config.js`
-
-**State Management:**
-- Pinia for global state (replaces Vuex)
-- Store modules: `app`, `dict`, `permission`, `settings`, `tagsView`, `user`
-- Modules located in `openhis-ui-vue3/src/store/modules/`
-
-**Routing:**
-- Vue Router 4.3.0
-- Two types of routes:
-  - `constantRoutes`: Public routes (login, 404, etc.)
-  - `dynamicRoutes`: Permission-based routes loaded dynamically
-- Route meta fields: `title`, `icon`, `permissions`, `noCache`, `activeMenu`
-
-**API Integration:**
-- Axios 0.27.2 for HTTP requests
-- Base API URL configured via environment variables (`VITE_APP_BASE_API`)
-- Proxy configuration in vite.config.js for development
-  - `/dev-api` → `http://localhost:18080/openhis`
-  - `/ybplugin` → `http://localhost:5000` (insurance plugin)
-- Request/response interceptors in `openhis-ui-vue3/src/utils/request.js`
-- API service files organized by module in `openhis-ui-vue3/src/api/`
-  - `administration`, `appoinmentmanage`, `monitor`, `system`, `tool`
-  - Shared APIs: `home.js`, `login.js`, `menu.js`, `public.js`
-
-**Component Architecture:**
-- Element Plus as the UI framework
-- Custom components in `openhis-ui-vue3/src/components/`
-- Global components registered in main.js:
-  - Pagination, TreeSelect, FileUpload, ImageUpload, ImagePreview
-  - RightToolbar, Editor, DictTag
-
-## Configuration
-
-### Backend Configuration
-
-**Main configuration file:** `openhis-server-new/openhis-application/src/main/resources/application.yml`
-
-**Environment-specific profiles:**
-- `application-dev.yml` - Development environment
-- `application-test.yml` - Test environment
-- `application-prd.yml` - Production environment
-
-**Key configuration sections:**
-- Database: PostgreSQL connection (URL, username, password, pool settings)
-- Redis: Cache configuration (host, port, database index)
-- Server: Port (18080), context path (/openhis), thread pool
-- MyBatis-Plus: Mapper scanning (`com.core.**.domain,com.openhis.**.domain`), type aliases, logical delete
-- Logging: Debug levels for com.openhis and com.baomidou.mybatisplus
-- Swagger: API documentation at `/swagger-ui/index.html`
-- Druid: Database monitoring at `/druid/*` (credentials: openhis/123456)
-- Flowable: Workflow engine settings (schema update disabled)
-- LiteFlow: Business rule configuration at `config/flow.el.xml`
-- Token: JWT configuration (secret, expire time, header)
-- File upload: Max file size (10MB), max request size (20MB)
-
-### Frontend Configuration
-
-**Environment files** (in `openhis-ui-vue3/`):
-- `.env.dev` - Dev environment
-- `.env.development` - Development environment variables
-- `.env.staging` - Staging environment variables
-- `.env.production` - Production environment variables
-- `.env.test` - Test environment variables
-- `.env.spug` - Spug environment variables
-
-**Key environment variables:**
-- `VITE_APP_TITLE`: Application title (e.g., "医院信息管理系统")
-- `VITE_APP_BASE_API`: Backend API base URL (e.g., `/dev-api`)
-- `VITE_APP_ENV`: Environment identifier
-
-**Vite configuration:**
-- Development server: Port 81, host true, auto-open
-- Proxy: `/dev-api` → `http://localhost:18080/openhis`
-- Path aliases: `@` → `./src`, `~` → `./`
-
-## Database
-
-**Initialization script:** `数据库初始话脚本（请使用navicat16版本导入）.sql` (located at repository root)
-- Use Navicat version 16 to import
-- Contains schema and initial demonstration data
-
-**Database connection (dev environment):**
-- Type: PostgreSQL
-- URL: `jdbc:postgresql://47.116.196.11:15432/postgresql?currentSchema=hisdev`
-- Driver: `org.postgresql.Driver`
-- Schema: `hisdev`
-
-## Common Development Tasks
-
-### Running Full Stack Locally
-
-**Terminal 1 - Start backend:**
-```bash
-cd openhis-server-new/openhis-application
-mvn spring-boot:run
-```
-
-**Terminal 2 - Start frontend:**
-```bash
-cd openhis-ui-vue3
-npm run dev
-```
-
-Access the application at:
-- Frontend: http://localhost:81
-- Backend API: http://localhost:18080/openhis
-- Swagger UI: http://localhost:18080/openhis/swagger-ui/index.html
-- Druid monitoring: http://localhost:18080/openhis/druid/login.html
-
-### Adding a New Backend Feature
-
-1. Create domain entity in appropriate module under `openhis-domain/[module]/domain/`
-2. Create mapper interface in `openhis-domain/[module]/mapper/`
-3. Create mapper XML in `openhis-domain/[module]/resources/mapper/` (if custom SQL needed)
-4. Create service interface and implementation in `openhis-domain/[module]/service/`
-5. Create controller in `openhis-application/src/main/java/com/openhis/web/[module]/`
-6. Add MyBatis-Plus annotations if using enhanced features
-7. Test endpoints via Swagger UI at `http://localhost:18080/openhis/swagger-ui/index.html`
-
-**Note:** Controllers are organized under `com.openhis.web` by business module (e.g., `web.administration`, `web.clinicalmanage`, `web.patientmanage`, etc.)
-
-### Adding a New Frontend Page
-
-1. Create Vue component in `openhis-ui-vue3/src/views/[module]/`
-2. Add API service methods in `openhis-ui-vue3/src/api/`
-3. Add route to `openhis-ui-vue3/src/router/index.js` (constantRoutes or dynamicRoutes)
-4. Add Pinia store module if state management needed
-5. Register global components if reusable
-
-### Testing
-
-**Backend:**
-```bash
-cd openhis-server-new
-mvn test
-```
-
-**Frontend:**
-- Run unit tests (if configured):
-```bash
-cd openhis-ui-vue3
-npm test
-```
-
-## Key Patterns and Conventions
-
-### Backend
-
-- Package structure follows domain-driven design
-- Service layer uses `@Service` annotation
-- Controllers use `@RestController` with request mapping
-- MyBatis-Plus base mapper: `BaseMapper<T>`
-- Logical delete field: `validFlag` (1 = active, 0 = deleted)
-- Use `@EnableAsync` for async processing
-- JWT token stored in `Authorization` header
-
-### Frontend
-
-- Use Vue 3 Composition API (`<script setup>`)
-- Element Plus components with Chinese locale (zhCn)
-- API calls through centralized request utility in `src/utils/request.js`
-- Route-based permission control
-- Dictionary data through `useDict()` composable
-- Global properties: `$download`, `$downloadGet`, `$parseTime`, `$resetForm`, `$handleTree`, `$formatDateStr`
-- CSS in SCSS with global styles in `src/assets/styles/index.scss`
-- Registered global components: DictTag, Pagination, TreeSelect, FileUpload, ImageUpload, ImagePreview, RightToolbar, Editor
-- Hiprint plugin for printing functionality (window.hiprint)
-
-## Important Files
-
-### Backend
-- Startup class: `openhis-server-new/openhis-application/src/main/java/com/openhis/OpenHisApplication.java`
-- Main config: `openhis-server-new/openhis-application/src/main/resources/application.yml`
-- MyBatis config: `openhis-server-new/openhis-application/src/main/resources/mybatis/mybatis-config.xml`
-- Parent POM: `openhis-server-new/pom.xml`
-
-### Frontend
-- Entry point: `openhis-ui-vue3/src/main.js`
-- Router: `openhis-ui-vue3/src/router/index.js`
-- Request utils: `openhis-ui-vue3/src/utils/request.js`
-- Vite config: `openhis-ui-vue3/vite.config.js`
-- Environment files: `openhis-ui-vue3/.env.*`
-
-## External Integrations
-
-- **PostgreSQL 42.2.27**: Primary database
-- **MySQL Connector 9.4.0**: MySQL database support (alternative)
-- **Redis**: Caching and session management
-- **Flowable 6.8.0**: Workflow engine
-- **LiteFlow 2.12.4.1**: Business rule engine
-- **Swagger 3.0.0**: API documentation
-- **Druid 1.2.27**: Database connection pool and monitoring
-- **Element Plus 2.12.0**: Vue 3 UI component library
-- **Pinia 2.2.0**: State management
-- **Vite 5.0.4**: Build tool and dev server
-- **Hutool 5.3.8**: Java utility library
-- **Fastjson2 2.0.58**: JSON processing
-- **Pinyin4j 2.5.1**: Chinese character to Pinyin conversion
-- **iText 5.5.12**: PDF generation
-- **Apache POI 4.1.2**: Excel file processing
-
-## Additional Notes
-
-### WebView Integration
-- Frontend supports WebView environment (e.g., embedded in desktop applications)
-- Chrome WebView integration with C# accessor (`chrome.webview.hostObjects.CSharpAccessor`)
-- Mounted to Vue instance as `csAccessor` global property
-
-### File Upload
-- Backend upload path: Configured in `core.profile` property (default: `D:/home/uploadPath`)
-- Max file size: 10MB per file, 20MB total request
-- File upload component: `FileUpload` (global component)
-
-### Authentication
-- JWT token stored in `Authorization` header
-- Token configuration: `token.secret`, `token.expireTime`, `token.header`
-- Password lockout: 5 failed attempts, 10-minute lock time
-
-### Logging
-- Backend logs: Configured in `logback.xml`
-- Debug logging enabled for: `com.openhis`, `com.baomidou.mybatisplus`, `com.alibaba.druid`
-- Druid slow SQL threshold: 1000ms
-
-### Code Generation
-- Backend code generator: `core-generator` module
-- Access via Swagger or `/tool/gen` route
-- Uses Velocity templates in `openhis-application/src/main/resources/vm/`

MybastisColumnsHandler_optimization_guide.md

@@ -1,223 +0,0 @@
-# MyBatis-Plus 自动填充处理器优化指南
-
-## 概述
-本文档说明如何优化 `MybastisColumnsHandler` 以确保所有实体的审计字段（create_by、create_time、update_by、update_time）能够正确自动填充。
-
-## 问题背景
-在 OpenHIS 系统中，当保存实体时可能会遇到以下错误：
-```
-org.postgresql.util.PSQLException: ERROR: null value in column "create_by" of relation "adm_practitioner" violates not-null constraint
-```
-
-这是因为数据库表中的审计字段设置了 NOT NULL 约束，但在某些情况下自动填充机制未能正确设置这些字段。
-
-## 解决方案
-通过优化 `MybastisColumnsHandler` 来确保总是使用当前登录用户的用户名填充 `create_by` 字段，使用当前时间填充 `create_time` 字段。
-
-## 实施步骤
-
-### 1. 替换现有处理器
-将 `D:\his\openhis-server-new\core-framework\src\main\java\com\core\framework\handler\MybastisColumnsHandler.java` 文件替换为以下内容：
-
-```java
-package com.core.framework.handler;
-
-import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import com.core.common.core.domain.model.LoginUser;
-import com.core.common.utils.SecurityUtils;
-import com.core.framework.config.TenantContext;
-import org.apache.ibatis.reflection.MetaObject;
-import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
-
-/**
- * MyBatis-Plus 自动填充处理器
- * 用于自动填充创建时间和更新时间，以及创建人和更新人
- */
-@Component
-public class MybastisColumnsHandler implements MetaObjectHandler {
-
-    // 设置数据新增时的字段自动赋值规则
-    @Override
-    public void insertFill(MetaObject metaObject) {
-        // 填充创建时间
-        Date currentTime = new Date();
-        this.strictInsertFill(metaObject, "createTime", Date.class, currentTime);
-        this.strictInsertFill(metaObject, "create_time", Date.class, currentTime);
-
-        // 获取当前登录用户名
-        String username = getCurrentUsername();
-
-        // 填充创建人
-        this.strictInsertFill(metaObject, "createBy", String.class, username);
-        this.strictInsertFill(metaObject, "create_by", String.class, username);
-
-        // 确保tenantId被设置
-        Integer tenantId = getCurrentTenantId();
-        if (tenantId == null) {
-            throw new RuntimeException("无法获取当前租户ID，请确保用户已登录或正确设置租户上下文");
-        }
-        this.strictInsertFill(metaObject, "tenantId", Integer.class, tenantId);
-        this.strictInsertFill(metaObject, "tenant_id", Integer.class, tenantId);
-    }
-
-    // 设置数据修改时的字段自动赋值规则
-    @Override
-    public void updateFill(MetaObject metaObject) {
-        // 填充更新时间
-        Date currentTime = new Date();
-        this.strictUpdateFill(metaObject, "updateTime", Date.class, currentTime);
-        this.strictUpdateFill(metaObject, "update_time", Date.class, currentTime);
-
-        // 填充更新人
-        String username = getCurrentUsername();
-        this.strictUpdateFill(metaObject, "updateBy", String.class, username);
-        this.strictUpdateFill(metaObject, "update_by", String.class, username);
-    }
-
-    /**
-     * 获取当前登录用户名
-     * @return 当前登录用户名，如果无法获取则返回 "system"
-     */
-    private String getCurrentUsername() {
-        String username = "system"; // 默认值
-        
-        try {
-            LoginUser loginUser = SecurityUtils.getLoginUser();
-            if (loginUser != null) {
-                username = loginUser.getUsername();
-            } else {
-                // 尝试从请求中获取用户信息
-                ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-                if (attributes != null) {
-                    HttpServletRequest request = attributes.getRequest();
-                    // 可以在这里添加额外的逻辑来从请求中获取用户信息
-                    // 例如从请求头、session等获取用户信息
-                }
-            }
-        } catch (Exception e) {
-            // 记录异常但不中断处理流程
-            System.err.println("获取当前登录用户时发生异常: " + e.getMessage());
-            // 可以考虑记录日志
-        }
-        
-        return username;
-    }
-
-    /**
-     * 获取当前租户 ID
-     */
-    private Integer getCurrentTenantId() {
-        Integer result = null;
-
-        // 首先尝试从线程局部变量中获取租户ID（适用于定时任务等场景）
-        Integer threadLocalTenantId = TenantContext.getCurrentTenant();
-        if (threadLocalTenantId != null) {
-            result = threadLocalTenantId;
-        } else {
-            // 获取当前登录用户的租户ID（优先使用SecurityUtils中储存的LoginUser的租户ID）
-            try {
-                if (SecurityUtils.getAuthentication() != null) {
-                    LoginUser loginUser = SecurityUtils.getLoginUser();
-                    if (loginUser != null) {
-                        result = loginUser.getTenantId();
-                    }
-                }
-            } catch (Exception e) {
-                // 记录异常但不中断处理
-                System.err.println("获取当前登录用户租户ID时发生异常: " + e.getMessage());
-            }
-
-            if (result == null) {
-                // 尝试从请求头中获取租户ID
-                ServletRequestAttributes attributes = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
-                if (attributes != null) {
-                    HttpServletRequest request = attributes.getRequest();
-                    if (request != null) {
-                        // 从请求头获取租户ID，假设header名称为"X-Tenant-ID" ; 登录接口前端把租户id放到请求头里
-                        String tenantIdHeader = request.getHeader("X-Tenant-ID");
-                        String requestMethodName = request.getHeader("Request-Method-Name");
-                        // 登录
-                        if ("login".equals(requestMethodName)) {
-                            if (tenantIdHeader != null && !tenantIdHeader.isEmpty()) {
-                                try {
-                                    result = Integer.parseInt(tenantIdHeader);
-                                } catch (NumberFormatException e) {
-                                    System.err.println("解析请求头中的租户ID时发生异常: " + e.getMessage());
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        // 如果仍然没有获取到租户ID，返回默认值
-        if (result == null) {
-            System.out.println("警告: 未能获取当前租户ID，将使用默认租户ID 1");
-            result = 1; // 默认租户ID
-        }
-
-        return result;
-    }
-}
-```
-
-### 2. 验证处理器是否被正确扫描
-确保在主应用类或配置类中启用了自动填充功能：
-
-```java
-@SpringBootApplication
-@MapperScan("com.openhis.*.mapper")  // 确保扫描到你的mapper
-@EnableTransactionManagement  // 启用事务管理
-public class OpenHisApplication {
-    public static void main(String[] args) {
-        SpringApplication.run(OpenHisApplication.class, args);
-    }
-}
-```
-
-### 3. 测试验证
-创建一个简单的测试来验证自动填充是否正常工作：
-
-```java
-@SpringBootTest
-public class AuditFieldTest {
-    @Autowired
-    private PractitionerMapper practitionerMapper;
-    
-    @Test
-    public void testAuditFieldsAutoFill() {
-        Practitioner practitioner = new Practitioner();
-        practitioner.setName("Test Practitioner");
-        
-        // 保存实体
-        practitionerMapper.insert(practitioner);
-        
-        // 验证审计字段是否被正确填充
-        assertThat(practitioner.getCreateBy()).isNotNull();
-        assertThat(practitioner.getCreateBy()).isNotEqualTo("");
-        assertThat(practitioner.getCreateTime()).isNotNull();
-        
-        // 清理测试数据
-        practitionerMapper.deleteById(practitioner.getId());
-    }
-}
-```
-
-## 注意事项
-
-1. **安全上下文**：确保在调用保存方法时用户已登录，这样 `SecurityUtils.getLoginUser()` 才能返回有效的用户对象。
-
-2. **异常处理**：处理器中包含了异常处理，如果无法获取当前用户，将使用 "system" 作为默认值。
-
-3. **租户ID**：处理器也处理租户ID的自动填充，这对于多租户系统很重要。
-
-4. **兼容性**：处理器同时支持驼峰命名（createBy）和下划线命名（create_by）的字段，以兼容不同的配置。
-
-## 总结
-通过优化 `MybastisColumnsHandler`，我们可以确保所有实体在保存时都能正确填充审计字段，避免因缺少这些字段而引发的数据库约束错误，同时保持数据完整性和审计跟踪功能。

QWEN.md

@@ -1,184 +0,0 @@
-# Qwen Code Context for HIS (Hospital Information System)
-
-## Project Overview
-
-This is a comprehensive Hospital Information System (HIS) called OpenHIS, built with a Java Spring Boot backend and Vue 3 frontend. The system is designed to manage hospital operations including patient management, appointments, clinical workflows, billing, and administrative tasks.
-
-### Technology Stack
-
-**Backend:**
-- Java 17
-- Spring Boot 2.5.15
-- PostgreSQL (recommended v16.2)
-- Redis
-- MyBatis-Plus 3.5.5 for ORM
-- Druid 1.2.27 for database connection pooling
-- Flowable 6.8.0 for workflow management
-- LiteFlow 2.12.4.1 for business rule orchestration
-- Swagger 3.0.0 for API documentation
-- JWT 0.9.1 for authentication
-
-**Frontend:**
-- Vue 3 with Composition API
-- Vite 5.0.4 as build tool
-- Element Plus 2.12.0 as UI component library
-- Pinia 2.2.0 for state management
-- Axios 0.27.2 for HTTP requests
-- Sass for styling
-
-## Repository Structure
-
-```
-.
-├── openhis-server-new/          # Backend multi-module Maven project
-│   ├── openhis-application/    # Main application module with startup class
-│   ├── openhis-domain/          # Business domain modules (administration, clinical, financial, etc.)
-│   ├── openhis-common/          # Shared utilities and common code
-│   ├── core-admin/             # Core administration module
-│   ├── core-framework/         # Framework configuration and security
-│   ├── core-system/            # System management module
-│   ├── core-quartz/            # Scheduled tasks
-│   ├── core-generator/         # Code generation utilities
-│   ├── core-common/            # Core utilities
-│   └── core-flowable/          # Workflow engine integration
-├── openhis-ui-vue3/            # Vue 3 frontend
-│   ├── src/
-│   │   ├── api/                # API service layer
-│   │   ├── components/         # Reusable components
-│   │   ├── router/             # Vue Router configuration
-│   │   ├── store/              # Pinia state management
-│   │   ├── utils/              # Utility functions
-│   │   └── views/              # Page components
-│   └── vite/                   # Vite plugins configuration
-├── sql/                        # Database scripts
-├── 发版记录/                     # Release records
-└── 迁移记录-DB变更记录/           # Database migration records
-```
-
-## Building and Running
-
-### Backend Setup
-
-1. **Prerequisites:**
-   - JDK 17 (required)
-   - PostgreSQL v16.2 (required)
-   - Redis (stable version)
-
-2. **Database Setup:**
-   - Import the database initialization script using Navicat 16 or later
-   - Script location: `sql/20251224init脚本(使用Navicat Premium 17导入).sql`
-   - Configure database connection in `application.yml` or `application-dev.yml`
-
-3. **Build and Run:**
-   ```bash
-   cd openhis-server-new
-   mvn clean package -DskipTests
-   cd openhis-application
-   mvn spring-boot:run
-   ```
-   
-   Or run directly from IDE by executing `OpenHisApplication.java`
-
-### Frontend Setup
-
-1. **Prerequisites:**
-   - Node.js v16.15 (recommended)
-
-2. **Installation and Run:**
-   ```bash
-   cd openhis-ui-vue3
-   npm install
-   npm run dev
-   ```
-
-3. **Access the application:**
-   - Frontend: http://localhost:81
-   - Backend API: http://localhost:18080/openhis
-   - Swagger UI: http://localhost:18080/openhis/swagger-ui/index.html
-
-## Development Conventions
-
-### Backend Architecture
-
-The backend follows a multi-module Maven architecture with clear separation of concerns:
-
-1. **openhis-application**: Entry point with `OpenHisApplication.java`
-   - Scans `com.core` and `com.openhis` packages
-   - Configured to run on port 18080 with context path `/openhis`
-
-2. **openhis-domain**: Business domain modules organized by medical functionality:
-   - `administration`: Administrative functions
-   - `appointmentmanage`: Appointment management
-   - `check`: Medical examination/checkup
-   - `clinical`: Clinical workflows
-   - `crosssystem`: Cross-system integration
-   - `document`: Document management
-   - `financial`: Financial/billing
-   - `lab`: Laboratory operations
-   - `medication`: Medication management
-   - `triageandqueuemanage`: Patient triage and queue management
-   - `yb`, `ybcatalog`, `ybelep`: Insurance (Yi Bao) integration
-   - `workflow`: Workflow management
-
-3. **Core Modules** (com.core package):
-   - `core-system`: User, role, menu, and permission management
-   - `core-framework`: Security, exception handling, and framework configurations
-   - `core-common`: Shared utilities and base classes
-   - `core-quartz`: Scheduled task management
-   - `core-generator`: Code generation tools
-   - `core-flowable`: Workflow engine integration
-   - `core-admin`: Administrative functions
-
-### Frontend Architecture
-
-The frontend uses Vue 3 with composition API and modern tooling:
-
-1. **State Management:** Pinia for global state with modules for app, dict, permission, settings, tagsView, and user
-
-2. **Routing:** Vue Router 4.3.0 with public routes and dynamic permission-based routes
-
-3. **API Integration:** Axios with request/response interceptors and API services organized by module
-
-4. **Component Architecture:** Element Plus as UI framework with custom components in `src/components/`
-
-## Key Configuration Files
-
-### Backend Configuration
-
-- Main config: `openhis-server-new/openhis-application/src/main/resources/application.yml`
-- Environment-specific: `application-dev.yml`, `application-test.yml`, `application-prd.yml`
-- Database connection settings, Redis configuration, server settings, and MyBatis-Plus configuration
-
-### Frontend Configuration
-
-- Environment files: `.env.*` in `openhis-ui-vue3/`
-- Vite configuration: `vite.config.js`
-- Main entry: `src/main.js`
-- Router: `src/router/index.js`
-
-## Common Development Tasks
-
-### Adding a New Backend Feature
-
-1. Create domain entity in appropriate module under `openhis-domain/[module]/domain/`
-2. Create mapper interface in `openhis-domain/[module]/mapper/`
-3. Create service interface and implementation in `openhis-domain/[module]/service/`
-4. Create controller in `openhis-application/src/main/java/com/openhis/web/[module]/`
-5. Test endpoints via Swagger UI
-
-### Adding a New Frontend Page
-
-1. Create Vue component in `openhis-ui-vue3/src/views/[module]/`
-2. Add API service methods in `openhis-ui-vue3/src/api/`
-3. Add route to `openhis-ui-vue3/src/router/index.js`
-4. Add Pinia store module if state management needed
-
-## Important Notes
-
-- The system uses logical deletion with a `validFlag` field (1 = active, 0 = deleted)
-- JWT tokens are stored in the `Authorization` header
-- The system supports WebView environments with C# accessor integration
-- File uploads are configured with max 10MB per file and 20MB total request size
-- Password lockout occurs after 5 failed attempts with a 10-minute lock time
-- The system includes a code generator accessible via `/tool/gen` route
-- Printing functionality is implemented using the hiprint plugin

audit_field_best_practices.md

@@ -1,202 +0,0 @@
-# OpenHIS 系统审计字段填充最佳实践
-
-## 概述
-本文档介绍如何在 OpenHIS 系统中确保所有实体的审计字段（create_by、create_time、update_by、update_time）能够正确自动填充。
-
-## 自动填充机制
-
-### 1. 基础实体类
-所有需要审计字段的实体类都应该继承自 `HisBaseEntity`：
-
-```java
-import com.core.common.core.domain.HisBaseEntity;
-
-@Data
-@TableName("adm_practitioner")
-public class Practitioner extends HisBaseEntity {
-    @TableId(type = IdType.AUTO)
-    private Long id;
-    
-    private String name;
-    
-    // 其他业务字段...
-}
-```
-
-### 2. 自动填充处理器
-系统使用 `MybastisColumnsHandler` 来自动填充审计字段：
-
-```java
-@Component
-public class MybastisColumnsHandler implements MetaObjectHandler {
-    @Override
-    public void insertFill(MetaObject metaObject) {
-        // 填充创建时间和创建人
-        this.strictInsertFill(metaObject, "createTime", Date.class, new Date());
-        this.strictInsertFill(metaObject, "create_time", Date.class, new Date());
-        
-        String username = getCurrentUsername(); // 获取当前用户名
-        this.strictInsertFill(metaObject, "createBy", String.class, username);
-        this.strictInsertFill(metaObject, "create_by", String.class, username);
-    }
-
-    @Override
-    public void updateFill(MetaObject metaObject) {
-        // 填充更新时间和更新人
-        this.strictUpdateFill(metaObject, "updateTime", Date.class, new Date());
-        this.strictUpdateFill(metaObject, "update_time", Date.class, new Date());
-        
-        String username = getCurrentUsername(); // 获取当前用户名
-        this.strictUpdateFill(metaObject, "updateBy", String.class, username);
-        this.strictUpdateFill(metaObject, "update_by", String.class, username);
-    }
-    
-    private String getCurrentUsername() {
-        String username = "system";
-        try {
-            LoginUser loginUser = SecurityUtils.getLoginUser();
-            if (loginUser != null) {
-                username = loginUser.getUsername();
-            }
-        } catch (Exception ignored) {
-        }
-        return username;
-    }
-}
-```
-
-## 确保自动填充正常工作的要点
-
-### 1. 检查实体类继承关系
-确保所有实体类都正确继承了 `HisBaseEntity`：
-
-```java
-// 正确的做法
-public class Practitioner extends HisBaseEntity { ... }
-
-// 如果不能继承 HisBaseEntity，则需要手动添加审计字段
-public class CustomEntity {
-    @TableField(fill = FieldFill.INSERT)
-    private String createBy;
-    
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-    
-    @TableField(fill = FieldFill.UPDATE)
-    private String updateBy;
-    
-    @TableField(fill = FieldFill.UPDATE)
-    private Date updateTime;
-}
-```
-
-### 2. 验证安全上下文
-确保在执行数据库操作时有有效的安全上下文：
-
-```java
-@Service
-public class PractitionerService {
-    public void savePractitioner(Practitioner practitioner) {
-        // 确保调用此方法时用户已登录
-        // SecurityUtils.getLoginUser() 应该能返回有效的 LoginUser 对象
-        
-        // MyBatis-Plus 会在保存时自动调用 MybastisColumnsHandler
-        practitionerMapper.insert(practitioner);
-    }
-}
-```
-
-### 3. 检查配置
-确保自动填充处理器被正确配置：
-
-```yaml
-# application.yml
-mybatis-plus:
-  global-config:
-    db-config:
-      # 其他配置...
-  configuration:
-    # 其他配置...
-```
-
-### 4. 手动填充（特殊情况）
-在某些特殊情况下，如果自动填充不工作，可以手动设置：
-
-```java
-@Service
-public class PractitionerService {
-    public void savePractitionerManually(Practitioner practitioner) {
-        // 手动设置审计字段
-        Date now = new Date();
-        String currentUser = getCurrentUsername();
-        
-        practitioner.setCreateTime(now);
-        practitioner.setCreateBy(currentUser);
-        practitioner.setUpdateTime(now);
-        practitioner.setUpdateBy(currentUser);
-        
-        practitionerMapper.insert(practitioner);
-    }
-}
-```
-
-## 常见问题及解决方案
-
-### 问题1：自动填充不生效
-**原因：**
-- 实体类没有继承 `HisBaseEntity`
-- `MybastisColumnsHandler` 没有被Spring管理（缺少@Component注解）
-- 没有有效的安全上下文
-
-**解决方案：**
-- 确保实体类继承 `HisBaseEntity`
-- 检查 `MybastisColumnsHandler` 是否有 `@Component` 注解
-- 确保在调用保存方法时用户已登录
-
-### 问题2：获取不到当前用户
-**原因：**
-- 用户未登录
-- 安全上下文配置错误
-
-**解决方案：**
-- 在调用保存方法前确保用户已登录
-- 检查安全配置是否正确
-
-### 问题3：批量操作时审计字段未填充
-**原因：**
-- 批量操作可能绕过了自动填充机制
-
-**解决方案：**
-- 对于批量操作，手动设置审计字段
-- 或者使用 MyBatis-Plus 的批量操作方法，确保它们支持自动填充
-
-## 测试验证
-
-创建一个简单的测试来验证自动填充是否正常工作：
-
-```java
-@SpringBootTest
-public class AuditFieldTest {
-    @Autowired
-    private PractitionerMapper practitionerMapper;
-    
-    @Test
-    public void testAuditFieldsAutoFill() {
-        Practitioner practitioner = new Practitioner();
-        practitioner.setName("Test Practitioner");
-        
-        // 保存实体
-        practitionerMapper.insert(practitioner);
-        
-        // 验证审计字段是否被正确填充
-        assertThat(practitioner.getCreateBy()).isNotNull();
-        assertThat(practitioner.getCreateTime()).isNotNull();
-        
-        // 清理测试数据
-        practitionerMapper.deleteById(practitioner.getId());
-    }
-}
-```
-
-## 总结
-通过遵循以上最佳实践，可以确保 OpenHIS 系统中的所有实体在保存时都能正确填充审计字段，避免因缺少这些字段而引发的数据库约束错误。

audit_field_solution.md

@@ -1,113 +0,0 @@
-# 关于数据库审计字段（create_by, create_time等）的处理方案
-
-## 问题描述
-在使用OpenHIS系统时，可能会遇到如下错误：
-```
-org.postgresql.util.PSQLException: ERROR: null value in column "create_by" of relation "adm_practitioner" violates not-null constraint
-```
-
-## 问题分析
-1. 数据库表中的审计字段（如create_by, create_time）设置了NOT NULL约束
-2. 应用程序层面使用了MyBatis-Plus的自动填充功能来设置这些字段
-3. 当自动填充机制失效时，就会出现违反非空约束的错误
-
-## 解决方案
-
-### 方案一：修复自动填充机制（推荐）
-系统已经实现了自动填充机制，位于 `MybastisColumnsHandler.java`：
-
-```java
-// 设置数据新增时候的，字段自动赋值规则
-@Override
-public void insertFill(MetaObject metaObject) {
-    // 同时填充驼峰和下划线命名的字段，以兼容不同的配置
-    this.strictInsertFill(metaObject, "createTime", Date.class, new Date());
-    this.strictInsertFill(metaObject, "create_time", Date.class, new Date());
-
-    String username = "system";
-    try {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (loginUser != null) {
-            username = loginUser.getUsername();
-        }
-    } catch (Exception ignored) {
-    }
-    // 使用 fillStrategy 确保即使字段为 null 也会被填充
-    this.strictInsertFill(metaObject, "createBy", String.class, username);
-    this.strictInsertFill(metaObject, "create_by", String.class, username);
-    // 如果 strictInsertFill 没有生效，使用 setFieldValByName 强制设置
-    if (metaObject.hasGetter("createBy") && metaObject.getValue("createBy") == null) {
-        this.setFieldValByName("createBy", username, metaObject);
-    }
-    if (metaObject.hasGetter("create_by") && metaObject.getValue("create_by") == null) {
-        this.setFieldValByName("create_by", username, metaObject);
-    }
-    ...
-}
-```
-
-确保所有实体类都继承自 `HisBaseEntity` 或 `BaseEntity`，这样就能自动获得审计字段。
-
-### 方案二：移除数据库约束（谨慎使用）
-如果确实需要允许审计字段为NULL，可以移除数据库约束：
-
-```sql
--- 移除 adm_practitioner 表中 create_by 列的 NOT NULL 约束
-ALTER TABLE "public"."adm_practitioner" 
-ALTER COLUMN "create_by" DROP NOT NULL;
-
--- 同样处理 create_time 列（如果需要）
-ALTER TABLE "public"."adm_practitioner" 
-ALTER COLUMN "create_time" DROP NOT NULL;
-```
-
-### 方案三：批量修复所有表的约束
-如果多个表都存在这个问题，可以使用以下脚本：
-
-```sql
--- 为所有表的审计字段移除NOT NULL约束
--- 注意：执行前请备份数据库！
-
--- 1. 检查所有包含审计字段的表
-SELECT 
-    table_name,
-    column_name,
-    is_nullable
-FROM 
-    information_schema.columns 
-WHERE 
-    column_name IN ('create_by', 'create_time', 'update_by', 'update_time')
-    AND table_schema = 'public'
-    AND is_nullable = 'NO';  -- NO 表示 NOT NULL 约束
-
--- 2. 根据需要移除特定表的约束
--- 示例：移除多个表的create_by约束
-ALTER TABLE "public"."adm_practitioner" ALTER COLUMN "create_by" DROP NOT NULL;
-ALTER TABLE "public"."adm_patient" ALTER COLUMN "create_by" DROP NOT NULL;
--- 添加更多表的处理...
-```
-
-## 最佳实践
-
-### 1. 确保实体类继承基础类
-所有实体类应继承 `HisBaseEntity` 或 `BaseEntity`：
-
-```java
-@Data
-@TableName("adm_practitioner")
-public class Practitioner extends HisBaseEntity {
-    // 其他字段...
-}
-```
-
-### 2. 检查安全上下文
-确保在保存数据时有有效的安全上下文，这样自动填充处理器才能获取到当前用户信息。
-
-### 3. 验证自动填充配置
-确保 `MybastisColumnsHandler` 在Spring容器中被正确注册（使用@Component注解）。
-
-## 总结
-- 推荐保持数据库中的NOT NULL约束，确保数据完整性
-- 依赖MyBatis-Plus的自动填充机制来设置审计字段
-- 确保所有实体类继承基础实体类
-- 在必要时才考虑移除数据库约束

debug_api_return.md

@@ -1,38 +0,0 @@
-# 检查后端API返回数据结构
-
-## 问题分析
-尽管我们更新了DTO和SQL查询，前端仍然没有显示创建时间，可能的原因：
-1. API响应中没有包含createTime字段
-2. SQL查询没有正确返回createTime字段
-3. 数据库中createTime字段本身为null
-4. JSON序列化问题
-
-## 检查步骤
-
-### 1. 检查数据库中数据
-首先检查数据库中sys_user表的createTime字段是否正确填充：
-```sql
-SELECT user_id, user_name, nick_name, create_time 
-FROM sys_user 
-WHERE create_time IS NOT NULL 
-LIMIT 10;
-```
-
-### 2. 检查API端点
-API端点是：GET /base-data-manage/practitioner/user-practitioner-page
-这个端点在PractitionerController中定义，调用practitionerAppService.getUserPractitionerPage()
-
-### 3. 检查SQL查询
-在PractitionerAppMapper.xml中，我们已经添加了createTime字段：
-```xml
-T2.create_time
-```
-
-### 4. 验证DTO映射
-UserAndPractitionerDto中已添加createTime字段：
-```java
-private Date createTime;
-```
-
-### 5. 检查JSON序列化
-检查是否有@JsonFormat注解或其他序列化配置问题

deep_dive_autofill_solution.md

@@ -1,290 +0,0 @@
-# 深度排查 MyBatis-Plus 自动填充不生效问题
-
-## 问题概述
-尽管对 MyBatis-Plus 的自动填充处理器进行了多次优化和配置，但 `create_by` 和 `create_time` 字段仍然没有被自动填充。
-
-## 深度排查步骤
-
-### 1. 检查 AOP 代理是否生效
-MyBatis-Plus 的自动填充功能依赖于 AOP 代理。如果实体类的方法被直接调用而非通过代理调用，自动填充可能不会生效。
-
-### 2. 验证 Service 层实现
-确保使用的是 MyBatis-Plus 提供的通用 Service 方法，而不是自定义的 SQL。
-
-### 3. 检查 @TableField 注解配置
-确认实体类中的字段注解配置正确。
-
-### 4. 检查事务配置
-某些事务配置可能会影响 AOP 代理的生效。
-
-## 解决方案
-
-### 方案一：在 Service 层手动设置审计字段
-
-创建一个工具类来统一处理审计字段的设置：
-
-```java
-@Component
-public class AuditFieldUtil {
-    
-    public static void setCreateInfo(Object entity) {
-        if (entity == null) return;
-        
-        try {
-            LoginUser loginUser = SecurityUtils.getLoginUser();
-            String username = loginUser != null ? loginUser.getUsername() : "system";
-            Date currentTime = new Date();
-            
-            // 使用反射设置字段值
-            Field createByField = getField(entity.getClass(), "createBy");
-            if (createByField != null) {
-                createByField.setAccessible(true);
-                if (createByField.get(entity) == null || "".equals(createByField.get(entity))) {
-                    createByField.set(entity, username);
-                }
-            }
-            
-            Field createTimeField = getField(entity.getClass(), "createTime");
-            if (createTimeField != null) {
-                createTimeField.setAccessible(true);
-                if (createTimeField.get(entity) == null) {
-                    createTimeField.set(entity, currentTime);
-                }
-            }
-            
-            // 处理下划线命名的字段
-            Field createByFieldUnderscore = getField(entity.getClass(), "create_by");
-            if (createByFieldUnderscore != null) {
-                createByFieldUnderscore.setAccessible(true);
-                if (createByFieldUnderscore.get(entity) == null || "".equals(createByFieldUnderscore.get(entity))) {
-                    createByFieldUnderscore.set(entity, username);
-                }
-            }
-            
-            Field createTimeFieldUnderscore = getField(entity.getClass(), "create_time");
-            if (createTimeFieldUnderscore != null) {
-                createTimeFieldUnderscore.setAccessible(true);
-                if (createTimeFieldUnderscore.get(entity) == null) {
-                    createTimeFieldUnderscore.set(entity, currentTime);
-                }
-            }
-            
-        } catch (Exception e) {
-            System.err.println("设置审计字段时发生异常: " + e.getMessage());
-        }
-    }
-    
-    private static Field getField(Class<?> clazz, String fieldName) {
-        try {
-            return clazz.getDeclaredField(fieldName);
-        } catch (NoSuchFieldException e) {
-            if (clazz.getSuperclass() != null) {
-                return getField(clazz.getSuperclass(), fieldName);
-            }
-            return null;
-        }
-    }
-}
-```
-
-然后在 Service 实现中使用：
-
-```java
-@Service
-public class PractitionerServiceImpl extends ServiceImpl<PractitionerMapper, Practitioner> 
-        implements IPractitionerService {
-    
-    @Autowired
-    private AuditFieldUtil auditFieldUtil;
-    
-    @Override
-    @Transactional
-    public boolean save(Practitioner entity) {
-        // 在保存前手动设置审计字段
-        auditFieldUtil.setCreateInfo(entity);
-        return super.save(entity);
-    }
-    
-    @Override
-    @Transactional
-    public boolean saveBatch(Collection<Practitioner> entityList) {
-        entityList.forEach(auditFieldUtil::setCreateInfo);
-        return super.saveBatch(entityList);
-    }
-}
-```
-
-### 方案二：重写 BaseMapper 方法
-
-如果 Service 层的方法不起作用，可以直接在 Mapper 层处理：
-
-```java
-@Mapper
-public interface PractitionerMapper extends BaseMapper<Practitioner> {
-    
-    @Insert({
-        "<script>",
-        "INSERT INTO adm_practitioner (",
-        "id, active_flag, name, name_json, gender_enum, birth_date, deceased_date,",
-        "phone, address, address_province, address_city, address_district, address_street,",
-        "address_json, py_str, wb_str, bus_no, yb_no, user_id, tenant_id, delete_flag,",
-        "create_by, create_time, update_by, update_time, org_id,",
-        "phar_prac_cert_no, prsc_dr_cert_code, dr_profttl_code, kpd_code, signature, pos_no",
-        ") VALUES (",
-        "#{id}, #{activeFlag}, #{name}, #{nameJson}, #{genderEnum}, #{birthDate}, #{deceasedDate},",
-        "#{phone}, #{address}, #{addressProvince}, #{addressCity}, #{addressDistrict}, #{addressStreet},",
-        "#{addressJson}, #{pyStr}, #{wbStr}, #{busNo}, #{ybNo}, #{userId}, #{tenantId}, #{deleteFlag},",
-        "#{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{orgId},",
-        "#{pharPracCertNo}, #{prscDrCertCode}, #{drProfttlCode}, #{kpdCode}, #{signature}, #{posNo}",
-        ")",
-        "</script>"
-    })
-    @Options(useGeneratedKeys = true, keyProperty = "id")
-    int insertWithAuditFields(Practitioner record);
-}
-```
-
-### 方案三：使用 MyBatis 拦截器
-
-创建一个 MyBatis 拦截器来自动填充字段：
-
-```java
-@Intercepts({
-    @Signature(type = Executor.class, method = "update", args = {MappedStatement.class, Object.class})
-})
-@Component
-public class AuditFieldInterceptor implements Interceptor {
-    
-    @Override
-    public Object intercept(Invocation invocation) throws Throwable {
-        Object[] args = invocation.getArgs();
-        MappedStatement ms = (MappedStatement) args[0];
-        Object parameter = args[1];
-        
-        String sqlCommandType = ms.getSqlCommandType().toString();
-        
-        if ("INSERT".equals(sqlCommandType)) {
-            setCreateAuditFields(parameter);
-        } else if ("UPDATE".equals(sqlCommandType)) {
-            setUpdateAuditFields(parameter);
-        }
-        
-        return invocation.proceed();
-    }
-    
-    private void setCreateAuditFields(Object parameter) {
-        if (parameter == null) return;
-        
-        try {
-            LoginUser loginUser = SecurityUtils.getLoginUser();
-            String username = loginUser != null ? loginUser.getUsername() : "system";
-            Date currentTime = new Date();
-            
-            // 设置 createBy 和 createTime
-            setFieldValue(parameter, "createBy", username);
-            setFieldValue(parameter, "create_time", username);
-            setFieldValue(parameter, "createTime", currentTime);
-            setFieldValue(parameter, "create_time", currentTime);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    private void setUpdateAuditFields(Object parameter) {
-        if (parameter == null) return;
-        
-        try {
-            LoginUser loginUser = SecurityUtils.getLoginUser();
-            String username = loginUser != null ? loginUser.getUsername() : "system";
-            Date currentTime = new Date();
-            
-            // 设置 updateBy 和 updateTime
-            setFieldValue(parameter, "updateBy", username);
-            setFieldValue(parameter, "update_by", username);
-            setFieldValue(parameter, "updateTime", currentTime);
-            setFieldValue(parameter, "update_time", currentTime);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    private void setFieldValue(Object obj, String fieldName, Object value) {
-        try {
-            Field field = getField(obj.getClass(), fieldName);
-            if (field != null) {
-                field.setAccessible(true);
-                if (field.get(obj) == null) { // 只在原值为 null 时设置
-                    field.set(obj, value);
-                }
-            }
-        } catch (Exception e) {
-            // 忽略无法设置的字段
-        }
-    }
-    
-    private Field getField(Class<?> clazz, String fieldName) {
-        try {
-            return clazz.getDeclaredField(fieldName);
-        } catch (NoSuchFieldException e) {
-            if (clazz.getSuperclass() != null) {
-                return getField(clazz.getSuperclass(), fieldName);
-            }
-            return null;
-        }
-    }
-    
-    @Override
-    public Object plugin(Object target) {
-        if (target instanceof Executor) {
-            return Plugin.wrap(target, this);
-        } else {
-            return target;
-        }
-    }
-    
-    @Override
-    public void setProperties(Properties properties) {}
-}
-```
-
-## 推荐实施顺序
-
-1. 首先尝试方案一（Service 层手动设置），这是最简单且可控的方式
-2. 如果方案一不行，尝试方案三（MyBatis 拦截器），它在更底层起作用
-3. 方案二是最后的选择，需要重写具体的插入逻辑
-
-## 验证方法
-
-创建一个测试来验证自动填充是否生效：
-
-```java
-@SpringBootTest
-public class AuditFieldTest {
-    
-    @Autowired
-    private IPractitionerService practitionerService;
-    
-    @Test
-    public void testAuditFieldFill() {
-        Practitioner practitioner = new Practitioner();
-        practitioner.setName("Test Practitioner");
-        
-        // 记录保存前的值
-        System.out.println("保存前 - createBy: " + practitioner.getCreateBy());
-        System.out.println("保存前 - createTime: " + practitioner.getCreateTime());
-        
-        boolean success = practitionerService.save(practitioner);
-        
-        // 从数据库重新查询以验证
-        Practitioner saved = practitionerService.getById(practitioner.getId());
-        System.out.println("保存后 - createBy: " + saved.getCreateBy());
-        System.out.println("保存后 - createTime: " + saved.getCreateTime());
-        
-        Assertions.assertTrue(success);
-        Assertions.assertNotNull(saved.getCreateBy());
-        Assertions.assertNotNull(saved.getCreateTime());
-    }
-}
-```
-
-通过这些方案，应该能够解决自动填充不生效的问题。

diagnose_autofill_issue.md

@@ -1,143 +0,0 @@
-# 诊断 MyBatis-Plus 自动填充问题
-
-## 问题现象
-尽管 `MybastisColumnsHandler` 已经实现并配置了自动填充功能，但 `create_by` 和 `create_time` 字段仍然没有被正确填充。
-
-## 可能的原因及解决方案
-
-### 1. 检查组件扫描配置
-确保 `MybastisColumnsHandler` 类被Spring容器正确管理：
-
-```java
-@Component  // 确保这个注解存在
-public class MybastisColumnsHandler implements MetaObjectHandler {
-    // ...
-}
-```
-
-### 2. 检查包扫描路径
-在主应用类中确保扫描到了处理器所在的包：
-
-```java
-@SpringBootApplication
-@MapperScan("com.openhis.*.mapper")  // 确保扫描到你的mapper
-@ComponentScan(basePackages = {"com.core", "com.openhis"})  // 确保扫描到处理器
-public class OpenHisApplication {
-    public static void main(String[] args) {
-        SpringApplication.run(OpenHisApplication.class, args);
-    }
-}
-```
-
-### 3. 验证实体类配置
-确保实体类正确继承了 `HisBaseEntity` 并且字段上有正确的注解：
-
-```java
-@Data
-@TableName("adm_practitioner")
-public class Practitioner extends HisBaseEntity {
-    // 不需要在子类中重复定义 createBy, createTime 等字段
-    // 因为它们已在 HisBaseEntity 中定义并带有 @TableField(fill = FieldFill.INSERT)
-}
-```
-
-### 4. 检查安全上下文
-自动填充处理器依赖于安全上下文来获取当前用户。确保在执行保存操作时用户已登录：
-
-```java
-// 在保存之前，确保用户已登录
-LoginUser loginUser = SecurityUtils.getLoginUser();
-if (loginUser == null) {
-    // 用户未登录，可能需要手动设置审计字段
-}
-```
-
-### 5. 手动测试自动填充
-创建一个简单的测试来验证自动填充是否正常工作：
-
-```java
-@SpringBootTest
-public class AutoFillTest {
-    
-    @Autowired
-    private PractitionerMapper practitionerMapper;
-    
-    @Test
-    public void testAutoFill() {
-        Practitioner practitioner = new Practitioner();
-        practitioner.setName("Test Practitioner");
-        
-        // 检查在保存前字段是否为空
-        System.out.println("Before insert - createBy: " + practitioner.getCreateBy());
-        System.out.println("Before insert - createTime: " + practitioner.getCreateTime());
-        
-        // 执行插入操作
-        int result = practitionerMapper.insert(practitioner);
-        
-        // 检查保存后字段是否被填充
-        System.out.println("After insert - createBy: " + practitioner.getCreateBy());
-        System.out.println("After insert - createTime: " + practitioner.getCreateTime());
-        
-        assertThat(result).isEqualTo(1);
-        assertThat(practitioner.getCreateBy()).isNotNull();
-        assertThat(practitioner.getCreateTime()).isNotNull();
-    }
-}
-```
-
-### 6. 临时解决方案
-如果自动填充仍然不工作，可以在服务层手动设置这些字段：
-
-```java
-@Service
-public class PractitionerServiceImpl extends ServiceImpl<PractitionerMapper, Practitioner> 
-        implements IPractitionerService {
-    
-    @Override
-    public void savePractitioner(Practitioner practitioner) {
-        // 手动设置审计字段
-        if (practitioner.getCreateBy() == null || practitioner.getCreateBy().isEmpty()) {
-            LoginUser loginUser = SecurityUtils.getLoginUser();
-            if (loginUser != null) {
-                practitioner.setCreateBy(loginUser.getUsername());
-            } else {
-                practitioner.setCreateBy("system"); // 默认值
-            }
-        }
-        
-        if (practitioner.getCreateTime() == null) {
-            practitioner.setCreateTime(new Date());
-        }
-        
-        // 执行保存操作
-        this.save(practitioner);
-    }
-}
-```
-
-### 7. 检查 MyBatis-Plus 版本兼容性
-确保使用的 MyBatis-Plus 版本与自动填充功能兼容。当前项目使用的是 3.5.5 版本，应该支持自动填充功能。
-
-### 8. 调试自动填充处理器
-在 `MybastisColumnsHandler` 中添加日志来调试是否被调用：
-
-```java
-@Override
-public void insertFill(MetaObject metaObject) {
-    System.out.println("MybastisColumnsHandler.insertFill() called"); // 调试日志
-    
-    Date currentTime = new Date();
-    this.strictInsertFill(metaObject, "createTime", Date.class, currentTime);
-    this.strictInsertFill(metaObject, "create_time", Date.class, currentTime);
-
-    String username = getCurrentUsername();
-    System.out.println("Setting createBy to: " + username); // 调试日志
-    
-    this.strictInsertFill(metaObject, "createBy", String.class, username);
-    this.strictInsertFill(metaObject, "create_by", String.class, username);
-    
-    // ... 其他代码
-}
-```
-
-通过以上步骤，应该能够诊断并解决自动填充不工作的问题。

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

@@ -1,11 +1,15 @@
 package com.core.framework.config;
 
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.TimeZone;
 
 /**
@@ -24,6 +28,14 @@ public class ApplicationConfig {
      */
     @Bean
     public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization() {
-        return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(TimeZone.getDefault());
+        return builder -> {
+            // 设置默认时区
+            builder.timeZone(TimeZone.getDefault());
+            // 设置日期格式为 yyyy/M/d HH:mm:ss，支持多种格式反序列化
+            builder.simpleDateFormat("yyyy/M/d HH:mm:ss");
+            // 添加JavaTimeModule支持，用于LocalDateTime
+            builder.modules(new JavaTimeModule());
+            builder.serializerByType(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern("yyyy/M/d HH:mm:ss")));
+        };
     }
 }

openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysUserRoleMapper.java

@@ -54,9 +54,17 @@ public interface SysUserRoleMapper {
     /**
      * 批量取消授权用户角色
      * 
-     * @param roleId 角色ID
+     * @param roleId 角色 ID
-     * @param userIds 需要删除的用户数据ID
+     * @param userIds 需要删除的用户数据 ID
      * @return 结果
      */
     public int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds);
+
+    /**
+     * 通过角色 ID 查询用户 ID 列表
+     * 
+     * @param roleId 角色 ID
+     * @return 用户 ID 列表
+     */
+    public List<Long> selectUserIdsByRoleId(Long roleId);
 }

openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysRoleServiceImpl.java

@@ -15,6 +15,7 @@ import com.core.system.mapper.SysRoleDeptMapper;
 import com.core.system.mapper.SysRoleMapper;
 import com.core.system.mapper.SysRoleMenuMapper;
 import com.core.system.mapper.SysUserRoleMapper;
+import com.core.system.service.ISysMenuService;
 import com.core.system.service.ISysRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -41,6 +42,9 @@ public class SysRoleServiceImpl implements ISysRoleService {
     @Autowired
     private SysRoleDeptMapper roleDeptMapper;
 
+    @Autowired
+    private ISysMenuService menuService;
+
     /**
      * 根据条件分页查询角色数据
      * 
@@ -221,11 +225,23 @@ public class SysRoleServiceImpl implements ISysRoleService {
     @Override
     @Transactional
     public int updateRole(SysRole role) {
-        // 修改角色信息
+        // 1. 获取该角色下的所有用户 ID（在修改权限前查询）
+        List<Long> userIds = userRoleMapper.selectUserIdsByRoleId(role.getRoleId());
+        
+        // 2. 修改角色信息
         roleMapper.updateRole(role);
-        // 删除角色与菜单关联
+        // 3. 删除角色与菜单关联
         roleMenuMapper.deleteRoleMenuByRoleId(role.getRoleId());
-        return insertRoleMenu(role);
+        int result = insertRoleMenu(role);
+        
+        // 4. 清除该角色下所有用户的菜单树缓存
+        if (userIds != null && !userIds.isEmpty()) {
+            for (Long userId : userIds) {
+                menuService.clearMenuCacheByUserId(userId);
+            }
+        }
+        
+        return result;
     }
 
     /**

openhis-server-new/core-system/src/main/resources/mapper/system/SysUserRoleMapper.xml

@@ -48,4 +48,10 @@
             #{userId}
         </foreach>
     </delete>
+
+    <select id="selectUserIdsByRoleId" resultType="Long">
+        select user_id
+        from sys_user_role
+        where role_id = #{roleId}
+    </select>
 </mapper> 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/IAppointmentConfigAppService.java

@@ -0,0 +1,28 @@
+package com.openhis.web.appointmentmanage.appservice;
+
+import com.core.common.core.domain.R;
+import com.openhis.appointmentmanage.domain.AppointmentConfig;
+
+/**
+ * 预约配置AppService接口
+ *
+ * @author openhis
+ * @date 2026-03-23
+ */
+public interface IAppointmentConfigAppService {
+
+    /**
+     * 获取当前机构的预约配置
+     *
+     * @return 预约配置
+     */
+    R<?> getAppointmentConfig();
+
+    /**
+     * 保存预约配置
+     *
+     * @param appointmentConfig 预约配置
+     * @return 结果
+     */
+    R<?> saveAppointmentConfig(AppointmentConfig appointmentConfig);
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/ITicketAppService.java

@@ -2,7 +2,9 @@ package com.openhis.web.appointmentmanage.appservice;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
+import com.openhis.appointmentmanage.dto.TicketQueryDTO;
 import com.openhis.web.appointmentmanage.dto.TicketDto;
+import com.openhis.appointmentmanage.dto.TicketQueryDTO;
 
 import java.util.Map;
 
@@ -14,37 +16,53 @@ import java.util.Map;
 public interface ITicketAppService {
 
     /**
-     * 预约号源
+     * 分页查询门诊号源列表（真分页）
      *
-     * @param params 预约参数
+     * @param query 查询参数
      * @return 结果
      */
-    R<?> bookTicket(Map<String, Object> params);
+    R<?> listTicket(TicketQueryDTO query);
+
+    /**
+     * 查询医生余号汇总（基于号源池，不受分页影响）
+     *
+     * @param query 查询参数
+     * @return 结果
+     */
+    R<?> listDoctorAvailability(TicketQueryDTO query);
+
+    /**
+     * 预约号源
+     *
+     * @param dto 预约参数
+     * @return 结果
+     */
+    R<?> bookTicket(com.openhis.appointmentmanage.domain.AppointmentBookDTO dto);
 
     /**
      * 取消预约
      *
-     * @param ticketId 号源ID
+     * @param slotId 槽位ID
      * @return 结果
      */
-    R<?> cancelTicket(Long ticketId);
+    R<?> cancelTicket(Long slotId);
 
     /**
      * 取号
      *
-     * @param ticketId 号源ID
+     * @param slotId 槽位ID
      * @return 结果
      */
-    R<?> checkInTicket(Long ticketId);
+    R<?> checkInTicket(Long slotId);
 
     /**
      * 停诊
      *
-     * @param ticketId 号源ID
+     * @param slotId 槽位ID
      * @return 结果
      */
-    R<?> cancelConsultation(Long ticketId);
+    R<?> cancelConsultation(Long slotId);
-    
+
     /**
      * 查询所有号源（用于测试）
      *

openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/AppointmentConfigAppServiceImpl.java

@@ -0,0 +1,62 @@
+package com.openhis.web.appointmentmanage.appservice.impl;
+
+import com.core.common.core.domain.R;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.appointmentmanage.domain.AppointmentConfig;
+import com.openhis.appointmentmanage.service.IAppointmentConfigService;
+import com.openhis.web.appointmentmanage.appservice.IAppointmentConfigAppService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * 预约配置AppService实现类
+ *
+ * @author openhis
+ * @date 2026-03-23
+ */
+@Service
+public class AppointmentConfigAppServiceImpl implements IAppointmentConfigAppService {
+
+    @Resource
+    private IAppointmentConfigService appointmentConfigService;
+
+    @Override
+    public R<?> getAppointmentConfig() {
+        // 获取当前登录用户的机构ID
+        Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
+        if (tenantId == null) {
+            return R.fail("获取机构信息失败");
+        }
+
+        AppointmentConfig config = appointmentConfigService.getConfigByTenantId(tenantId);
+        return R.ok(config);
+    }
+
+    @Override
+    public R<?> saveAppointmentConfig(AppointmentConfig appointmentConfig) {
+        // 获取当前登录用户的机构ID
+        Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
+        if (tenantId == null) {
+            return R.fail("获取机构信息失败");
+        }
+
+        // 查询是否已存在配置
+        AppointmentConfig existingConfig = appointmentConfigService.getConfigByTenantId(tenantId);
+
+        if (existingConfig != null) {
+            // 更新现有配置
+            existingConfig.setCancelAppointmentType(appointmentConfig.getCancelAppointmentType());
+            existingConfig.setCancelAppointmentCount(appointmentConfig.getCancelAppointmentCount());
+            existingConfig.setValidFlag(appointmentConfig.getValidFlag());
+            appointmentConfigService.saveOrUpdate(existingConfig);
+            return R.ok(existingConfig);
+        } else {
+            // 新增配置
+            appointmentConfig.setTenantId(tenantId);
+            appointmentConfig.setValidFlag(1);
+            appointmentConfigService.saveOrUpdateConfig(appointmentConfig);
+            return R.ok(appointmentConfig);
+        }
+    }
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DoctorScheduleAppServiceImpl.java

@@ -118,6 +118,7 @@ public class DoctorScheduleAppServiceImpl implements IDoctorScheduleAppService {
         newSchedule.setIsStopped(doctorSchedule.getIsStopped() != null ? doctorSchedule.getIsStopped() : false);
         newSchedule.setStopReason(doctorSchedule.getStopReason() != null ? doctorSchedule.getStopReason() : "");
         newSchedule.setDeptId(doctorSchedule.getDeptId());
+        newSchedule.setRegType(doctorSchedule.getRegType() != null ? doctorSchedule.getRegType() : 0);
         newSchedule.setDoctorId(doctorSchedule.getDoctorId());
 
         // 不设置id字段，让数据库自动生成
@@ -162,6 +163,30 @@ public class DoctorScheduleAppServiceImpl implements IDoctorScheduleAppService {
             return R.fail("限号数量必须大于0");
         }
 
+        // 检查结束时间必须大于开始时间
+        if (doctorSchedule.getStartTime() != null && doctorSchedule.getEndTime() != null) {
+            if (!doctorSchedule.getStartTime().isBefore(doctorSchedule.getEndTime())) {
+                return R.fail("结束时间必须大于开始时间");
+            }
+        }
+
+        // 检查时间重叠（同一医生、同一天时间段有重叠）
+        if (doctorSchedule.getDoctorId() != null && scheduledDate != null
+                && doctorSchedule.getStartTime() != null && doctorSchedule.getEndTime() != null) {
+            LocalDate scheduleDate = LocalDate.parse(scheduledDate);
+            boolean hasOverlap = checkTimeOverlap(
+                    doctorSchedule.getDoctorId(),
+                    scheduleDate,
+                    doctorSchedule.getStartTime(),
+                    doctorSchedule.getEndTime()
+            );
+            if (hasOverlap) {
+                return R.fail("该医生在 " + scheduledDate + " 的 "
+                        + doctorSchedule.getStartTime() + "-" + doctorSchedule.getEndTime()
+                        + " 时间段与已有排班重叠，不能重复添加");
+            }
+        }
+
         // 创建新对象，排除id字段（数据库id列是GENERATED ALWAYS，由数据库自动生成）
         DoctorSchedule newSchedule = new DoctorSchedule();
         newSchedule.setWeekday(doctorSchedule.getWeekday());
@@ -183,6 +208,7 @@ public class DoctorScheduleAppServiceImpl implements IDoctorScheduleAppService {
         newSchedule.setIsStopped(doctorSchedule.getIsStopped() != null ? doctorSchedule.getIsStopped() : false);
         newSchedule.setStopReason(doctorSchedule.getStopReason() != null ? doctorSchedule.getStopReason() : "");
         newSchedule.setDeptId(doctorSchedule.getDeptId());
+        newSchedule.setRegType(doctorSchedule.getRegType() != null ? doctorSchedule.getRegType() : 0);
         newSchedule.setDoctorId(doctorSchedule.getDoctorId());
 
         // 不设置id字段，让数据库自动生成
@@ -213,14 +239,51 @@ public class DoctorScheduleAppServiceImpl implements IDoctorScheduleAppService {
         }
     }
 
+    @Transactional
     @Override
     public R<?> updateDoctorSchedule(DoctorSchedule doctorSchedule) {
         if (ObjectUtil.isEmpty(doctorSchedule) || ObjectUtil.isEmpty(doctorSchedule.getId())) {
             return R.fail("医生排班ID不能为空");
         }
-        // 注意：此为核心更新，暂未处理号源池和号源槽的同步更新
+
         int result = doctorScheduleMapper.updateDoctorSchedule(doctorSchedule);
-        return result > 0 ? R.ok(result) : R.fail("更新排班信息失败");
+        if (result <= 0) {
+            return R.fail("更新排班信息失败");
+        }
+
+        // 同步更新号源池，避免查询联表时医生/诊室等字段看起来“未更新”
+        boolean needSyncPool = doctorSchedule.getDoctorId() != null
+                || doctorSchedule.getDoctor() != null
+                || doctorSchedule.getClinic() != null
+                || doctorSchedule.getStartTime() != null
+                || doctorSchedule.getEndTime() != null
+                || doctorSchedule.getLimitNumber() != null
+                || doctorSchedule.getStopReason() != null
+                || doctorSchedule.getRegType() != null
+                || doctorSchedule.getRegisterFee() != null
+                || doctorSchedule.getRegisterItem() != null
+                || doctorSchedule.getDiagnosisItem() != null
+                || doctorSchedule.getDiagnosisFee() != null;
+
+        if (needSyncPool) {
+            schedulePoolService.lambdaUpdate()
+                    .eq(SchedulePool::getScheduleId, doctorSchedule.getId())
+                    .set(doctorSchedule.getDoctorId() != null, SchedulePool::getDoctorId, doctorSchedule.getDoctorId())
+                    .set(doctorSchedule.getDoctor() != null, SchedulePool::getDoctorName, doctorSchedule.getDoctor())
+                    .set(doctorSchedule.getClinic() != null, SchedulePool::getClinicRoom, doctorSchedule.getClinic())
+                    .set(doctorSchedule.getStartTime() != null, SchedulePool::getStartTime, doctorSchedule.getStartTime())
+                    .set(doctorSchedule.getEndTime() != null, SchedulePool::getEndTime, doctorSchedule.getEndTime())
+                    .set(doctorSchedule.getLimitNumber() != null, SchedulePool::getTotalQuota,
+                            doctorSchedule.getLimitNumber())
+                    .set(doctorSchedule.getStopReason() != null, SchedulePool::getStopReason, doctorSchedule.getStopReason())
+                    .set(doctorSchedule.getRegType() != null, SchedulePool::getRegType, String.valueOf(doctorSchedule.getRegType()))
+                    .set(doctorSchedule.getRegisterFee() != null, SchedulePool::getFee, Double.valueOf(doctorSchedule.getRegisterFee().toString()))
+                    .set(doctorSchedule.getRegisterFee() != null, SchedulePool::getInsurancePrice,
+                            Double.valueOf(doctorSchedule.getRegisterFee().toString()))
+                    .update();
+        }
+
+        return R.ok(result);
     }
 
     /**
@@ -246,7 +309,7 @@ public class DoctorScheduleAppServiceImpl implements IDoctorScheduleAppService {
         // 不设置available_num，因为它是数据库生成列
         // pool.setAvailableNum(0); // 初始为0，稍后更新
         pool.setRegType(schedule.getRegisterItem() != null ? schedule.getRegisterItem() : "普通");
-        pool.setFee(schedule.getRegisterFee() != null ? schedule.getRegisterFee() / 100.0 : 0.0); // 假设数据库中以分为单位存储
+        pool.setFee(schedule.getRegisterFee() != null ? Double.valueOf(schedule.getRegisterFee().toString()) : 0.0); // 直接使用原始价格
         pool.setInsurancePrice(pool.getFee()); // 医保价格暂时与原价相同
         // 暂时设置support_channel为空字符串，避免JSON类型问题
         pool.setSupportChannel("");
@@ -299,7 +362,7 @@ public class DoctorScheduleAppServiceImpl implements IDoctorScheduleAppService {
         // 不设置available_num，因为它是数据库生成列
         // pool.setAvailableNum(0); // 初始为0，稍后更新
         pool.setRegType(schedule.getRegisterItem() != null ? schedule.getRegisterItem() : "普通");
-        pool.setFee(schedule.getRegisterFee() != null ? schedule.getRegisterFee() / 100.0 : 0.0); // 假设数据库中以分为单位存储
+        pool.setFee(schedule.getRegisterFee() != null ? Double.valueOf(schedule.getRegisterFee().toString()) : 0.0); // 直接使用原始价格
         pool.setInsurancePrice(pool.getFee()); // 医保价格暂时与原价相同
         // 暂时设置support_channel为空字符串，避免JSON类型问题
         pool.setSupportChannel("");
@@ -345,6 +408,42 @@ public class DoctorScheduleAppServiceImpl implements IDoctorScheduleAppService {
         return slots;
     }
 
+    /**
+     * 检查同一医生、同一天、同时段是否已存在排班
+     *
+     * @param doctorId     医生ID
+     * @param scheduleDate 出诊日期
+     * @param timePeriod   时段（上午/下午）
+     * @return true表示存在重复排班，false表示不存在
+     */
+    // private boolean checkDuplicateSchedule(Long doctorId, LocalDate scheduleDate, String timePeriod) {
+    //     return schedulePoolService.lambdaQuery()
+    //             .eq(SchedulePool::getDoctorId, doctorId)
+    //             .eq(SchedulePool::getScheduleDate, scheduleDate)
+    //             .eq(SchedulePool::getShift, timePeriod)
+    //             .exists();
+    // }
+
+    /**
+     * 检查同一医生、同一天是否有时间重叠的排班
+     * 重叠判断：startA < endB AND startB < endA（即时间段有交集）
+     *
+     * @param doctorId     医生ID
+     * @param scheduleDate 出诊日期
+     * @param startTime    开始时间
+     * @param endTime      结束时间
+     * @return true表示存在时间重叠，false表示不重叠
+     */
+    private boolean checkTimeOverlap(Long doctorId, LocalDate scheduleDate,
+                                      LocalTime startTime, LocalTime endTime) {
+        return schedulePoolService.lambdaQuery()
+                .eq(SchedulePool::getDoctorId, doctorId)
+                .eq(SchedulePool::getScheduleDate, scheduleDate)
+                .lt(SchedulePool::getStartTime, endTime)    // 已有开始时间 < 新结束时间
+                .gt(SchedulePool::getEndTime, startTime)    // 已有结束时间 > 新开始时间
+                .exists();
+    }
+
     /**
      * 根据星期几计算具体日期（下周的对应星期）
      */

openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java

@@ -4,28 +4,22 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.openhis.administration.domain.Patient;
 import com.openhis.administration.service.IPatientService;
-import com.openhis.appointmentmanage.domain.DoctorSchedule;
+import com.openhis.appointmentmanage.mapper.ScheduleSlotMapper;
-import com.openhis.appointmentmanage.mapper.DoctorScheduleMapper;
-import com.openhis.appointmentmanage.service.IDoctorScheduleService;
-import com.openhis.clinical.domain.Order;
 import com.openhis.clinical.domain.Ticket;
-import com.openhis.clinical.mapper.OrderMapper;
 import com.openhis.clinical.service.ITicketService;
-import com.openhis.web.appointmentmanage.appservice.IDoctorScheduleAppService;
 import com.openhis.web.appointmentmanage.appservice.ITicketAppService;
 import com.openhis.web.appointmentmanage.dto.TicketDto;
+import com.openhis.common.constant.CommonConstants.SlotStatus;
+import com.openhis.common.constant.CommonConstants.AppointmentOrderStatus;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.time.*;
 import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
+import java.util.Locale;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 /**
  * 号源管理应用服务实现类
  *
@@ -36,73 +30,41 @@ public class TicketAppServiceImpl implements ITicketAppService {
 
     @Resource
     private ITicketService ticketService;
-    
+    @Resource
+    private ScheduleSlotMapper scheduleSlotMapper;
     @Resource
     private IPatientService patientService;
-    @Resource
-    private IDoctorScheduleAppService doctorScheduleAppService;
-    @Resource
-    private DoctorScheduleMapper doctorScheduleMapper;
-    @Resource
-    private OrderMapper orderMapper;
 
     private static final Logger log = LoggerFactory.getLogger(TicketAppServiceImpl.class);
 
     /**
-     * 预约号源
+     * 预约号源 (重构版：精准锁定单一槽位)
      *
-     * @param params 预约参数
+     * @param dto 预约参数
      * @return 结果
      */
     @Override
-    public R<?> bookTicket(Map<String, Object> params) {
+    public R<?> bookTicket(com.openhis.appointmentmanage.domain.AppointmentBookDTO dto) {
-        // 1. 获取 ticketId 和 slotId
+        Long slotId = dto.getSlotId();
-        Long ticketId = null;
+        if (slotId == null) {
-        Long slotId = null;
+            return R.fail("参数校验失败：缺少排班槽位唯一标识");
-        if (params.get("ticketId") != null) {
-            ticketId = Long.valueOf(params.get("ticketId").toString());
         }
-        if (params.get("slotId") != null) {
-            slotId = Long.valueOf(params.get("slotId").toString());
-        }
-        // 2. 参数校验
-        if (ticketId == null || slotId == null) {
-            return R.fail("参数错误：ticketId 或 slotId 不能为空");
-        }
-
         try {
-            // 3. 执行原有的预约逻辑
+            int result = ticketService.bookTicket(dto);
-            int result = ticketService.bookTicket(params);
             if (result > 0) {
-                // 4. 预约成功后，更新排班表状态
+                return R.ok("预约成功！号源已安全锁定。");
-                DoctorSchedule schedule = new DoctorSchedule();
-                schedule.setId(slotId);             // 对应 XML 中的 WHERE id = #{id}
-                schedule.setIsStopped(true);         // 设置为已预约
-                schedule.setStopReason("booked");    // 设置停用原因
-
-                // 执行更新
-                int updateCount = doctorScheduleMapper.updateDoctorSchedule(schedule);
-
-                if (updateCount > 0) {
-                    return R.ok("预约成功并已更新排班状态");
-                } else {
-                    // 如果更新失败，可能需要根据业务逻辑决定是否回滚预约
-                    return R.ok("预约成功，但排班状态更新失败");
-                }
-            } else {
-                return R.fail("预约失败");
             }
+            return R.fail("预约挂单核发失败");
         } catch (Exception e) {
-           // e.printStackTrace();
+            log.error("大厅挂号捕获系统异常", e);
-            log.error(e.getMessage());
             return R.fail("系统异常：" + e.getMessage());
         }
     }
 
     /**
-     * 取消预约
+     * 取消预约 (重构版：精准释放单一槽位)
      *
-     * @param slotId 医生排班ID
+     * @param slotId 医生槽位排班ID
      * @return 结果
      */
     @Override
@@ -111,18 +73,8 @@ public class TicketAppServiceImpl implements ITicketAppService {
             return R.fail("参数错误");
         }
         try {
-            ticketService.cancelTicket(slotId);
+            int result = ticketService.cancelTicket(slotId);
-            DoctorSchedule schedule = new DoctorSchedule();
+            return R.ok(result > 0 ? "取消成功，号源已重新释放回市场" : "取消失败");
-            schedule.setId(slotId);            // 对应 WHERE id = #{id}
-            schedule.setIsStopped(false);      // 设置为 false
-            schedule.setStopReason("");        // 将原因清空 (设为空字符串)
-            // 3. 调用自定义更新方法
-            int updateCount = doctorScheduleMapper.updateDoctorSchedule(schedule);
-            if (updateCount > 0) {
-                return R.ok("取消成功");
-            } else {
-                return R.ok("取消成功");
-            }
         } catch (Exception e) {
             return R.fail(e.getMessage());
         }
@@ -131,16 +83,16 @@ public class TicketAppServiceImpl implements ITicketAppService {
     /**
      * 取号
      *
-     * @param ticketId 号源ID
+     * @param slotId 槽位ID
      * @return 结果
      */
     @Override
-    public R<?> checkInTicket(Long ticketId) {
+    public R<?> checkInTicket(Long slotId) {
-        if (ticketId == null) {
+        if (slotId == null) {
             return R.fail("参数错误");
         }
         try {
-            int result = ticketService.checkInTicket(ticketId);
+            int result = ticketService.checkInTicket(slotId);
             return R.ok(result > 0 ? "取号成功" : "取号失败");
         } catch (Exception e) {
             return R.fail(e.getMessage());
@@ -150,109 +102,300 @@ public class TicketAppServiceImpl implements ITicketAppService {
     /**
      * 停诊
      *
-     * @param ticketId 号源ID
+     * @param slotId 槽位ID
      * @return 结果
      */
     @Override
-    public R<?> cancelConsultation(Long ticketId) {
+    public R<?> cancelConsultation(Long slotId) {
-        if (ticketId == null) {
+        if (slotId == null) {
             return R.fail("参数错误");
         }
         try {
-            int result = ticketService.cancelConsultation(ticketId);
+            int result = ticketService.cancelConsultation(slotId);
             return R.ok(result > 0 ? "停诊成功" : "停诊失败");
         } catch (Exception e) {
             return R.fail(e.getMessage());
         }
     }
-    
+
     @Override
-    public R<?> listAllTickets() {
+    public R<?> listTicket(com.openhis.appointmentmanage.dto.TicketQueryDTO query) {
-        // 1. 从 AppService 获取排班数据
+        // 1. 防空指针处理
-        R<?> response = doctorScheduleAppService.getDoctorScheduleList();
+        if (query == null) {
-        // 获取返回的 List 数据 (假设 R.ok 里的数据是 List<DoctorSchedule>)
+            query = new com.openhis.appointmentmanage.dto.TicketQueryDTO();
-        List<DoctorSchedule> scheduleList = (List<DoctorSchedule>) response.getData();
+        }
+        normalizeQueryStatus(query);
 
-        // 2. 转换数据为 TicketDto
+        // 2. 构造 MyBatis 的分页对象 (传入前端给的当前页和每页条数)
-        List<TicketDto> tickets = new ArrayList<>();
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.openhis.appointmentmanage.domain.TicketSlotDTO> pageParam = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(
+                query.getPage(), query.getLimit());
 
-        if (scheduleList != null) {
+        // 3. 调用刚才写的底层动态 SQL 查询！
-            for (DoctorSchedule schedule : scheduleList) {
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.openhis.appointmentmanage.domain.TicketSlotDTO> rawPage = scheduleSlotMapper
+                .selectTicketSlotsPage(pageParam, query);
+
+        // 4. 将查出来的数据翻译为前端可以直接渲染的结构
+        java.util.List<TicketDto> tickets = new java.util.ArrayList<>();
+        if (rawPage.getRecords() != null) {
+            for (com.openhis.appointmentmanage.domain.TicketSlotDTO raw : rawPage.getRecords()) {
                 TicketDto dto = new TicketDto();
 
-                // 基础信息映射
+                // 基础字段映射
-                dto.setSlot_id(Long.valueOf(schedule.getId())); // Integer 转 Long
+                dto.setSlot_id(raw.getSlotId());
-                dto.setBusNo(String.valueOf(schedule.getId()));         // 生成一个业务编号
+                dto.setSeqNo(raw.getSeqNo());
-                dto.setDepartment(String.valueOf(schedule.getDeptId())); // 如果有科室名建议关联查询，这里暂填ID
+                dto.setBusNo(String.valueOf(raw.getSlotId()));
-                dto.setDoctor(schedule.getDoctor());
+                dto.setDoctor(raw.getDoctor());
+                dto.setDepartment(raw.getDepartmentName()); // 注意：以前这里传成了ID，导致前端出Bug，现在修复成了真正的科室名
+                dto.setFee(raw.getFee());
+                dto.setPatientName(raw.getPatientName());
+                dto.setPatientId(raw.getMedicalCard()); 
+                dto.setPhone(raw.getPhone());
+                dto.setIdCard(raw.getIdCard());
+                dto.setDoctorId(raw.getDoctorId());
+                dto.setDepartmentId(raw.getDepartmentId());
+                dto.setRealPatientId(raw.getPatientId()); 
 
-                // 号源类型处理：根据挂号项目判断是普通号还是专家号
+                // 性别处理：直接读取优先级最高的订单性别字段 (SQL 已处理优先级)
-                String registerItem = schedule.getRegisterItem();
+                if (raw.getPatientGender() != null) {
-                if (registerItem != null && registerItem.contains("专家")) {
+                    String pg = raw.getPatientGender().trim();
+                    dto.setGender("1".equals(pg) ? "男" : ("2".equals(pg) ? "女" : "未知"));
+                } else {
+                    dto.setGender("未知");
+                }
+
+                if (raw.getRegType() != null && raw.getRegType() == 1) {
                     dto.setTicketType("expert");
                 } else {
                     dto.setTicketType("general");
                 }
-                // 时间处理：格式化为日期+时间范围，如 "2025-12-01 08:00-12:00"
-                String currentDate = LocalDate.now().toString(); // 或者从schedule中获取具体日期
-                String timeRange = schedule.getStartTime() + "-" + schedule.getEndTime();
-                dto.setDateTime(currentDate + " " + timeRange);
-                LocalTime nowTime = LocalTime.now();
-                LocalTime endTime = schedule.getEndTime();
-                String stopReason1 = schedule.getStopReason();
-                if ("cancelled".equals(stopReason1)||(endTime != null && nowTime.isAfter(endTime))) {
-                    dto.setStatus("已停诊");
-                }else if (Boolean.TRUE.equals(schedule.getIsStopped())) {
-                    // 获取原因并处理可能的空值
-                    String stopReason = schedule.getStopReason();
-                    // 使用 .equals() 比较内容，并将常量放在前面防止空指针
-                    if ("booked".equals(stopReason)) {
-                        dto.setStatus("已预约");
-                        // --- 新增：获取患者信息 ---
-                        List<Order> Order = orderMapper.selectOrderBySlotId(Long.valueOf(schedule.getId()));
-                        Order latestOrder=Order.get(0);
 
-                        if (latestOrder != null) {
+                if (raw.getScheduleDate() != null && raw.getExpectTime() != null) {
-                            dto.setPatientName(latestOrder.getPatientName());
+                    dto.setDateTime(raw.getScheduleDate().toString() + " " + raw.getExpectTime().toString());
-                            dto.setPatientId(String.valueOf(latestOrder.getPatientId()));
+                    try {
-                            dto.setPhone(latestOrder.getPhone());
+                        String timeStr = raw.getAppointmentTime() != null ? raw.getAppointmentTime() : (raw.getScheduleDate().toString() + " " + raw.getExpectTime().toString());
-                        }
+                        java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat(timeStr.length() > 10 ? "yyyy-MM-dd HH:mm" : "yyyy-MM-dd");
-                        // -----------------------
+                        java.util.Date date = sdf.parse(timeStr);
-                    } else if ("checked".equals(stopReason)) {
+                        dto.setAppointmentDate(date);
-                        dto.setStatus("已取号");
+                        dto.setAppointmentTime(date);
-                    } else {
+                    } catch (Exception e) {
-                        // 兜底逻辑：如果 is_stopped 为 true 但没有匹配到原因
+                        dto.setAppointmentDate(new java.util.Date());
-                        dto.setStatus("不可预约");
                     }
-                } else {
-                    // is_stopped 为 false 或 null 时
-                    dto.setStatus("未预约");
                 }
 
-                // 费用处理 (挂号费 + 诊疗费)
+                if (Boolean.TRUE.equals(raw.getIsStopped())) {
-                int totalFee = schedule.getRegisterFee() + schedule.getDiagnosisFee();
+                    dto.setStatus("已停诊");
-                dto.setFee(String.valueOf(totalFee));
+                } else {
-
+                    Integer slotStatus = raw.getSlotStatus();
-                // 日期处理：LocalDateTime 转 Date
+                    if (slotStatus != null) {
-                if (schedule.getCreateTime() != null) {
+                        if (SlotStatus.CHECKED_IN.equals(slotStatus)) {
-                    // 1. 先转成 Instant
+                            dto.setStatus("已取号");
-                    Instant instant = schedule.getCreateTime().toInstant();
+                        } else if (SlotStatus.BOOKED.equals(slotStatus)) {
-                    // 2. 结合时区转成 ZonedDateTime
+                            if (AppointmentOrderStatus.CHECKED_IN.equals(raw.getOrderStatus())) {
-                    ZonedDateTime zdt = instant.atZone(ZoneId.systemDefault());
+                                dto.setStatus("已取号");
-                    // 3. 再转回 Date (如果 DTO 需要的是 Date)
+                            } else if (AppointmentOrderStatus.RETURNED.equals(raw.getOrderStatus())) {
-                    dto.setAppointmentDate(Date.from(zdt.toInstant()));
+                                dto.setStatus("已退号");
+                            } else {
+                                dto.setStatus("已预约");
+                            }
+                        } else if (SlotStatus.RETURNED.equals(slotStatus)) {
+                            dto.setStatus("已退号");
+                        } else if (SlotStatus.CANCELLED.equals(slotStatus)) {
+                            dto.setStatus("已停诊");
+                        } else if (SlotStatus.LOCKED.equals(slotStatus)) {
+                            dto.setStatus("已锁定");
+                        } else {
+                            dto.setStatus("未预约");
+                        }
+                    } else {
+                        dto.setStatus("未预约");
+                    }
                 }
 
                 tickets.add(dto);
             }
         }
 
-        // 3. 封装分页响应结构
+        // 5. 按照前端组件需要的【真分页】格式进行包装，并返回
-        Map<String, Object> result = new HashMap<>();
+        java.util.Map<String, Object> result = new java.util.HashMap<>();
+        result.put("list", tickets);
+        result.put("total", rawPage.getTotal()); // 这个 total 就是底层用 COUNT(*) 算出来的真实总条数！
+        result.put("page", query.getPage());
+        result.put("limit", query.getLimit());
+
+        return R.ok(result);
+    }
+
+    /**
+     * 统一状态入参，避免前端状态值大小写/中文/数字差异导致 SQL 条件失效后回全量数据
+     */
+    private void normalizeQueryStatus(com.openhis.appointmentmanage.dto.TicketQueryDTO query) {
+        String rawStatus = query.getStatus();
+        if (rawStatus == null) {
+            return;
+        }
+        String normalized = rawStatus.trim();
+        if (normalized.isEmpty()) {
+            query.setStatus(null);
+            return;
+        }
+        String lower = normalized.toLowerCase(Locale.ROOT);
+        switch (lower) {
+            case "all":
+            case "全部":
+                query.setStatus("all");
+                break;
+            case "unbooked":
+            case "0":
+            case "未预约":
+                query.setStatus("unbooked");
+                break;
+            case "booked":
+            case "1":
+            case "已预约":
+                query.setStatus("booked");
+                break;
+            case "checked":
+            case "checkin":
+            case "checkedin":
+            case "2":
+            case "已取号":
+                query.setStatus("checked");
+                break;
+            case "cancelled":
+            case "canceled":
+            case "3":
+            case "已停诊":
+            case "已取消":
+                query.setStatus("cancelled");
+                break;
+            case "returned":
+            case "4":
+            case "5":
+            case "已退号":
+                query.setStatus("returned");
+                break;
+            default:
+                // 设置为 impossible 值，配合 mapper 的 otherwise 分支直接返回空
+                query.setStatus("__invalid__");
+                break;
+        }
+    }
+
+    @Override
+    public R<?> listDoctorAvailability(com.openhis.appointmentmanage.dto.TicketQueryDTO query) {
+        if (query == null) {
+            query = new com.openhis.appointmentmanage.dto.TicketQueryDTO();
+        }
+
+        java.util.List<com.openhis.appointmentmanage.domain.DoctorAvailabilityDTO> rawList = scheduleSlotMapper
+                .selectDoctorAvailabilitySummary(query);
+        java.util.List<java.util.Map<String, Object>> doctors = new java.util.ArrayList<>();
+        if (rawList != null) {
+            for (com.openhis.appointmentmanage.domain.DoctorAvailabilityDTO item : rawList) {
+                java.util.Map<String, Object> row = new java.util.HashMap<>();
+                String doctorName = item.getDoctorName();
+                Long doctorId = item.getDoctorId();
+                row.put("id", doctorId != null ? String.valueOf(doctorId) : doctorName);
+                row.put("name", doctorName);
+                row.put("available", item.getAvailable() == null ? 0 : item.getAvailable());
+                row.put("type", item.getTicketType() == null ? "general" : item.getTicketType());
+                doctors.add(row);
+            }
+        }
+        return R.ok(doctors);
+    }
+
+    @Override
+    public R<?> listAllTickets() {
+        // 1. 调用最新的 Mapper，直接从数据库抽出我们半成品的 DTO（强类型！）
+        List<com.openhis.appointmentmanage.domain.TicketSlotDTO> rawDtos = scheduleSlotMapper.selectAllTicketSlots();
+
+        // 这是真正要发给前端展示的包裹外卖盒
+        List<TicketDto> tickets = new ArrayList<>();
+
+        if (rawDtos != null) {
+            for (com.openhis.appointmentmanage.domain.TicketSlotDTO raw : rawDtos) {
+                TicketDto dto = new TicketDto();
+
+                // --- 基础字段处理 ---
+                // 注意：这里已经变成了极其舒服的 .getSlotId() 方法调用，告别魔鬼字符串！
+                dto.setSlot_id(raw.getSlotId());
+                dto.setSeqNo(raw.getSeqNo());
+                dto.setBusNo(String.valueOf(raw.getSlotId())); // 暂时借用真实槽位ID做唯一流水号
+                dto.setDoctor(raw.getDoctor());
+                dto.setDepartment(raw.getDepartmentName());
+                dto.setFee(raw.getFee());
+                dto.setPatientName(raw.getPatientName());
+                dto.setPatientId(raw.getMedicalCard()); 
+                dto.setPhone(raw.getPhone());
+
+                // --- 号源类型处理 (普通/专家) ---
+                // 改用底层 adm_doctor_schedule 传来的标准数字字典：0=普通，1=专家
+                if (raw.getRegType() != null && raw.getRegType() == 1) {
+                    dto.setTicketType("expert");
+                } else {
+                    dto.setTicketType("general");
+                }
+
+                // --- 就诊时间严谨拼接 ---
+                // 拼接出来给前端展示的，如 "2026-03-20 08:30"
+                if (raw.getScheduleDate() != null && raw.getExpectTime() != null) {
+                    dto.setDateTime(raw.getScheduleDate().toString() + " " + raw.getExpectTime().toString());
+                    try {
+                        String timeStr = raw.getAppointmentTime() != null ? raw.getAppointmentTime() : (raw.getScheduleDate().toString() + " " + raw.getExpectTime().toString());
+                        java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat(timeStr.length() > 10 ? "yyyy-MM-dd HH:mm" : "yyyy-MM-dd");
+                        java.util.Date date = sdf.parse(timeStr);
+                        dto.setAppointmentDate(date);
+                        dto.setAppointmentTime(date);
+                    } catch (Exception e) {
+                        log.error("时间解析失败", e);
+                        dto.setAppointmentDate(new java.util.Date());
+                    }
+                }
+
+                // --- 核心逻辑：精准状态分类 ---
+                // 第一关：底层硬性停诊拦截
+                if (Boolean.TRUE.equals(raw.getIsStopped())) {
+                    dto.setStatus("已停诊");
+                } else {
+                    // 第二关：看独立的细分槽位状态 (0: 可用, 1: 已预约, 2: 已取消...)
+                    Integer slotStatus = raw.getSlotStatus();
+                    if (slotStatus != null) {
+                        if (SlotStatus.CHECKED_IN.equals(slotStatus)) {
+                            dto.setStatus("已取号");
+                        } else if (SlotStatus.BOOKED.equals(slotStatus)) {
+                            if (AppointmentOrderStatus.CHECKED_IN.equals(raw.getOrderStatus())) {
+                                dto.setStatus("已取号");
+                            } else if (AppointmentOrderStatus.RETURNED.equals(raw.getOrderStatus())) {
+                                dto.setStatus("已退号");
+                            } else {
+                                dto.setStatus("已预约");
+                            }
+                        } else if (SlotStatus.RETURNED.equals(slotStatus)) {
+                            dto.setStatus("已退号");
+                        } else if (SlotStatus.CANCELLED.equals(slotStatus)) {
+                            dto.setStatus("已停诊");
+                        } else if (SlotStatus.LOCKED.equals(slotStatus)) {
+                            dto.setStatus("已锁定");
+                        } else {
+                            dto.setStatus("未预约");
+                        }
+                    } else {
+                        dto.setStatus("未预约");
+                    }
+                }
+
+                tickets.add(dto);
+            }
+        }
+
+        // 3. 封装分页响应结构并吐给前端
+        java.util.Map<String, Object> result = new java.util.HashMap<>();
         result.put("list", tickets);
         result.put("total", tickets.size());
         result.put("page", 1);
         result.put("limit", 20);
+
         return R.ok(result);
     }
 
@@ -268,7 +411,7 @@ public class TicketAppServiceImpl implements ITicketAppService {
         dto.setBusNo(ticket.getBusNo());
         dto.setDepartment(ticket.getDepartment());
         dto.setDoctor(ticket.getDoctor());
-        
+
         // 处理号源类型（转换为英文，前端期望的是general或expert）
         String ticketType = ticket.getTicketType();
         if ("普通".equals(ticketType)) {
@@ -278,10 +421,10 @@ public class TicketAppServiceImpl implements ITicketAppService {
         } else {
             dto.setTicketType(ticketType);
         }
-        
+
         // 处理号源时间（dateTime）
         dto.setDateTime(ticket.getTime());
-        
+
         // 处理号源状态（转换为中文）
         String status = ticket.getStatus();
         switch (status) {
@@ -300,32 +443,29 @@ public class TicketAppServiceImpl implements ITicketAppService {
             default:
                 dto.setStatus(status);
         }
-        
+
         dto.setFee(ticket.getFee());
         dto.setPatientName(ticket.getPatientName());
         dto.setPatientId(ticket.getMedicalCard()); // 就诊卡号
         dto.setPhone(ticket.getPhone());
-        
+
         // 获取患者性别
         if (ticket.getPatientId() != null) {
             Patient patient = patientService.getById(ticket.getPatientId());
             if (patient != null) {
                 Integer genderEnum = patient.getGenderEnum();
                 if (genderEnum != null) {
-                    switch (genderEnum) {
+                    if (Integer.valueOf(1).equals(genderEnum)) {
-                        case 1:
+                        dto.setGender("男");
-                            dto.setGender("男");
+                    } else if (Integer.valueOf(2).equals(genderEnum)) {
-                            break;
+                        dto.setGender("女");
-                        case 2:
+                    } else {
-                            dto.setGender("女");
+                        dto.setGender("未知");
-                            break;
-                        default:
-                            dto.setGender("未知");
                     }
                 }
             }
         }
-        
+
         dto.setAppointmentDate(ticket.getAppointmentDate());
         dto.setAppointmentTime(ticket.getAppointmentTime());
         dto.setDepartmentId(ticket.getDepartmentId());

openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DeptController.java

@@ -1,11 +1,10 @@
 package com.openhis.web.appointmentmanage.controller;
 
 import com.core.common.core.domain.R;
+import com.openhis.appointmentmanage.domain.AppointmentConfig;
+import com.openhis.web.appointmentmanage.appservice.IAppointmentConfigAppService;
 import com.openhis.web.appointmentmanage.appservice.IDeptAppService;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 
@@ -16,6 +15,9 @@ public class DeptController {
     @Resource
     private IDeptAppService deptAppService;
 
+    @Resource
+    private IAppointmentConfigAppService appointmentConfigAppService;
+
     /*
     * 获取科室列表
     *
@@ -38,4 +40,22 @@ public class DeptController {
     ){
         return R.ok(deptAppService.searchDept(pageNo,pageSize,orgName,deptName));
     }
+
+    /*
+    * 获取预约配置
+    *
+    * */
+    @GetMapping("/config")
+    public R<?> getAppointmentConfig(){
+        return appointmentConfigAppService.getAppointmentConfig();
+    }
+
+    /*
+    * 保存预约配置
+    *
+    * */
+    @PostMapping("/config")
+    public R<?> saveAppointmentConfig(@RequestBody AppointmentConfig appointmentConfig){
+        return appointmentConfigAppService.saveAppointmentConfig(appointmentConfig);
+    }
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DoctorScheduleController.java

@@ -53,7 +53,6 @@ public class DoctorScheduleController {
 
     /*
     * 新增医生排班（带具体日期）
-    *
     * */
     @PostMapping("/add-with-date")
     public R<?> addDoctorScheduleWithDate(@RequestBody DoctorSchedule doctorSchedule) {
@@ -77,7 +76,7 @@ public class DoctorScheduleController {
      * */
     @DeleteMapping("/delete/{doctorScheduleId}")
     public R<?> removeDoctorSchedule(@PathVariable Integer doctorScheduleId){
-        return R.ok(doctorScheduleAppService.removeDoctorSchedule(doctorScheduleId));
+        return doctorScheduleAppService.removeDoctorSchedule(doctorScheduleId);
     }
 
     /*

openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/TicketController.java

@@ -3,8 +3,12 @@ package com.openhis.web.appointmentmanage.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.annotation.Anonymous;
 import com.core.common.core.domain.R;
+import com.openhis.appointmentmanage.domain.AppointmentBookDTO;
+import com.openhis.appointmentmanage.dto.TicketQueryDTO;
 import com.openhis.web.appointmentmanage.appservice.ITicketAppService;
 import com.openhis.web.appointmentmanage.dto.TicketDto;
+
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -19,11 +23,35 @@ import java.util.Map;
 @RequestMapping("/appointment/ticket")
 public class TicketController {
 
+    /**
+     * 分页查询门诊号源列表 (带多条件过滤)
+     *
+     * @param query 查询条件
+     * @return 分页号源列表
+     */
+    @Anonymous
+    @PostMapping("/list")
+    public R<?> listTicket(@RequestBody @Validated TicketQueryDTO query) {
+        return ticketAppService.listTicket(query);
+    }
+
+    /**
+     * 查询医生余号汇总（基于号源池，不受分页影响）
+     *
+     * @param query 查询条件
+     * @return 医生余号列表
+     */
+    @Anonymous
+    @PostMapping("/doctorSummary")
+    public R<?> listDoctorAvailability(@RequestBody @Validated TicketQueryDTO query) {
+        return ticketAppService.listDoctorAvailability(query);
+    }
+
     @Resource
     private ITicketAppService ticketAppService;
-    
+
     /**
-     * 查询所有号源（用于测试）
+     * 查询所有号源
      *
      * @return 所有号源列表
      */
@@ -36,44 +64,44 @@ public class TicketController {
     /**
      * 预约号源
      *
-     * @param params 预约参数
+     * @param dto 预约参数
      * @return 结果
      */
     @PostMapping("/book")
-    public R<?> bookTicket(@RequestBody Map<String, Object> params) {
+    public R<?> bookTicket(@RequestBody @Validated AppointmentBookDTO dto) {
-        return ticketAppService.bookTicket(params);
+        return ticketAppService.bookTicket(dto);
     }
 
     /**
      * 取消预约
      *
-     * @param ticketId 号源ID
+     * @param slotId 槽位ID
      * @return 结果
      */
     @PostMapping("/cancel")
-    public R<?> cancelTicket(@RequestParam Long ticketId) {
+    public R<?> cancelTicket(@RequestParam Long slotId) {
-        return ticketAppService.cancelTicket(ticketId);
+        return ticketAppService.cancelTicket(slotId);
     }
 
     /**
      * 取号
      *
-     * @param ticketId 号源ID
+     * @param slotId 槽位ID
      * @return 结果
      */
     @PostMapping("/checkin")
-    public R<?> checkInTicket(@RequestParam Long ticketId) {
+    public R<?> checkInTicket(@RequestParam Long slotId) {
-        return ticketAppService.checkInTicket(ticketId);
+        return ticketAppService.checkInTicket(slotId);
     }
 
     /**
      * 停诊
      *
-     * @param ticketId 号源ID
+     * @param slotId 槽位ID
      * @return 结果
      */
     @PostMapping("/cancelConsultation")
-    public R<?> cancelConsultation(@RequestParam Long ticketId) {
+    public R<?> cancelConsultation(@RequestParam Long slotId) {
-        return ticketAppService.cancelConsultation(ticketId);
+        return ticketAppService.cancelConsultation(slotId);
     }
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/dto/TicketDto.java

@@ -23,6 +23,11 @@ public class TicketDto {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long slot_id;
 
+    /**
+     * 号源序号（对应 adm_schedule_slot.seq_no）
+     */
+    private Integer seqNo;
+
     /**
      * 号源编码
      */
@@ -49,7 +54,7 @@ public class TicketDto {
     private String dateTime;
 
     /**
-     * 状态 (unbooked:未预约, booked:已预约, checked:已取号, cancelled:已取消, locked:已锁定)
+     * 状态
      */
     private String status;
 
@@ -99,4 +104,15 @@ public class TicketDto {
      */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long doctorId;
+
+    /**
+     * 真实患者ID（数据库主键，区别于 patientId 存的就诊卡号）
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long realPatientId;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
 }

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

@@ -1,12 +1,14 @@
 package com.openhis.web.basedatamanage.appservice.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.StringUtils;
 import com.openhis.administration.domain.Organization;
+import com.openhis.administration.mapper.OrganizationMapper;
 import com.openhis.administration.service.IOrganizationService;
 import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.PromptMsgConstant;
@@ -35,12 +37,15 @@ public class OrganizationAppServiceImpl implements IOrganizationAppService {
     @Resource
     private AssignSeqUtil assignSeqUtil;
 
+    @Resource
+    private OrganizationMapper organizationMapper;
+
     @Override
     public Page<OrganizationDto> getOrganizationTree(Integer pageNo, Integer pageSize, String name, Integer typeEnum,
             List<String> classEnumList,
             String sortField, String sortOrder, HttpServletRequest request) {
 
-        // 使用Page对象进行分页查询
+        // 使用 Page 对象进行分页查询
         Page<Organization> page = new Page<>(pageNo, pageSize);
 
         // 创建查询条件
@@ -54,7 +59,7 @@ public class OrganizationAppServiceImpl implements IOrganizationAppService {
             queryWrapper.eq(Organization::getTypeEnum, typeEnum);
         }
         if (classEnumList != null && !classEnumList.isEmpty()) {
-            // 使用OR条件来匹配class_enum字段中包含任一值的记录
+            // 使用 OR 条件来匹配 class_enum 字段中包含任一值的记录
             queryWrapper.and(wrapper -> {
                 for (int i = 0; i < classEnumList.size(); i++) {
                     String classEnum = classEnumList.get(i);
@@ -63,18 +68,18 @@ public class OrganizationAppServiceImpl implements IOrganizationAppService {
                         wrapper.and(subWrapper -> {
                             subWrapper.eq(Organization::getClassEnum, classEnum) // 精确匹配
                                     .or() // 或者
-                                    .likeRight(Organization::getClassEnum, classEnum + ",") // 以"值,"开头
+                                    .likeRight(Organization::getClassEnum, classEnum + ",") // 以"值，"开头
                                     .or() // 或者
                                     .likeLeft(Organization::getClassEnum, "," + classEnum) // 以",值"结尾
                                     .or() // 或者
                                     .like(Organization::getClassEnum, "," + classEnum + ","); // 在中间，被逗号包围
                         });
                     } else {
-                        // 后续条件使用OR连接
+                        // 后续条件使用 OR 连接
                         wrapper.or(subWrapper -> {
                             subWrapper.eq(Organization::getClassEnum, classEnum) // 精确匹配
                                     .or() // 或者
-                                    .likeRight(Organization::getClassEnum, classEnum + ",") // 以"值,"开头
+                                    .likeRight(Organization::getClassEnum, classEnum + ",") // 以"值，"开头
                                     .or() // 或者
                                     .likeLeft(Organization::getClassEnum, "," + classEnum) // 以",值"结尾
                                     .or() // 或者
@@ -88,7 +93,7 @@ public class OrganizationAppServiceImpl implements IOrganizationAppService {
         // 执行分页查询
         Page<Organization> resultPage = organizationService.page(page, queryWrapper);
 
-        // 将查询结果转为DTO并构建树结构
+        // 将查询结果转为 DTO 并构建树结构
         List<Organization> organizationList = resultPage.getRecords();
         List<OrganizationDto> orgTree = buildTree(organizationList);
 
@@ -109,7 +114,7 @@ public class OrganizationAppServiceImpl implements IOrganizationAppService {
      * @return tree
      */
     private List<OrganizationDto> buildTree(List<Organization> records) {
-        // 按b_no的层级排序，确保父节点先处理
+        // 按 b_no 的层级排序，确保父节点先处理
         List<Organization> sortedRecords = records.stream()
                 .sorted(Comparator.comparingInt(r -> r.getBusNo().split("\\.").length)).collect(Collectors.toList());
 
@@ -131,7 +136,7 @@ public class OrganizationAppServiceImpl implements IOrganizationAppService {
                 // 根节点
                 tree.add(node);
             } else {
-                // 获取父节点的b_no（去掉最后一部分）
+                // 获取父节点的 b_no（去掉最后一部分）
                 String parentBNo = String.join(".", Arrays.copyOf(parts, parts.length - 1));
                 OrganizationDto parent = nodeMap.get(parentBNo);
 
@@ -149,7 +154,7 @@ public class OrganizationAppServiceImpl implements IOrganizationAppService {
     /**
      * 机构信息详情
      *
-     * @param orgId 机构信息id
+     * @param orgId 机构信息 id
      * @return 机构信息详情
      */
     @Override
@@ -159,7 +164,7 @@ public class OrganizationAppServiceImpl implements IOrganizationAppService {
             return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00006, new Object[] { "机构信息" }));
         }
 
-        // 转换为DTO对象，确保数据格式一致
+        // 转换为 DTO 对象，确保数据格式一致
         OrganizationDto organizationDto = new OrganizationDto();
         BeanUtils.copyProperties(organization, organizationDto);
         organizationDto
@@ -181,7 +186,7 @@ public class OrganizationAppServiceImpl implements IOrganizationAppService {
     @Override
     public R<?> addOrEditOrganization(OrganizationDto organizationDto) {
 
-        // 新增organization信息
+        // 新增 organization 信息
         Organization organization = new Organization();
         BeanUtils.copyProperties(organizationDto, organization);
 
@@ -191,9 +196,9 @@ public class OrganizationAppServiceImpl implements IOrganizationAppService {
         } else {
             // 活动标识：有效
             organization.setActiveFlag(AccountStatus.ACTIVE.getValue());
-            // 采番bus_no三位
+            // 采番 bus_no 三位
             String code = assignSeqUtil.getSeq(AssignSeqEnum.ORGANIZATION_BUS_NO.getPrefix(), 3);
-            // 如果传了上级科室 把当前的code拼到后边
+            // 如果传了上级科室 把当前的 code 拼到后边
             if (StringUtils.isNotEmpty(organization.getBusNo())) {
                 organization.setBusNo(String.format(CommonConstants.Common.MONTAGE_FORMAT, organization.getBusNo(),
                         CommonConstants.Common.POINT, code));
@@ -203,7 +208,7 @@ public class OrganizationAppServiceImpl implements IOrganizationAppService {
             // 生成待发送的机构信息
             organizationService.save(organization);
         }
-        // 返回机构id
+        // 返回机构 id
         return R.ok(organization.getId(),
                 MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] { "机构信息更新添加" }));
     }
@@ -211,7 +216,7 @@ public class OrganizationAppServiceImpl implements IOrganizationAppService {
     /**
      * 删除机构
      *
-     * @param orgIds 机构信息id
+     * @param orgIds 机构信息 id
      * @return 操作结果
      */
     @Override
@@ -232,7 +237,7 @@ public class OrganizationAppServiceImpl implements IOrganizationAppService {
     /**
      * 机构启用
      *
-     * @param orgId 机构信息id
+     * @param orgId 机构信息 id
      * @return 操作结果
      */
     @Override
@@ -247,7 +252,7 @@ public class OrganizationAppServiceImpl implements IOrganizationAppService {
     /**
      * 机构停用
      *
-     * @param orgId 机构信息id
+     * @param orgId 机构信息 id
      * @return 操作结果
      */
     @Override
@@ -299,38 +304,27 @@ public class OrganizationAppServiceImpl implements IOrganizationAppService {
      */
     @Override
     public R<?> getRegisterOrganizations(Integer pageNo, Integer pageSize, String name, String orgName) {
-        // 使用Page对象进行分页查询
+        // 使用 Page 对象进行分页查询
         Page<Organization> page = new Page<>(pageNo != null ? pageNo : 1, pageSize != null ? pageSize : 10);
 
-        // 创建查询条件，只查询register_flag为1的组织机构
+        // 使用 Mapper 方法关联查询 sys_tenant 表获取租户名称
-        LambdaQueryWrapper<Organization> queryWrapper = new LambdaQueryWrapper<>();
+        IPage<Organization> resultPage = organizationMapper.selectRegisterOrganizationsWithTenant(
-        queryWrapper.eq(Organization::getRegisterFlag, 1); // 只获取挂号科室
+            page,
-        queryWrapper.eq(Organization::getDeleteFlag, "0"); // 确保未删除
+            1,  // register_flag = 1
+            "0", // delete_flag = '0'
+            name,
+            orgName
+        );
 
-        // 添加名称过滤条件
+        // 转换为 DTO 对象并设置字典文本
-        if (StringUtils.isNotEmpty(name)) {
-            queryWrapper.like(Organization::getName, name);
-        }
-
-        // 如果有机构名称筛选
-        if (StringUtils.isNotEmpty(orgName)) {
-            // 这里假设 orgName 是父机构名称，如果需要更复杂的关联查询可在此扩展
-            // 当前逻辑暂保持与原逻辑一致的过滤方式或根据需求调整
-        }
-
-        // 按编码排序
-        queryWrapper.orderByAsc(Organization::getBusNo);
-
-        // 执行分页查询
-        Page<Organization> resultPage = organizationService.page(page, queryWrapper);
-
-        // 转换为DTO对象并设置字典文本
         List<OrganizationDto> organizationDtoList = resultPage.getRecords().stream().map(org -> {
             OrganizationDto dto = new OrganizationDto();
             BeanUtils.copyProperties(org, dto);
             dto.setTypeEnum_dictText(EnumUtils.getInfoByValue(OrganizationType.class, dto.getTypeEnum()));
             dto.setClassEnum_dictText(formatClassEnumDictText(dto.getClassEnum()));
             dto.setActiveFlag_dictText(EnumUtils.getInfoByValue(AccountStatus.class, dto.getActiveFlag()));
+            // 设置租户名称
+            dto.setOrgName(org.getTenantName());
             return dto;
         }).collect(Collectors.toList());
 

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

@@ -8,7 +8,6 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
-import lombok.ToString;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -60,18 +59,20 @@ public class OrganizationDto {
     private Integer displayOrder;
 
     /** 子集合 */
-    @ToString.Exclude
     private List<OrganizationDto> children = new ArrayList<>();
-    
+
     /** 挂号科室标记 */
     private Integer registerFlag;
-    
+
     /** 科室位置 */
     private String location;
-    
+
     /** 科室简介 */
     private String intro;
-    
+
     /** 备注 */
     private String remark;
+
+    /** 租户名称 */
+    private String orgName;
 }

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

@@ -119,9 +119,11 @@ public class OutpatientChargeAppServiceImpl implements IOutpatientChargeAppServi
                 = outpatientChargeAppMapper.selectEncounterPatientPrescription(encounterId,
                         ChargeItemContext.ACTIVITY.getValue(), ChargeItemContext.MEDICATION.getValue(),
                         ChargeItemContext.DEVICE.getValue(), ChargeItemContext.REGISTER.getValue(),
+                        ChargeItemContext.WESTERN_MEDICINE.getValue(), ChargeItemContext.CHINESE_PATENT_MEDICINE.getValue(),
                         ChargeItemStatus.PLANNED.getValue(), ChargeItemStatus.BILLABLE.getValue(),
                         ChargeItemStatus.BILLED.getValue(), ChargeItemStatus.REFUNDING.getValue(),
-                        ChargeItemStatus.REFUNDED.getValue(), ChargeItemStatus.PART_REFUND.getValue());
+                        ChargeItemStatus.REFUNDED.getValue(), ChargeItemStatus.PART_REFUND.getValue(),
+                        CommonConstants.TableName.WOR_DEVICE_REQUEST);
         prescriptionDtoList.forEach(e -> {
             // 收费状态枚举
             e.setStatusEnum_enumText(EnumUtils.getInfoByValue(ChargeItemStatus.class, e.getStatusEnum()));
@@ -229,7 +231,8 @@ public class OutpatientChargeAppServiceImpl implements IOutpatientChargeAppServi
                         ChargeItemStatus.REFUNDING.getValue(), ChargeItemStatus.REFUNDED.getValue(),
                         ChargeItemStatus.PART_REFUND.getValue(), YbPayment.DISCOUNT_PAY.getValue(),
                         YbPayment.SELF_CASH_VALUE.getValue(), YbPayment.SELF_CASH_VX_VALUE.getValue(),
-                        YbPayment.SELF_CASH_ALI_VALUE.getValue(), YbPayment.SELF_CASH_UNION_VALUE.getValue());
+                        YbPayment.SELF_CASH_ALI_VALUE.getValue(), YbPayment.SELF_CASH_UNION_VALUE.getValue(),
+                        CommonConstants.TableName.WOR_DEVICE_REQUEST);
         prescriptionDtoList.forEach(e -> {
             // 应收金额
             BigDecimal receivableAmount = e.getReceivableAmount();

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

@@ -73,10 +73,10 @@ public class OutpatientPricingAppServiceImpl implements IOutpatientPricingAppSer
         } else {
             adviceTypes = List.of(1, 2, 3);
         }
-        // 门诊划价：不要强制 pricingFlag=1 参与过滤（wor_activity_definition.pricing_flag 可能为 0），
+        String categoryCode = adviceBaseDto != null ? adviceBaseDto.getCategoryCode() : null;
-        // 否则会导致诊疗项目(adviceType=3)查询结果为空 records=[]
+        // 门诊划价：仅返回划价标记为“是”的项目
         return iDoctorStationAdviceAppService.getAdviceBaseInfo(adviceBaseDto, searchKey, locationId, null,
-            organizationId, pageNo, pageSize, null, adviceTypes, null);
+            organizationId, pageNo, pageSize, Whether.YES.getValue(), adviceTypes, null, categoryCode);
     }
 
 }

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

@@ -22,6 +22,10 @@ import com.openhis.common.enums.ybenums.YbPayment;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisPageUtils;
 import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.appointmentmanage.mapper.SchedulePoolMapper;
+import com.openhis.appointmentmanage.mapper.ScheduleSlotMapper;
+import com.openhis.clinical.domain.Order;
+import com.openhis.clinical.service.IOrderService;
 import com.openhis.financial.domain.PaymentReconciliation;
 import com.openhis.financial.domain.RefundLog;
 import com.openhis.financial.service.IRefundLogService;
@@ -48,6 +52,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.*;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
@@ -97,6 +102,15 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
     @Resource
     IRefundLogService iRefundLogService;
 
+    @Resource
+    IOrderService orderService;
+
+    @Resource
+    ScheduleSlotMapper scheduleSlotMapper;
+
+    @Resource
+    SchedulePoolMapper schedulePoolMapper;
+
     /**
      * 门诊挂号 - 查询患者信息
      *
@@ -291,6 +305,11 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
             }
         }
 
+        // 如果本次门诊挂号来自预约签到，同步把预约订单与号源槽位状态改为已退号
+        if (result != null && result.getCode() == 200) {
+            syncAppointmentReturnStatus(byId, cancelRegPaymentDto.getReason());
+        }
+
         // 记录退号日志
         recordRefundLog(cancelRegPaymentDto, byId, result, paymentRecon);
 
@@ -399,6 +418,74 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
         return R.ok("已取消挂号");
     }
 
+    /**
+     * 同步预约号源状态为已退号。
+     * 说明：
+     * 1) 门诊退号主流程不依赖该步骤成功与否，因此此方法内部异常仅记录日志，不向上抛出。
+     * 2) 通过患者、科室、日期以及状态筛选最近一条预约订单，尽量避免误匹配。
+     */
+    private void syncAppointmentReturnStatus(Encounter encounter, String reason) {
+        if (encounter == null || encounter.getPatientId() == null) {
+            return;
+        }
+        try {
+            LambdaQueryWrapper<Order> queryWrapper = new LambdaQueryWrapper<Order>()
+                .eq(Order::getPatientId, encounter.getPatientId())
+                .in(Order::getStatus, CommonConstants.AppointmentOrderStatus.BOOKED,
+                    CommonConstants.AppointmentOrderStatus.CHECKED_IN)
+                .orderByDesc(Order::getUpdateTime)
+                .orderByDesc(Order::getCreateTime)
+                .last("LIMIT 1");
+
+            if (encounter.getOrganizationId() != null) {
+                queryWrapper.eq(Order::getDepartmentId, encounter.getOrganizationId());
+            }
+            if (encounter.getTenantId() != null) {
+                queryWrapper.eq(Order::getTenantId, encounter.getTenantId());
+            }
+            if (encounter.getCreateTime() != null) {
+                LocalDate encounterDate = encounter.getCreateTime().toInstant()
+                    .atZone(ZoneId.systemDefault()).toLocalDate();
+                Date startOfDay = Date.from(encounterDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
+                Date nextDayStart = Date.from(encounterDate.plusDays(1).atStartOfDay(ZoneId.systemDefault()).toInstant());
+                queryWrapper.ge(Order::getAppointmentDate, startOfDay)
+                    .lt(Order::getAppointmentDate, nextDayStart);
+            }
+
+            Order appointmentOrder = orderService.getOne(queryWrapper, false);
+            if (appointmentOrder == null) {
+                return;
+            }
+
+            Date now = new Date();
+            if (!CommonConstants.AppointmentOrderStatus.RETURNED.equals(appointmentOrder.getStatus())) {
+                Order updateOrder = new Order();
+                updateOrder.setId(appointmentOrder.getId());
+                updateOrder.setStatus(CommonConstants.AppointmentOrderStatus.RETURNED);
+                updateOrder.setCancelTime(now);
+                updateOrder.setCancelReason(
+                    StringUtils.isNotEmpty(reason) ? reason : "门诊退号");
+                updateOrder.setUpdateTime(now);
+                orderService.updateById(updateOrder);
+            }
+
+            Long slotId = appointmentOrder.getSlotId();
+            if (slotId == null) {
+                return;
+            }
+
+            int slotRows = scheduleSlotMapper.updateSlotStatus(slotId, CommonConstants.SlotStatus.RETURNED);
+            if (slotRows > 0) {
+                Long poolId = scheduleSlotMapper.selectPoolIdBySlotId(slotId);
+                if (poolId != null) {
+                    schedulePoolMapper.refreshPoolStats(poolId);
+                }
+            }
+        } catch (Exception e) {
+            log.warn("同步预约号源已退号状态失败, encounterId={}", encounter.getId(), e);
+        }
+    }
+
     /**
      * 补打挂号
      * 补打挂号不需要修改数据库，只需要返回成功即可，前端已有所有需要的数据用于打印

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientPricingController.java

@@ -61,7 +61,12 @@ public class OutpatientPricingController {
         @RequestParam(value = "locationId", required = false) Long locationId,
         @RequestParam(value = "organizationId") Long organizationId,
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
-        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(value = "categoryCode", required = false) String categoryCode) {
+        // 将 categoryCode 设置到 adviceBaseDto 中
+        if (categoryCode != null && !categoryCode.isEmpty()) {
+            adviceBaseDto.setCategoryCode(categoryCode);
+        }
         return R.ok(iOutpatientPricingAppService.getAdviceBaseInfo(adviceBaseDto, searchKey, locationId, organizationId,
             pageNo, pageSize));
     }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientChargeAppMapper.java

@@ -42,19 +42,24 @@ public interface OutpatientChargeAppMapper {
      * @param medication 药品
      * @param device 耗材
      * @param register 挂号费
+     * @param westernMedicine 西药
+     * @param chinesePatentMedicine 中成药
      * @param planned 收费状态：待收费
      * @param billable 收费状态：待结算
      * @param billed 收费状态：已结算
      * @param refunding 收费状态：退费中
      * @param refunded 收费状态：全部退费
      * @param partRefund 收费状态：部分退费
+     * @param worDeviceRequest 耗材请求表名常量
      * @return 患者处方列表
      */
     List<EncounterPatientPrescriptionDto> selectEncounterPatientPrescription(@Param("encounterId") Long encounterId,
         @Param("activity") Integer activity, @Param("medication") Integer medication, @Param("device") Integer device,
-        @Param("register") Integer register, @Param("planned") Integer planned, @Param("billable") Integer billable,
+        @Param("register") Integer register, @Param("westernMedicine") Integer westernMedicine,
+        @Param("chinesePatentMedicine") Integer chinesePatentMedicine,
+        @Param("planned") Integer planned, @Param("billable") Integer billable,
         @Param("billed") Integer billed, @Param("refunding") Integer refunding, @Param("refunded") Integer refunded,
-        @Param("partRefund") Integer partRefund);
+        @Param("partRefund") Integer partRefund, @Param("worDeviceRequest") String worDeviceRequest);
 
     /**
      * 根据就诊id查询患者处方列表并新增字段：应收金额，实收金额，优惠金额，折扣率
@@ -75,6 +80,7 @@ public interface OutpatientChargeAppMapper {
      * @param selfVxCode 微信枚举码
      * @param selfAliCode 支付宝枚举码
      * @param selfUnionCode 银联枚举码
+     * @param worDeviceRequest 耗材请求表名常量
      * @return 患者处方列表
      */
     List<EncounterPatientPrescriptionDto> selectEncounterPatientPrescriptionWithPrice(
@@ -84,5 +90,5 @@ public interface OutpatientChargeAppMapper {
         @Param("refunding") Integer refunding, @Param("refunded") Integer refunded,
         @Param("partRefund") Integer partRefund, @Param("discountCode") Integer discountCode,
         @Param("self") Integer selfCode, @Param("selfVx") Integer selfVxCode, @Param("selfAli") Integer selfAliCode,
-        @Param("selfUnion") Integer selfUnionCode);
+        @Param("selfUnion") Integer selfUnionCode, @Param("worDeviceRequest") String worDeviceRequest);
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRegistrationAppMapper.java

@@ -51,11 +51,22 @@ public interface OutpatientRegistrationAppMapper {
 
     /**
      * 查询item绑定的信息(耗材或诊疗)
-     * 
+     *
      * @param itemId itemId
      * @param devActable 绑定的表名(耗材或诊疗)
      * @return item绑定的信息
      */
     List<ActivityDeviceDto> getTmpActivityList(@Param("itemId") String itemId, @Param("devActable") String devActable);
 
+    /**
+     * 根据用法代码查询绑定的耗材
+     *
+     * @param methodCode 用法代码
+     * @param devActTable 绑定的表名(耗材)
+     * @param typeCode 类型代码(1-用法绑定)
+     * @return 绑定的耗材列表
+     */
+    List<ActivityDeviceDto> getBoundDevicesByUsage(@Param("methodCode") String methodCode,
+            @Param("devActTable") String devActTable, @Param("typeCode") String typeCode);
+
 }

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

@@ -24,5 +24,5 @@ public interface ICheckMethodAppService{
 
     R<?> searchCheckMethodList(Integer pageNo, Integer pageSize, String checkType, String name, String packageName);
 
-    R<?> exportCheckMethod(String checkType, String name, String packageName, HttpServletResponse response);
+    void exportCheckMethod(String checkType, String name, String packageName, HttpServletResponse response);
 }

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

@@ -16,5 +16,5 @@ public interface ICheckPartAppService {
 
     R<?> searchCheckPartList(Integer pageNo, Integer pageSize, String checkType, String name, String packageName);
 
-    R<?> exportCheckPart(String checkType, String name, String packageName, HttpServletResponse response);
+    void exportCheckPart(String checkType, String name, String packageName, HttpServletResponse response);
 }

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

@@ -59,8 +59,10 @@ public class CheckMethodAppServiceImpl implements ICheckMethodAppService {
             return R.fail("检查方法的检查类型不能为空！");
         }
         //2.保存
-        boolean save = checkMethodService.save(checkMethod);
+        checkMethodService.save(checkMethod);
-        return R.ok(save);
+        java.util.Map<String, Object> result = new java.util.HashMap<>();
+        result.put("id", checkMethod.getId());
+        return R.ok(result);
     }
 
     @Override
@@ -87,7 +89,7 @@ public class CheckMethodAppServiceImpl implements ICheckMethodAppService {
     }
 
     @Override
-    public R<?> exportCheckMethod(String checkType, String name, String packageName, HttpServletResponse response) {
+    public void 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);
@@ -101,7 +103,13 @@ public class CheckMethodAppServiceImpl implements ICheckMethodAppService {
         List<CheckMethod> list = checkMethodService.list(wrapper);
         
         if (list.isEmpty()) {
-            return R.fail("导出Excel失败,无数据。");
+            try {
+                response.setContentType("application/json;charset=UTF-8");
+                response.getWriter().write("{\"code\":500,\"msg\":\"导出Excel失败,无数据。\"}");
+            } catch (IOException e) {
+                log.error("写入响应失败", e);
+            }
+            return;
         }
         
         try {
@@ -121,9 +129,12 @@ public class CheckMethodAppServiceImpl implements ICheckMethodAppService {
             ExcelFillerUtil.makeExcelFile(response, list, headers, excelName, null);
         } catch (IOException | IllegalAccessException e) {
             log.error("导出Excel失败", e);
-            return R.fail("导出Excel失败：" + e.getMessage());
+            try {
+                response.setContentType("application/json;charset=UTF-8");
+                response.getWriter().write("{\"code\":500,\"msg\":\"导出Excel失败：" + e.getMessage() + "\"}");
+            } catch (IOException ex) {
+                log.error("写入响应失败", ex);
+            }
         }
-
-        return R.ok(null, "导出Excel成功");
     }
 }

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

@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 /**
- * 检查套餐AppService实现
+ * 检查套餐 AppService 实现
  * 
  * @author system
  * @date 2025-11-26
@@ -35,6 +35,32 @@ public class CheckPackageAppServiceImpl implements ICheckPackageAppService {
     private final ICheckPackageService checkPackageService;
     private final ICheckPackageDetailService checkPackageDetailService;
 
+    /**
+     * 转换明细 DTO 列表为实体列表
+     * @param detailDtos 明细 DTO 列表
+     * @param packageId 套餐 ID
+     * @param orderNumStart 起始序号
+     * @return 明细实体列表
+     */
+    private List<CheckPackageDetail> convertToDetails(List<CheckPackageDetailDto> detailDtos, Long packageId, int orderNumStart) {
+        if (detailDtos == null || detailDtos.isEmpty()) {
+            return new ArrayList<>();
+        }
+        
+        List<CheckPackageDetail> details = new ArrayList<>();
+        int orderNum = orderNumStart;
+        for (CheckPackageDetailDto detailDto : detailDtos) {
+            CheckPackageDetail detail = new CheckPackageDetail();
+            BeanUtils.copyProperties(detailDto, detail);
+            detail.setPackageId(packageId);
+            detail.setOrderNum(orderNum++);
+            detail.setCreateTime(LocalDateTime.now());
+            detail.setUpdateTime(LocalDateTime.now());
+            details.add(detail);
+        }
+        return details;
+    }
+
     @Override
     public R<?> getCheckPackageList() {
         try {
@@ -61,7 +87,7 @@ public class CheckPackageAppServiceImpl implements ICheckPackageAppService {
                             .orderByAsc(CheckPackageDetail::getOrderNum)
             );
 
-            // 转换为DTO
+            // 转换为 DTO
             CheckPackageDto dto = new CheckPackageDto();
             BeanUtils.copyProperties(checkPackage, dto);
             
@@ -101,28 +127,21 @@ public class CheckPackageAppServiceImpl implements ICheckPackageAppService {
 
             // 保存套餐明细
             if (checkPackageDto.getItems() != null && !checkPackageDto.getItems().isEmpty()) {
-                List<CheckPackageDetail> details = new ArrayList<>();
+                List<CheckPackageDetail> details = convertToDetails(checkPackageDto.getItems(), checkPackage.getId(), 1);
-                int orderNum = 1;
+                boolean detailSaveResult = checkPackageDetailService.saveBatch(details);
-                for (CheckPackageDetailDto detailDto : checkPackageDto.getItems()) {
+                if (!detailSaveResult) {
-                    CheckPackageDetail detail = new CheckPackageDetail();
+                    throw new RuntimeException("保存套餐明细失败");
-                    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);
             
-            // 捕获PostgreSQL唯一约束冲突异常
+            // 捕获 PostgreSQL 唯一约束冲突异常
             String errorMessage = e.getMessage();
             if (errorMessage != null) {
-                // PostgreSQL唯一约束错误通常包含 "duplicate key value" 或约束名称
+                // PostgreSQL 唯一约束错误通常包含 "duplicate key value" 或约束名称
                 if (errorMessage.contains("duplicate key value") || 
                     errorMessage.contains("违反唯一约束") ||
                     errorMessage.contains("unique constraint")) {
@@ -135,7 +154,7 @@ public class CheckPackageAppServiceImpl implements ICheckPackageAppService {
                 }
             }
             
-            return R.fail("新增检查套餐失败: " + errorMessage);
+            return R.fail("新增检查套餐失败：" + errorMessage);
         }
     }
 
@@ -170,24 +189,14 @@ public class CheckPackageAppServiceImpl implements ICheckPackageAppService {
 
             // 保存新的套餐明细
             if (checkPackageDto.getItems() != null && !checkPackageDto.getItems().isEmpty()) {
-                List<CheckPackageDetail> details = new ArrayList<>();
+                List<CheckPackageDetail> details = convertToDetails(checkPackageDto.getItems(), checkPackage.getId(), 1);
-                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());
+            return R.fail("更新检查套餐失败：" + e.getMessage());
         }
     }
 
@@ -201,11 +210,14 @@ public class CheckPackageAppServiceImpl implements ICheckPackageAppService {
                 return R.fail("套餐不存在");
             }
 
-            // 删除套餐明细
+            // 删除套餐明细 - 先删除子表数据
-            checkPackageDetailService.remove(
+            boolean removeDetailsResult = checkPackageDetailService.remove(
                     new LambdaQueryWrapper<CheckPackageDetail>()
                             .eq(CheckPackageDetail::getPackageId, id)
             );
+            if (!removeDetailsResult) {
+                log.warn("删除套餐明细失败，套餐 ID: {}", id);
+            }
 
             // 删除套餐主表
             boolean deleteResult = checkPackageService.removeById(id);
@@ -213,11 +225,11 @@ public class CheckPackageAppServiceImpl implements ICheckPackageAppService {
                 return R.fail("删除套餐失败");
             }
 
+            log.info("删除检查套餐成功，套餐 ID: {}", id);
             return R.ok("删除成功");
         } catch (Exception e) {
             log.error("删除检查套餐失败", e);
-            return R.fail("删除检查套餐失败: " + e.getMessage());
+            return R.fail("删除检查套餐失败：" + e.getMessage());
         }
     }
 }
-

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

@@ -65,7 +65,7 @@ public class CheckPartAppServiceImpl implements ICheckPartAppService {
     }
 
     @Override
-    public R<?> exportCheckPart(String checkType, String name, String packageName, HttpServletResponse response) {
+    public void 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);
@@ -79,7 +79,13 @@ public class CheckPartAppServiceImpl implements ICheckPartAppService {
         List<CheckPart> list = checkPartService.list(wrapper);
 
         if (list.isEmpty()) {
-            return R.fail("导出Excel失败,无数据。");
+            try {
+                response.setContentType("application/json;charset=UTF-8");
+                response.getWriter().write("{\"code\":500,\"msg\":\"导出Excel失败,无数据。\"}");
+            } catch (IOException e) {
+                log.error("写入响应失败", e);
+            }
+            return;
         }
 
         try {
@@ -102,8 +108,12 @@ public class CheckPartAppServiceImpl implements ICheckPartAppService {
             ExcelFillerUtil.makeExcelFile(response, list, headers, excelName, null);
         } catch (IOException | IllegalAccessException e) {
             log.error("导出Excel失败", e);
-            return R.fail("导出Excel失败：" + e.getMessage());
+            try {
+                response.setContentType("application/json;charset=UTF-8");
+                response.getWriter().write("{\"code\":500,\"msg\":\"导出Excel失败：" + e.getMessage() + "\"}");
+            } catch (IOException ex) {
+                log.error("写入响应失败", ex);
+            }
         }
-        return R.ok(null, "导出Excel成功");
     }
 }

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

@@ -48,6 +48,16 @@ public class CheckTypeController extends BaseController {
     private final ICheckPackageDetailService checkPackageDetailService;
     private final ICheckPackageAppService checkPackageAppService;
 
+    /**
+     * 获取所有检查类型列表（不分页，用于下拉选项）
+     */
+    @GetMapping("/all")
+    public AjaxResult getAllCheckTypes() {
+        List<CheckType> list = checkTypeService.list(
+                new QueryWrapper<CheckType>().orderByAsc("id"));
+        return AjaxResult.success(list);
+    }
+
     /**
      * 获取检查类型列表（支持分页）
      */

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

@@ -49,6 +49,9 @@ public class CheckPackageDetailDto {
     @NotNull(message = "数量不能为空")
     private Integer quantity;
 
+    /** 单位 */
+    private String unit;
+
     /** 单价 */
     @NotNull(message = "单价不能为空")
     private BigDecimal unitPrice;

openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java

@@ -343,11 +343,28 @@ public class SurgeryAppServiceImpl implements ISurgeryAppService {
         serviceRequest.setEncounterId(surgeryDto.getEncounterId()); // 就诊id
         serviceRequest.setAuthoredTime(curDate); // 请求签发时间
         serviceRequest.setOrgId(orgId); // 执行科室
+        // 🔧 BugFix#318: 设置 contentJson，包含手术名称
+        Map<String, String> serviceContentMap = new HashMap<>();
+        String surgeryNameFromDto = surgeryDto.getSurgeryName();
+        String surgeryCodeFromDto = surgeryDto.getSurgeryCode();
+        log.info("【DEBUG】surgeryName from DTO: {}", surgeryNameFromDto);
+        log.info("【DEBUG】surgeryCode from DTO: {}", surgeryCodeFromDto);
+        serviceContentMap.put("surgeryName", surgeryNameFromDto != null ? surgeryNameFromDto : "");
+        serviceContentMap.put("surgeryCode", surgeryCodeFromDto != null ? surgeryCodeFromDto : "");
+        try {
+            String contentJson = new ObjectMapper().writeValueAsString(serviceContentMap);
+            log.info("【DEBUG】Setting contentJson: {}", contentJson);
+            serviceRequest.setContentJson(contentJson);
+        } catch (JsonProcessingException e) {
+            log.error("【DEBUG】设置手术医嘱 contentJson 失败", e);
+        }
         serviceRequestService.save(serviceRequest);
+        log.info("【DEBUG】Saved serviceRequest with ID: {}, contentJson: {}", 
+                serviceRequest.getId(), serviceRequest.getContentJson());
 
         // 生成收费项目
         ChargeItem chargeItem = new ChargeItem();
-        chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 收费状态
+        chargeItem.setStatusEnum(ChargeItemStatus.PLANNED.getValue()); // 收费状态：待收费
         chargeItem.setBusNo("CI" + serviceRequest.getBusNo());
         chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
         chargeItem.setPatientId(surgeryDto.getPatientId()); // 患者
@@ -541,15 +558,33 @@ public class SurgeryAppServiceImpl implements ISurgeryAppService {
         // 收集所有需要查询的ID
         Set<Long> practitionerIds = new HashSet<>();
         Set<Long> orgIds = new HashSet<>();
-        Set<Long> otherIds = new HashSet<>();
+        Set<Long> userIds = new HashSet<>(); // 用于查询sys_user表
 
-        // 收集Practitioner IDs
+        // 收集Practitioner IDs (医生相关)
-        if (surgery.getMainSurgeonId() != null) practitionerIds.add(surgery.getMainSurgeonId());
+        if (surgery.getMainSurgeonId() != null) {
-        if (surgery.getAnesthetistId() != null) practitionerIds.add(surgery.getAnesthetistId());
+            practitionerIds.add(surgery.getMainSurgeonId());
-        if (surgery.getAssistant1Id() != null) practitionerIds.add(surgery.getAssistant1Id());
+            userIds.add(surgery.getMainSurgeonId());
-        if (surgery.getAssistant2Id() != null) practitionerIds.add(surgery.getAssistant2Id());
+        }
-        if (surgery.getScrubNurseId() != null) practitionerIds.add(surgery.getScrubNurseId());
+        if (surgery.getAnesthetistId() != null) {
-        if (surgery.getApplyDoctorId() != null) practitionerIds.add(surgery.getApplyDoctorId());
+            practitionerIds.add(surgery.getAnesthetistId());
+            userIds.add(surgery.getAnesthetistId());
+        }
+        if (surgery.getAssistant1Id() != null) {
+            practitionerIds.add(surgery.getAssistant1Id());
+            userIds.add(surgery.getAssistant1Id());
+        }
+        if (surgery.getAssistant2Id() != null) {
+            practitionerIds.add(surgery.getAssistant2Id());
+            userIds.add(surgery.getAssistant2Id());
+        }
+        if (surgery.getScrubNurseId() != null) {
+            practitionerIds.add(surgery.getScrubNurseId());
+            userIds.add(surgery.getScrubNurseId());
+        }
+        if (surgery.getApplyDoctorId() != null) {
+            practitionerIds.add(surgery.getApplyDoctorId());
+            userIds.add(surgery.getApplyDoctorId());
+        }
 
         // 收集Organization IDs
         if (surgery.getOrgId() != null) orgIds.add(surgery.getOrgId());
@@ -558,69 +593,151 @@ public class SurgeryAppServiceImpl implements ISurgeryAppService {
         // 批量查询并缓存结果
         Map<Long, String> practitionerNameMap = new HashMap<>();
         Map<Long, String> orgNameMap = new HashMap<>();
+        Map<Long, String> userNameMap = new HashMap<>(); // 从sys_user查询的名称
 
         // 批量查询Practitioner
         if (!practitionerIds.isEmpty()) {
-            List<com.openhis.administration.domain.Practitioner> practitioners = practitionerService.listByIds(practitionerIds);
+            try {
-            for (com.openhis.administration.domain.Practitioner p : practitioners) {
+                List<com.openhis.administration.domain.Practitioner> practitioners = practitionerService.listByIds(practitionerIds);
-                practitionerNameMap.put(p.getId(), p.getName());
+                for (com.openhis.administration.domain.Practitioner p : practitioners) {
+                    if (p.getName() != null && !p.getName().isEmpty()) {
+                        practitionerNameMap.put(p.getId(), p.getName());
+                    }
+                }
+            } catch (Exception e) {
+                log.warn("查询Practitioner名称失败: {}", e.getMessage());
+            }
+        }
+
+        // 批量查询SysUser (作为备选) - 使用逐个查询
+        if (!userIds.isEmpty()) {
+            try {
+                for (Long userId : userIds) {
+                    SysUser u = sysUserService.selectUserById(userId);
+                    if (u != null) {
+                        String userName = u.getNickName() != null && !u.getNickName().isEmpty() 
+                            ? u.getNickName() 
+                            : u.getUserName();
+                        if (userName != null && !userName.isEmpty()) {
+                            userNameMap.put(u.getUserId(), userName);
+                        }
+                    }
+                }
+            } catch (Exception e) {
+                log.warn("查询SysUser名称失败: {}", e.getMessage());
             }
         }
 
         // 批量查询Organization
         if (!orgIds.isEmpty()) {
-            List<Organization> orgs = organizationService.listByIds(orgIds);
+            try {
-            for (Organization o : orgs) {
+                List<Organization> orgs = organizationService.listByIds(orgIds);
-                orgNameMap.put(o.getId(), o.getName());
+                for (Organization o : orgs) {
+                    if (o.getName() != null && !o.getName().isEmpty()) {
+                        orgNameMap.put(o.getId(), o.getName());
+                    }
+                }
+            } catch (Exception e) {
+                log.warn("查询Organization名称失败: {}", e.getMessage());
             }
         }
 
         // 填充患者姓名
         if (surgery.getPatientId() != null && surgery.getPatientName() == null) {
-            Patient patient = patientService.getById(surgery.getPatientId());
+            try {
-            if (patient != null) {
+                Patient patient = patientService.getById(surgery.getPatientId());
-                surgery.setPatientName(patient.getName());
+                if (patient != null) {
+                    surgery.setPatientName(patient.getName());
+                }
+            } catch (Exception e) {
+                log.warn("查询患者名称失败: {}", e.getMessage());
             }
         }
 
-        // 使用缓存填充名称
+        // 填充医生名称 - 优先使用practitioner，如果不存在则使用sys_user
         if (surgery.getMainSurgeonId() != null && surgery.getMainSurgeonName() == null) {
-            surgery.setMainSurgeonName(practitionerNameMap.get(surgery.getMainSurgeonId()));
+            String name = practitionerNameMap.get(surgery.getMainSurgeonId());
+            if (name == null || name.isEmpty()) {
+                name = userNameMap.get(surgery.getMainSurgeonId());
+            }
+            if (name != null && !name.isEmpty()) {
+                surgery.setMainSurgeonName(name);
+            }
         }
         if (surgery.getAnesthetistId() != null && surgery.getAnesthetistName() == null) {
-            surgery.setAnesthetistName(practitionerNameMap.get(surgery.getAnesthetistId()));
+            String name = practitionerNameMap.get(surgery.getAnesthetistId());
+            if (name == null || name.isEmpty()) {
+                name = userNameMap.get(surgery.getAnesthetistId());
+            }
+            if (name != null && !name.isEmpty()) {
+                surgery.setAnesthetistName(name);
+            }
         }
         if (surgery.getAssistant1Id() != null && surgery.getAssistant1Name() == null) {
-            surgery.setAssistant1Name(practitionerNameMap.get(surgery.getAssistant1Id()));
+            String name = practitionerNameMap.get(surgery.getAssistant1Id());
+            if (name == null || name.isEmpty()) {
+                name = userNameMap.get(surgery.getAssistant1Id());
+            }
+            if (name != null && !name.isEmpty()) {
+                surgery.setAssistant1Name(name);
+            }
         }
         if (surgery.getAssistant2Id() != null && surgery.getAssistant2Name() == null) {
-            surgery.setAssistant2Name(practitionerNameMap.get(surgery.getAssistant2Id()));
+            String name = practitionerNameMap.get(surgery.getAssistant2Id());
+            if (name == null || name.isEmpty()) {
+                name = userNameMap.get(surgery.getAssistant2Id());
+            }
+            if (name != null && !name.isEmpty()) {
+                surgery.setAssistant2Name(name);
+            }
         }
         if (surgery.getScrubNurseId() != null && surgery.getScrubNurseName() == null) {
-            surgery.setScrubNurseName(practitionerNameMap.get(surgery.getScrubNurseId()));
+            String name = practitionerNameMap.get(surgery.getScrubNurseId());
+            if (name == null || name.isEmpty()) {
+                name = userNameMap.get(surgery.getScrubNurseId());
+            }
+            if (name != null && !name.isEmpty()) {
+                surgery.setScrubNurseName(name);
+            }
         }
         if (surgery.getApplyDoctorId() != null && surgery.getApplyDoctorName() == null) {
-            surgery.setApplyDoctorName(practitionerNameMap.get(surgery.getApplyDoctorId()));
+            String name = practitionerNameMap.get(surgery.getApplyDoctorId());
+            if (name == null || name.isEmpty()) {
+                name = userNameMap.get(surgery.getApplyDoctorId());
+            }
+            if (name != null && !name.isEmpty()) {
+                surgery.setApplyDoctorName(name);
+            }
         }
 
         // 填充手术室名称
         if (surgery.getOperatingRoomId() != null && surgery.getOperatingRoomName() == null) {
-            OperatingRoom operatingRoom = operatingRoomService.getById(surgery.getOperatingRoomId());
+            try {
-            if (operatingRoom != null) {
+                OperatingRoom operatingRoom = operatingRoomService.getById(surgery.getOperatingRoomId());
-                surgery.setOperatingRoomName(operatingRoom.getName());
+                if (operatingRoom != null) {
+                    surgery.setOperatingRoomName(operatingRoom.getName());
+                }
+            } catch (Exception e) {
+                log.warn("查询手术室名称失败: {}", e.getMessage());
             }
         }
 
         // 使用缓存填充组织名称
         if (surgery.getOrgId() != null && surgery.getOrgName() == null) {
-            surgery.setOrgName(orgNameMap.get(surgery.getOrgId()));
+            String name = orgNameMap.get(surgery.getOrgId());
+            if (name != null && !name.isEmpty()) {
+                surgery.setOrgName(name);
+            }
         }
         if (surgery.getApplyDeptId() != null && surgery.getApplyDeptName() == null) {
-            surgery.setApplyDeptName(orgNameMap.get(surgery.getApplyDeptId()));
+            String name = orgNameMap.get(surgery.getApplyDeptId());
+            if (name != null && !name.isEmpty()) {
+                surgery.setApplyDeptName(name);
+            }
         }
 
-        log.debug("填充手术名称字段完成 - patientName: {}, mainSurgeonName: {}, orgName: {}",
+        log.debug("填充手术名称字段完成 - patientName: {}, mainSurgeonName: {}, applyDeptName: {}",
-            surgery.getPatientName(), surgery.getMainSurgeonName(), surgery.getOrgName());
+            surgery.getPatientName(), surgery.getMainSurgeonName(), surgery.getApplyDeptName());
     }
 
     /**

openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgicalScheduleAppServiceImpl.java

@@ -1,12 +1,16 @@
 package com.openhis.web.clinicalmanage.appservice.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.core.domain.model.LoginUser;
 import com.core.common.utils.SecurityUtils;
 import com.openhis.administration.domain.Patient;
+import com.openhis.administration.service.IOrganizationService;
 import com.openhis.administration.service.IPatientService;
+import com.openhis.clinical.domain.Surgery;
+import com.openhis.clinical.service.ISurgeryService;
 import com.openhis.surgicalschedule.domain.OpSchedule;
 import com.openhis.surgicalschedule.service.IOpScheduleService;
 import com.openhis.web.clinicalmanage.appservice.ISurgicalScheduleAppService;
@@ -29,6 +33,8 @@ import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
+import static com.core.framework.datasource.DynamicDataSourceContextHolder.log;
+
 /**
  * 手术安排业务层实现类
  *
@@ -47,6 +53,15 @@ public class SurgicalScheduleAppServiceImpl implements ISurgicalScheduleAppServi
     @Resource
     private SurgicalScheduleAppMapper surgicalScheduleAppMapper;
 
+    @Resource
+    private ISurgeryService surgeryService;
+
+    @Resource
+    private com.openhis.administration.service.IOrganizationService organizationService;
+
+    @Resource
+    private com.core.system.service.ISysUserService sysUserService;
+
 
     @Resource
     private RequestFormManageAppMapper requestFormManageAppMapper;
@@ -94,13 +109,31 @@ public class SurgicalScheduleAppServiceImpl implements ISurgicalScheduleAppServi
                 return R.fail("患者信息不存在");
             }
         }
-        //校验该时段内手术间是否被占用
+
-        LocalDateTime scheduleDate = opCreateScheduleDto.getEntryTime();//入室时间
+        // 校验是否重复手术安排（必须在校验手术间占用之前执行，确保能正确返回重复错误）
-        String roomCode = opCreateScheduleDto.getRoomCode();//手术室编号
+        // 同一患者 + 同一手术单号 + 同一手术名称 只能有一条有效安排记录
+        if (opCreateScheduleDto.getPatientId() != null
+                && opCreateScheduleDto.getOperCode() != null && !opCreateScheduleDto.getOperCode().isEmpty()
+                && opCreateScheduleDto.getOperName() != null && !opCreateScheduleDto.getOperName().isEmpty()) {
+            Boolean existsDuplicate = surgicalScheduleAppMapper.existsDuplicateSchedule(
+                    opCreateScheduleDto.getPatientId(),
+                    opCreateScheduleDto.getOperCode(),
+                    opCreateScheduleDto.getOperName()
+            );
+            if (existsDuplicate != null && existsDuplicate) {
+                return R.fail("该患者此手术单号已存在手术安排，请勿重复提交");
+            }
+        }
+
+        // 校验该时段内手术间是否被占用
+        LocalDateTime startTime = opCreateScheduleDto.getEntryTime();//入室时间
         LocalDateTime endTime = opCreateScheduleDto.getEndTime();//手术结束时间
-        Boolean scheduleConflict = surgicalScheduleAppMapper.isScheduleConflict(scheduleDate, endTime, roomCode);
+        String roomCode = opCreateScheduleDto.getRoomCode();//手术室编号
-        if (scheduleConflict) {
+        if (startTime != null && endTime != null && roomCode != null && !roomCode.isEmpty()) {
-            return R.fail("该时段内手术间被占用");
+            Boolean scheduleConflict = surgicalScheduleAppMapper.isScheduleConflict(startTime, endTime, roomCode);
+            if (scheduleConflict != null && scheduleConflict) {
+                return R.fail("该时段内手术间被占用");
+            }
         }
 
         LoginUser loginUser = new LoginUser();
@@ -113,6 +146,44 @@ public class SurgicalScheduleAppServiceImpl implements ISurgicalScheduleAppServi
         OpSchedule opSchedule = new OpSchedule();
         BeanUtils.copyProperties(opCreateScheduleDto, opSchedule);
 
+        // 处理可能为null的字符串字段，设置默认值为空字符串
+        if (opSchedule.getPreoperativeDiagnosis() == null) {
+            opSchedule.setPreoperativeDiagnosis("");
+        }
+        if (opSchedule.getPostoperativeDiagnosis() == null) {
+            opSchedule.setPostoperativeDiagnosis("");
+        }
+        if (opSchedule.getAnesMethod() == null) {
+            opSchedule.setAnesMethod("");
+        }
+        if (opSchedule.getAnesDoctor1Code() == null) {
+            opSchedule.setAnesDoctor1Code("");
+        }
+        if (opSchedule.getAnesDoctor2Code() == null) {
+            opSchedule.setAnesDoctor2Code("");
+        }
+        if (opSchedule.getAnesDoctor3Code() == null) {
+            opSchedule.setAnesDoctor3Code("");
+        }
+        if (opSchedule.getScrubNurseCode() == null) {
+            opSchedule.setScrubNurseCode("");
+        }
+        if (opSchedule.getCircuNurse1Code() == null) {
+            opSchedule.setCircuNurse1Code("");
+        }
+        if (opSchedule.getCircuNurse2Code() == null) {
+            opSchedule.setCircuNurse2Code("");
+        }
+        if (opSchedule.getScrubNurse1Code() == null) {
+            opSchedule.setScrubNurse1Code("");
+        }
+        if (opSchedule.getScrubNurse2Code() == null) {
+            opSchedule.setScrubNurse2Code("");
+        }
+        if (opSchedule.getSurgeonCode() == null) {
+            opSchedule.setSurgeonCode("");
+        }
+
         // 设置创建者ID
         opSchedule.setCreatorId(userId);
         //设置创建人名称
@@ -127,12 +198,34 @@ public class SurgicalScheduleAppServiceImpl implements ISurgicalScheduleAppServi
 
         // 保存手术安排
         boolean saved = opScheduleService.save(opSchedule);
-        //修改申请单状态为已排期
-
         if (!saved) {
             return R.fail("新增手术安排失败");
         }
 
+        // Bug #247 修复：更新手术申请单状态为已排期 (1)
+        if (opCreateScheduleDto.getApplyId() != null) {
+            try {
+                // 通过手术单号查找手术申请记录并更新状态
+                LambdaQueryWrapper<com.openhis.clinical.domain.Surgery> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(com.openhis.clinical.domain.Surgery::getSurgeryNo, opSchedule.getOperCode())
+                           .eq(com.openhis.clinical.domain.Surgery::getDeleteFlag, "0");
+                com.openhis.clinical.domain.Surgery surgery = surgeryService.getOne(queryWrapper);
+                if (surgery != null) {
+                    surgery.setStatusEnum(1); // 1 = 已排期
+                    surgery.setUpdateTime(new Date());
+                    
+                    // 填充缺失的申请科室和主刀医生名称
+                    fillSurgeryMissingNames(surgery);
+                    
+                    surgeryService.updateById(surgery);
+                    log.info("更新手术申请单状态为已排期 - surgeryNo: {}, surgeryId: {}", opSchedule.getOperCode(), surgery.getId());
+                }
+            } catch (Exception e) {
+                log.error("更新手术申请单状态失败 - operCode: {}", opSchedule.getOperCode(), e);
+                // 状态更新失败不影响主流程，只记录日志
+            }
+        }
+
         return R.ok("新增手术安排成功");
     }
 
@@ -158,6 +251,44 @@ public class SurgicalScheduleAppServiceImpl implements ISurgicalScheduleAppServi
         OpSchedule opSchedule = new OpSchedule();
         BeanUtils.copyProperties(opScheduleDto, opSchedule);
 
+        // 处理可能为null的字符串字段，设置默认值为空字符串
+        if (opSchedule.getPreoperativeDiagnosis() == null) {
+            opSchedule.setPreoperativeDiagnosis("");
+        }
+        if (opSchedule.getPostoperativeDiagnosis() == null) {
+            opSchedule.setPostoperativeDiagnosis("");
+        }
+        if (opSchedule.getAnesMethod() == null) {
+            opSchedule.setAnesMethod("");
+        }
+        if (opSchedule.getAnesDoctor1Code() == null) {
+            opSchedule.setAnesDoctor1Code("");
+        }
+        if (opSchedule.getAnesDoctor2Code() == null) {
+            opSchedule.setAnesDoctor2Code("");
+        }
+        if (opSchedule.getAnesDoctor3Code() == null) {
+            opSchedule.setAnesDoctor3Code("");
+        }
+        if (opSchedule.getScrubNurseCode() == null) {
+            opSchedule.setScrubNurseCode("");
+        }
+        if (opSchedule.getCircuNurse1Code() == null) {
+            opSchedule.setCircuNurse1Code("");
+        }
+        if (opSchedule.getCircuNurse2Code() == null) {
+            opSchedule.setCircuNurse2Code("");
+        }
+        if (opSchedule.getScrubNurse1Code() == null) {
+            opSchedule.setScrubNurse1Code("");
+        }
+        if (opSchedule.getScrubNurse2Code() == null) {
+            opSchedule.setScrubNurse2Code("");
+        }
+        if (opSchedule.getSurgeonCode() == null) {
+            opSchedule.setSurgeonCode("");
+        }
+
         // 更新时间
         opSchedule.setUpdateTime(new Date());
 
@@ -226,21 +357,21 @@ public class SurgicalScheduleAppServiceImpl implements ISurgicalScheduleAppServi
             int index = 0;
             for (OpScheduleDto schedule : scheduleList) {
                 index++;
-                
+
                 // 转换手术类型
                 String surgeryType = convertSurgeryNature(schedule.getSurgeryNature());
-                
+
                 // 转换麻醉方法
                 String anesthesiaMethod = convertAnesMethod(schedule.getAnesMethod());
-                
+
                 // 格式化安排时间
                 String formattedDate = formatScheduleDate(schedule.getScheduleDate());
-                
+
                 writer.printf("%d,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s\n",
                     index, // 序号从1开始
                     schedule.getOrgName() != null ? schedule.getOrgName() : "",
                     schedule.getPatientName() != null ? schedule.getPatientName() : "",
-                    schedule.getVisitId() != null ? schedule.getVisitId().toString() : "",
+                    schedule.getIdentifierNo() != null ? schedule.getIdentifierNo() : "",
                     schedule.getOperCode() != null ? schedule.getOperCode() : "",
                     schedule.getOperName() != null ? schedule.getOperName() : "",
                     schedule.getApplyDeptName() != null ? schedule.getApplyDeptName() : "",
@@ -293,10 +424,84 @@ public class SurgicalScheduleAppServiceImpl implements ISurgicalScheduleAppServi
     /**
      * 格式化安排时间
      */
-    private String formatScheduleDate(LocalDate scheduleDate) {
+    private String formatScheduleDate(LocalDateTime scheduleDate) {
         if (scheduleDate == null) return "";
         
-        // 格式化为 yyyy-MM-dd
+        // 格式化为 yyyy-MM-dd HH:mm:ss
-        return scheduleDate.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        return scheduleDate.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+    }
+
+    /**
+     * 填充手术申请中缺失的名称字段
+     * 在创建手术安排时调用，确保关联的cli_surgery表中的名称字段有值
+     *
+     * @param surgery 手术申请对象
+     */
+    private void fillSurgeryMissingNames(com.openhis.clinical.domain.Surgery surgery) {
+        // 填充申请科室名称
+        if ((surgery.getApplyDeptName() == null || surgery.getApplyDeptName().isEmpty()) 
+                && surgery.getApplyDeptId() != null) {
+            try {
+                com.openhis.administration.domain.Organization org = organizationService.getById(surgery.getApplyDeptId());
+                if (org != null && org.getName() != null) {
+                    surgery.setApplyDeptName(org.getName());
+                    log.info("填充申请科室名称 - surgeryId: {}, deptId: {}, deptName: {}", 
+                        surgery.getId(), surgery.getApplyDeptId(), org.getName());
+                }
+            } catch (Exception e) {
+                log.warn("查询申请科室名称失败 - deptId: {}, error: {}", surgery.getApplyDeptId(), e.getMessage());
+            }
+        }
+
+        // 填充主刀医生名称
+        if ((surgery.getMainSurgeonName() == null || surgery.getMainSurgeonName().isEmpty()) 
+                && surgery.getMainSurgeonId() != null) {
+            try {
+                com.core.common.core.domain.entity.SysUser user = sysUserService.selectUserById(surgery.getMainSurgeonId());
+                if (user != null) {
+                    String surgeonName = user.getNickName() != null && !user.getNickName().isEmpty() 
+                        ? user.getNickName() 
+                        : user.getUserName();
+                    if (surgeonName != null) {
+                        surgery.setMainSurgeonName(surgeonName);
+                        log.info("填充主刀医生名称 - surgeryId: {}, surgeonId: {}, surgeonName: {}", 
+                            surgery.getId(), surgery.getMainSurgeonId(), surgeonName);
+                    }
+                }
+            } catch (Exception e) {
+                log.warn("查询主刀医生名称失败 - surgeonId: {}, error: {}", surgery.getMainSurgeonId(), e.getMessage());
+            }
+        }
+
+        // 填充麻醉医生名称
+        if ((surgery.getAnesthetistName() == null || surgery.getAnesthetistName().isEmpty()) 
+                && surgery.getAnesthetistId() != null) {
+            try {
+                com.core.common.core.domain.entity.SysUser user = sysUserService.selectUserById(surgery.getAnesthetistId());
+                if (user != null) {
+                    String anesthetistName = user.getNickName() != null && !user.getNickName().isEmpty() 
+                        ? user.getNickName() 
+                        : user.getUserName();
+                    if (anesthetistName != null) {
+                        surgery.setAnesthetistName(anesthetistName);
+                    }
+                }
+            } catch (Exception e) {
+                log.warn("查询麻醉医生名称失败 - anesthetistId: {}, error: {}", surgery.getAnesthetistId(), e.getMessage());
+            }
+        }
+
+        // 填充执行科室名称
+        if ((surgery.getOrgName() == null || surgery.getOrgName().isEmpty()) 
+                && surgery.getOrgId() != null) {
+            try {
+                com.openhis.administration.domain.Organization org = organizationService.getById(surgery.getOrgId());
+                if (org != null && org.getName() != null) {
+                    surgery.setOrgName(org.getName());
+                }
+            } catch (Exception e) {
+                log.warn("查询执行科室名称失败 - orgId: {}, error: {}", surgery.getOrgId(), e.getMessage());
+            }
+        }
     }
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpCreateScheduleDto.java

@@ -24,6 +24,11 @@ public class OpCreateScheduleDto {
      */
     private Long visitId;
 
+    /**
+     * 就诊卡号
+     */
+    private String identifierNo;
+
     /**
      * 手术编码
      */
@@ -45,9 +50,10 @@ public class OpCreateScheduleDto {
     private String postoperativeDiagnosis;
 
     /**
-     * 手术安排日期
+     * 手术安排日期时间
      */
-    private LocalDate scheduleDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime scheduleDate;
 
     /**
      * 手术台次序号
@@ -82,11 +88,13 @@ public class OpCreateScheduleDto {
     /**
      * 入院时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime admissionTime;
 
     /**
      * 入手术室时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime entryTime;
 
     /**
@@ -167,21 +175,25 @@ public class OpCreateScheduleDto {
     /**
      * 手术开始时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startTime;
 
     /**
      * 手术结束时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endTime;
 
     /**
      * 麻醉开始时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime anesStart;
 
     /**
      * 麻醉结束时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime anesEnd;
 
     /**

openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpScheduleDto.java

@@ -1,8 +1,10 @@
 package com.openhis.web.clinicalmanage.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.openhis.surgicalschedule.domain.OpSchedule;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
 
@@ -17,6 +19,20 @@ import java.time.LocalDate;
 @EqualsAndHashCode(callSuper = true)
 public class OpScheduleDto extends OpSchedule {
 
+    /**
+     * 手术安排日期开始（查询用）
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate scheduleDateStart;
+
+    /**
+     * 手术安排日期结束（查询用）
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate scheduleDateEnd;
+
     /**
      * 患者姓名
      */
@@ -27,6 +43,11 @@ public class OpScheduleDto extends OpSchedule {
      */
     private Long encounterId;
 
+    /**
+     * 就诊卡号
+     */
+    private String patientCardNo;
+
     /**
      * 性别
      */
@@ -55,6 +76,7 @@ public class OpScheduleDto extends OpSchedule {
     /**
      * 申请时间开始
      */
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
     private String applyTime;
 
     /**

openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/SurgeryDto.java

@@ -45,6 +45,9 @@ public class SurgeryDto {
     /** 就诊流水号 */
     private String encounterNo;
 
+    /** 就诊卡号 */
+    private String patientCardNo;
+
     /** 申请医生ID */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long applyDoctorId;

openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/mapper/SurgicalScheduleAppMapper.java

@@ -58,4 +58,14 @@ public interface SurgicalScheduleAppMapper {
      * @return 是否存在冲突的手术安排
      */
     Boolean isScheduleConflict(LocalDateTime startTime, LocalDateTime endTime, String surgeryRoomId);
+
+    /**
+     * 检查是否存在重复的手术安排
+     *
+     * @param patientId 患者ID
+     * @param operCode 手术单号
+     * @param operName 手术名称
+     * @return 是否存在重复记录
+     */
+    Boolean existsDuplicateSchedule(@Param("patientId") Long patientId, @Param("operCode") String operCode, @Param("operName") String operName);
 }