From d03e6fb1d6ae9ff40a024e1003c85d55ac79009d Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Sat, 23 Nov 2024 19:04:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...mportRegisterCheckPictureByLisRequestNoInputDto.cs |  5 +++++
 ...RegisterCheckPictureByPatientRegisterNoInputDto.cs |  6 ++++++
 .../ImportRegisterCheckPictureInputDto.cs             |  5 +++++
 .../UploadRegisterCheckPictureManyDto.cs              |  5 +++++
 .../ImportLisResults/ImportLisResultAppService.cs     |  4 ++--
 .../RegisterCheckPictureAppService.cs                 | 11 +++++++----
 6 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/Shentun.Peis.Application.Contracts/RegisterCheckPictures/ImportRegisterCheckPictureByLisRequestNoInputDto.cs b/src/Shentun.Peis.Application.Contracts/RegisterCheckPictures/ImportRegisterCheckPictureByLisRequestNoInputDto.cs
index decc2b2..43881aa 100644
--- a/src/Shentun.Peis.Application.Contracts/RegisterCheckPictures/ImportRegisterCheckPictureByLisRequestNoInputDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/RegisterCheckPictures/ImportRegisterCheckPictureByLisRequestNoInputDto.cs
@@ -30,5 +30,10 @@ namespace Shentun.Peis.RegisterCheckPictures
         /// 图片文件类型  0-仪器图片，1-报告文件，默认是0
         /// </summary>
         public char PictureFileType { get; set; } = '1';
+
+        /// <summary>
+        /// 是打印标志
+        /// </summary>
+        public char IsPrint { get; set; } = 'Y';
     }
 }
diff --git a/src/Shentun.Peis.Application.Contracts/RegisterCheckPictures/ImportRegisterCheckPictureByPatientRegisterNoInputDto.cs b/src/Shentun.Peis.Application.Contracts/RegisterCheckPictures/ImportRegisterCheckPictureByPatientRegisterNoInputDto.cs
index 08276c6..02c218b 100644
--- a/src/Shentun.Peis.Application.Contracts/RegisterCheckPictures/ImportRegisterCheckPictureByPatientRegisterNoInputDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/RegisterCheckPictures/ImportRegisterCheckPictureByPatientRegisterNoInputDto.cs
@@ -30,5 +30,11 @@ namespace Shentun.Peis.RegisterCheckPictures
         /// 图片文件类型  0-仪器图片，1-报告文件，默认是0
         /// </summary>
         public char PictureFileType { get; set; } = '1';
+
+        /// <summary>
+        /// 是打印标志
+        /// </summary>
+        public char IsPrint { get; set; } = 'Y';
+
     }
 }
diff --git a/src/Shentun.Peis.Application.Contracts/RegisterCheckPictures/ImportRegisterCheckPictureInputDto.cs b/src/Shentun.Peis.Application.Contracts/RegisterCheckPictures/ImportRegisterCheckPictureInputDto.cs
index dc092c8..93508a1 100644
--- a/src/Shentun.Peis.Application.Contracts/RegisterCheckPictures/ImportRegisterCheckPictureInputDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/RegisterCheckPictures/ImportRegisterCheckPictureInputDto.cs
@@ -28,5 +28,10 @@ namespace Shentun.Peis.RegisterCheckPictures
         /// 图片文件类型  0-仪器图片，1-报告文件，默认是0
         /// </summary>
         public char PictureFileType { get; set; } = '1';
+
+        /// <summary>
+        /// 是打印标志
+        /// </summary>
+        public char IsPrint { get; set; } = 'Y';
     }
 }
diff --git a/src/Shentun.Peis.Application.Contracts/RegisterCheckPictures/UploadRegisterCheckPictureManyDto.cs b/src/Shentun.Peis.Application.Contracts/RegisterCheckPictures/UploadRegisterCheckPictureManyDto.cs
index fe535f8..3a4fce4 100644
--- a/src/Shentun.Peis.Application.Contracts/RegisterCheckPictures/UploadRegisterCheckPictureManyDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/RegisterCheckPictures/UploadRegisterCheckPictureManyDto.cs
@@ -45,5 +45,10 @@ namespace Shentun.Peis.RegisterCheckPictures
         public string FileName { get; set; }
 
         public string PictureBaseStr { get; set; }
+
+        /// <summary>
+        /// 是打印标志
+        /// </summary>
+        public char IsPrint { get; set; } = 'Y';
     }
 }
diff --git a/src/Shentun.Peis.Application/ImportLisResults/ImportLisResultAppService.cs b/src/Shentun.Peis.Application/ImportLisResults/ImportLisResultAppService.cs
index 2dc9837..f7b066c 100644
--- a/src/Shentun.Peis.Application/ImportLisResults/ImportLisResultAppService.cs
+++ b/src/Shentun.Peis.Application/ImportLisResults/ImportLisResultAppService.cs
@@ -192,7 +192,7 @@ namespace Shentun.Peis.ImportLisResults
                     //};
                     //修改参考范围
                     await UpdateItemReferenceRangeValueAsync(inputItem.ItemId, lisRequestItem.patientRegister.SexId,
-                        lisRequestItem.patientRegister.Age, inputItem.ReferenceRangeValue);
+                        lisRequestItem.patientRegister.Age, inputItem.ReferenceRangeValue, inputItem.CriticalRangeValue);
                     //修改单位
                     await UpdateItemUnitAsync(inputItem.ItemId, inputItem.Unit);
 
@@ -598,7 +598,7 @@ namespace Shentun.Peis.ImportLisResults
                     //};
                     //修改参考范围
                     await UpdateItemReferenceRangeValueAsync(inputItem.ItemId, lisRequestItem.patientRegister.SexId,
-                        lisRequestItem.patientRegister.Age, inputItem.ReferenceRangeValue);
+                        lisRequestItem.patientRegister.Age, inputItem.ReferenceRangeValue,inputItem.CriticalRangeValue);
                     //修改单位
                     await UpdateItemUnitAsync(inputItem.ItemId, inputItem.Unit);
 
diff --git a/src/Shentun.Peis.Application/RegisterCheckPictures/RegisterCheckPictureAppService.cs b/src/Shentun.Peis.Application/RegisterCheckPictures/RegisterCheckPictureAppService.cs
index 9270b77..5298422 100644
--- a/src/Shentun.Peis.Application/RegisterCheckPictures/RegisterCheckPictureAppService.cs
+++ b/src/Shentun.Peis.Application/RegisterCheckPictures/RegisterCheckPictureAppService.cs
@@ -217,7 +217,7 @@ namespace Shentun.Peis.RegisterCheckPictures
                     ent = new RegisterCheckPicture
                     {
                         DisplayOrder = input.PictureBaseStrs.IndexOf(item) + 1,
-                        IsPrint = 'Y',
+                        IsPrint = item.IsPrint,
                         PictureFilename = PictureUrl,
                         RegisterCheckId = input.RegisterCheckId,
                         PictureFileType = input.PictureFileType
@@ -371,7 +371,8 @@ namespace Shentun.Peis.RegisterCheckPictures
             pic.Add(new UploadRegisterCheckPictureManyPictureBaseStrsDto
             {
                 FileName = input.PictureName,
-                PictureBaseStr = input.PictureBase64
+                PictureBaseStr = input.PictureBase64,
+                IsPrint = input.IsPrint
             });
 
             await UploadRegisterCheckPictureManyAsync(new UploadRegisterCheckPictureManyDto
@@ -408,7 +409,8 @@ namespace Shentun.Peis.RegisterCheckPictures
             pic.Add(new UploadRegisterCheckPictureManyPictureBaseStrsDto
             {
                 FileName = input.PictureName,
-                PictureBaseStr = input.PictureBase64
+                PictureBaseStr = input.PictureBase64,
+                IsPrint = input.IsPrint
             });
 
 
@@ -450,7 +452,8 @@ namespace Shentun.Peis.RegisterCheckPictures
             pic.Add(new UploadRegisterCheckPictureManyPictureBaseStrsDto
             {
                 FileName = input.PictureName,
-                PictureBaseStr = input.PictureBase64
+                PictureBaseStr = input.PictureBase64,
+                IsPrint = input.IsPrint
             });