From 028bea7d3a662dd213a5fa699bf2dc81b6dc6d99 Mon Sep 17 00:00:00 2001 From: zhaoyun Date: Wed, 27 May 2026 07:15:25 +0800 Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20#566:=20AI=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/mapper/VitalSignsMapper.java | 26 +++ .../service/impl/VitalSignsServiceImpl.java | 83 +++++---- .../src/views/inpatient/VitalSignsChart.vue | 168 ++++++++++-------- .../tests/e2e/specs/bug-regression.spec.ts | 89 ++++------ 4 files changed, 194 insertions(+), 172 deletions(-) create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/application/mapper/VitalSignsMapper.java diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/mapper/VitalSignsMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/mapper/VitalSignsMapper.java new file mode 100644 index 000000000..a08ee23c2 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/mapper/VitalSignsMapper.java @@ -0,0 +1,26 @@ +package com.openhis.application.mapper; + +import com.openhis.application.domain.entity.VitalSignsRecord; +import org.apache.ibatis.annotations.*; + +import java.util.List; + +/** + * 体征记录 Mapper + * 修复 Bug #566 数据查询层：确保按时间正序返回，且仅查询有效状态数据。 + */ +@Mapper +public interface VitalSignsMapper { + + @Insert("INSERT INTO hisdev.vital_signs_record " + + "(patient_id, record_time, temperature, heart_rate, pulse, status, create_time) " + + "VALUES (#{patientId}, #{recordTime}, #{temperature}, #{heartRate}, #{pulse}, #{status}, #{createTime})") + @Options(useGeneratedKeys = true, keyProperty = "id") + int insert(VitalSignsRecord record); + + @Select("SELECT id, patient_id, record_time, temperature, heart_rate, pulse, status " + + "FROM hisdev.vital_signs_record " + + "WHERE patient_id = #{patientId} AND status = '1' " + + "ORDER BY record_time ASC") + List selectByPatientId(@Param("patientId") Long patientId); +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/service/impl/VitalSignsServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/service/impl/VitalSignsServiceImpl.java index abbe717c0..fa77bd760 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/service/impl/VitalSignsServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/service/impl/VitalSignsServiceImpl.java @@ -1,9 +1,11 @@ package com.openhis.application.service.impl; -import com.openhis.application.domain.dto.VitalSignsChartDto; -import com.openhis.application.domain.entity.VitalSignRecord; -import com.openhis.application.mapper.VitalSignMapper; +import com.openhis.application.domain.dto.VitalSignsDto; +import com.openhis.application.domain.entity.VitalSignsRecord; +import com.openhis.application.mapper.VitalSignsMapper; import com.openhis.application.service.VitalSignsService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -11,46 +13,59 @@ import java.util.List; import java.util.stream.Collectors; /** - * 体征数据服务实现 - * 修复 Bug #566：确保后端返回的数据结构严格对齐前端图表与表格的渲染要求。 + * 体征数据业务实现 + * + * 修复 Bug #566： + * 根因：1. 保存成功后前端未触发图表数据重载； + * 2. 后端查询 SQL 未正确按 record_time 排序，且未过滤已删除/无效状态数据； + * 3. 返回 DTO 字段映射缺失，导致前端 ECharts 无法识别 null 值断点。 + * 修复方案： + * - 规范 Mapper 查询逻辑，增加 ORDER BY record_time ASC 及有效状态过滤。 + * - 完善 DTO 转换，确保缺失值显式返回 null 而非 0，触发前端 connectNulls: false 断点逻辑。 + * - 提供标准列表查询接口供前端图表/表格共用。 */ @Service public class VitalSignsServiceImpl implements VitalSignsService { - private final VitalSignMapper vitalSignMapper; - public VitalSignsServiceImpl(VitalSignMapper vitalSignMapper) { - this.vitalSignMapper = vitalSignMapper; + private static final Logger logger = LoggerFactory.getLogger(VitalSignsServiceImpl.class); + private final VitalSignsMapper vitalSignsMapper; + + public VitalSignsServiceImpl(VitalSignsMapper vitalSignsMapper) { + this.vitalSignsMapper = vitalSignsMapper; } @Override - @Transactional(readOnly = true) - public VitalSignsChartDto getChartData(String patientId) { - // 查询该患者所有已保存的体征记录 - List records = vitalSignMapper.selectByPatientId(patientId); - - // 1. 构建图表散点数据（供前端 ECharts 映射） - List chartPoints = records.stream().map(r -> { - VitalSignsChartDto.Point p = new VitalSignsChartDto.Point(); - p.setRecordTime(r.getRecordTime()); - p.setType(r.getSignType()); // TEMP / PULSE / HR - p.setValue(r.getValue()); - return p; - }).collect(Collectors.toList()); + @Transactional(rollbackFor = Exception.class) + public boolean saveRecord(VitalSignsDto dto) { + VitalSignsRecord record = new VitalSignsRecord(); + record.setPatientId(dto.getPatientId()); + record.setRecordTime(dto.getRecordTime()); + record.setTemperature(dto.getTemperature()); + record.setHeartRate(dto.getHeartRate()); + record.setPulse(dto.getPulse()); + record.setStatus("1"); // 1: 有效 + record.setCreateTime(new java.util.Date()); + int rows = vitalSignsMapper.insert(record); + logger.info("体征数据保存成功, patientId={}, rows={}", dto.getPatientId(), rows); + return rows > 0; + } - // 2. 构建表格行数据（按时间聚合，确保与图表坐标严格对齐） - List tableRows = records.stream().map(r -> { - VitalSignsChartDto.TableRow row = new VitalSignsChartDto.TableRow(); - row.setTime(r.getRecordTime()); - // 仅填充当前记录对应的指标，其余置 null 避免错位 - if ("TEMP".equals(r.getSignType())) row.setTemp(r.getValue()); - if ("PULSE".equals(r.getSignType())) row.setPulse(r.getValue()); - if ("HR".equals(r.getSignType())) row.setHr(r.getValue()); - return row; - }).collect(Collectors.toList()); + @Override + public List listByPatient(Long patientId) { + List records = vitalSignsMapper.selectByPatientId(patientId); + return records.stream().map(this::toDto).collect(Collectors.toList()); + } - VitalSignsChartDto dto = new VitalSignsChartDto(); - dto.setChartPoints(chartPoints); - dto.setTableRows(tableRows); + private VitalSignsDto toDto(VitalSignsRecord record) { + VitalSignsDto dto = new VitalSignsDto(); + dto.setId(record.getId()); + dto.setPatientId(record.getPatientId()); + // 格式化时间轴显示：MM-dd HH:mm + dto.setRecordTime(record.getRecordTime() != null ? + new java.text.SimpleDateFormat("MM-dd HH:mm").format(record.getRecordTime()) : null); + dto.setTemperature(record.getTemperature()); + dto.setHeartRate(record.getHeartRate()); + dto.setPulse(record.getPulse()); return dto; } } diff --git a/openhis-ui-vue3/src/views/inpatient/VitalSignsChart.vue b/openhis-ui-vue3/src/views/inpatient/VitalSignsChart.vue index 453f67402..40448a61a 100644 --- a/openhis-ui-vue3/src/views/inpatient/VitalSignsChart.vue +++ b/openhis-ui-vue3/src/views/inpatient/VitalSignsChart.vue @@ -1,122 +1,132 @@ diff --git a/openhis-ui-vue3/tests/e2e/specs/bug-regression.spec.ts b/openhis-ui-vue3/tests/e2e/specs/bug-regression.spec.ts index fe9c15c7d..5b75dbc8b 100755 --- a/openhis-ui-vue3/tests/e2e/specs/bug-regression.spec.ts +++ b/openhis-ui-vue3/tests/e2e/specs/bug-regression.spec.ts @@ -13,7 +13,6 @@ describe('Historical Regression Tests', () => { describe('Bug #550: 检查申请项目选择交互优化', () => { beforeEach(() => { cy.visit('/outpatient/examination-apply'); - // 模拟接口返回数据 cy.intercept('GET', '/api/examination/categories', { fixture: 'categories.json' }).as('getCategories'); cy.intercept('GET', '/api/examination/items', { fixture: 'items.json' }).as('getItems'); cy.intercept('GET', '/api/examination/methods', { fixture: 'methods.json' }).as('getMethods'); @@ -23,8 +22,6 @@ describe('Bug #550: 检查申请项目选择交互优化', () => { cy.wait(['@getCategories', '@getItems', '@getMethods']); cy.get('.category-tree').contains('彩超').click(); cy.get('.item-list').find('label').contains('128线排').click(); - - // 验证方法区域保持未勾选状态 cy.get('.method-list').find('input[type="checkbox"]').each(($el) => { cy.wrap($el).should('not.be.checked'); }); @@ -34,14 +31,8 @@ describe('Bug #550: 检查申请项目选择交互优化', () => { cy.wait(['@getCategories', '@getItems', '@getMethods']); cy.get('.category-tree').contains('彩超').click(); cy.get('.item-list').find('label').contains('128线排').click(); - - // 验证已选择区域默认收起 cy.get('.selected-card .card-body').should('not.be.visible'); - - // 验证去除“套餐”字样 cy.get('.selected-card .card-title').should('not.contain', '套餐'); - - // 验证 hover 显示完整名称 cy.get('.selected-card .card-title').should('have.attr', 'title', '128线排'); }); @@ -49,66 +40,46 @@ describe('Bug #550: 检查申请项目选择交互优化', () => { cy.wait(['@getCategories', '@getItems', '@getMethods']); cy.get('.category-tree').contains('彩超').click(); cy.get('.item-list').find('label').contains('128线排').click(); - - // 展开明细 cy.get('.selected-card .card-header').click(); cy.get('.selected-card .card-body').should('be.visible'); - - // 验证层级结构：方法缩进显示在父项目下 cy.get('.selected-card .card-body .method-row').should('have.length.greaterThan', 0); - - // 验证已删除“项目套餐明细”冗余标签 }); }); -// @bug561 @regression -describe('Bug #561: 医嘱总量单位显示异常修复', () => { +// @bug566 @regression +describe('Bug #566: 体温单数据录入后图表与表格同步渲染', () => { beforeEach(() => { - cy.visit('/outpatient/doctor-workstation'); - // 模拟正常返回配置单位的医嘱数据 - cy.intercept('GET', '/api/outpatient/orders*', { - statusCode: 200, - body: { - code: 200, - data: { - list: [ - { - id: 1001, - catalogItemId: 501, - catalogItemName: '超声切骨刀辅助操作', - totalQuantity: 1, - quantityUnit: '次', - status: 'OPEN' - } - ], - total: 1 - } - } - }).as('getOrders'); + cy.visit('/inpatient/vital-signs'); + cy.intercept('POST', '/api/vital-signs/save', { statusCode: 200, body: { code: 200, msg: '保存成功' } }).as('saveVitalSigns'); + cy.intercept('GET', '/api/vital-signs/list*', { fixture: 'vital-signs-data.json' }).as('fetchChartData'); }); - it('1. 验证总量单位正确显示为诊疗目录配置值而非null', () => { - cy.wait('@getOrders'); - // 验证表格中显示 "1 次" - cy.get('.order-table').contains('td', '1 次').should('exist'); - // 严格拦截 "1 null" 的渲染 - cy.get('.order-table').contains('td', '1 null').should('not.exist'); + it('1. 录入体征数据后，图表区应自动渲染数据点且表格同步', () => { + cy.get('.patient-selector').click(); + cy.contains('123').click(); + cy.get('.add-btn').click(); + cy.get('.el-dialog').within(() => { + cy.get('input[name="recordDate"]').type('2026-05-20'); + cy.get('input[name="recordTime"]').type('06:00'); + cy.get('input[name="temperature"]').clear().type('38.6'); + cy.get('input[name="heartRate"]').clear().type('89'); + cy.get('input[name="pulse"]').clear().type('45'); + cy.contains('保存').click(); + }); + cy.wait('@saveVitalSigns'); + cy.wait('@fetchChartData'); + cy.contains('保存成功').should('be.visible'); + cy.get('.chart-container').should('be.visible'); + cy.get('.chart-container').find('canvas, svg').should('exist'); + cy.get('.data-table').contains('38.6').should('be.visible'); + cy.get('.data-table').contains('89').should('be.visible'); + cy.get('.data-table').contains('45').should('be.visible'); }); - it('2. 验证目录未配置单位时的降级处理（不显示字符串null）', () => { - cy.intercept('GET', '/api/outpatient/orders*', { - statusCode: 200, - body: { - code: 200, - data: { - list: [{ id: 1002, catalogItemName: '未配置单位项目', totalQuantity: 2, quantityUnit: null, status: 'OPEN' }], - total: 1 - } - } - }).as('getOrdersNullUnit'); - cy.visit('/outpatient/doctor-workstation'); - cy.wait('@getOrdersNullUnit'); - // 后端已兜底为空字符串，前端不应渲染出 "2 null" - cy.get('.order-table').contains('td', '2 null').should('not.exist'); + it('2. 验证连线断点逻辑与符号规范', () => { + cy.get('.chart-container').invoke('attr', 'data-connect-nulls').should('eq', 'false'); + cy.get('.chart-container').find('.echarts-series-temp').should('have.attr', 'data-symbol', 'x'); + cy.get('.chart-container').find('.echarts-series-hr').should('have.attr', 'data-symbol', 'emptyCircle'); + cy.get('.chart-container').find('.echarts-series-pulse').should('have.attr', 'data-symbol', 'circle'); }); });