|
@@ -110,6 +110,11 @@ namespace ZLPlugin_MR
|
|
|
List<Codes> listlis;
|
|
|
List<Codes> listpacs;
|
|
|
LisPacs_MR_Bll.GetTreatmentId(ss_list, out code, out listlis, out listpacs);
|
|
|
+
|
|
|
+ string xgid = "";
|
|
|
+ string yzid = "";
|
|
|
+ string zlxmid = "";
|
|
|
+ string totalPrice = "0";
|
|
|
int hrType = 0;
|
|
|
if (listlis.Count == 0 && listpacs.Count == 0)
|
|
|
{
|
|
@@ -119,15 +124,19 @@ namespace ZLPlugin_MR
|
|
|
else if (listlis.Count > 0 && listpacs.Count == 0)//只有检验
|
|
|
{
|
|
|
hrType = 1;
|
|
|
+ yzid = listlis[0].yzid;
|
|
|
+ xgid = listlis[0].id;
|
|
|
+ zlxmid = listlis[0].zlxmid;
|
|
|
}
|
|
|
else if (listpacs.Count > 0 && listlis.Count == 0)//只有检查
|
|
|
{
|
|
|
hrType = 2;
|
|
|
+ yzid = listpacs[0].yzid;
|
|
|
+ xgid = listpacs[0].id;
|
|
|
+ zlxmid = listpacs[0].zlxmid;
|
|
|
}
|
|
|
- string yzid = listlis[0].yzid;
|
|
|
- string xgid = listlis[0].id;
|
|
|
|
|
|
- string totalPrice= LisPacs_MR_Bll.GetMZTotalPrice(lngPatientID, yzid);
|
|
|
+ totalPrice= LisPacs_MR_Bll.GetMZTotalPrice(lngPatientID, yzid);
|
|
|
Recordset rd = LisPacs_MR_Bll.GetMZPostJson(lngClinicID, code, hrType, totalPrice, xgid);
|
|
|
string json = Tools.RecordsetToJson(rd);
|
|
|
Log.Info(json);
|
|
@@ -246,31 +255,49 @@ namespace ZLPlugin_MR
|
|
|
LisPacs_MR_Bll.GetTreatmentId(ss_list, out code, out listlis, out listpacs);
|
|
|
Log.Info("code==" + code);
|
|
|
Recordset rd = new Recordset();
|
|
|
+
|
|
|
+ string xgid = "";
|
|
|
+ string yzid = "";
|
|
|
+ string zlxmid = "";
|
|
|
+ string totalPrice = "0";
|
|
|
int hrType = 0;
|
|
|
if (listlis.Count == 0 && listpacs.Count == 0)
|
|
|
{
|
|
|
+ Log.Info("listlis.Count == 0 && listpacs.Count == 0");
|
|
|
return true;
|
|
|
}
|
|
|
else if (listlis.Count > 0 && listpacs.Count == 0)//只有检验
|
|
|
{
|
|
|
hrType = 1;
|
|
|
+ yzid = listlis[0].yzid;
|
|
|
+ xgid = listlis[0].id;
|
|
|
+ zlxmid = listlis[0].zlxmid;
|
|
|
}
|
|
|
else if (listpacs.Count > 0 && listlis.Count == 0)//只有检查
|
|
|
{
|
|
|
hrType = 2;
|
|
|
+ yzid = listpacs[0].yzid;
|
|
|
+ xgid = listpacs[0].id;
|
|
|
+ zlxmid = listpacs[0].zlxmid;
|
|
|
}
|
|
|
|
|
|
- string yzid = listlis[0].yzid;
|
|
|
- string xgid = listlis[0].id;
|
|
|
if (lngModual == 1253)//住院
|
|
|
{
|
|
|
- string zlxmid = listlis[0].zlxmid;
|
|
|
- string totalPrice = LisPacs_MR_Bll.GetZYTotalPrice(zlxmid);
|
|
|
+ if (hrType == 1)
|
|
|
+ {
|
|
|
+ totalPrice = LisPacs_MR_Bll.GetTotalPriceForLisByZLXM(zlxmid);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+
|
|
|
+ totalPrice = LisPacs_MR_Bll.GetTotalPriceForPacsByZLXM(zlxmid, listpacs[0].zxksid, listpacs[0].part, listpacs[0].method, 1);
|
|
|
+ }
|
|
|
+ //totalPrice = LisPacs_MR_Bll.GetZYTotalPrice(zlxmid);
|
|
|
rd = LisPacs_MR_Bll.GetZYPostJson(lngPatientID, lngClinicID, code, hrType, totalPrice, xgid);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- string totalPrice = LisPacs_MR_Bll.GetMZTotalPrice(lngPatientID, yzid);
|
|
|
+ totalPrice = LisPacs_MR_Bll.GetMZTotalPrice(lngPatientID, yzid);
|
|
|
|
|
|
rd = LisPacs_MR_Bll.GetMZPostJson(lngClinicID, code, hrType, totalPrice,xgid);
|
|
|
}
|
|
@@ -360,7 +387,7 @@ namespace ZLPlugin_MR
|
|
|
}
|
|
|
try
|
|
|
{
|
|
|
- Log.Info("互认的信息" + SocketClient.Message);
|
|
|
+ Log.Info("互认的信息》》" + SocketClient.Message);
|
|
|
result = JSON.JsonToObject<Results>(Tools.FormatStr(SocketClient.Message), Encoding.UTF8);
|
|
|
}
|
|
|
catch (Exception ex)//插件关闭时,返回格式不一样
|