解决合并冲突

openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocInventoryItemStatic.java

@@ -0,0 +1,120 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.document.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+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;
+
+/**
+ * 历史库存静态记录表
+ *
+ * @author zwh
+ * @date 2025-11-04
+ */
+@Data
+@TableName("doc_inventory_item_static")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class DocInventoryItemStatic extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 物品类别 */
+    private String categoryCode;
+
+    /** 名称 */
+    private String name;
+
+    /** 库存状态 */
+    private Integer inventoryStatusEnum;
+
+    /** 供应商id */
+    private Long supplierId;
+
+    /** 说明书 */
+    private String descriptionText;
+
+    /** 最小单位 */
+    private String unitCode;
+
+    /** 当前库存数量(最小单位数量) */
+    private BigDecimal quantity;
+
+    /** 产品批号 */
+    private String lotNumber;
+
+    /** 生产日期 */
+    private Date productionDate;
+
+    /** 失效日期 */
+    private Date expirationDate;
+
+    /** 库位 */
+    private Long locationStoreId;
+
+    /** 仓库 */
+    private Long locationId;
+
+    /** 追溯码 */
+    private String traceNo;
+
+    /** 追溯码包装层级 */
+    private Integer packagingLevels;
+
+    /** 项目 */
+    private String itemTable;
+
+    /** 物品编码 */
+    private Long itemId;
+
+    /** 采购单价(包装单位) */
+    private BigDecimal price;
+
+    /** 销售单价(包装单位) */
+    private BigDecimal salePrice;
+
+    /** 项目编号 */
+    private String busNo;
+
+    /** 最小单位 */
+    private String minUnitCode;
+
+    /** 拆零比 */
+    private BigDecimal partPercent;
+
+    /** 供应商名称 */
+    private String supplierName;
+
+    /** 库房名称 */
+    private String locationName;
+
+    /** 货位名称 */
+    private String locationStoreName;
+
+    /** 生产厂商文本 */
+    private String manufacturerText;
+
+    /** 医保等级 */
+    private Integer chrgitmLv;
+
+    /** 规格 */
+    private String totalVolume;
+
+    /** 药品名称拼音码 */
+    private String pyStr;
+
+    /** 药品五笔码 */
+    private String wbStr;
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocInventoryItemStaticMapper.java

@@ -0,0 +1,18 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.document.mapper;
+
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.document.domain.DocInventoryItemStatic;
+
+/**
+ * 历史库存静态记录 mapper
+ *
+ * @author zwh
+ * @date 2025-11-04
+ */
+@Repository
+public interface DocInventoryItemStaticMapper extends BaseMapper<DocInventoryItemStatic> {}

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

@@ -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;
 
 /**

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

@@ -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;
 
 /**
  * 病历定义服务接口

openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocInventoryItemStaticService.java

@@ -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> {}

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

@@ -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;
 
 /**

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

@@ -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;
 
 /**

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

@@ -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 {}

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

@@ -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 {}

openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocInventoryItemStaticServiceImpl.java

@@ -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 {}

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

@@ -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 {}

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

@@ -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 {}

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

@@ -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 {}

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

@@ -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 {}

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

@@ -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 {}