From c8e56594e03e0e7d0bf9c34e3375d95b34cf9c54 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Fri, 27 Nov 2020 18:09:07 +0800
Subject: [PATCH] 配合新的套餐功能，修正套餐的扣款顺序（修复）
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java
index 0a853f6..3a39e96 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java
@@ -72,6 +72,15 @@
}
/**
+ * 查看报告
+ */
+ @Override
+ public ResultBody getPdfPathForOperation(String diagnosticId, Integer reportType, Long hospitalId, Long departId) {
+ ResultBody pdfPathForOperation = diagnosticService.getPdfPathForOperation(diagnosticId, reportType, hospitalId, departId);
+ return pdfPathForOperation;
+ }
+
+ /**
* 列表
*
* @param params
@@ -80,9 +89,21 @@
@Override
public PageResult<ProductOrderJoinDetail> findAllList(Map<String, Object> params, SysUser sysUser) {
Page<ProductOrderJoinDetail> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
- Map<String, Object> roleOrgMap = roleOrganizationService.getRoleOrgMap(sysUser.getRoles());
- params.putAll(roleOrgMap);
+// Map<String, Object> roleOrgMap = roleOrganizationService.getRoleOrgMap(sysUser);
+// params.putAll(roleOrgMap);
List<ProductOrderJoinDetail> list = baseMapper.findAllList(page, params);
+ for (ProductOrderJoinDetail productOrderJoinDetail : list) {
+ Date proBegintime = productOrderJoinDetail.getProBegintime();
+ Date proEndtime = productOrderJoinDetail.getProEndtime();
+ Date nowDate = new Date();
+ if(nowDate.getTime()<proBegintime.getTime()){
+ productOrderJoinDetail.setUseType("未使用");
+ }else if (proBegintime.getTime()<=nowDate.getTime()&&nowDate.getTime()<proEndtime.getTime()){
+ productOrderJoinDetail.setUseType("使用中");
+ }else if(nowDate.getTime()>=proEndtime.getTime()){
+ productOrderJoinDetail.setUseType("已结束");
+ }
+ }
return PageResult.<ProductOrderJoinDetail>builder().data(list).code(0).count(page.getTotal()).build();
}
--
Gitblit v1.8.0