From f789b998cceaf5d60be5bdaf75d9fb37b1f087a6 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Sat, 15 Aug 2020 09:09:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 28 +++++++------
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html | 23 ++++++-----
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html | 4 +-
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html | 4 +-
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctorTemplete.html | 18 ++++----
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java | 4 +-
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html | 18 ++++----
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/verifyRecharge.html | 20 +++++-----
8 files changed, 61 insertions(+), 58 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
index 4dbfd44..8a596ea 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
@@ -118,10 +118,10 @@
//查询user表
SysDoctor sysDoctor = baseMapper.selectById(id);
if (sysDoctor != null && sysDoctor.getUserId() != null) {
- boolean b = iSysUserService.delUser(sysDoctor.getUserId());
+ boolean b = iSysUserService.deleteNoContact(sysDoctor.getUserId());
}
sysDoctor.setIsDel(true);
- int i = baseMapper.deleteById(id);
+ int i = baseMapper.updateById(sysDoctor);
return true;
}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
index 3143265..d78ce5d 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
@@ -112,22 +112,25 @@
/**
* 获取登录用户的一系列信息 hrj 06-04修改
*
- * @param sysUserNew
+ * @param sysUser
* @return
*/
@Override
- public LoginAppUser getLoginAppUser(SysUser sysUserNew) {
+ public LoginAppUser getLoginAppUser(SysUser sysUser) {
LoginAppUser loginAppUser = new LoginAppUser();
- SysUser sysUser = this.baseMapper.selectById(sysUserNew);
+ SysUser sysUserNew = this.baseMapper.selectById(sysUser);
if (sysUser != null) {
+ //返回的数据为什么要把密码也返回？清空!!
+ loginAppUser.setPassword("");
+ loginAppUser.setNewPassword("");
+ loginAppUser.setOldPassword("");
+
BeanUtils.copyProperties(sysUser, loginAppUser);
//获取用户所属组织机构列表
- loginAppUser.setDefaultAuth(sysUser.getDefaultAuth());
+ loginAppUser.setDefaultAuth(sysUserNew.getDefaultAuth());
List<SysOrganization> sysOrganizations = organizationService.findListByUserId(sysUser.getId());
//设置组织机构集合
- if (sysOrganizations != null) {
- loginAppUser.setOrganizations(sysOrganizations);
- }
+ loginAppUser.setOrganizations(sysOrganizations);
List<SysRole> sysRoles = roleUserService.findRolesByUserId(sysUser.getId());
// 设置角色
loginAppUser.setRoles(sysRoles);
@@ -142,17 +145,16 @@
loginAppUser.setPermissions(permissions);
}
}
+ //是否医院管理员
+ com.kidgrow.usercenter.model.SysDoctor sysDoctor = findDoctorByUserId(sysUser.getId());
+ if (sysDoctor.getIsAdminUser() != null) {
+ loginAppUser.setHAdminUser(sysDoctor.getIsAdminUser());
+ }
//医院信息 只有H端要返回的信息
if (sysUser.getTenantId().toLowerCase().equals(CommonConstant.H_TENANT.toLowerCase())) {
DoctorUserAll doctorUserAllVo = baseMapper.findDoctorUserAllData(sysUser.getId());
loginAppUser.setDoctorUserAllVO(doctorUserAllVo);
- //是否医院管理员
- loginAppUser.setHAdminUser(doctorUserAllVo.getIsAdminUser());
}
- //返回的数据为什么要把密码也返回？清空!!
- loginAppUser.setPassword("");
- loginAppUser.setNewPassword("");
- loginAppUser.setOldPassword("");
}
return loginAppUser;
}
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html
index 9364a57..f7b5520 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html
@@ -64,7 +64,7 @@
headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
page: true,
cols: [[
- { field: 'hospitalName', width: 300, title: '医院名称' },
+ { field: 'hospitalName', width: 263, title: '医院名称' },
{ field: 'departmentName', width: 100, title: '科室名称' },
{ field: 'contractNo', width: 150, title: '合同编号' },
{ field: 'contractTitle', width: 260, title: '合同名' },
@@ -83,7 +83,7 @@
{ field: 'createTime', width: 160, title: '创建时间' , templet: function (d) {
return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
}},
- { align: 'center', width: 150, toolbar: '#contract-table-bar', title: '操作' }
+ { align: 'center', width: 200, toolbar: '#contract-table-bar', title: '操作' }
]],
done:function(res){
permissionsInput(res,config);
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
index 2095325..b243578 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
@@ -85,7 +85,7 @@
<div class="layui-form-item">
<label class="layui-form-label">需求标签</label>
<div class="layui-input-block">
- <input name="needTags" placeholder="请输入回调地址" type="text" class="layui-input" maxlength="20"/>
+ <textarea name="needTags" placeholder="请输入回调地址" class="layui-input" style="height:200px;overflow:auto" maxlength="20"> </textarea>
</div>
</div>
<div class="layui-form-item model-form-footer">
@@ -142,14 +142,14 @@
page: true,
cols: [[
{ type: 'numbers' },
- { field: 'doctorName', width: 100, title: '医生姓名' },
- { field: 'doctorTel', width: 150, title: '联系电话' },
- { field: 'hospitalName', width: 300, title: '所在医院' },
- { field: 'needBegintime', width: 240, title: '时间段', templet: "<div>{{layui.util.toDateString(d.needBegintime, 'yyyy-MM-dd')}}至{{layui.util.toDateString(d.needEndtime, 'yyyy-MM-dd')}}</div>" },
- { field: 'needType', width: 100, title: '数据类型', templet: function (d) { if (d.needType == 1) { return '筛查' } else { return '就诊' } } },// 0就诊数据 1筛查
- { field: 'needTags', width: 100, align: 'center', toolbar: '#app-table-bar', title: '需求标签' },
- { field: 'enabled', width: 200, toolbar: '#app-table-bar1', title: '处理状态', },
- { field: 'downTime', width: 250, title: '下载时间', templet: "<div>{{layui.util.toDateString(d.downTime, 'yyyy-MM-dd HH:mm')}}</div>" }
+ { field: 'doctorName',align:'center', width: 100, title: '医生姓名' },
+ { field: 'doctorTel',align:'center', width: 150, title: '联系电话' },
+ { field: 'hospitalName',align:'center', width: 300, title: '所在医院' },
+ { field: 'needBegintime',align:'center', width: 240, title: '时间段', templet: "<div>{{layui.util.toDateString(d.needBegintime, 'yyyy-MM-dd')}} 至 {{layui.util.toDateString(d.needEndtime, 'yyyy-MM-dd')}}</div>" },
+ { field: 'needType',align:'center', width: 100, title: '数据类型', templet: function (d) { if (d.needType == 1) { return '筛查' } else { return '就诊' } } },// 0就诊数据 1筛查
+ { field: 'needTags',align:'center', width: 100, align: 'center', toolbar: '#app-table-bar', title: '需求标签' },
+ { field: 'enabled',align:'center', width: 200, toolbar: '#app-table-bar1', title: '处理状态', },
+ { field: 'downTime',align:'center', width: 250, title: '下载时间', templet: "<div>{{layui.util.toDateString(d.downTime, 'yyyy-MM-dd HH:mm')}}</div>" }
]],done:function(res){
permissionsInput(res,config);
}
@@ -298,11 +298,11 @@
$('#app-form').attr('method', 'POST');
if (data) {
if (data.needBegintime) {
- var needBegintime = layui.util.toDateString(data.needBegintime, 'yyyy年MM月dd日 HH:mm:ss');
+ var needBegintime = layui.util.toDateString(data.needBegintime, 'yyyy年MM月dd日');
data.needBegintime = needBegintime
}
if (data.needEndtime) {
- var needEndtime = layui.util.toDateString(data.needEndtime, 'yyyy年MM月dd日 HH:mm:ss');
+ var needEndtime = layui.util.toDateString(data.needEndtime, 'yyyy年MM月dd日');
data.needEndtime = needEndtime
}
$("input[name='clientId']").attr('disabled', true);
@@ -310,6 +310,7 @@
$("input[name='webServerRedirectUri']").attr('disabled', true);
$("input[name='webServerRedirectUri']").attr('class', "layui-input layui-disabled");
form.val('app-form', data);
+ $('#app-form').find('input,textarea').prop('readonly', true);
$('#app-form').attr('method', 'POST');
}
}
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html
index 08830dd..1aa6019 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html
@@ -14,8 +14,8 @@
<input id="doctorName" class="layui-input search-input" type="text" placeholder="按医生名" /> 
<select id="doctorState" lay-filter="role_clients">
<option value="">-医院状态-</option>
- <option value="true">正常</option>
- <option value="false">试用</option>
+ <option value="1">正常</option>
+ <option value="0">试用</option>
</select> 
<input name="hospitalName" id="hospitalName-seach" placeholder="按医院名称" type="text"
class="layui-input search-input" maxlength="50" autocomplete="off" /> 
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctorTemplete.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctorTemplete.html
index 10d0e88..7922a67 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctorTemplete.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctorTemplete.html
@@ -68,8 +68,8 @@
<div class="layui-input-block">
<select id="publicType-add" name="publicType" placeholder="开放类型" lay-verify="required" required>
<option value="">-请选择-</option>
- <option value="1">公开</option>
- <option value="0">私有</option>
+ <option value="0">公开</option>
+ <option value="1">私有</option>
</select>
</div>
</div>
@@ -115,14 +115,14 @@
page: true,
cols: [[
{ type: 'numbers' },
- { field: 'templeteTitle', width: 180, sort: true, title: '标题' },
+ { field: 'templeteTitle',align:'center', width: 180, sort: true, title: '标题' },
{
- field: 'publicType', width: 200, sort: true, title: '开放类型', templet: function (d) {
+ field: 'publicType',align:'center', width: 200, sort: true, title: '开放类型', templet: function (d) {
return d.publicType ==true ? "私有" : "公开"
}
},
{
- field: 'templeteType', width: 180, sort: true, title: '话术类型', templet: function (d) {
+ field: 'templeteType',align:'center', width: 180, sort: true, title: '话术类型', templet: function (d) {
if (d.templeteType == 0) {
return "结论";
} else if (d.templeteType == 1) {
@@ -132,10 +132,10 @@
}
}
},
- { field: 'createUserName', width: 300, sort: true, title: '创建者' },
- { field: 'createTime', width: 250, sort: true, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy/MM/dd HH:mm')}}</div>" },
- { field: 'enabled', width: 100, sort: true, templet: '#doctor-templete-tpl-state', title: '状态' },
- { field: 'recordTitle', width: 300, toolbar: '#doctor-templete-table-bar', sort: true, title: '操作' },
+ { field: 'createUserName',align:'center', width: 300, sort: true, title: '创建者' },
+ { field: 'createTime',align:'center', width: 250, sort: true, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy/MM/dd HH:mm')}}</div>" },
+ { field: 'enabled',align:'center', width: 100, sort: true, templet: '#doctor-templete-tpl-state', title: '状态' },
+ { field: 'recordTitle',align:'center', width: 150, toolbar: '#doctor-templete-table-bar', sort: true, title: '操作' },
]],
done:function(res){
permissionsInput(res,config);
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html
index ab5536d..78ddbea 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html
@@ -45,9 +45,9 @@
headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
page: true,
cols: [[
- { field: 'proName', width: 300, title: '产品名称' },
+ { field: 'proName', width: '20%', title: '产品名称' },
{
- field: 'proType', align: 'center', width: 100, templet: function (d) {
+ field: 'proType', align: 'center', width: '10%', templet: function (d) {
if (d.proType === 0)
return "试用"
else
@@ -55,7 +55,7 @@
}, title: '类型'
},
{
- field: 'proTime', width: 150, title: '有效时长', templet: function (d) {
+ field: 'proTime', width: '10%', title: '有效时长', templet: function (d) {
switch (d.proTimeUnit) {
case 0:
return d.proTime + "天";
@@ -69,16 +69,16 @@
}
}
},
- { field: 'proPrice', width: 100, title: '价格' },
- { field: 'recordCount', width: 180, title: '报告数' },
- { field: 'ailightCount', width: 180, title: '读片量' },
- { field: 'enabled', width: 150, templet: '#product-tpl-state', sort: true, title: '状态' },
+ { field: 'proPrice', width: '10%', title: '价格' },
+ { field: 'recordCount', width: '10%', title: '报告数' },
+ { field: 'ailightCount', width: '10%', title: '读片量' },
+ { field: 'enabled', width: '10%', templet: '#product-tpl-state', sort: true, title: '状态' },
{
- field: 'createTime', width: 200, sort: true, title: '创建时间', templet: function (d) {
+ field: 'createTime', width: '10%', sort: true, title: '创建时间', templet: function (d) {
return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
}
},
- { align: 'center', width: 100, toolbar: '#product-table-bar', title: '操作' }
+ { align: 'center', width: '10%', toolbar: '#product-table-bar', title: '操作' }
]],
done: function (res) {
permissionsInput(res,config);
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/verifyRecharge.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/verifyRecharge.html
index 6c92aa7..5d8d669 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/verifyRecharge.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/verifyRecharge.html
@@ -39,13 +39,13 @@
headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
page: true,
cols: [[
- { field: 'hospitalName', width: 300, title: '医院名称' },
- { field: 'departmentName', width: 100, title: '科室名称' },
- { field: 'proName', width: 250, title: '产品名称' },
- { field: 'ailightCount', width: 150, title: '读片量' },
- { field: 'recordCount', width: 100, title: '报告量' },
+ { field: 'hospitalName',align:'center', width: 300, title: '医院名称' },
+ { field: 'departmentName', align:'center',width: 100, title: '科室名称' },
+ { field: 'proName',align:'center', width: 250, title: '产品名称' },
+ { field: 'ailightCount', align:'center',width: 150, title: '读片量' },
+ { field: 'recordCount',align:'center', width: 100, title: '报告量' },
{
- field: 'isShare', width: 100, title: '是否共享', templet: function (d) {
+ field: 'isShare',align:'center', width: 100, title: '是否共享', templet: function (d) {
if (d.isShare)
return '共享'
else
@@ -53,21 +53,21 @@
}
},
{
- field: 'proBegintime', width: 120, title: '开始时间', templet: function (d) {
+ field: 'proBegintime',align:'center', width: 120, title: '开始时间', templet: function (d) {
return new Date(d.proBegintime).dateFormat("yyyy/MM/dd");
}
},
{
- field: 'proEndtime', width: 120, title: '结束时间', templet: function (d) {
+ field: 'proEndtime',align:'center', width: 120, title: '结束时间', templet: function (d) {
return new Date(d.proEndtime).dateFormat("yyyy/MM/dd");
}
},
{
- field: 'createTime', width: 160, sort: true, title: '创建时间', templet: function (d) {
+ field: 'createTime',align:'center', width: 160, sort: true, title: '创建时间', templet: function (d) {
return new Date(d.createTime).dateFormat("yyyy/MM/dd hh:mm");
}
},
- { field: 'enabled', width: 100, templet: '#product-tpl-state', sort: true, title: '审核' }
+ { field: 'enabled',align:'center', width: 100, templet: '#product-tpl-state', sort: true, title: '审核' }
]],
done:function(res){
permissionsInput(res,config);
--
Gitblit v1.8.0