From e6a149ea753350d3bebbd76ce40315a8b6016b4e Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Thu, 23 Jul 2020 13:04:47 +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-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java | 2
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html | 250 ++++++++++++++++++++---------------
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html | 18 ++
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java | 57 +++++++
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html | 2
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysUserOrg.java | 3
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysRoleOrganizationMapper.xml | 4
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml | 2
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml | 2
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml | 4
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDoctorMapper.xml | 2
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderRecordMapper.xml | 2
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DataNeedServiceImpl.java | 17 ++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml | 2
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java | 8
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysCompanyMapper.xml | 2
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_org_form.html | 1
17 files changed, 253 insertions(+), 125 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DataNeedServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DataNeedServiceImpl.java
index 101b084..2d82958 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DataNeedServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DataNeedServiceImpl.java
@@ -1,6 +1,7 @@
package com.kidgrow.oprationcenter.service.impl;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
@@ -57,7 +58,21 @@
@Override
public List<DataNeedExcel> findListExportByParam(Map<String, Object> params) {
- List<DataNeed> dataNeeds = baseMapper.selectByMap(params);
+ QueryWrapper queryWrapper=new QueryWrapper();
+ String doctor_name = MapUtils.getString(params, "doctor_name");
+ if(doctor_name!=null){
+ queryWrapper.like("doctor_name","%"+doctor_name+"%");
+ }
+ String need_begintime = MapUtils.getString(params, "need_begintime");
+ if(need_begintime!=null){
+ queryWrapper.gt("need_begintime",need_begintime);
+ }
+ String need_endtime = MapUtils.getString(params, "need_endtime");
+ if(need_endtime!=null){
+ queryWrapper.gt("need_endtime",need_endtime);
+ }
+ queryWrapper.eq("is_del",0);
+ List<DataNeed> dataNeeds = baseMapper.selectList(queryWrapper);
List<DataNeedExcel> voList=new ArrayList<>();
dataNeeds.forEach(e ->{
DataNeedExcel vo=new DataNeedExcel();
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
index 27594bd..b22f059 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
@@ -4,7 +4,7 @@
<mapper namespace="com.kidgrow.oprationcenter.mapper.ProductOrderDetailMapper">
<!--定义查询列-->
<sql id="Column_List">
- *
+ DISTINCT *
</sql>
<!--sql查询片段-->
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml
index 35dabc4..27388fb 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml
@@ -4,7 +4,7 @@
<mapper namespace="com.kidgrow.oprationcenter.mapper.ProductOrderMapper">
<!--定义查询列-->
<sql id="Column_List">
- *
+ DISTINCT *
</sql>
<!--sql查询片段-->
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderRecordMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderRecordMapper.xml
index 4664987..8099d25 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderRecordMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderRecordMapper.xml
@@ -4,7 +4,7 @@
<mapper namespace="com.kidgrow.oprationcenter.mapper.ProductOrderRecordMapper">
<!--定义查询列-->
<sql id="Column_List">
- *
+ DISTINCT *
</sql>
<!--sql查询片段-->
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml
index 3aa7b4f..1707b3c 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml
@@ -4,7 +4,7 @@
<mapper namespace="com.kidgrow.oprationcenter.mapper.SysProductMapper">
<!--定义查询列-->
<sql id="Column_List">
- *
+ DISTINCT *
</sql>
<!--定义数据权限的查询-->
<sql id="Role_Organization">
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysCompanyMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysCompanyMapper.xml
index afd038f..c8f04ea 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysCompanyMapper.xml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysCompanyMapper.xml
@@ -4,7 +4,7 @@
<mapper namespace="com.kidgrow.usercenter.mapper.SysCompanyMapper">
<!--定义查询列-->
<sql id="Column_List">
- *
+ DISTINCT *
</sql>
<!--sql查询片段-->
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDoctorMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDoctorMapper.xml
index 26d1d51..de33ab1 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDoctorMapper.xml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDoctorMapper.xml
@@ -4,7 +4,7 @@
<mapper namespace="com.kidgrow.usercenter.mapper.SysDoctorMapper">
<!--定义查询列-->
<sql id="Column_List">
- *
+ DISTINCT *
</sql>
<!--sql查询片段-->
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml
index dcc8a51..93bee13 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml
@@ -163,10 +163,9 @@
<choose>
<when test="inx == 1">
<if test="itemto.flag">
- and 1=1
</if>
<if test="!itemto.flag">
- or (1=1 and HOS.is_del = 0 and HOS.enabled=1)
+ or ( HOS.is_del = 0 and HOS.enabled=1)
</if>
</when>
<when test="inx==2">
@@ -226,6 +225,7 @@
</sql>
<select id="findHospitalList" resultType="com.kidgrow.usercenter.vo.HospitalListVo">
SELECT
+ DISTINCT
DEP.department_name,
DEP.id department_id,
DEP.server_user_name,
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysRoleOrganizationMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysRoleOrganizationMapper.xml
index 6a5f123..fa9564d 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysRoleOrganizationMapper.xml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysRoleOrganizationMapper.xml
@@ -11,10 +11,10 @@
<choose>
<when test="inx == 1">
<if test="itemto.flag">
- and 1=1
+
</if>
<if test="!itemto.flag">
- or (1=1 and is_del = 0 and enabled=1)
+ or ( is_del = 0 and enabled=1)
</if>
</when>
<when test="inx==2">
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java
index 2ee5b2d..f277fdb 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java
@@ -173,7 +173,7 @@
} else {
sysOrganization.setOrgName(sysHospital.getHospitalName());
}
- boolean org = organizationService.saveOrUpdate(sysOrganization);
+ boolean org = organizationService.saveOrUpdateSer(sysOrganization);
sysHospital.setOrgId(sysOrganization.getId());
List<SysOrganization> organizations = sysUser.getOrganizations();
if (organizations.size() > 0) {
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java
index 3ed3a85..51199b2 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java
@@ -1,12 +1,17 @@
package com.kidgrow.usercenter.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.kidgrow.common.annotation.LoginUser;
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.common.model.SysOrganization;
import com.kidgrow.common.model.SysUser;
import com.kidgrow.common.model.SysUserOrg;
+import com.kidgrow.usercenter.model.SysDepartment;
+import com.kidgrow.usercenter.model.SysHospital;
import com.kidgrow.usercenter.service.ISysOrganizationService;
import com.kidgrow.usercenter.service.ISysUserOrgService;
+import com.kidgrow.usercenter.service.impl.SysDepartmentServiceImpl;
+import com.kidgrow.usercenter.service.impl.SysHospitalServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -29,6 +34,10 @@
private ISysUserOrgService sysUserOrgService;
@Autowired
private ISysOrganizationService sysOrganizationService;
+ @Autowired
+ private SysDepartmentServiceImpl sysDepartmentService;
+ @Autowired
+ private SysHospitalServiceImpl sysHospitalService;
@PostMapping("getListByMap")
public List<SysUserOrg> getListByMap(@RequestParam Map<String, Object> map) {
@@ -74,9 +83,31 @@
for (int i = 0; i < userOrgList.size(); i++) {
if (sysUserOrg.getId().equals(userOrgList.get(i).getId())) {
userOrgList.get(i).setOrgId(sysUserOrg.getOrgId());
+ userOrgList.get(i).setFromLevel(2);
+
+ //查询 科室
+ QueryWrapper queryWrapper=new QueryWrapper();
+ queryWrapper.eq("org_id",sysUserOrg.getUpdateUserId());
+ queryWrapper.eq("is_del",0);
+ queryWrapper.eq("enabled",1);
+ List<SysDepartment> list = sysDepartmentService.list(queryWrapper);
+ if(!list.isEmpty()){
+ userOrgList.get(i).setFromId(list.get(0).getId());
+ }else {
+ userOrgList.get(i).setFromId(null);
+ }
}
else
{
+ QueryWrapper queryWrapper=new QueryWrapper();
+ queryWrapper.eq("org_id",sysUserOrg.getUpdateUserId());
+ queryWrapper.eq("is_del",0);
+ queryWrapper.eq("enabled",1);
+ List<SysHospital> listHospital = sysHospitalService.list(queryWrapper);
+ if (!listHospital.isEmpty()) {
+ userOrgList.get(i).setFromId(listHospital.get(0).getId());
+ }
+ userOrgList.get(i).setFromLevel(1);
userOrgList.get(i).setOrgId(sysUserOrg.getUpdateUserId());
}
userOrgList.get(i).setEnabled(sysUserOrg.getEnabled());
@@ -93,15 +124,37 @@
sysUserOrgTemp.setUserId(sysUserOrg.getUserId());
sysUserOrgTemp.setEnabled(sysUserOrg.getEnabled());
sysUserOrgTemp.setCreateUserOrgCode(createUserOrgCode);
- userOrgList.add(sysUserOrgTemp);
+ sysUserOrgTemp.setFromLevel(2);
- sysUserOrg.setUpdateUserId(0L);
+ //查询 科室
+ QueryWrapper queryWrapper=new QueryWrapper();
+ queryWrapper.eq("org_id",sysUserOrg.getUpdateUserId());
+ queryWrapper.eq("is_del",0);
+ queryWrapper.eq("enabled",1);
+ List<SysDepartment> list = sysDepartmentService.list(queryWrapper);
+ if(!list.isEmpty()){
+ sysUserOrgTemp.setFromId(list.get(0).getId());
+ }
+ userOrgList.add(sysUserOrgTemp);
+ //查询 医院
+ queryWrapper=new QueryWrapper();
+ queryWrapper.eq("org_id",sysUserOrg.getUpdateUserId());
+ queryWrapper.eq("is_del",0);
+ queryWrapper.eq("enabled",1);
+ List<SysHospital> listHospital = sysHospitalService.list(queryWrapper);
+ if (!listHospital.isEmpty()) {
+ sysUserOrgTemp.setFromId(listHospital.get(0).getId());
+ }
+ sysUserOrgTemp.setFromLevel(1);
+// sysUserOrg.setUpdateUserId(0L);
+ sysUserOrg.setOrgId(sysOrganization.getOrgParentId());
sysUserOrg.setCreateUserOrgCode(createUserOrgCode);
userOrgList.add(sysUserOrg);
} else {
return ResultBody.failed().data(null).msg("该组织的上级组织数据异常！");
}
}
+ //查询
boolean v = sysUserOrgService.saveOrUpdateBatch(userOrgList);
if (v) {
return ResultBody.ok().data(sysUserOrg).msg("保存成功");
diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysUserOrg.java b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysUserOrg.java
index fd312f3..c51622b 100644
--- a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysUserOrg.java
+++ b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysUserOrg.java
@@ -1,5 +1,7 @@
package com.kidgrow.common.model;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -44,6 +46,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@NotNull(message = "医院/科室表里面的id")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private Long fromId;
/**
* 组织级别 0集团 1医院公司 2科室部门
diff --git a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java
index 62bd6b0..c628247 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java
+++ b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java
@@ -90,12 +90,15 @@
doctorId=sysDoctors.get(0).getId();
departmentId=sysDoctors.get(0).getDepartmentId();
departmentName=sysDoctors.get(0).getDepartmentName();
+ ctx.addZuulRequestHeader(SecurityConstants.USER_ORG_NAME_HEADER, URLEncoder.encode(sysDoctors.get(0).getHospitalName(),"UTF-8"));
+ ctx.addZuulRequestHeader(SecurityConstants.USER_DEP_ID_HEADER,String.valueOf(departmentId));
+ ctx.addZuulRequestHeader(SecurityConstants.USER_DEP_NAME_HEADER,URLEncoder.encode(departmentName,"UTF-8"));
}
ctx.addZuulRequestHeader(SecurityConstants.USER_ID_HEADER, String.valueOf(user.getId()));
ctx.addZuulRequestHeader(SecurityConstants.DOCTOR_ID_HEADER, String.valueOf(doctorId));
ctx.addZuulRequestHeader(SecurityConstants.USER_HEADER, user.getUsername());
- ctx.addZuulRequestHeader(SecurityConstants.USER_REAL_NAME,URLEncoder.encode(str,"UTF-8"));//待完善
+ ctx.addZuulRequestHeader(SecurityConstants.USER_REAL_NAME,URLEncoder.encode(str,"UTF-8"));
ctx.addZuulRequestHeader(SecurityConstants.USER_HOSPITAL_ID_HEADER,hospital.toString());
tenantId=hospital.toString();
List<SysOrganization> organizations = (List<SysOrganization>) user.getOrganizations();
@@ -103,9 +106,6 @@
organizations.sort((e1,e2)->e1.getOrgLevel().compareTo(e2.getOrgLevel()));
if (organizations != null&&organizations.size()>0) {
ctx.addZuulRequestHeader(SecurityConstants.USER_ORG_ID_HEADER,String.valueOf(organizations.get(0).getId()));
- ctx.addZuulRequestHeader(SecurityConstants.USER_ORG_NAME_HEADER, URLEncoder.encode(organizations.get(0).getOrgName(),"UTF-8"));
- ctx.addZuulRequestHeader(SecurityConstants.USER_DEP_ID_HEADER,String.valueOf(departmentId));
- ctx.addZuulRequestHeader(SecurityConstants.USER_DEP_NAME_HEADER,(departmentName.equals("")?URLEncoder.encode(organizations.get(organizations.size()-1).getOrgName(),"UTF-8"):departmentName));
ctx.addZuulRequestHeader(SecurityConstants.USER_ORGS_HEADER,JSON.toJSONString(organizations));
}
//将角色放到header
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 71cf9ca..fcaee07 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
@@ -245,11 +245,27 @@
}
// 导出
$('#app-btn-export').click(function () {
+ var key = $('#app-edit-search').val();
+ var needBegintime = $('#test1').val();
+ var needEndtime = $('#test2').val();
+ if (needBegintime != null && needEndtime != null) {
+ var flag = compareDate(needBegintime, needEndtime);
+ if (!flag) {
+ layer.msg('结束时间不得小于开始时间');
+ return;
+ }
+ }
//获取
var url = config.base_server + 'api-opration/dataneed/export';
var xhr = new XMLHttpRequest();
xhr.open('POST', url, true);
xhr.responseType = "blob";
+ var form = new FormData();
+ // Add selected file to form
+ form.append("doctor_name", key);
+ form.append('need_begintime',needBegintime);
+ form.append('need_endtime',needEndtime);
+
xhr.setRequestHeader("client_type", "DESKTOP_WEB");
xhr.setRequestHeader("Authorization", "Bearer " + config.getToken().access_token);
xhr.onload = function () {
@@ -268,7 +284,7 @@
document.body.removeChild(a);
}
}
- xhr.send();
+ xhr.send(form);
});
// 显示编辑弹窗
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 0dd5a1f..c581393 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
@@ -390,7 +390,7 @@
admin.popupCenter({
title: '编辑医生',
path: 'pages/opration/doctor_form.html',
- area: '800px',
+ area: '900px',
finish: function () {
}
});
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html
index 7c116bf..ece5883 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html
@@ -2,82 +2,101 @@
<input name="id" type="hidden" />
<div style="display:flex">
<div class="layui-form-item">
- <label class="layui-form-label">所在医院</label>
- <div class="layui-input-block">
- <input name="hospitalName" id="hospitalName" placeholder="请输入医院名称" type="text" class="layui-input"
- maxlength="50" lay-verify="required" required style="width: 175px;"/>
- <input type="hidden" name="hospitalId" id="hospitalId"/>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">所在医院</label>
+ <div class="layui-input-block" style="width: 150px;">
+ <input name="hospitalName" id="hospitalName" placeholder="请输入医院名称" type="text" class="layui-input"
+ maxlength="50" lay-verify="required" required style="width: 150px;" />
+ <input type="hidden" name="hospitalId" id="hospitalId" />
+ </div>
</div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">科室</label>
- <div class="layui-input-block">
- <input name="departmentName" id="departmentName" placeholder="请选择科室" type="hidden" class="layui-input"
- maxlength="20" />
- <select id="departmentId" name="departmentId" lay-filter="departmentId" placeholder="请选择科室"
- lay-verify="required" required>
- <option value="">-请选择科室-</option>
- </select>
+ <div class="layui-inline">
+ <label class="layui-form-label">科室</label>
+ <div class="layui-input-block" style="width: 150px;">
+ <input name="departmentName" id="departmentName" placeholder="请选择科室" type="hidden"
+ class="layui-input" maxlength="20" />
+ <select id="departmentId" name="departmentId" lay-filter="departmentId" placeholder="请选择科室"
+ lay-verify="required" required>
+ <option value="">-请选择科室-</option>
+ </select>
+ </div>
</div>
- </div>
-
- <div class="layui-form-item">
- <label class="layui-form-label">医生类型</label>
- <div class="layui-input-block">
- <select id="doctorType" name="doctorType" lay-filter="doctorType"
- lay-verify="required" required>
- <option value="2" selected>C端医生</option>
- <option value="1">H端医生</option>
- <option value="0">C端+H端</option>
- </select>
+ <div class="layui-inline">
+ <label class="layui-form-label">医生类型</label>
+ <div class="layui-input-block" style="width: 150px;">
+ <select id="doctorType" name="doctorType" lay-filter="doctorType" lay-verify="required" required>
+ <option value="2" selected>C端医生</option>
+ <option value="1">H端医生</option>
+ <option value="0">C端+H端</option>
+ </select>
+ </div>
</div>
+
+ <!-- </div>
+ <div class="layui-form-item"> -->
+
+ <!-- </div>
+
+ <div class="layui-form-item"> -->
+
</div>
</div>
<div style="display:flex">
<div class="layui-form-item">
- <label class="layui-form-label">姓名</label>
- <div class="layui-input-block">
- <input name="doctorName" type="text" class="layui-input" maxlength="20" lay-verify="required"
- required style="width: 175px;"/>
+ <div class="layui-inline">
+ <label class="layui-form-label">姓名</label>
+ <div class="layui-input-block" style="width: 150px;">
+ <input name="doctorName" type="text" class="layui-input" maxlength="20" lay-verify="required"
+ required style="width: 150px;" />
+ </div>
</div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">职称</label>
- <div class="layui-input-block">
- <select id="doctorRankId" name="doctorRankId" lay-filter="doctorRankId" placeholder="选择一个职称"
- lay-verify="required" required>
- <option value="">-请选择-</option>
- </select>
- <input name="doctorRank" id='doctorRank' type="hidden" class="layui-input" maxlength="20" />
+ <div class="layui-inline">
+ <label class="layui-form-label">职称</label>
+ <div class="layui-input-block" style="width: 150px;">
+ <select id="doctorRankId" name="doctorRankId" lay-filter="doctorRankId" placeholder="选择一个职称"
+ lay-verify="required" required>
+ <option value="">-请选择-</option>
+ </select>
+ <input name="doctorRank" id='doctorRank' type="hidden" class="layui-input" maxlength="20" />
+ </div>
</div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">角色</label>
- <div class="layui-input-block">
- <select name="roleId" xm-select="roleId" lay-verify="required">
- </select>
+ <div class="layui-inline">
+ <label class="layui-form-label">角色</label>
+ <div class="layui-input-block" style="width: 150px;">
+ <select name="roleId" xm-select="roleId" lay-verify="required">
+ </select>
+ </div>
</div>
+
+ <!-- </div>
+ <div class="layui-form-item"> -->
+
+ <!-- </div>
+ <div class="layui-form-item"> -->
+
</div>
</div>
<div style="display:flex">
<div class="layui-form-item">
- <label class="layui-form-label">联系电话</label>
- <div class="layui-input-block">
- <input name="doctorTel" id="doctorTel-add" type="text" class="layui-input" maxlength="20"
- lay-verify="required|phone" required style="width: 175px;"/>
+ <div class="layui-inline">
+ <label class="layui-form-label">联系电话</label>
+ <div class="layui-input-block" style="width: 150px;">
+ <input name="doctorTel" id="doctorTel-add" type="text" class="layui-input" maxlength="20"
+ lay-verify="required|phone" required style="width: 150px;" />
+ </div>
</div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">联系电话2</label>
- <div class="layui-input-block">
- <input name="doctorOtherLink" type="text" class="layui-input" maxlength="20" />
+ <div class="layui-inline">
+ <label class="layui-form-label">其它联系方式</label>
+ <div class="layui-input-block" style="width: 150px;">
+ <input name="doctorOtherLink" type="text" class="layui-input" maxlength="20" />
+ </div>
</div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">Email</label>
- <div class="layui-input-block">
- <input name="doctorEmail" type="text" class="layui-input" maxlength="20" lay-verify="required|email"
- required />
+ <div class="layui-inline">
+ <label class="layui-form-label">Email</label>
+ <div class="layui-input-block" style="width: 150px;">
+ <input name="doctorEmail" type="text" class="layui-input" maxlength="20" lay-verify="required|email"
+ required />
+ </div>
</div>
</div>
</div>
@@ -85,7 +104,8 @@
<div class="layui-form-item">
<label class="layui-form-label">医生简介</label>
<div class="layui-input-block">
- <textarea name="doctorAbout" id="doctorAbout" class="layui-textarea" maxlength="300" style="width: 650px;"></textarea>
+ <textarea name="doctorAbout" id="doctorAbout" class="layui-textarea" maxlength="300"
+ style="width: 650px;"></textarea>
</div>
</div>
</div>
@@ -93,21 +113,24 @@
<div class="layui-form-item">
<label class="layui-form-label">医生状态</label>
<div class="layui-input-block">
- <input name="doctorState" id="doctorState-shi" type="radio" checked value="true" title="正常" class="layui-input"/>
- <input name="doctorState" id="doctorState-fou" type="radio" value="false" title="试用" class="layui-input" />
+ <input name="doctorState" id="doctorState-shi" type="radio" checked value="true" title="正常"
+ class="layui-input" />
+ <input name="doctorState" id="doctorState-fou" type="radio" value="false" title="试用"
+ class="layui-input" />
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label"> 置顶</label>
<div class="layui-input-block">
- <input name="isTop" id="isTop-shi" type="radio" checked value="true" title="是" class="layui-input"/>
+ <input name="isTop" id="isTop-shi" type="radio" checked value="true" title="是" class="layui-input" />
<input name="isTop" id="isTop-fou" type="radio" value="false" title="否" class="layui-input" />
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">医答</label>
<div class="layui-input-block">
- <input name="isAnswer" id="isAnswer-shi" type="radio" checked value="true" title="是" class="layui-input"/>
+ <input name="isAnswer" id="isAnswer-shi" type="radio" checked value="true" title="是"
+ class="layui-input" />
<input name="isAnswer" id="isAnswer-fou" type="radio" value="false" title="否" class="layui-input" />
</div>
</div>
@@ -115,58 +138,74 @@
<label class="layui-form-label">签约</label>
<div class="layui-input-block">
<input name="isSigning" id="isSigning-shi" type="radio" checked value="true" title="是"
- class="layui-input"/>
- <input name="isSigning" id="isSigning-fou" type="radio" value="false" title="否" class="layui-input"/>
+ class="layui-input" />
+ <input name="isSigning" id="isSigning-fou" type="radio" value="false" title="否" class="layui-input" />
</div>
</div>
</div>
<div style="display:flex">
<div class="layui-form-item">
- <label class="layui-form-label">登录帐号</label>
- <div class="layui-input-block">
- <input name="username" id="username" readonly type="text" class="layui-input" maxlength="20"
- lay-verify="required" required />
+ <div class="layui-inline">
+ <label class="layui-form-label">登录帐号</label>
+ <div class="layui-input-block" style="width: 150px;">
+ <input name="username" id="username" readonly type="text" class="layui-input" maxlength="20"
+ lay-verify="required" required />
+ </div>
</div>
- </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">登录密码</label>
+ <div class="layui-input-block" style="width: 150px;">
+ <input name="password" type="password" lay-verify="required" class="layui-input" maxlength="20"
+ lay-verify="required|phone" required />
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">确认密码</label>
+ <div class="layui-input-block" style="width: 150px;">
+ <input name="passwordSure" type="password" lay-verify="required|confirmPass" class="layui-input"
+ maxlength="20" />
+ </div>
+ </div>
+
+ <!-- </div>
<div class="layui-form-item">
- <label class="layui-form-label">登录密码</label>
- <div class="layui-input-block">
- <input name="password" type="password" lay-verify="required" class="layui-input" maxlength="20"
- lay-verify="required|phone" required />
- </div>
+
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">确认密码</label>
- <div class="layui-input-block">
- <input name="passwordSure" type="password" lay-verify="required|confirmPass" class="layui-input"
- maxlength="20" />
- </div>
+ <div class="layui-form-item"> -->
+
</div>
</div>
<div style="display:flex">
<div class="layui-form-item">
- <label class="layui-form-label">医生的头像</label>
- <div class="layui-input-block" id="demo">
- <button type="button" class="layui-btn" id="phonto">
- <i class="layui-icon"></i>上传图片
- </button>
- <input name="doctorLogo" id="doctorLogo-add" type="hidden" class="layui-input" maxlength="20" />
- <blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">
- 预览效果
- <div class="layui-upload-list" id="demo2"></div>
- </blockquote>
+ <div class="layui-inline">
+ <label class="layui-form-label">医生的头像</label>
+ <div class="layui-input-block" id="demo" style="width: 150px;">
+ <button type="button" class="layui-btn" id="phonto">
+ <i class="layui-icon"></i>上传图片
+ </button>
+ <input name="doctorLogo" id="doctorLogo-add" type="hidden" class="layui-input" maxlength="20" />
+ <blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">
+ 预览效果
+ <div class="layui-upload-list" id="demo2"></div>
+ </blockquote>
+ </div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">销售代表</label>
+ <div class="layui-input-block" style="width: 150px;">
+ <input name="serverUserName" id="serverUserName-add" type="hidden" class="layui-input"
+ maxlength="15" />
+ <select id="serverUserId-add" name="serverUserId" lay-filter="serverUserId-add"
+ lay-verify="required" required>
+ <option value="">-请选择-</option>
+ </select>
+ </div>
+ </div>
+ <!--
</div>
-
- <div class="layui-form-item">
- <label class="layui-form-label">销售代表</label>
- <div class="layui-input-block">
- <input name="serverUserName" id="serverUserName-add" type="hidden" class="layui-input" maxlength="15" />
- <select id="serverUserId-add" name="serverUserId" lay-filter="serverUserId-add"
- lay-verify="required" required>
- <option value="">-请选择-</option>
- </select>
- </div>
+
+ <div class="layui-form-item"> -->
+
</div>
</div>
@@ -188,7 +227,7 @@
var autocomplete = layui.autocomplete;
var formSelects = layui.formSelects;
var $ = layui.jquery;
-
+
//获取角色
var get_role = function () {
admin.req('api-user/findByMap?tenant_id=hospital', {}, function (data) {
@@ -322,6 +361,7 @@
if (data.field.roleId != null && data.field.roleId != "") {
data.field.roles = data.field.roleId.split(',');
}
+ data.field.hospitalId = ""+data.field.hospitalId;
data.field.roleId = null;
debugger
admin.req('api-user/sysdoctor', JSON.stringify(data.field), function (data) {
@@ -337,7 +377,7 @@
}, "POST");
return false;
});
-
+
//将新增 中的 serverUserName 赋值
form.on('select(serverUserId-add)', function (data) {
//将医院名称赋值
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_org_form.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_org_form.html
index 512be03..c293bf3 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_org_form.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_org_form.html
@@ -139,6 +139,7 @@
if (!strUtil.isEmpty($("#orgId").val())) {
if (data.field != null) {
data.field.enabled = (data.field.enabled == 0) ? false : true;
+ data.field.fromId=0;
admin.req('api-user/sysuserorg', JSON.stringify(data.field), function (data) {
layer.closeAll('loading');
if (data.code == 0) {
--
Gitblit v1.8.0