Merge branch 'master' of http://140.143.162.39:3000/shentun/peis

src/Shentun.Peis.Application/Books/HelloAAppService.cs

@@ -53,13 +53,7 @@ namespace Shentun.Peis.Books
 
         }
 
-
-        public async void Sa()
-        {
-            var s1 = await _helloARepository.FindAsync(m => m.AName == "45645454");
-
-            QiNiuHelper.Upload_QiNiu();
-        }
+ 
 
         public async Task<List<HelloA>> GetListAsync()
         {

src/Shentun.Peis.Application/Books/QiNiuDemo.cs

@@ -1,67 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Services;
-using System.IO;
-using Aliyun.OSS;
-using System.Security.AccessControl;
-
-namespace Shentun.Peis.Books
-{
-
-
-    public static class QiNiuHelper
-    {
-
-        // 阿里云账号AccessKey拥有所有API的访问权限，风险很高。强烈建议您创建并使用RAM
-        // 用户进行API访问或日常运维，请登录RAM控制台创建RAM用户。
-
-        const string accessKeyId = "LTAI5tBNDdiV7JudVvaQhU1t";
-        const string accessKeySecret = "sA6k0TbeX8w2cv7YhcTed7wyt0EBdN";
-
-        // yourEndpoint填写Bucket所在地域对应的Endpoint。以华东1（杭州）为例，Endpoint
-        //  填写为https://oss-cn-hangzhou.aliyuncs.com。
-        const string endpoint = "https://oss-cn-beijing.aliyuncs.com";
- 
-        // 填写Bucket名称。
-        const string bucketName = "whdshake";
-
-        public static void Upload_QiNiu()
-        {
-
-
-            // 填写Object完整路径。Object完整路径中不能包含Bucket名称。 
-            // 即：objectName为文件上传到阿里云OSS上的文件夹路径
-            var objectName = "imgae/222.png";
-
-            // 填写本地文件的完整路径。如果未指定本地路径，
-            // 则默认从示例程序所属项目对应本地路径中上传文件。
-            var localFilename = @"D:\aaa.png";
-
-            //System.Web.HttpContext.Current.Server.MapPath("imgae.png");
-            // 创建OssClient实例。
-            var client = new Aliyun.OSS.OssClient(endpoint, accessKeyId, accessKeySecret);
-            try
-            {
-                // 上传文件。
-                client.PutObject(bucketName, objectName, localFilename);
-                Console.WriteLine("1");
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine(ex.Message);
-            }
-
-        }
-
-    
-    }
-
-
-
-
-
-
-}

src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs

@@ -679,6 +679,7 @@ namespace Shentun.Peis.PatientRegisters
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost("api/patientregister/createreturninfo")]
+        [RemoteService(false)]
         public async Task<PatientRegisterOrNoDto> CreateReturnInfoAsync(CreatePatientRegisterDto input)
         {
             throw new UserFriendlyException("改接口已经禁止使用");
@@ -1011,19 +1012,19 @@ namespace Shentun.Peis.PatientRegisters
 
                 sumquery = sumquery.Where(m => m.a.CompleteFlag == input.CompleteFlag);
 
-                if (input.CompleteFlag != PatientRegisterCompleteFlag.PreRegistration && input.IsFilterPreRegistration != null && input.IsFilterPreRegistration == 'Y')
-                {
-                    //直接过滤
-                    sumquery = sumquery.Where(m => m.a.CompleteFlag != PatientRegisterCompleteFlag.PreRegistration);
-                }
+                //if (input.CompleteFlag != PatientRegisterCompleteFlag.PreRegistration && input.IsFilterPreRegistration != null && input.IsFilterPreRegistration == 'Y')
+                //{
+                //    //直接过滤
+                //    sumquery = sumquery.Where(m => m.a.CompleteFlag != PatientRegisterCompleteFlag.PreRegistration);
+                //}
             }
             else
             {
-                if (input.IsFilterPreRegistration != null && input.IsFilterPreRegistration == 'Y')
-                {
-                    //直接过滤
-                    sumquery = sumquery.Where(m => m.a.CompleteFlag != PatientRegisterCompleteFlag.PreRegistration);
-                }
+                //if (input.IsFilterPreRegistration != null && input.IsFilterPreRegistration == 'Y')
+                //{
+                //直接过滤
+                sumquery = sumquery.Where(m => m.a.CompleteFlag != PatientRegisterCompleteFlag.PreRegistration);
+                //}
             }
 
             if (input.IsAudit != null)
@@ -2499,7 +2500,7 @@ namespace Shentun.Peis.PatientRegisters
                 patientRegisterList.ForEach(f =>
                 {
                     f.IsMedicalStart = 'Y';
-                    f.MedicalStartDate =DateTime.Now;
+                    f.MedicalStartDate = DateTime.Now;
                 }
                 );
 

src/Shentun.Peis.Application/Shentun.Peis.Application.csproj

@@ -22,7 +22,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.13.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.1.0" />
     <PackageReference Include="System.DirectoryServices" Version="8.0.0" />
     <PackageReference Include="System.IO.FileSystem" Version="4.3.0" />

src/Shentun.Peis.HttpApi.Host/Filter/JsonTimeSpanConverter.cs

@@ -0,0 +1,24 @@
+using System.Text.Json;
+using System;
+using System.Text.Json.Serialization;
+
+namespace Shentun.Peis.Filter
+{
+    /// <summary>
+    /// 转换时间
+    /// </summary>
+    public class JsonTimeSpanConverter : JsonConverter<TimeSpan>
+    {
+        public override TimeSpan Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            var value = reader.GetString();
+            return TimeSpan.TryParse(value, out var timeSpan) ? timeSpan : new TimeSpan();
+        }
+
+        public override void Write(Utf8JsonWriter writer, TimeSpan value, JsonSerializerOptions options)
+        {
+            var timeSpanString = value.ToString();
+            writer.WriteStringValue(timeSpanString);
+        }
+    }
+}

src/Shentun.Peis.HttpApi.Host/PeisHttpApiHostModule.cs

@@ -52,6 +52,9 @@ using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Http;
 using Shentun.Peis.Filter;
 using Shentun.Peis.VirtualPath;
+using System.Text.Encodings.Web;
+using System.Text.Unicode;
+using Volo.Abp.Json;
 
 namespace Shentun.Peis;
 [DependsOn(
@@ -104,7 +107,7 @@ public class PeisHttpApiHostModule : AbpModule
         ConfigureCors(context, configuration);
         ConfigureSwaggerServices(context, configuration);
 
-
+        ConfigureJsonOptions();  //全局配置api返回值中的日期默认格式
 
         //密码策略配置
         context.Services.Configure<IdentityOptions>(opt =>
@@ -178,6 +181,31 @@ public class PeisHttpApiHostModule : AbpModule
 
     }
 
+    /// <summary>
+    /// 全局转换日期格式
+    /// </summary>
+    private void ConfigureJsonOptions()
+    {
+        //context.Services.AddControllers().AddJsonOptions(options =>
+        //{
+        //    options.JsonSerializerOptions.Encoder = JavaScriptEncoder.Create(UnicodeRanges.All);
+        //    options.JsonSerializerOptions.PropertyNamingPolicy = null;
+        //});
+        //Configure<JsonOptions>(x =>
+        //{
+        //    x.JsonSerializerOptions.Encoder = JavaScriptEncoder.Create(UnicodeRanges.All);
+        //    //x.JsonSerializerOptions.PropertyNamingPolicy = null;
+        //    x.JsonSerializerOptions.Converters.Add(new JsonTimeSpanConverter());
+        //});
+
+        Configure<AbpJsonOptions>(x =>
+        {
+            x.DefaultDateTimeFormat = "yyyy-MM-dd HH:mm:ss";
+        });
+    }
+
+
+
     private void ConfigureAuthentication(ServiceConfigurationContext context)
     {
         context.Services.ForwardIdentityAuthenticationForBearer(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme);