From 83715ed7019ab37a4611a2e4e506f84aa1f7b1b0 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Tue, 28 Apr 2020 15:43:13 +0800
Subject: [PATCH] 增加feign客户端调用排除 tenant的注解。 修改完善诊断记录查看的细节问题
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html
index 31c7e63..ac98c35 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html
@@ -70,15 +70,17 @@
headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
page: true,
cols: [[
- { field: 'hospitalName', width: 300, title: '医院名称' },
- { field: 'departmentName', width: 100, title: '科室名称' },
+ { field: 'diagnosticHospitalName', width: 300, title: '医院名称' },
+ { field: 'diagnosticDepartName', width: 100, title: '科室名称' },
{ field: 'diagnosticDoctorName', width: 100, title: '医生姓名' },
{ field: 'childName', width: 100, title: '患者姓名' },
{ field: 'childSex', width: 80, title: '性别' },
- { field: 'childBirthday', width: 100, title: '出生日期' },
+ { field: 'childBirthday', width: 120, title: '出生日期',templet:function(d){
+ return new Date(d.createTime).dateFormat("yyyy/MM/dd");
+ }},
{ field: 'childPhone', width: 150, title: '联系电话' },
{
- field: 'isDelete', sort: true, align: 'center', width: 80, templet: function (d) {
+ field: 'isDelete', sort: true, align: 'center', width: 100, templet: function (d) {
if (d.proType === 0)
return "正常"
else
@@ -86,12 +88,16 @@
}, title: '状态'
},
{
- field: 'createTime', width: 160, sort: true, title: '创建时间', templet: function (d) {
+ field: 'createTime', width: 170, sort: true, title: '创建时间', templet: function (d) {
return new Date(d.createTime).dateFormat("yyyy/MM/dd hh:mm:ss");
+ }
+ },{
+ field: 'diagnosticDiagnoseTime', width: 120, sort: true, title: '诊断时间', templet: function (d) {
+ return new Date(d.diagnosticDiagnoseTime).dateFormat("yyyy/MM/dd");
}
},
{
- field: 'updateTime', width: 160, sort: true, title: '修改时间', templet: function (d) {
+ field: 'updateTime', width: 170, sort: true, title: '修改时间', templet: function (d) {
return new Date(d.createTime).dateFormat("yyyy/MM/dd hh:mm:ss");
}
},
--
Gitblit v1.8.0