From 39823fe5af887fe06616cac2ecd8aae736be3a40 Mon Sep 17 00:00:00 2001
From: "DESKTOP-G961P6V\\Zhh" <839860190@qq.com>
Date: Tue, 14 May 2024 11:36:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=94=B3=E8=AF=B7=E5=92=8C?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChargeRequestPlugInsGem.cs                 | 18 +++++++++++++++++-
 .../ImportLisResultPlugInsBase.cs              |  6 +++++-
 .../ImportPacsResultPlugInsBase.cs             | 11 +++++++++--
 .../RegisterCheckAsbitemManager.cs             |  7 +++++++
 4 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/ThirdPlugIns/Shentun.Peis.PlugIns.Gem/ChargeRequestPlugInsGem.cs b/ThirdPlugIns/Shentun.Peis.PlugIns.Gem/ChargeRequestPlugInsGem.cs
index 1c2b771..54c1066 100644
--- a/ThirdPlugIns/Shentun.Peis.PlugIns.Gem/ChargeRequestPlugInsGem.cs
+++ b/ThirdPlugIns/Shentun.Peis.PlugIns.Gem/ChargeRequestPlugInsGem.cs
@@ -53,7 +53,7 @@ namespace Shentun.Peis.PlugIns.Gem
                         IdCard = patientRegisterForPlugIns.IdNo,
                         IdCardCode = "01",
                         Name = patientRegisterForPlugIns.PatientName,
-                        Sex = "1",
+                        Sex = ConverSex(patientRegisterForPlugIns.SexId),
                         BirthDate = ((DateTime)patientRegisterForPlugIns.BirthDate).ToString("yyyy-MM-dd", System.Globalization.DateTimeFormatInfo.InvariantInfo),
                         PatientPhone = patientRegisterForPlugIns.MobileTelephone,
                         EthnicGroupCode = "01",
@@ -398,5 +398,21 @@ namespace Shentun.Peis.PlugIns.Gem
                 _endpointAddress);
         }
 
+        private string ConverSex(char sexId)
+        {
+            switch (sexId)
+            {
+                case 'M':
+                    return "1";
+                case 'F':
+                    return "2";
+                case 'U':
+                    return "3";
+                default:
+                    return "3";
+            }
+
+        }
+
     }
 }
diff --git a/src/Shentun.ColumnReferencePlugIns/ImportLisResultPlugInsBase.cs b/src/Shentun.ColumnReferencePlugIns/ImportLisResultPlugInsBase.cs
index 61831b9..439ce55 100644
--- a/src/Shentun.ColumnReferencePlugIns/ImportLisResultPlugInsBase.cs
+++ b/src/Shentun.ColumnReferencePlugIns/ImportLisResultPlugInsBase.cs
@@ -55,9 +55,13 @@ namespace Shentun.Peis.PlugIns
                 string sql;
                 var startDate = DateTime.Now.Date.AddDays(-days);
                 sql = @" SELECT distinct register_check.patient_register_id
- from lis_request ,register_check_asbitem,register_check
+ from lis_request ,register_check_asbitem,register_check,patient_register
 WHERE lis_request.id = register_check_asbitem.lis_request_id and
 register_check_asbitem.register_check_id = register_check.id and
+register_check.patient_register_id = patient_register.id and
+(patient_register.complete_flag = '0' or 
+          patient_register.complete_flag = '1' or 
+          patient_register.complete_flag = '2') and
 lis_request.creation_time > @StartDate
 ORDER BY register_check.patient_register_id
                       ";
diff --git a/src/Shentun.ColumnReferencePlugIns/ImportPacsResultPlugInsBase.cs b/src/Shentun.ColumnReferencePlugIns/ImportPacsResultPlugInsBase.cs
index 81fda2a..3e25704 100644
--- a/src/Shentun.ColumnReferencePlugIns/ImportPacsResultPlugInsBase.cs
+++ b/src/Shentun.ColumnReferencePlugIns/ImportPacsResultPlugInsBase.cs
@@ -36,7 +36,10 @@ JOIN register_check_asbitem on register_check.id = register_check_asbitem.regist
 JOIN asbitem on register_check_asbitem.asbitem_id = asbitem.id 
 JOIN item_type on asbitem.item_type_id = item_type.id 
 where patient_register.id = @PatientRegisterId and 
-      item_type.is_check_request = 'Y'
+      item_type.is_check_request = 'Y' and
+      (patient_register.complete_flag = '0' or 
+          patient_register.complete_flag = '1' or 
+          patient_register.complete_flag = '2')
                       ";
                 var pacsRequestForResultImportPlugInss = (await conn.QueryAsync<PacsRequestForImportResultPlugIns>(sql,
                     new { PatientRegisterId = patientRegisterId })).ToList();
@@ -57,7 +60,11 @@ JOIN register_check on patient_register.id = register_check.patient_register_id
 JOIN register_check_asbitem on register_check.id = register_check_asbitem.register_check_id
 JOIN asbitem on register_check_asbitem.asbitem_id = asbitem.id 
 JOIN item_type on asbitem.item_type_id = item_type.id 
-where item_type.is_check_request = 'Y' and 
+where 
+      item_type.is_check_request = 'Y' and 
+      (patient_register.complete_flag = '0' or 
+          patient_register.complete_flag = '1' or 
+          patient_register.complete_flag = '2') and
       patient_register.medical_start_date >@StartDate and
       register_check.creation_time >@StartDate
 ORDER BY register_check.patient_register_id
diff --git a/src/Shentun.Peis.Domain/RegisterCheckAsbitems/RegisterCheckAsbitemManager.cs b/src/Shentun.Peis.Domain/RegisterCheckAsbitems/RegisterCheckAsbitemManager.cs
index 9190d6e..a637c80 100644
--- a/src/Shentun.Peis.Domain/RegisterCheckAsbitems/RegisterCheckAsbitemManager.cs
+++ b/src/Shentun.Peis.Domain/RegisterCheckAsbitems/RegisterCheckAsbitemManager.cs
@@ -1,4 +1,5 @@
 using Microsoft.EntityFrameworkCore;
+using NUglify.Helpers;
 using Shentun.Peis.Enums;
 using Shentun.Peis.Models;
 using Shentun.Peis.ReferenceRanges;
@@ -470,6 +471,12 @@ namespace Shentun.Peis.RegisterAsbitems
                     {
                         throw new UserFriendlyException($"{asbitem.DisplayName}已检查不能修改");
                     }
+                    var registerCheck = existRegisterChecks.Where(o => o.Id == existRegisterAsbitem.RegisterCheckId).Single();
+                    if (string.IsNullOrWhiteSpace(registerCheck.CheckRequestNo))
+                    {
+                        //没有申请号的要重新生成申请号，所有设置成修改状态
+                        isModified = true ;
+                    }
                     if (!isModified)
                     {
                         continue;