|
|
|
@ -80,7 +80,7 @@ public class AnalysisService {
|
|
|
|
|
//如果是pet-ct报告 那么还要查出住院次数
|
|
|
|
|
UltrasonicReport ultrasonicReport = JSON.parseObject(messageDto.getObject().toString(), UltrasonicReport.class);
|
|
|
|
|
String authorReportTime = ultrasonicReport.getAuthorReportTime();
|
|
|
|
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
|
|
|
|
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
|
|
|
|
|
Date date = simpleDateFormat.parse(authorReportTime, new ParsePosition(0));
|
|
|
|
|
String visitId = archiveMasterRepository.findVisitIdByTimeAndInpNo(date, messageDto.getInpNo());
|
|
|
|
|
messageDto.setVisitId(visitId);
|
|
|
|
@ -88,7 +88,6 @@ public class AnalysisService {
|
|
|
|
|
|
|
|
|
|
archiveMasterId = messageService.getArchiveMasterId(messageDto.getInpNo(), messageDto.getVisitId(),messageDto.getPatientId());
|
|
|
|
|
if(archiveMasterId != null){
|
|
|
|
|
|
|
|
|
|
if (Objects.equals(messageDto.getEntity(), ExamApply.class.getName())) { // 申请单
|
|
|
|
|
ExamApply examApply = JSON.parseObject(messageDto.getObject().toString(), ExamApply.class);
|
|
|
|
|
textContentTemp = changeApply(examApply,parameter);
|
|
|
|
|