chore(dev): 添加代码格式化工具 prettier

- 在 package.json 中添加 format 脚本用于代码格式化
- 安装 prettier 依赖到项目中
- 配置 prettier 支持 vue js ts jsx tsx scss css json 文件格式化

MD/bugs/BUG_503_ANALYSIS.md

@@ -0,0 +1,15 @@
+# Bug #503 分析报告
+
+## 基本信息
+- Bug ID: 503
+- 标题: 【住院发退药】发药明细与发药汇总单数据触发时机不一致，存在业务脱节风险
+- 严重程度: 3
+- 模块: 
+
+## 根因分析
+（待深入分析）
+
+## 修复方案
+（待分析后确定）
+
+FIXER_ID: guanyu

MD/bugs/BUG_606_ANALYSIS.md

@@ -0,0 +1,15 @@
+# Bug #606 分析报告
+
+## 基本信息
+- Bug ID: 606
+- 标题: 门诊术中安排-医嘱】预览列表字段显示及逻辑异常（涉及单位、频次、执行时间）
+- 严重程度: 3
+- 模块: 
+
+## 根因分析
+（待深入分析）
+
+## 修复方案
+（待分析后确定）
+
+FIXER_ID: zhaoyun

MD/bugs/BUG_611_ANALYSIS.md

@@ -0,0 +1,15 @@
+# Bug #611 分析报告
+
+## 基本信息
+- Bug ID: 611
+- 标题: 【住院护士站-住院记账】“补费”弹窗确认按钮位置过深且未固定，建议将核心操作与汇总信息上移
+- 严重程度: 3
+- 模块: 
+
+## 根因分析
+（待深入分析）
+
+## 修复方案
+（待分析后确定）
+
+FIXER_ID: zhaoyun

MD/bugs/BUG_613_ANALYSIS.md

@@ -0,0 +1,15 @@
+# Bug #613 分析报告
+
+## 基本信息
+- Bug ID: 613
+- 标题: 【医嘱校对/住院医生工作站】医嘱“退回”流程缺失反馈机制：护士端退回无原因录入，医生端缺失原因显示
+- 严重程度: 3
+- 模块: 
+
+## 根因分析
+（待深入分析）
+
+## 修复方案
+（待分析后确定）
+
+FIXER_ID: zhaoyun

MD/bugs/BUG_616_ANALYSIS.md

@@ -0,0 +1,15 @@
+# Bug #616 分析报告
+
+## 基本信息
+- Bug ID: 616
+- 标题: 【住院医生工作站-临床医嘱】医嘱录入频次下拉框缺少英文缩写（字典键值）显示，不符合临床书写习惯
+- 严重程度: 3
+- 模块: 
+
+## 根因分析
+（待深入分析）
+
+## 修复方案
+（待分析后确定）
+
+FIXER_ID: zhaoyun

MD/bugs/BUG_617_ANALYSIS.md

@@ -0,0 +1,15 @@
+# Bug #617 分析报告
+
+## 基本信息
+- Bug ID: 617
+- 标题: [住院登记] “费用性质”字段保存逻辑错误（登记选择医保保存后变为全自费）
+- 严重程度: 3
+- 模块: 
+
+## 根因分析
+（待深入分析）
+
+## 修复方案
+（待分析后确定）
+
+FIXER_ID: guanyu

MD/bugs/BUG_637_ANALYSIS.md

@@ -0,0 +1,15 @@
+# Bug #637 分析报告
+
+## 基本信息
+- Bug ID: 637
+- 标题: [住院护士站-体温单] 选中患者后系统上下文不同步，导致无法触发“变更体温单”录入弹窗
+- 严重程度: 3
+- 模块: 
+
+## 根因分析
+（待深入分析）
+
+## 修复方案
+（待分析后确定）
+
+FIXER_ID: zhaoyun

MD/bugs/BUG_638_ANALYSIS.md

@@ -0,0 +1,15 @@
+# Bug #638 分析报告
+
+## 基本信息
+- Bug ID: 638
+- 标题: [分诊排队管理] 智能候选池数据过滤失效，导致跨科室患者数据错误显示
+- 严重程度: 3
+- 模块: 
+
+## 根因分析
+（待深入分析）
+
+## 修复方案
+（待分析后确定）
+
+FIXER_ID: guanyu

MD/bugs/BUG_643_ANALYSIS.md

@@ -0,0 +1,15 @@
+# Bug #643 分析报告
+
+## 基本信息
+- Bug ID: 643
+- 标题: [门诊手术安排-术中医嘱] 删除已生成的临时医嘱提示成功，但点击刷新后医嘱重新出现
+- 严重程度: 3
+- 模块: 
+
+## 根因分析
+（待深入分析）
+
+## 修复方案
+（待分析后确定）
+
+FIXER_ID: zhaoyun

MD/bugs/BUG_730_ANALYSIS.md

@@ -0,0 +1,15 @@
+# Bug #730 分析报告
+
+## 基本信息
+- Bug ID: 730
+- 标题: 【门诊医生工作站】医嘱下的个人组套都是空的删不掉
+- 严重程度: 3
+- 模块: 
+
+## 根因分析
+（待深入分析）
+
+## 修复方案
+（待分析后确定）
+
+FIXER_ID: zhaoyun

MD/bugs/BUG_751_ANALYSIS.md

@@ -0,0 +1,24 @@
+# Bug #751 分析报告
+
+## 基本信息
+- Bug ID: 751
+- 标题: 【门诊医生站-医嘱】点击"新增"医嘱时未展示详细参数编辑面板
+- 严重程度: 一般
+- 模块: doctorstation
+
+## 根因分析
+**直接原因**：前端"新增医嘱"按钮的点击事件未正确打开参数编辑面板。
+**涉及文件**：
+- `healthlink-his-ui/src/views/doctorstation/components/OrderPanel.vue` — 医嘱面板主组件
+- `healthlink-his-ui/src/views/doctorstation/components/OrderForm.vue` — 医嘱编辑表单
+
+**修复方案**：
+1. 检查 OrderPanel.vue 中"新增"按钮的 @click 事件绑定
+2. 确认 OrderForm 组件是否正确引入和渲染
+3. 检查 v-if/v-show 条件是否阻止了面板显示
+
+## 涉及模块
+- 前端: doctorstation
+- 后端: 无需修改
+
+FIXER_ID: zhaoyun

MD/bugs/BUG_754_ANALYSIS.md

@@ -0,0 +1,15 @@
+# Bug #754 分析报告
+
+## 基本信息
+- Bug ID: 754
+- 标题: 【住院医生工作站-临床医嘱】删除“待签发”出院带药医嘱时，系统提示“删除成功”但医嘱状态未变更为“已作废”
+- 严重程度: 3
+- 模块: 
+
+## 根因分析
+（待深入分析）
+
+## 修复方案
+（待分析后确定）
+
+FIXER_ID: zhaoyun

MD/bugs/BUG_755_ANALYSIS.md

@@ -0,0 +1,15 @@
+# Bug #755 分析报告
+
+## 基本信息
+- Bug ID: 755
+- 标题: 【门诊医生工作站】新增医嘱时明明有显示库存数量，但是确无法保存成功，显示无库存
+- 严重程度: 3
+- 模块: 
+
+## 根因分析
+（待深入分析）
+
+## 修复方案
+（待分析后确定）
+
+FIXER_ID: guanyu

MD/bugs/BUG_756_ANALYSIS.md

@@ -0,0 +1,15 @@
+# Bug #756 分析报告
+
+## 基本信息
+- Bug ID: 756
+- 标题: 【门诊医生工作站】在诊断里修改并保存会出现报错：Cannot deserialize value of type `com.core.common.core.domain.entity.SysDictData` from Array value (token `JsonToken.START_ARRAY`) at [Source: UNKNOWN; byte offset: #UNKNOWN] (through reference chain: java.util.ArrayList[0])
+- 严重程度: 3
+- 模块: 
+
+## 根因分析
+（待深入分析）
+
+## 修复方案
+（待分析后确定）
+
+FIXER_ID: guanyu

healthlink-his-server/core-common/pom.xml

@@ -110,9 +110,9 @@
         </dependency>
 
         <!-- JSON工具类 -->
-        <!-- JSON工具类 -->
+        <!-- JSON工具类 -->
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
+            <groupId>tools.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
 

healthlink-his-server/core-common/src/main/java/com/core/common/annotation/Sensitive.java

@@ -3,7 +3,7 @@ package com.core.common.annotation;
 import com.core.common.config.serializer.SensitiveJsonSerializer;
 import com.core.common.enums.DesensitizedType;
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.annotation.JsonSerialize;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

healthlink-his-server/core-common/src/main/java/com/core/common/config/serializer/SensitiveJsonSerializer.java

@@ -4,14 +4,13 @@ import com.core.common.annotation.Sensitive;
 import com.core.common.core.domain.model.LoginUser;
 import com.core.common.enums.DesensitizedType;
 import com.core.common.utils.SecurityUtils;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.ser.ContextualSerializer;
+import tools.jackson.core.JacksonException;
+import tools.jackson.core.JsonGenerator;
+import tools.jackson.databind.BeanProperty;
+import tools.jackson.databind.DatabindException;
+import tools.jackson.databind.ValueSerializer;
+import tools.jackson.databind.SerializationContext;
 
-import java.io.IOException;
 import java.util.Objects;
 
 /**
@@ -19,11 +18,11 @@ import java.util.Objects;
  *
  * @author system
  */
-public class SensitiveJsonSerializer extends JsonSerializer<String> implements ContextualSerializer {
+public class SensitiveJsonSerializer extends ValueSerializer<String> {
     private DesensitizedType desensitizedType;
 
     @Override
-    public void serialize(String value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+    public void serialize(String value, JsonGenerator gen, SerializationContext serializers) throws JacksonException {
         if (desensitization()) {
             gen.writeString(desensitizedType.desensitizer().apply(value));
         } else {
@@ -32,14 +31,14 @@ public class SensitiveJsonSerializer extends JsonSerializer<String> implements C
     }
 
     @Override
-    public JsonSerializer<?> createContextual(SerializerProvider prov, BeanProperty property)
-        throws JsonMappingException {
+    public ValueSerializer<?> createContextual(SerializationContext prov, BeanProperty property)
+        throws DatabindException {
         Sensitive annotation = property.getAnnotation(Sensitive.class);
         if (Objects.nonNull(annotation) && Objects.equals(String.class, property.getType().getRawClass())) {
             this.desensitizedType = annotation.desensitizedType();
             return this;
         }
-        return prov.findValueSerializer(property.getType(), property);
+        return prov.findPrimaryPropertySerializer(property.getType(), property);
     }
 
     /**

healthlink-his-server/core-common/src/main/java/com/core/common/core/domain/entity/SysUser.java

@@ -9,8 +9,8 @@ import com.core.common.annotation.Excel.Type;
 import com.core.common.annotation.Excels;
 import com.core.common.core.domain.BaseEntity;
 import com.core.common.xss.Xss;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

healthlink-his-server/core-common/src/main/java/com/core/common/filter/PropertyPreExcludeFilter.java

@@ -1,9 +1,9 @@
 package com.core.common.filter;
 
 import com.fasterxml.jackson.annotation.JsonFilter;
-import com.fasterxml.jackson.databind.ser.FilterProvider;
-import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
-import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
+import tools.jackson.databind.ser.FilterProvider;
+import tools.jackson.databind.ser.std.SimpleBeanPropertyFilter;
+import tools.jackson.databind.ser.std.SimpleFilterProvider;
 import org.apache.commons.lang3.ArrayUtils;
 
 import java.util.HashSet;

healthlink-his-server/core-common/src/main/java/com/core/common/utils/DictUtils.java

@@ -1,7 +1,7 @@
 package com.core.common.utils;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.core.type.TypeReference;
+import tools.jackson.databind.ObjectMapper;
 import com.core.common.constant.CacheConstants;
 import com.core.common.core.domain.entity.SysDictData;
 import com.core.common.core.redis.RedisCache;

healthlink-his-server/core-common/src/main/java/com/core/common/utils/JsonUtils.java

@@ -1,11 +1,12 @@
 package com.core.common.utils;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
+import tools.jackson.core.JacksonException;
+import tools.jackson.core.type.TypeReference;
+import tools.jackson.databind.DeserializationFeature;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.SerializationFeature;
+import tools.jackson.databind.json.JsonMapper;
 
 /**
  * Jackson JSON 工具类
@@ -13,12 +14,10 @@ import com.fasterxml.jackson.databind.SerializationFeature;
  * @author system
  */
 public class JsonUtils {
-    private static final ObjectMapper MAPPER = new ObjectMapper();
-
-    static {
-        MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        MAPPER.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
-    }
+    private static final ObjectMapper MAPPER = JsonMapper.builder()
+            .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+            .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)
+            .build();
 
     public static ObjectMapper getMapper() {
         return MAPPER;
@@ -27,7 +26,7 @@ public class JsonUtils {
     public static String toJson(Object obj) {
         try {
             return MAPPER.writeValueAsString(obj);
-        } catch (JsonProcessingException e) {
+        } catch (JacksonException e) {
             return "{}";
         }
     }

healthlink-his-server/core-common/src/main/java/com/core/common/utils/ip/AddressUtils.java

@@ -1,8 +1,8 @@
 package com.core.common.utils.ip;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.databind.ObjectMapper;
 import com.core.common.utils.JsonUtils;
-import com.fasterxml.jackson.databind.JsonNode;
+import tools.jackson.databind.JsonNode;
 import com.core.common.config.CoreConfig;
 import com.core.common.constant.Constants;
 import com.core.common.utils.StringUtils;

healthlink-his-server/core-flowable/pom.xml

@@ -34,7 +34,7 @@
 
         <!-- JSON工具类 -->
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
+            <groupId>tools.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
 

healthlink-his-server/core-flowable/src/main/java/com/core/flowable/service/impl/FlowTaskServiceImpl.java

@@ -1,11 +1,11 @@
 package com.core.flowable.service.impl;
 
 import com.core.common.utils.JsonUtils;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.core.type.TypeReference;
+import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.node.ObjectNode;
+import tools.jackson.databind.node.ArrayNode;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.core.type.TypeReference;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.AjaxResult;
 import com.core.common.core.domain.entity.SysRole;

healthlink-his-server/core-framework/src/main/java/com/core/framework/aspectj/LogAspect.java

@@ -1,6 +1,6 @@
 package com.core.framework.aspectj;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.databind.ObjectMapper;
 import com.core.common.utils.JsonUtils;
 import com.core.common.annotation.Log;
 import com.core.common.core.domain.entity.SysUser;

healthlink-his-server/core-framework/src/main/java/com/core/framework/config/ApplicationConfig.java

@@ -1,51 +1,64 @@
 package com.core.framework.config;
 
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-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.jackson2.autoconfigure.Jackson2ObjectMapperBuilderCustomizer;
+import org.springframework.boot.jackson.autoconfigure.JsonMapperBuilderCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import tools.jackson.core.JacksonException;
+import tools.jackson.core.JsonParser;
+import tools.jackson.core.JsonGenerator;
+import tools.jackson.databind.DeserializationContext;
+import tools.jackson.databind.SerializationContext;
+import tools.jackson.databind.ValueDeserializer;
+import tools.jackson.databind.ValueSerializer;
+import tools.jackson.databind.module.SimpleModule;
 
-import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.TimeZone;
 
 @Configuration
 @EnableAspectJAutoProxy(exposeProxy = true)
 @MapperScan({"com.core.**.mapper", "com.healthlink.his.**.mapper"})
 public class ApplicationConfig {
 
-    private static final JsonDeserializer<LocalDateTime> LOCAL_DATE_TIME_DESERIALIZER = new JsonDeserializer<>() {
-        private static final DateTimeFormatter ISO_FORMATTER = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
-        private static final DateTimeFormatter SIMPLE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        private static final DateTimeFormatter SLASH_FORMATTER = DateTimeFormatter.ofPattern("yyyy/M/d HH:mm:ss");
+    private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+    private static final DateTimeFormatter ISO_FORMATTER = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
+    private static final DateTimeFormatter SLASH_FORMATTER = DateTimeFormatter.ofPattern("yyyy/M/d HH:mm:ss");
 
-        @Override
-        public LocalDateTime deserialize(JsonParser p, DeserializationContext context) throws IOException {
-            String text = p.getText();
-            if (text == null || text.isEmpty()) return null;
-            String cleaned = text.replaceAll("[Zz]$", "").replaceAll("[+-]\\d{2}:?\\d{2}$", "");
-            try { return LocalDateTime.parse(cleaned, ISO_FORMATTER); } catch (Exception ignored) {}
-            try { return LocalDateTime.parse(cleaned, SIMPLE_FORMATTER); } catch (Exception ignored) {}
-            return LocalDateTime.parse(cleaned, SLASH_FORMATTER);
-        }
-    };
+    private static final ValueDeserializer<LocalDateTime> LOCAL_DATE_TIME_DESERIALIZER =
+            new ValueDeserializer<LocalDateTime>() {
+                @Override
+                public LocalDateTime deserialize(JsonParser p, DeserializationContext context) throws JacksonException {
+                    String text = p.getText();
+                    if (text == null || text.isEmpty()) return null;
+                    String cleaned = text.replaceAll("[Zz]$", "").replaceAll("[+-]\\d{2}:?\\d{2}$", "");
+                    try { return LocalDateTime.parse(cleaned, ISO_FORMATTER); } catch (Exception ignored) {}
+                    try { return LocalDateTime.parse(cleaned, FORMATTER); } catch (Exception ignored) {}
+                    return LocalDateTime.parse(cleaned, SLASH_FORMATTER);
+                }
+            };
+
+    private static final ValueSerializer<LocalDateTime> LOCAL_DATE_TIME_SERIALIZER =
+            new ValueSerializer<LocalDateTime>() {
+                @Override
+                public void serialize(LocalDateTime value, JsonGenerator gen, SerializationContext ctx) throws JacksonException {
+                    gen.writeString(value.format(FORMATTER));
+                }
+
+                @Override
+                public Class<LocalDateTime> handledType() {
+                    return LocalDateTime.class;
+                }
+            };
 
     @Bean
-    public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization() {
+    public JsonMapperBuilderCustomizer jacksonObjectMapperCustomization() {
         return builder -> {
-            builder.timeZone(TimeZone.getDefault());
-            builder.simpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            JavaTimeModule javaTimeModule = new JavaTimeModule();
-            javaTimeModule.addDeserializer(LocalDateTime.class, LOCAL_DATE_TIME_DESERIALIZER);
-            builder.modules(javaTimeModule);
-            builder.serializerByType(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            SimpleModule module = new SimpleModule("HealthLinkLocalDateTime");
+            module.addDeserializer(LocalDateTime.class, LOCAL_DATE_TIME_DESERIALIZER);
+            module.addSerializer(LocalDateTime.class, LOCAL_DATE_TIME_SERIALIZER);
+            builder.addModule(module);
         };
     }
 }

healthlink-his-server/core-framework/src/main/java/com/core/framework/config/FastJson2JsonRedisSerializer.java

@@ -1,7 +1,10 @@
 package com.core.framework.config;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
+import tools.jackson.databind.DefaultTyping;
+import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.jsontype.BasicPolymorphicTypeValidator;
+import tools.jackson.databind.jsontype.PolymorphicTypeValidator;
+import tools.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import org.slf4j.Logger;
@@ -10,16 +13,17 @@ import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.data.redis.serializer.SerializationException;
 
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.LinkedHashMap;
 
 /**
- * Redis序列化器 - 兼容fastjson2旧格式
+ * Redis序列化器 - 兼容fastjson2旧格式（Jackson 3 迁移版）
  *
  * @author system
  */
 public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T> {
     private static final Logger log = LoggerFactory.getLogger(FastJson2JsonRedisSerializer.class);
-    public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
+    public static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
 
     /** 新格式: 带类型信息 (activateDefaultTyping) */
     private final ObjectMapper typedMapper;
@@ -31,16 +35,21 @@ public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T> {
         super();
         this.clazz = clazz;
 
+        // Jackson 3: 用 BasicPolymorphicTypeValidator 替代 LaissezFaireSubTypeValidator
+        PolymorphicTypeValidator ptv = BasicPolymorphicTypeValidator.builder()
+                .allowIfBaseType(Object.class)
+                .build();
+
         // 新格式 ObjectMapper (带类型信息)
-        this.typedMapper = new ObjectMapper();
-        this.typedMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
-        this.typedMapper.activateDefaultTyping(
-                LaissezFaireSubTypeValidator.instance,
-                ObjectMapper.DefaultTyping.NON_FINAL);
+        this.typedMapper = JsonMapper.builder()
+                .changeDefaultVisibility(vc -> vc.withVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY))
+                .activateDefaultTyping(ptv, DefaultTyping.NON_FINAL)
+                .build();
 
         // 旧格式 ObjectMapper (不带类型信息)
-        this.plainMapper = new ObjectMapper();
-        this.plainMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
+        this.plainMapper = JsonMapper.builder()
+                .changeDefaultVisibility(vc -> vc.withVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY))
+                .build();
     }
 
     @Override
@@ -75,4 +84,4 @@ public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T> {
             return null;
         }
     }
-}
+}

healthlink-his-server/core-framework/src/main/java/com/core/framework/config/FastjsonCompatibleRedisSerializer.java

@@ -2,8 +2,10 @@ package com.core.framework.config;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.databind.DeserializationFeature;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.redis.serializer.RedisSerializer;
@@ -12,7 +14,7 @@ import org.springframework.data.redis.serializer.SerializationException;
 import java.nio.charset.StandardCharsets;
 
 /**
- * Jackson Redis序列化器 - 兼容fastjson旧格式
+ * Jackson Redis序列化器 - 兼容fastjson旧格式（Jackson 3 迁移版）
  *
  * 新数据: 纯JSON (无类型包装)，调用方用 convertValue 转换
  * 旧fastjson: 去除L后缀后按JSON解析
@@ -30,10 +32,10 @@ public class FastjsonCompatibleRedisSerializer implements RedisSerializer<Object
     }
 
     private static ObjectMapper createMapper() {
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
-        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        return mapper;
+        return JsonMapper.builder()
+                .changeDefaultVisibility(vc -> vc.withVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY))
+                .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+                .build();
     }
 
     /** 获取共享ObjectMapper，供 DictUtils / TokenService 等做 convertValue */
@@ -64,7 +66,7 @@ public class FastjsonCompatibleRedisSerializer implements RedisSerializer<Object
         try {
             // 处理旧Jackson activateDefaultTyping格式: ["className", {data}]
             if (cleaned.startsWith("[\"") && cleaned.length() > 10) {
-                com.fasterxml.jackson.databind.JsonNode node = objectMapper.readTree(cleaned);
+                JsonNode node = objectMapper.readTree(cleaned);
                 if (node.isArray() && node.size() >= 2 && node.get(0).isTextual()) {
                     // 取data部分（第2个元素），忽略className
                     return objectMapper.treeToValue(node.get(1), Object.class);
@@ -76,4 +78,4 @@ public class FastjsonCompatibleRedisSerializer implements RedisSerializer<Object
             return null;
         }
     }
-}
+}

healthlink-his-server/core-framework/src/main/java/com/core/framework/interceptor/RepeatSubmitInterceptor.java

@@ -1,6 +1,6 @@
 package com.core.framework.interceptor;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.databind.ObjectMapper;
 import com.core.common.utils.JsonUtils;
 import com.core.common.annotation.RepeatSubmit;
 import com.core.common.core.domain.AjaxResult;

healthlink-his-server/core-framework/src/main/java/com/core/framework/interceptor/impl/SameUrlDataInterceptor.java

@@ -1,6 +1,6 @@
 package com.core.framework.interceptor.impl;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.databind.ObjectMapper;
 import com.core.common.utils.JsonUtils;
 import com.core.common.annotation.RepeatSubmit;
 import com.core.common.constant.CacheConstants;

healthlink-his-server/core-framework/src/main/java/com/core/framework/security/handle/AuthenticationEntryPointImpl.java

@@ -1,6 +1,6 @@
 package com.core.framework.security.handle;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.databind.ObjectMapper;
 import com.core.common.utils.JsonUtils;
 import com.core.common.constant.HttpStatus;
 import com.core.common.core.domain.AjaxResult;

healthlink-his-server/core-framework/src/main/java/com/core/framework/security/handle/LogoutSuccessHandlerImpl.java

@@ -1,6 +1,6 @@
 package com.core.framework.security.handle;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.databind.ObjectMapper;
 import com.core.common.utils.JsonUtils;
 import com.core.common.constant.Constants;
 import com.core.common.core.domain.AjaxResult;

healthlink-his-server/core-framework/src/main/java/com/core/framework/web/service/TokenService.java

@@ -71,17 +71,19 @@ public class TokenService {
                 if (cached instanceof java.util.List<?> list && list.size() >= 2 && list.get(0) instanceof String) {
                     Object data = list.get(1);
                     if (data instanceof java.util.Map) {
-                        com.fasterxml.jackson.databind.ObjectMapper mapper =
-                            new com.fasterxml.jackson.databind.ObjectMapper();
-                        mapper.configure(com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+                        tools.jackson.databind.ObjectMapper mapper =
+                            tools.jackson.databind.json.JsonMapper.builder()
+                                .disable(tools.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+                                .build();
                         return mapper.convertValue(data, LoginUser.class);
                     }
                 }
                 // 兼容纯JSON格式: LinkedHashMap -> LoginUser
                 if (cached instanceof java.util.Map) {
-                    com.fasterxml.jackson.databind.ObjectMapper mapper =
-                        new com.fasterxml.jackson.databind.ObjectMapper();
-                    mapper.configure(com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+                    tools.jackson.databind.ObjectMapper mapper =
+                        tools.jackson.databind.json.JsonMapper.builder()
+                            .disable(tools.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+                            .build();
                     return mapper.convertValue(cached, LoginUser.class);
                 }
                 return null;

healthlink-his-server/core-generator/pom.xml

@@ -61,7 +61,7 @@
 
         <!-- JSON工具类 -->
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
+            <groupId>tools.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
 

healthlink-his-server/core-generator/src/main/java/com/core/generator/service/GenTableServiceImpl.java

@@ -1,8 +1,8 @@
 package com.core.generator.service;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.databind.ObjectMapper;
 import com.core.common.utils.JsonUtils;
-import com.fasterxml.jackson.databind.JsonNode;
+import tools.jackson.databind.JsonNode;
 import com.core.common.constant.Constants;
 import com.core.common.constant.GenConstants;
 import com.core.common.core.text.CharsetKit;

healthlink-his-server/core-generator/src/main/java/com/core/generator/util/VelocityUtils.java

@@ -1,8 +1,8 @@
 package com.core.generator.util;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.databind.ObjectMapper;
 import com.core.common.utils.JsonUtils;
-import com.fasterxml.jackson.databind.JsonNode;
+import tools.jackson.databind.JsonNode;
 import com.core.common.constant.GenConstants;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.StringUtils;

healthlink-his-server/core-system/src/main/java/com/core/system/domain/SysNoticeRead.java

@@ -1,8 +1,8 @@
 package com.core.system.domain;
 
 import com.core.common.core.domain.BaseEntity;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 
 /**
  * 公告/通知已读记录 sys_notice_read

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/controller/ClinicalManageLaboratoryController.java

@@ -0,0 +1,37 @@
+package com.healthlink.his.web.Inspection.controller;
+
+import com.core.common.core.domain.R;
+import com.healthlink.his.web.Inspection.appservice.ILaboratoryManageAppService;
+import com.healthlink.his.web.Inspection.dto.ReportResultManageDto;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import jakarta.servlet.http.HttpServletRequest;
+
+/**
+ * 前端 lisPascResult 页面 API 兼容映射
+ * 前端调用 /clinical-manage/laboratory/* 和 /clinical-manage/observation/*
+ * 路由到已有的 /inspection/* 服务
+ */
+@RestController
+@Slf4j
+@AllArgsConstructor
+@RequestMapping("/clinical-manage/laboratory")
+public class ClinicalManageLaboratoryController {
+    private final ILaboratoryManageAppService appService;
+
+    @GetMapping("/result-page")
+    public R<?> getResultPage(ReportResultManageDto dto,
+                              @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                              @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                              @RequestParam(name = "searchKey", required = false) String searchKey,
+                              HttpServletRequest request) {
+        return appService.getReportResultList(dto, pageNo, pageSize, searchKey, request);
+    }
+
+    @GetMapping("/result-detail/{id}")
+    public R<?> getResultDetail(@PathVariable Long id) {
+        return appService.getReportById(id);
+    }
+}

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/controller/ClinicalManageObservationController.java

@@ -0,0 +1,30 @@
+package com.healthlink.his.web.Inspection.controller;
+
+import com.core.common.core.domain.R;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Collections;
+
+/**
+ * 前端 lisPascResult 检查结果 API 兼容映射
+ * 后端暂无检查结果独立服务，返回空列表避免前端报错
+ * TODO: 接入检查报告数据源后替换实现
+ */
+@RestController
+@Slf4j
+@AllArgsConstructor
+@RequestMapping("/clinical-manage/observation")
+public class ClinicalManageObservationController {
+
+    @GetMapping("/result-page")
+    public R<?> getResultPage(@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                              @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        // 暂时返回空列表，前端可正常渲染
+        return R.ok(new java.util.HashMap<String, Object>() {{
+            put("records", Collections.emptyList());
+            put("total", 0);
+        }});
+    }
+}

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/InstrumentManageDto.java

@@ -1,8 +1,8 @@
 package com.healthlink.his.web.Inspection.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/LisConfigManageDto.java

@@ -1,7 +1,7 @@
 package com.healthlink.his.web.Inspection.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import com.healthlink.his.lab.domain.ActivityDefDeviceDef;
 import com.healthlink.his.lab.domain.ActivityDefObservationDef;
 import com.healthlink.his.lab.domain.ActivityDefSpecimenDef;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/ObservationDefManageDto.java

@@ -1,7 +1,7 @@
 package com.healthlink.his.web.Inspection.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/ReportResultManageDto.java

@@ -1,8 +1,8 @@
 package com.healthlink.his.web.Inspection.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 /**

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/SampleCollectManageDto.java

@@ -1,8 +1,8 @@
 package com.healthlink.his.web.Inspection.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 import java.util.Date;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/Inspection/dto/SpecimenDefManageDto.java

@@ -1,7 +1,7 @@
 package com.healthlink.his.web.Inspection.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/dto/ChangePriceDataDto.java

@@ -1,7 +1,7 @@
 package com.healthlink.his.web.adjustprice.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 import java.math.BigDecimal;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/dto/TicketDto.java

@@ -1,7 +1,7 @@
 package com.healthlink.his.web.appointmentmanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/BodyStructureDto.java

@@ -3,8 +3,8 @@
  */
 package com.healthlink.his.web.basedatamanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/LocationDto.java

@@ -3,8 +3,8 @@
  */
 package com.healthlink.his.web.basedatamanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/LocationInfoDto.java

@@ -3,8 +3,8 @@
  */
 package com.healthlink.his.web.basedatamanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/OperatingRoomDto.java

@@ -1,7 +1,7 @@
 package com.healthlink.his.web.basedatamanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/OrgLocInitDto.java

@@ -3,8 +3,8 @@
  */
 package com.healthlink.his.web.basedatamanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/OrgLocQueryDto.java

@@ -3,8 +3,8 @@
  */
 package com.healthlink.his.web.basedatamanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/OrganizationDto.java

@@ -4,8 +4,8 @@
 package com.healthlink.his.web.basedatamanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/PractitionerDto.java

@@ -3,8 +3,8 @@
  */
 package com.healthlink.his.web.basedatamanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/PractitionerOrgAndLocationDto.java

@@ -1,7 +1,7 @@
 package com.healthlink.his.web.basedatamanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/PractitionerRoleDto.java

@@ -3,8 +3,8 @@
  */
 package com.healthlink.his.web.basedatamanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/PractitionerRolesDto.java

@@ -1,7 +1,7 @@
 package com.healthlink.his.web.basedatamanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/SelectableOrgDto.java

@@ -3,8 +3,8 @@
  */
 package com.healthlink.his.web.basedatamanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/dto/UserAndPractitionerDto.java

@@ -1,7 +1,7 @@
 package com.healthlink.his.web.basedatamanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/basicservice/dto/HealthcareServiceDto.java

@@ -1,7 +1,7 @@
 package com.healthlink.his.web.basicservice.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/cardmanagement/dto/DoctorCardListDto.java

@@ -4,8 +4,8 @@
 package com.healthlink.his.web.cardmanagement.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 import java.time.LocalDate;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/AccountFormData.java

@@ -1,7 +1,7 @@
 package com.healthlink.his.web.chargemanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import com.healthlink.his.common.constant.CommonConstants;
 import com.healthlink.his.common.enums.AccountBillingStatus;
 import com.healthlink.his.common.enums.AccountStatus;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/ChargeItemFormData.java

@@ -1,8 +1,8 @@
 package com.healthlink.his.web.chargemanage.dto;
 
 import com.core.common.utils.SecurityUtils;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import com.healthlink.his.common.constant.CommonConstants;
 import com.healthlink.his.common.enums.ChargeItemContext;
 import com.healthlink.his.common.enums.ChargeItemStatus;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/CurrentDayEncounterDto.java

@@ -1,7 +1,7 @@
 package com.healthlink.his.web.chargemanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterDiagnosisFormData.java

@@ -1,7 +1,7 @@
 package com.healthlink.his.web.chargemanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterFormData.java

@@ -1,7 +1,7 @@
 package com.healthlink.his.web.chargemanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import com.healthlink.his.common.enums.*;
 import lombok.Data;
 import lombok.experimental.Accessors;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterLocationFormData.java

@@ -1,7 +1,7 @@
 package com.healthlink.his.web.chargemanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import com.healthlink.his.common.enums.EncounterActivityStatus;
 import com.healthlink.his.common.enums.LocationForm;
 import lombok.Data;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterParticipantFormData.java

@@ -1,7 +1,7 @@
 package com.healthlink.his.web.chargemanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import com.healthlink.his.common.enums.ParticipantType;
 import lombok.Data;
 import lombok.experimental.Accessors;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterPatientPageDto.java

@@ -4,8 +4,8 @@
 package com.healthlink.his.web.chargemanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterPatientPaymentDto.java

@@ -5,8 +5,8 @@ package com.healthlink.his.web.chargemanage.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterPatientPrescriptionDto.java

@@ -3,8 +3,8 @@
  */
 package com.healthlink.his.web.chargemanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/EncounterPatientRefundDto.java

@@ -4,8 +4,8 @@
 package com.healthlink.his.web.chargemanage.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import com.healthlink.his.common.annotation.Dict;
 import com.healthlink.his.yb.dto.PaymentDetailDto;
 import lombok.Data;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/OrgMetadata.java

@@ -1,7 +1,7 @@
 package com.healthlink.his.web.chargemanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/OutpatientPricingInventoryDto.java

@@ -1,7 +1,7 @@
 package com.healthlink.his.web.chargemanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/OutpatientPricingPriceDto.java

@@ -1,7 +1,7 @@
 package com.healthlink.his.web.chargemanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/PatientMetadata.java

@@ -1,7 +1,7 @@
 package com.healthlink.his.web.chargemanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/PractitionerMetadata.java

@@ -1,7 +1,7 @@
 package com.healthlink.his.web.chargemanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/PricingProjectDto.java

@@ -4,8 +4,8 @@
 package com.healthlink.his.web.chargemanage.dto;
 
 import com.core.common.utils.SecurityUtils;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import com.healthlink.his.common.enums.EncounterClass;
 import com.healthlink.his.common.enums.RequestStatus;
 import com.healthlink.his.common.enums.TherapyTimeType;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/RefundItemDto.java

@@ -3,8 +3,8 @@
  */
 package com.healthlink.his.web.chargemanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/ReprintRegistrationDto.java

@@ -1,7 +1,7 @@
 package com.healthlink.his.web.chargemanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/check/controller/ExamApplyController.java

@@ -123,7 +123,7 @@ public class ExamApplyController extends BaseController {
             
             for (ExamApplyItem item : items) {
                 BigDecimal itemTotal = item.getItemFee() != null ? item.getItemFee() : BigDecimal.ZERO;
-                BigDecimal methodFee = getMethodAdditionalFee(item.getExamMethodCode());
+                BigDecimal methodFee = getMethodAdditionalFee(item.getExamMethodCode(), item.getBodyPartCode());
                 totalAmount = totalAmount.add(itemTotal.add(methodFee));
             }
             
@@ -318,7 +318,7 @@ public class ExamApplyController extends BaseController {
 
                 // 金额：单价和总价取检查项目费用
                 BigDecimal baseFee = itemDto.getItemFee() != null ? itemDto.getItemFee() : BigDecimal.ZERO;
-                BigDecimal methodFee = getMethodAdditionalFee(itemDto.getExamMethodCode());
+                BigDecimal methodFee = getMethodAdditionalFee(itemDto.getExamMethodCode(), itemDto.getBodyPartCode());
                 BigDecimal fee = baseFee.add(methodFee);
                 chargeItem.setQuantityValue(BigDecimal.ONE); // 数量
                 chargeItem.setQuantityUnit("次"); // 单位
@@ -506,7 +506,7 @@ public class ExamApplyController extends BaseController {
                 chargeItem.setProductId(0L);
 
                 BigDecimal baseFee = itemDto.getItemFee() != null ? itemDto.getItemFee() : BigDecimal.ZERO;
-                BigDecimal methodFee = getMethodAdditionalFee(itemDto.getExamMethodCode());
+                BigDecimal methodFee = getMethodAdditionalFee(itemDto.getExamMethodCode(), itemDto.getBodyPartCode());
                 BigDecimal fee = baseFee.add(methodFee);
                 chargeItem.setQuantityValue(BigDecimal.ONE);
                 chargeItem.setQuantityUnit("次");
@@ -570,15 +570,17 @@ public class ExamApplyController extends BaseController {
      * Bug #655: 根据检查方法代码查询附加金额（套餐价格）
      * 查找链路：examMethodCode → CheckMethod → packageName → CheckPackage → packagePrice
      */
-    private BigDecimal getMethodAdditionalFee(String examMethodCode) {
+    private BigDecimal getMethodAdditionalFee(String examMethodCode, String checkType) {
         if (examMethodCode == null || examMethodCode.isEmpty()) {
             return BigDecimal.ZERO;
         }
-        // 1. 根据 code 查找 CheckMethod
-        CheckMethod method = checkMethodService.getOne(
-            new LambdaQueryWrapper<CheckMethod>()
-                .eq(CheckMethod::getCode, examMethodCode)
-                .last("LIMIT 1"));
+        // 1. 根据 code 和 checkType 查找 CheckMethod
+        LambdaQueryWrapper<CheckMethod> wrapper = new LambdaQueryWrapper<CheckMethod>()
+            .eq(CheckMethod::getCode, examMethodCode);
+        if (checkType != null && !checkType.isEmpty()) {
+            wrapper.eq(CheckMethod::getCheckType, checkType);
+        }
+        CheckMethod method = checkMethodService.getOne(wrapper.last("LIMIT 1"));
         if (method == null || method.getPackageName() == null || method.getPackageName().isEmpty()) {
             return BigDecimal.ZERO;
         }

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java

@@ -9,7 +9,7 @@ import com.core.common.core.domain.entity.SysUser;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
 import com.core.system.service.ISysUserService;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.databind.ObjectMapper;
 import com.core.common.utils.JsonUtils;
 import com.healthlink.his.administration.domain.ChargeItem;
 import com.healthlink.his.administration.domain.Encounter;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/dto/SurgeryDto.java

@@ -1,7 +1,7 @@
 package com.healthlink.his.web.clinicalmanage.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/ActivityDefinitionDto.java

@@ -3,8 +3,8 @@
  */
 package com.healthlink.his.web.common.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/InventoryItemDto.java

@@ -3,8 +3,8 @@
  */
 package com.healthlink.his.web.common.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import com.healthlink.his.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/LocationDto.java

@@ -1,7 +1,7 @@
 package com.healthlink.his.web.common.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/LocationInventoryDto.java

@@ -3,8 +3,8 @@
  */
 package com.healthlink.his.web.common.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/PerformInfoDto.java

@@ -3,8 +3,8 @@
  */
 package com.healthlink.his.web.common.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/PerformRecordDto.java

@@ -4,8 +4,8 @@
 package com.healthlink.his.web.common.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/common/dto/PractitionerInfoDto.java

@@ -3,8 +3,8 @@
  */
 package com.healthlink.his.web.common.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/dto/ConsultationActivityDto.java

@@ -1,7 +1,7 @@
 package com.healthlink.his.web.consultation.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 import java.io.Serializable;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/dto/ConsultationRequestDto.java

@@ -1,8 +1,8 @@
 package com.healthlink.his.web.consultation.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 import java.io.Serializable;

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/dto/DepartmentTreeDto.java

@@ -1,7 +1,7 @@
 package com.healthlink.his.web.consultation.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 import java.io.Serializable;