Ver código fonte

增加部分log

felix 1 ano atrás
pai
commit
0452fce555

+ 1 - 2
FISSDK/FISIMPL/FISIMPL.cs

@@ -22,10 +22,9 @@ using System.Threading;
 using System.Threading.Tasks;
 using Vinno.IUS.Common.Log;
 using Vinno.IUS.Common.Network;
-using Vinno.IUS.Common.Utilities;
 using Vinno.vCloud.Common.FIS.Log;
 using Vinno.vCloud.FIS.CrossPlatform.Common;
-using Vinno.vCloud.FIS.CrossPlatform.Common.Processes;
+using Vinno.vCloud.FIS.CrossPlatform.Common.Helper;
 
 namespace FISIMPL
 {

+ 8 - 7
Vinno.FIS.Sonopost/Features/Dicom/DicomUploadQueue.cs

@@ -23,16 +23,16 @@ namespace Vinno.FIS.Sonopost.Features.Dicom
         protected override bool DoWork(DicomFile dicomFile)
         {
             var patientId = string.Empty;
+            var patientName = string.Empty;
             try
             {
                 patientId = dicomFile.GetPatientId();
+                patientName = dicomFile.GetPatientName();
                 //Single picture, almost use 1 second to finish below steps.
                 var newGuid = Guid.NewGuid().ToString("N").ToUpper();
                 var currentDate = DateTime.Now.Date.ToString("yyyyMMdd");
-                Logger.WriteLineInfo($"Save to original dicom,PatientId:{patientId}");
+                Logger.WriteLineInfo($"Save to original dicom,PatientId:{patientId},PatientName:{patientName}");
                 var dicomFilePath = Save(SonopostConstants.OriginalDicomFolder, dicomFile, newGuid, currentDate);
-
-                var patientName = dicomFile.GetPatientName();
                 var cache = new DicomUploadContext(newGuid, dicomFilePath, patientId, patientName);
                 DicomUploadContextOperator.Instance.Create(cache);
 
@@ -52,7 +52,7 @@ namespace Vinno.FIS.Sonopost.Features.Dicom
             }
             catch (Exception e)
             {
-                Logger.WriteLineInfo($"Upload dicom file error ,PatientId:{patientId},{e}");
+                Logger.WriteLineInfo($"Upload dicom file error ,PatientId:{patientId},PatientName:{patientName},{e}");
             }
             return true;
         }
@@ -60,20 +60,21 @@ namespace Vinno.FIS.Sonopost.Features.Dicom
         protected override bool DoWork(VidInfo vidInfo)
         {
             var patientId = string.Empty;
+            var patientName = string.Empty;
             try
             {
                 patientId = vidInfo.PatientInfo?.PatientId;
+                patientName = vidInfo.PatientInfo?.LastName;
                 //Single picture, almost use 1 second to finish below steps.
                 var newGuid = Guid.NewGuid().ToString("N").ToUpper();
                 var currentDate = DateTime.Now.Date.ToString("yyyyMMdd");
-                Logger.WriteLineInfo($"Save to original vid,PatientId:{patientId}");
+                Logger.WriteLineInfo($"Save to original vid,PatientId:{patientId},PatientName:{patientName}");
                 var vidFilePath = Save(SonopostConstants.OriginalVidFolder, vidInfo.VidFilePath, newGuid, currentDate);
                 if (string.IsNullOrEmpty(vidFilePath))
                 {
                     return false;
                 }
                 vidInfo.VidFilePath = vidFilePath;
-                var patientName = vidInfo.PatientInfo?.LastName;
                 var cache = new DicomUploadContext(newGuid, vidFilePath, patientId, patientName);
                 DicomUploadContextOperator.Instance.Create(cache);
 
@@ -92,7 +93,7 @@ namespace Vinno.FIS.Sonopost.Features.Dicom
             }
             catch (Exception e)
             {
-                Logger.WriteLineInfo($"Upload dicom file error ,PatientId:{patientId},{e}");
+                Logger.WriteLineInfo($"Upload dicom file error ,PatientId:{patientId},PatientName:{patientName},{e}");
             }
             return true;
         }

+ 1 - 1
Vinno.vCloud.FIS.CrossPlatform.Common/Processes/ProcessHelper.cs → Vinno.vCloud.FIS.CrossPlatform.Common/Helper/ProcessHelper.cs

@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 
-namespace Vinno.vCloud.FIS.CrossPlatform.Common.Processes
+namespace Vinno.vCloud.FIS.CrossPlatform.Common.Helper
 {
     public class ProcessHelper
     {

+ 1 - 1
Vinno.vCloud.FIS.CrossPlatform.Common/Processes/ProcessKeepHelper.cs → Vinno.vCloud.FIS.CrossPlatform.Common/Helper/ProcessKeepHelper.cs

@@ -2,7 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Vinno.vCloud.FIS.CrossPlatform.Common.Processes
+namespace Vinno.vCloud.FIS.CrossPlatform.Common.Helper
 {
     public class ProcessKeepHelper
     {

+ 1 - 1
Vinno.vCloud.FIS.CrossPlatform.Windows/Consultation/RTC/RtcRoom.cs

@@ -9,8 +9,8 @@ using Vinno.vCloud.FIS.CrossPlatform.Common;
 using Vinno.vCloud.FIS.CrossPlatform.Common.Consultation;
 using Vinno.vCloud.FIS.CrossPlatform.Common.Consultation.Interface;
 using Vinno.vCloud.FIS.CrossPlatform.Common.Enum;
+using Vinno.vCloud.FIS.CrossPlatform.Common.Helper;
 using Vinno.vCloud.FIS.CrossPlatform.Common.LiveVideo;
-using Vinno.vCloud.FIS.CrossPlatform.Common.Processes;
 
 namespace Vinno.vCloud.FIS.CrossPlatform.Windows.Consultation.RTC
 {

+ 1 - 1
Vinno.vCloud.FIS.CrossPlatform.Windows/LiveVideo/RTC/RtcMultiPusher.cs

@@ -11,9 +11,9 @@ using Vinno.FIS.TRTCClient.Common.Log;
 using Vinno.FIS.TRTCClient.Common.Pipe;
 using Vinno.vCloud.FIS.CrossPlatform.Common;
 using Vinno.vCloud.FIS.CrossPlatform.Common.Enum;
+using Vinno.vCloud.FIS.CrossPlatform.Common.Helper;
 using Vinno.vCloud.FIS.CrossPlatform.Common.LiveVideo;
 using Vinno.vCloud.FIS.CrossPlatform.Common.LiveVideo.Interface;
-using Vinno.vCloud.FIS.CrossPlatform.Common.Processes;
 
 namespace Vinno.vCloud.FIS.CrossPlatform.Windows.LiveVideo.RTC
 {

+ 1 - 1
Vinno.vCloud.FIS.CrossPlatform.Windows/LiveVideo/RTC/RtcMultiPusherV2.cs

@@ -11,9 +11,9 @@ using Vinno.FIS.TRTCClient.Common.Log;
 using Vinno.FIS.TRTCClient.Common.Pipe;
 using Vinno.vCloud.FIS.CrossPlatform.Common;
 using Vinno.vCloud.FIS.CrossPlatform.Common.Enum;
+using Vinno.vCloud.FIS.CrossPlatform.Common.Helper;
 using Vinno.vCloud.FIS.CrossPlatform.Common.LiveVideo;
 using Vinno.vCloud.FIS.CrossPlatform.Common.LiveVideo.Interface;
-using Vinno.vCloud.FIS.CrossPlatform.Common.Processes;
 
 namespace Vinno.vCloud.FIS.CrossPlatform.Windows.LiveVideo.RTC
 {