py/his
3
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

后端最新版本同步

Browse Source
This commit is contained in:
Zhang.WH
2025-09-25 10:43:25 +08:00
parent 1276dc4adb
commit c8014404f1
355 changed files with 10070 additions and 5578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDispense.java
View File

@@ -68,7 +68,7 @@ public class MedicationDispense extends HisBaseEntity {
private String partTypeCode;
/** 已发药数量 */
private Integer dispenseQuantity;
private BigDecimal dispenseQuantity;
/** 发药频次 */
private String dispenseFrequencyCode;
@@ -113,7 +113,7 @@ public class MedicationDispense extends HisBaseEntity {
private BigDecimal maxUnit;
/** 发放数量 */
private Integer quantity;
private BigDecimal quantity;
/** 发放单位 */
private String unitCode;

4
openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java
View File

@@ -41,7 +41,7 @@ public class MedicationRequest extends HisBaseEntity {
private Long packageId;
/** 请求数量 */
private Integer quantity;
private BigDecimal quantity;
/** 执行次数 */
private Integer executeNum;
@@ -206,7 +206,7 @@ public class MedicationRequest extends HisBaseEntity {
/**
* 中药付数
*/
private Integer chineseHerbsDoseQuantity;
private BigDecimal chineseHerbsDoseQuantity;
/**
* 代煎标识 | 0:否 , 1:是

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

@@ -1,5 +1,6 @@
package com.openhis.medication.service.impl;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Date;
@@ -75,7 +76,7 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
// 药品请求id
medicationDispense.setMedReqId(medicationRequest.getId());
// 已发药数量
medicationDispense.setDispenseQuantity(0);
medicationDispense.setDispenseQuantity(BigDecimal.ZERO);
// 用法
medicationDispense.setMethodCode(medicationRequest.getMethodCode());
// 用药频次
@@ -169,6 +170,7 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
.eq(MedicationDispense::getStatusEnum, DispenseStatus.REFUNDED.getValue()))
.eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode()));
}
/**
* 通过请求id获取药品发放信息
*
@@ -176,9 +178,10 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
* @return 发放信息
*/
@Override
public List<MedicationDispense> selectByRequestIdList(List<Long> requestIdList){
return baseMapper.selectList( new LambdaQueryWrapper<MedicationDispense>().in(MedicationDispense::getMedReqId, requestIdList)
.eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode()));
public List<MedicationDispense> selectByRequestIdList(List<Long> requestIdList) {
return baseMapper
.selectList(new LambdaQueryWrapper<MedicationDispense>().in(MedicationDispense::getMedReqId, requestIdList)
.eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode()));
}
/**
@@ -188,8 +191,8 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
* @return 发放信息
*/
@Override
public List<MedicationDispense> selectByIdList(@Param("idList") List<Long> idList){
return baseMapper.selectList( new LambdaQueryWrapper<MedicationDispense>().in(MedicationDispense::getId, idList)
public List<MedicationDispense> selectByIdList(@Param("idList") List<Long> idList) {
return baseMapper.selectList(new LambdaQueryWrapper<MedicationDispense>().in(MedicationDispense::getId, idList)
.eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode()));
}
@@ -199,7 +202,7 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
* @param medDispenseId 发放id列表
*/
@Override
public void updateDispenseStatusSummarized(List<Long> medDispenseId){
public void updateDispenseStatusSummarized(List<Long> medDispenseId) {
baseMapper.update(null,
new LambdaUpdateWrapper<MedicationDispense>()
.set(MedicationDispense::getStatusEnum, DispenseStatus.SUMMARIZED.getValue())