机构增加dcm访问前缀和地址 以及查询方法
Some checks are pending
Java CI with Maven / build (11) (push) Waiting to run
Java CI with Maven / build (17) (push) Waiting to run
Java CI with Maven / build (8) (push) Waiting to run
yudao-ui-admin CI / build (14.x) (push) Waiting to run
yudao-ui-admin CI / build (16.x) (push) Waiting to run

This commit is contained in:
lxd 2024-09-12 12:20:05 +08:00
parent 1f3b8f09a5
commit 81f3d9f2ec
10 changed files with 45 additions and 2 deletions

View File

@ -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 = "获得机构管理字典")

View File

@ -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;
}

View File

@ -61,4 +61,9 @@ public class OrgUnitRespVO {
@Schema(description = "是否删除")
private String isdelete;
@Schema(description = "dcm前缀名称")
private String dcmprefix;
@Schema(description = "dcm前缀地址")
private String dcmurl;
}

View File

@ -48,4 +48,8 @@ public class OrgUnitSaveReqVO {
@Schema(description = "是否删除")
private String isdelete;
@Schema(description = "dcm前缀名称")
private String dcmprefix;
@Schema(description = "dcm前缀地址")
private String dcmurl;
}

View File

@ -83,4 +83,10 @@ public class OrgUnitDO {
@TableField("isdelete")
private String isdelete;
@TableField("dcmprefix")
private String dcmprefix;
@TableField("dcmurl")
private String dcmurl;
}

View File

@ -42,4 +42,8 @@ public interface OrgUnitMapper extends BaseMapperX<OrgUnitDO> {
List<OrgUnitDO> getOrgUnitdictList();
default OrgUnitDO selectByKey(String key) {
return selectOne(OrgUnitDO::getOrgID, key);
}
}

View File

@ -57,4 +57,6 @@ public interface OrgUnitService {
// 获取机构字典
List<OrgUnitDO> getOrgUnitList();
OrgUnitDO getonekey(String orgId);
}

View File

@ -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);
}
}

View File

@ -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) {

View File

@ -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 # 路径