From 424a99f4120eb6aaab54f163fe3d679a4364705f Mon Sep 17 00:00:00 2001 From: chenqi Date: Thu, 18 Jun 2026 18:50:42 +0800 Subject: [PATCH] =?UTF-8?q?fix(quality):=20=E4=BF=AE=E5=A4=8DEmrQualitySco?= =?UTF-8?q?reMapper=20bean=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将quality包下的EmrQualityScoreMapper重命名为QualityScoreMapper， 避免与emr包下的EmrQualityScoreMapper产生Spring bean名冲突。 同步更新EmrQualityAppServiceImpl和TerminalQualityAppServiceImpl的引用。 --- .../web/quality/appservice/impl/EmrQualityAppServiceImpl.java | 2 +- .../appservice/impl/TerminalQualityAppServiceImpl.java | 4 ++-- .../{EmrQualityScoreMapper.java => QualityScoreMapper.java} | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/quality/mapper/{EmrQualityScoreMapper.java => QualityScoreMapper.java} (70%) diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/quality/appservice/impl/EmrQualityAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/quality/appservice/impl/EmrQualityAppServiceImpl.java index 7d537ffc7..cfa578f16 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/quality/appservice/impl/EmrQualityAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/quality/appservice/impl/EmrQualityAppServiceImpl.java @@ -10,7 +10,7 @@ import java.util.*; import java.util.Date; @Service public class EmrQualityAppServiceImpl implements IEmrQualityAppService { - @Autowired private EmrQualityScoreMapper scoreMapper; + @Autowired private QualityScoreMapper scoreMapper; @Autowired private EmrDefectMapper defectMapper; @Override diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/quality/appservice/impl/TerminalQualityAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/quality/appservice/impl/TerminalQualityAppServiceImpl.java index 0c2a603db..d76031f59 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/quality/appservice/impl/TerminalQualityAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/quality/appservice/impl/TerminalQualityAppServiceImpl.java @@ -3,7 +3,7 @@ package com.healthlink.his.web.quality.appservice.impl; import com.healthlink.his.quality.domain.EmrDefect; import com.healthlink.his.quality.domain.EmrQualityScore; import com.healthlink.his.quality.mapper.EmrDefectMapper; -import com.healthlink.his.quality.mapper.EmrQualityScoreMapper; +import com.healthlink.his.quality.mapper.QualityScoreMapper; import com.healthlink.his.web.quality.appservice.ITerminalQualityAppService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.beans.factory.annotation.Autowired; @@ -16,7 +16,7 @@ import java.util.*; public class TerminalQualityAppServiceImpl implements ITerminalQualityAppService { @Autowired - private EmrQualityScoreMapper scoreMapper; + private QualityScoreMapper scoreMapper; @Autowired private EmrDefectMapper defectMapper; diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/quality/mapper/EmrQualityScoreMapper.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/quality/mapper/QualityScoreMapper.java similarity index 70% rename from healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/quality/mapper/EmrQualityScoreMapper.java rename to healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/quality/mapper/QualityScoreMapper.java index 46a337123..80cf23aec 100644 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/quality/mapper/EmrQualityScoreMapper.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/quality/mapper/QualityScoreMapper.java @@ -2,4 +2,4 @@ package com.healthlink.his.quality.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.healthlink.his.quality.domain.EmrQualityScore; import org.apache.ibatis.annotations.Mapper; -@Mapper public interface EmrQualityScoreMapper extends BaseMapper {} +@Mapper public interface QualityScoreMapper extends BaseMapper {}