From 81f3d9f2ec72ba7af988ec4511b791c8af185b25 Mon Sep 17 00:00:00 2001
From: lxd <1004405501@qq.com>
Date: Thu, 12 Sep 2024 12:20:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E5=A2=9E=E5=8A=A0dcm?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E5=89=8D=E7=BC=80=E5=92=8C=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=20=E4=BB=A5=E5=8F=8A=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/admin/org/OrgUnitController.java    | 6 ++++++
 .../system/controller/admin/org/vo/OrgUnitPageReqVO.java  | 5 +++++
 .../system/controller/admin/org/vo/OrgUnitRespVO.java     | 5 +++++
 .../system/controller/admin/org/vo/OrgUnitSaveReqVO.java  | 4 ++++
 .../yudao/module/system/dal/dataobject/org/OrgUnitDO.java | 6 ++++++
 .../yudao/module/system/dal/mysql/org/OrgUnitMapper.java  | 4 ++++
 .../yudao/module/system/service/org/OrgUnitService.java   | 2 ++
 .../module/system/service/org/OrgUnitServiceImpl.java     | 6 +++++-
 .../controller/admin/ultrasonic/ultrasonicController.java | 8 +++++++-
 yudao-server/src/main/resources/application.yaml          | 1 +
 10 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/OrgUnitController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/OrgUnitController.java
index 7ff273ce5..270a7fff6 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/OrgUnitController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/OrgUnitController.java
@@ -112,6 +112,12 @@ public class OrgUnitController {
         OrgUnitDO aDo = Service.get(id);
         return success(BeanUtils.toBean(aDo, OrgUnitRespVO.class));
     }
+    @GetMapping("/getone")
+    public  CommonResult<OrgUnitRespVO> getoneorg(@RequestParam("orgID") String orgID)
+    {
+        OrgUnitDO aDo = Service.getonekey(orgID);
+        return success(BeanUtils.toBean(aDo, OrgUnitRespVO.class));
+    }
 
     @GetMapping("/getlist")
     @Operation(summary = "获得机构管理字典")
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 0245508aa..1265be539 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
@@ -53,4 +53,9 @@ public class OrgUnitPageReqVO extends PageParam {
 
     @Schema(description = "是否删除")
     private String isdelete;
+
+    @Schema(description = "dcm前缀名称")
+    private String dcmprefix;
+    @Schema(description = "dcm前缀地址")
+    private String dcmurl;
 }
\ 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 35c03f750..9f2554264 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
@@ -61,4 +61,9 @@ public class OrgUnitRespVO {
 
     @Schema(description = "是否删除")
     private String isdelete;
+
+    @Schema(description = "dcm前缀名称")
+    private String dcmprefix;
+    @Schema(description = "dcm前缀地址")
+    private String dcmurl;
 }
\ 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 08ed3b11c..d1ea3df59 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
@@ -48,4 +48,8 @@ public class OrgUnitSaveReqVO {
     @Schema(description = "是否删除")
     private String isdelete;
 
+    @Schema(description = "dcm前缀名称")
+    private String dcmprefix;
+    @Schema(description = "dcm前缀地址")
+    private String dcmurl;
 }
\ 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 3e5c774f0..c0174ddc3 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
@@ -83,4 +83,10 @@ public class OrgUnitDO {
     @TableField("isdelete")
     private String isdelete;
 
+    @TableField("dcmprefix")
+    private String dcmprefix;
+
+    @TableField("dcmurl")
+    private String dcmurl;
+
 }
\ 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/mysql/org/OrgUnitMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/org/OrgUnitMapper.java
index adc8b4ed0..8abda4dca 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/org/OrgUnitMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/org/OrgUnitMapper.java
@@ -42,4 +42,8 @@ public interface OrgUnitMapper extends BaseMapperX<OrgUnitDO> {
 
 
     List<OrgUnitDO> getOrgUnitdictList();
+
+    default OrgUnitDO selectByKey(String key) {
+        return selectOne(OrgUnitDO::getOrgID, key);
+    }
 }
\ No newline at end of file
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/org/OrgUnitService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/org/OrgUnitService.java
index a58af3de1..1c1ac466c 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/org/OrgUnitService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/org/OrgUnitService.java
@@ -57,4 +57,6 @@ public interface OrgUnitService {
 
     //        获取机构字典
     List<OrgUnitDO> getOrgUnitList();
+
+    OrgUnitDO getonekey(String orgId);
 }
\ No newline at end of file
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/org/OrgUnitServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/org/OrgUnitServiceImpl.java
index bd64ba351..95261492f 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/org/OrgUnitServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/org/OrgUnitServiceImpl.java
@@ -84,5 +84,9 @@ public class OrgUnitServiceImpl implements OrgUnitService {
     public List<OrgUnitDO> getOrgUnitList() {
         return Mapper.getOrgUnitdictList();
     }
-
+    @Override
+    public  OrgUnitDO getonekey(String orgId)
+    {
+        return Mapper.selectByKey(orgId);
+    }
 }
\ No newline at end of file
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 a633896ef..070ca6479 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
@@ -268,8 +268,14 @@ public class ultrasonicController {
     public CommonResult<String> GetDcmList(@RequestParam("orgID") String orgID, @RequestParam("studyInsta") String studyInsta, @RequestParam("regId") String regId) throws JsonProcessingException {
         String strJson = "";
         String json = "";
+        String Dcmprefix="";
         if (!studyInsta.isEmpty() && !orgID.isEmpty()) {
 
+          OrgUnitDO unitDO=   Service.getonekey(orgID);
+           if(!unitDO.getDcmprefix().isEmpty())
+           {
+               Dcmprefix=unitDO.getDcmprefix();
+           }
 //            先查询基本信息  一个患者基本信息就一条
             DicompatientDO dicompatientDO = dicomworklistService.GetPatientIdData(regId, orgID);
 //            获取机构名称
@@ -308,7 +314,7 @@ public class ultrasonicController {
                                 // 处理完第一条数据后，将isFirst标志设置为false
                                 isFirst = false;
                             }
-                            imageid.append("{\"imageid\": \"").append("/dcm/" + imagesDO.getObjectFile().replace("\\", "\\\\")).append("\"},");
+                            imageid.append("{\"imageid\": \"").append("/"+Dcmprefix+"/" + imagesDO.getObjectFile().replace("\\", "\\\\")).append("\"},");
                         }
                     }
                     if (imageid.length() > 0) {
diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml
index dcf991568..029f71691 100644
--- a/yudao-server/src/main/resources/application.yaml
+++ b/yudao-server/src/main/resources/application.yaml
@@ -155,6 +155,7 @@ yudao:
     permit-all_urls:
       - /admin-api/mp/open/** # 微信公众号开放平台，微信回调接口，不需要登录
       - /admin-api/ultrasoniccom/ultrasonic/getdcm
+      - /admin-api/org/org/getone
   websocket:
     enable: true # websocket的开关
     path: /infra/ws # 路径