From 0bb113557cc8512d7abc44aa974d0d8d743d016d Mon Sep 17 00:00:00 2001 From: chenqi Date: Thu, 18 Jun 2026 19:06:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DEmrQualityScore?= =?UTF-8?q?=E5=88=AB=E5=90=8D=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EmrQualityAppServiceImpl.java | 8 ++++---- .../impl/TerminalQualityAppServiceImpl.java | 16 ++++++++-------- .../{EmrQualityScore.java => QualityScore.java} | 4 ++-- .../his/quality/mapper/QualityScoreMapper.java | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) rename healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/quality/domain/{EmrQualityScore.java => QualityScore.java} (93%) 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 cfa578f16..7706214d8 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 @@ -1,6 +1,6 @@ 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.domain.QualityScore; import com.healthlink.his.quality.mapper.*; import com.healthlink.his.web.quality.appservice.IEmrQualityAppService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -43,9 +43,9 @@ public class EmrQualityAppServiceImpl implements IEmrQualityAppService { @Override public List> getQualityScores(Long encounterId) { List> scores = new ArrayList<>(); - List list = scoreMapper.selectList(new LambdaQueryWrapper() - .eq(EmrQualityScore::getEncounterId, encounterId).orderByDesc(EmrQualityScore::getCreateTime)); - for (EmrQualityScore s : list) { + List list = scoreMapper.selectList(new LambdaQueryWrapper() + .eq(QualityScore::getEncounterId, encounterId).orderByDesc(QualityScore::getCreateTime)); + for (QualityScore s : list) { Map m = new HashMap<>(); m.put("id", s.getId()); m.put("emrType", s.getEmrType()); m.put("score", s.getScore()); m.put("grade", s.getGrade()); m.put("checkType", s.getCheckType()); m.put("checkerName", s.getCheckerName()); 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 d76031f59..b3b7b6453 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 @@ -1,7 +1,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.domain.QualityScore; import com.healthlink.his.quality.mapper.EmrDefectMapper; import com.healthlink.his.quality.mapper.QualityScoreMapper; import com.healthlink.his.web.quality.appservice.ITerminalQualityAppService; @@ -44,7 +44,7 @@ public class TerminalQualityAppServiceImpl implements ITerminalQualityAppService String grade = calculateGrade(score); // 保存评分记录 - EmrQualityScore qualityScore = new EmrQualityScore(); + QualityScore qualityScore = new QualityScore(); qualityScore.setEncounterId(encounterId); qualityScore.setScore(score); qualityScore.setMaxScore(new BigDecimal(100)); @@ -69,15 +69,15 @@ public class TerminalQualityAppServiceImpl implements ITerminalQualityAppService result.put("encounterId", encounterId); // 获取评分记录 - List scores = scoreMapper.selectList( - new LambdaQueryWrapper() - .eq(EmrQualityScore::getEncounterId, encounterId) - .eq(EmrQualityScore::getCheckType, "TERMINAL") - .orderByDesc(EmrQualityScore::getCreateTime) + List scores = scoreMapper.selectList( + new LambdaQueryWrapper() + .eq(QualityScore::getEncounterId, encounterId) + .eq(QualityScore::getCheckType, "TERMINAL") + .orderByDesc(QualityScore::getCreateTime) ); if (!scores.isEmpty()) { - EmrQualityScore latestScore = scores.get(0); + QualityScore latestScore = scores.get(0); result.put("score", latestScore.getScore()); result.put("grade", latestScore.getGrade()); result.put("checkTime", latestScore.getCreateTime()); diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/quality/domain/EmrQualityScore.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/quality/domain/QualityScore.java similarity index 93% rename from healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/quality/domain/EmrQualityScore.java rename to healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/quality/domain/QualityScore.java index 895d0182a..83b16ecc1 100644 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/quality/domain/EmrQualityScore.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/quality/domain/QualityScore.java @@ -6,9 +6,9 @@ import com.core.common.core.domain.HisBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import java.math.BigDecimal; @Data @TableName("emr_quality_score") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -public class EmrQualityScore extends HisBaseEntity { +public class QualityScore extends HisBaseEntity { @TableId(type = IdType.ASSIGN_ID) private Long id; private Long encounterId; private Long patientId; private String emrType; private BigDecimal score; private BigDecimal maxScore; private String grade; private Long checkerId; private String checkerName; private String checkType; private String remark; private String delFlag; -} +} \ No newline at end of file diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/quality/mapper/QualityScoreMapper.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/quality/mapper/QualityScoreMapper.java index 80cf23aec..27808bcd6 100644 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/quality/mapper/QualityScoreMapper.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/quality/mapper/QualityScoreMapper.java @@ -1,5 +1,5 @@ package com.healthlink.his.quality.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.healthlink.his.quality.domain.EmrQualityScore; +import com.healthlink.his.quality.domain.QualityScore; import org.apache.ibatis.annotations.Mapper; -@Mapper public interface QualityScoreMapper extends BaseMapper {} +@Mapper public interface QualityScoreMapper extends BaseMapper {}