Browse Source

特性分支代码 互认上传pdf开发

zzh_love 7 months ago
parent
commit
91b6633c5f

+ 2 - 15
LisPacsDataUpload/Form1.cs

@@ -35,7 +35,7 @@ namespace LisPacsDataUpload
         private string DicLis = AppDomain.CurrentDomain.BaseDirectory + "Lis\\";
 
         private int zlhr = 0;// 是否为临生免
-        private int lisSource = 1;// 1 中联lis  2  专业版临生免  3 三方lis
+        private int lisSource = 1;// 0中联老版lis 1 中联新版lis  2  专业版临生免  3 三方lis
         private int open_multiple_upload_flag = 0;// 开启多个线程上传
         private delegate void SetTextCallback(string text);
         //在给textBox1.text赋值的地方调用以下方法即可
@@ -469,20 +469,7 @@ namespace LisPacsDataUpload
                             }
 
                             //最新调整  需要获取 原始pdf 文件  存在场景  有三方lis、中联lis 、 以及专业版临生免 的报告 三种  
-
-                            if ()
-                            {
-
-                            }else if ()
-                            {
-
-                            }
-                            else
-                            {
-
-                            }
-
-
+                            
                             //上传文件
                             string file_json = "{\"attachmentType\":\".pdf\",\"attachmentName\":\"检验报告\",\"businessType\":\"A001\",\"attachmentFile\":\"" + Tools.FileToBase64Str(res) + "\"}";
                             string file_vi = Tools.GuidTo16String();

+ 2 - 0
LisPacsDataUpload/LisPacsDataUpload.csproj

@@ -61,6 +61,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="business\PdfUtils.cs" />
     <Compile Include="Class1.cs" />
     <Compile Include="Models\Authorization.cs" />
     <Compile Include="Models\Count.cs" />
@@ -68,6 +69,7 @@
     <Compile Include="Models\LISITEMS.cs" />
     <Compile Include="Models\LISOBJ.cs" />
     <Compile Include="Models\PACS.cs" />
+    <Compile Include="Models\Report\Paramater.cs" />
     <Compile Include="Models\ResFile.cs" />
     <Compile Include="Models\ResPacs.cs" />
     <Compile Include="OracleHelper.cs" />

+ 24 - 0
LisPacsDataUpload/Models/Report/Paramater.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace LisPacsDataUpload.Models.Report
+{
+    public class Paramater
+    {
+        public int ZlSysCode { get; set; } = 0;
+        public string RePortCode { get; set; }
+        /// <summary>
+        /// 调用类型:0-执行;1-预览;2-打印;3-Excel;4-PDF
+        /// </summary>
+        public int InvokeType { get; set; } = 4;
+        public string PdfPath { get; set; } = "pdf=" + AppDomain.CurrentDomain.BaseDirectory + "PDF\\PrintReport";
+        public int ReturnType { get; set; } = 0;
+        public List<SubParameter> Params { get; set; } = new List<SubParameter>();
+
+    }
+
+    public class SubParameter
+    {
+        public string Param { get; set; }
+    }
+}

+ 41 - 0
LisPacsDataUpload/business/PdfUtils.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace LisPacsDataUpload.business
+{
+    /// <summary>
+    /// pdf 工具类 
+    /// </summary>
+    public class PdfUtils
+    {
+        /// <summary>
+        /// 根据lis版本获取请求生成pdf报告的参数   0中联老版lis 1 中联新版lis  2  专业版临生免  3 三方lis
+        /// </summary>
+        /// <returns></returns>
+        public static string getPdfParamByLisVersion(int lisVersion,long yzid)
+        {
+            if (lisVersion==0)
+            {
+
+            }
+            else if (lisVersion == 1)
+            {
+
+            }
+            else if (lisVersion == 2)
+            {
+
+            }
+            else
+            {
+                
+            }
+
+            return null;
+        }
+
+
+    }
+}