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

提交merge1.3

Browse Source
This commit is contained in:
chenqi
2025-12-27 15:30:25 +08:00
parent 8c607c8749
commit 088861f66e
1245 changed files with 220442 additions and 77616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,8 +31,19 @@ public class DocInventoryItemStatic extends HisBaseEntity {
@TableId(type = IdType.ASSIGN_ID)
private Long id;
<<<<<<< HEAD
/** 物品类别 */
private String categoryCode;
=======
/** 备份单据编号 */
private String busNo;
/** 药品类别 */
private String medCategoryCode;
/** 耗材类别 */
private String devCategoryCode;
>>>>>>> v1.3
/** 名称 */
private String name;
@@ -49,9 +60,21 @@ public class DocInventoryItemStatic extends HisBaseEntity {
/** 最小单位 */
private String unitCode;
<<<<<<< HEAD
/** 当前库存数量(最小单位数量) */
private BigDecimal quantity;
=======
/** 库存数量 */
private BigDecimal quantity;
/** 包装单位数量（整数部分） */
private BigDecimal number;
/** 包装单位数量（余数部分） */
private BigDecimal remainder;
>>>>>>> v1.3
/** 产品批号 */
private String lotNumber;
@@ -85,8 +108,19 @@ public class DocInventoryItemStatic extends HisBaseEntity {
/** 销售单价(包装单位) */
private BigDecimal salePrice;
<<<<<<< HEAD
/** 项目编号 */
private String busNo;
=======
/** 总零售价 */
private BigDecimal totalSalePrice;
/** 总进价 */
private BigDecimal totalPrice;
/** 项目编号 */
private String itemNo;
>>>>>>> v1.3
/** 最小单位 */
private String minUnitCode;
@@ -117,4 +151,19 @@ public class DocInventoryItemStatic extends HisBaseEntity {
/** 药品五笔码 */
private String wbStr;
<<<<<<< HEAD
=======
/** 剩余过期天数 */
private Integer remainingDays;
/** 库存id */
private Long inventoryId;
/** 医保码 */
private String ybNo;
/** 批准文号 */
private String approvalNumber;
>>>>>>> v1.3
}

4
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocRecord.java
View File

@@ -55,4 +55,8 @@ public class DocRecord extends HisBaseEntity {
*/
private Integer isEdit;
/**
* 打印次数
*/
private Integer printCount = 0;
}

6
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatistics.java
View File

@@ -44,6 +44,8 @@ public class DocStatistics extends HisBaseEntity {
* 记录来源
*/
private String source;
/**
* 文书ID
*/
private Long definitionId;
}

4
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatisticsDefinition.java
View File

@@ -50,5 +50,9 @@ public class DocStatisticsDefinition extends HisBaseEntity {
/** 字典类型 */
private String dictType;
/**
* 类型代码 例 003:体温
*/
private String typeCode;
}

20
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsMapper.java
View File

@@ -1,11 +1,25 @@
package com.openhis.document.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.openhis.document.domain.DocDefinition;
import com.openhis.document.domain.DocStatistics;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.openhis.document.domain.DocStatistics;
@Repository
public interface DocStatisticsMapper extends BaseMapper<DocStatistics> {
/**
* 根据病历ID、病人ID和体温单ID获取温度单信息
*
* @param encounterId 病历ID
* @param patientId 病人ID
* @param tempId 体温单ID
* @param source 来源
* @return 体温单信息
*/
List<DocStatistics> getTempList(@Param("encounterId") Long encounterId, @Param("patientId") Long patientId,
@Param("tempId") Long tempId, @Param("source") String source);
}

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

@@ -3,6 +3,11 @@
*/
package com.openhis.document.service;
<<<<<<< HEAD
=======
import java.util.List;
>>>>>>> v1.3
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.document.domain.DocInventoryItemStatic;
@@ -12,4 +17,19 @@ import com.openhis.document.domain.DocInventoryItemStatic;
* @author zwh
* @date 2025-11-04
*/
<<<<<<< HEAD
public interface IDocInventoryItemStaticService extends IService<DocInventoryItemStatic> {}
=======
public interface IDocInventoryItemStaticService extends IService<DocInventoryItemStatic> {
/**
* 获取物品的库存备份信息
*
* @param itemIdList 物品id
* @param busNo 备份单据号
* @param locationId 库房id
* @return 库存备份信息
*/
List<DocInventoryItemStatic> getInventoryItemStaticByItemId(List<Long> itemIdList, String busNo, Long locationId);
}
>>>>>>> v1.3

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

@@ -3,9 +3,19 @@
*/
package com.openhis.document.service.impl;
<<<<<<< HEAD
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
=======
import java.util.List;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.core.common.enums.DelFlag;
>>>>>>> v1.3
import com.openhis.document.domain.DocInventoryItemStatic;
import com.openhis.document.mapper.DocInventoryItemStaticMapper;
import com.openhis.document.service.IDocInventoryItemStaticService;
@@ -18,4 +28,28 @@ import com.openhis.document.service.IDocInventoryItemStaticService;
*/
@Service
public class DocInventoryItemStaticServiceImpl extends ServiceImpl<DocInventoryItemStaticMapper, DocInventoryItemStatic>
<<<<<<< HEAD
implements IDocInventoryItemStaticService {}
=======
implements IDocInventoryItemStaticService {
/**
* 根据物品id获取物品的库存备份信息
*
* @param itemIdList 物品id
* @return 库存备份信息
*/
@Override
public List<DocInventoryItemStatic> getInventoryItemStaticByItemId(List<Long> itemIdList, String busNo,
Long locationId) {
LambdaQueryWrapper<DocInventoryItemStatic> queryWrapper = new LambdaQueryWrapper<>();
if (itemIdList != null && !itemIdList.isEmpty()) {
queryWrapper.in(DocInventoryItemStatic::getItemId, itemIdList);
}
queryWrapper.eq(DocInventoryItemStatic::getBusNo, busNo)
.eq(DocInventoryItemStatic::getDeleteFlag, DelFlag.NO.getCode())
.eq(DocInventoryItemStatic::getLocationId, locationId).orderByDesc(DocInventoryItemStatic::getCreateTime);
return baseMapper.selectList(queryWrapper);
}
}
>>>>>>> v1.3