From 28bd829507326985a9d84a33eada400f65c93c76 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Fri, 27 Nov 2020 18:12:14 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java | 13 +++++++++++--
1 files changed, 11 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 113e57d..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,8 +89,8 @@
@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);
- 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();
--
Gitblit v1.8.0