From f5bf97265e21f19cb7d42cea98dbeebc7e6ca85a Mon Sep 17 00:00:00 2001 From: lsm Date: Tue, 9 Jul 2024 15:07:58 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8F=91=E9=80=81=E5=88=B0=E7=A7=91?= =?UTF-8?q?=E5=AE=A4=EF=BC=8C=E7=A7=BB=E9=99=A4=E4=B8=AD=E5=8C=BB=E9=99=A2?= =?UTF-8?q?=E5=AE=9A=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PEIS/Model/Enrollment/EnrollmentOrgModel.cs | 10 ++++++++++ PEIS/Model/Enrollment/EnrollmentPatientModel.cs | 11 +++++++++++ 2 files changed, 21 insertions(+) diff --git a/PEIS/Model/Enrollment/EnrollmentOrgModel.cs b/PEIS/Model/Enrollment/EnrollmentOrgModel.cs index acc56b6..d0151f2 100644 --- a/PEIS/Model/Enrollment/EnrollmentOrgModel.cs +++ b/PEIS/Model/Enrollment/EnrollmentOrgModel.cs @@ -51,6 +51,7 @@ namespace PEIS.Model.Enrollment var enrollmentPatient = $@"UPDATE Enrollment_Patient SET ExamDate = GETDATE(), SignTime = GETDATE(), SignerCode = '{Global.currentUser.Code}', Signer = '{Global.currentUser.Name}' WHERE ID = {eID} AND SignTime is null"; var enrollmentFeeItem = $@"UPDATE a SET a.IsSend = 1 FROM Enrollment_FeeItem a LEFT JOIN Enrollment_CheckCost b ON a.OrderNO = b.ID AND a.EID = b.EID WHERE b.SendTime IS NOT NULL AND a.EID = {eID};"; +<<<<<<< HEAD // 插入常规检查男/女 var normal = $@"EXEC sp_InsertNormalFeeItem {eID};"; @@ -61,12 +62,21 @@ namespace PEIS.Model.Enrollment UPDATE Enrollment_FeeItem SET DeptCode = '01415', DeptName = '口腔科' WHERE KeyNo = '87933670' AND FeeItemCode = 'Z1064' AND EID = {eID}; UPDATE Enrollment_FeeItem SET DeptCode = '01414', DeptName = '一般检查' WHERE KeyNo = '87965917' AND FeeItemCode = 'Z1065' AND EID = {eID}; UPDATE Enrollment_FeeItem SET DeptCode = '01414', DeptName = '一般检查' WHERE KeyNo = '87965918' AND FeeItemCode = 'Z1066' AND EID = {eID}; EXEC sp_SyncExamPart {eID};"; +======= + // 插入分检步骤 + var part = $@"EXEC sp_SyncExamPart {eID}"; +>>>>>>> 81d9dc6 (1、发送到科室，移除中医院定制) var cResult = DAOHelp.ExecuteSql(checkCost, false); var eResult = DAOHelp.ExecuteSql(enrollmentPatient, false); var fResult = DAOHelp.ExecuteSql(enrollmentFeeItem, false); +<<<<<<< HEAD var nResult = DAOHelp.ExecuteSql(normal); var dResult = DAOHelp.ExecuteSql(dept); +======= + + var pResult = DAOHelp.ExecuteSql(part); +>>>>>>> 81d9dc6 (1、发送到科室，移除中医院定制) return cResult > 0 && eResult > 0 && fResult > 0; } diff --git a/PEIS/Model/Enrollment/EnrollmentPatientModel.cs b/PEIS/Model/Enrollment/EnrollmentPatientModel.cs index 5522e83..9a30769 100644 --- a/PEIS/Model/Enrollment/EnrollmentPatientModel.cs +++ b/PEIS/Model/Enrollment/EnrollmentPatientModel.cs @@ -112,6 +112,7 @@ namespace PEIS.Model.Enrollment var enrollmentPatient = $@"UPDATE Enrollment_Patient SET ExamDate = GETDATE(), SignTime = GETDATE(), SignerCode = '{Global.currentUser.Code}', Signer = '{Global.currentUser.Name}' WHERE ID = {EId} AND SignTime is null"; var enrollmentFeeItem = $@"UPDATE a SET a.IsSend = 1 FROM Enrollment_FeeItem a LEFT JOIN Enrollment_CheckCost b ON a.OrderNO = b.ID AND a.EID = b.EID WHERE b.SendTime IS NOT NULL AND a.EID = {EId}; "; +<<<<<<< HEAD // 插入常规检查男/女 //同步分检 var normal = $@"EXEC sp_InsertNormalFeeItem {EId};"; @@ -128,6 +129,16 @@ namespace PEIS.Model.Enrollment var fResult = DAOHelp.ExecuteSql(enrollmentFeeItem, false); var nResult = DAOHelp.ExecuteSql(normal); var dResult = DAOHelp.ExecuteSql(dept); +======= + // 插入分检步骤 + var part = $@"EXEC sp_SyncExamPart {EId}"; + + + var cResult = DAOHelp.ExecuteSql(checkCost, false); + var eResult = DAOHelp.ExecuteSql(enrollmentPatient, false); + var fResult = DAOHelp.ExecuteSql(enrollmentFeeItem, false); + var pResult = DAOHelp.ExecuteSql(part); +>>>>>>> 81d9dc6 (1、发送到科室，移除中医院定制) return cResult > 0 && eResult > 0 && fResult > 0; }