|
@@ -163,7 +163,7 @@ namespace ZLPlugin_LisPacs_MR
|
|
|
Log.Info("初始化完成!");
|
|
|
try
|
|
|
{
|
|
|
- clientSend.WhileReceive();
|
|
|
+ clientSend.WhileReceive(waittingdate);
|
|
|
}
|
|
|
catch (Exception e)
|
|
|
{
|
|
@@ -176,7 +176,7 @@ namespace ZLPlugin_LisPacs_MR
|
|
|
if (rex.ResultCode == 2)//有互认
|
|
|
{
|
|
|
|
|
|
- clientSend.WhileReceive();
|
|
|
+ clientSend.WhileReceive(waittingdate);
|
|
|
MessageBox.Show("回传数据至his!");
|
|
|
//SocketClient.Message = null;
|
|
|
return SaveData(waittingdate, lngPatientID, lngClinicID, listlis, listpacs, 1);
|
|
@@ -336,14 +336,15 @@ namespace ZLPlugin_LisPacs_MR
|
|
|
string json = Tools.RecordsetToJson(rd);
|
|
|
Log.Info("save发送json ===" + json);
|
|
|
socketClient.Send(json);
|
|
|
-
|
|
|
+ Log.Info("waittingdate=" + waittingdate);
|
|
|
try
|
|
|
{
|
|
|
- socketClient.WhileReceive();
|
|
|
+ socketClient.WhileReceive(waittingdate);
|
|
|
}
|
|
|
catch (Exception e)
|
|
|
{
|
|
|
Log.Info("接收失败!"+ e.Message);
|
|
|
+ return false;
|
|
|
}
|
|
|
|
|
|
Log.Info("退出循环!");
|
|
@@ -355,7 +356,7 @@ namespace ZLPlugin_LisPacs_MR
|
|
|
rex = JSON.JsonToObject<ResultsEx>(Tools.FormatStr(SocketClient.Message), Encoding.UTF8);
|
|
|
if (rex.ResultCode == 2)//有互认
|
|
|
{
|
|
|
- socketClient.WhileReceive();
|
|
|
+ socketClient.WhileReceive(waittingdate);
|
|
|
MessageBox.Show("回传数据至his!");
|
|
|
SaveData(waittingdate, lngPatientID, lngClinicID, listlis, listpacs, -1);
|
|
|
//保存开单项目
|
|
@@ -387,6 +388,7 @@ namespace ZLPlugin_LisPacs_MR
|
|
|
MessageBox.Show(ex.Message, "中联软件", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
|
|
|
Log.Info(ex.Message);
|
|
|
Log.Info(ex.StackTrace);
|
|
|
+ return false;
|
|
|
}
|
|
|
/* if (socketClient != null)
|
|
|
{
|