wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

fix: 修复EmrQualityScore别名冲突

Browse Source
This commit is contained in:
chenqi
2026-06-18 19:06:24 +08:00
parent 359afba793
commit 0bb113557c
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/quality/appservice/impl/EmrQualityAppServiceImpl.java
View File

@@ -1,6 +1,6 @@
package com.healthlink.his.web.quality.appservice.impl; package com.healthlink.his.web.quality.appservice.impl;
import com.healthlink.his.quality.domain.EmrDefect; 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.quality.mapper.*;
import com.healthlink.his.web.quality.appservice.IEmrQualityAppService; import com.healthlink.his.web.quality.appservice.IEmrQualityAppService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -43,9 +43,9 @@ public class EmrQualityAppServiceImpl implements IEmrQualityAppService {
@Override @Override
public List<Map<String, Object>> getQualityScores(Long encounterId) { public List<Map<String, Object>> getQualityScores(Long encounterId) {
List<Map<String, Object>> scores = new ArrayList<>(); List<Map<String, Object>> scores = new ArrayList<>();
List<EmrQualityScore> list = scoreMapper.selectList(new LambdaQueryWrapper<EmrQualityScore>() List<QualityScore> list = scoreMapper.selectList(new LambdaQueryWrapper<QualityScore>()
.eq(EmrQualityScore::getEncounterId, encounterId).orderByDesc(EmrQualityScore::getCreateTime)); .eq(QualityScore::getEncounterId, encounterId).orderByDesc(QualityScore::getCreateTime));
for (EmrQualityScore s : list) { for (QualityScore s : list) {
Map<String, Object> m = new HashMap<>(); Map<String, Object> m = new HashMap<>();
m.put("id", s.getId()); m.put("emrType", s.getEmrType()); m.put("score", s.getScore()); 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()); m.put("grade", s.getGrade()); m.put("checkType", s.getCheckType()); m.put("checkerName", s.getCheckerName());

16
healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/quality/appservice/impl/TerminalQualityAppServiceImpl.java
View File

@@ -1,7 +1,7 @@
package com.healthlink.his.web.quality.appservice.impl; package com.healthlink.his.web.quality.appservice.impl;
import com.healthlink.his.quality.domain.EmrDefect; 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.EmrDefectMapper;
import com.healthlink.his.quality.mapper.QualityScoreMapper; import com.healthlink.his.quality.mapper.QualityScoreMapper;
import com.healthlink.his.web.quality.appservice.ITerminalQualityAppService; import com.healthlink.his.web.quality.appservice.ITerminalQualityAppService;
@@ -44,7 +44,7 @@ public class TerminalQualityAppServiceImpl implements ITerminalQualityAppService
String grade = calculateGrade(score); String grade = calculateGrade(score);
// 保存评分记录 // 保存评分记录
EmrQualityScore qualityScore = new EmrQualityScore(); QualityScore qualityScore = new QualityScore();
qualityScore.setEncounterId(encounterId); qualityScore.setEncounterId(encounterId);
qualityScore.setScore(score); qualityScore.setScore(score);
qualityScore.setMaxScore(new BigDecimal(100)); qualityScore.setMaxScore(new BigDecimal(100));
@@ -69,15 +69,15 @@ public class TerminalQualityAppServiceImpl implements ITerminalQualityAppService
result.put("encounterId", encounterId); result.put("encounterId", encounterId);
// 获取评分记录 // 获取评分记录
List<EmrQualityScore> scores = scoreMapper.selectList( List<QualityScore> scores = scoreMapper.selectList(
new LambdaQueryWrapper<EmrQualityScore>() new LambdaQueryWrapper<QualityScore>()
.eq(EmrQualityScore::getEncounterId, encounterId) .eq(QualityScore::getEncounterId, encounterId)
.eq(EmrQualityScore::getCheckType, "TERMINAL") .eq(QualityScore::getCheckType, "TERMINAL")
.orderByDesc(EmrQualityScore::getCreateTime) .orderByDesc(QualityScore::getCreateTime)
); );
if (!scores.isEmpty()) { if (!scores.isEmpty()) {
EmrQualityScore latestScore = scores.get(0); QualityScore latestScore = scores.get(0);
result.put("score", latestScore.getScore()); result.put("score", latestScore.getScore());
result.put("grade", latestScore.getGrade()); result.put("grade", latestScore.getGrade());
result.put("checkTime", latestScore.getCreateTime()); result.put("checkTime", latestScore.getCreateTime());

2
healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/quality/domain/EmrQualityScore.java → healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/quality/domain/QualityScore.java
View File

@@ -6,7 +6,7 @@ import com.core.common.core.domain.HisBaseEntity;
import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data @TableName("emr_quality_score") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @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; @TableId(type = IdType.ASSIGN_ID) private Long id;
private Long encounterId; private Long patientId; private String emrType; private Long encounterId; private Long patientId; private String emrType;
private BigDecimal score; private BigDecimal maxScore; private String grade; private BigDecimal score; private BigDecimal maxScore; private String grade;

4
healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/quality/mapper/QualityScoreMapper.java
View File

@@ -1,5 +1,5 @@
package com.healthlink.his.quality.mapper; package com.healthlink.his.quality.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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; import org.apache.ibatis.annotations.Mapper;
@Mapper public interface QualityScoreMapper extends BaseMapper<EmrQualityScore> {} @Mapper public interface QualityScoreMapper extends BaseMapper<QualityScore> {}