lxd/FlowPacs
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' of http://114.55.171.231:3000/lxd/FlowPacs

Browse Source 
# Conflicts:
#	yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java
This commit is contained in:
lxd 2024-10-25 21:59:20 +08:00
commit c4e49c9265
2 changed files with 128 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/mysql/patientexamlist/PatientexamlistMapper.java
View File

@ -52,6 +52,7 @@ public interface PatientexamlistMapper extends BaseMapperX<PatientexamlistDO> {
.eqIfPresent(PatientexamlistDO::getDeviceType, reqVO.getDeviceType()) .eqIfPresent(PatientexamlistDO::getDeviceType, reqVO.getDeviceType())
.likeIfPresent(PatientexamlistDO::getPName, reqVO.getPname()) .likeIfPresent(PatientexamlistDO::getPName, reqVO.getPname())
.isNotNull(PatientexamlistDO::getDiagDate) .isNotNull(PatientexamlistDO::getDiagDate)
.eq(PatientexamlistDO::getReportstatus, "已审核")
.orderByDesc(PatientexamlistDO::getExamDate)); .orderByDesc(PatientexamlistDO::getExamDate));
} }
@ -66,8 +67,8 @@ public interface PatientexamlistMapper extends BaseMapperX<PatientexamlistDO> {
.eqIfPresent(PatientexamlistDO::getReportstatus, reqVO.getReportstatus()) .eqIfPresent(PatientexamlistDO::getReportstatus, reqVO.getReportstatus())
.betweenIfPresent(PatientexamlistDO::getUploadDate, reqVO.getUploadDate()) .betweenIfPresent(PatientexamlistDO::getUploadDate, reqVO.getUploadDate())
.likeIfPresent(PatientexamlistDO::getOrgName, reqVO.getOrgName()) .likeIfPresent(PatientexamlistDO::getOrgName, reqVO.getOrgName())
// .eqIfPresent(PatientexamlistDO::getOrgId, reqVO.getOrgId()) // .eqIfPresent(PatientexamlistDO::getOrgId, reqVO.getOrgId())
.likeIfPresent(PatientexamlistDO::getDeviceType,reqVO.getDeviceType()) .likeIfPresent(PatientexamlistDO::getDeviceType, reqVO.getDeviceType())
// .eqIfPresent(PatientexamlistDO::getHighLevelOrgId, reqVO.getHighLevelOrgId()) // .eqIfPresent(PatientexamlistDO::getHighLevelOrgId, reqVO.getHighLevelOrgId())
.betweenIfPresent(PatientexamlistDO::getCreateDate, reqVO.getCreateDate()) .betweenIfPresent(PatientexamlistDO::getCreateDate, reqVO.getCreateDate())
.eqIfPresent(PatientexamlistDO::getExamDescription, reqVO.getExamDescription()) .eqIfPresent(PatientexamlistDO::getExamDescription, reqVO.getExamDescription())
@ -76,7 +77,7 @@ public interface PatientexamlistMapper extends BaseMapperX<PatientexamlistDO> {
.eqIfPresent(PatientexamlistDO::getDiagDoctor, reqVO.getDiagDoctor()) .eqIfPresent(PatientexamlistDO::getDiagDoctor, reqVO.getDiagDoctor())
.betweenIfPresent(PatientexamlistDO::getCreateTime, reqVO.getCreateTime()) .betweenIfPresent(PatientexamlistDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(PatientexamlistDO::getOrgId, reqVO.getHighLevelOrgId()) .eqIfPresent(PatientexamlistDO::getOrgId, reqVO.getHighLevelOrgId())
.eqIfPresent(PatientexamlistDO::getIsFavourite,reqVO.getIsFavourite()) .eqIfPresent(PatientexamlistDO::getIsFavourite, reqVO.getIsFavourite())
.eq(PatientexamlistDO::getOrgId, reqVO.getOrgId()) // 始终添加orgId条件 .eq(PatientexamlistDO::getOrgId, reqVO.getOrgId()) // 始终添加orgId条件
.or(wrapper -> { .or(wrapper -> {
if (reqVO.getHighLevelOrgId() != null) { if (reqVO.getHighLevelOrgId() != null) {

263
yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java
View File

@ -153,14 +153,14 @@ public class ultrasonicController {
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
String json = mapper.writeValueAsString(filteredList); String json = mapper.writeValueAsString(filteredList);
List<Tree> tree = convertJsonToTree(json,isprivate); List<Tree> tree = convertJsonToTree(json, isprivate);
return success(tree); return success(tree);
} }
//返回树结构 //返回树结构
private List<Tree> convertJsonToTree(String jsonData,String isprivate) { private List<Tree> convertJsonToTree(String jsonData, String isprivate) {
try { try {
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
List<Map<String, Object>> dataList = objectMapper.readValue(jsonData, List.class); List<Map<String, Object>> dataList = objectMapper.readValue(jsonData, List.class);
@ -180,7 +180,7 @@ public class ultrasonicController {
tree.tempname = (String) data.get("templateName"); tree.tempname = (String) data.get("templateName");
tree.examDescription = (String) data.get("examDescription"); tree.examDescription = (String) data.get("examDescription");
tree.diagResults = (String) data.get("diagResults"); tree.diagResults = (String) data.get("diagResults");
tree.dataType=(String) data.get("dataType"); tree.dataType = (String) data.get("dataType");
treeMap.put(id, tree); treeMap.put(id, tree);
if (privateId != null && !privateId.isEmpty()) { if (privateId != null && !privateId.isEmpty()) {
@ -189,15 +189,12 @@ public class ultrasonicController {
publicTrees.add(tree); // 添加到公共节点列表 publicTrees.add(tree); // 添加到公共节点列表
} }
} }
if (isprivate.equals("1")) if (isprivate.equals("1")) {
{
// 构建公共树 // 构建公共树
buildTree(privateTrees, "0", treeMap); buildTree(privateTrees, "0", treeMap);
// 将私有节点添加到结果列表 // 将私有节点添加到结果列表
return new ArrayList<>(privateTrees); // return new ArrayList<>(privateTrees); //
} } else {
else
{
// 构建公共树 // 构建公共树
buildTree(publicTrees, "0", treeMap); buildTree(publicTrees, "0", treeMap);
// 将私有节点添加到结果列表 // 将私有节点添加到结果列表
@ -205,7 +202,6 @@ public class ultrasonicController {
} }
} catch (JsonProcessingException e) { } catch (JsonProcessingException e) {
return new ArrayList<>(); return new ArrayList<>();
} }
@ -329,14 +325,13 @@ public class ultrasonicController {
public CommonResult<String> GetDcmList(@RequestParam("orgID") String orgID, @RequestParam("studyInsta") String studyInsta, @RequestParam("regId") String regId) throws JsonProcessingException { public CommonResult<String> GetDcmList(@RequestParam("orgID") String orgID, @RequestParam("studyInsta") String studyInsta, @RequestParam("regId") String regId) throws JsonProcessingException {
String strJson = ""; String strJson = "";
String json = ""; String json = "";
String Dcmprefix=""; String Dcmprefix = "";
if (!studyInsta.isEmpty() && !orgID.isEmpty()) { if (!studyInsta.isEmpty() && !orgID.isEmpty()) {
OrgUnitDO unitDO= Service.getonekey(orgID); OrgUnitDO unitDO = Service.getonekey(orgID);
if(!unitDO.getDcmprefix().isEmpty()) if (!unitDO.getDcmprefix().isEmpty()) {
{ Dcmprefix = unitDO.getDcmprefix();
Dcmprefix=unitDO.getDcmprefix(); }
}
// 先查询基本信息 一个患者基本信息就一条 // 先查询基本信息 一个患者基本信息就一条
DicompatientDO dicompatientDO = dicomworklistService.GetPatientIdData(regId, orgID); DicompatientDO dicompatientDO = dicomworklistService.GetPatientIdData(regId, orgID);
// 获取机构名称 // 获取机构名称
@ -375,7 +370,7 @@ public class ultrasonicController {
// 处理完第一条数据后，将isFirst标志设置为false // 处理完第一条数据后，将isFirst标志设置为false
isFirst = false; isFirst = false;
} }
imageid.append("{\"imageid\": \"").append("/"+Dcmprefix+"/" + imagesDO.getObjectFile().replace("\\", "\\\\")).append("\"},"); imageid.append("{\"imageid\": \"").append("/" + Dcmprefix + "/" + imagesDO.getObjectFile().replace("\\", "\\\\")).append("\"},");
} }
} }
if (imageid.length() > 0) { if (imageid.length() > 0) {
@ -415,7 +410,7 @@ public class ultrasonicController {
LocalDateTime dateTime = LocalDateTime.parse(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), LocalDateTime dateTime = LocalDateTime.parse(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")),
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
//当前登陆用户 //当前登陆用户
// AdminUserDO user = userService.getUser(getLoginUserId()); // AdminUserDO user = userService.getUser(getLoginUserId());
// 生成随机 UUID // 生成随机 UUID
UUID randomUUID = UUID.randomUUID(); UUID randomUUID = UUID.randomUUID();
medicalimgDO medicalimgDO = new medicalimgDO(); medicalimgDO medicalimgDO = new medicalimgDO();
@ -430,107 +425,108 @@ public class ultrasonicController {
return medicalimgService.insimage(medicalimgDO); return medicalimgService.insimage(medicalimgDO);
} }
@PostMapping("/ftpimage") @PostMapping("/ftpimage")
@Operation(summary = "获取图片上传ftp") @Operation(summary = "获取图片上传ftp")
public void FtpImage(@RequestBody insimagescreenshotVO insimagescreenshotVO) public void FtpImage(@RequestBody insimagescreenshotVO insimagescreenshotVO) {
{ String base64String = insimagescreenshotVO.getImagebase();
String base64String = insimagescreenshotVO.getImagebase(); String ftpServer = "192.168.0.110"; //114.55.171.231
String ftpServer = "192.168.0.110";//114.55.171.231 int ftpPort = 21; // FTP端口，默认为21
int ftpPort = 21; // FTP端口，默认为21 String ftpUser = "pacs";
String ftpUser = "pacs"; String ftpPassword = "pacs123";
String ftpPassword = "pacs123"; String uploadPath = "/";
String uploadPath = "/"; String fileName = System.currentTimeMillis() + ".jpg";
String fileName = System.currentTimeMillis()+".jpg";
FTPClient ftpClient = new FTPClient(); FTPClient ftpClient = new FTPClient();
ftpClient.enterLocalPassiveMode(); ftpClient.enterLocalPassiveMode();
try { try {
// 连接FTP服务器 // 连接FTP服务器
ftpClient.connect(ftpServer, ftpPort); ftpClient.connect(ftpServer, ftpPort);
ftpClient.login(ftpUser, ftpPassword); ftpClient.login(ftpUser, ftpPassword);
// 设置文件传输类型为二进制 // 设置文件传输类型为二进制
ftpClient.setFileType(FTP.BINARY_FILE_TYPE); ftpClient.setFileType(FTP.BINARY_FILE_TYPE);
// 解码Base64字符串 // 解码Base64字符串
String base64Image = base64String.split(",")[1]; // 去掉数据URL的头部 String base64Image = base64String.split(",")[1]; // 去掉数据URL的头部
// 解码Base64字符串 // 解码Base64字符串
byte[] decodedBytes = Base64.getDecoder().decode(base64Image); byte[] decodedBytes = Base64.getDecoder().decode(base64Image);
// 创建输入流 // 创建输入流
InputStream inputStream = new ByteArrayInputStream(decodedBytes); InputStream inputStream = new ByteArrayInputStream(decodedBytes);
// 上传文件 // 上传文件
boolean result = ftpClient.storeFile(uploadPath + "/" + fileName, inputStream); boolean result = ftpClient.storeFile(uploadPath + "/" + fileName, inputStream);
if (result) { if (result) {
//上传成功 //上传成功
//当前时间 //当前时间
LocalDateTime dateTime = LocalDateTime.parse(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), LocalDateTime dateTime = LocalDateTime.parse(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")),
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
AdminUserDO user = userService.getUser(getLoginUserId()); AdminUserDO user = userService.getUser(getLoginUserId());
// 生成随机 UUID // 生成随机 UUID
UUID randomUUID = UUID.randomUUID(); UUID randomUUID = UUID.randomUUID();
medicalimgDO medicalimgDO = new medicalimgDO(); medicalimgDO medicalimgDO = new medicalimgDO();
medicalimgDO.setId(randomUUID.toString()); medicalimgDO.setId(randomUUID.toString());
medicalimgDO.setImgUrl("/video/"+fileName); medicalimgDO.setImgUrl("http://192.168.0.110:48082/" + fileName);
medicalimgDO.setCreatePerson(""); medicalimgDO.setCreatePerson("");
medicalimgDO.setCreateDate(dateTime); medicalimgDO.setCreateDate(dateTime);
medicalimgDO.setRegId(insimagescreenshotVO.getID()); medicalimgDO.setRegId(insimagescreenshotVO.getID());
medicalimgDO.setOrgId(user.getOrgId()); if (insimagescreenshotVO.getOrgId() != null && !insimagescreenshotVO.getOrgId().trim().equals(""))
medicalimgDO.setSelected("0"); medicalimgDO.setOrgId(insimagescreenshotVO.getOrgId().trim());
if (insimagescreenshotVO.getImgType() == null || insimagescreenshotVO.getImgType().trim().equals("")) else if (user != null && user.getOrgId() != null)
medicalimgDO.setImgType("1"); medicalimgDO.setOrgId(user.getOrgId());
else medicalimgDO.setSelected("0");
medicalimgDO.setImgType(insimagescreenshotVO.getImgType().trim()); if (insimagescreenshotVO.getImgType() == null || insimagescreenshotVO.getImgType().trim().equals(""))
int count=medicalimgService.insimage(medicalimgDO); medicalimgDO.setImgType("1");
} else { else
System.out.println("文件上传失败"); medicalimgDO.setImgType(insimagescreenshotVO.getImgType().trim());
} int count = medicalimgService.insimage(medicalimgDO);
} else {
System.out.println("文件上传失败");
}
// 断开连接 // 断开连接
ftpClient.logout(); ftpClient.logout();
ftpClient.disconnect(); ftpClient.disconnect();
} catch (SocketException e) { } catch (SocketException e) {
System.err.println("无法连接到FTP服务器: " + e.getMessage()); System.err.println("无法连接到FTP服务器: " + e.getMessage());
} catch (IOException e) { } catch (IOException e) {
System.err.println("IO异常: " + e.getMessage()); System.err.println("IO异常: " + e.getMessage());
} finally { } finally {
try { try {
if (ftpClient.isConnected()) { if (ftpClient.isConnected()) {
ftpClient.disconnect(); ftpClient.disconnect();
} }
} catch (IOException ignored) { } catch (IOException ignored) {
} }
} }
} }
@PostMapping("/InsImageInfo") @PostMapping("/InsImageInfo")
@Operation(summary = "影像信息") @Operation(summary = "影像信息")
public CommonResult<String> InsImageInfo(@RequestBody List<PatientInfoVO> patientInfoVOS) throws ParseException { public CommonResult<String> InsImageInfo(@RequestBody List<PatientInfoVO> patientInfoVOS) throws ParseException {
try { try {
if(!patientInfoVOS.isEmpty()) if (!patientInfoVOS.isEmpty()) {
{ List<dicompatientsDO> dicompatientsDOList = new ArrayList<>();
List<dicompatientsDO> dicompatientsDOList=new ArrayList<>(); List<dicomstudiesDO> dicomstudiesDOList = new ArrayList<>();
List<dicomstudiesDO> dicomstudiesDOList=new ArrayList<>(); List<dicomseriesDO> dicomseriesDOList = new ArrayList<>();
List<dicomseriesDO> dicomseriesDOList=new ArrayList<>(); List<dicomimagesDO> dicomimagesDOList = new ArrayList<>();
List<dicomimagesDO> dicomimagesDOList=new ArrayList<>(); for (PatientInfoVO patientInfo : patientInfoVOS) {
for (PatientInfoVO patientInfo : patientInfoVOS)
{
//获取基础信息 //获取基础信息
String PatientID=patientInfo.getPatientID(); String PatientID = patientInfo.getPatientID();
String PatientNam=patientInfo.getPatientNam(); String PatientNam = patientInfo.getPatientNam();
String PatientBir=DateUtils.formatedcsrq(Long.parseLong(patientInfo.getPatientBir())) ; String PatientBir = DateUtils.formatedcsrq(Long.parseLong(patientInfo.getPatientBir()));
String PatientSex=patientInfo.getPatientSex(); String PatientSex = patientInfo.getPatientSex();
String AccessTime= DateUtils.timestamp(); String AccessTime = DateUtils.timestamp();
String orgId=patientInfo.getOrgId(); String orgId = patientInfo.getOrgId();
String orgname=patientInfo.getOrgName(); String orgname = patientInfo.getOrgName();
String StudyDate=patientInfo.getStudyDate(); String StudyDate = patientInfo.getStudyDate();
List<StudyVO> studyVOS= patientInfo.getStudies(); List<StudyVO> studyVOS = patientInfo.getStudies();
//填充dicompatients信息 //填充dicompatients信息
dicompatientsDO dicompatientsDO=new dicompatientsDO(); dicompatientsDO dicompatientsDO = new dicompatientsDO();
dicompatientsDO.setPatientID(PatientID); dicompatientsDO.setPatientID(PatientID);
dicompatientsDO.setPatientNam(PatientNam); dicompatientsDO.setPatientNam(PatientNam);
dicompatientsDO.setPatientBir(PatientBir); dicompatientsDO.setPatientBir(PatientBir);
@ -540,16 +536,14 @@ public class ultrasonicController {
dicompatientsDO.setDataSync("1"); dicompatientsDO.setDataSync("1");
dicompatientsDOList.add(dicompatientsDO); dicompatientsDOList.add(dicompatientsDO);
if(!studyVOS.isEmpty()) if (!studyVOS.isEmpty()) {
{ for (StudyVO studyVO : studyVOS) {
for (StudyVO studyVO :studyVOS)
{
// study表的主键 // study表的主键
// String StudyInsta= UUID.randomUUID().toString(); // String StudyInsta= UUID.randomUUID().toString();
String StudyInsta= studyVO.getStudyID(); String StudyInsta = studyVO.getStudyID();
dicomstudiesDO dicomstudiesDO=new dicomstudiesDO(); dicomstudiesDO dicomstudiesDO = new dicomstudiesDO();
dicomstudiesDO.setStudyInsta(StudyInsta); dicomstudiesDO.setStudyInsta(StudyInsta);
dicomstudiesDO.setStudyDate(StudyDate.split(" ")[0].replace("-","")); dicomstudiesDO.setStudyDate(StudyDate.split(" ")[0].replace("-", ""));
dicomstudiesDO.setStudyTime(DateUtils.formattedTime(StudyDate.split(" ")[1])); dicomstudiesDO.setStudyTime(DateUtils.formattedTime(StudyDate.split(" ")[1]));
dicomstudiesDO.setStudyID(studyVO.getStudyID()); dicomstudiesDO.setStudyID(studyVO.getStudyID());
dicomstudiesDO.setStudyDescr(studyVO.getStudyDescr()); dicomstudiesDO.setStudyDescr(studyVO.getStudyDescr());
@ -561,20 +555,18 @@ public class ultrasonicController {
dicomstudiesDO.setAccessTime(AccessTime); dicomstudiesDO.setAccessTime(AccessTime);
dicomstudiesDO.setOrgId(orgId); dicomstudiesDO.setOrgId(orgId);
dicomstudiesDOList.add(dicomstudiesDO); dicomstudiesDOList.add(dicomstudiesDO);
List<SeriesVO> series= studyVO.getSeries(); List<SeriesVO> series = studyVO.getSeries();
if (!series.isEmpty()) if (!series.isEmpty()) {
{
for (SeriesVO seriesVO:series) for (SeriesVO seriesVO : series) {
{
//service表主键 //service表主键
String SeriesInst=UUID.randomUUID().toString(); String SeriesInst = UUID.randomUUID().toString();
// String SeriesInst= seriesVO.getSeriesNumb(); // String SeriesInst= seriesVO.getSeriesNumb();
dicomseriesDO dicomseriesDO=new dicomseriesDO(); dicomseriesDO dicomseriesDO = new dicomseriesDO();
dicomseriesDO.setSeriesInst(SeriesInst); dicomseriesDO.setSeriesInst(SeriesInst);
dicomseriesDO.setSeriesNumb(seriesVO.getSeriesNumb()); dicomseriesDO.setSeriesNumb(seriesVO.getSeriesNumb());
dicomseriesDO.setSeriesDate(StudyDate.split(" ")[0].replace("-","")); dicomseriesDO.setSeriesDate(StudyDate.split(" ")[0].replace("-", ""));
dicomseriesDO.setSeriesTime(DateUtils.formattedTime(StudyDate.split(" ")[1])); dicomseriesDO.setSeriesTime(DateUtils.formattedTime(StudyDate.split(" ")[1]));
dicomseriesDO.setSeriesDesc(seriesVO.getSeriesDesc()); dicomseriesDO.setSeriesDesc(seriesVO.getSeriesDesc());
dicomseriesDO.setModality(seriesVO.getModality()); dicomseriesDO.setModality(seriesVO.getModality());
@ -586,19 +578,17 @@ public class ultrasonicController {
dicomseriesDO.setAccessTime(AccessTime); dicomseriesDO.setAccessTime(AccessTime);
dicomseriesDO.setOrgId(orgId); dicomseriesDO.setOrgId(orgId);
dicomseriesDOList.add(dicomseriesDO); dicomseriesDOList.add(dicomseriesDO);
List<ImageVO> imageVOS= seriesVO.getImage() ; List<ImageVO> imageVOS = seriesVO.getImage();
if (!imageVOS.isEmpty()) if (!imageVOS.isEmpty()) {
{ for (ImageVO imageVO : imageVOS) {
for (ImageVO imageVO:imageVOS)
{
//image主键 //image主键
String SOPInstanc=UUID.randomUUID().toString(); String SOPInstanc = UUID.randomUUID().toString();
dicomimagesDO dicomimagesDO=new dicomimagesDO(); dicomimagesDO dicomimagesDO = new dicomimagesDO();
dicomimagesDO.setSOPInstanc(SOPInstanc); dicomimagesDO.setSOPInstanc(SOPInstanc);
dicomimagesDO.setImageNumbe(imageVO.getImageNumber()); dicomimagesDO.setImageNumbe(imageVO.getImageNumber());
dicomimagesDO.setImageDate(StudyDate.split(" ")[0].replace("-","")); dicomimagesDO.setImageDate(StudyDate.split(" ")[0].replace("-", ""));
dicomimagesDO.setImageTime(DateUtils.formattedTime(StudyDate.split(" ")[1])); dicomimagesDO.setImageTime(DateUtils.formattedTime(StudyDate.split(" ")[1]));
dicomimagesDO.setAcqDate(StudyDate.split(" ")[0].replace("-","")); dicomimagesDO.setAcqDate(StudyDate.split(" ")[0].replace("-", ""));
dicomimagesDO.setAcqTime(DateUtils.formattedTime(StudyDate.split(" ")[1])); dicomimagesDO.setAcqTime(DateUtils.formattedTime(StudyDate.split(" ")[1]));
dicomimagesDO.setSeriesInst(SeriesInst); dicomimagesDO.setSeriesInst(SeriesInst);
dicomimagesDO.setAccessTime(AccessTime); dicomimagesDO.setAccessTime(AccessTime);
@ -618,23 +608,18 @@ public class ultrasonicController {
} }
} }
if (!dicompatientsDOList.isEmpty()&&!dicomstudiesDOList.isEmpty()&&!dicomseriesDOList.isEmpty()&&!dicomimagesDOList.isEmpty()) if (!dicompatientsDOList.isEmpty() && !dicomstudiesDOList.isEmpty() && !dicomseriesDOList.isEmpty() && !dicomimagesDOList.isEmpty()) {
{ dicompatientsService.insertAll(dicompatientsDOList, dicomstudiesDOList, dicomseriesDOList, dicomimagesDOList);
dicompatientsService.insertAll(dicompatientsDOList,dicomstudiesDOList,dicomseriesDOList,dicomimagesDOList);
} }
} else {
return success("参数为空");
} }
else } catch (Exception e) {
{ return success(e.getMessage());
return success("参数为空");
}
}
catch (Exception e)
{
return success(e.getMessage());
} }
return success("插入成功"); return success("插入成功");
} }