diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/emr/appservice/impl/StructuredEmrAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/emr/appservice/impl/StructuredEmrAppServiceImpl.java index 289c2ce49..c31c315eb 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/emr/appservice/impl/StructuredEmrAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/emr/appservice/impl/StructuredEmrAppServiceImpl.java @@ -4,10 +4,10 @@ import com.healthlink.his.emr.domain.EmrCompletenessCheck; import com.healthlink.his.emr.domain.EmrRevision; import com.healthlink.his.emr.domain.EmrTimeliness; import com.healthlink.his.emr.dto.RevisionHistoryDto; -import com.healthlink.his.emr.service.IEmrCompletenessCheckService; import com.healthlink.his.emr.service.IEmrRevisionService; import com.healthlink.his.emr.service.IEmrTimelinessService; import com.healthlink.his.web.emr.appservice.IStructuredEmrAppService; +import com.healthlink.his.web.emr.appservice.IEmrCompletenessAppService; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -23,10 +23,10 @@ public class StructuredEmrAppServiceImpl implements IStructuredEmrAppService { private IEmrRevisionService emrRevisionService; @Resource - private IEmrCompletenessCheckService emrCompletenessCheckService; + private IEmrTimelinessService emrTimelinessService; @Resource - private IEmrTimelinessService emrTimelinessService; + private IEmrCompletenessAppService emrCompletenessAppService; @Override @Transactional @@ -59,7 +59,10 @@ public class StructuredEmrAppServiceImpl implements IStructuredEmrAppService { @Override @Transactional public List executeCompletenessCheck(Long emrId, Long encounterId) { - return emrCompletenessCheckService.executeCheck(emrId, encounterId); + Map result = emrCompletenessAppService.checkCompleteness(emrId, encounterId); + @SuppressWarnings("unchecked") + List checks = (List) result.get("checks"); + return checks != null ? checks : List.of(); } @Override diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/DocStatisticsDefinitionServiceImpl.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/DocStatisticsDefinitionServiceImpl.java index e04aced51..96ae50ea5 100755 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/DocStatisticsDefinitionServiceImpl.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/DocStatisticsDefinitionServiceImpl.java @@ -4,8 +4,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.healthlink.his.document.domain.DocStatisticsDefinition; import com.healthlink.his.document.mapper.DocStatisticsDefinitionMapper; import com.healthlink.his.document.service.IDocStatisticsDefinitionService; -import org.springframework.stereotype.Service; -@Service +// DEPRECATED: Empty shell service, no business logic. Kept for compilation compatibility. + +/** + * @deprecated Use DocStatisticsDefinitionAppServiceImpl instead + */ +@SuppressWarnings("unused") public class DocStatisticsDefinitionServiceImpl extends ServiceImpl implements IDocStatisticsDefinitionService {} diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/EmrDetailServiceImpl.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/EmrDetailServiceImpl.java index 4c82a1f09..de34bf1b1 100755 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/EmrDetailServiceImpl.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/document/service/impl/EmrDetailServiceImpl.java @@ -4,15 +4,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.healthlink.his.document.domain.EmrDetail; import com.healthlink.his.document.mapper.EmrDetailMapper; import com.healthlink.his.document.service.IEmrDetailService; -import org.springframework.stereotype.Service; + +// DEPRECATED: Empty shell service, never used. Kept for compilation compatibility. /** - * 电子病历详情Service业务层处理 - * - * @author system - * @date 2025-02-22 + * @deprecated Replaced by EmrDataWarehouseAppServiceImpl for structured data extraction */ -@Service +@SuppressWarnings("unused") public class EmrDetailServiceImpl extends ServiceImpl implements IEmrDetailService { } \ No newline at end of file diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/emr/service/IEmrCompletenessCheckService.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/emr/service/IEmrCompletenessCheckService.java index 6bb0c79f3..f96edf602 100644 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/emr/service/IEmrCompletenessCheckService.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/emr/service/IEmrCompletenessCheckService.java @@ -8,6 +8,4 @@ import java.util.List; public interface IEmrCompletenessCheckService extends IService { List selectByEmrId(Long emrId); - - List executeCheck(Long emrId, Long encounterId); } diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/emr/service/impl/EmrCompletenessCheckServiceImpl.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/emr/service/impl/EmrCompletenessCheckServiceImpl.java index ad25f0863..af6ef2448 100644 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/emr/service/impl/EmrCompletenessCheckServiceImpl.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/emr/service/impl/EmrCompletenessCheckServiceImpl.java @@ -6,8 +6,6 @@ import com.healthlink.his.emr.mapper.EmrCompletenessCheckMapper; import com.healthlink.his.emr.service.IEmrCompletenessCheckService; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Date; import java.util.List; @Service @@ -19,27 +17,4 @@ public class EmrCompletenessCheckServiceImpl public List selectByEmrId(Long emrId) { return baseMapper.selectByEmrId(emrId); } - - @Override - public List executeCheck(Long emrId, Long encounterId) { - List checks = new ArrayList<>(); - - String[] requiredItems = {"chief_complaint", "medical_history", "physical_exam", "auxiliary_exam", "diagnosis", "treatment_plan"}; - String[] categories = {"basic", "basic", "basic", "examination", "diagnosis", "treatment"}; - - for (int i = 0; i < requiredItems.length; i++) { - EmrCompletenessCheck check = new EmrCompletenessCheck() - .setEmrId(emrId) - .setEncounterId(encounterId) - .setCheckItem(requiredItems[i]) - .setCheckCategory(categories[i]) - .setIsRequired(true) - .setCheckResult("PASS") - .setCheckDetail("检查项: " + requiredItems[i]) - .setCheckTime(new Date()); - save(check); - checks.add(check); - } - return checks; - } } diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/emr/service/impl/StructuredEmrTemplateServiceImpl.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/emr/service/impl/StructuredEmrTemplateServiceImpl.java index 2bdcc6815..8fbde474f 100644 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/emr/service/impl/StructuredEmrTemplateServiceImpl.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/emr/service/impl/StructuredEmrTemplateServiceImpl.java @@ -4,8 +4,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.healthlink.his.emr.domain.StructuredEmrTemplate; import com.healthlink.his.emr.mapper.StructuredEmrTemplateMapper; import com.healthlink.his.emr.service.IStructuredEmrTemplateService; -import org.springframework.stereotype.Service; -@Service +// DEPRECATED: Empty shell service, no business logic. Kept for compilation compatibility. + +/** + * @deprecated Use StructuredEmrTemplateController + new AppService instead + */ +@SuppressWarnings("unused") public class StructuredEmrTemplateServiceImpl extends ServiceImpl implements IStructuredEmrTemplateService { } diff --git a/healthlink-his-ui/src/views/doctorstation/index.vue b/healthlink-his-ui/src/views/doctorstation/index.vue index b09633558..5a4b618f6 100755 --- a/healthlink-his-ui/src/views/doctorstation/index.vue +++ b/healthlink-his-ui/src/views/doctorstation/index.vue @@ -245,7 +245,7 @@ - + import hospitalizationEmr from './components/hospitalizationEmr/index.vue'; import PendingEmr from './components/pendingEmr/index.vue'; +import Emr from './components/emr/emr.vue'; import { completeEncounter, getEncounterDiagnosis, diff --git a/healthlink-his-ui/src/views/emr/revision-history/api.js b/healthlink-his-ui/src/views/emr/revision-history/api.js index 688583e9c..eda898f29 100644 --- a/healthlink-his-ui/src/views/emr/revision-history/api.js +++ b/healthlink-his-ui/src/views/emr/revision-history/api.js @@ -1,5 +1,5 @@ import request from '@/utils/request' -export function getRevisionPage(p){return request({url:'/emr/revision/page-with-patient',method:'get',params:p})} -export function getRevisionList(emrId){return request({url:'/emr/revision/list/'+emrId,method:'get'})} -export function recordRevision(d){return request({url:'/emr/revision/record',method:'post',data:d})} -export function compareRevisions(id1,id2){return request({url:'/emr/revision/compare',method:'get',params:{revisionId1:id1,revisionId2:id2}})} +export function getRevisionPage(p){return request({url:'/api/v1/emr/revision/page-with-patient',method:'get',params:p})} +export function getRevisionList(emrId){return request({url:'/api/v1/emr/revision/list/'+emrId,method:'get'})} +export function recordRevision(d){return request({url:'/api/v1/emr/revision/record',method:'post',data:d})} +export function compareRevisions(id1,id2){return request({url:'/api/v1/emr/revision/compare',method:'get',params:{revisionId1:id1,revisionId2:id2}})}