From e7c3314727fc06444689c0e6ecab5fea337afeb0 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 26 Feb 2021 15:24:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html
index c5f67cb..e8dd898 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html
@@ -106,7 +106,7 @@
},
{
field: 'hospitalLink',
- width: "6%",
+ width: "7%",
title: '联系人'
},
{
@@ -115,11 +115,21 @@
title: '联系方式'
},
{
+ field: 'departmentLink',
+ width: "6%",
+ title: '科室联系人'
+ },
+ {
+ field: 'departmentTel',
+ width: "8%",
+ title: '科室联系方式'
+ },
+ {
field: 'orderType', width: 80, title: '状态', templet: function (d) {
if(d.orderType==null){
return "";
}
- return d.orderType ? "试用" : "正式"
+ return d.orderType ? "正式" : "试用"
}
},
{
@@ -340,7 +350,8 @@
method: 'GET',
where: {
'hospitalId': data.hospitalId,
- 'departmentId': data.departmentId
+ 'departmentId': data.departmentId,
+ 'enabled': true
},
headers: {
'Authorization': 'Bearer ' + config.getToken().access_token
@@ -360,6 +371,14 @@
title: '读片量(剩余)'
},
{
+ field: 'ailightCount',
+ width: 150,
+ title: '读片使用量',
+ templet: function (d) {
+ return d.orderAilightCount-d.ailightCount;
+ }
+ },
+ {
field: 'recordCount',
width: 150,
title: '报告量(剩余)'
--
Gitblit v1.8.0