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

解决合并冲突

Browse Source
This commit is contained in:
chenqi
2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocDefinitionOrganizationService.java
View File

@@ -1,7 +1,6 @@
package com.openhis.document.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.document.domain.DocDefinition;
import com.openhis.document.domain.DocDefinitionOrganization;
/**

1
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocDefinitionService.java
View File

@@ -2,7 +2,6 @@ package com.openhis.document.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.document.domain.DocDefinition;
import com.openhis.document.domain.EmrTemplate;
/**
* 病历定义服务接口

15
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocInventoryItemStaticService.java Normal file
View File

@@ -0,0 +1,15 @@
/*
* Copyright ©2023 CJB-CNIT Team. All rights reserved
*/
package com.openhis.document.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.document.domain.DocInventoryItemStatic;
/**
* 历史库存静态记录接口
*
* @author zwh
* @date 2025-11-04
*/
public interface IDocInventoryItemStaticService extends IService<DocInventoryItemStatic> {}

1
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsDefinitionOptionService.java
View File

@@ -1,7 +1,6 @@
package com.openhis.document.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.document.domain.DocStatisticsDefinition;
import com.openhis.document.domain.DocStatisticsDefinitionOption;
/**

1
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsDefinitionService.java
View File

@@ -1,7 +1,6 @@
package com.openhis.document.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.document.domain.DocStatistics;
import com.openhis.document.domain.DocStatisticsDefinition;
/**

17
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocDefinitionOrganizationServiceImpl.java
View File

@@ -1,14 +1,13 @@
package com.openhis.document.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.document.domain.DocDefinition;
import com.openhis.document.domain.DocDefinitionOrganization;
import com.openhis.document.mapper.DocDefinitionMapper;
import com.openhis.document.mapper.DocDefinitionOrganizationMapper;
import com.openhis.document.service.IDocDefinitionOrganizationService;
import com.openhis.document.service.IDocDefinitionService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.document.domain.DocDefinitionOrganization;
import com.openhis.document.mapper.DocDefinitionOrganizationMapper;
import com.openhis.document.service.IDocDefinitionOrganizationService;
@Service
public class DocDefinitionOrganizationServiceImpl extends ServiceImpl<DocDefinitionOrganizationMapper, DocDefinitionOrganization> implements IDocDefinitionOrganizationService {
}
public class DocDefinitionOrganizationServiceImpl
extends ServiceImpl<DocDefinitionOrganizationMapper, DocDefinitionOrganization>
implements IDocDefinitionOrganizationService {}

11
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocDefinitionServiceImpl.java
View File

@@ -1,15 +1,12 @@
package com.openhis.document.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.document.domain.DocDefinition;
import com.openhis.document.domain.EmrDetail;
import com.openhis.document.mapper.DocDefinitionMapper;
import com.openhis.document.mapper.EmrDetailMapper;
import com.openhis.document.service.IDocDefinitionService;
import com.openhis.document.service.IEmrDetailService;
import nonapi.io.github.classgraph.json.Id;
import org.springframework.stereotype.Service;
@Service
public class DocDefinitionServiceImpl extends ServiceImpl<DocDefinitionMapper, DocDefinition> implements IDocDefinitionService {
}
public class DocDefinitionServiceImpl extends ServiceImpl<DocDefinitionMapper, DocDefinition>
implements IDocDefinitionService {}

21
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocInventoryItemStaticServiceImpl.java Normal file
View File

@@ -0,0 +1,21 @@
/*
* Copyright ©2023 CJB-CNIT Team. All rights reserved
*/
package com.openhis.document.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.document.domain.DocInventoryItemStatic;
import com.openhis.document.mapper.DocInventoryItemStaticMapper;
import com.openhis.document.service.IDocInventoryItemStaticService;
/**
* 历史库存静态记录接口实现类
*
* @author zwh
* @date 2025-11-04
*/
@Service
public class DocInventoryItemStaticServiceImpl extends ServiceImpl<DocInventoryItemStaticMapper, DocInventoryItemStatic>
implements IDocInventoryItemStaticService {}

9
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocRecordServiceImpl.java
View File

@@ -1,14 +1,11 @@
package com.openhis.document.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.document.domain.DocRecord;
import com.openhis.document.domain.DocStatistics;
import com.openhis.document.mapper.DocRecordMapper;
import com.openhis.document.mapper.DocStatisticsMapper;
import com.openhis.document.service.IDocRecordService;
import com.openhis.document.service.IDocStatisticsService;
import org.springframework.stereotype.Service;
@Service
public class DocRecordServiceImpl extends ServiceImpl<DocRecordMapper, DocRecord> implements IDocRecordService {
}
public class DocRecordServiceImpl extends ServiceImpl<DocRecordMapper, DocRecord> implements IDocRecordService {}

17
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsDefinitionOptionServiceImpl.java
View File

@@ -1,14 +1,13 @@
package com.openhis.document.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.document.domain.DocStatisticsDefinition;
import com.openhis.document.domain.DocStatisticsDefinitionOption;
import com.openhis.document.mapper.DocStatisticsDefinitionMapper;
import com.openhis.document.mapper.DocStatisticsDefinitionOptionMapper;
import com.openhis.document.service.IDocStatisticsDefinitionOptionService;
import com.openhis.document.service.IDocStatisticsDefinitionService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.document.domain.DocStatisticsDefinitionOption;
import com.openhis.document.mapper.DocStatisticsDefinitionOptionMapper;
import com.openhis.document.service.IDocStatisticsDefinitionOptionService;
@Service
public class DocStatisticsDefinitionOptionServiceImpl extends ServiceImpl<DocStatisticsDefinitionOptionMapper, DocStatisticsDefinitionOption> implements IDocStatisticsDefinitionOptionService {
}
public class DocStatisticsDefinitionOptionServiceImpl
extends ServiceImpl<DocStatisticsDefinitionOptionMapper, DocStatisticsDefinitionOption>
implements IDocStatisticsDefinitionOptionService {}

16
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsDefinitionServiceImpl.java
View File

@@ -1,14 +1,12 @@
package com.openhis.document.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.document.domain.DocStatistics;
import com.openhis.document.domain.DocStatisticsDefinition;
import com.openhis.document.mapper.DocStatisticsDefinitionMapper;
import com.openhis.document.mapper.DocStatisticsMapper;
import com.openhis.document.service.IDocStatisticsDefinitionService;
import com.openhis.document.service.IDocStatisticsService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.document.domain.DocStatisticsDefinition;
import com.openhis.document.mapper.DocStatisticsDefinitionMapper;
import com.openhis.document.service.IDocStatisticsDefinitionService;
@Service
public class DocStatisticsDefinitionServiceImpl extends ServiceImpl<DocStatisticsDefinitionMapper, DocStatisticsDefinition> implements IDocStatisticsDefinitionService {
}
public class DocStatisticsDefinitionServiceImpl extends
ServiceImpl<DocStatisticsDefinitionMapper, DocStatisticsDefinition> implements IDocStatisticsDefinitionService {}

16
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsServiceImpl.java
View File

@@ -1,14 +1,12 @@
package com.openhis.document.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.document.domain.DocDefinition;
import com.openhis.document.domain.DocStatistics;
import com.openhis.document.mapper.DocDefinitionMapper;
import com.openhis.document.mapper.DocStatisticsMapper;
import com.openhis.document.service.IDocDefinitionService;
import com.openhis.document.service.IDocStatisticsService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.document.domain.DocStatistics;
import com.openhis.document.mapper.DocStatisticsMapper;
import com.openhis.document.service.IDocStatisticsService;
@Service
public class DocStatisticsServiceImpl extends ServiceImpl<DocStatisticsMapper, DocStatistics> implements IDocStatisticsService {
}
public class DocStatisticsServiceImpl extends ServiceImpl<DocStatisticsMapper, DocStatistics>
implements IDocStatisticsService {}

7
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocTemplateServiceImpl.java
View File

@@ -1,11 +1,12 @@
package com.openhis.document.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.document.domain.DocTemplate;
import com.openhis.document.mapper.DocTemplateMapper;
import com.openhis.document.service.IDocTemplateService;
import org.springframework.stereotype.Service;
@Service
public class DocTemplateServiceImpl extends ServiceImpl<DocTemplateMapper, DocTemplate> implements IDocTemplateService {
}
public class DocTemplateServiceImpl extends ServiceImpl<DocTemplateMapper, DocTemplate>
implements IDocTemplateService {}