denny

ReportService/Service/ReportService.RemoteUltrasound.cs

@@ -157,10 +157,26 @@ namespace ReportService.Service
                     Code = userCode
                 });
                 //当前用户的签名
-                var doctorSign = userInfo.Signature;
-                var examDoctor = userInfo.Signature;//userInfo.UserName;//todo
+                var doctorSign = userInfo?.Signature ?? string.Empty;
+                var examDoctorInfo = await _vitalUserDBService.GetUserDetailAsync(new WingInterfaceLibrary.Request.DBVitalRequest.GetUserDBRequest
+                {
+                    Code = examRecord.ExamDoctor
+                });
+                var examDoctor = examDoctorInfo?.Signature ?? string.Empty;
 
                 var orgName = examRecord?.OrganizationName ?? string.Empty;
+                if (string.IsNullOrEmpty(orgName) && !string.IsNullOrEmpty(examRecord?.OrganizationCode))
+                {
+                    var orgDBReq = new WingInterfaceLibrary.Request.DBVitalRequest.GetOrganizationDBRequest()
+                    {
+                        Code = examRecord.OrganizationCode
+                    };
+                    var orgInfo = await _vitalOrganizationDBService.GetOrganizationDetailAsync(orgDBReq);
+                    if (!string.IsNullOrEmpty(orgInfo?.OrganizationName))
+                    {
+                        orgName = orgInfo.OrganizationName;
+                    }
+                }
                 var examTime = UTCToBeijing(examRecord.ExamTime).ToString("yyyy-MM-dd HH:mm:ss.fff");
 
                 var patientName = examRecord?.PatientName ?? string.Empty;