Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

2023-06-28 14:14:19 +08:00
parent 03026a84c7 fd33e4c3d4
commit 63ae52d99c
4 changed files with 33 additions and 6 deletions
@@ -22,7 +22,8 @@ namespace IRaCIS.Core.Application.ViewModel
    ///<summary>InternationalizationQuery  列表查询参数模型</summary>
    public class InternationalizationQuery : PageInput
    {
-
+        public int? InternationalizationType { get; set; }
+        public int? State { get; set; }
        public string? Description { get; set; }
        public string? Code { get; set; }
        public string? Value { get; set; }
@@ -36,10 +37,10 @@ namespace IRaCIS.Core.Application.ViewModel
    {
        public Guid? Id { get; set; }
        public int State { get; set; }
-        public string Description { get; set; }
+        public string Description { get; set; } = string.Empty;
        public string Code { get; set; }
-        public string Value { get; set; }
-        public string ValueCN { get; set; }
+        public string Value { get; set; } = string.Empty;
+        public string ValueCN { get; set; } = string.Empty;

        public int InternationalizationType { get; set; }
    }
@@ -31,6 +31,9 @@ namespace IRaCIS.Core.Application.Service
            var internationalizationQueryable =_internationalizationRepository
                .WhereIf(inQuery.Description!=null,t=>t.Description.Contains(inQuery.Description))
                .WhereIf(inQuery.Code != null, t => t.Code.Contains(inQuery.Code))
+                 .WhereIf(inQuery.State != null, t => t.State==inQuery.State)
+                  .WhereIf(inQuery.InternationalizationType != null, t => t.InternationalizationType == inQuery.InternationalizationType)
+                 
                .WhereIf(inQuery.Value != null, t => t.Value.Contains(inQuery.Value))
                 .WhereIf(inQuery.ValueCN != null, t => t.ValueCN.Contains(inQuery.ValueCN))
             .ProjectTo<InternationalizationView>(_mapper.ConfigurationProvider);
@@ -43,7 +43,7 @@ namespace IRaCIS.Application.Services
            };

          
-            var hospital = await _hospitalRepository.InsertOrUpdateAsync(hospitalCommand, true, exp);
+            var hospital = await _hospitalRepository.InsertOrUpdateAsync(hospitalCommand, true, exp,exp1);
        
            return ResponseOutput.Ok(hospital.Id.ToString());