机构增加云胶片地址字段
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
This commit is contained in:
parent
03b34a897c
commit
331e283589
@ -61,4 +61,8 @@ public class OrgUnitPageReqVO extends PageParam {
|
||||
@Schema(description = "是否启用云胶片")
|
||||
private String EnableCloudDicom;
|
||||
|
||||
@Schema(description = "云胶片地址")
|
||||
private String CloudDicom;
|
||||
|
||||
|
||||
}
|
@ -68,4 +68,7 @@ public class OrgUnitRespVO {
|
||||
private String dcmurl;
|
||||
@Schema(description = "是否启用云胶片")
|
||||
private String EnableCloudDicom;
|
||||
|
||||
@Schema(description = "云胶片地址")
|
||||
private String CloudDicom;
|
||||
}
|
@ -54,4 +54,7 @@ public class OrgUnitSaveReqVO {
|
||||
private String dcmurl;
|
||||
@Schema(description = "是否启用云胶片")
|
||||
private String EnableCloudDicom;
|
||||
@Schema(description = "云胶片地址")
|
||||
private String CloudDicom;
|
||||
|
||||
}
|
@ -92,4 +92,8 @@ public class OrgUnitDO {
|
||||
|
||||
@TableField("EnableCloudDicom")
|
||||
private String EnableCloudDicom;
|
||||
|
||||
@TableField("CloudDicom")
|
||||
private String CloudDicom;
|
||||
|
||||
}
|
@ -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<String, Object> 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);
|
||||
}
|
||||
|
||||
|
@ -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());
|
||||
|
@ -32,5 +32,9 @@ public class dicompatientsDO {
|
||||
@TableField("orgId")
|
||||
private String orgId;
|
||||
|
||||
@TableField("dataSync")
|
||||
private String dataSync;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user