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-19 09:22:15 +08:00
parent 615810461f
commit 2d0decb7e9
39 changed files with 615 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,4 +35,12 @@ public interface IChargeItemService extends IService<ChargeItem> {
* @return 更新结果
*/
boolean updateAccountType(Long encounterId, Long accountId);
/**
* 根据收费项目id列表获取收费信息
*
* @param chargeItemIdList 收费项目id列表
* @return 收费信息
*/
List<ChargeItem> getChargeItemInfo(List<Long> chargeItemIdList);
}

15
openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/ILocationService.java
View File

@@ -3,6 +3,8 @@ package com.openhis.administration.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.administration.domain.Location;
import java.util.List;
/**
* 位置管理Service接口
*
@@ -11,4 +13,17 @@ import com.openhis.administration.domain.Location;
*/
public interface ILocationService extends IService<Location> {
/**
* 获取药房列表
*
* @return 药房列表
*/
List<Location> getPharmacyList();
/**
* 获取药库列表
*
* @return 药库列表
*/
List<Location> getCabinetList();
}

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.administration.domain.Practitioner;
import com.openhis.administration.domain.PractitionerRole;
import java.util.List;
/**
* 医疗参与者管理Service接口
*
@@ -20,4 +22,10 @@ public interface IPractitionerService extends IService<Practitioner> {
*/
Practitioner getPractitionerByUserId(long userId);
/**
* 查询医疗参与者列表
*
* @return 医疗参与者列表
*/
List<Practitioner> getList();
}

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

@@ -9,6 +9,7 @@ import com.openhis.workflow.domain.SupplyRequest;
import org.springframework.web.bind.annotation.RequestParam;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
* 供应商管理Service接口
@@ -24,4 +25,11 @@ public interface ISupplierService extends IService<Supplier> {
* @return
*/
boolean addSupplier(Supplier supplier);
/**
* 查询供应商下拉列表
*
* @return 供应商下拉列表
*/
List<Supplier> getList();
}

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

@@ -60,4 +60,15 @@ public class ChargeItemServiceImpl extends ServiceImpl<ChargeItemMapper, ChargeI
.eq(ChargeItem::getEncounterId, encounterId).set(ChargeItem::getAccountId, accountId));
return update > 0;
}
/**
* 根据收费项目id列表获取收费信息
*
* @param chargeItemIdList 收费项目id列表
* @return 收费信息
*/
@Override
public List<ChargeItem> getChargeItemInfo(List<Long> chargeItemIdList) {
return baseMapper.selectBatchIds(chargeItemIdList);
}
}

2
openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterServiceImpl.java
View File

@@ -2,7 +2,7 @@ package com.openhis.administration.service.impl;
import javax.annotation.Resource;
import com.core.common.enums.AssignSeqEnum;
import com.openhis.common.enums.AssignSeqEnum;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

25
openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/LocationServiceImpl.java
View File

@@ -1,11 +1,15 @@
package com.openhis.administration.service.impl;
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.openhis.administration.domain.Location;
import com.openhis.administration.mapper.LocationMapper;
import com.openhis.administration.service.ILocationService;
import com.openhis.common.enums.LocationForm;
/**
* 位置管理Service业务层处理
@@ -16,4 +20,25 @@ import com.openhis.administration.service.ILocationService;
@Service
public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> implements ILocationService {
/**
* 获取药房列表
*
* @return 药房列表
*/
@Override
public List<Location> getPharmacyList() {
return baseMapper
.selectList(new LambdaQueryWrapper<Location>().eq(Location::getFormEnum, LocationForm.PHARMACY.getValue()));
}
/**
* 获取药库列表
*
* @return 药库列表
*/
@Override
public List<Location> getCabinetList() {
return baseMapper
.selectList(new LambdaQueryWrapper<Location>().eq(Location::getFormEnum, LocationForm.CABINET.getValue()));
}
}

21
openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerServiceImpl.java
View File

@@ -1,13 +1,13 @@
package com.openhis.administration.service.impl;
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.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.core.common.utils.SecurityUtils;
import com.openhis.administration.domain.Practitioner;
import com.openhis.administration.mapper.PatientMapper;
import com.openhis.administration.mapper.PractitionerMapper;
import com.openhis.administration.service.IPractitionerService;
@@ -21,9 +21,6 @@ import com.openhis.administration.service.IPractitionerService;
public class PractitionerServiceImpl extends ServiceImpl<PractitionerMapper, Practitioner>
implements IPractitionerService {
@Autowired
PractitionerMapper practitionerMapper;
/**
* 根据执行人ID查询
*
@@ -35,6 +32,16 @@ public class PractitionerServiceImpl extends ServiceImpl<PractitionerMapper, Pra
QueryWrapper<Practitioner> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("user_id", userId);
return practitionerMapper.selectOne(queryWrapper);
return baseMapper.selectOne(queryWrapper);
}
/**
* 查询医疗参与者列表
*
* @return 医疗参与者列表
*/
@Override
public List<Practitioner> getList() {
return baseMapper.selectList(new LambdaQueryWrapper<>());
}
}

39
openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/SupplierServiceImpl.java
View File

@@ -1,24 +1,19 @@
package com.openhis.administration.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.utils.StringUtils;
import com.core.common.utils.bean.BeanUtils;
import com.openhis.clinical.domain.ConditionDefinition;
import com.openhis.clinical.mapper.ConditionDefinitionMapper;
import com.openhis.common.enums.DelFlag;
import com.openhis.workflow.domain.SupplyRequest;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.List;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.administration.domain.Supplier;
import com.openhis.administration.mapper.SupplierMapper;
import com.openhis.administration.service.ISupplierService;
import org.springframework.transaction.annotation.Transactional;
import com.openhis.common.enums.SupplierType;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
/**
* 供应商管理Service业务层处理
@@ -30,7 +25,7 @@ import java.util.List;
@Service
@AllArgsConstructor
public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> implements ISupplierService {
private final SupplierMapper supplierMapper;
/**
* 新增供应商
*
@@ -42,16 +37,26 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
public boolean addSupplier(Supplier supplier) {
// 根据病种编码判断病种是否存在
List<Supplier> suppliers =
supplierMapper.selectList(new LambdaQueryWrapper<Supplier>()
.eq(Supplier::getBusNo, supplier.getBusNo()));
baseMapper.selectList(new LambdaQueryWrapper<Supplier>().eq(Supplier::getBusNo, supplier.getBusNo()));
if (suppliers.size() > 0) {
return false;
}
// 新增供应商
int insert = supplierMapper.insert(supplier);
int insert = baseMapper.insert(supplier);
if (insert != 1) {
return false;
}
return true;
}
/**
* 查询供应商下拉列表
*
* @return 供应商下拉列表
*/
@Override
public List<Supplier> getList() {
return baseMapper.selectList(new LambdaQueryWrapper<Supplier>().select(Supplier::getId, Supplier::getName)
.eq(Supplier::getTypeEnum, SupplierType.ACTIVE.getValue()));
}
}

9
openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentReconciliationService.java
View File

@@ -3,6 +3,8 @@ package com.openhis.financial.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.financial.domain.PaymentReconciliation;
import java.util.List;
/**
* 付款管理Service接口
*
@@ -11,4 +13,11 @@ import com.openhis.financial.domain.PaymentReconciliation;
*/
public interface IPaymentReconciliationService extends IService<PaymentReconciliation> {
/**
* 根据支付id获取对应收费项目的id列表
*
* @param paymentId 支付id
* @return 收费项目的id列表
*/
List<Long> getChargeItemIdListByPayment(Long paymentId);
}

33
openhis-server/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentReconciliationServiceImpl.java
View File

@@ -1,8 +1,15 @@
package com.openhis.financial.service.impl;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.common.constant.CommonConstants;
import com.openhis.financial.domain.PaymentReconciliation;
import com.openhis.financial.mapper.PaymentReconciliationMapper;
import com.openhis.financial.service.IPaymentReconciliationService;
@@ -14,6 +21,30 @@ import com.openhis.financial.service.IPaymentReconciliationService;
* @date 2025-02-20
*/
@Service
public class PaymentReconciliationServiceImpl extends ServiceImpl<PaymentReconciliationMapper, PaymentReconciliation> implements IPaymentReconciliationService {
public class PaymentReconciliationServiceImpl extends ServiceImpl<PaymentReconciliationMapper, PaymentReconciliation>
implements IPaymentReconciliationService {
@Autowired
private PaymentReconciliationMapper paymentReconciliationMapper;
/**
* 根据支付id获取对应收费项目的id列表
*
* @param paymentId 支付id
* @return 收费项目的id列表
*/
@Override
public List<Long> getChargeItemIdListByPayment(Long paymentId) {
// 根据支付id获取支付信息
PaymentReconciliation paymentReconciliation =
paymentReconciliationMapper.selectOne(new LambdaQueryWrapper<PaymentReconciliation>()
.select(PaymentReconciliation::getChargeItemIds).eq(PaymentReconciliation::getId, paymentId));
if (paymentReconciliation == null) {
return null;
}
// 将收费项目集合转换成列表
return Arrays.stream(paymentReconciliation.getChargeItemIds().split(CommonConstants.Common.COMMA))
.map(Long::parseLong).collect(Collectors.toList());
}
}