From c682fbb7c873a7e84cbb6287943a30fb7ae72e87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=8E=E4=BD=97?= Date: Sun, 7 Jun 2026 19:36:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8A=A4=E7=90=86=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E5=A2=9E=E5=BC=BA=20-=20Braden/Morse/NRS2002/=E7=96=BC?= =?UTF-8?q?=E7=97=9B/=E7=AE=A1=E9=81=93=E9=87=8F=E8=A1=A8=E5=AE=8C?= =?UTF-8?q?=E6=95=B4=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - NursingAssessment域修复delFlag/deleteFlag冲突 - 修复nursing_assessment表缺少create_by列 - 修复nursing_assessment_intervention表约束 - 前端评估页面增强（量表选择/评分/风险等级/统计） - 前端API文件补全评估相关接口 - Braden/Morse/NRS2002/疼痛/管道评估测试通过 --- .../impl/NursingAppServiceImpl.java | 12 +- .../NursingAssessmentEnhancedController.java | 18 +- .../his/nursing/domain/NursingAssessment.java | 31 +- .../src/views/nursingenhanced/api.js | 15 + .../src/views/nursingenhanced/assessment.vue | 350 ++++++++++-------- 5 files changed, 245 insertions(+), 181 deletions(-) diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/nursing/appservice/impl/NursingAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/nursing/appservice/impl/NursingAppServiceImpl.java index f117c4997..31ce13782 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/nursing/appservice/impl/NursingAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/nursing/appservice/impl/NursingAppServiceImpl.java @@ -15,14 +15,14 @@ public class NursingAppServiceImpl implements INursingAppService { @Override public NursingAssessment createAssessment(NursingAssessment a) { a.setRiskLevel(calculateRiskLevel(a)); - a.setDelFlag("0"); + a.setDeleteFlag("0"); assessmentService.save(a); return a; } @Override public List getAssessmentsByEncounter(Long encounterId) { return assessmentService.list(new LambdaQueryWrapper() - .eq(NursingAssessment::getEncounterId, encounterId).eq(NursingAssessment::getDelFlag, "0") + .eq(NursingAssessment::getEncounterId, encounterId).eq(NursingAssessment::getDeleteFlag, "0") .orderByDesc(NursingAssessment::getAssessmentTime)); } @Override @@ -36,20 +36,20 @@ public class NursingAppServiceImpl implements INursingAppService { } @Override public NursingCarePlan createCarePlan(NursingCarePlan p) { - p.setDelFlag("0"); carePlanService.save(p); return p; + p.setDeleteFlag("0"); carePlanService.save(p); return p; } @Override public List getCarePlansByEncounter(Long encounterId) { return carePlanService.list(new LambdaQueryWrapper() - .eq(NursingCarePlan::getEncounterId, encounterId).eq(NursingCarePlan::getDelFlag, "0")); + .eq(NursingCarePlan::getEncounterId, encounterId).eq(NursingCarePlan::getDeleteFlag, "0")); } @Override - public NursingHandoff createHandoff(NursingHandoff h) { h.setDelFlag("0"); handoffService.save(h); return h; } + public NursingHandoff createHandoff(NursingHandoff h) { h.setDeleteFlag("0"); handoffService.save(h); return h; } @Override public List getHandoffList(String ward, String shift) { return handoffService.list(new LambdaQueryWrapper() .eq(ward != null, NursingHandoff::getWard, ward) .eq(shift != null, NursingHandoff::getShift, shift) - .eq(NursingHandoff::getDelFlag, "0").orderByDesc(NursingHandoff::getHandoffTime)); + .eq(NursingHandoff::getDeleteFlag, "0").orderByDesc(NursingHandoff::getHandoffTime)); } } diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/nursing/controller/NursingAssessmentEnhancedController.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/nursing/controller/NursingAssessmentEnhancedController.java index 20ed8b0aa..0cece8528 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/nursing/controller/NursingAssessmentEnhancedController.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/nursing/controller/NursingAssessmentEnhancedController.java @@ -43,7 +43,7 @@ public class NursingAssessmentEnhancedController { .eq(StringUtils.hasText(riskLevel), NursingAssessment::getRiskLevel, riskLevel) .eq(encounterId != null, NursingAssessment::getEncounterId, encounterId) .like(StringUtils.hasText(patientName), NursingAssessment::getPatientName, patientName) - .eq(NursingAssessment::getDelFlag, "0") + .eq(NursingAssessment::getDeleteFlag, "0") .orderByDesc(NursingAssessment::getAssessmentTime); return R.ok(assessmentService.page(new Page<>(pageNo, pageSize), w)); } @@ -55,7 +55,7 @@ public class NursingAssessmentEnhancedController { LambdaQueryWrapper w = new LambdaQueryWrapper<>(); w.eq(NursingAssessment::getEncounterId, encounterId) .eq(StringUtils.hasText(assessmentTool), NursingAssessment::getAssessmentTool, assessmentTool) - .eq(NursingAssessment::getDelFlag, "0") + .eq(NursingAssessment::getDeleteFlag, "0") .orderByDesc(NursingAssessment::getAssessmentTime); return R.ok(assessmentService.list(w)); } @@ -73,7 +73,7 @@ public class NursingAssessmentEnhancedController { assessment.setAssessmentTool("BRADEN"); assessment.setTotalScore(total); assessment.setRiskLevel(riskLevel); - assessment.setDelFlag("0"); + assessment.setDeleteFlag("0"); assessment.setAssessmentTime(new Date()); assessmentService.save(assessment); @@ -113,7 +113,7 @@ public class NursingAssessmentEnhancedController { assessment.setAssessmentTool("MORSE"); assessment.setTotalScore(total); assessment.setRiskLevel(riskLevel); - assessment.setDelFlag("0"); + assessment.setDeleteFlag("0"); assessment.setAssessmentTime(new Date()); assessmentService.save(assessment); @@ -152,7 +152,7 @@ public class NursingAssessmentEnhancedController { assessment.setAssessmentTool("NRS2002"); assessment.setTotalScore(total); assessment.setRiskLevel(riskLevel); - assessment.setDelFlag("0"); + assessment.setDeleteFlag("0"); assessment.setAssessmentTime(new Date()); assessmentService.save(assessment); @@ -191,7 +191,7 @@ public class NursingAssessmentEnhancedController { assessment.setAssessmentTool("NRS_PAIN"); assessment.setTotalScore(total); assessment.setRiskLevel(riskLevel); - assessment.setDelFlag("0"); + assessment.setDeleteFlag("0"); assessment.setAssessmentTime(new Date()); assessmentService.save(assessment); @@ -230,7 +230,7 @@ public class NursingAssessmentEnhancedController { assessment.setAssessmentTool("TUBE"); assessment.setTotalScore(total); assessment.setRiskLevel(riskLevel); - assessment.setDelFlag("0"); + assessment.setDeleteFlag("0"); assessment.setAssessmentTime(new Date()); assessmentService.save(assessment); @@ -295,13 +295,13 @@ public class NursingAssessmentEnhancedController { for (String tool : tools) { LambdaQueryWrapper w = new LambdaQueryWrapper<>(); w.eq(NursingAssessment::getAssessmentTool, tool) - .eq(NursingAssessment::getDelFlag, "0"); + .eq(NursingAssessment::getDeleteFlag, "0"); long total = assessmentService.count(w); LambdaQueryWrapper hw = new LambdaQueryWrapper<>(); hw.eq(NursingAssessment::getAssessmentTool, tool) .eq(NursingAssessment::getRiskLevel, "HIGH") - .eq(NursingAssessment::getDelFlag, "0"); + .eq(NursingAssessment::getDeleteFlag, "0"); long highRisk = assessmentService.count(hw); stats.put(tool + "_total", total); diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/nursing/domain/NursingAssessment.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/nursing/domain/NursingAssessment.java index e0efa41b5..7c871597a 100644 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/nursing/domain/NursingAssessment.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/nursing/domain/NursingAssessment.java @@ -3,15 +3,28 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; 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.util.Date; -@Data @TableName("nursing_assessment") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) + +@Data +@TableName("nursing_assessment") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = true) public class NursingAssessment extends HisBaseEntity { - @TableId(type = IdType.ASSIGN_ID) private Long id; - private Long encounterId; private Long patientId; private String patientName; - private Long assessorId; private String assessorName; - private String assessmentType; private String assessmentTool; - private Integer totalScore; private String riskLevel; - private String itemScores; private String detail; - private Date assessmentTime; private String delFlag; + @TableId(type = IdType.ASSIGN_ID) + private Long id; + private Long encounterId; + private Long patientId; + private String patientName; + private Long assessorId; + private String assessorName; + private String assessmentType; + private String assessmentTool; + private Integer totalScore; + private String riskLevel; + private String itemScores; + private String detail; + private Date assessmentTime; } diff --git a/healthlink-his-ui/src/views/nursingenhanced/api.js b/healthlink-his-ui/src/views/nursingenhanced/api.js index 1f0e6f193..fb4e7d535 100644 --- a/healthlink-his-ui/src/views/nursingenhanced/api.js +++ b/healthlink-his-ui/src/views/nursingenhanced/api.js @@ -1,9 +1,24 @@ import request from '@/utils/request' + +// ==================== 护理提醒 ==================== export function getReminderPage(p){return request({url:'/nursing-enhanced/reminder/page',method:'get',params:p})} export function addReminder(d){return request({url:'/nursing-enhanced/reminder/add',method:'post',data:d})} export function completeReminder(id){return request({url:'/nursing-enhanced/reminder/complete',method:'post',params:{id}})} export function getOverdueReminders(){return request({url:'/nursing-enhanced/reminder/overdue',method:'get'})} + +// ==================== 护理计划 ==================== export function getCarePlanPage(p){return request({url:'/nursing-enhanced/care-plan/page',method:'get',params:p})} export function addCarePlan(d){return request({url:'/nursing-enhanced/care-plan/add',method:'post',data:d})} export function evaluateCarePlan(d){return request({url:'/nursing-enhanced/care-plan/evaluate',method:'post',data:d})} export function getQualityStats(p){return request({url:'/nursing-enhanced/quality/stats',method:'get',params:p})} + +// ==================== 护理专项评估 ==================== +export function getPage(p){return request({url:'/nursing-assessment-enhanced/page',method:'get',params:p})} +export function bradenAssess(d){return request({url:'/nursing-assessment-enhanced/braden/assess',method:'post',data:d})} +export function morseAssess(d){return request({url:'/nursing-assessment-enhanced/morse/assess',method:'post',data:d})} +export function nrs2002Assess(d){return request({url:'/nursing-assessment-enhanced/nrs2002/assess',method:'post',data:d})} +export function painAssess(d){return request({url:'/nursing-assessment-enhanced/pain/assess',method:'post',data:d})} +export function tubeAssess(d){return request({url:'/nursing-assessment-enhanced/tube/assess',method:'post',data:d})} +export function getInterventionPage(p){return request({url:'/nursing-assessment-enhanced/intervention/page',method:'get',params:p})} +export function executeIntervention(id){return request({url:`/nursing-assessment-enhanced/intervention/execute/${id}`,method:'put'})} +export function getStats(){return request({url:'/nursing-assessment-enhanced/stats',method:'get'})} diff --git a/healthlink-his-ui/src/views/nursingenhanced/assessment.vue b/healthlink-his-ui/src/views/nursingenhanced/assessment.vue index 72899cedc..d3519fe74 100644 --- a/healthlink-his-ui/src/views/nursingenhanced/assessment.vue +++ b/healthlink-his-ui/src/views/nursingenhanced/assessment.vue @@ -2,7 +2,10 @@
护理专项评估 - 刷新统计 +
+ 刷新统计 + 导出评估报告 +
@@ -51,7 +54,7 @@ @@ -65,13 +68,13 @@
新建NRS2002评估
- + @@ -80,22 +83,18 @@ - - + +
- 新建疼痛评估 + 新建疼痛评估
- - - - + + @@ -104,14 +103,14 @@ - - + +
- 新建导管评估 + 新建管道评估
- +