소스 검색

feature: 检验检查列表与详情修改返回字

wuyongyi 2 년 전
부모
커밋
1175b830d5
1개의 변경된 파일5개의 추가작업 그리고 1개의 파일을 삭제
  1. 5 1
      onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/service/impl/IsvReportServiceImpl.java

+ 5 - 1
onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/service/impl/IsvReportServiceImpl.java

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