准备增加合单项目之后的代码

ZLPlugin_LisPacs_MR/Properties/AssemblyInfo.cs

@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("zlsoft")]
 [assembly: AssemblyProduct("ZLPlugin_LisPacs_MR")]
-[assembly: AssemblyCopyright("Copyright ©  2024")]
+[assembly: AssemblyCopyright("Copyright ©  2024-1.0.1.4")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,4 +32,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.4.35.140")]
-[assembly: AssemblyFileVersion("1.0.1.4")]
+[assembly: AssemblyFileVersion("1.4.35.140")]

ZLPlugin_LisPacs_MR/clsPlugin.cs

@@ -278,7 +278,7 @@ namespace ZLPlugin_LisPacs_MR
                 string zlxmid = "";
                 string totalPrice = "0";
                 int hrType = 0;
-
+                string hisApplyCode = ""; // 开单唯一id
                 if (listlis.Count == 0 && listpacs.Count == 0)
                 {
                     return true;
@@ -289,6 +289,7 @@ namespace ZLPlugin_LisPacs_MR
                     yzid = listlis[0].yzid;
                     xgid = listlis[0].id;
                     zlxmid = listlis[0].zlxmid;
+                    hisApplyCode = xgid;
                 }
                 else if (listpacs.Count > 0 && listlis.Count == 0)//只有检查
                 {
@@ -296,6 +297,7 @@ namespace ZLPlugin_LisPacs_MR
                     yzid = listpacs[0].yzid;
                     xgid = listpacs[0].id;
                     zlxmid = listpacs[0].zlxmid;
+                    hisApplyCode = xgid;
                 }
                 Log.Info("listpacs.Count"+ listpacs.Count);
                 Log.Info("listlis.Count" + listlis.Count);
@@ -306,11 +308,17 @@ namespace ZLPlugin_LisPacs_MR
                     {
                         totalPrice = LisPacs_MR_Bll.GetTotalPriceForLisByZLXM(zlxmid);
                     }
-                    else
+                    else if(hrType == 2)
                     {
 
                         totalPrice = LisPacs_MR_Bll.GetTotalPriceForPacsByZLXM(zlxmid, listpacs[0].zxksid, listpacs[0].part, listpacs[0].method,1);
                     }
+                    else
+                    {
+                        //获取合单之后 同时有检查和检验  的开单项目唯一id  以及金额
+
+
+                    }
                      
                     rd = LisPacs_MR_Bll.GetZYPostJson(lngPatientID, lngClinicID, code, hrType, totalPrice, xgid);
                 }
@@ -320,9 +328,15 @@ namespace ZLPlugin_LisPacs_MR
                     {
                         totalPrice = LisPacs_MR_Bll.GetTotalPriceForLisByZLXM(zlxmid);
                     }
-                    else
+                    else if (hrType == 2)
                     {
                         totalPrice = LisPacs_MR_Bll.GetTotalPriceForPacsByZLXM(zlxmid, listpacs[0].zxksid, listpacs[0].part, listpacs[0].method, 2);
+                    }
+                    else
+                    {
+                        //获取合单之后 同时有检查和检验  的开单项目唯一id  以及金额
+
+
                     }
                     rd = LisPacs_MR_Bll.GetMZPostJson(lngClinicID, code, hrType, totalPrice, xgid);
                 }