From b1d00486932ee28667f429a52fbe41f42bcfbc82 Mon Sep 17 00:00:00 2001 From: lsm Date: Fri, 2 Aug 2024 14:29:36 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=93=BE=E6=8E=A5=E4=B8=B2=E6=9B=B4?= =?UTF-8?q?=E6=8D=A2=EF=BC=8C2=E3=80=81=E9=87=91=E5=9F=9F=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E9=A1=B9=E7=9B=AE=E6=98=BE=E7=A4=BA=EF=BC=8C3?= =?UTF-8?q?=E3=80=81SQL=E8=AF=AD=E5=8F=A5=E6=8A=A5=E9=94=99=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DcmToPng/Helper/Constant.cs | 2 +- PEIS.sln | 27 ++++++++----------- PEIS/App.config | 2 +- .../Enrollment/EnrollmentOrgFeeItemModel.cs | 4 +-- PEIS/Model/Exam/PartModel.cs | 4 +-- .../Enrollment/NewEnrollmentPersonForm.cs | 1 + 6 files changed, 18 insertions(+), 22 deletions(-) diff --git a/DcmToPng/Helper/Constant.cs b/DcmToPng/Helper/Constant.cs index 5b80a91..eda5fa9 100644 --- a/DcmToPng/Helper/Constant.cs +++ b/DcmToPng/Helper/Constant.cs @@ -9,7 +9,7 @@ public static readonly string ImgPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "DicomImages/"); // 德宏中医 - public static readonly string ConnectionString = @"Data Source=200.200.200.71;Initial Catalog=peisdb;User ID=sa;Password=wVJeC28@eY*&F#5NGL^eYC3m;"; + public static readonly string ConnectionString = @"Data Source=192.168.1.37;Initial Catalog=peisdb;User ID=sa;Password=xbdLis!@#77911;"; // PACS报告中已选的图片 diff --git a/PEIS.sln b/PEIS.sln index e09929d..38356a1 100644 --- a/PEIS.sln +++ b/PEIS.sln @@ -1,16 +1,14 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.33529.398 +# Visual Studio Version 17 +VisualStudioVersion = 17.10.35122.118 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PEIS", "PEIS\PEIS.csproj", "{8980800E-6620-4B2E-A7DD-8C4651E1A344}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "解决方案项", "解决方案项", "{AB0394FA-735E-4213-9ACE-31C02F698FA7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DcmToPng", "DcmToPng\DcmToPng.csproj", "{91EFD8EB-F52C-442E-A777-724389F9EA8D}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Update", "Update\Update.csproj", "{8894C92C-210D-459C-B5CD-7A6D2AB4CBE5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DicomTool", "DicomTool\DicomTool.csproj", "{7AFE3A9A-02C9-4D8C-A03B-1BFFECB153A3}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -27,6 +25,14 @@ Global {8980800E-6620-4B2E-A7DD-8C4651E1A344}.Release|Any CPU.Build.0 = Release|Any CPU {8980800E-6620-4B2E-A7DD-8C4651E1A344}.Release|x86.ActiveCfg = Release|Any CPU {8980800E-6620-4B2E-A7DD-8C4651E1A344}.Release|x86.Build.0 = Release|Any CPU + {91EFD8EB-F52C-442E-A777-724389F9EA8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {91EFD8EB-F52C-442E-A777-724389F9EA8D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {91EFD8EB-F52C-442E-A777-724389F9EA8D}.Debug|x86.ActiveCfg = Debug|Any CPU + {91EFD8EB-F52C-442E-A777-724389F9EA8D}.Debug|x86.Build.0 = Debug|Any CPU + {91EFD8EB-F52C-442E-A777-724389F9EA8D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {91EFD8EB-F52C-442E-A777-724389F9EA8D}.Release|Any CPU.Build.0 = Release|Any CPU + {91EFD8EB-F52C-442E-A777-724389F9EA8D}.Release|x86.ActiveCfg = Release|Any CPU + {91EFD8EB-F52C-442E-A777-724389F9EA8D}.Release|x86.Build.0 = Release|Any CPU {8894C92C-210D-459C-B5CD-7A6D2AB4CBE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8894C92C-210D-459C-B5CD-7A6D2AB4CBE5}.Debug|Any CPU.Build.0 = Debug|Any CPU {8894C92C-210D-459C-B5CD-7A6D2AB4CBE5}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -35,21 +41,10 @@ Global {8894C92C-210D-459C-B5CD-7A6D2AB4CBE5}.Release|Any CPU.Build.0 = Release|Any CPU {8894C92C-210D-459C-B5CD-7A6D2AB4CBE5}.Release|x86.ActiveCfg = Release|Any CPU {8894C92C-210D-459C-B5CD-7A6D2AB4CBE5}.Release|x86.Build.0 = Release|Any CPU - {7AFE3A9A-02C9-4D8C-A03B-1BFFECB153A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7AFE3A9A-02C9-4D8C-A03B-1BFFECB153A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7AFE3A9A-02C9-4D8C-A03B-1BFFECB153A3}.Debug|x86.ActiveCfg = Debug|Any CPU - {7AFE3A9A-02C9-4D8C-A03B-1BFFECB153A3}.Debug|x86.Build.0 = Debug|Any CPU - {7AFE3A9A-02C9-4D8C-A03B-1BFFECB153A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7AFE3A9A-02C9-4D8C-A03B-1BFFECB153A3}.Release|Any CPU.Build.0 = Release|Any CPU - {7AFE3A9A-02C9-4D8C-A03B-1BFFECB153A3}.Release|x86.ActiveCfg = Release|Any CPU - {7AFE3A9A-02C9-4D8C-A03B-1BFFECB153A3}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {8894C92C-210D-459C-B5CD-7A6D2AB4CBE5} = {AB0394FA-735E-4213-9ACE-31C02F698FA7} - EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {56DA78F6-DED1-4B17-AE1F-7DCF4A666388} EndGlobalSection diff --git a/PEIS/App.config b/PEIS/App.config index 1c4d84e..3876e24 100644 --- a/PEIS/App.config +++ b/PEIS/App.config @@ -10,7 +10,7 @@ - + diff --git a/PEIS/Model/Enrollment/EnrollmentOrgFeeItemModel.cs b/PEIS/Model/Enrollment/EnrollmentOrgFeeItemModel.cs index 3121a1f..45b415c 100644 --- a/PEIS/Model/Enrollment/EnrollmentOrgFeeItemModel.cs +++ b/PEIS/Model/Enrollment/EnrollmentOrgFeeItemModel.cs @@ -50,8 +50,8 @@ namespace PEIS.Model.Enrollment { // 个人登记信息 DAOHelp.ExecuteSql($"Insert into Enrollment_Patient " + - $"(Name, Sex, Nation, Age, AgeClass, CardType, CardNo, Tel1, Tel2, Contactor1,Contactor2,Address1, Address2, Marriage, Education, Occupation, Company, ExamDate, Type, PID, OID, OEID, OrgName, GroupID, GroupName, CreateTime, CreatorCode, Creator)" + - $" SELECT a.Name, a.Sex, a.Nation, DATEDIFF(YEAR, a.Birthday, GETDATE()) + CASE WHEN DATEDIFF(DAY,DATEADD(YEAR,DATEDIFF(YEAR, a.Birthday,GETDATE()), a.Birthday),GETDATE()) < 0 THEN -1 ELSE 0 END, '岁', CardType, CardNo, a.Tel1, a.Tel2, a.Contactor1, a.Contactor2, Address1, Address2, a.Marriage, Education, Occupation, Company, c.ExamDate, d.Type, a.ID, c.OID, c.ID, c.Name, d.ID, d.Name, GETDATE(), '{Global.currentUser.Code}', '{Global.currentUser.Name}' " + + $"(Name, Sex, Nation, Age, AgeClass, CardType, CardNo, Tel1, Tel2, Contactor1,Contactor2,Address1, Address2, Marriage, Education, Occupation, Company, ExamDate, Type, PID, OID, OEID, OrgName, GroupID, GroupName, CreateTime, CreatorCode, Creator, WeChatStatus, IsWeChatView)" + + $" SELECT a.Name, a.Sex, a.Nation, DATEDIFF(YEAR, a.Birthday, GETDATE()) + CASE WHEN DATEDIFF(DAY,DATEADD(YEAR,DATEDIFF(YEAR, a.Birthday,GETDATE()), a.Birthday),GETDATE()) < 0 THEN -1 ELSE 0 END, '岁', CardType, CardNo, a.Tel1, a.Tel2, a.Contactor1, a.Contactor2, Address1, Address2, a.Marriage, Education, Occupation, Company, c.ExamDate, d.Type, a.ID, c.OID, c.ID, c.Name, d.ID, d.Name, GETDATE(), '{Global.currentUser.Code}', '{Global.currentUser.Name}', 0, 0 " + $"FROM dbo.Base_Patient a " + $"LEFT JOIN dbo.Enrollment_OrgPatient b ON a.ID = b.PID " + $"LEFT JOIN dbo.Enrollment_Org c ON b.OID = c.ID " + diff --git a/PEIS/Model/Exam/PartModel.cs b/PEIS/Model/Exam/PartModel.cs index 52d1347..1d57c4f 100644 --- a/PEIS/Model/Exam/PartModel.cs +++ b/PEIS/Model/Exam/PartModel.cs @@ -500,12 +500,12 @@ namespace PEIS.Model var giveUp = GiveUpExamResult(eid, deptCode); var general = GeneralExamResult(eid, deptCode); var lis = deptCode== "3001" ? LisExamResult(eid, deptCode):new List(); - //var jyLis = GetJyLisResult(eid, deptCode); + var jyLis = GetJyLisResult(eid, deptCode); var pacs = PacsExamResult(eid, deptCode) ; var data = giveUp.Union(general).ToList() .Union(lis).ToList() - //.Union(jyLis).ToList() + .Union(jyLis).ToList() .Union(pacs).ToList() .Distinct().ToList(); // data.RemoveAll(p => p.FID == null); diff --git a/PEIS/View/Enrollment/NewEnrollmentPersonForm.cs b/PEIS/View/Enrollment/NewEnrollmentPersonForm.cs index 649d1b4..3ead643 100644 --- a/PEIS/View/Enrollment/NewEnrollmentPersonForm.cs +++ b/PEIS/View/Enrollment/NewEnrollmentPersonForm.cs @@ -274,6 +274,7 @@ namespace PEIS.View.Enrollment Address1 = Address1.Text.Trim(), Company = Company.Text.Trim(), Description = Description.Text.Trim(), + IsWeChatView = false }; if (_editStatus)