diff --git a/cloud-common/cloud-common-bom/pom.xml b/cloud-common/cloud-common-bom/pom.xml index 2b6e2df628c2d0fa0b426d00958f0af8d829094f..78cf30e11572b0bd8e4000db9dd64f2eb7696c5c 100644 --- a/cloud-common/cloud-common-bom/pom.xml +++ b/cloud-common/cloud-common-bom/pom.xml @@ -22,7 +22,7 @@ 8.0.15 1.5.22 2.9.2 - 5.5.1 + 5.7.0 4.1.0 2.5.1 2.10.1 @@ -58,11 +58,11 @@ cloud-common-core ${sict.version} - - cn.sh.stc.sict - cloud-auth-api - ${sict.version} - + + + + + cn.sh.stc.sict cloud-common-dynamic-gateway diff --git a/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/controller/web/SysUserBaseController.java b/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/controller/web/SysUserBaseController.java index 38141fbecd083928ccd3acf9114902a2dac4193c..a82cbb98c3f0d3315c0b21b112581f28895f92de 100644 --- a/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/controller/web/SysUserBaseController.java +++ b/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/controller/web/SysUserBaseController.java @@ -69,16 +69,19 @@ public class SysUserBaseController { @ApiOperation("新增/修改用户") @PostMapping @PreAuthorize("@pms.hasPermission('ROLE_admin')") - public R save(@RequestBody SysUserBase userBase) { - if (NumberUtil.isNullOrZero(userBase.getId())) { - if(StrUtil.isBlank(userBase.getUserName())){ + public R save(@RequestBody SysUserBase user) { + if (NumberUtil.isNullOrZero(user.getId())) { + if (StrUtil.isBlank(user.getUserName())) { return new R().error("用户名不可为空！"); } - String pw = StrUtil.isBlank(userBase.getPasswd()) ? Constant.DEFAULT_PASSWORD : userBase.getPasswd(); - userBase.setPasswd(ENCODER.encode(pw)); + String pw = StrUtil.isBlank(user.getPasswd()) ? Constant.DEFAULT_PASSWORD : user.getPasswd(); + user.setPasswd(ENCODER.encode(pw)); } - userBase.setStatus(Constant.BYTE_NO); - sysUserBaseService.saveOrUpdate(userBase); + if (sysUserBaseService.exist(user)) { + return new R().error("相同用户名用户已经存在！"); + } + user.setStatus(Constant.BYTE_NO); + sysUserBaseService.saveOrUpdate(user); return new R<>(); } @@ -99,7 +102,7 @@ public class SysUserBaseController { @ApiOperation("获取当前用户信息") @GetMapping("/info/current") - public R getCurrentUserInfo(){ + public R getCurrentUserInfo() { CurrentUser current = SecurityUtils.getCurrentUser(); if (current == null) { return new R().error("无登录信息！"); diff --git a/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/service/SysUserBaseService.java b/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/service/SysUserBaseService.java index b3f82720f7613eb94b695f3279d78531b6d9f9f9..e45174907cbfa338182fc35fa53e3a75e20f4c97 100644 --- a/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/service/SysUserBaseService.java +++ b/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/service/SysUserBaseService.java @@ -18,5 +18,7 @@ public interface SysUserBaseService extends IService { UserInfo getUserInfoBySocial(String appId, String inStr) throws WxErrorException; boolean saveDto(UserDTO dto); + + boolean exist(SysUserBase user); } diff --git a/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/service/impl/SysUserBaseServiceImpl.java b/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/service/impl/SysUserBaseServiceImpl.java index d5ccc96322ce49971d43db3489d88bdc76f57072..18829965ae1e0dc5fb46ea9df268d5d274608c8e 100644 --- a/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/service/impl/SysUserBaseServiceImpl.java +++ b/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/service/impl/SysUserBaseServiceImpl.java @@ -21,6 +21,7 @@ import cn.sh.stc.sict.cloud.upms.service.HpUserRoleService; import cn.sh.stc.sict.cloud.upms.service.SysUserBaseService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -56,7 +57,7 @@ public class SysUserBaseServiceImpl extends ServiceImpl roleList = hpRoleService.listByUserId(user.getId()); - if(CollUtil.isNotEmpty(roleList)){ + if (CollUtil.isNotEmpty(roleList)) { // 设置角色列表 （ID） List roleIds = roleList.stream().map(HpRole::getRoleCode) .collect(Collectors.toList()); @@ -126,6 +127,17 @@ public class SysUserBaseServiceImpl extends ServiceImpl wrapper = Wrappers.lambdaQuery(); + wrapper.ne(NumberUtil.isNotNullOrZero(user.getId()), SysUserBase::getId, user.getId()) + .eq(SysUserBase::getUserName, user.getUserName()); + return this.count(wrapper) > 0; + } + private UserInfo getByPhone(String phone) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SysUserBase::getPhone, phone); diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/AppointmentController.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/AppointmentController.java index 1ef53276b1be20227f0f2ae21918fa64c274a89f..c439400b16a7d025d8306e046cdde1b0246d57dc 100644 --- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/AppointmentController.java +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/AppointmentController.java @@ -84,6 +84,9 @@ public class AppointmentController { if (WanDaConstant.ORDER_MODEL_1.equals(hos.getOrderMode()) && isNullCard) { return new R().error("请补充患者就诊卡信息！"); } + String deptName = ""; + String doctorName = ""; + String resourceName = ""; if (WanDaConstant.ORDER_TYPE_OUTP.equals(order.getOrderType())) { HpDocInfo docInfo = hpDocInfoService.getById(order.getDoctorId()); if (null == docInfo) { @@ -92,11 +95,16 @@ public class AppointmentController { order.setOneDeptCode(docInfo.getOneDeptCode()); order.setDeptCode(docInfo.getDeptCode()); order.setResourceCode(docInfo.getResourceCode()); + order.setDeptName(docInfo.getDeptName()); app.setDoctorId(docInfo.getId().toString()); app.setResourceCertId(docInfo.getPersonId()); app.setHosOrgName(docInfo.getHosName()); app.setDeptName(docInfo.getDeptName()); app.setResourceName(docInfo.getResourceName()); + app.setDoctorName(docInfo.getResourceName()); + deptName = docInfo.getDeptName(); + doctorName = docInfo.getResourceName(); + resourceName = docInfo.getResourceName(); } else { HpDeptInfo deptInfo = hpDeptInfoService.getById(order.getDeptId()); if (null == deptInfo) { @@ -105,9 +113,12 @@ public class AppointmentController { order.setOneDeptCode(deptInfo.getOneDeptCode()); order.setDeptCode(deptInfo.getDeptCode()); order.setResourceCode(deptInfo.getDeptCode()); + order.setDeptName(deptInfo.getDeptName()); app.setHosOrgName(deptInfo.getHosName()); app.setDeptName(deptInfo.getDeptName()); app.setResourceName(deptInfo.getDeptName()); + deptName = deptInfo.getDeptName(); + resourceName = deptInfo.getDeptName(); } // order.setOrderType(WanDaConstant.ORDER_TYPE_OUTP); order.setChannelCode(WanDaConstant.CHANNEL_CODE_OTHER); @@ -146,6 +157,9 @@ public class AppointmentController { app.setStatus(Constant.STRING_NO); app.setOrderNumType(order.getOrderNumType()); app.setPatientName(patient.getName()); + app.setDeptName(deptName); + app.setDoctorName(doctorName); + app.setResourceName(resourceName); app.setStatus(Constant.STRING_NO); app.setEvaStatus(Constant.BYTE_NO); hpAppointmentService.save(app); diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/web/GuideRecordController.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/web/GuideRecordController.java index 35c34ff42ace81d70438cc86bf9613bd4c175a21..cb6397df8ccccba67a7f7a3cc85afb6b4f81d36b 100644 --- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/web/GuideRecordController.java +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/web/GuideRecordController.java @@ -1,11 +1,10 @@ package cn.sh.stc.sict.theme.hphy.controller.web; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.DesensitizedUtil; import cn.hutool.core.util.StrUtil; import cn.sh.stc.sict.cloud.common.core.util.R; -import cn.sh.stc.sict.cloud.common.security.util.SecurityUtils; -import cn.sh.stc.sict.cloud.upms.dto.CurrentUser; import cn.sh.stc.sict.theme.hphy.model.HphyGuideRecord; -import cn.sh.stc.sict.theme.hphy.service.HphyGuideQuestionService; import cn.sh.stc.sict.theme.hphy.service.HphyGuideRecordService; import cn.sh.stc.sict.theme.hphy.vo.DiseaseAnalysisDTO; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -35,12 +34,12 @@ public class GuideRecordController { @ApiOperation("分页查询") @GetMapping("/page") - public R page(Page page, + public R page(Page page, String patientName, String disease, String hospName, String deptName, - String doctorName){ + String doctorName) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.like(StrUtil.isNotBlank(patientName), HphyGuideRecord::getPatientName, patientName) .like(StrUtil.isNotBlank(disease), HphyGuideRecord::getDisease, disease) @@ -49,12 +48,18 @@ public class GuideRecordController { page = hphyGuideRecordService.page(page, wrapper); + if (CollUtil.isNotEmpty(page.getRecords())) { + page.getRecords().forEach(i -> { + i.setPatientName(DesensitizedUtil.chineseName(i.getPatientName())); + }); + } + return new R(page); } @ApiOperation("获取详情") @GetMapping("/info") - public R info(@RequestParam("guideId")Long guideId){ + public R info(@RequestParam("guideId") Long guideId) { HphyGuideRecord guide = hphyGuideRecordService.getById(guideId); if (guide == null) { diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/web/HpAppointmentController.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/web/HpAppointmentController.java index cd2a6d765195be73c26073923e7dc1fb2fa577bb..6546b96aea3407b7ae81bd01b1f33308d0199fd0 100644 --- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/web/HpAppointmentController.java +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/web/HpAppointmentController.java @@ -1,6 +1,8 @@ package cn.sh.stc.sict.theme.hphy.controller.web; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.DesensitizedUtil; import cn.hutool.core.util.StrUtil; import cn.sh.stc.sict.cloud.common.core.constant.Constant; import cn.sh.stc.sict.cloud.common.core.util.R; @@ -36,7 +38,7 @@ public class HpAppointmentController extends ApiController { @ApiOperation("分页查询 - 预约记录") @GetMapping("/app/page") - public R appPage(Page page, + public R appPage(Page page, @RequestParam(value = "name", required = false) String name, @RequestParam(value = "hospName", required = false) String hospName, @RequestParam(value = "deptName", required = false) String deptName, @@ -49,6 +51,12 @@ public class HpAppointmentController extends ApiController { .orderByDesc(HpAppointment::getCreateTime); page = hpAppointmentService.page(page, wrapper); + if(CollUtil.isNotEmpty(page.getRecords())){ + page.getRecords().forEach(i->{ + i.setPatientName(DesensitizedUtil.chineseName(i.getPatientName())); + i.setUserPhone(DesensitizedUtil.mobilePhone(i.getUserPhone())); + }); + } return new R(page); } diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/web/HphyGuideMatchController.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/web/HphyGuideMatchController.java index c70fdfd41c5e186082f7d5e9e1d0f08743132da5..286e4f412838ae8f431571d569e1904c27a6e381 100644 --- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/web/HphyGuideMatchController.java +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/web/HphyGuideMatchController.java @@ -1,6 +1,8 @@ package cn.sh.stc.sict.theme.hphy.controller.web; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.DesensitizedUtil; import cn.hutool.core.util.StrUtil; import cn.sh.stc.sict.cloud.common.core.util.R; import cn.sh.stc.sict.theme.hphy.model.HphyGuideMatch; @@ -40,7 +42,7 @@ public class HphyGuideMatchController { */ @ApiOperation("分页查询 导医推荐记录") @GetMapping("/page") - public R getHphyGuideMatchPage(Page page, HphyGuideMatch guide) { + public R getHphyGuideMatchPage(Page page, HphyGuideMatch guide) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.like(StrUtil.isNotBlank(guide.getPatientName()), HphyGuideMatch::getPatientName, guide.getPatientName()) .like(StrUtil.isNotBlank(guide.getHospName()), HphyGuideMatch::getHospName, guide.getHospName()) @@ -49,6 +51,12 @@ public class HphyGuideMatchController { .orderByDesc(HphyGuideMatch::getCreateTime); page = hphyGuideMatchService.page(page, wrapper); + + if(CollUtil.isNotEmpty(page.getRecords())){ + page.getRecords().forEach(i->{ + i.setPatientName(DesensitizedUtil.chineseName(i.getPatientName())); + }); + } return new R(page); } }