diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/antibiotic/appservice/impl/AntibioticAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/antibiotic/appservice/impl/AntibioticAppServiceImpl.java index 6aaea22b0..054e3c5cd 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/antibiotic/appservice/impl/AntibioticAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/antibiotic/appservice/impl/AntibioticAppServiceImpl.java @@ -28,7 +28,7 @@ public class AntibioticAppServiceImpl implements IAntibioticAppService { } @Override public AntibioticApproval requestApproval(AntibioticApproval a) { - a.setStatus("PENDING"); a.setDelFlag("0"); approvalService.save(a); return a; + a.setStatus("PENDING"); a.setDeleteFlag("0"); approvalService.save(a); return a; } @Override public void approve(Long id, Long approverId, String approverName, String result) { diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V2026_0611__fix_prescription_intercept_log.sql b/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V2026_0611__fix_prescription_intercept_log.sql new file mode 100644 index 000000000..09d408400 --- /dev/null +++ b/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V2026_0611__fix_prescription_intercept_log.sql @@ -0,0 +1,7 @@ +-- Fix: prescription_intercept_log missing HisBaseEntity columns +ALTER TABLE prescription_intercept_log ADD COLUMN IF NOT EXISTS delete_flag VARCHAR(1) DEFAULT '0'; +ALTER TABLE prescription_intercept_log ADD COLUMN IF NOT EXISTS create_by VARCHAR(64) DEFAULT ''; +ALTER TABLE prescription_intercept_log ADD COLUMN IF NOT EXISTS create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP; +ALTER TABLE prescription_intercept_log ADD COLUMN IF NOT EXISTS update_by VARCHAR(64) DEFAULT ''; +ALTER TABLE prescription_intercept_log ADD COLUMN IF NOT EXISTS update_time TIMESTAMP; +ALTER TABLE prescription_intercept_log ADD COLUMN IF NOT EXISTS tenant_id BIGINT DEFAULT 1; \ No newline at end of file diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V42__add_del_flag_to_sys_audit_log.sql b/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V42__add_del_flag_to_sys_audit_log.sql new file mode 100644 index 000000000..64170363a --- /dev/null +++ b/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V42__add_del_flag_to_sys_audit_log.sql @@ -0,0 +1,4 @@ +-- 为 sys_audit_log 添加 del_flag 列以匹配 HisBaseEntity 逻辑删除 +ALTER TABLE sys_audit_log ADD COLUMN IF NOT EXISTS del_flag CHAR(1) DEFAULT '0'; +COMMENT ON COLUMN sys_audit_log.del_flag IS '删除标识(0=正常,1=删除)'; +UPDATE sys_audit_log SET del_flag = '0' WHERE del_flag IS NULL; \ No newline at end of file diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V42__add_delete_flag_columns.sql b/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V42__add_delete_flag_columns.sql new file mode 100644 index 000000000..b9ab72d60 --- /dev/null +++ b/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V42__add_delete_flag_columns.sql @@ -0,0 +1,10 @@ +-- 为 sys_audit_log 和 antibiotic_approval 添加 delete_flag 列以匹配 HisBaseEntity 默认映射 +-- HisBaseEntity.deleteFlag 映射到 delete_flag (MyBatis-Plus camelCase默认) +ALTER TABLE sys_audit_log ADD COLUMN IF NOT EXISTS delete_flag CHAR(1) DEFAULT '0'; +COMMENT ON COLUMN sys_audit_log.delete_flag IS '删除标识(0=正常,1=删除)'; +UPDATE sys_audit_log SET delete_flag = '0' WHERE delete_flag IS NULL; + +-- antibiotic_approval 表原有 del_flag 列，新增 delete_flag 列供 HisBaseEntity 使用 +ALTER TABLE antibiotic_approval ADD COLUMN IF NOT EXISTS delete_flag CHAR(1) DEFAULT '0'; +COMMENT ON COLUMN antibiotic_approval.delete_flag IS '删除标识(0=正常,1=删除)'; +UPDATE antibiotic_approval SET delete_flag = '0' WHERE delete_flag IS NULL; \ No newline at end of file diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/antibiotic/domain/AntibioticApproval.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/antibiotic/domain/AntibioticApproval.java index 800559647..c8a8a68fa 100644 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/antibiotic/domain/AntibioticApproval.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/antibiotic/domain/AntibioticApproval.java @@ -1,16 +1,31 @@ package com.healthlink.his.antibiotic.domain; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; + +import com.baomidou.mybatisplus.annotation.*; 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("antibiotic_approval") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) + +@Data +@TableName("antibiotic_approval") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) public class AntibioticApproval extends HisBaseEntity { - @TableId(type = IdType.ASSIGN_ID) private Long id; - private Long encounterId; private Long patientId; - private String drugCode; private String drugName; private String antibioticClass; - private Long requesterId; private String requesterName; - private Long approverId; private String approverName; private Date approvalTime; - private String approvalResult; private String reason; private String status; private String delFlag; -} + @TableId(type = IdType.ASSIGN_ID) + private Long id; + private Long encounterId; + private Long patientId; + private String drugCode; + private String drugName; + private String antibioticClass; + private Long requesterId; + private String requesterName; + private Long approverId; + private String approverName; + private Date approvalTime; + private String approvalResult; + private String reason; + private String status; +} \ No newline at end of file diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/sys/domain/SysAuditLog.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/sys/domain/SysAuditLog.java index 75d208215..bd7a3d702 100644 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/sys/domain/SysAuditLog.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/sys/domain/SysAuditLog.java @@ -25,4 +25,4 @@ public class SysAuditLog extends HisBaseEntity { private String result; private String errorMsg; private Integer durationMs; -} +} \ No newline at end of file diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/YbDao.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/YbDao.java index 9b6ee32fe..9018e4a6d 100755 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/YbDao.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/YbDao.java @@ -1317,6 +1317,9 @@ public class YbDao { public List reconcileGeneralLedgerDetail(Settlement3201WebParam settlement3201WebParam) { // 获取条件 String clrType = settlement3201WebParam.getClrType();// 住院 or 门诊 + if (StringUtils.isEmpty(clrType)) { + throw new ServiceException("请选择医疗类型：住院/门诊"); + } Integer kindEnum; if (clrType.equals(YbClrType.OUTPATIENT_CLINIC.getValue())) { kindEnum = PaymentKind.OUTPATIENT_CLINIC.getValue(); diff --git a/healthlink-his-ui/src/api/anesthesia/index.js b/healthlink-his-ui/src/api/anesthesia/index.js index 3a156dcec..3c529d7d0 100644 --- a/healthlink-his-ui/src/api/anesthesia/index.js +++ b/healthlink-his-ui/src/api/anesthesia/index.js @@ -1,9 +1,9 @@ import request from '@/utils/request' -export function createRecord(data) { return request({ url: '/healthlink-his/api/v1/anesthesia/record', method: 'post', data }) } -export function updateRecord(data) { return request({ url: '/healthlink-his/api/v1/anesthesia/record', method: 'put', data }) } -export function getRecordDetail(id) { return request({ url: '/healthlink-his/api/v1/anesthesia/record/' + id, method: 'get' }) } -export function getByEncounter(encounterId) { return request({ url: '/healthlink-his/api/v1/anesthesia/record/encounter/' + encounterId, method: 'get' }) } -export function getVitalSigns(recordId) { return request({ url: '/healthlink-his/api/v1/anesthesia/vital-sign/' + recordId, method: 'get' }) } -export function getMedications(recordId) { return request({ url: '/healthlink-his/api/v1/anesthesia/medication/' + recordId, method: 'get' }) } -export function getIoSummary(recordId) { return request({ url: '/healthlink-his/api/v1/anesthesia/io-summary/' + recordId, method: 'get' }) } -export function completeRecord(id) { return request({ url: '/healthlink-his/api/v1/anesthesia/complete/' + id, method: 'put' }) } +export function createRecord(data) { return request({ url: '/api/v1/anesthesia/record', method: 'post', data }) } +export function updateRecord(data) { return request({ url: '/api/v1/anesthesia/record', method: 'put', data }) } +export function getRecordDetail(id) { return request({ url: '/api/v1/anesthesia/record/' + id, method: 'get' }) } +export function getByEncounter(encounterId) { return request({ url: '/api/v1/anesthesia/record/encounter/' + encounterId, method: 'get' }) } +export function getVitalSigns(recordId) { return request({ url: '/api/v1/anesthesia/vital-sign/' + recordId, method: 'get' }) } +export function getMedications(recordId) { return request({ url: '/api/v1/anesthesia/medication/' + recordId, method: 'get' }) } +export function getIoSummary(recordId) { return request({ url: '/api/v1/anesthesia/io-summary/' + recordId, method: 'get' }) } +export function completeRecord(id) { return request({ url: '/api/v1/anesthesia/complete/' + id, method: 'put' }) } diff --git a/healthlink-his-ui/src/api/antibiotic.js b/healthlink-his-ui/src/api/antibiotic.js index 13f609652..6e63fef5f 100644 --- a/healthlink-his-ui/src/api/antibiotic.js +++ b/healthlink-his-ui/src/api/antibiotic.js @@ -2,23 +2,23 @@ import request from '@/utils/request' // ==================== 抗菌药物管控 ==================== export function getRules(drugCode) { - return request({ url: `/healthlink-his/api/v1/antibiotic/rules/${drugCode}`, method: 'get' }) + return request({ url: `/api/v1/antibiotic/rules/${drugCode}`, method: 'get' }) } export function checkRestriction(drugCode, doctorLevel) { - return request({ url: '/healthlink-his/api/v1/antibiotic/check-restriction', method: 'get', params: { drugCode, doctorLevel } }) + return request({ url: '/api/v1/antibiotic/check-restriction', method: 'get', params: { drugCode, doctorLevel } }) } export function requestApproval(data) { - return request({ url: '/healthlink-his/api/v1/antibiotic/approval', method: 'post', data }) + return request({ url: '/api/v1/antibiotic/approval', method: 'post', data }) } export function approve(id, approverId, approverName, result) { - return request({ url: `/healthlink-his/api/v1/antibiotic/approval/${id}`, method: 'put', params: { approverId, approverName, result } }) + return request({ url: `/api/v1/antibiotic/approval/${id}`, method: 'put', params: { approverId, approverName, result } }) } export function getStatistics(startDate, endDate) { - return request({ url: '/healthlink-his/api/v1/antibiotic/statistics', method: 'get', params: { startDate, endDate } }) + return request({ url: '/api/v1/antibiotic/statistics', method: 'get', params: { startDate, endDate } }) } // 新增抗菌药物规则 diff --git a/healthlink-his-ui/src/api/antibiotic/index.js b/healthlink-his-ui/src/api/antibiotic/index.js index 498a708eb..69ae45158 100644 --- a/healthlink-his-ui/src/api/antibiotic/index.js +++ b/healthlink-his-ui/src/api/antibiotic/index.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -export function getRules(drugCode) { return request({ url: '/healthlink-his/api/v1/antibiotic/rules/' + drugCode, method: 'get' }) } -export function checkRestriction(drugCode, doctorLevel) { return request({ url: '/healthlink-his/api/v1/antibiotic/check-restriction', method: 'get', params: { drugCode, doctorLevel } }) } -export function requestApproval(data) { return request({ url: '/healthlink-his/api/v1/antibiotic/approval', method: 'post', data }) } -export function approve(id, params) { return request({ url: '/healthlink-his/api/v1/antibiotic/approval/' + id, method: 'put', params }) } -export function getStatistics() { return request({ url: '/healthlink-his/api/v1/antibiotic/statistics', method: 'get' }) } +export function getRules(drugCode) { return request({ url: '/api/v1/antibiotic/rules/' + drugCode, method: 'get' }) } +export function checkRestriction(drugCode, doctorLevel) { return request({ url: '/api/v1/antibiotic/check-restriction', method: 'get', params: { drugCode, doctorLevel } }) } +export function requestApproval(data) { return request({ url: '/api/v1/antibiotic/approval', method: 'post', data }) } +export function approve(id, params) { return request({ url: '/api/v1/antibiotic/approval/' + id, method: 'put', params }) } +export function getStatistics() { return request({ url: '/api/v1/antibiotic/statistics', method: 'get' }) } diff --git a/healthlink-his-ui/src/api/casignature/index.js b/healthlink-his-ui/src/api/casignature/index.js index afbdebb73..f9779926f 100644 --- a/healthlink-his-ui/src/api/casignature/index.js +++ b/healthlink-his-ui/src/api/casignature/index.js @@ -1,5 +1,5 @@ import request from '@/utils/request' -export function verifySignature(documentType, documentId) { return request({ url: '/healthlink-his/api/v1/ca-signature/verify/' + documentType + '/' + documentId, method: 'get' }) } -export function getSignatureHistory(documentType, documentId) { return request({ url: '/healthlink-his/api/v1/ca-signature/history/' + documentType + '/' + documentId, method: 'get' }) } -export function revokeSignature(id) { return request({ url: '/healthlink-his/api/v1/ca-signature/revoke/' + id, method: 'put' }) } -export function getSignatureStatistics() { return request({ url: '/healthlink-his/api/v1/ca-signature/statistics', method: 'get' }) } +export function verifySignature(documentType, documentId) { return request({ url: '/api/v1/ca-signature/verify/' + documentType + '/' + documentId, method: 'get' }) } +export function getSignatureHistory(documentType, documentId) { return request({ url: '/api/v1/ca-signature/history/' + documentType + '/' + documentId, method: 'get' }) } +export function revokeSignature(id) { return request({ url: '/api/v1/ca-signature/revoke/' + id, method: 'put' }) } +export function getSignatureStatistics() { return request({ url: '/api/v1/ca-signature/statistics', method: 'get' }) } diff --git a/healthlink-his-ui/src/api/criticalvalue/index.js b/healthlink-his-ui/src/api/criticalvalue/index.js index 543020a5b..858934a00 100644 --- a/healthlink-his-ui/src/api/criticalvalue/index.js +++ b/healthlink-his-ui/src/api/criticalvalue/index.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -export function getPendingList() { return request({ url: '/healthlink-his/api/v1/critical-value/pending', method: 'get' }) } -export function confirmValue(id, params) { return request({ url: '/healthlink-his/api/v1/critical-value/confirm/' + id, method: 'put', params }) } -export function closeValue(id) { return request({ url: '/healthlink-his/api/v1/critical-value/close/' + id, method: 'put' }) } -export function getStatistics() { return request({ url: '/healthlink-his/api/v1/critical-value/statistics', method: 'get' }) } -export function getOverdueList() { return request({ url: '/healthlink-his/api/v1/critical-value/overdue', method: 'get' }) } +export function getPendingList() { return request({ url: '/api/v1/critical-value/pending', method: 'get' }) } +export function confirmValue(id, params) { return request({ url: '/api/v1/critical-value/confirm/' + id, method: 'put', params }) } +export function closeValue(id) { return request({ url: '/api/v1/critical-value/close/' + id, method: 'put' }) } +export function getStatistics() { return request({ url: '/api/v1/critical-value/statistics', method: 'get' }) } +export function getOverdueList() { return request({ url: '/api/v1/critical-value/overdue', method: 'get' }) } diff --git a/healthlink-his-ui/src/api/emr/index.js b/healthlink-his-ui/src/api/emr/index.js index 098dbec27..c814665a3 100644 --- a/healthlink-his-ui/src/api/emr/index.js +++ b/healthlink-his-ui/src/api/emr/index.js @@ -1,9 +1,9 @@ import request from '@/utils/request' -export function createRevision(data) { return request({ url: '/healthlink-his/api/v1/emr/revision', method: 'post', data }) } -export function getRevisionHistory(emrId) { return request({ url: '/healthlink-his/api/v1/emr/revision/' + emrId, method: 'get' }) } -export function executeCompletenessCheck(emrId) { return request({ url: '/healthlink-his/api/v1/emr/completeness-check/' + emrId, method: 'post' }) } -export function getCompletenessCheck(emrId) { return request({ url: '/healthlink-his/api/v1/emr/completeness-check/' + emrId, method: 'get' }) } -export function getTimelinessByEncounter(encounterId) { return request({ url: '/healthlink-his/api/v1/emr/timeliness/encounter/' + encounterId, method: 'get' }) } -export function getOverdueList() { return request({ url: '/healthlink-his/api/v1/emr/timeliness/overdue', method: 'get' }) } -export function getTimelinessStatistics(params) { return request({ url: '/healthlink-his/api/v1/emr/timeliness/statistics', method: 'get', params }) } -export function checkTimeliness(data) { return request({ url: '/healthlink-his/api/v1/emr/timeliness/check', method: 'post', data }) } +export function createRevision(data) { return request({ url: '/api/v1/emr/revision', method: 'post', data }) } +export function getRevisionHistory(emrId) { return request({ url: '/api/v1/emr/revision/' + emrId, method: 'get' }) } +export function executeCompletenessCheck(emrId) { return request({ url: '/api/v1/emr/completeness-check/' + emrId, method: 'post' }) } +export function getCompletenessCheck(emrId) { return request({ url: '/api/v1/emr/completeness-check/' + emrId, method: 'get' }) } +export function getTimelinessByEncounter(encounterId) { return request({ url: '/api/v1/emr/timeliness/encounter/' + encounterId, method: 'get' }) } +export function getOverdueList() { return request({ url: '/api/v1/emr/timeliness/overdue', method: 'get' }) } +export function getTimelinessStatistics(params) { return request({ url: '/api/v1/emr/timeliness/statistics', method: 'get', params }) } +export function checkTimeliness(data) { return request({ url: '/api/v1/emr/timeliness/check', method: 'post', data }) } diff --git a/healthlink-his-ui/src/api/infection/index.js b/healthlink-his-ui/src/api/infection/index.js index 90f550420..39b5eb525 100644 --- a/healthlink-his-ui/src/api/infection/index.js +++ b/healthlink-his-ui/src/api/infection/index.js @@ -1,4 +1,4 @@ import request from '@/utils/request' -export function getCaseList(params) { return request({ url: '/healthlink-his/api/v1/infection/case', method: 'get', params }) } -export function getStatistics() { return request({ url: '/healthlink-his/api/v1/infection/statistics', method: 'get' }) } -export function getExposureList() { return request({ url: '/healthlink-his/api/v1/infection/exposure', method: 'get' }) } +export function getCaseList(params) { return request({ url: '/api/v1/infection/case', method: 'get', params }) } +export function getStatistics() { return request({ url: '/api/v1/infection/statistics', method: 'get' }) } +export function getExposureList() { return request({ url: '/api/v1/infection/exposure', method: 'get' }) } diff --git a/healthlink-his-ui/src/api/mrhomepage/index.js b/healthlink-his-ui/src/api/mrhomepage/index.js index 227bf397b..370befdd6 100644 --- a/healthlink-his-ui/src/api/mrhomepage/index.js +++ b/healthlink-his-ui/src/api/mrhomepage/index.js @@ -1,8 +1,8 @@ import request from '@/utils/request' -export function generateHomepage(data) { return request({ url: '/healthlink-his/api/v1/mr-homepage/generate', method: 'post', data }) } -export function updateHomepage(data) { return request({ url: '/healthlink-his/api/v1/mr-homepage', method: 'put', data }) } -export function getHomepageDetail(id) { return request({ url: '/healthlink-his/api/v1/mr-homepage/' + id, method: 'get' }) } -export function executeQualityCheck(id) { return request({ url: '/healthlink-his/api/v1/mr-homepage/quality-check/' + id, method: 'post' }) } -export function getQualityCheck(homepageId) { return request({ url: '/healthlink-his/api/v1/mr-homepage/quality-check/' + homepageId, method: 'get' }) } -export function getStatistics(params) { return request({ url: '/healthlink-his/api/v1/mr-homepage/statistics', method: 'get', params }) } -export function submitHomepage(id) { return request({ url: '/healthlink-his/api/v1/mr-homepage/submit/' + id, method: 'put' }) } +export function generateHomepage(data) { return request({ url: '/api/v1/mr-homepage/generate', method: 'post', data }) } +export function updateHomepage(data) { return request({ url: '/api/v1/mr-homepage', method: 'put', data }) } +export function getHomepageDetail(id) { return request({ url: '/api/v1/mr-homepage/' + id, method: 'get' }) } +export function executeQualityCheck(id) { return request({ url: '/api/v1/mr-homepage/quality-check/' + id, method: 'post' }) } +export function getQualityCheck(homepageId) { return request({ url: '/api/v1/mr-homepage/quality-check/' + homepageId, method: 'get' }) } +export function getStatistics(params) { return request({ url: '/api/v1/mr-homepage/statistics', method: 'get', params }) } +export function submitHomepage(id) { return request({ url: '/api/v1/mr-homepage/submit/' + id, method: 'put' }) } diff --git a/healthlink-his-ui/src/api/nursing/index.js b/healthlink-his-ui/src/api/nursing/index.js index f3103c33d..a034d0ff7 100644 --- a/healthlink-his-ui/src/api/nursing/index.js +++ b/healthlink-his-ui/src/api/nursing/index.js @@ -1,7 +1,7 @@ import request from '@/utils/request' -export function createAssessment(data) { return request({ url: '/healthlink-his/api/v1/nursing/assessment', method: 'post', data }) } -export function getAssessmentsByEncounter(encounterId) { return request({ url: '/healthlink-his/api/v1/nursing/assessment/encounter/' + encounterId, method: 'get' }) } -export function createCarePlan(data) { return request({ url: '/healthlink-his/api/v1/nursing/care-plan', method: 'post', data }) } -export function getCarePlansByEncounter(encounterId) { return request({ url: '/healthlink-his/api/v1/nursing/care-plan/encounter/' + encounterId, method: 'get' }) } -export function createHandoff(data) { return request({ url: '/healthlink-his/api/v1/nursing/handoff', method: 'post', data }) } -export function getHandoffList(params) { return request({ url: '/healthlink-his/api/v1/nursing/handoff', method: 'get', params }) } +export function createAssessment(data) { return request({ url: '/api/v1/nursing/assessment', method: 'post', data }) } +export function getAssessmentsByEncounter(encounterId) { return request({ url: '/api/v1/nursing/assessment/encounter/' + encounterId, method: 'get' }) } +export function createCarePlan(data) { return request({ url: '/api/v1/nursing/care-plan', method: 'post', data }) } +export function getCarePlansByEncounter(encounterId) { return request({ url: '/api/v1/nursing/care-plan/encounter/' + encounterId, method: 'get' }) } +export function createHandoff(data) { return request({ url: '/api/v1/nursing/handoff', method: 'post', data }) } +export function getHandoffList(params) { return request({ url: '/api/v1/nursing/handoff', method: 'get', params }) } diff --git a/healthlink-his-ui/src/api/orderclosedloop/index.js b/healthlink-his-ui/src/api/orderclosedloop/index.js index 4bc1774fe..1afdb1e0b 100644 --- a/healthlink-his-ui/src/api/orderclosedloop/index.js +++ b/healthlink-his-ui/src/api/orderclosedloop/index.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 医嘱执行记录列表 export function listOrderExecuteRecord(params) { return request({ - url: '/healthlink-his/api/v1/order-closed-loop/list', + url: '/api/v1/order-closed-loop/list', method: 'get', params: params }) @@ -12,7 +12,7 @@ export function listOrderExecuteRecord(params) { // 医嘱闭环状态查询 export function getOrderClosedLoopStatus(orderId) { return request({ - url: '/healthlink-his/api/v1/order-closed-loop/status/' + orderId, + url: '/api/v1/order-closed-loop/status/' + orderId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getOrderClosedLoopStatus(orderId) { // 执行医嘱步骤 export function executeOrderStep(data) { return request({ - url: '/healthlink-his/api/v1/order-closed-loop/execute', + url: '/api/v1/order-closed-loop/execute', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function executeOrderStep(data) { // 闭环统计 export function getClosedLoopStatistics(params) { return request({ - url: '/healthlink-his/api/v1/order-closed-loop/statistics', + url: '/api/v1/order-closed-loop/statistics', method: 'get', params: params }) diff --git a/healthlink-his-ui/src/api/review/index.js b/healthlink-his-ui/src/api/review/index.js index 2adfee172..1bd39f32a 100644 --- a/healthlink-his-ui/src/api/review/index.js +++ b/healthlink-his-ui/src/api/review/index.js @@ -1,4 +1,4 @@ import request from '@/utils/request' -export function createPlan(data) { return request({ url: '/healthlink-his/api/v1/review/plan', method: 'post', data }) } -export function getRecords(planId) { return request({ url: '/healthlink-his/api/v1/review/records/' + planId, method: 'get' }) } -export function getStatistics() { return request({ url: '/healthlink-his/api/v1/review/statistics', method: 'get' }) } +export function createPlan(data) { return request({ url: '/api/v1/review/plan', method: 'post', data }) } +export function getRecords(planId) { return request({ url: '/api/v1/review/records/' + planId, method: 'get' }) } +export function getStatistics() { return request({ url: '/api/v1/review/statistics', method: 'get' }) } diff --git a/healthlink-his-ui/src/views/casignature/components/SignDialog.vue b/healthlink-his-ui/src/views/casignature/components/SignDialog.vue index 86f1fddec..0d497dece 100644 --- a/healthlink-his-ui/src/views/casignature/components/SignDialog.vue +++ b/healthlink-his-ui/src/views/casignature/components/SignDialog.vue @@ -35,7 +35,7 @@ const open = (data) => { formData.value = data || {}; visible.value = true } const handleSign = async () => { try { - await request({ url: '/healthlink-his/api/v1/ca-signature/sign', method: 'post', data: formData.value }) + await request({ url: '/api/v1/ca-signature/sign', method: 'post', data: formData.value }) ElMessage.success('签名成功') visible.value = false } catch (e) { ElMessage.error('签名失败') } diff --git a/healthlink-his-ui/src/views/criticalvalue/api.js b/healthlink-his-ui/src/views/criticalvalue/api.js index 02e55143c..714cef059 100644 --- a/healthlink-his-ui/src/views/criticalvalue/api.js +++ b/healthlink-his-ui/src/views/criticalvalue/api.js @@ -1,9 +1,9 @@ import request from '@/utils/request' -export function reportCriticalValue(data) { return request({ url: '/healthlink-his/api/v1/critical-value/report', method: 'post', data }) } -export function confirmCriticalValue(id, params) { return request({ url: '/healthlink-his/api/v1/critical-value/confirm/' + id, method: 'put', params }) } -export function processCriticalValue(id, params) { return request({ url: '/healthlink-his/api/v1/critical-value/process/' + id, method: 'put', params }) } -export function closeCriticalValue(id) { return request({ url: '/healthlink-his/api/v1/critical-value/close/' + id, method: 'put' }) } -export function getPendingList() { return request({ url: '/healthlink-his/api/v1/critical-value/pending', method: 'get' }) } -export function getOverdueList() { return request({ url: '/healthlink-his/api/v1/critical-value/overdue', method: 'get' }) } -export function getStatistics(params) { return request({ url: '/healthlink-his/api/v1/critical-value/statistics', method: 'get', params }) } +export function reportCriticalValue(data) { return request({ url: '/api/v1/critical-value/report', method: 'post', data }) } +export function confirmCriticalValue(id, params) { return request({ url: '/api/v1/critical-value/confirm/' + id, method: 'put', params }) } +export function processCriticalValue(id, params) { return request({ url: '/api/v1/critical-value/process/' + id, method: 'put', params }) } +export function closeCriticalValue(id) { return request({ url: '/api/v1/critical-value/close/' + id, method: 'put' }) } +export function getPendingList() { return request({ url: '/api/v1/critical-value/pending', method: 'get' }) } +export function getOverdueList() { return request({ url: '/api/v1/critical-value/overdue', method: 'get' }) } +export function getStatistics(params) { return request({ url: '/api/v1/critical-value/statistics', method: 'get', params }) } diff --git a/healthlink-his-ui/src/views/empienhanced/api.js b/healthlink-his-ui/src/views/empienhanced/api.js index 273ad72f5..993755991 100644 --- a/healthlink-his-ui/src/views/empienhanced/api.js +++ b/healthlink-his-ui/src/views/empienhanced/api.js @@ -1,11 +1,11 @@ import request from '@/utils/request' -export function registerPerson(data) { return request({ url: '/healthlink-his/api/v1/empi/person', method: 'post', data }) } -export function mergePersons(primaryId, secondaryIds) { return request({ url: '/healthlink-his/api/v1/empi/merge', method: 'post', params: { primaryId, secondaryIds: secondaryIds.join(',') } }) } -export function findByGlobalId(globalId) { return request({ url: '/healthlink-his/api/v1/empi/person/global/' + globalId, method: 'get' }) } -export function findByIdCard(idCardNo) { return request({ url: '/healthlink-his/api/v1/empi/person/idcard/' + idCardNo, method: 'get' }) } -export function getMappings(globalId) { return request({ url: '/healthlink-his/api/v1/empi/mappings/' + globalId, method: 'get' }) } -export function getStatistics() { return request({ url: '/healthlink-his/api/v1/empi/statistics', method: 'get' }) } +export function registerPerson(data) { return request({ url: '/api/v1/empi/person', method: 'post', data }) } +export function mergePersons(primaryId, secondaryIds) { return request({ url: '/api/v1/empi/merge', method: 'post', params: { primaryId, secondaryIds: secondaryIds.join(',') } }) } +export function findByGlobalId(globalId) { return request({ url: '/api/v1/empi/person/global/' + globalId, method: 'get' }) } +export function findByIdCard(idCardNo) { return request({ url: '/api/v1/empi/person/idcard/' + idCardNo, method: 'get' }) } +export function getMappings(globalId) { return request({ url: '/api/v1/empi/mappings/' + globalId, method: 'get' }) } +export function getStatistics() { return request({ url: '/api/v1/empi/statistics', method: 'get' }) } export function getPhotos(patientId) { return request({ url: '/empi-enhanced/photo/list', method: 'get', params: { patientId } }) } export function addPhoto(data) { return request({ url: '/empi-enhanced/photo/add', method: 'post', data }) }