收费

src/Shentun.ColumnReferencePlugIns/ChargeRequestForPlugIns.cs

@@ -27,6 +27,8 @@ namespace Shentun.Peis.PlugIns
         /// </summary>
         public char ChargeRequestFlag { get; set; }
 
+        public string ConcurrencyStamp { get; set; }
+
         public List<ChargeRequestAsbitemForPlugIns> Asbitems = new List<ChargeRequestAsbitemForPlugIns> ();
     }
 }

src/Shentun.ColumnReferencePlugIns/ChargeRequestPlugInsBase.cs

@@ -75,7 +75,8 @@ where patient.id = patient_register.patient_id and
                 sql = @"SELECT id as charge_request_id,
                         charge_request_no,
 	                     his_charge_no,
-				         charge_request_flag
+				         charge_request_flag,
+                         concurrency_stamp
 	                    FROM charge_request
 	                   WHERE id =@ChargeRequestId
                       ";
@@ -113,7 +114,8 @@ where patient.id = patient_register.patient_id and
                 sql = @"SELECT id as charge_request_id,
                         charge_request_no,
 	                     his_charge_no,
-				         charge_request_flag
+				         charge_request_flag,
+                         concurrency_stamp
 	                    FROM charge_request
 	                   WHERE (charge_request_flag = '0' or 
                                charge_request_flag = '2' or 
@@ -153,16 +155,18 @@ where patient.id = patient_register.patient_id and
         //    }
         //}
 
-        public async Task SetAppChargeRequestFlagAsync(Guid chargeRequestId, char chargeRequestFlag)
+        public async Task SetAppChargeRequestFlagAsync(Guid chargeRequestId, string concurrencyStamp, char chargeRequestFlag)
         {
             using (DbConnection conn = new NpgsqlConnection(AppConnctionStr))
             {
                 string sql;
                 sql = @" update charge_request set charge_request_flag =" + chargeRequestFlag +
-                        @" where  id = @ChargeRequestId		
+                        @" where  id = @ChargeRequestId and concurrency_stamp = @ConcurrencyStamp		
                       ";
                 conn.Execute(sql,
-                  new { ChargeRequestId = chargeRequestId });
+                  new { ChargeRequestId = chargeRequestId,
+                        ConcurrencyStamp = concurrencyStamp
+                  });
                 if (chargeRequestFlag == ChargeRequestFlag.AlreadyCharge)
                 {
                     sql = @" update register_check_asbitem set is_charge = 'Y' where  charge_request_id = @ChargeRequestId		

src/Shentun.Peis.Application.Contracts/RegisterChecks/RegisterCheckWithAsbitemsDto.cs

@@ -53,5 +53,17 @@ namespace Shentun.Peis.RegisterChecks
         /// 审核时间
         /// </summary>
         public DateTime? AuditTime { get; set; }
+        /// <summary>
+        /// 检查类别
+        /// </summary>
+        public char CheckTypeFlag { get; set; }
+        /// <summary>
+        /// 项目类别显示顺序
+        /// </summary>
+        public int ItemTypeDisplayOrder { get; set; }
+        /// <summary>
+        /// 组合项目顺序
+        /// </summary>
+        public int AsbitemDisplayOrder { get; set; }
     }
 }

src/Shentun.Peis.Application/ImportLisResults/ImportLisResultAppService.cs

@@ -52,6 +52,8 @@ namespace Shentun.Peis.ImportLisResults
         private readonly RegisterCheckAppService _registerCheckAppService;
         private List<Unit> _units;
         private List<ReferenceRange> _referenceRanges;
+        private static bool _isRunning = false;
+        private static readonly object lockObject = new object();
         public ImportLisResultAppService(IRepository<RegisterCheck, Guid> registerCheckRepository,
             IRepository<RegisterCheckItem> registerCheckItemRepository,
              IRepository<PatientRegister, Guid> patientRegisterRepository,
@@ -109,7 +111,8 @@ namespace Shentun.Peis.ImportLisResults
         public async Task ImportResultAsync(List<CreateImportLisResultDto> input)
         {
             //设置结果
-
+            lock (lockObject)
+            {
                 var list = (from patientRegister in await _patientRegisterRepository.GetQueryableAsync()
                             join registerCheck in await _registerCheckRepository.GetQueryableAsync()
                             on patientRegister.Id equals registerCheck.PatientRegisterId
@@ -245,6 +248,8 @@ namespace Shentun.Peis.ImportLisResults
                 }
             }
                 
+        }
+
         private async Task UpdateItemReferenceRangeValueAsync(Guid itemId, char sexId, int? age, string referenceRangeValue)
         {
             var referenceRanges = _referenceRanges.Where(o=>o.ItemId == itemId).ToList();

src/Shentun.Peis.Application/RegisterChecks/RegisterCheckAppService.cs

@@ -261,6 +261,9 @@ namespace Shentun.Peis.RegisterChecks
                 IsAudit = s.IsAudit,
                 IsCharge = s.RegisterCheckAsbitems.Where(m => m.IsCharge == 'Y').Count() > 0 ? 'Y' : 'N',
                 IsLock = s.IsLock,
+                CheckTypeFlag = s.RegisterCheckAsbitems.First().Asbitem.ItemType.CheckTypeFlag,
+                ItemTypeDisplayOrder = s.RegisterCheckAsbitems.First().Asbitem.ItemType.DisplayOrder,
+                AsbitemDisplayOrder = s.RegisterCheckAsbitems.First().Asbitem.DisplayOrder,
             }).ToList();
 
             return entdto;