更新

api/WebApplication1/WebApplication1/DBHelper/DBHelper.csproj

-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
-  </ItemGroup>
-
-</Project>

api/WebApplication1/WebApplication1/DBHelper/DBHelpers.cs

-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.Common;
-using System.Data.SqlClient;
-using System.Data.SqlTypes;
-using System.Linq;
-
-namespace DBHelper
-{
-    public class DBHelpers
-    {
-        public static string ConectionString = "server=192.168.18.151;User Id=sa;Password=Suvalue2016;";
-        public DBHelpers() { }
-
-       /// <summary>
-       /// 执行循环的sql
-       /// </summary>
-       /// <param name="SQLString"></param>
-       /// <returns>表名集合</returns>
-        public static List<string> Query(string CirculateSql)
-        {
-            List<string> tableName = new List<string>();
-            using (SqlConnection connection = new SqlConnection(ConectionString))
-            {
-                using (SqlCommand cmd = new SqlCommand(CirculateSql, connection))
-                {
-                    connection.Open();
-                    SqlDataReader result = cmd.ExecuteReader();
-                    while (result.Read())
-                    {
-                        tableName.Add(result["name"].ToString());
-                    }
-                    connection.Close();
-
-                    return tableName;
-                }
-            }
-        }
-        
-        /// <summary>
-        /// 遍历表名，并执行sql
-        /// </summary>
-        /// <param name="tableName"></param>
-        /// <returns>受影响的行数(-1:执行的sql为空  -2：未找到表)</returns>
-        public static int Add(List<string> tableName,string ExcuteSql){
-            int count=0;
-            if (ExcuteSql == "" || ExcuteSql == null)
-            {
-                count = -1;
-                return count;
-            }
-            else if (tableName.Count == 0)
-            {
-                count = -2;
-                return count;
-            }
-            using (SqlConnection connection = new SqlConnection(ConectionString))
-            {
-                connection.Open();
-                foreach (var name in tableName)
-                {
-                    
-                    SqlCommand cmd = connection.CreateCommand();
-                    cmd.CommandText = ExcuteSql.Replace("[@name]","["+name+"]");
-                    count += cmd.ExecuteNonQuery();
-                    ExcuteSql = ExcuteSql.Replace("[" + name + "]", "[@name]");
-                }
-                connection.Close();
-            }
-            return count;
-        }
-    }
-}

api/WebApplication1/WebApplication1/WebApplication1.sln

-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.7.34018.315
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApplication1", "WebApplication1\WebApplication1.csproj", "{EF8E5F21-FE45-4812-B60F-5375F6C51C01}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DBHelper", "DBHelper\DBHelper.csproj", "{CB7F6E84-B3B5-46FA-80A2-88EC633828B3}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{EF8E5F21-FE45-4812-B60F-5375F6C51C01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF8E5F21-FE45-4812-B60F-5375F6C51C01}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EF8E5F21-FE45-4812-B60F-5375F6C51C01}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EF8E5F21-FE45-4812-B60F-5375F6C51C01}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CB7F6E84-B3B5-46FA-80A2-88EC633828B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB7F6E84-B3B5-46FA-80A2-88EC633828B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CB7F6E84-B3B5-46FA-80A2-88EC633828B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CB7F6E84-B3B5-46FA-80A2-88EC633828B3}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {C360C5EB-C4AE-4FDF-9AAD-406E0050028B}
-	EndGlobalSection
-EndGlobal

api/WebApplication1/WebApplication1/WebApplication1/Controllers/CursorController.cs

-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using System.Collections.Generic;
-
-namespace WebApplication1.Controllers
-{
-    [Route("api/[controller]")]
-    [ApiController]
-    public class CursorController : ControllerBase
-    {
-        [HttpPost("Demo")]
-        public int Demo([FromBody]SqlModel Sql)
-        {
-            List<string> TableNames = DBHelper.DBHelpers.Query(Sql.CirculateSql);
-            return DBHelper.DBHelpers.Add(TableNames,Sql.ExecuteSql);
-        }
-    }
-}

api/WebApplication1/WebApplication1/WebApplication1/Program.cs

-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace WebApplication1
-{
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            CreateHostBuilder(args).Build().Run();
-        }
-
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                });
-    }
-}

api/WebApplication1/WebApplication1/WebApplication1/Properties/launchSettings.json

-{
-  "$schema": "http://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:41905",
-      "sslPort": 44327
-    }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "WebApplication1": {
-      "commandName": "Project",
-      "dotnetRunMessages": "true",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "https://localhost:5001;http://localhost:5000",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}

api/WebApplication1/WebApplication1/WebApplication1/SqlModel.cs

-namespace WebApplication1
-{
-    public class SqlModel
-    {
-        public string CirculateSql { get; set; }
-        public string ExecuteSql { get; set; }
-    }
-}

api/WebApplication1/WebApplication1/WebApplication1/Startup.cs

-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.HttpsPolicy;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using Microsoft.OpenApi.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace WebApplication1
-{
-    public class Startup
-    {
-        public Startup(IConfiguration configuration)
-        {
-            Configuration = configuration;
-        }
-
-        public IConfiguration Configuration { get; }
-
-        // This method gets called by the runtime. Use this method to add services to the container.
-        public void ConfigureServices(IServiceCollection services)
-        {
-
-            services.AddControllers();
-            services.AddSwaggerGen(c =>
-            {
-                c.SwaggerDoc("v1", new OpenApiInfo { Title = "WebApplication1", Version = "v1" });
-            });
-        }
-
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-                app.UseSwagger();
-                app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "WebApplication1 v1"));
-            }
-
-            app.UseHttpsRedirection();
-
-            app.UseRouting();
-
-            app.UseAuthorization();
-
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapControllers();
-            });
-        }
-    }
-}

api/WebApplication1/WebApplication1/WebApplication1/WeatherForecast.cs

-using System;
-
-namespace WebApplication1
-{
-    public class WeatherForecast
-    {
-        public DateTime Date { get; set; }
-
-        public int TemperatureC { get; set; }
-
-        public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
-
-        public string Summary { get; set; }
-    }
-}

api/WebApplication1/WebApplication1/WebApplication1/WebApplication1.csproj

-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\DBHelper\DBHelper.csproj" />
-  </ItemGroup>
-
-</Project>

api/WebApplication1/WebApplication1/WebApplication1/appsettings.Development.json

-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    },
-    "Connection": {
-      "ConnectionString": "Host=192.168.18.187;Port=5432;Username=postgres;Password=Suvalue2016;Database=db_healthcare_drgs_gongcheng;SearchPath=public;"
-    }
-  }
-}

api/WebApplication1/WebApplication1/WebApplication1/appsettings.json

-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "AllowedHosts": "*"
-}

api/queryPlaform.Api/Controllers/DrugqueryController.cs

-using Microsoft.AspNetCore.Authorization;
+using com.sun.tools.javac.util;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using QueryPlatform.Api.Infrastructure.Modules;
 using System;
@@ -15,8 +16,10 @@ public class DrugqueryController : Controller
     {
         private readonly DrugqueryQueries _drugqueryQueries;
         private readonly HomeQueries _homeQueries;
-        public DrugqueryController(DrugqueryQueries drugqueryQueries, HomeQueries homeQueries)
+        private readonly ResourceQueries _resourceQueries;
+        public DrugqueryController(DrugqueryQueries drugqueryQueries, HomeQueries homeQueries, ResourceQueries resourceQueries)
         {
+            _resourceQueries= resourceQueries;
             _drugqueryQueries = drugqueryQueries;
             _homeQueries = homeQueries;
         }
@@ -135,6 +138,7 @@ public DrugqueryController(DrugqueryQueries drugqueryQueries, HomeQueries homeQu
             await semaphore.WaitAsync();
             try
             {
+                _resourceQueries.LOG($"查询条件", "", num, "", $"{icd_or_diseaseCondition}{drugs}{materialNames}");
                 asynsDrugquery(sYS_Drugquery, icd_or_diseaseCondition, drugs, materialNames, num, type, zxr);
             }
             finally

api/queryPlaform.Api/Controllers/HomeController.cs

@@ -3,6 +3,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
+using NPoco;
 using QueryPlatform.Api.Infrastructure.Hubs;
 using QueryPlatform.Api.Infrastructure.Modules;
 using QueryPlatform.Api.Infrastructure.Queries;
@@ -315,7 +316,12 @@ public IActionResult ceshi()
 
 
 
-
+        [HttpPost("city_hosLevel_hosType")]
+        [AllowAnonymous]
+        public List<string> city_hosLevel_hosType(string type)
+        {
+            return _homeQueries.city_hosLevel_hosType(type);
+        }
 
         [HttpPost("Cursor")]
         [AllowAnonymous]

api/queryPlaform.Api/Controllers/ResourceController.cs

@@ -152,13 +152,11 @@ public IEnumerable<dynamic> ShowLog(long indexs, string tableName)
         /// 拉取流水库数据
         /// </summary>
         /// <returns></returns> 
-        private static SemaphoreSlim semaphore = new SemaphoreSlim(1, 1);
         [HttpPost("PullData")]
         [AllowAnonymous]
-        public async Task PullDataAsync(long indexs, string DatabaseName, string tableName, string zxr)
+        public Task PullDataAsync(long indexs, string DatabaseName, string tableName, string zxr)
         {
             resourceQueries.pullstate(indexs, tableName);
-            await semaphore.WaitAsync();
             try
             {
                 resourceQueries.PullData(indexs, DatabaseName, tableName);
@@ -167,13 +165,11 @@ public IEnumerable<dynamic> ShowLog(long indexs, string tableName)
             catch (Exception e)
             {
                 throw e;
-            }
-            finally
-            {
-                semaphore.Release();
-            }
+            } 
             resourceQueries.Connection(181).Execute($"UPDATE [SV_QueryPlatform].[dbo].[FlowReservoirStatus] SET DataPullTime=getdate() WHERE  indexs={indexs} and tableName='{tableName}'");
+            return Task.CompletedTask;
         }
+
         /// <summary>
         /// 操作人展示
         /// </summary>

api/queryPlaform.Api/Infrastructure/AutofacModules/QueriesModule.cs

@@ -24,11 +24,12 @@ protected override void Load(ContainerBuilder builder)
             var Connection155 = configuration["ConnectionStrings:Connection155"];
             var Connection156 = configuration["ConnectionStrings:Connection156"];
             var Connection158 = configuration["ConnectionStrings:Connection158"];
+            var lskxc = configuration["ConnectionStrings:lskxc"];
 
             builder.RegisterType<HubNotificationQueue>().SingleInstance();
             builder.Register(c => new UserStorage(configConnectionString)).InstancePerLifetimeScope();
             builder.Register(c => new UserQueries(configConnectionString)).InstancePerLifetimeScope();
-            builder.Register(c => new ResourceQueries(Connection156, configConnectionString)).InstancePerLifetimeScope();
+            builder.Register(c => new ResourceQueries(Connection156, configConnectionString, lskxc)).InstancePerLifetimeScope();
             builder.Register(c => new DrugqueryQueries(Connection156, configConnectionString)).InstancePerLifetimeScope();
             builder.Register(c => new HomeQueries(configConnectionString, Connection156)).InstancePerLifetimeScope();
             builder.Register(c => new AnalysisQueries(Connection156, configConnectionString)).InstancePerLifetimeScope();

api/queryPlaform.Api/Infrastructure/Job.cs

@@ -29,9 +29,9 @@ public Job(ILogger<Job> logger, DrugqueryQueries drugqueryQueries, HomeQueries h
                     {
                         var day = DateTime.Now.Day;
                         var time = DateTime.Now.ToString("HH:mm:ss");
-                        if (day == 8 && time == "09:39:01")
+                        if (day == 1 && time == "00:00:01")
                         {
-                            // _drugqueryQueries.定时执行();
+                             _drugqueryQueries.定时执行();
                             _homeQueries.SendMail("定时任务", "人群检索表 化验检查检索表合并成功");
                         }
                     }

api/queryPlaform.Api/Infrastructure/Models/SYS_MODELS.cs

@@ -54,6 +54,9 @@ public class SYS_Hospital
     {
         public int id { get; set; }
         public string HosName { get; set; }
+        public string City { get; set; }
+        public string HosLevel { get; set; }
+        public string HosType { get; set; }
         public string ExecOpenLink { get; set; }
         public string ExecDatabase { get; set; }
         public string DataLoginName { get; set; }
@@ -447,9 +450,8 @@ public class SYS_LOG
         public string 错误sql { get; set; }
     }
     public class DateExploration
-    {
-        public int id { get; set; }
-        public int Id { get; internal set; }
+    { 
+        public int Id { get; set; }
         public string Name1 { get; set; }
         public string Name2 { get; set; }
         public string Name3 { get; set; }

api/queryPlaform.Api/Infrastructure/Queries/HomeQueries.cs

@@ -1430,6 +1430,25 @@ public List<string> ceshi()
         }
 
 
+        public List<string> city_hosLevel_hosType(string type)
+        {
+            var dbs = "SELECT city,left(hosLevel,1)hosLevel,hosType FROM [DB_SV_Data_Config].[dbo].[SYS_Hospital] where isnull([ExecOpenLink],'')!='' and isnull([ExecDatabase],'')!=''";
+            var hoss = Connection(156).Query<SYS_Hospital>(dbs);
+            if (type == "city")
+            {
+                return hoss.Select(s => s.City.Replace(" ","")).Distinct().ToList();
+            }
+            else if (type == "hosLevel")
+            {
+                return hoss.Select(s => s.HosLevel.Replace(" ", "")).Distinct().ToList();
+            }
+            else if (type == "hosType")
+            {
+                return hoss.Select(s => s.HosType.Replace(" ", "")).Distinct().ToList();
+            }
+            return null;
+        }
+
         /// <summary>
         /// 游标
         /// </summary>

api/queryPlaform.Api/Properties/PublishProfiles/FolderProfile.pubxml

@@ -4,9 +4,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <DeleteExistingFiles>True</DeleteExistingFiles>
-    <ExcludeApp_Data>False</ExcludeApp_Data>
-    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <DeleteExistingFiles>true</DeleteExistingFiles>
+    <ExcludeApp_Data>false</ExcludeApp_Data>
+    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
@@ -15,6 +15,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <SiteUrlToLaunchAfterPublish />
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <ProjectGuid>e9d630a1-10fd-4dcf-abc2-d827dd79d8d4</ProjectGuid>
-    <SelfContained>false</SelfContained>
+    <SelfContained>true</SelfContained>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
   </PropertyGroup>
 </Project>
\ No newline at end of file

api/queryPlaform.Api/appsettings.json

@@ -21,7 +21,8 @@
     "Connection155": "Server=192.168.18.155;Database=DB_SV_Data_Config;User ID=sa;Password=Suvalue2016;Trusted_Connection=False;",
     "Connection156": "Server=192.168.18.156;Database=DB_SV_Data_Config;User ID=sa;Password=srv@Ashersa;Trusted_Connection=False;",
     "Connection158": "Server=192.168.18.158;Database=DB_SV_Data_Config;User ID=sa;Password=Suvalue2016;Trusted_Connection=False;",
-    "pg":"Host=192.168.18.185;Port=5432;Username=postgres;Password=Suvalue2016;Database=db_QueryPlatformcare_drgs;"
+    "pg": "Host=192.168.18.185;Port=5432;Username=postgres;Password=Suvalue2016;Database=db_QueryPlatformcare_drgs;",
+    "lskxc": "4"
   }
 }
 

api/queryPlaform.Api/wwwroot/QueryPlatform.Api.xml

@@ -198,7 +198,7 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="F:QueryPlatform.Api.Controllers.ResourceController.semaphore">
+        <member name="M:QueryPlatform.Api.Controllers.ResourceController.PullDataAsync(System.Int64,System.String,System.String,System.String)">
             <summary>
             拉取流水库数据
             </summary>
@@ -442,7 +442,7 @@
             创建流水库
             </summary>
         </member>
-        <member name="M:QueryPlatform.Api.Infrastructure.Queries.ResourceQueries.PullData(System.Int64,System.String,System.String,System.String,System.String)">
+        <member name="F:QueryPlatform.Api.Infrastructure.Queries.ResourceQueries.lskmaxxc">
             <summary>
             拉取病人表
             </summary>