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

86门诊医生站-》西药方

Browse Source
This commit is contained in:
sindir
2026-01-26 13:25:02 +08:00
parent c1efd84332
commit c878dc19d7
7 changed files with 1035 additions and 972 deletions
Download Patch File Download Diff File Expand all files Collapse all files

161
openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
View File

@@ -40,6 +40,7 @@ import com.openhis.workflow.service.IServiceRequestService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal; import java.math.BigDecimal;
@@ -118,7 +119,8 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
String safeSearchKey = searchKey != null ? searchKey : ""; String safeSearchKey = searchKey != null ? searchKey : "";
String safeAdviceTypesStr = ""; String safeAdviceTypesStr = "";
if (adviceTypes != null && !adviceTypes.isEmpty()) { if (adviceTypes != null && !adviceTypes.isEmpty()) {
safeAdviceTypesStr = String.join(",", adviceTypes.stream().map(String::valueOf).collect(Collectors.toList())); safeAdviceTypesStr = String.join(",",
adviceTypes.stream().map(String::valueOf).collect(Collectors.toList()));
} }
String safeOrganizationId = organizationId != null ? organizationId.toString() : ""; String safeOrganizationId = organizationId != null ? organizationId.toString() : "";
String safePricingFlag = pricingFlag != null ? pricingFlag.toString() : ""; String safePricingFlag = pricingFlag != null ? pricingFlag.toString() : "";
@@ -141,8 +143,8 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
orderPricingSource = orderPricing; orderPricingSource = orderPricing;
} }
// 开药时药房允许多选开关 // 开药时药房允许多选开关
String pharmacyMultipleChoiceSwitch String pharmacyMultipleChoiceSwitch = TenantOptionUtil
= TenantOptionUtil.getOptionContent(TenantOptionDict.PHARMACY_MULTIPLE_CHOICE_SWITCH); .getOptionContent(TenantOptionDict.PHARMACY_MULTIPLE_CHOICE_SWITCH);
// 药房允许多选 // 药房允许多选
boolean pharmacyMultipleChoice = Whether.YES.getCode().equals(pharmacyMultipleChoiceSwitch); boolean pharmacyMultipleChoice = Whether.YES.getCode().equals(pharmacyMultipleChoiceSwitch);
@@ -152,7 +154,8 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
IPage<AdviceBaseDto> adviceBaseInfo = doctorStationAdviceAppMapper.getAdviceBaseInfo( IPage<AdviceBaseDto> adviceBaseInfo = doctorStationAdviceAppMapper.getAdviceBaseInfo(
new Page<>(pageNo, pageSize), PublicationStatus.ACTIVE.getValue(), organizationId, new Page<>(pageNo, pageSize), PublicationStatus.ACTIVE.getValue(), organizationId,
CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION, CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,
CommonConstants.TableName.WOR_ACTIVITY_DEFINITION, pricingFlag, adviceDefinitionIdParamList, adviceTypes, CommonConstants.TableName.WOR_ACTIVITY_DEFINITION, pricingFlag, adviceDefinitionIdParamList,
adviceTypes,
queryWrapper); queryWrapper);
List<AdviceBaseDto> adviceBaseDtoList = adviceBaseInfo.getRecords(); List<AdviceBaseDto> adviceBaseDtoList = adviceBaseInfo.getRecords();
@@ -162,22 +165,22 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
} }
// 医嘱定义ID集合 // 医嘱定义ID集合
List<Long> adviceDefinitionIdList List<Long> adviceDefinitionIdList = adviceBaseDtoList.stream().map(AdviceBaseDto::getAdviceDefinitionId)
= adviceBaseDtoList.stream().map(AdviceBaseDto::getAdviceDefinitionId).collect(Collectors.toList()); .collect(Collectors.toList());
// 费用定价主表ID集合 // 费用定价主表ID集合
List<Long> chargeItemDefinitionIdList List<Long> chargeItemDefinitionIdList = adviceBaseDtoList.stream().map(AdviceBaseDto::getChargeItemDefinitionId)
= adviceBaseDtoList.stream().map(AdviceBaseDto::getChargeItemDefinitionId).collect(Collectors.toList()); .collect(Collectors.toList());
// 医嘱库存集合 // 医嘱库存集合
List<AdviceInventoryDto> adviceInventoryList List<AdviceInventoryDto> adviceInventoryList = doctorStationAdviceAppMapper.getAdviceInventory(locationId,
= doctorStationAdviceAppMapper.getAdviceInventory(locationId, adviceDefinitionIdList, adviceDefinitionIdList,
CommonConstants.SqlCondition.ABOUT_INVENTORY_TABLE_STR, PublicationStatus.ACTIVE.getValue()); CommonConstants.SqlCondition.ABOUT_INVENTORY_TABLE_STR, PublicationStatus.ACTIVE.getValue());
// 待发放个数信息 // 待发放个数信息
List<AdviceInventoryDto> adviceDraftInventoryList = doctorStationAdviceAppMapper.getAdviceDraftInventory( List<AdviceInventoryDto> adviceDraftInventoryList = doctorStationAdviceAppMapper.getAdviceDraftInventory(
CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION, CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,
DispenseStatus.DRAFT.getValue(), DispenseStatus.PREPARATION.getValue()); DispenseStatus.DRAFT.getValue(), DispenseStatus.PREPARATION.getValue());
// 预减库存 // 预减库存
List<AdviceInventoryDto> adviceInventory List<AdviceInventoryDto> adviceInventory = adviceUtils.subtractInventory(adviceInventoryList,
= adviceUtils.subtractInventory(adviceInventoryList, adviceDraftInventoryList); adviceDraftInventoryList);
// 查询取药科室配置 // 查询取药科室配置
List<AdviceInventoryDto> medLocationConfig = doctorStationAdviceAppMapper.getMedLocationConfig(organizationId); List<AdviceInventoryDto> medLocationConfig = doctorStationAdviceAppMapper.getMedLocationConfig(organizationId);
// 将配置转为 {categoryCode -> 允许的locationId集合} // 将配置转为 {categoryCode -> 允许的locationId集合}
@@ -212,7 +215,8 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
for (int i = 0; i < chargeItemDefinitionIdList.size(); i += batchSize) { for (int i = 0; i < chargeItemDefinitionIdList.size(); i += batchSize) {
int endIndex = Math.min(i + batchSize, chargeItemDefinitionIdList.size()); int endIndex = Math.min(i + batchSize, chargeItemDefinitionIdList.size());
List<Long> batch = chargeItemDefinitionIdList.subList(i, endIndex); List<Long> batch = chargeItemDefinitionIdList.subList(i, endIndex);
mainCharge.addAll(doctorStationAdviceAppMapper.getMainCharge(batch, PublicationStatus.ACTIVE.getValue())); mainCharge
.addAll(doctorStationAdviceAppMapper.getMainCharge(batch, PublicationStatus.ACTIVE.getValue()));
} }
} }
String unitCode = ""; // 包装单位 String unitCode = ""; // 包装单位
@@ -228,13 +232,14 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
// fallthrough to 耗材处理逻辑（保持原有逻辑） // fallthrough to 耗材处理逻辑（保持原有逻辑）
// 每一条医嘱的库存集合信息 , 包装单位库存前端计算 // 每一条医嘱的库存集合信息 , 包装单位库存前端计算
List<AdviceInventoryDto> inventoryList = adviceInventory.stream().filter(e -> List<AdviceInventoryDto> inventoryList = adviceInventory
baseDto.getAdviceDefinitionId() != null && e.getItemId() != null .stream().filter(e -> baseDto.getAdviceDefinitionId() != null && e.getItemId() != null
&& baseDto.getAdviceDefinitionId().equals(e.getItemId()) && baseDto.getAdviceDefinitionId().equals(e.getItemId())
&& baseDto.getAdviceTableName() != null && e.getItemTable() != null && baseDto.getAdviceTableName() != null && e.getItemTable() != null
&& baseDto.getAdviceTableName().equals(e.getItemTable()) && baseDto.getAdviceTableName().equals(e.getItemTable())
&& (pharmacyMultipleChoice && (pharmacyMultipleChoice
|| (baseDto.getPositionId() == null || (e.getLocationId() != null && baseDto.getPositionId().equals(e.getLocationId()))))) || (baseDto.getPositionId() == null || (e.getLocationId() != null
&& baseDto.getPositionId().equals(e.getLocationId())))))
.collect(Collectors.toList()); .collect(Collectors.toList());
// 库存信息 // 库存信息
baseDto.setInventoryList(inventoryList); baseDto.setInventoryList(inventoryList);
@@ -251,13 +256,15 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
// 第一步：在medLocationConfig中匹配categoryCode // 第一步：在medLocationConfig中匹配categoryCode
AdviceInventoryDto result1 = medLocationConfig.stream() AdviceInventoryDto result1 = medLocationConfig.stream()
.filter(dto -> baseDto.getCategoryCode() != null && dto.getCategoryCode() != null .filter(dto -> baseDto.getCategoryCode() != null && dto.getCategoryCode() != null
&& baseDto.getCategoryCode().equals(dto.getCategoryCode())).findFirst() && baseDto.getCategoryCode().equals(dto.getCategoryCode()))
.findFirst()
.orElse(null); .orElse(null);
if (result1 != null) { if (result1 != null) {
// 第二步：在inventoryList中匹配locationId // 第二步：在inventoryList中匹配locationId
AdviceInventoryDto result2 = inventoryList.stream() AdviceInventoryDto result2 = inventoryList.stream()
.filter(dto -> result1.getLocationId() != null && dto.getLocationId() != null .filter(dto -> result1.getLocationId() != null && dto.getLocationId() != null
&& result1.getLocationId().equals(dto.getLocationId())).findFirst() && result1.getLocationId().equals(dto.getLocationId()))
.findFirst()
.orElse(null); .orElse(null);
if (result2 != null && result2.getLotNumber() != null) { if (result2 != null && result2.getLotNumber() != null) {
baseDto.setDefaultLotNumber(result2.getLotNumber()); baseDto.setDefaultLotNumber(result2.getLotNumber());
@@ -296,13 +303,14 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
baseDto.setPriceList(priceDtoList); baseDto.setPriceList(priceDtoList);
} else if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(tableName)) { // 耗材 } else if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(tableName)) { // 耗材
// 每一条医嘱的库存集合信息 , 包装单位库存前端计算 // 每一条医嘱的库存集合信息 , 包装单位库存前端计算
List<AdviceInventoryDto> inventoryList = adviceInventory.stream().filter(e -> List<AdviceInventoryDto> inventoryList = adviceInventory
baseDto.getAdviceDefinitionId() != null && e.getItemId() != null .stream().filter(e -> baseDto.getAdviceDefinitionId() != null && e.getItemId() != null
&& baseDto.getAdviceDefinitionId().equals(e.getItemId()) && baseDto.getAdviceDefinitionId().equals(e.getItemId())
&& baseDto.getAdviceTableName() != null && e.getItemTable() != null && baseDto.getAdviceTableName() != null && e.getItemTable() != null
&& baseDto.getAdviceTableName().equals(e.getItemTable()) && baseDto.getAdviceTableName().equals(e.getItemTable())
&& (pharmacyMultipleChoice && (pharmacyMultipleChoice
|| (baseDto.getPositionId() == null || (e.getLocationId() != null && baseDto.getPositionId().equals(e.getLocationId()))))) || (baseDto.getPositionId() == null || (e.getLocationId() != null
&& baseDto.getPositionId().equals(e.getLocationId())))))
.collect(Collectors.toList()); .collect(Collectors.toList());
// 库存信息 // 库存信息
baseDto.setInventoryList(inventoryList); baseDto.setInventoryList(inventoryList);
@@ -319,13 +327,15 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
// 第一步：在medLocationConfig中匹配categoryCode // 第一步：在medLocationConfig中匹配categoryCode
AdviceInventoryDto result1 = medLocationConfig.stream() AdviceInventoryDto result1 = medLocationConfig.stream()
.filter(dto -> baseDto.getCategoryCode() != null && dto.getCategoryCode() != null .filter(dto -> baseDto.getCategoryCode() != null && dto.getCategoryCode() != null
&& baseDto.getCategoryCode().equals(dto.getCategoryCode())).findFirst() && baseDto.getCategoryCode().equals(dto.getCategoryCode()))
.findFirst()
.orElse(null); .orElse(null);
if (result1 != null) { if (result1 != null) {
// 第二步：在inventoryList中匹配locationId // 第二步：在inventoryList中匹配locationId
AdviceInventoryDto result2 = inventoryList.stream() AdviceInventoryDto result2 = inventoryList.stream()
.filter(dto -> result1.getLocationId() != null && dto.getLocationId() != null .filter(dto -> result1.getLocationId() != null && dto.getLocationId() != null
&& result1.getLocationId().equals(dto.getLocationId())).findFirst() && result1.getLocationId().equals(dto.getLocationId()))
.findFirst()
.orElse(null); .orElse(null);
if (result2 != null && result2.getLotNumber() != null) { if (result2 != null && result2.getLotNumber() != null) {
baseDto.setDefaultLotNumber(result2.getLotNumber()); baseDto.setDefaultLotNumber(result2.getLotNumber());
@@ -363,13 +373,15 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
// 价格信息 // 价格信息
baseDto.setPriceList(priceDtoList); baseDto.setPriceList(priceDtoList);
} else if (CommonConstants.TableName.WOR_ACTIVITY_DEFINITION.equals(tableName)) { // 诊疗 } else if (CommonConstants.TableName.WOR_ACTIVITY_DEFINITION.equals(tableName)) { // 诊疗
List<AdvicePriceDto> priceList List<AdvicePriceDto> priceList = mainCharge.stream()
= mainCharge.stream().filter(e -> baseDto.getChargeItemDefinitionId() != null && e.getDefinitionId() != null .filter(e -> baseDto.getChargeItemDefinitionId() != null && e.getDefinitionId() != null
&& baseDto.getChargeItemDefinitionId().equals(e.getDefinitionId())) && baseDto.getChargeItemDefinitionId().equals(e.getDefinitionId()))
.collect(Collectors.toList()); .collect(Collectors.toList());
// 价格信息 // 价格信息
baseDto.setPriceList(priceList); baseDto.setPriceList(priceList);
// 活动类型：字典转换框架会自动填充 activityType_dictText，无需手动设置 // 活动类型
baseDto.setActivityType_enumText(
EnumUtils.getInfoByValue(ActivityType.class, baseDto.getActivityType()));
} }
} }
@@ -396,6 +408,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
* @return 结果 * @return 结果
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public R<?> saveAdvice(AdviceSaveParam adviceSaveParam, String adviceOpType) { public R<?> saveAdvice(AdviceSaveParam adviceSaveParam, String adviceOpType) {
try { try {
// 患者挂号对应的科室id // 患者挂号对应的科室id
@@ -416,10 +429,10 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
* 保存时,校验库存 * 保存时,校验库存
*/ */
if (AdviceOpType.SAVE_ADVICE.getCode().equals(adviceOpType)) { if (AdviceOpType.SAVE_ADVICE.getCode().equals(adviceOpType)) {
List<AdviceSaveDto> medUpdateList List<AdviceSaveDto> medUpdateList = medicineList.stream().filter(e -> e.getRequestId() != null)
= medicineList.stream().filter(e -> e.getRequestId() != null).collect(Collectors.toList()); .collect(Collectors.toList());
List<AdviceSaveDto> devUpdateList List<AdviceSaveDto> devUpdateList = deviceList.stream().filter(e -> e.getRequestId() != null)
= deviceList.stream().filter(e -> e.getRequestId() != null).collect(Collectors.toList()); .collect(Collectors.toList());
// 编辑时,释放本身占用的库存发放 // 编辑时,释放本身占用的库存发放
for (AdviceSaveDto adviceSaveDto : medUpdateList) { for (AdviceSaveDto adviceSaveDto : medUpdateList) {
iMedicationDispenseService.deleteMedicationDispense(adviceSaveDto.getRequestId()); iMedicationDispenseService.deleteMedicationDispense(adviceSaveDto.getRequestId());
@@ -428,9 +441,10 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
iDeviceDispenseService.deleteDeviceDispense(adviceSaveDto.getRequestId()); iDeviceDispenseService.deleteDeviceDispense(adviceSaveDto.getRequestId());
} }
List<AdviceSaveDto> needCheckList List<AdviceSaveDto> needCheckList = adviceSaveList.stream()
= adviceSaveList.stream().filter(e -> !DbOpType.DELETE.getCode().equals(e.getDbOpType()) .filter(e -> !DbOpType.DELETE.getCode().equals(e.getDbOpType())
&& !ItemType.ACTIVITY.getValue().equals(e.getAdviceType())).collect(Collectors.toList()); && !ItemType.ACTIVITY.getValue().equals(e.getAdviceType()))
.collect(Collectors.toList());
// 校验库存 // 校验库存
String tipRes = adviceUtils.checkInventory(needCheckList); String tipRes = adviceUtils.checkInventory(needCheckList);
if (tipRes != null) { if (tipRes != null) {
@@ -445,8 +459,8 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
/** /**
* 处理药品请求 * 处理药品请求
*/ */
List<String> medRequestIdList List<String> medRequestIdList = this.handMedication(medicineList, curDate, adviceOpType, organizationId,
= this.handMedication(medicineList, curDate, adviceOpType, organizationId, signCode); signCode);
/** /**
* 处理诊疗项目请求 * 处理诊疗项目请求
@@ -463,7 +477,8 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
// 签发的医嘱id集合 // 签发的医嘱id集合
List<Long> requestIds = adviceSaveList.stream() List<Long> requestIds = adviceSaveList.stream()
.filter(e -> !DbOpType.DELETE.getCode().equals(e.getDbOpType()) && e.getRequestId() != null) .filter(e -> !DbOpType.DELETE.getCode().equals(e.getDbOpType()) && e.getRequestId() != null)
.collect(Collectors.toList()).stream().map(AdviceSaveDto::getRequestId).collect(Collectors.toList()); .collect(Collectors.toList()).stream().map(AdviceSaveDto::getRequestId)
.collect(Collectors.toList());
// 就诊id // 就诊id
Long encounterId = adviceSaveList.get(0).getEncounterId(); Long encounterId = adviceSaveList.get(0).getEncounterId();
iChargeItemService.update(new LambdaUpdateWrapper<ChargeItem>() iChargeItemService.update(new LambdaUpdateWrapper<ChargeItem>()
@@ -477,7 +492,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
clearRelatedCache(); clearRelatedCache();
return R.ok(medRequestIdList, return R.ok(medRequestIdList,
MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[]{"门诊医嘱"})); MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] { "门诊医嘱" }));
} catch (Exception e) { } catch (Exception e) {
// 异常处理 // 异常处理
throw e; throw e;
@@ -499,6 +514,10 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
Long organizationId, String signCode) { Long organizationId, String signCode) {
// 当前登录账号的科室id // 当前登录账号的科室id
Long orgId = SecurityUtils.getLoginUser().getOrgId(); Long orgId = SecurityUtils.getLoginUser().getOrgId();
// 获取当前登录用户的tenantId
Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
// 获取当前登录用户名
String currentUsername = SecurityUtils.getUsername();
// 保存操作 // 保存操作
boolean is_save = AdviceOpType.SAVE_ADVICE.getCode().equals(adviceOpType); boolean is_save = AdviceOpType.SAVE_ADVICE.getCode().equals(adviceOpType);
// 签发操作 // 签发操作
@@ -508,9 +527,10 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
// 声明费用项 // 声明费用项
ChargeItem chargeItem; ChargeItem chargeItem;
// 新增 + 修改 // 新增 + 修改
List<AdviceSaveDto> insertOrUpdateList List<AdviceSaveDto> insertOrUpdateList = medicineList.stream()
= medicineList.stream().filter(e -> (DbOpType.INSERT.getCode().equals(e.getDbOpType()) .filter(e -> (DbOpType.INSERT.getCode().equals(e.getDbOpType())
|| DbOpType.UPDATE.getCode().equals(e.getDbOpType()))).collect(Collectors.toList()); || DbOpType.UPDATE.getCode().equals(e.getDbOpType())))
.collect(Collectors.toList());
// 删除 // 删除
List<AdviceSaveDto> deleteList = medicineList.stream() List<AdviceSaveDto> deleteList = medicineList.stream()
.filter(e -> DbOpType.DELETE.getCode().equals(e.getDbOpType())).collect(Collectors.toList()); .filter(e -> DbOpType.DELETE.getCode().equals(e.getDbOpType())).collect(Collectors.toList());
@@ -535,7 +555,8 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
adviceSaveDto.getRequestId()); adviceSaveDto.getRequestId());
// 删除基于这个药品生成的需要执行的诊疗请求 // 删除基于这个药品生成的需要执行的诊疗请求
iServiceRequestService.remove( iServiceRequestService.remove(
new LambdaQueryWrapper<ServiceRequest>().eq(ServiceRequest::getBasedOnId, adviceSaveDto.getRequestId()) new LambdaQueryWrapper<ServiceRequest>()
.eq(ServiceRequest::getBasedOnId, adviceSaveDto.getRequestId())
.isNotNull(ServiceRequest::getBasedOnTable) .isNotNull(ServiceRequest::getBasedOnTable)
.eq(ServiceRequest::getStatusEnum, RequestStatus.COMPLETED.getValue())); .eq(ServiceRequest::getStatusEnum, RequestStatus.COMPLETED.getValue()));
} }
@@ -552,8 +573,10 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
medicationRequest.setId(adviceSaveDto.getRequestId()); // 主键id medicationRequest.setId(adviceSaveDto.getRequestId()); // 主键id
medicationRequest.setStatusEnum(is_save ? RequestStatus.DRAFT.getValue() : RequestStatus.ACTIVE.getValue()); // 请求状态 medicationRequest.setStatusEnum(is_save ? RequestStatus.DRAFT.getValue() : RequestStatus.ACTIVE.getValue()); // 请求状态
medicationRequest.setPrescriptionNo(adviceSaveDto.getPrescriptionNo()); // 处方号 medicationRequest.setPrescriptionNo(adviceSaveDto.getPrescriptionNo()); // 处方号
medicationRequest.setTenantId(SecurityUtils.getLoginUser().getTenantId()); // 显式设置租户ID
medicationRequest.setGroupId(adviceSaveDto.getGroupId()); // 组号 medicationRequest.setGroupId(adviceSaveDto.getGroupId()); // 组号
medicationRequest.setTenantId(tenantId); // 设置租户id
medicationRequest.setCreateBy(currentUsername); // 设置创建人
medicationRequest.setCreateTime(curDate); // 设置创建时间
if (is_sign) { if (is_sign) {
medicationRequest.setSignCode(signCode); medicationRequest.setSignCode(signCode);
} }
@@ -598,8 +621,8 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
} }
if (is_save) { if (is_save) {
// 处理药品发放 // 处理药品发放
Long dispenseId Long dispenseId = iMedicationDispenseService.handleMedicationDispense(medicationRequest,
= iMedicationDispenseService.handleMedicationDispense(medicationRequest, adviceSaveDto.getDbOpType()); adviceSaveDto.getDbOpType());
// 保存药品费用项 // 保存药品费用项
chargeItem = new ChargeItem(); chargeItem = new ChargeItem();
@@ -624,6 +647,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
chargeItem.setConditionId(adviceSaveDto.getConditionId()); // 诊断id chargeItem.setConditionId(adviceSaveDto.getConditionId()); // 诊断id
chargeItem.setEncounterDiagnosisId(adviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id chargeItem.setEncounterDiagnosisId(adviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
chargeItem.setDispenseId(dispenseId); // 发放ID chargeItem.setDispenseId(dispenseId); // 发放ID
chargeItem.setTenantId(tenantId); // 设置租户ID (修复本次报错)
chargeItem.setCreateBy(currentUsername); // 设置创建人
chargeItem.setCreateTime(curDate); // 设置创建时间
chargeItem.setQuantityValue(adviceSaveDto.getQuantity()); // 数量 chargeItem.setQuantityValue(adviceSaveDto.getQuantity()); // 数量
chargeItem.setQuantityUnit(adviceSaveDto.getUnitCode()); // 单位 chargeItem.setQuantityUnit(adviceSaveDto.getUnitCode()); // 单位
@@ -648,6 +674,10 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
private void handDevice(List<AdviceSaveDto> deviceList, Date curDate, String adviceOpType) { private void handDevice(List<AdviceSaveDto> deviceList, Date curDate, String adviceOpType) {
// 当前登录账号的科室id // 当前登录账号的科室id
Long orgId = SecurityUtils.getLoginUser().getOrgId(); Long orgId = SecurityUtils.getLoginUser().getOrgId();
// 获取当前登录用户的tenantId
Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
// 获取当前登录用户名
String currentUsername = SecurityUtils.getUsername();
// 保存操作 // 保存操作
boolean is_save = AdviceOpType.SAVE_ADVICE.getCode().equals(adviceOpType); boolean is_save = AdviceOpType.SAVE_ADVICE.getCode().equals(adviceOpType);
// 签发操作 // 签发操作
@@ -656,9 +686,10 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
// 声明费用项 // 声明费用项
ChargeItem chargeItem; ChargeItem chargeItem;
// 新增 + 修改 // 新增 + 修改
List<AdviceSaveDto> insertOrUpdateList List<AdviceSaveDto> insertOrUpdateList = deviceList.stream()
= deviceList.stream().filter(e -> (DbOpType.INSERT.getCode().equals(e.getDbOpType()) .filter(e -> (DbOpType.INSERT.getCode().equals(e.getDbOpType())
|| DbOpType.UPDATE.getCode().equals(e.getDbOpType()))).collect(Collectors.toList()); || DbOpType.UPDATE.getCode().equals(e.getDbOpType())))
.collect(Collectors.toList());
// 删除 // 删除
List<AdviceSaveDto> deleteList = deviceList.stream() List<AdviceSaveDto> deleteList = deviceList.stream()
.filter(e -> DbOpType.DELETE.getCode().equals(e.getDbOpType())).collect(Collectors.toList()); .filter(e -> DbOpType.DELETE.getCode().equals(e.getDbOpType())).collect(Collectors.toList());
@@ -691,6 +722,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
// 显式设置审计字段，防止自动填充机制失效 // 显式设置审计字段，防止自动填充机制失效
deviceRequest.setCreateBy(SecurityUtils.getLoginUser().getUsername()); deviceRequest.setCreateBy(SecurityUtils.getLoginUser().getUsername());
deviceRequest.setCreateTime(new Date()); deviceRequest.setCreateTime(new Date());
deviceRequest.setTenantId(tenantId); // 设置租户id
deviceRequest.setCreateBy(currentUsername); // 设置创建人
deviceRequest.setCreateTime(curDate); // 设置创建时间
// 保存时,处理数据(请求,发放,账单) // 保存时,处理数据(请求,发放,账单)
if (is_save) { if (is_save) {
@@ -720,12 +754,15 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
iDeviceRequestService.saveOrUpdate(deviceRequest); iDeviceRequestService.saveOrUpdate(deviceRequest);
if (is_save) { if (is_save) {
// 处理耗材发放 // 处理耗材发放
Long dispenseId Long dispenseId = iDeviceDispenseService.handleDeviceDispense(deviceRequest,
= iDeviceDispenseService.handleDeviceDispense(deviceRequest, adviceSaveDto.getDbOpType()); adviceSaveDto.getDbOpType());
// 保存耗材费用项 // 保存耗材费用项
chargeItem = new ChargeItem(); chargeItem = new ChargeItem();
chargeItem.setId(adviceSaveDto.getChargeItemId()); // 费用项id chargeItem.setId(adviceSaveDto.getChargeItemId()); // 费用项id
chargeItem.setTenantId(tenantId); // 补全租户ID
chargeItem.setCreateBy(currentUsername); // 补全创建人
chargeItem.setCreateTime(curDate); // 补全创建时间
chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 收费状态 chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 收费状态
chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(deviceRequest.getBusNo())); chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(deviceRequest.getBusNo()));
chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源 chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
@@ -768,6 +805,10 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
String signCode) { String signCode) {
// 当前登录账号的科室id // 当前登录账号的科室id
Long orgId = SecurityUtils.getLoginUser().getOrgId(); Long orgId = SecurityUtils.getLoginUser().getOrgId();
// 获取当前登录用户的tenantId
Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
// 获取当前登录用户名
String currentUsername = SecurityUtils.getUsername();
// 保存操作 // 保存操作
boolean is_save = AdviceOpType.SAVE_ADVICE.getCode().equals(adviceOpType); boolean is_save = AdviceOpType.SAVE_ADVICE.getCode().equals(adviceOpType);
// 签发操作 // 签发操作
@@ -776,9 +817,10 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
// 声明费用项 // 声明费用项
ChargeItem chargeItem; ChargeItem chargeItem;
// 新增 + 修改 // 新增 + 修改
List<AdviceSaveDto> insertOrUpdateList List<AdviceSaveDto> insertOrUpdateList = activityList.stream()
= activityList.stream().filter(e -> (DbOpType.INSERT.getCode().equals(e.getDbOpType()) .filter(e -> (DbOpType.INSERT.getCode().equals(e.getDbOpType())
|| DbOpType.UPDATE.getCode().equals(e.getDbOpType()))).collect(Collectors.toList()); || DbOpType.UPDATE.getCode().equals(e.getDbOpType())))
.collect(Collectors.toList());
// 删除 // 删除
List<AdviceSaveDto> deleteList = activityList.stream() List<AdviceSaveDto> deleteList = activityList.stream()
.filter(e -> DbOpType.DELETE.getCode().equals(e.getDbOpType())).collect(Collectors.toList()); .filter(e -> DbOpType.DELETE.getCode().equals(e.getDbOpType())).collect(Collectors.toList());
@@ -797,7 +839,8 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
for (AdviceSaveDto adviceSaveDto : deleteList) { for (AdviceSaveDto adviceSaveDto : deleteList) {
iServiceRequestService.removeById(adviceSaveDto.getRequestId());// 删除诊疗 iServiceRequestService.removeById(adviceSaveDto.getRequestId());// 删除诊疗
iServiceRequestService.remove( iServiceRequestService.remove(
new LambdaQueryWrapper<ServiceRequest>().eq(ServiceRequest::getParentId, adviceSaveDto.getRequestId()));// 删除诊疗套餐对应的子项 new LambdaQueryWrapper<ServiceRequest>().eq(ServiceRequest::getParentId,
adviceSaveDto.getRequestId()));// 删除诊疗套餐对应的子项
// 删除费用项 // 删除费用项
iChargeItemService.deleteByServiceTableAndId(CommonConstants.TableName.WOR_SERVICE_REQUEST, iChargeItemService.deleteByServiceTableAndId(CommonConstants.TableName.WOR_SERVICE_REQUEST,
adviceSaveDto.getRequestId()); adviceSaveDto.getRequestId());
@@ -807,6 +850,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
serviceRequest = new ServiceRequest(); serviceRequest = new ServiceRequest();
serviceRequest.setId(adviceSaveDto.getRequestId()); // 主键id serviceRequest.setId(adviceSaveDto.getRequestId()); // 主键id
serviceRequest.setStatusEnum(is_save ? RequestStatus.DRAFT.getValue() : RequestStatus.ACTIVE.getValue());// 请求状态 serviceRequest.setStatusEnum(is_save ? RequestStatus.DRAFT.getValue() : RequestStatus.ACTIVE.getValue());// 请求状态
serviceRequest.setTenantId(tenantId); // 设置租户id
serviceRequest.setCreateBy(currentUsername); // 设置创建人
serviceRequest.setCreateTime(curDate); // 设置创建时间
serviceRequest.setTenantId(SecurityUtils.getLoginUser().getTenantId()); // 显式设置租户ID serviceRequest.setTenantId(SecurityUtils.getLoginUser().getTenantId()); // 显式设置租户ID
if (is_sign) { if (is_sign) {
serviceRequest.setSignCode(signCode); serviceRequest.setSignCode(signCode);
@@ -845,6 +891,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
if (is_save) { if (is_save) {
chargeItem = new ChargeItem(); chargeItem = new ChargeItem();
chargeItem.setId(adviceSaveDto.getChargeItemId()); // 费用项id chargeItem.setId(adviceSaveDto.getChargeItemId()); // 费用项id
chargeItem.setTenantId(tenantId); // 补全租户ID
chargeItem.setCreateBy(currentUsername); // 补全创建人
chargeItem.setCreateTime(curDate); // 补全创建时间
chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 收费状态 chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 收费状态
chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(serviceRequest.getBusNo())); chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(serviceRequest.getBusNo()));
chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源 chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
@@ -868,11 +917,6 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
chargeItem.setUnitPrice(adviceSaveDto.getUnitPrice()); // 单价 chargeItem.setUnitPrice(adviceSaveDto.getUnitPrice()); // 单价
chargeItem.setTotalPrice(adviceSaveDto.getTotalPrice()); // 总价 chargeItem.setTotalPrice(adviceSaveDto.getTotalPrice()); // 总价
// 显式设置审计字段，防止自动填充机制失效
chargeItem.setTenantId(SecurityUtils.getLoginUser().getTenantId());
chargeItem.setCreateBy(SecurityUtils.getLoginUser().getUsername());
chargeItem.setCreateTime(new Date());
iChargeItemService.saveOrUpdate(chargeItem); iChargeItemService.saveOrUpdate(chargeItem);
// 第一次保存时,处理诊疗套餐的子项信息 // 第一次保存时,处理诊疗套餐的子项信息
@@ -894,6 +938,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
} }
} }
} }
// 只有在签发时 // 只有在签发时
if (is_sign) { if (is_sign) {
// 发送跨系统申请 // 发送跨系统申请

12
openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java
View File

@@ -215,6 +215,12 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
condition.setYbNo(saveDiagnosisChildParam.getYbNo()); condition.setYbNo(saveDiagnosisChildParam.getYbNo());
condition.setRecordedDatetime(new Date()); condition.setRecordedDatetime(new Date());
condition.setRecorderId(SecurityUtils.getLoginUser().getPractitionerId());// 记录人 condition.setRecorderId(SecurityUtils.getLoginUser().getPractitionerId());// 记录人
// 设置租户ID，避免数据库约束错误
condition.setTenantId(SecurityUtils.getLoginUser().getTenantId());
// 设置创建人，避免数据库约束错误
condition.setCreateBy(SecurityUtils.getLoginUser().getUsername());
// 设置创建时间，避免数据库约束错误
condition.setCreateTime(new Date());
iConditionService.saveOrUpdate(condition); iConditionService.saveOrUpdate(condition);
saveDiagnosisChildParam.setConditionId(condition.getId()); saveDiagnosisChildParam.setConditionId(condition.getId());
} }
@@ -230,6 +236,12 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
encounterDiagnosis.setMedTypeCode(saveDiagnosisChildParam.getMedTypeCode());// 医疗类型 encounterDiagnosis.setMedTypeCode(saveDiagnosisChildParam.getMedTypeCode());// 医疗类型
encounterDiagnosis.setDiagnosisDesc(saveDiagnosisChildParam.getDiagnosisDesc()); // 诊断描述 encounterDiagnosis.setDiagnosisDesc(saveDiagnosisChildParam.getDiagnosisDesc()); // 诊断描述
encounterDiagnosis.setIptDiseTypeCode(saveDiagnosisChildParam.getIptDiseTypeCode()); // 患者疾病诊断类型代码 encounterDiagnosis.setIptDiseTypeCode(saveDiagnosisChildParam.getIptDiseTypeCode()); // 患者疾病诊断类型代码
// 设置租户ID，避免数据库约束错误
encounterDiagnosis.setTenantId(SecurityUtils.getLoginUser().getTenantId());
// 设置创建人，避免数据库约束错误
encounterDiagnosis.setCreateBy(SecurityUtils.getLoginUser().getUsername());
// 设置创建时间，避免数据库约束错误
encounterDiagnosis.setCreateTime(new Date());
iEncounterDiagnosisService.saveOrUpdate(encounterDiagnosis); iEncounterDiagnosisService.saveOrUpdate(encounterDiagnosis);
} }
return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"诊断"})); return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"诊断"}));

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java
View File

@@ -111,6 +111,10 @@ public class AdviceBaseDto {
@Dict(dictCode = "activity_category_code") @Dict(dictCode = "activity_category_code")
private Integer activityType; private Integer activityType;
private String activityType_dictText; private String activityType_dictText;
/**
* 活动类型枚举文本 (手动赋值用)
*/
private String activityType_enumText;
/** /**
* 是否皮试 * 是否皮试

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.core.common.enums.DelFlag; import com.core.common.enums.DelFlag;
import com.core.common.utils.AssignSeqUtil; import com.core.common.utils.AssignSeqUtil;
import com.core.common.utils.DateUtils; import com.core.common.utils.DateUtils;
import com.core.common.utils.SecurityUtils;
import com.openhis.common.enums.AssignSeqEnum; import com.openhis.common.enums.AssignSeqEnum;
import com.openhis.common.enums.DispenseStatus; import com.openhis.common.enums.DispenseStatus;
import com.openhis.medication.domain.MedicationDispense; import com.openhis.medication.domain.MedicationDispense;
@@ -50,6 +51,10 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
medicationDispense.setStatusEnum(DispenseStatus.DRAFT.getValue()); medicationDispense.setStatusEnum(DispenseStatus.DRAFT.getValue());
// 状态变更时间 // 状态变更时间
medicationDispense.setStatusChangedTime(DateUtils.getNowDate()); medicationDispense.setStatusChangedTime(DateUtils.getNowDate());
// 【关键修改】设置创建时间，解决数据库 not-null 报错
medicationDispense.setCreateTime(DateUtils.getNowDate());
// 发药类型 // 发药类型
medicationDispense.setDispenseEnum(medicationRequest.getCategoryEnum()); medicationDispense.setDispenseEnum(medicationRequest.getCategoryEnum());
// 药品编码 // 药品编码
@@ -89,19 +94,31 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
// 增加2小时 // 增加2小时
LocalDateTime newTime = now.plusHours(2); LocalDateTime newTime = now.plusHours(2);
// 转换为Date对象（如果需要保持使用Date类型） // 转换为Date对象
Date limitTime = Date.from(newTime.atZone(ZoneId.systemDefault()).toInstant()); Date limitTime = Date.from(newTime.atZone(ZoneId.systemDefault()).toInstant());
// 设置限制发药时间 // 设置限制发药时间
medicationDispense.setLimitTime(limitTime); medicationDispense.setLimitTime(limitTime);
baseMapper.insert(medicationDispense); // 【关键修改】手动设置租户ID和创建人，确保 create_by 非空
try {
// 尝试获取当前登录用户
medicationDispense.setTenantId(SecurityUtils.getLoginUser().getTenantId());
medicationDispense.setCreateBy(SecurityUtils.getUsername());
} catch (Exception e) {
// 如果获取失败（如系统自动执行），使用默认值兜底，防止数据库报错
medicationDispense.setTenantId(1);
medicationDispense.setCreateBy("system");
}
// 执行插入
// 注意：如果您需要区分新增和修改，请取消下面注释并根据 dbOpType 判断
// if (DbOpType.UPDATE.getCode().equals(dbOpType)) {
// baseMapper.update(medicationDispense, new LambdaUpdateWrapper<MedicationDispense>()
// .eq(MedicationDispense::getMedReqId, medicationRequest.getId()));
// } else {
baseMapper.insert(medicationDispense);
// }
// if (DbOpType.INSERT.getCode().equals(dbOpType)) {
// baseMapper.insert(medicationDispense);
// } else if (DbOpType.UPDATE.getCode().equals(dbOpType)) {
// baseMapper.update(medicationDispense, new LambdaUpdateWrapper<MedicationDispense>()
// .eq(MedicationDispense::getMedReqId, medicationRequest.getId()));
// }
return medicationDispense.getId(); return medicationDispense.getId();
} }
@@ -161,6 +178,7 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
medicationDispense.setDoseUnitCode(medicationRequest.getDoseUnitCode()); medicationDispense.setDoseUnitCode(medicationRequest.getDoseUnitCode());
// 单次最大剂量 // 单次最大剂量
medicationDispense.setMaxUnit(medicationRequest.getMaxDose()); medicationDispense.setMaxUnit(medicationRequest.getMaxDose());
// 获取当前时间 // 获取当前时间
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
// 增加12小时 // 增加12小时
@@ -169,6 +187,15 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
Date limitTime = Date.from(newTime.atZone(ZoneId.systemDefault()).toInstant()); Date limitTime = Date.from(newTime.atZone(ZoneId.systemDefault()).toInstant());
// 设置限制发药时间 // 设置限制发药时间
medicationDispense.setLimitTime(limitTime); medicationDispense.setLimitTime(limitTime);
// 手动设置租户ID和创建人
try {
medicationDispense.setTenantId(SecurityUtils.getLoginUser().getTenantId());
medicationDispense.setCreateBy(SecurityUtils.getUsername());
} catch (Exception e) {
// 如果获取登录用户信息失败，使用默认值
medicationDispense.setTenantId(1); // 默认租户ID
medicationDispense.setCreateBy("system"); // 默认创建人
}
baseMapper.insert(medicationDispense); baseMapper.insert(medicationDispense);
@@ -182,7 +209,8 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
*/ */
@Override @Override
public void deleteMedicationDispense(Long medReqId) { public void deleteMedicationDispense(Long medReqId) {
baseMapper.delete(new LambdaQueryWrapper<MedicationDispense>().eq(MedicationDispense::getMedReqId, medReqId)); baseMapper.delete(new LambdaQueryWrapper<MedicationDispense>().eq(MedicationDispense::getMedReqId,
medReqId));
} }
/** /**
@@ -194,8 +222,10 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
@Override @Override
public void updateStopDispenseStatus(List<Long> medDisIdList, Integer refund) { public void updateStopDispenseStatus(List<Long> medDisIdList, Integer refund) {
baseMapper.update( baseMapper.update(
new MedicationDispense().setStatusEnum(DispenseStatus.STOPPED.getValue()).setNotPerformedReasonEnum(refund), new MedicationDispense().setStatusEnum(DispenseStatus.STOPPED.getValue())
new LambdaUpdateWrapper<MedicationDispense>().in(MedicationDispense::getId, medDisIdList)); .setNotPerformedReasonEnum(refund),
new LambdaUpdateWrapper<MedicationDispense>().in(MedicationDispense::getId,
medDisIdList));
} }
/** /**
@@ -207,7 +237,8 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
public void updatePreparationDispenseStatus(List<Long> medicationRequestIdList) { public void updatePreparationDispenseStatus(List<Long> medicationRequestIdList) {
baseMapper.update(null, baseMapper.update(null,
new LambdaUpdateWrapper<MedicationDispense>() new LambdaUpdateWrapper<MedicationDispense>()
.set(MedicationDispense::getStatusEnum, DispenseStatus.PREPARATION.getValue()) .set(MedicationDispense::getStatusEnum,
DispenseStatus.PREPARATION.getValue())
.set(MedicationDispense::getStatusChangedTime, DateUtils.getNowDate()) .set(MedicationDispense::getStatusChangedTime, DateUtils.getNowDate())
.in(MedicationDispense::getMedReqId, medicationRequestIdList)); .in(MedicationDispense::getMedReqId, medicationRequestIdList));
} }
@@ -221,7 +252,8 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
public void updateOnHoldDispenseStatus(List<Long> medReqIdList) { public void updateOnHoldDispenseStatus(List<Long> medReqIdList) {
baseMapper.update(null, baseMapper.update(null,
new LambdaUpdateWrapper<MedicationDispense>() new LambdaUpdateWrapper<MedicationDispense>()
.set(MedicationDispense::getStatusEnum, DispenseStatus.ON_HOLD.getValue()) .set(MedicationDispense::getStatusEnum,
DispenseStatus.ON_HOLD.getValue())
.set(MedicationDispense::getStatusChangedTime, DateUtils.getNowDate()) .set(MedicationDispense::getStatusChangedTime, DateUtils.getNowDate())
.in(MedicationDispense::getMedReqId, medReqIdList)); .in(MedicationDispense::getMedReqId, medReqIdList));
} }
@@ -235,9 +267,12 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
@Override @Override
public boolean verifyAbleEdit(Long medicationDefId) { public boolean verifyAbleEdit(Long medicationDefId) {
return baseMapper.exists( return baseMapper.exists(
new LambdaQueryWrapper<MedicationDispense>().eq(MedicationDispense::getMedicationId, medicationDefId) new LambdaQueryWrapper<MedicationDispense>()
.and(q -> q.eq(MedicationDispense::getStatusEnum, DispenseStatus.COMPLETED.getValue()).or() .eq(MedicationDispense::getMedicationId, medicationDefId)
.eq(MedicationDispense::getStatusEnum, DispenseStatus.REFUNDED.getValue())) .and(q -> q.eq(MedicationDispense::getStatusEnum,
DispenseStatus.COMPLETED.getValue()).or()
.eq(MedicationDispense::getStatusEnum,
DispenseStatus.REFUNDED.getValue()))
.eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode())); .eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode()));
} }
@@ -250,7 +285,8 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
@Override @Override
public List<MedicationDispense> selectByRequestIdList(List<Long> requestIdList) { public List<MedicationDispense> selectByRequestIdList(List<Long> requestIdList) {
return baseMapper return baseMapper
.selectList(new LambdaQueryWrapper<MedicationDispense>().in(MedicationDispense::getMedReqId, requestIdList) .selectList(new LambdaQueryWrapper<MedicationDispense>()
.in(MedicationDispense::getMedReqId, requestIdList)
.eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode())); .eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode()));
} }
@@ -263,9 +299,11 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
public void updateDispenseStatusSummarized(List<Long> medDispenseId, String busNo) { public void updateDispenseStatusSummarized(List<Long> medDispenseId, String busNo) {
baseMapper.update(null, baseMapper.update(null,
new LambdaUpdateWrapper<MedicationDispense>() new LambdaUpdateWrapper<MedicationDispense>()
.set(MedicationDispense::getStatusEnum, DispenseStatus.SUMMARIZED.getValue()) .set(MedicationDispense::getStatusEnum,
DispenseStatus.SUMMARIZED.getValue())
.set(MedicationDispense::getStatusChangedTime, DateUtils.getNowDate()) .set(MedicationDispense::getStatusChangedTime, DateUtils.getNowDate())
.set(MedicationDispense::getSummaryNo, busNo).in(MedicationDispense::getId, medDispenseId) .set(MedicationDispense::getSummaryNo, busNo)
.in(MedicationDispense::getId, medDispenseId)
.eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode())); .eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode()));
} }
@@ -278,7 +316,8 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
@Override @Override
public List<MedicationDispense> getMedDispenseByProcedureId(List<Long> procedureIdList) { public List<MedicationDispense> getMedDispenseByProcedureId(List<Long> procedureIdList) {
return baseMapper.selectList( return baseMapper.selectList(
new LambdaQueryWrapper<MedicationDispense>().in(MedicationDispense::getProcedureId, procedureIdList) new LambdaQueryWrapper<MedicationDispense>()
.in(MedicationDispense::getProcedureId, procedureIdList)
.eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode())); .eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode()));
} }
@@ -292,8 +331,10 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
public boolean cancelMedicationSummary(List<String> summaryNoList) { public boolean cancelMedicationSummary(List<String> summaryNoList) {
int result = baseMapper.update(null, int result = baseMapper.update(null,
new LambdaUpdateWrapper<MedicationDispense>() new LambdaUpdateWrapper<MedicationDispense>()
.set(MedicationDispense::getStatusEnum, DispenseStatus.PREPARATION.getValue()) .set(MedicationDispense::getStatusEnum,
.set(MedicationDispense::getSummaryNo, null).in(MedicationDispense::getSummaryNo, summaryNoList) DispenseStatus.PREPARATION.getValue())
.set(MedicationDispense::getSummaryNo, null)
.in(MedicationDispense::getSummaryNo, summaryNoList)
.eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode())); .eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode()));
return result > 0; return result > 0;
} }
@@ -307,7 +348,8 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
@Override @Override
public void updateDispenseStatus(List<Long> dispenseIdList, Integer dispenseStatus) { public void updateDispenseStatus(List<Long> dispenseIdList, Integer dispenseStatus) {
baseMapper.update(null, baseMapper.update(null,
new LambdaUpdateWrapper<MedicationDispense>().set(MedicationDispense::getStatusEnum, dispenseStatus) new LambdaUpdateWrapper<MedicationDispense>()
.set(MedicationDispense::getStatusEnum, dispenseStatus)
.set(MedicationDispense::getStatusChangedTime, DateUtils.getNowDate()) .set(MedicationDispense::getStatusChangedTime, DateUtils.getNowDate())
.in(MedicationDispense::getId, dispenseIdList) .in(MedicationDispense::getId, dispenseIdList)
.eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode())); .eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode()));
@@ -322,8 +364,10 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
@Override @Override
public List<MedicationDispense> getMedDispenseBySummaryNo(List<String> summaryNoList) { public List<MedicationDispense> getMedDispenseBySummaryNo(List<String> summaryNoList) {
return baseMapper return baseMapper
.selectList(new LambdaQueryWrapper<MedicationDispense>().in(MedicationDispense::getSummaryNo, summaryNoList) .selectList(new LambdaQueryWrapper<MedicationDispense>()
.in(MedicationDispense::getSummaryNo, summaryNoList)
.eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode()) .eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode())
.eq(MedicationDispense::getStatusEnum, DispenseStatus.SUMMARIZED.getValue())); .eq(MedicationDispense::getStatusEnum,
DispenseStatus.SUMMARIZED.getValue()));
} }
} }

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

@@ -77,6 +77,9 @@ public class DeviceDispenseServiceImpl extends ServiceImpl<DeviceDispenseMapper,
deviceDispense.setDispenseQuantity(BigDecimal.ZERO); deviceDispense.setDispenseQuantity(BigDecimal.ZERO);
// 发药频次 // 发药频次
deviceDispense.setDispenseFrequencyCode(deviceRequest.getRateCode()); deviceDispense.setDispenseFrequencyCode(deviceRequest.getRateCode());
// 设置租户id
LoginUser loginUser = getLoginUser();
deviceDispense.setTenantId(loginUser.getTenantId());
// 获取当前时间 // 获取当前时间
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
@@ -150,6 +153,9 @@ public class DeviceDispenseServiceImpl extends ServiceImpl<DeviceDispenseMapper,
deviceDispense.setDispenseQuantity(BigDecimal.ZERO); deviceDispense.setDispenseQuantity(BigDecimal.ZERO);
// 发药频次 // 发药频次
deviceDispense.setDispenseFrequencyCode(deviceRequest.getRateCode()); deviceDispense.setDispenseFrequencyCode(deviceRequest.getRateCode());
// 设置租户id
LoginUser loginUser = getLoginUser();
deviceDispense.setTenantId(loginUser.getTenantId());
// 获取当前时间 // 获取当前时间
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
@@ -230,6 +236,9 @@ public class DeviceDispenseServiceImpl extends ServiceImpl<DeviceDispenseMapper,
deviceDispense.setDispenseTime(now); deviceDispense.setDispenseTime(now);
// id // id
deviceDispense.setId(null); deviceDispense.setId(null);
// 设置租户id
LoginUser currentLoginUser = getLoginUser();
deviceDispense.setTenantId(currentLoginUser.getTenantId());
// 新增器材发放 // 新增器材发放
baseMapper.insert(deviceDispense); baseMapper.insert(deviceDispense);
@@ -397,6 +406,8 @@ public class DeviceDispenseServiceImpl extends ServiceImpl<DeviceDispenseMapper,
// todo 存疑,是否用请求人作为发药人 // todo 存疑,是否用请求人作为发药人
LoginUser loginUser = getLoginUser(); LoginUser loginUser = getLoginUser();
deviceDispense.setPerformerId(loginUser.getPractitionerId()); deviceDispense.setPerformerId(loginUser.getPractitionerId());
// 设置租户id
deviceDispense.setTenantId(loginUser.getTenantId());
// 发放器材房 // 发放器材房
deviceDispense.setLocationId(locationId); deviceDispense.setLocationId(locationId);
// 支持用药信息 // 支持用药信息

51
openhis-ui-vue3/src/views/clinicmanagement/bargain/component/adviceBaseList.vue
View File

@@ -99,48 +99,17 @@ watch(
// 移除组件初始化时的 getList() 调用，避免在没有 adviceType 时查询所有类型的数据 // 移除组件初始化时的 getList() 调用，避免在没有 adviceType 时查询所有类型的数据
// getList(); // getList();
function getList() { async function getList() {
// 验证是否已选择患者 loading.value = true;
if (!props.patientInfo || Object.keys(props.patientInfo).length === 0) { try {
console.log('[adviceBaseList] getList() 跳过：未选择患者'); // 统一调用 getAdviceBaseInfo，因为后端在这个接口里实现了库存和价格查询
return; // 不执行API调用 const res = await getAdviceBaseInfo(props.adviceQueryParams);
adviceBaseList.value = res.data?.records || [];
} catch (error) {
console.error('获取医嘱列表失败:', error);
} finally {
loading.value = false;
} }
// 只有在弹窗打开时才执行查询
if (!props.popoverVisible) {
console.log('[adviceBaseList] getList() 跳过：弹窗未打开');
return;
}
// 必须有 adviceType 才查询，避免查询所有类型的数据
if (!queryParams.value.adviceType) {
console.log('[adviceBaseList] getList() 跳过：adviceType 未设置，当前值:', queryParams.value.adviceType);
return;
}
queryParams.value.organizationId = props.patientInfo.orgId;
console.log('[adviceBaseList] getList() 请求参数:', JSON.stringify(queryParams.value));
getAdviceBaseInfo(queryParams.value).then((res) => {
console.log('[adviceBaseList] getList() 响应数据:', {
total: res.data?.total,
recordsCount: res.data?.records?.length || 0,
firstRecord: res.data?.records?.[0]?.adviceName || '无数据',
adviceType: queryParams.value.adviceType
});
adviceBaseList.value = res.data.records || [];
total.value = res.data.total || 0;
nextTick(() => {
currentIndex.value = 0;
if (adviceBaseList.value.length > 0) {
adviceBaseRef.value?.setCurrentRow(adviceBaseList.value[0]);
}
});
}).catch((err) => {
console.error('[adviceBaseList] getList() 请求失败:', err);
adviceBaseList.value = [];
total.value = 0;
});
} }
// 处理键盘事件 // 处理键盘事件

846
openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
View File

File diff suppressed because it is too large Load Diff