|
@@ -74,6 +74,7 @@ public class IsvReportServiceImpl implements IsvReportService {
|
|
data.setConfirmDoctorName(detail.getInspectionDoctor());
|
|
data.setConfirmDoctorName(detail.getInspectionDoctor());
|
|
data.setReportDate(detail.getInspectionDate());
|
|
data.setReportDate(detail.getInspectionDate());
|
|
data.setReportImageDesc(detail.getInspectionResult());
|
|
data.setReportImageDesc(detail.getInspectionResult());
|
|
|
|
+ return data;
|
|
|
|
|
|
} else {
|
|
} else {
|
|
com.ywt.gapi.user.GetInspectionReportDetailRequest girdReq = com.ywt.gapi.user.GetInspectionReportDetailRequest.newBuilder()
|
|
com.ywt.gapi.user.GetInspectionReportDetailRequest girdReq = com.ywt.gapi.user.GetInspectionReportDetailRequest.newBuilder()
|
|
@@ -96,6 +97,7 @@ public class IsvReportServiceImpl implements IsvReportService {
|
|
data.setConfirmDoctorName(Checker.getStringValue(detail.getVerifyDocName()));
|
|
data.setConfirmDoctorName(Checker.getStringValue(detail.getVerifyDocName()));
|
|
data.setReportDate(DateUtil.convertTimestampToDateString(detail.getExaminationDate(), "yyyy年MM月dd日 HH:mm:ss"));
|
|
data.setReportDate(DateUtil.convertTimestampToDateString(detail.getExaminationDate(), "yyyy年MM月dd日 HH:mm:ss"));
|
|
data.setReportImageDesc(Checker.getStringValue(detail.getExamination()));
|
|
data.setReportImageDesc(Checker.getStringValue(detail.getExamination()));
|
|
|
|
+ return data;
|
|
}
|
|
}
|
|
throw new AppMessageException("没有此报告详情");
|
|
throw new AppMessageException("没有此报告详情");
|
|
}
|
|
}
|
|
@@ -129,6 +131,7 @@ public class IsvReportServiceImpl implements IsvReportService {
|
|
reportItemList.add(r);
|
|
reportItemList.add(r);
|
|
}
|
|
}
|
|
data.setReportItemList(reportItemList);
|
|
data.setReportItemList(reportItemList);
|
|
|
|
+ return data;
|
|
} else {
|
|
} else {
|
|
com.ywt.gapi.user.GetLaboratoryReportDetailRequest glrdReq = com.ywt.gapi.user.GetLaboratoryReportDetailRequest.newBuilder()
|
|
com.ywt.gapi.user.GetLaboratoryReportDetailRequest glrdReq = com.ywt.gapi.user.GetLaboratoryReportDetailRequest.newBuilder()
|
|
.setInspectionId(request.getRecordId())
|
|
.setInspectionId(request.getRecordId())
|
|
@@ -157,6 +160,7 @@ public class IsvReportServiceImpl implements IsvReportService {
|
|
reportItemList.add(r);
|
|
reportItemList.add(r);
|
|
}
|
|
}
|
|
data.setReportItemList(reportItemList);
|
|
data.setReportItemList(reportItemList);
|
|
|
|
+ return data;
|
|
}
|
|
}
|
|
throw new AppMessageException("没有此报告");
|
|
throw new AppMessageException("没有此报告");
|
|
}
|
|
}
|
|
@@ -264,7 +268,7 @@ public class IsvReportServiceImpl implements IsvReportService {
|
|
QueryReportListResponseData da = new QueryReportListResponseData();
|
|
QueryReportListResponseData da = new QueryReportListResponseData();
|
|
da.setItemName(Checker.getStringValue(report.getInspectionName()));
|
|
da.setItemName(Checker.getStringValue(report.getInspectionName()));
|
|
da.setDepartmentName(Checker.getStringValue(report.getDeptName()));
|
|
da.setDepartmentName(Checker.getStringValue(report.getDeptName()));
|
|
- da.setRecordId(Checker.getStringValue(report.getInpatientId()));
|
|
|
|
|
|
+ da.setRecordId(Checker.getStringValue(report.getInspectionId()));
|
|
da.setUserName(card.getPatientName());
|
|
da.setUserName(card.getPatientName());
|
|
da.setCardNum(card.getCardNum());
|
|
da.setCardNum(card.getCardNum());
|
|
da.setType(Checker.getStringValue(request.getType()));
|
|
da.setType(Checker.getStringValue(request.getType()));
|