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-28 13:43:04 +08:00
parent 5d538e714f
commit f81a553c21
24 changed files with 358 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRefundAppServiceImpl.java
View File

@@ -4,22 +4,18 @@
package com.openhis.web.chargemanage.appservice.impl;
import java.util.List;
import java.util.stream.Collectors;
import com.openhis.web.chargemanage.dto.RefundItemDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.core.common.core.domain.R;
import com.core.common.utils.MessageUtils;
import com.openhis.administration.domain.ChargeItem;
import com.openhis.administration.service.IChargeItemService;
import com.openhis.common.constant.CommonConstants;
import com.openhis.common.constant.PromptMsgConstant;
import com.openhis.common.enums.PaymentStatus;
import com.openhis.financial.service.IPaymentReconciliationService;
import com.openhis.web.chargemanage.appservice.IOutpatientRefundAppService;
import com.openhis.web.chargemanage.dto.EncounterPatientPaymentDto;
import com.openhis.web.chargemanage.dto.RefundItemDto;
import com.openhis.web.chargemanage.mapper.OutpatientRefundAppMapper;
/**
@@ -61,28 +57,19 @@ public class OutpatientRefundAppServiceImpl implements IOutpatientRefundAppServi
@Override
public R<?> refundPayment(List<Long> paymentIdList) {
List<RefundItemDto> refundItemList = outpatientRefundAppMapper.selectRefundItem(paymentIdList, CommonConstants.TableName.MED_MEDICATION_REQUEST,
CommonConstants.TableName.WOR_SERVICE_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST,
CommonConstants.Common.THREE);
// 医生同意退费
// 查询所有的chargeid，对应生成一个负的chargeitem
// 根据每个 chargeitem判断对应的服务，药品，耗材是否已发放执行
// 若已发放/执行需要对应的发药人/执行人审批（药品耗材需要先退药）
for (Long paymentId : paymentIdList) {
// 根据支付id获取对应收费项目的id列表
List<Long> chargeItemIdList = paymentReconciliationService.getChargeItemIdListByPayment(paymentId);
if (chargeItemIdList == null) {
return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00006, null));
}
// 根据收费项目id列表获取收费信息
List<ChargeItem> chargeItemList = chargeItemService.getChargeItemInfo(chargeItemIdList);
// 根据支付id获取对应收费项目的id列表
List<Long> chargeItemIdList = paymentReconciliationService.getChargeItemIdListByPayment(paymentIdList);
List<String> prescriptionNoList =
chargeItemList.stream().map(ChargeItem::getPrescriptionNo).collect(Collectors.toList());
//根据收费项目id列表查询退费项
List<RefundItemDto> refundItemList = outpatientRefundAppMapper.selectRefundItem(chargeItemIdList,
CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_SERVICE_REQUEST,
CommonConstants.TableName.WOR_DEVICE_REQUEST, CommonConstants.Common.THREE);
}
return null;
}
}

4
openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRefundAppMapper.java
View File

@@ -36,14 +36,14 @@ public interface OutpatientRefundAppMapper {
/**
* 查询退费项目
*
* @param paymentIdList 支付编号列表
* @param chargeItemIdList 收费项列表
* @param medMedicationRequest 药品请求表
* @param worServiceRequest 服务请求表
* @param worDeviceRequest 耗材请求表
* @param three 用于字符截位
* @return 退费项目列表
*/
List<RefundItemDto> selectRefundItem(@Param("paymentIdList") List<Long> paymentIdList,
List<RefundItemDto> selectRefundItem(@Param("chargeItemIdList") List<Long> chargeItemIdList,
@Param("medMedicationRequest") String medMedicationRequest,
@Param("worServiceRequest") String worServiceRequest, @Param("worDeviceRequest") String worDeviceRequest,
@Param("three") Integer three);

22
openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IDispenseAddAppService.java
View File

@@ -1,22 +0,0 @@
package com.openhis.web.pharmacymanage.appservice;
import com.openhis.medication.domain.MedicationRequest;
import java.util.List;
/**
* 新增药品发放草稿 应用实现接口
*
* @author wangyang
* @date 2025/3/14
*/
public interface IDispenseAddAppService {
/**
* 新增药品发放草稿
*
* @param medicationRequestList
* @return 无
*/
boolean addMedicationDispense(List<MedicationRequest> medicationRequestList);
}

18
openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IWesternMedicineDispenseAppService.java
View File

@@ -1,10 +1,10 @@
package com.openhis.web.pharmacymanage.appservice;
import javax.servlet.http.HttpServletRequest;
import com.core.common.core.domain.R;
import com.openhis.web.pharmacymanage.dto.EncounterInfoSearchParam;
import javax.servlet.http.HttpServletRequest;
/**
* 处方管理 应用实现接口
*
@@ -29,14 +29,12 @@ public interface IWesternMedicineDispenseAppService {
* @param request 请求数据
* @return 就诊病人分页列表
*/
R<?> getEncounterInfoListPage(EncounterInfoSearchParam encounterInfoSearchParam,
Integer pageNo,
Integer pageSize,
HttpServletRequest request);
R<?> getEncounterInfoListPage(EncounterInfoSearchParam encounterInfoSearchParam, Integer pageNo, Integer pageSize,
HttpServletRequest request);
/**
* 查询处方单列表
*
* @param encounterId 就诊号
* @return 处方单列表
*/
@@ -44,18 +42,18 @@ public interface IWesternMedicineDispenseAppService {
/**
* 处方单核对发药
*
* @param prescriptionNo 处方号
* @return 处理结果
*/
R<?> medicineDispense(String prescriptionNo);
/**
* 处方单作废
*
* @param prescriptionNo 处方号
* @param notPerformedReasonEnum 未发药原因
* @return 处理结果
*/
R<?> medicineCancel(String prescriptionNo,
Integer notPerformedReasonEnum);
R<?> medicineCancel(String prescriptionNo, Integer notPerformedReasonEnum);
}

88
openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IDispenseAddAppServiceImpl.java
View File

@@ -1,88 +0,0 @@
package com.openhis.web.pharmacymanage.appservice.impl;
import com.core.common.utils.DateUtils;
import com.openhis.common.enums.DispenseStatusEnum;
import com.openhis.medication.domain.MedicationDispense;
import com.openhis.medication.domain.MedicationRequest;
import com.openhis.medication.service.IMedicationDispenseService;
import com.openhis.web.pharmacymanage.appservice.IDispenseAddAppService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
* 西药发放 应用实现类
*
* @author wangyang
* @date 2025/3/14
*/
@Service
public class IDispenseAddAppServiceImpl implements IDispenseAddAppService {
@Resource
IMedicationDispenseService iMedicationDispenseService;
/**
* 新增药品发放草稿
*
* @param medicationRequestList 药品请求数据
* @return 无
*/
@Override
public boolean addMedicationDispense(List<MedicationRequest> medicationRequestList) {
List<MedicationDispense> medicationDispenseList = new ArrayList<>();
MedicationDispense medicationDispense;
for (MedicationRequest medicationRequest : medicationRequestList) {
medicationDispense = new MedicationDispense();
// 药品发放id
medicationDispense.setBusNo(medicationRequest.getBusNo());
// 药品发放状态
medicationDispense.setStatusEnum(DispenseStatusEnum.DRAFT.getValue());
// 状态变更时间
medicationDispense.setStatusChangedTime(DateUtils.getNowDate());
// 发药类型
medicationDispense.setDispenseEnum(medicationRequest.getCategoryEnum());
// 药品编码
medicationDispense.setMedicationId(medicationRequest.getMedicationId());
// 请求数量
medicationDispense.setQuantity(medicationRequest.getQuantity());
// 请求单位编码
medicationDispense.setUnitCode(medicationRequest.getUnitCode());
// 产品批号
medicationDispense.setLotNumber(medicationRequest.getLotNumber());
// 患者id
medicationDispense.setPatientId(medicationRequest.getPatientId());
// 就诊id
medicationDispense.setEncounterId(medicationRequest.getEncounterId());
// 支持用药信息
medicationDispense.setSupportInfo(medicationRequest.getSupportInfo());
// 发药人
medicationDispense.setPractitionerId(0L);
// 发放药房
medicationDispense.setLocationId(medicationRequest.getPerformOrg());
// 药品请求id
medicationDispense.setMedReqId(medicationRequest.getId());
// 已发药数量
medicationDispense.setDispenseQuantity(0);
// 用法
medicationDispense.setMethodCode(medicationRequest.getMethodCode());
// 用药频次
medicationDispense.setFrequencyCode(medicationRequest.getRateCode());
// 单次剂量
medicationDispense.setDose(medicationRequest.getDose());
// 剂量单位
medicationDispense.setDoseUnitCode(medicationRequest.getDoseUnitCode());
// 单次最大剂量
medicationDispense.setMaxUnit(medicationRequest.getMaxDose());
medicationDispenseList.add(medicationDispense);
}
return iMedicationDispenseService.saveBatch(medicationDispenseList);
}
}

118
openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IWesternMedicineDispenseAppServiceImpl.java → openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java
View File

@@ -1,5 +1,19 @@
package com.openhis.web.pharmacymanage.appservice.impl;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
@@ -9,7 +23,7 @@ import com.core.common.utils.SecurityUtils;
import com.openhis.administration.domain.Organization;
import com.openhis.administration.service.IOrganizationService;
import com.openhis.common.constant.PromptMsgConstant;
import com.openhis.common.enums.DispenseStatusEnum;
import com.openhis.common.enums.DispenseStatus;
import com.openhis.common.enums.NotPerformedReasonEnum;
import com.openhis.common.enums.OrganizationClass;
import com.openhis.common.utils.HisQueryUtils;
@@ -20,18 +34,6 @@ import com.openhis.web.pharmacymanage.dto.*;
import com.openhis.web.pharmacymanage.mapper.WesternMedicineDispenseMapper;
import com.openhis.workflow.domain.InventoryItem;
import com.openhis.workflow.service.IInventoryItemService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* 西药发放 应用实现类
@@ -40,7 +42,7 @@ import java.util.stream.Stream;
* @date 2025/3/14
*/
@Service
public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineDispenseAppService {
public class WesternMedicineDispenseAppServiceImpl implements IWesternMedicineDispenseAppService {
@Autowired
private IOrganizationService iOrganizationService;
@@ -67,14 +69,15 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
// 获取科室下拉选列表
List<Organization> organizationList = iOrganizationService.getList(OrganizationClass.CLINIC.getValue());
List<PageInitDto.DepartmentOption> organizationOptions = organizationList.stream()
.map(organization -> new PageInitDto.DepartmentOption(organization.getId(),
organization.getName())).collect(Collectors.toList());
.map(organization -> new PageInitDto.DepartmentOption(organization.getId(), organization.getName()))
.collect(Collectors.toList());
// 未发药原因下拉选列表
List<PageInitDto.NotPerformedReasonOption> notPerformedReasonOptions =
Stream.of(NotPerformedReasonEnum.values()).map(notPerformedReason ->
new PageInitDto.NotPerformedReasonOption(notPerformedReason.getValue(),
notPerformedReason.getInfo())).collect(Collectors.toList());
Stream.of(NotPerformedReasonEnum.values())
.map(notPerformedReason -> new PageInitDto.NotPerformedReasonOption(notPerformedReason.getValue(),
notPerformedReason.getInfo()))
.collect(Collectors.toList());
initDto.setDepartmentOptions(organizationOptions).setNotPerformedReasonOptions(notPerformedReasonOptions);
return R.ok(initDto);
@@ -90,33 +93,32 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
* @return 就诊病人列表
*/
@Override
public R<?> getEncounterInfoListPage(EncounterInfoSearchParam encounterInfoSearchParam,
Integer pageNo,
Integer pageSize,
HttpServletRequest request) {
public R<?> getEncounterInfoListPage(EncounterInfoSearchParam encounterInfoSearchParam, Integer pageNo,
Integer pageSize, HttpServletRequest request) {
// 查询条件设定
String condition = encounterInfoSearchParam.getCondition();
if (!condition.isEmpty()){
if (!condition.isEmpty()) {
Pattern pattern = Pattern.compile(".*\\d.*");
Matcher matcher = pattern.matcher(encounterInfoSearchParam.getCondition());
encounterInfoSearchParam.setIdCard(matcher.find() ? condition:"");
encounterInfoSearchParam.setPatientName(!matcher.find() ? condition:"");
encounterInfoSearchParam.setIdCard(matcher.find() ? condition : "");
encounterInfoSearchParam.setPatientName(!matcher.find() ? condition : "");
}
// 构建查询条件
QueryWrapper<EncounterInfoSearchParam> queryWrapper =
HisQueryUtils.buildQueryWrapper(encounterInfoSearchParam,null,null, request);
HisQueryUtils.buildQueryWrapper(encounterInfoSearchParam, null, null, request);
// 查询就诊病人列表
Page<EncounterInfoPageDto> encounterInfoPageDto = westernMedicineDispenseMapper.selectEncounterInfoListPage(
new Page<>(pageNo, pageSize), queryWrapper);
Page<EncounterInfoPageDto> encounterInfoPageDto =
westernMedicineDispenseMapper.selectEncounterInfoListPage(new Page<>(pageNo, pageSize), queryWrapper);
return R.ok(encounterInfoPageDto);
}
/**
* 查询处方单列表
*
* @param encounterId 就诊号
* @return 处方单列表
*/
@@ -124,15 +126,15 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
public R<?> getPrescriptionInfo(Long encounterId) {
// 患者基本信息查询
PrescriptionPatientInfoDto prescriptionPatientInfoDto = westernMedicineDispenseMapper.
selectPrescriptionPatientInfo(encounterId);
PrescriptionPatientInfoDto prescriptionPatientInfoDto =
westernMedicineDispenseMapper.selectPrescriptionPatientInfo(encounterId);
// 处方单信息查询
List<PrescriptionMedicineInfoDto> prescriptionMedicineInfoList = westernMedicineDispenseMapper.
selectPrescriptionMedicineInfoList(encounterId);
List<PrescriptionMedicineInfoDto> prescriptionMedicineInfoList =
westernMedicineDispenseMapper.selectPrescriptionMedicineInfoList(encounterId);
// 计算合计金额
if(!prescriptionMedicineInfoList.isEmpty()) {
if (!prescriptionMedicineInfoList.isEmpty()) {
BigDecimal totalPrice = new BigDecimal(0);
for (PrescriptionMedicineInfoDto item : prescriptionMedicineInfoList) {
totalPrice.add(item.getTotal_price());
@@ -149,6 +151,7 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
/**
* 处方单核对发药
*
* @param prescriptionNo 处方号
* @return 处理结果
*/
@@ -161,9 +164,9 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
boolean iInventoryItemUpdFlg = true;
// 获取药品待发放和库存信息
List<DispenseInventoryDto> dispenseInventoryList = westernMedicineDispenseMapper.
selectDispenseInventoryInfoByPrescriptionNo(prescriptionNo);
if(!dispenseInventoryList.isEmpty()){
List<DispenseInventoryDto> dispenseInventoryList =
westernMedicineDispenseMapper.selectDispenseInventoryInfoByPrescriptionNo(prescriptionNo);
if (!dispenseInventoryList.isEmpty()) {
MedicationDispense medicationDispense;
InventoryItem inventoryItem;
for (DispenseInventoryDto dispenseInventoryDto : dispenseInventoryList) {
@@ -173,7 +176,7 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
// id
medicationDispense.setId(dispenseInventoryDto.getDispenseId());
// 药品发放状态
medicationDispense.setStatusEnum(DispenseStatusEnum.COMPLETED.getValue());
medicationDispense.setStatusEnum(DispenseStatus.COMPLETED.getValue());
// 状态变更时间
medicationDispense.setStatusChangedTime(DateUtils.getNowDate());
// 发药人
@@ -189,23 +192,23 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
// 库存表项目设定
inventoryItem = new InventoryItem();
// 库存数量
if (dispenseInventoryDto.getDispenseUnitCode().equals(dispenseInventoryDto.
getInventoryBaseUnitCode())) {
if (dispenseInventoryDto.getDispenseUnitCode()
.equals(dispenseInventoryDto.getInventoryBaseUnitCode())) {
// id
inventoryItem.setId(dispenseInventoryDto.getInventoryId());
// 包装数量
inventoryItem.setBaseQuantity(new BigDecimal(dispenseInventoryDto.getDispenseQuantity()));
// 拆零数量（拆零比×包装数量）
inventoryItem.setMinQuantity(dispenseInventoryDto.getPartPercent().
multiply(new BigDecimal(dispenseInventoryDto.getDispenseQuantity())));
} else if (dispenseInventoryDto.getDispenseUnitCode().equals(dispenseInventoryDto.
getInventoryMinUnitCode())) {
inventoryItem.setMinQuantity(dispenseInventoryDto.getPartPercent()
.multiply(new BigDecimal(dispenseInventoryDto.getDispenseQuantity())));
} else if (dispenseInventoryDto.getDispenseUnitCode()
.equals(dispenseInventoryDto.getInventoryMinUnitCode())) {
// 拆零数量
inventoryItem.setMinQuantity(new BigDecimal(dispenseInventoryDto.getDispenseQuantity()));
// 包装数量（拆零数量÷拆零比）
inventoryItem.setBaseQuantity(new BigDecimal(dispenseInventoryDto.getDispenseQuantity()).
divide(dispenseInventoryDto.getPartPercent(),RoundingMode.HALF_UP));
inventoryItem.setBaseQuantity(new BigDecimal(dispenseInventoryDto.getDispenseQuantity())
.divide(dispenseInventoryDto.getPartPercent(), RoundingMode.HALF_UP));
}
inventoryItemList.add(inventoryItem);
}
@@ -215,28 +218,28 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
// 库存更新
iInventoryItemUpdFlg = iInventoryItemService.updateBatchById(inventoryItemList);
}
return iMedicationDispenseUpdFlg && iInventoryItemUpdFlg ?
R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))
: R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00010, null));
return iMedicationDispenseUpdFlg && iInventoryItemUpdFlg
? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))
: R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00010, null));
}
/**
* 作废
*
* @param prescriptionNo 处方号
* @param notPerformedReasonEnum 未发药原因
* @return 处理结果
*/
@Override
public R<?> medicineCancel(String prescriptionNo,
Integer notPerformedReasonEnum) {
public R<?> medicineCancel(String prescriptionNo, Integer notPerformedReasonEnum) {
List<MedicationDispense> medicationDispenseList = new ArrayList<>();
boolean iMedicationDispenseUpdFlg = true;
// 获取药品待发放记录
List<DispenseInventoryDto> dispenseInventoryList = westernMedicineDispenseMapper.
selectDispenseInventoryInfoByPrescriptionNo(prescriptionNo);
if(!dispenseInventoryList.isEmpty()){
List<DispenseInventoryDto> dispenseInventoryList =
westernMedicineDispenseMapper.selectDispenseInventoryInfoByPrescriptionNo(prescriptionNo);
if (!dispenseInventoryList.isEmpty()) {
MedicationDispense medicationDispense;
for (DispenseInventoryDto dispenseInventoryDto : dispenseInventoryList) {
@@ -245,7 +248,7 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
// id
medicationDispense.setId(dispenseInventoryDto.getDispenseId());
// 药品发放状态
medicationDispense.setStatusEnum(DispenseStatusEnum.DECLINED.getValue());
medicationDispense.setStatusEnum(DispenseStatus.DECLINED.getValue());
// 未发药原因
medicationDispense.setNotPerformedReasonEnum(notPerformedReasonEnum);
// 状态变更时间
@@ -257,8 +260,7 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
// 药品发放更新
iMedicationDispenseUpdFlg = iMedicationDispenseService.updateBatchById(medicationDispenseList);
}
return iMedicationDispenseUpdFlg?
R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))
: R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00010, null));
return iMedicationDispenseUpdFlg ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))
: R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00010, null));
}
}

29
openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/WesternMedicineDispenseController.java
View File

@@ -1,17 +1,19 @@
package com.openhis.web.pharmacymanage.controller;
import com.core.common.core.domain.R;
import com.openhis.web.pharmacymanage.appservice.IWesternMedicineDispenseAppService;
import com.openhis.web.pharmacymanage.dto.EncounterInfoSearchParam;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import com.core.common.core.domain.R;
import com.openhis.web.pharmacymanage.appservice.IWesternMedicineDispenseAppService;
import com.openhis.web.pharmacymanage.dto.EncounterInfoSearchParam;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
/**
* 西药发药
@@ -49,11 +51,10 @@ public class WesternMedicineDispenseController {
*/
@GetMapping("/encounter-list")
public R<?> getEncounterInfoList(EncounterInfoSearchParam encounterInfoSearchParam,
@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest request) {
return iWesternMedicineDispenseService.getEncounterInfoListPage(encounterInfoSearchParam,
pageNo, pageSize, request);
@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
return iWesternMedicineDispenseService.getEncounterInfoListPage(encounterInfoSearchParam, pageNo, pageSize,
request);
}
/**
@@ -66,6 +67,8 @@ public class WesternMedicineDispenseController {
return iWesternMedicineDispenseService.getPrescriptionInfo(encounterId);
}
// todo：配药逻辑
/**
* 核对发药
*
@@ -84,7 +87,7 @@ public class WesternMedicineDispenseController {
*/
@GetMapping("/medicine-cancel")
public R<?> medicineCancel(@RequestParam(value = "prescriptionNo") String prescriptionNo,
@RequestParam(value = "prescriptionNo") Integer notPerformedReasonEnum) {
return iWesternMedicineDispenseService.medicineCancel(prescriptionNo,notPerformedReasonEnum);
@RequestParam(value = "prescriptionNo") Integer notPerformedReasonEnum) {
return iWesternMedicineDispenseService.medicineCancel(prescriptionNo, notPerformedReasonEnum);
}
}

4
openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInventoryDto.java
View File

@@ -3,11 +3,11 @@
*/
package com.openhis.web.pharmacymanage.dto;
import java.math.BigDecimal;
import lombok.Data;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
/**
* 药品发放和库存表连接信息
*

4
openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoPageDto.java
View File

@@ -3,11 +3,11 @@
*/
package com.openhis.web.pharmacymanage.dto;
import java.io.Serializable;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
/**
* 就诊人员列表
*

4
openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoSearchParam.java
View File

@@ -3,11 +3,11 @@
*/
package com.openhis.web.pharmacymanage.dto;
import java.io.Serializable;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
/**
* 处方列表查询条件
*

4
openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PageInitDto.java
View File

@@ -3,11 +3,11 @@
*/
package com.openhis.web.pharmacymanage.dto;
import java.util.List;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.List;
/**
*
* @author wangyang

6
openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionInfoDto.java
View File

@@ -3,12 +3,12 @@
*/
package com.openhis.web.pharmacymanage.dto;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.List;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 处方信息
*

6
openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionMedicineInfoDto.java
View File

@@ -3,12 +3,12 @@
*/
package com.openhis.web.pharmacymanage.dto;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.math.BigDecimal;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 就诊人员列表
*

6
openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionPatientInfoDto.java
View File

@@ -3,13 +3,13 @@
*/
package com.openhis.web.pharmacymanage.dto;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 患者基本信息
*

21
openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java
View File

@@ -3,37 +3,40 @@
*/
package com.openhis.web.pharmacymanage.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.openhis.web.pharmacymanage.dto.*;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public interface WesternMedicineDispenseMapper {
/**
* 就诊病人列表分页查询
*
* @param page 分页
* @param queryWrapper 查询条件
* @return 就诊病人列表
*/
Page<EncounterInfoPageDto> selectEncounterInfoListPage(@Param("page") Page<EncounterInfoPageDto> page,
@Param(Constants.WRAPPER) QueryWrapper<EncounterInfoSearchParam> queryWrapper);
@Param(Constants.WRAPPER) QueryWrapper<EncounterInfoSearchParam> queryWrapper);
/**
* 患者基本信息查询
*
* @param encounterId 就诊号
* @return 患者基本信息
*/
PrescriptionPatientInfoDto selectPrescriptionPatientInfo(@Param("encounterId") Long encounterId);
/**
* 处方单查询
*
* @param encounterId 就诊号
* @return 处方单列表
*/
@@ -41,8 +44,10 @@ public interface WesternMedicineDispenseMapper {
/**
* 待发药和库存信息查询
* @param prescriptionNo 处方号
*
* @param prescriptionNo 处方号
* @return 待发药信息
*/
List<DispenseInventoryDto> selectDispenseInventoryInfoByPrescriptionNo(@Param("prescriptionNo") String prescriptionNo);
List<DispenseInventoryDto>
selectDispenseInventoryInfoByPrescriptionNo(@Param("prescriptionNo") String prescriptionNo);
}

63
openhis-server/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRefundAppMapper.xml
View File

@@ -24,47 +24,46 @@
AND T1.delete_flag = '0'
</select>
<select id="selectRefundItem" resultType="com.openhis.web.chargemanage.dto.RefundItemDto">
SELECT T1.*,
T2.name AS service_name
FROM fin_payment_reconciliation AS T1
LEFT JOIN adm_charge_item AS T2
ON T2.id IN T1.charge_item_ids
LEFT JOIN med_medication_request AS T3
ON T3.bus_no = SUBSTRING(T2.bus_no, #{three})
LEFT JOIN med_medication_dispense AS T4
ON T4.med_req_id = T3.id
WHERE T2.service_table = #{medMedicationRequest}
SELECT (T1.discount_amount + T2.surcharge_amount) AS pay_amount,
T2.bus_no,
T2.prescription_no,
T2.quantity,
T2.medication_id AS item_id,
T2.unit_code,
T3.status_enum
FROM adm_charge_item AS T1
LEFT JOIN med_medication_request AS T2
ON T2.bus_no = SUBSTRING(T1.bus_no, #{three})
LEFT JOIN med_medication_dispense AS T3
ON T3.med_req_id = T2.id
WHERE T1.service_table = #{medMedicationRequest}
AND T1.id IN
<foreach collection="paymentIdList" item="paymentId" separator="," open="(" close=")">
#{paymentId}
<foreach collection="chargeItemIdList" item="chargeItemId" separator="," open="(" close=")">
#{chargeItemId}
</foreach>
UNION ALL
UNION
SELECT T1.*,
T2.name AS service_name
FROM fin_payment_reconciliation AS T1
LEFT JOIN adm_charge_item AS T2
ON T2.id IN T1.charge_item_ids
LEFT JOIN wor_device_request AS T5
ON T6.bus_no = SUBSTRING(T2.bus_no, #{three})
LEFT JOIN wor_device_dispense AS T6
ON T6.device_req_id = T5.id
WHERE T2.service_table = #{worDeviceRequest}
FROM adm_charge_item AS T1
LEFT JOIN wor_device_request AS T4
ON T4.bus_no = SUBSTRING(T1.bus_no, #{three})
LEFT JOIN wor_device_dispense AS T5
ON T5.device_req_id = T4.id
WHERE T1.service_table = #{worDeviceRequest}
AND T1.id IN
<foreach collection="paymentIdList" item="paymentId" separator="," open="(" close=")">
#{paymentId}
<foreach collection="chargeItemIdList" item="chargeItemId" separator="," open="(" close=")">
#{chargeItemId}
</foreach>
UNION ALL
UNION
SELECT T1.*,
T2.name AS service_name
FROM fin_payment_reconciliation AS T1
LEFT JOIN adm_charge_item AS T2
ON T2.id IN T1.charge_item_ids
LEFT JOIN wor_service_request AS T7
ON T7.bus_no = SUBSTRING(T2.bus_no, #{three})
WHERE T2.service_table = #{worServiceRequest}
FROM adm_charge_item AS T1
LEFT JOIN wor_service_request AS T6
ON T6.bus_no = SUBSTRING(T1.bus_no, #{three})
WHERE T1.service_table = #{worServiceRequest}
AND T1.id IN
<foreach collection="paymentIdList" item="paymentId" separator="," open="(" close=")">
#{paymentId}
<foreach collection="chargeItemIdList" item="chargeItemId" separator="," open="(" close=")">
#{chargeItemId}
</foreach>
</select>
</mapper>