From 331e28358908bf38be47bdcd79ac38280ceb1711 Mon Sep 17 00:00:00 2001 From: lxd <1004405501@qq.com> Date: Wed, 25 Sep 2024 18:14:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E5=A2=9E=E5=8A=A0=E4=BA=91?= =?UTF-8?q?=E8=83=B6=E7=89=87=E5=9C=B0=E5=9D=80=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/org/vo/OrgUnitPageReqVO.java | 4 ++++ .../controller/admin/org/vo/OrgUnitRespVO.java | 3 +++ .../controller/admin/org/vo/OrgUnitSaveReqVO.java | 3 +++ .../module/system/dal/dataobject/org/OrgUnitDO.java | 4 ++++ .../patientexamlist/PatientexamlistController.java | 13 +++++++++++-- .../admin/ultrasonic/ultrasonicController.java | 5 ++++- .../ultrasoniccom/dal/image/dicompatientsDO.java | 4 ++++ 7 files changed, 33 insertions(+), 3 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/vo/OrgUnitPageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/vo/OrgUnitPageReqVO.java index b47835c45..ea63af6e8 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/vo/OrgUnitPageReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/vo/OrgUnitPageReqVO.java @@ -61,4 +61,8 @@ public class OrgUnitPageReqVO extends PageParam { @Schema(description = "是否启用云胶片") private String EnableCloudDicom; + @Schema(description = "云胶片地址") + private String CloudDicom; + + } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/vo/OrgUnitRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/vo/OrgUnitRespVO.java index f2a94f872..dcd86f8f1 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/vo/OrgUnitRespVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/vo/OrgUnitRespVO.java @@ -68,4 +68,7 @@ public class OrgUnitRespVO { private String dcmurl; @Schema(description = "是否启用云胶片") private String EnableCloudDicom; + + @Schema(description = "云胶片地址") + private String CloudDicom; } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/vo/OrgUnitSaveReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/vo/OrgUnitSaveReqVO.java index 779ad4bf0..10a9c528b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/vo/OrgUnitSaveReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/vo/OrgUnitSaveReqVO.java @@ -54,4 +54,7 @@ public class OrgUnitSaveReqVO { private String dcmurl; @Schema(description = "是否启用云胶片") private String EnableCloudDicom; + @Schema(description = "云胶片地址") + private String CloudDicom; + } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/org/OrgUnitDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/org/OrgUnitDO.java index 21154830b..e7f1ae488 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/org/OrgUnitDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/org/OrgUnitDO.java @@ -92,4 +92,8 @@ public class OrgUnitDO { @TableField("EnableCloudDicom") private String EnableCloudDicom; + + @TableField("CloudDicom") + private String CloudDicom; + } \ No newline at end of file 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 aeb11bd75..720bbc6c3 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 @@ -1,7 +1,9 @@ package cn.iocoder.yudao.module.tblist.controller.admin.patientexamlist; import cn.iocoder.yudao.framework.common.util.date.DateUtils; +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; import cn.iocoder.yudao.module.system.service.user.AdminUserService; import cn.iocoder.yudao.module.tblist.service.patientexamlist.org.OrgService; import com.google.gson.Gson; @@ -63,7 +65,8 @@ public class PatientexamlistController { private AdminUserService userService; @Resource private OrgService OrgService; - + @Resource + private OrgUnitService Service; @PostMapping("/create") @Operation(summary = "创建PACS检查列表") @PreAuthorize("@ss.hasPermission('tblist:patientexamlist:create')") @@ -330,6 +333,12 @@ public class PatientexamlistController { if (regId!=null &&!regId.isEmpty() && orgId!=null &&!orgId.isEmpty()) { + String CloudDicom=""; + OrgUnitDO unitDO= Service.getonekey(orgId); + if(unitDO!=null) + { + CloudDicom= unitDO.getCloudDicom(); + } Map params = new HashMap<>(); params.put("regId", regId); params.put("orgId", orgId); @@ -359,7 +368,7 @@ public class PatientexamlistController { infoVO.setDiagDate(patientexamlistDO.getDiagDate() != null ? patientexamlistDO.getDiagDate().toString() : null); infoVO.setReviewDoctor(patientexamlistDO.getReviewDoctor()); infoVO.setReviewDate(patientexamlistDO.getReviewDate()!=null ?patientexamlistDO.getReviewDate().toString():null); - infoVO.setCloudurl("http://114.55.171.231:48081/?no="+regId+"&&orgId="+orgId); + infoVO.setCloudurl(CloudDicom+"/?no="+regId+"&orgId="+orgId);//http://1.119.159.138:48082/flyCloudDicom analysisInfoVOS.add(infoVO); } diff --git a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java index 41b0284b0..2ab574245 100644 --- a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java +++ b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java @@ -520,6 +520,7 @@ public class ultrasonicController { dicompatientsDO.setPatientSex(PatientSex); dicompatientsDO.setOrgId(orgId); dicompatientsDO.setAccessTime(AccessTime); + dicompatientsDO.setDataSync("1"); dicompatientsDOList.add(dicompatientsDO); if(!studyVOS.isEmpty()) @@ -527,7 +528,8 @@ public class ultrasonicController { for (StudyVO studyVO :studyVOS) { // study表的主键 - String StudyInsta= UUID.randomUUID().toString(); + // String StudyInsta= UUID.randomUUID().toString(); + String StudyInsta= studyVO.getStudyID(); dicomstudiesDO dicomstudiesDO=new dicomstudiesDO(); dicomstudiesDO.setStudyInsta(StudyInsta); dicomstudiesDO.setStudyDate(StudyDate.split(" ")[0].replace("-","")); @@ -551,6 +553,7 @@ public class ultrasonicController { { //service表主键 String SeriesInst=UUID.randomUUID().toString(); + // String SeriesInst= seriesVO.getSeriesNumb(); dicomseriesDO dicomseriesDO=new dicomseriesDO(); dicomseriesDO.setSeriesInst(SeriesInst); dicomseriesDO.setSeriesNumb(seriesVO.getSeriesNumb()); diff --git a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/dal/image/dicompatientsDO.java b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/dal/image/dicompatientsDO.java index be8b6ec5f..35887d2fd 100644 --- a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/dal/image/dicompatientsDO.java +++ b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/dal/image/dicompatientsDO.java @@ -32,5 +32,9 @@ public class dicompatientsDO { @TableField("orgId") private String orgId; + @TableField("dataSync") + private String dataSync; + + }