From a8bf44754f50d0b0a65f0f2d4beefc131261e35d Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Wed, 24 Jun 2020 16:53:47 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
index 4929194..7a2efd8 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
@@ -13,6 +13,7 @@
import com.kidgrow.oprationcenter.vo.DiagnosisRecord;
import com.kidgrow.oprationcenter.vo.GroupProductDetail;
import com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail;
+import com.kidgrow.oprationcenter.vo.UserProductDetail;
import com.kidgrow.usercenter.feign.SysDoctorService;
import com.kidgrow.usercenter.feign.SysHospitalService;
import com.kidgrow.usercenter.model.SysHospital;
@@ -25,6 +26,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -56,6 +58,15 @@
List<ProductOrderDetail> list = baseMapper.findList(page, params);
return PageResult.<ProductOrderDetail>builder().data(list).code(0).count(page.getTotal()).build();
}
+ /**
+ * 获取已购买产品列表
+ * @param params
+ * @return
+ */
+ @Override
+ public List<ProductOrderJoinDetail> findAllList(Map<String, Object> params){
+ return baseMapper.findAllList(params);
+ }
/**
* 获取诊断列表
@@ -65,19 +76,6 @@
@Override
public PageResult<DiagnosisRecord> findAllDataList(Map<String, Object> params){
return diagnosticService.getDiagnosticItemList(params).getData();
- }
- /**
- * 列表
- * @param params
- * @return
- */
- @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);
- List<ProductOrderJoinDetail> list = baseMapper.findAllList(page,params);
- return PageResult.<ProductOrderJoinDetail>builder().data(list).code(0).count(page.getTotal()).build();
}
/**
@@ -156,6 +154,9 @@
int surplus = surplusDay.intValue();
mapVo.put("surplus",surplus);
mapVo.put("logo",logo);
+ //获取 售后服务工程师********不能从sysOrganization获取，从department获取
+ /* mapVo.put("saleUserName",sysOrganization.getSaleUserName());
+ mapVo.put("saleUserTel",sysOrganization.getSaleUserTel());*/
return ResultBody.ok().data(mapVo);
}else {
return ResultBody.failed("该用户套餐已经失效");
@@ -164,4 +165,27 @@
return ResultBody.failed("该用户的组织已经失效");
}
}
+ /**
+ *获取医院的套餐数据
+ * @param hospitalId
+ * @param departmentId
+ * @return
+ */
+ @Override
+ public UserProductDetail getUserProductDetail(Long hospitalId, Long departmentId)
+ {
+ //查询当前医院正在使用的套餐
+ Map<String, Object> selectMap = new HashMap<>();
+ selectMap.put("hospitalId", hospitalId);
+ List<ProductOrderJoinDetail> productOrderDetailList = this.findAllList(selectMap);
+ if (productOrderDetailList.size() > 0) {
+ UserProductDetail userProductDetail=new UserProductDetail();
+ //包含共享的数据
+ userProductDetail.setProductOrderJoinDetailListShare(productOrderDetailList.stream().filter(f -> f.getIsShare()).collect(Collectors.toList()));
+ //科室私有的数据
+ userProductDetail.setProductOrderJoinDetailsListDep(productOrderDetailList.stream().filter((f -> departmentId.equals(f.getDepartmentId()) && f.getIsShare() == false)).collect(Collectors.toList()));
+ return userProductDetail;
+ }
+ return null;
+ }
}
--
Gitblit v1.8.0