UpdateDeviceOrganizationName接口将TerminalName移除

FISSDK/FISIMPL/ConnectionService.cs

@@ -535,7 +535,7 @@ namespace FISIMPL
         /// <param name="organizationName">Organization Name</param>
         /// <param name="createNewOrganization">Is Create New Organization</param>
         /// <returns>True:Update Success/False: Update fail</returns>
-        public bool UpdateDeviceOrganizationName(string terminalName, string organizationName, bool createNewOrganization)
+        public bool UpdateDeviceOrganizationName(string organizationName, bool createNewOrganization)
         {
             try
             {
@@ -549,7 +549,7 @@ namespace FISIMPL
                     Logger.WriteLineError($"Update Terminal Organization Name error: _vcloudTerminal is null");
                     return false;
                 }
-                return _vCloudTerminal.UpdatelTerminalOrganizationName(terminalName, organizationName, createNewOrganization);
+                return _vCloudTerminal.UpdatelTerminalOrganizationName(organizationName, createNewOrganization);
             }
             catch (Exception ex)
             {

FISSDK/FISSDK/Connect/FISConnect.cs

@@ -306,15 +306,14 @@ namespace FISLib.Connect
         /// <summary>
         /// Update Organzation Name according to the device Name
         /// </summary>
-        /// <param name="deviceName">device Name</param>
         /// <param name="organizationName">Organization Name</param>
         /// <param name="createNewOrganization">Is Create New Organization</param>
         /// <returns>True:Update Success/False: Update fail</returns>
-        public bool UpdateDeviceOrganizationName(string deviceName, string organizationName, bool createNewOrganization)
+        public bool UpdateDeviceOrganizationName(string organizationName, bool createNewOrganization)
         {
             try
             {
-                return _connectionService.UpdateDeviceOrganizationName(deviceName, organizationName, createNewOrganization);
+                return _connectionService.UpdateDeviceOrganizationName(organizationName, createNewOrganization);
             }
             catch (Exception ex)
             {

FISSDK/FISSDK/Connect/IConnectionService.cs

@@ -55,11 +55,10 @@ namespace FISLib.Connect
         /// <summary>
         /// Update device Organzation Name
         /// </summary>
-        /// <param name="deviceName">device Name</param>
         /// <param name="organizationName">Organization Name</param>
         /// <param name="createNewOrganization">Is Create New Organization</param>
         /// <returns>True:Update Success/False: Update fail</returns>
-        bool UpdateDeviceOrganizationName(string deviceName, string organizationName, bool createNewOrganization);
+        bool UpdateDeviceOrganizationName(string organizationName, bool createNewOrganization);
 
         /// <summary>
         /// Get Organization Name

FISSDK/FISSDK/Connect/IFISConnect.cs

@@ -56,11 +56,10 @@ namespace FISLib.Connect
         /// <summary>
         /// Update Organzation Name according to the device Name
         /// </summary>
-        /// <param name="deviceName">device Name</param>
         /// <param name="organizationName">Organization Name</param>
         /// <param name="createNewOrganization">Is Create New Organization</param>
         /// <returns>True:Update Success/False: Update fail</returns>
-        bool UpdateDeviceOrganizationName(string deviceName, string organizationName, bool createNewOrganization);
+        bool UpdateDeviceOrganizationName(string organizationName, bool createNewOrganization);
 
         /// <summary>
         /// Get Organization Name

FISSDK/FISSDKDemo/ViewModels/MainWindowViewModel.cs

@@ -1119,16 +1119,7 @@ namespace FISSDKDemo.ViewModels
                 MessageBox.Show("请先完善医院信息，并点击提交！", "Warning", MessageBoxButton.OK, MessageBoxImage.Warning);
                 return;
             }
-            string account;
-            if (!_ultrasoundMachineInfo.IsNonDongleMode)
-            {
-                account = _ultrasoundMachineInfo.DongleId;
-            }
-            else
-            {
-                account = Account;
-            }
-            if (_fisConnect.UpdateDeviceOrganizationName(account, SelectedOrganization, true))
+            if (_fisConnect.UpdateDeviceOrganizationName(SelectedOrganization, true))
             {
                 IsUpdateOrganization = false;
                 ShowOrganizationFill = false;
@@ -1340,7 +1331,7 @@ namespace FISSDKDemo.ViewModels
                 var accountInfo = new FISAccountInfo(Account, Password, true);
                 if (!_ultrasoundMachineInfo.IsNonDongleMode)
                 {
-                    if (_ultrasoundMachineInfo.DongleId?.Length != 8 || !Regex.IsMatch(DongleId, @"^[A-Za-z0-9]{8}"))
+                    if (_ultrasoundMachineInfo.DongleId?.Length < 8 || !Regex.IsMatch(DongleId, @"^[A-Za-z0-9]{8}"))
                     {
                         return;
                     }
@@ -1707,7 +1698,7 @@ namespace FISSDKDemo.ViewModels
 
                     if (MockDongleId)
                     {
-                        if (DongleId?.Length == 8 && Regex.IsMatch(DongleId, @"^[A-Za-z0-9]{8}"))
+                        if (DongleId?.Length >= 8 && Regex.IsMatch(DongleId, @"^[A-Za-z0-9]{8}"))
                         {
                             _ultrasoundMachineInfo.DongleId = DongleId;
                             FIS.UpdateUltrasoundMachineInfo(_ultrasoundMachineInfo);

Vinno.vCloud.Common.FIS/IvCloudTerminal.cs

@@ -69,11 +69,10 @@ namespace Vinno.vCloud.Common.FIS
         /// <summary>
         /// update terminal account organization name to server
         /// </summary>
-        /// <param name="terminalName"></param>
         /// <param name="organizationName"></param>
         /// <param name="createNewOrganization"></param>
         /// <returns> update success or yfailed</returns>
-        bool UpdatelTerminalOrganizationName(string terminalName, string organizationName, bool createNewOrganization);
+        bool UpdatelTerminalOrganizationName(string organizationName, bool createNewOrganization);
 
         /// <summary>
         ///  get terminal Organization name after this must login successed
@@ -95,4 +94,4 @@ namespace Vinno.vCloud.Common.FIS
         /// <param name="enabledFeatureTypes">The enabled feature types.</param>
         void UpdateFeatures(IEnumerable<TerminalFeatureType> enabledFeatureTypes);
     }
-}
+}

Vinno.vCloud.Common.FIS/vCloudTerminal.cs

@@ -304,21 +304,23 @@ namespace Vinno.vCloud.Common.FIS
             return Status == TerminalStatus.OrganizationMissing;
         }
 
-        public bool UpdatelTerminalOrganizationName(string terminalName, string organizationName, bool createNewOrganization)
+        public bool UpdatelTerminalOrganizationName(string organizationName, bool createNewOrganization)
         {
             using (var request = MessagePool.GetMessage<UpdateTerminalOrganizationNameRequest>())
             {
-                request.TerminalName = terminalName;
+                request.TerminalName = _deviceName;
                 request.OrganizationName = organizationName;
                 request.IsCreateNewOrganization = createNewOrganization;
                 var result = _leaf?.Send(request);
                 var updateTerminalResult = ResultMessage.Convert(result);
                 if (updateTerminalResult == CCR.OK)
                 {
+                    Logger.WriteLineInfo($"vCloudTerminal UpdatelTerminalOrganizationName Success,TerminalName:{_deviceName},OrganizationName:{organizationName},CreateNewOrganization:{createNewOrganization}");
                     return true;
                 }
                 else
                 {
+                    Logger.WriteLineError($"vCloudTerminal UpdatelTerminalOrganizationName Failed,TerminalName:{_deviceName},OrganizationName:{organizationName},CreateNewOrganization:{createNewOrganization}");
                     return false; //update organization name fail
                 }
             }