diff --git a/yudao-module-applyregistration/yudao-module-applyregistration-biz/src/main/java/cn/iocoder/yudao/module/applyregistration/controller/admin/applyform/ApplyformController.java b/yudao-module-applyregistration/yudao-module-applyregistration-biz/src/main/java/cn/iocoder/yudao/module/applyregistration/controller/admin/applyform/ApplyformController.java index 93558146d..e463a7847 100644 --- a/yudao-module-applyregistration/yudao-module-applyregistration-biz/src/main/java/cn/iocoder/yudao/module/applyregistration/controller/admin/applyform/ApplyformController.java +++ b/yudao-module-applyregistration/yudao-module-applyregistration-biz/src/main/java/cn/iocoder/yudao/module/applyregistration/controller/admin/applyform/ApplyformController.java @@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.applyregistration.controller.admin.applyform; import cn.iocoder.yudao.framework.common.util.http.HttpUtils; import cn.iocoder.yudao.module.applyregistration.dal.mysql.applyform.ApplyformMapper; +import cn.iocoder.yudao.module.infra.dal.dataobject.config.ConfigDO; +import cn.iocoder.yudao.module.infra.service.config.ConfigService; import cn.iocoder.yudao.module.system.api.DatabaseUtils; import cn.iocoder.yudao.module.applyregistration.controller.admin.applyform.devicevo.DeviceVO; import cn.iocoder.yudao.module.applyregistration.controller.admin.applyform.devicevo.deviceupVO; @@ -91,7 +93,8 @@ public class ApplyformController { private DicomworklistService dicomworklistService; @Resource private PatientexamlistService patientexamlistService; - + @Resource + private ConfigService configService; @Resource private OrgUnitService Service; @Resource @@ -521,6 +524,9 @@ public class ApplyformController { String msg=""; String re="调取成功"; if (regId != null && !regId.isEmpty() && orgId != null && !orgId.isEmpty()) { + //获取配置项地址 + ConfigDO config= configService.getConfigByKey("url.viewdcm"); + Map params = new HashMap<>(); params.put("regId", regId); params.put("orgId", orgId); @@ -541,7 +547,7 @@ public class ApplyformController { if(!patientexamlistDO.getDeviceType().equals("US")) { //存放访问地址 一次检查一个地址 - dcmurl.add("https://pacs.gw12320.com/viewdcm/?regid="+patientexamlistDO.getRegId()+"&orgId="+patientexamlistDO.getOrgId()+"&examid="+patientexamlistDO.getExamId()); + dcmurl.add(config.getValue()+"/?regid="+patientexamlistDO.getRegId()+"&orgId="+patientexamlistDO.getOrgId()+"&examid="+patientexamlistDO.getExamId()); } } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctor/DoctorController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctor/DoctorController.java index e7ccde186..e586fea83 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctor/DoctorController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctor/DoctorController.java @@ -55,7 +55,17 @@ public class DoctorController { @PreAuthorize("@ss.hasPermission('doctor::create')") @LogRecord(type = "医生管理", subType = "创建", bizNo ="{{#createReqVO.getDoctorID}}" , success = "创建ID为{{#createReqVO.getDoctorID}}的医生") public CommonResult create(@Valid @RequestBody DoctorSaveReqVO createReqVO) { - return success(Service.create(createReqVO)); + + String Msg=""; + DoctorDO doctorDO= Service.get(createReqVO.getDoctorID()); + if(doctorDO!=null) { + Msg="医生编号已存在"; + } + else + { + Msg= Service.create(createReqVO); + } + return success(Msg); } @PutMapping("/update") diff --git a/yudao-module-tblist/yudao-module-tblist-biz/pom.xml b/yudao-module-tblist/yudao-module-tblist-biz/pom.xml index e0aa3cdb3..b49238ef8 100644 --- a/yudao-module-tblist/yudao-module-tblist-biz/pom.xml +++ b/yudao-module-tblist/yudao-module-tblist-biz/pom.xml @@ -130,6 +130,12 @@ commons-net commons-net + + cn.iocoder.boot + yudao-module-infra-biz + 2.1.0-jdk8-snapshot + compile + diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java index c447d4002..6ceb5e59b 100644 --- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java +++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java @@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.tblist.controller.admin.patientexamlist; import cn.iocoder.yudao.framework.common.util.date.DateUtils; import cn.iocoder.yudao.framework.common.util.io.FileUtils; +import cn.iocoder.yudao.module.infra.dal.dataobject.config.ConfigDO; +import cn.iocoder.yudao.module.infra.service.config.ConfigService; import cn.iocoder.yudao.module.system.dal.dataobject.org.OrgUnitDO; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import cn.iocoder.yudao.module.system.service.org.OrgUnitService; @@ -76,6 +78,8 @@ public class PatientexamlistController { private OrgService OrgService; @Resource private OrgUnitService Service; + @Resource + private ConfigService configService; @PostMapping("/create") @Operation(summary = "创建PACS检查列表") @@ -498,7 +502,8 @@ public class PatientexamlistController { } } } - + //获取配置项地址 + ConfigDO config= configService.getConfigByKey("url.ftpurl"); //上传成功 //当前时间 LocalDateTime dateTime = LocalDateTime.parse(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), @@ -506,7 +511,7 @@ public class PatientexamlistController { AdminUserDO user = userService.getUser(getLoginUserId()); PatientexamlistSaveReqVO updateReqVO = new PatientexamlistSaveReqVO(); updateReqVO.setId(insimagescreenshotVO.getID()); - updateReqVO.setPdfurl("https://114.55.171.231:48082/" + insimagescreenshotVO.getID() + "/" + fileName);//https://pacs.gw12320.com/video + updateReqVO.setPdfurl(config.getValue()+"/" + insimagescreenshotVO.getID() + "/" + fileName);//https://pacs.gw12320.com/video https://114.55.171.231:48082 patientexamlistService.updatePatientexamlist(updateReqVO);