LIS申请

ThirdPlugIns/Shentun.Peis.PlugIns.Gem/ChargeRequestPlugInsGem.cs

@@ -264,7 +264,7 @@ namespace Shentun.Peis.PlugIns.Gem
             
             //1：已支付，2.已作废3.已退费, 其他：未支付
             char charRequstFlag;
-            if (payStatus == "1")
+            if (payStatus == "1" && chargeRequest.ChargeRequestFlag != ChargeRequestFlag.RefundRequest)
             {
                 charRequstFlag = ChargeRequestFlag.AlreadyCharge;
                 SetAppChargeRequestFlagAsync(chargeRequest.ChargeRequestId, charRequstFlag);

ThirdPlugIns/Shentun.Peis.PlugIns.Gem/test/Shentun.Peis.PlugIns.Gem.Test/HisTest.cs

@@ -191,8 +191,8 @@ namespace Shentun.Peis.PlugIns.Gem.Test
                     },
                     Item = new HisPayStatusDataItemInput()
                     {
-                        Yjxh = "911",
-                        ExamRequestNo = "0003"
+                        Yjxh = "4334",
+                        ExamRequestNo = "202405060016"
                     }
                 }
             };

src/Shentun.ColumnReferencePlugIns/ChargeRequestPlugInsBase.cs

@@ -115,7 +115,8 @@ where patient.id = patient_register.patient_id and
 	                     his_charge_no,
 				         charge_request_flag
 	                    FROM charge_request
-	                   WHERE (charge_request_flag = '0' or charge_request_flag = '2' or 
+	                   WHERE (charge_request_flag = '0' or 
+                               charge_request_flag = '2' or 
                              charge_request_flag = '4')and
                              creation_time >@StartDate 
                       ";

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

@@ -265,6 +265,7 @@ namespace Shentun.Peis.ImportLisResults
                 && o.ReferenceRangeTypeFlag == ItemReferenceRangeTypeFlag.Number).FirstOrDefault();
                 if (referenceRange != null)
                 {
+                    referenceRange.ReferenceRangeTypeFlag = ItemReferenceRangeTypeFlag.Number;
                     referenceRange.ReferenceRangeValue = referenceRangeValue;
                     await _referenceRangeRepository.UpdateAsync(referenceRange, true);
                     return;
@@ -275,6 +276,7 @@ namespace Shentun.Peis.ImportLisResults
                  && o.ReferenceRangeTypeFlag == ItemReferenceRangeTypeFlag.Number).FirstOrDefault();
                 if (referenceRange != null)
                 {
+                    referenceRange.ReferenceRangeTypeFlag = ItemReferenceRangeTypeFlag.Number;
                     referenceRange.ReferenceRangeValue = referenceRangeValue;
                     await _referenceRangeRepository.UpdateAsync(referenceRange, true);
                     return;
@@ -298,6 +300,7 @@ namespace Shentun.Peis.ImportLisResults
             referenceRange = referenceRanges.Where(o => o.ReferenceRangeTypeFlag == ItemReferenceRangeTypeFlag.Character).FirstOrDefault();
             if (referenceRange != null)
             {
+                referenceRange.ReferenceRangeTypeFlag = ItemReferenceRangeTypeFlag.Character;
                 referenceRange.ReferenceRangeValue = referenceRangeValue;
                 await _referenceRangeRepository.UpdateAsync(referenceRange, true);
                 return;

src/Shentun.Peis.Domain/ReferenceRanges/ReferenceRangeManager.cs

@@ -298,6 +298,14 @@ namespace Shentun.Peis.ReferenceRanges
             {
                 return true;
             }
+            if (Regex.Matches(referenceRangeValue, "〜").Count() == 1)
+            {
+                return true;
+            }
+            if (Regex.Matches(referenceRangeValue, "～").Count() == 1)
+            {
+                return true;
+            }
             return false;
         }
     }

test/Shentun.Peis.Application.Tests/ImportLisResultAppServiceTest.cs

@@ -40,7 +40,7 @@ namespace Shentun.Peis
                       ItemId = new Guid("3a1203c2-c974-de89-ee07-3427f22fa8f7"),
                       Result = "10",
                       Unit = "g/l",
-                      ReferenceRangeValue = "0-20"
+                      ReferenceRangeValue = "0～20"
                   },
                    new CreateImportLisResultDto()
                   {
@@ -48,7 +48,7 @@ namespace Shentun.Peis
                       ItemId = new Guid("3a1203c2-ccd1-e29b-84b4-26bd28bbe12e"),
                       Result = "5.63",
                       Unit = "ml",
-                      ReferenceRangeValue = "10-50"
+                      ReferenceRangeValue = "10～50"
                   },
                     new CreateImportLisResultDto()
                   {
@@ -56,7 +56,7 @@ namespace Shentun.Peis
                       ItemId = new Guid("3a1203c2-d3b1-61fe-94e9-1210fd5555ec"),
                       Result = "123.001",
                       Unit = "次",
-                      ReferenceRangeValue = "10-60"
+                      ReferenceRangeValue = "10～60"
                   }
                 };