代码优化

LisPacsDataUpload/bin/Release/LisPacsDataUpload.exe.config

@@ -4,22 +4,25 @@
     <section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342" />
   </configSections>
   <appSettings>
+	  
     <!--定时轮询时间(单位：分钟)-->
-    <add key="time" value="120"/>
+    <add key="time" value="120" />
     <!--数据上传开始时间点(值域：0-23)-->
-    <add key="start_time" value="9"/>
+    <add key="start_time" value="9" />
     <!--是否上传检查数据，1：上传，0不上传-->
-    <add key="pacs" value="0"/>
+    <add key="pacs" value="0" />
     <!--清除多久以前已上传的数据（单位：月），整数,小于1不删除-->
-    <add key="upload_time" value="1"/>
+    <add key="upload_time" value="1" />
+
+	  <add key="UserName" value="zlhis"/>
+	  <add key="PasWord" value="aqa"/>
+	  <add key="Server" value="orcl"/>
+	  
   </appSettings>
   <connectionStrings>
-    <add name="conn" connectionString="data source=(DESCRIPTION = (ADDRESS_LIST = (ADDRESS = (PROTOCOL = TCP)(HOST = 172.30.0.1)(PORT = 1521)))(CONNECT_DATA = (SERVICE_NAME = his)));user id=ZLLPMR;password=ZLLPMR;Persist Security Info=True;Enlist=true;Pooling=true;Max Pool Size=300;Min Pool Size=0;Connection Lifetime=300;"/>
+    <add name="conn" connectionString="data source=(DESCRIPTION = (ADDRESS_LIST = (ADDRESS = (PROTOCOL = TCP)(HOST = 172.30.0.1)(PORT = 1521)))(CONNECT_DATA = (SERVICE_NAME = his)));user id=ZLLPMR;password=ZLLPMR;Persist Security Info=True;Enlist=true;Pooling=true;Max Pool Size=300;Min Pool Size=0;Connection Lifetime=300;" />
     <!--<add name="conn" connectionString="data source=(DESCRIPTION = (ADDRESS_LIST = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.181)(PORT = 1521)))(CONNECT_DATA = (SERVICE_NAME = orcl)));user id=ZLDSTX;password=ZLDSTX;Persist Security Info=True;Enlist=true;Pooling=true;Max Pool Size=300;Min Pool Size=0;Connection Lifetime=300;"/>-->
-	  <add name="pgConn"
-			 connectionString="Server=localhost;Port=5432;User Id=your_username;Password=your_password;Database=your_database;"
-			 providerName="Npgsql" />
-  
+    <add name="pgConn" connectionString="Server=localhost;Port=5432;User Id=your_username;Password=your_password;Database=your_database;" providerName="Npgsql" />
   </connectionStrings>
   <system.data>
     <DbProviderFactories>

LisPacsDataUpload/obj/Release/LisPacsDataUpload.csproj.CoreCompileInputs.cache

@@ -1 +0,0 @@
-ef7f1a72c6ea479b4ac8d1207ff204144246126afa9112c29e79b684ff33eacb

LisPacsDataUpload/obj/Release/LisPacsDataUpload.csproj.FileListAbsolute.txt

@@ -1,27 +0,0 @@
-D:\CodeSpace\VisualStudioSpace\zlsoft\ZLPlugin_LisPacs_MR\LisPacsDataUpload\bin\Release\LisPacsDataUpload.exe.config
-D:\CodeSpace\VisualStudioSpace\zlsoft\ZLPlugin_LisPacs_MR\LisPacsDataUpload\bin\Release\LisPacsDataUpload.exe
-D:\CodeSpace\VisualStudioSpace\zlsoft\ZLPlugin_LisPacs_MR\LisPacsDataUpload\bin\Release\LisPacsDataUpload.pdb
-D:\CodeSpace\VisualStudioSpace\zlsoft\ZLPlugin_LisPacs_MR\LisPacsDataUpload\bin\Release\Common.dll
-D:\CodeSpace\VisualStudioSpace\zlsoft\ZLPlugin_LisPacs_MR\LisPacsDataUpload\bin\Release\itextsharp.dll
-D:\CodeSpace\VisualStudioSpace\zlsoft\ZLPlugin_LisPacs_MR\LisPacsDataUpload\bin\Release\Mono.Security.dll
-D:\CodeSpace\VisualStudioSpace\zlsoft\ZLPlugin_LisPacs_MR\LisPacsDataUpload\bin\Release\Newtonsoft.Json.dll
-D:\CodeSpace\VisualStudioSpace\zlsoft\ZLPlugin_LisPacs_MR\LisPacsDataUpload\bin\Release\Npgsql.dll
-D:\CodeSpace\VisualStudioSpace\zlsoft\ZLPlugin_LisPacs_MR\LisPacsDataUpload\bin\Release\Oracle.ManagedDataAccess.dll
-D:\CodeSpace\VisualStudioSpace\zlsoft\ZLPlugin_LisPacs_MR\LisPacsDataUpload\bin\Release\Common.pdb
-D:\CodeSpace\VisualStudioSpace\zlsoft\ZLPlugin_LisPacs_MR\LisPacsDataUpload\bin\Release\Newtonsoft.Json.pdb
-D:\CodeSpace\VisualStudioSpace\zlsoft\ZLPlugin_LisPacs_MR\LisPacsDataUpload\bin\Release\Newtonsoft.Json.xml
-D:\CodeSpace\VisualStudioSpace\zlsoft\ZLPlugin_LisPacs_MR\LisPacsDataUpload\bin\Release\Npgsql.xml
-D:\CodeSpace\VisualStudioSpace\zlsoft\ZLPlugin_LisPacs_MR\LisPacsDataUpload\bin\Release\de\Npgsql.resources.dll
-D:\CodeSpace\VisualStudioSpace\zlsoft\ZLPlugin_LisPacs_MR\LisPacsDataUpload\bin\Release\es\Npgsql.resources.dll
-D:\CodeSpace\VisualStudioSpace\zlsoft\ZLPlugin_LisPacs_MR\LisPacsDataUpload\bin\Release\fi\Npgsql.resources.dll
-D:\CodeSpace\VisualStudioSpace\zlsoft\ZLPlugin_LisPacs_MR\LisPacsDataUpload\bin\Release\fr\Npgsql.resources.dll
-D:\CodeSpace\VisualStudioSpace\zlsoft\ZLPlugin_LisPacs_MR\LisPacsDataUpload\bin\Release\ja\Npgsql.resources.dll
-D:\CodeSpace\VisualStudioSpace\zlsoft\ZLPlugin_LisPacs_MR\LisPacsDataUpload\bin\Release\zh-CN\Npgsql.resources.dll
-D:\CodeSpace\VisualStudioSpace\zlsoft\ZLPlugin_LisPacs_MR\LisPacsDataUpload\obj\Release\LisPacsDataUpload.csproj.AssemblyReference.cache
-D:\CodeSpace\VisualStudioSpace\zlsoft\ZLPlugin_LisPacs_MR\LisPacsDataUpload\obj\Release\LisPacsDataUpload.Form1.resources
-D:\CodeSpace\VisualStudioSpace\zlsoft\ZLPlugin_LisPacs_MR\LisPacsDataUpload\obj\Release\LisPacsDataUpload.Properties.Resources.resources
-D:\CodeSpace\VisualStudioSpace\zlsoft\ZLPlugin_LisPacs_MR\LisPacsDataUpload\obj\Release\LisPacsDataUpload.csproj.GenerateResource.cache
-D:\CodeSpace\VisualStudioSpace\zlsoft\ZLPlugin_LisPacs_MR\LisPacsDataUpload\obj\Release\LisPacsDataUpload.csproj.CoreCompileInputs.cache
-D:\CodeSpace\VisualStudioSpace\zlsoft\ZLPlugin_LisPacs_MR\LisPacsDataUpload\obj\Release\LisPacsD.191B9CEA.Up2Date
-D:\CodeSpace\VisualStudioSpace\zlsoft\ZLPlugin_LisPacs_MR\LisPacsDataUpload\obj\Release\LisPacsDataUpload.exe
-D:\CodeSpace\VisualStudioSpace\zlsoft\ZLPlugin_LisPacs_MR\LisPacsDataUpload\obj\Release\LisPacsDataUpload.pdb

ZLPlugin_LisPacs_MR/LisPacs_MR_Bll.cs

@@ -289,7 +289,7 @@ namespace ZLPlugin_LisPacs_MR
         }
 
 
-        //获取诊疗项目id
+        //获取诊疗项目ids
         public static string GetZlxmIdFromList(List<Codes> list)
         {
             string zlxmids="";

ZLPlugin_LisPacs_MR/clsPlugin.cs

@@ -313,7 +313,6 @@ namespace ZLPlugin_LisPacs_MR
                         totalPrice = LisPacs_MR_Bll.GetTotalPriceForLisByZlxmIds(LisPacs_MR_Bll.GetZlxmIdFromList(listlis));// 获取总金额
                         for (var ii = 0; ii < listpacs.Count; ii++)
                         {
-
                             totalPrice += LisPacs_MR_Bll.GetTotalPriceForPacsByZLXM(listpacs[ii].zlxmid, listpacs[ii].zxksid, listpacs[ii].part, listpacs[ii].method, 1);
                         }
                     }
@@ -340,7 +339,7 @@ namespace ZLPlugin_LisPacs_MR
                         totalPrice = LisPacs_MR_Bll.GetTotalPriceForLisByZlxmIds(LisPacs_MR_Bll.GetZlxmIdFromList(listlis));// 获取总金额
                         for (var ii = 0; ii < listpacs.Count; ii++)
                         {
-                            totalPrice += LisPacs_MR_Bll.GetTotalPriceForPacsByZLXM(listpacs[ii].zlxmid, listpacs[ii].zxksid, listpacs[ii].part, listpacs[ii].method, 1);
+                            totalPrice += LisPacs_MR_Bll.GetTotalPriceForPacsByZLXM(listpacs[ii].zlxmid, listpacs[ii].zxksid, listpacs[ii].part, listpacs[ii].method, 2);
                         }
                     }
                     rd = LisPacs_MR_Bll.GetMZPostJson(lngClinicID, code, hrType, totalPrice.ToString(), code);

ZLPlugin_LisPacs_MR/obj/Debug/ZLPlugin_LisPacs_MR.csproj.FileListAbsolute.txt

@@ -1,10 +0,0 @@
-E:\Git公司项目\检查检验互认\ZLPlugin_LisPacs_MR\ZLPlugin_LisPacs_MR\obj\Debug\Interop.ADODB.dll
-E:\Git公司项目\检查检验互认\ZLPlugin_LisPacs_MR\ZLPlugin_LisPacs_MR\obj\Debug\ZLPlugin_LisPacs_MR.csproj.ResolveComReference.cache
-E:\Git公司项目\检查检验互认\ZLPlugin_LisPacs_MR\ZLPlugin_LisPacs_MR\obj\Debug\ZLPlugin_LisPacs_MR.csproj.CoreCompileInputs.cache
-E:\Git公司项目\检查检验互认\ZLPlugin_LisPacs_MR\ZLPlugin_LisPacs_MR\obj\Debug\ZLPlugin_LisPacs_MR.FormInfo.resources
-E:\Git公司项目\检查检验互认\ZLPlugin_LisPacs_MR\ZLPlugin_LisPacs_MR\obj\Debug\ZLPlugin_LisPacs_MR.csproj.GenerateResource.cache
-E:\Git公司项目\检查检验互认\ZLPlugin_LisPacs_MR\ZLPlugin_LisPacs_MR\bin\Debug\ZLPlugin_LisPacs_MR.dll
-E:\Git公司项目\检查检验互认\ZLPlugin_LisPacs_MR\ZLPlugin_LisPacs_MR\bin\Debug\ZLPlugin_LisPacs_MR.pdb
-E:\Git公司项目\检查检验互认\ZLPlugin_LisPacs_MR\ZLPlugin_LisPacs_MR\bin\Debug\ZLPlugin_LisPacs_MR.tlb
-E:\Git公司项目\检查检验互认\ZLPlugin_LisPacs_MR\ZLPlugin_LisPacs_MR\obj\Debug\ZLPlugin_LisPacs_MR.dll
-E:\Git公司项目\检查检验互认\ZLPlugin_LisPacs_MR\ZLPlugin_LisPacs_MR\obj\Debug\ZLPlugin_LisPacs_MR.pdb