修复门诊收费报表报错,修复采购入库历史遗留数据问题

This commit is contained in:
2025-11-04 13:10:47 +08:00
parent a57a326b83
commit 3211553d0d
4 changed files with 31 additions and 36 deletions

View File

@@ -37,6 +37,10 @@ public final class AgeCalculatorUtil {
* 当前年龄取得(床位列表表示年龄用)
*/
public static String getAge(Date date) {
// 添加空值检查
if (date == null) {
return "";
}
// 将 Date 转换为 LocalDateTime
LocalDateTime dateTime = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
LocalDateTime now = LocalDateTime.now();

View File

@@ -91,7 +91,7 @@ public class CommonAppController {
/**
* 病区列表
*
* @return 病区列表
* @return 病区列表
*/
@GetMapping(value = "/ward-list")
public R<?> getWardList(@RequestParam(value = "orgId", required = false) Long orgId) {

View File

@@ -233,7 +233,7 @@ public class PurchaseInventoryAppServiceImpl implements IPurchaseInventoryAppSer
// 申请时间
.setApplyTime(DateUtils.getNowDate());
supplyRequestList.add(supplyRequest);
}
// 保存
@@ -245,7 +245,7 @@ public class PurchaseInventoryAppServiceImpl implements IPurchaseInventoryAppSer
List<Long> requestIdList = supplyRequestIdList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
for (Long list : requestIdList) {
idList.add(list.toString());
}
}
// 返回请求id
return R.ok(idList, null);