forked from kidgrow-microservices-platform
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/DoctorTempleteMapper.java
@@ -21,9 +21,16 @@ * 分页查询医生的模板列表 * @param page * @param params * @return * @returnfindDoctorList */ List<DoctorTemplete> findList(Page<DoctorTemplete> page, @Param("p") Map<String, Object> params); /** * 分页查询医生的模板列表 * @param page * @param params * @returnfindDoctorList */ List<DoctorTemplete> findDoctorList(Page<DoctorTemplete> page, @Param("p") Map<String, Object> params); /** * 根据DoctorTemplete对象当做查询条件进行查询 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IDoctorTempleteService.java
@@ -22,7 +22,12 @@ * @return */ PageResult findList(Map<String, Object> params); /** * 列表 * @param params * @return */ PageResult findDoctorList(Map<String, Object> params); /** * 根据DoctorTemplete对象当做查询条件进行查询 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DoctorTempleteServiceImpl.java
@@ -1,19 +1,18 @@ package com.kidgrow.oprationcenter.service.impl; import com.kidgrow.common.model.ResultBody; import org.springframework.stereotype.Service; import com.kidgrow.common.model.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kidgrow.common.model.PageResult; import com.kidgrow.common.model.ResultBody; import com.kidgrow.common.service.impl.SuperServiceImpl; import com.kidgrow.oprationcenter.mapper.DoctorTempleteMapper; import com.kidgrow.oprationcenter.model.DoctorTemplete; import com.kidgrow.oprationcenter.service.IDoctorTempleteService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.MapUtils; import org.springframework.stereotype.Service; import java.util.List; import java.util.Map; import org.apache.commons.collections4.MapUtils; import lombok.extern.slf4j.Slf4j; import com.kidgrow.oprationcenter.model.DoctorTemplete; import com.kidgrow.oprationcenter.mapper.DoctorTempleteMapper; import com.kidgrow.oprationcenter.service.IDoctorTempleteService; /** * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br> @@ -38,6 +37,13 @@ return PageResult.<DoctorTemplete>builder().data(list).code(0).count(page.getTotal()).build(); } @Override public PageResult findDoctorList(Map<String, Object> params) { Page<DoctorTemplete> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit")); List<DoctorTemplete> list = baseMapper.findDoctorList(page, params); return PageResult.<DoctorTemplete>builder().data(list).code(0).count(page.getTotal()).build(); } /** * 根据DoctorTemplete对象当做查询条件进行查询 * @param doctorTemplete kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
@@ -287,7 +287,7 @@ //包含共享的数据 userProductDetail.setProductOrderJoinDetailListShare(productOrderDetailList.stream().filter(f -> f.getIsShare()).collect(Collectors.toList())); //科室私有的数据 userProductDetail.setProductOrderJoinDetailsListDep(productOrderDetailList.stream().filter((f -> departmentId.equals(f.getDepartmentId()) && f.getIsShare() == false)).collect(Collectors.toList())); userProductDetail.setProductOrderJoinDetailsListDep(productOrderDetailList.stream().filter((f -> departmentId.equals(f.getDepartmentId()) && !f.getIsShare())).collect(Collectors.toList())); return userProductDetail; } return null; kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml
@@ -40,7 +40,7 @@ and templete_type = #{p.templeteType} </if> <if test="p.templeteTitle != null and p.templeteTitle !=''"> and templete_title like '%${p.templeteTitle}%' and templete_title like '%${p.templeteTitle}%' </if> <if test="p.templeteNote != null and p.templeteNote !=''"> and templete_note = #{p.templeteNote} @@ -90,4 +90,35 @@ <include refid="where"/> order by id desc </select> <select id="findDoctorList" resultType="com.kidgrow.oprationcenter.model.DoctorTemplete"> SELECT id, doctor_id, doctor_name, public_type, templete_type, templete_title, templete_note, create_time FROM doctor_templete WHERE is_del = 0 AND enabled = 1 AND templete_type = #{p.templeteType} AND(( hospital_id IS NULL AND hospital_id IS NULL AND doctor_id IS NULL ) OR ( hospital_id =#{p.hospitalId} AND department_id =#{p.departmentId} AND ( public_type = 0 OR ( doctor_id =#{p.doctorId} AND public_type = 1)))) ORDER BY public_type DESC,id desc </select> </mapper> kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorTempleteController.java
@@ -53,6 +53,22 @@ } return doctorTempleteService.findList(params); } /** * 医生的模板列表 */ @ApiOperation(value = "查询列表") @ApiImplicitParams({ @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"), @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer") }) @GetMapping("/doctorTempleteList") public PageResult doctorList(@RequestParam Map<String, Object> params) { if(params.size()==0){ params.put("page",1); params.put("limit",10); } return doctorTempleteService.findDoctorList(params); } /** * 查询 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
@@ -740,7 +740,7 @@ //添加用户数据 如果没有输入密码，将会创建一个默认密码返回 String defaultPassWord = ""; SysUser sysUser = new SysUser(); sysUser.setUsername(userRegVo.getUsername()); sysUser.setUsername(userRegVo.getMobile()); sysUser.setMobile(userRegVo.getMobile()); if (StringUtils.isBlank(userRegVo.getPassword())) { defaultPassWord = com.kidgrow.common.utils.RandomValueUtils.getRandom(6); @@ -802,13 +802,14 @@ sysDictionaries.setCreateUserId(createUserId); sysDictionaries.setCreateUserName(createUserName); dicBool = sysDictionariesService.save(sysDictionaries); if (dicBool) { userRegVo.setDoctorRankId(sysDictionaries.getId()); } } if (dicBool) { userRegVo.setDoctorRankId(sysDictionaries.getId()); //写用户组织关系表 List<SysUserOrg> sysUserOrgList = new ArrayList<SysUserOrg>(); sysUserOrgH.setUserId(sysUser.getId()); sysUserOrgH.setOrgId(organizationHos); sysUserOrgH.setFromLevel(CommonConstant.SYSTEM_ORG_HOS_LEVEL); @@ -837,11 +838,7 @@ sysDoctor.setDoctorType(CommonConstant.H_DOCTOR_TYPE); sysDoctor.setCreateUserId(isReg ? createUserId : sysUserd.getId()); sysDoctor.setCreateUserName(isReg ? createUserName : sysUserd.getUsername()); if (isReg) { sysDoctor.setDoctorState(false); } else { sysDoctor.setDoctorState(true); } sysDoctor.setDoctorState(!isReg); sysDoctor.setDoctorTel(userRegVo.getMobile()); sysDoctor.setDoctorName(userRegVo.getNickname()); sysDoctor.setServerUserId(isReg ? createUserId : sysUserd.getId()); @@ -987,8 +984,9 @@ List<HospitalDoctorListVo> hospitalDoctorListVos = baseMapper.hospitalDoctorList(sysHospitalId, depatmentId, CommonConstant.HOSPITAL_DOCTOR_ID, CommonConstant.HOSPITAL_ADMIN_ID); if (hospitalDoctorListVos != null) { int doctorCount = hospitalDoctorListVos.size(); int accountCount = sysDepartment.getAccountsCount(); return (accountCount - doctorCount); int accountCount = sysDepartment.getAccountsCount().intValue(); int liveCount=accountCount - doctorCount; return liveCount; } else { return 0; } kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
@@ -199,8 +199,6 @@ }) @GetMapping("/users") public PageResult<SysUser> findUsers(@RequestParam Map<String, Object> params) { // log.info("租户ID："+ TenantContextHolder.getTenant()); // log.info("IP:"+request.getHeader(CommonConstant.USER_AGENT_IP)); return appUserService.findUsers(params); } /** @@ -423,7 +421,7 @@ * 根据map查询 */ private boolean checkAdmin(long id) { return id == 1L; return id == CommonConstant.ADMIN_USER_ID; } @PostMapping("/users/findAll") kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java
@@ -103,8 +103,11 @@ /** * 超级管理员用户名 */ String ADMIN_USER_NAME = "admin"; String ADMIN_USER_NAME = "admin-xg"; /** * 超级管理的id */ Long ADMIN_USER_ID=1000000000000000001L; /** * 公共日期格式 */ kidgrow-commons/kidgrow-db-spring-boot-starter/src/main/java/com/kidgrow/db/config/TenantAutoConfigure.java
@@ -41,7 +41,7 @@ @Override public Expression getTenantId(boolean where) { String tenant = TenantContextHolder.getTenant(); log.info("租户ID:"+tenant); //log.info("租户ID:"+tenant); if (tenant != null) { return new StringValue(TenantContextHolder.getTenant()); }
