fix(ui): 修复多个功能模块的验证和数据处理问题
- 在医生工作站退费功能中添加患者选择验证 - 统一药品管理中的仓库类型选择逻辑,移除重复代码 - 修复统计管理页面清空按钮的数据重置问题 - 修正西药管理页面处方打印按钮的功能绑定 - 完善库存报表查询的SQL过滤条件实现 - 更新多个控制器接口参数类型以支持业务流程 - 优化退费列表对话框的数据加载和错误处理
This commit is contained in:
@@ -66,7 +66,10 @@ public class OutpatientRefundController {
|
||||
* @return 患者账单列表
|
||||
*/
|
||||
@GetMapping(value = "/patient-payment")
|
||||
public R<?> getEncounterPatientPayment(@RequestParam Long encounterId) {
|
||||
public R<?> getEncounterPatientPayment(@RequestParam(required = false) Long encounterId) {
|
||||
if (encounterId == null) {
|
||||
return R.fail(null, "请先选择患者后再进行退费操作");
|
||||
}
|
||||
return outpatientRefundAppService.getEncounterPatientPayment(encounterId);
|
||||
}
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@ package com.openhis.web.inventorymanage.controller;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.web.inventorymanage.appservice.ILossReportFormAppService;
|
||||
import com.openhis.web.inventorymanage.dto.BusNoRequest;
|
||||
import com.openhis.web.inventorymanage.dto.LossReportFormDto;
|
||||
import com.openhis.web.inventorymanage.dto.LossReportSearchParam;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -104,23 +105,23 @@ public class LossReportFormController {
|
||||
/**
|
||||
* 提交审批
|
||||
*
|
||||
* @param busNo 单据号
|
||||
* @param request 单据号请求
|
||||
* @return 操作结果
|
||||
*/
|
||||
@PutMapping("/submit-approval")
|
||||
public R<?> submitApproval(@RequestBody String busNo) {
|
||||
return lossReportFormAppService.submitApproval(busNo);
|
||||
public R<?> submitApproval(@RequestBody BusNoRequest request) {
|
||||
return lossReportFormAppService.submitApproval(request.getBusNo());
|
||||
}
|
||||
|
||||
/**
|
||||
* 撤回审批
|
||||
*
|
||||
* @param busNo 单据号
|
||||
* @param request 单据号请求
|
||||
* @return 操作结果
|
||||
*/
|
||||
@PutMapping("/withdraw-approval")
|
||||
public R<?> withdrawApproval(@RequestBody String busNo) {
|
||||
return lossReportFormAppService.withdrawApproval(busNo);
|
||||
public R<?> withdrawApproval(@RequestBody BusNoRequest request) {
|
||||
return lossReportFormAppService.withdrawApproval(request.getBusNo());
|
||||
}
|
||||
|
||||
// /**
|
||||
|
||||
@@ -5,6 +5,7 @@ package com.openhis.web.inventorymanage.controller;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.web.inventorymanage.appservice.IProductStocktakingAppService;
|
||||
import com.openhis.web.inventorymanage.dto.BusNoRequest;
|
||||
import com.openhis.web.inventorymanage.dto.ProductStocktakingDto;
|
||||
import com.openhis.web.inventorymanage.dto.ProductStocktakingSearchParam;
|
||||
import com.openhis.web.inventorymanage.dto.StocktakingBatchSearchParam;
|
||||
@@ -140,23 +141,23 @@ public class ProductStocktakingController {
|
||||
/**
|
||||
* 提交审批
|
||||
*
|
||||
* @param busNo 单据号
|
||||
* @param request 单据号请求
|
||||
* @return 操作结果
|
||||
*/
|
||||
@PutMapping("/submit-approval")
|
||||
public R<?> submitApproval(@RequestBody String busNo) {
|
||||
return productStocktakingAppService.submitApproval(busNo);
|
||||
public R<?> submitApproval(@RequestBody BusNoRequest request) {
|
||||
return productStocktakingAppService.submitApproval(request.getBusNo());
|
||||
}
|
||||
|
||||
/**
|
||||
* 撤回审批
|
||||
*
|
||||
* @param busNo 单据号
|
||||
* @param request 单据号请求
|
||||
* @return 操作结果
|
||||
*/
|
||||
@PutMapping("/withdraw-approval")
|
||||
public R<?> withdrawApproval(@RequestBody String busNo) {
|
||||
return productStocktakingAppService.withdrawApproval(busNo);
|
||||
public R<?> withdrawApproval(@RequestBody BusNoRequest request) {
|
||||
return productStocktakingAppService.withdrawApproval(request.getBusNo());
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -5,6 +5,7 @@ package com.openhis.web.inventorymanage.controller;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.web.inventorymanage.appservice.IProductTransferAppService;
|
||||
import com.openhis.web.inventorymanage.dto.BusNoRequest;
|
||||
import com.openhis.web.inventorymanage.dto.BatchTransferSearchParam;
|
||||
import com.openhis.web.inventorymanage.dto.ProductTransferDto;
|
||||
import com.openhis.web.inventorymanage.dto.SupplySearchParam;
|
||||
@@ -151,23 +152,23 @@ public class ProductTransferController {
|
||||
/**
|
||||
* 提交审批
|
||||
*
|
||||
* @param busNo 单据号
|
||||
* @param request 单据号请求
|
||||
* @return 操作结果
|
||||
*/
|
||||
@PutMapping("/submit-approval")
|
||||
public R<?> submitApproval(@RequestBody String busNo) {
|
||||
return productTransferAppService.submitApproval(busNo);
|
||||
public R<?> submitApproval(@RequestBody BusNoRequest request) {
|
||||
return productTransferAppService.submitApproval(request.getBusNo());
|
||||
}
|
||||
|
||||
/**
|
||||
* 撤回审批
|
||||
*
|
||||
* @param busNo 单据号
|
||||
* @param request 单据号请求
|
||||
* @return 操作结果
|
||||
*/
|
||||
@PutMapping("/withdraw-approval")
|
||||
public R<?> withdrawApproval(@RequestBody String busNo) {
|
||||
return productTransferAppService.withdrawApproval(busNo);
|
||||
public R<?> withdrawApproval(@RequestBody BusNoRequest request) {
|
||||
return productTransferAppService.withdrawApproval(request.getBusNo());
|
||||
}
|
||||
|
||||
// /**
|
||||
|
||||
@@ -5,6 +5,7 @@ package com.openhis.web.inventorymanage.controller;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.web.inventorymanage.appservice.IPurchaseInventoryAppService;
|
||||
import com.openhis.web.inventorymanage.dto.BusNoRequest;
|
||||
import com.openhis.web.inventorymanage.dto.InventorySearchParam;
|
||||
import com.openhis.web.inventorymanage.dto.PurchaseInventoryDto;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -104,23 +105,23 @@ public class PurchaseInventoryController {
|
||||
/**
|
||||
* 提交审批
|
||||
*
|
||||
* @param busNo 单据号
|
||||
* @param request 单据号请求
|
||||
* @return 操作结果
|
||||
*/
|
||||
@PutMapping("/submit-approval")
|
||||
public R<?> submitApproval(@RequestBody String busNo) {
|
||||
return purchaseInventoryAppService.submitApproval(busNo);
|
||||
public R<?> submitApproval(@RequestBody BusNoRequest request) {
|
||||
return purchaseInventoryAppService.submitApproval(request.getBusNo());
|
||||
}
|
||||
|
||||
/**
|
||||
* 撤回审批
|
||||
*
|
||||
* @param busNo 单据号
|
||||
* @param request 单据号请求
|
||||
* @return 操作结果
|
||||
*/
|
||||
@PutMapping("/withdraw-approval")
|
||||
public R<?> withdrawApproval(@RequestBody String busNo) {
|
||||
return purchaseInventoryAppService.withdrawApproval(busNo);
|
||||
public R<?> withdrawApproval(@RequestBody BusNoRequest request) {
|
||||
return purchaseInventoryAppService.withdrawApproval(request.getBusNo());
|
||||
}
|
||||
// /**
|
||||
// * 采购入库单据详情
|
||||
|
||||
@@ -5,6 +5,7 @@ package com.openhis.web.inventorymanage.controller;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.web.inventorymanage.appservice.IPurchaseReturnAppService;
|
||||
import com.openhis.web.inventorymanage.dto.BusNoRequest;
|
||||
import com.openhis.web.inventorymanage.dto.PurchaseReturnDetailDto;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -96,23 +97,23 @@ public class PurchaseReturnController {
|
||||
/**
|
||||
* 提交审批
|
||||
*
|
||||
* @param busNo 单据号
|
||||
* @param request 单据号请求
|
||||
* @return 操作结果
|
||||
*/
|
||||
@PutMapping("/return-submit-approval")
|
||||
public R<?> submitApproval(@RequestBody String busNo) {
|
||||
return purchaseReturnAppService.submitApproval(busNo);
|
||||
public R<?> submitApproval(@RequestBody BusNoRequest request) {
|
||||
return purchaseReturnAppService.submitApproval(request.getBusNo());
|
||||
}
|
||||
|
||||
/**
|
||||
* 撤回审批
|
||||
*
|
||||
* @param busNo 单据号
|
||||
* @param request 单据号请求
|
||||
* @return 操作结果
|
||||
*/
|
||||
@PutMapping("/return-withdraw-approval")
|
||||
public R<?> withdrawApproval(@RequestBody String busNo) {
|
||||
return purchaseReturnAppService.withdrawApproval(busNo);
|
||||
public R<?> withdrawApproval(@RequestBody BusNoRequest request) {
|
||||
return purchaseReturnAppService.withdrawApproval(request.getBusNo());
|
||||
}
|
||||
|
||||
// /**
|
||||
|
||||
@@ -5,6 +5,7 @@ package com.openhis.web.inventorymanage.controller;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.web.inventorymanage.appservice.IRequisitionIssueAppService;
|
||||
import com.openhis.web.inventorymanage.dto.BusNoRequest;
|
||||
import com.openhis.web.inventorymanage.dto.IssueDto;
|
||||
import com.openhis.web.inventorymanage.dto.IssueSearchParam;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -104,23 +105,23 @@ public class RequisitionIssueController {
|
||||
/**
|
||||
* 提交审批
|
||||
*
|
||||
* @param busNo 单据号
|
||||
* @param request 单据号请求
|
||||
* @return 操作结果
|
||||
*/
|
||||
@PutMapping("/submit-approval")
|
||||
public R<?> submitApproval(@RequestBody String busNo) {
|
||||
return requisitionIssueAppService.submitApproval(busNo);
|
||||
public R<?> submitApproval(@RequestBody BusNoRequest request) {
|
||||
return requisitionIssueAppService.submitApproval(request.getBusNo());
|
||||
}
|
||||
|
||||
/**
|
||||
* 撤回审批
|
||||
*
|
||||
* @param busNo 单据号
|
||||
* @param request 单据号请求
|
||||
* @return 操作结果
|
||||
*/
|
||||
@PutMapping("/withdraw-approval")
|
||||
public R<?> withdrawApproval(@RequestBody String busNo) {
|
||||
return requisitionIssueAppService.withdrawApproval(busNo);
|
||||
public R<?> withdrawApproval(@RequestBody BusNoRequest request) {
|
||||
return requisitionIssueAppService.withdrawApproval(request.getBusNo());
|
||||
}
|
||||
|
||||
// /**
|
||||
|
||||
@@ -5,6 +5,7 @@ package com.openhis.web.inventorymanage.controller;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.web.inventorymanage.appservice.IReturnIssueAppService;
|
||||
import com.openhis.web.inventorymanage.dto.BusNoRequest;
|
||||
import com.openhis.web.inventorymanage.dto.IssueDto;
|
||||
import com.openhis.web.inventorymanage.dto.IssueSearchParam;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -104,23 +105,23 @@ public class ReturnIssueController {
|
||||
/**
|
||||
* 提交审批
|
||||
*
|
||||
* @param busNo 单据号
|
||||
* @param request 单据号请求
|
||||
* @return 操作结果
|
||||
*/
|
||||
@PutMapping("/submit-approval")
|
||||
public R<?> submitApproval(@RequestBody String busNo) {
|
||||
return returnIssueAppService.submitApproval(busNo);
|
||||
public R<?> submitApproval(@RequestBody BusNoRequest request) {
|
||||
return returnIssueAppService.submitApproval(request.getBusNo());
|
||||
}
|
||||
|
||||
/**
|
||||
* 撤回审批
|
||||
*
|
||||
* @param busNo 单据号
|
||||
* @param request 单据号请求
|
||||
* @return 操作结果
|
||||
*/
|
||||
@PutMapping("/withdraw-approval")
|
||||
public R<?> withdrawApproval(@RequestBody String busNo) {
|
||||
return returnIssueAppService.withdrawApproval(busNo);
|
||||
public R<?> withdrawApproval(@RequestBody BusNoRequest request) {
|
||||
return returnIssueAppService.withdrawApproval(request.getBusNo());
|
||||
}
|
||||
|
||||
// /**
|
||||
|
||||
Reference in New Issue
Block a user