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

退费部分代码完成

Browse Source
This commit is contained in:
Zhang.WH
2025-03-30 12:41:26 +08:00
parent b32bd56da5
commit 73f15d7ee9
30 changed files with 600 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java
View File

@@ -43,4 +43,11 @@ public interface IChargeItemService extends IService<ChargeItem> {
* @return 收费信息
*/
List<ChargeItem> getChargeItemInfo(List<Long> chargeItemIdList);
/**
* 更新收费状态：已退费
*
* @param chargeItemIdList 收费id列表
*/
void updateRefundChargeStatus(List<Long> chargeItemIdList);
}

16
openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java
View File

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.administration.domain.ChargeItem;
import com.openhis.administration.mapper.ChargeItemMapper;
import com.openhis.administration.service.IChargeItemService;
import com.openhis.common.enums.ChargeItemStatus;
import lombok.AllArgsConstructor;
@@ -56,8 +57,8 @@ public class ChargeItemServiceImpl extends ServiceImpl<ChargeItemMapper, ChargeI
*/
@Override
public boolean updateAccountType(Long encounterId, Long accountId) {
int update = baseMapper.update(null, new LambdaUpdateWrapper<ChargeItem>()
.eq(ChargeItem::getEncounterId, encounterId).set(ChargeItem::getAccountId, accountId));
int update = baseMapper.update(new ChargeItem().setAccountId(accountId),
new LambdaUpdateWrapper<ChargeItem>().eq(ChargeItem::getEncounterId, encounterId));
return update > 0;
}
@@ -71,4 +72,15 @@ public class ChargeItemServiceImpl extends ServiceImpl<ChargeItemMapper, ChargeI
public List<ChargeItem> getChargeItemInfo(List<Long> chargeItemIdList) {
return baseMapper.selectBatchIds(chargeItemIdList);
}
/**
* 更新收费状态：已退费
*
* @param chargeItemIdList 收费id列表
*/
@Override
public void updateRefundChargeStatus(List<Long> chargeItemIdList) {
baseMapper.update(new ChargeItem().setStatusEnum(ChargeItemStatus.REFUNDED.getValue()),
new LambdaUpdateWrapper<ChargeItem>().in(ChargeItem::getId, chargeItemIdList));
}
}

8
openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java
View File

@@ -30,8 +30,8 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
*/
@Override
public boolean activeOrg(Long orgId) {
int updateCount = baseMapper.update(null, new LambdaUpdateWrapper<Organization>().eq(Organization::getId, orgId)
.set(Organization::getActiveFlag, AccountStatus.ACTIVE.getValue()));
int updateCount = baseMapper.update(new Organization().setActiveFlag(AccountStatus.ACTIVE.getValue()),
new LambdaUpdateWrapper<Organization>().eq(Organization::getId, orgId));
return updateCount > 0;
}
@@ -43,8 +43,8 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
*/
@Override
public boolean inactiveOrg(Long orgId) {
int updateCount = baseMapper.update(null, new LambdaUpdateWrapper<Organization>().eq(Organization::getId, orgId)
.set(Organization::getActiveFlag, AccountStatus.INACTIVE.getValue()));
int updateCount = baseMapper.update(new Organization().setActiveFlag(AccountStatus.INACTIVE.getValue()),
new LambdaUpdateWrapper<Organization>().eq(Organization::getId, orgId));
return updateCount > 0;
}

6
openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecDetail.java
View File

@@ -6,8 +6,8 @@ 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;
@@ -31,6 +31,9 @@ public class PaymentRecDetail extends HisBaseEntity {
/** 先前支付明细id */
private Long predecessorId;
/** 付款id */
private Long reconciliationId;
/** 付款类型 */
private Integer targetEnum;
@@ -73,5 +76,4 @@ public class PaymentRecDetail extends HisBaseEntity {
/** 单笔交易结果 */
private Integer resultEnum;
}

5
openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java
View File

@@ -6,8 +6,8 @@ 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;
@@ -88,5 +88,6 @@ public class PaymentReconciliation extends HisBaseEntity {
/** 就诊ID */
private Long encounterId;
/** 结算时间 */
private Date billDate;
}

8
openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDispenseService.java
View File

@@ -20,4 +20,12 @@ public interface IMedicationDispenseService extends IService<MedicationDispense>
* @param medicationRequestList 药品请求信息
*/
void addMedicationDispense(List<MedicationRequest> medicationRequestList);
/**
* 更新未发放药品状态：停止发放
*
* @param medDisIdList 发放id列表
* @param refund 停止原因：退费
*/
void updateStopDispenseStatus(List<Long> medDisIdList, Integer refund);
}

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

@@ -4,6 +4,7 @@ import java.util.List;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.core.common.utils.DateUtils;
import com.openhis.common.enums.DispenseStatus;
@@ -74,4 +75,17 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
baseMapper.insert(medicationDispense);
}
}
/**
* 更新未发放药品状态：停止发放
*
* @param medDisIdList 发放id列表
* @param refund 停止原因：退费
*/
@Override
public void updateStopDispenseStatus(List<Long> medDisIdList, Integer refund) {
baseMapper.update(
new MedicationDispense().setStatusEnum(DispenseStatus.STOPPED.getValue()).setNotPerformedReasonEnum(refund),
new LambdaUpdateWrapper<MedicationDispense>().in(MedicationDispense::getId, medDisIdList));
}
}

9
openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceDispenseService.java
View File

@@ -1,5 +1,7 @@
package com.openhis.workflow.service;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.workflow.domain.DeviceDispense;
@@ -11,4 +13,11 @@ import com.openhis.workflow.domain.DeviceDispense;
*/
public interface IDeviceDispenseService extends IService<DeviceDispense> {
/**
* 更新未发放耗材状态：停止发放
*
* @param devDisIdList 发放id列表
* @param refund 停止原因：退费
*/
void updateStopDispenseStatus(List<Long> devDisIdList, Integer refund);
}

12
openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestService.java
View File

@@ -1,6 +1,7 @@
package com.openhis.workflow.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.workflow.domain.ServiceRequest;
@@ -12,13 +13,18 @@ import com.openhis.workflow.domain.ServiceRequest;
*/
public interface IServiceRequestService extends IService<ServiceRequest> {
/**
* 查询服务申请管理中basedOnId相同的个数
*
* @param basedOnId 请求基于什么的ID
* @return basedOnId相同的个数
*/
Long countServiceRequestByBasedOnId(Long basedOnId) ;
Long countServiceRequestByBasedOnId(Long basedOnId);
/**
* 更新执行诊疗状态：停止
*
* @param serReqIdList 服务请求id列表
*/
void updateStopRequestStatus(List<Long> serReqIdList);
}

19
openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceDispenseServiceImpl.java
View File

@@ -1,8 +1,12 @@
package com.openhis.workflow.service.impl;
import java.util.List;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.common.enums.DispenseStatus;
import com.openhis.workflow.domain.DeviceDispense;
import com.openhis.workflow.mapper.DeviceDispenseMapper;
import com.openhis.workflow.service.IDeviceDispenseService;
@@ -14,6 +18,19 @@ import com.openhis.workflow.service.IDeviceDispenseService;
* @date 2025-02-20
*/
@Service
public class DeviceDispenseServiceImpl extends ServiceImpl<DeviceDispenseMapper, DeviceDispense> implements IDeviceDispenseService {
public class DeviceDispenseServiceImpl extends ServiceImpl<DeviceDispenseMapper, DeviceDispense>
implements IDeviceDispenseService {
/**
* 更新未发放耗材状态：停止发放
*
* @param devDisIdList 发放id列表
* @param refund 停止原因：退费
*/
@Override
public void updateStopDispenseStatus(List<Long> devDisIdList, Integer refund) {
baseMapper.update(
new DeviceDispense().setStatusEnum(DispenseStatus.STOPPED.getValue()).setNotPerformedReasonEnum(refund),
new LambdaUpdateWrapper<DeviceDispense>().in(DeviceDispense::getId, devDisIdList));
}
}

24
openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestServiceImpl.java
View File

@@ -1,11 +1,13 @@
package com.openhis.workflow.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.common.enums.RequestStatus;
import com.openhis.workflow.domain.ServiceRequest;
import com.openhis.workflow.mapper.ServiceRequestMapper;
import com.openhis.workflow.service.IServiceRequestService;
@@ -20,9 +22,6 @@ import com.openhis.workflow.service.IServiceRequestService;
public class ServiceRequestServiceImpl extends ServiceImpl<ServiceRequestMapper, ServiceRequest>
implements IServiceRequestService {
@Autowired
private ServiceRequestMapper serviceRequestMapper;
/**
* 查询服务申请管理中basedOnId相同的个数
*
@@ -33,6 +32,17 @@ public class ServiceRequestServiceImpl extends ServiceImpl<ServiceRequestMapper,
public Long countServiceRequestByBasedOnId(Long basedOnId) {
LambdaQueryWrapper<ServiceRequest> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ServiceRequest::getBasedOnId, basedOnId);
return serviceRequestMapper.selectCount(queryWrapper);
return baseMapper.selectCount(queryWrapper);
}
/**
* 更新执行诊疗状态：停止
*
* @param serReqIdList 服务请求id列表
*/
@Override
public void updateStopRequestStatus(List<Long> serReqIdList) {
baseMapper.update(new ServiceRequest().setStatusEnum(RequestStatus.STOPPED.getValue()),
new LambdaUpdateWrapper<ServiceRequest>().in(ServiceRequest::getId, serReqIdList));
}
}

27
openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestServiceImpl.java
View File

@@ -53,10 +53,10 @@ public class SupplyRequestServiceImpl extends ServiceImpl<SupplyRequestMapper, S
@Override
public List<SupplyRequest> agreeRequest(String busNo, LoginUser loginUser, Date now) {
// 更新单据状态
baseMapper.update(null,
new LambdaUpdateWrapper<SupplyRequest>().eq(SupplyRequest::getBusNo, busNo)
.set(SupplyRequest::getApprovalTime, now).set(SupplyRequest::getApproverId, loginUser.getUserId())
.set(SupplyRequest::getStatusEnum, SupplyStatus.AGREE.getValue()));
baseMapper.update(
new SupplyRequest().setApprovalTime(now).setApproverId(loginUser.getPractitionerId())
.setStatusEnum(SupplyStatus.AGREE.getValue()),
new LambdaUpdateWrapper<SupplyRequest>().eq(SupplyRequest::getBusNo, busNo));
// 返回单据详情
return this.getSupplyByBusNo(busNo);
}
@@ -69,10 +69,9 @@ public class SupplyRequestServiceImpl extends ServiceImpl<SupplyRequestMapper, S
*/
@Override
public boolean submitApproval(String busNo) {
int updateCount = baseMapper.update(null,
new LambdaUpdateWrapper<SupplyRequest>().eq(SupplyRequest::getBusNo, busNo)
.set(SupplyRequest::getStatusEnum, SupplyStatus.APPROVAL.getValue())
.set(SupplyRequest::getApplyTime, DateUtils.getNowDate()));
int updateCount = baseMapper.update(
new SupplyRequest().setApplyTime(DateUtils.getNowDate()).setStatusEnum(SupplyStatus.APPROVAL.getValue()),
new LambdaUpdateWrapper<SupplyRequest>().eq(SupplyRequest::getBusNo, busNo));
return updateCount > 0;
}
@@ -84,8 +83,8 @@ public class SupplyRequestServiceImpl extends ServiceImpl<SupplyRequestMapper, S
*/
@Override
public boolean withdrawApproval(String busNo) {
int updateCount = baseMapper.update(null, new LambdaUpdateWrapper<SupplyRequest>()
.eq(SupplyRequest::getBusNo, busNo).set(SupplyRequest::getStatusEnum, SupplyStatus.WITHDRAW.getValue()));
int updateCount = baseMapper.update(new SupplyRequest().setStatusEnum(SupplyStatus.WITHDRAW.getValue()),
new LambdaUpdateWrapper<SupplyRequest>().eq(SupplyRequest::getBusNo, busNo));
return updateCount > 0;
}
@@ -99,10 +98,10 @@ public class SupplyRequestServiceImpl extends ServiceImpl<SupplyRequestMapper, S
@Override
public boolean rejectRequest(String busNo, LoginUser loginUser, Date now) {
// 更新单据状态
int updateCount = baseMapper.update(null,
new LambdaUpdateWrapper<SupplyRequest>().eq(SupplyRequest::getBusNo, busNo)
.set(SupplyRequest::getApprovalTime, now).set(SupplyRequest::getApproverId, loginUser.getUserId())
.set(SupplyRequest::getStatusEnum, SupplyStatus.REJECT.getValue()));
int updateCount = baseMapper.update(
new SupplyRequest().setApprovalTime(now).setApproverId(loginUser.getPractitionerId())
.setStatusEnum(SupplyStatus.REJECT.getValue()),
new LambdaUpdateWrapper<SupplyRequest>().eq(SupplyRequest::getBusNo, busNo));
return updateCount > 0;
}