bug249:手术管理-》门诊手术安排:【新增手术安排】-》【查找】在门诊医生站已【删除】作废的手术申请单在查询界面还能查询出来.
bug426:门诊医生站-检查开立:已选择列表应支持树形展开,显示套餐明细(项目/数量/单价
This commit is contained in:
@@ -106,6 +106,7 @@ public class CheckMethodAppServiceImpl implements ICheckMethodAppService {
|
||||
if (ObjectUtil.isNotEmpty(m.getPackageName())) {
|
||||
CheckPackage pkg = packageMap.get(m.getPackageName());
|
||||
if (pkg != null) {
|
||||
dto.setPackageId(pkg.getId());
|
||||
dto.setPackagePrice(pkg.getPackagePrice());
|
||||
dto.setServiceFee(pkg.getServiceFee());
|
||||
}
|
||||
|
||||
@@ -220,6 +220,36 @@ public class CheckTypeController extends BaseController {
|
||||
return AjaxResult.success(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询检查套餐明细,用于医生站已选择套餐展开显示
|
||||
*/
|
||||
@GetMapping({ "/package/{packageId}/details", "/check-package/{packageId}/details" })
|
||||
public AjaxResult getPackageDetails(@PathVariable Long packageId) {
|
||||
List<CheckPackageDetail> details = checkPackageDetailService.list(
|
||||
new LambdaQueryWrapper<CheckPackageDetail>()
|
||||
.eq(CheckPackageDetail::getPackageId, packageId)
|
||||
.orderByAsc(CheckPackageDetail::getOrderNum)
|
||||
.orderByAsc(CheckPackageDetail::getId));
|
||||
|
||||
List<Map<String, Object>> result = details.stream().map(d -> {
|
||||
Map<String, Object> item = new LinkedHashMap<>();
|
||||
item.put("id", d.getId());
|
||||
item.put("packageId", d.getPackageId());
|
||||
item.put("itemCode", d.getItemCode());
|
||||
item.put("itemName", d.getItemName());
|
||||
item.put("name", d.getItemName());
|
||||
item.put("quantity", d.getQuantity());
|
||||
item.put("unit", d.getUnit());
|
||||
item.put("unitPrice", d.getUnitPrice());
|
||||
item.put("price", d.getUnitPrice());
|
||||
item.put("amount", d.getAmount());
|
||||
item.put("orderNum", d.getOrderNum());
|
||||
return item;
|
||||
}).collect(Collectors.toList());
|
||||
|
||||
return AjaxResult.success(result);
|
||||
}
|
||||
|
||||
/** 套餐级别文字映射 */
|
||||
private String parseLevelText(String level) {
|
||||
if ("1".equals(level))
|
||||
|
||||
@@ -31,6 +31,9 @@ public class CheckMethodDto {
|
||||
/* 套餐名称 */
|
||||
private String packageName;
|
||||
|
||||
/* 套餐ID */
|
||||
private Long packageId;
|
||||
|
||||
/* 套餐价格 - Bug #384修复:通过packageName匹配CheckPackage获取 */
|
||||
private BigDecimal packagePrice;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user