From 4a3d284fdff25be03328847771f6b343aded32f1 Mon Sep 17 00:00:00 2001 From: leomon Date: Fri, 26 May 2023 11:54:34 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=A6=E7=9A=87=E5=B2=9B=E6=94=B6=E8=B4=B9?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AIMS/AIMS.csproj | 22 ++--- AIMS/AIMS.xml | 2 +- AIMS/OperationAanesthesia/frmFeesRecord.cs | 82 ++++++++++++++++++ .../frmSelectPatientNew2.cs | 14 +-- AIMS/Template/护士收费单QHD.xlt | Bin 0 -> 28160 bytes AIMS/Template/麻醉收费单QHD.xlt | Bin 0 -> 28160 bytes AIMSExtension/AIMSExtension.csproj | 2 + .../PdfFilePrinter.cs | 2 +- .../DrawGraphManagement.csproj | 1 - DrawGraphManagement/MainUp.cs | 3 + 10 files changed, 106 insertions(+), 22 deletions(-) create mode 100644 AIMS/Template/护士收费单QHD.xlt create mode 100644 AIMS/Template/麻醉收费单QHD.xlt rename {DrawGraphManagement => AIMSExtension}/PdfFilePrinter.cs (99%) diff --git a/AIMS/AIMS.csproj b/AIMS/AIMS.csproj index d49bc71..76e97aa 100644 --- a/AIMS/AIMS.csproj +++ b/AIMS/AIMS.csproj @@ -1280,22 +1280,16 @@ True - + + + + PreserveNewest - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - + + + + PreserveNewest diff --git a/AIMS/AIMS.xml b/AIMS/AIMS.xml index 8fe8536..093bb06 100644 --- a/AIMS/AIMS.xml +++ b/AIMS/AIMS.xml @@ -1,6 +1,6 @@  - Data Source=.;Initial Catalog=AIMSDB_FJZPTFYY;User ID=sa;Password=Test2020; + Data Source=.;Initial Catalog=AIMSDB_QHDSGRYY;User ID=sa;Password=Test2020; Data Source=.;Initial Catalog=AIMSDB_DATA;User ID=sa;Password=Test2020; Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.10.7)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=orcl2))));Persist Security Info=True;User ID=smview;Password=i39; diff --git a/AIMS/OperationAanesthesia/frmFeesRecord.cs b/AIMS/OperationAanesthesia/frmFeesRecord.cs index 4360a2d..5de39fb 100644 --- a/AIMS/OperationAanesthesia/frmFeesRecord.cs +++ b/AIMS/OperationAanesthesia/frmFeesRecord.cs @@ -1482,7 +1482,18 @@ namespace AIMS.PublicUI.UI private void bynPrint_Click(object sender, EventArgs e) { btnSave_Click(null, null); + if (PublicMethod.HospitalName.Contains("秦皇岛")) + { + PrintExcel2(); + } + else + { + PrintExcel(); + } + } + private void PrintExcel() + { GoldPrinter.ExcelAccess excel = new GoldPrinter.ExcelAccess(); string strFileName = "麻醉收费单.xlt"; //模板文件名 if (FeeType == "护士") strFileName = "护士收费单.xlt"; @@ -1554,6 +1565,77 @@ namespace AIMS.PublicUI.UI excel.Close(); } + private void PrintExcel2() + { + GoldPrinter.ExcelAccess excel = new GoldPrinter.ExcelAccess(); + string strFileName = "麻醉收费单QHD.xlt"; //模板文件名 + if (FeeType == "护士") strFileName = "护士收费单QHD.xlt"; + string strExcelTemplateFile = Application.StartupPath; + strExcelTemplateFile += @"\Template\" + strFileName; + excel.Open(strExcelTemplateFile); //用模板文件 + + excel.SetCellText(2, "A", PublicMethod.HospitalName); + excel.SetCellText(4, "B", _record.InRoomTime.Value.ToString("yyyy-MM-dd")); + excel.SetCellText(4, "E", _record.ApplyDepartmentName.ToString()); + excel.SetCellText(4, "H", _record.InHospitalNo); + excel.SetCellText(5, "B", _record.Name + " (" + _record.Sex + " " + _record.Age + ")"); + excel.SetCellText(5, "H", _record.Identity); + + PatientRecord Patient = PatientRecord.GetPatientRecord(_record.PatientId.Value); + if (FeeType == "麻醉") + { + excel.SetCellText(5, "E", DBManage.GetDictionaryValuesById(_record.Applydiagnose, "诊断")); + excel.SetCellText(38, "B", lblDrugs.Text); + excel.SetCellText(39, "B", _worker.Name); + excel.SetCellText(39, "D", Patient.AnesthesiaDoctor); + excel.SetCellText(39, "G", DateTime.Now.ToString("yyyy-MM-dd HH:mm")); + } + else + { + excel.SetCellText(5, "E", DBManage.GetDictionaryValuesById(_record.Operation, "手术")); + excel.SetCellText(27, "B", Patient.OperationDoctor); + excel.SetCellText(27, "F", Patient.InstrumentNurse + " " + Patient.TourNurse); + excel.SetCellText(27, "H", Patient.AnesthesiaDoctor); + excel.SetCellText(28, "B", lblDrugs.Text); + } + + int rowNum = 7; + for (int i = 0; i < dgvDrugs.Rows.Count; i++) + { + DataGridViewRow dr = dgvDrugs.Rows[i]; + if (dr.Tag == null) continue; + FeesRecord temp = dr.Tag as FeesRecord; + if (temp != null) + { + excel.GetRange(rowNum, "A", rowNum, "H").Value = new string[]{ + ( dr.Cells[3].EditedFormattedValue.ToString()),"","","","", + ( dr.Cells[4].EditedFormattedValue.ToString()), + dr.Cells[7].EditedFormattedValue.ToString(), + ( dr.Cells[6].EditedFormattedValue.ToString() ) }; + rowNum++; + } + } + for (int i = 0; i < dgvChargsRecord.Rows.Count; i++) + { + DataGridViewRow dr = dgvChargsRecord.Rows[i]; + if (dr.Tag == null) continue; + FeesRecord temp = dr.Tag as FeesRecord; + if (temp != null) + { + excel.GetRange(rowNum, "A", rowNum, "H").Value = new string[]{ + ( dr.Cells[3].EditedFormattedValue.ToString()),"","","","", + ( temp.ChargSpec ), + dr.Cells[7].EditedFormattedValue.ToString(), + ( dr.Cells[6].EditedFormattedValue.ToString() ) + }; + rowNum++; + } + } + excel.Print(); + this.Focus(); + excel.Close(); + } + private void buttonX1_Click(object sender, EventArgs e) { FeesRecordList = BFeesRecord.Select(" FeeIsDrug =1 and FeeType='" + FeeType + "' and OperationRecordId=" + _record.Id, null, RecursiveType.None, 0); diff --git a/AIMS/OperationAanesthesia/frmSelectPatientNew2.cs b/AIMS/OperationAanesthesia/frmSelectPatientNew2.cs index 012506e..26fea0c 100644 --- a/AIMS/OperationAanesthesia/frmSelectPatientNew2.cs +++ b/AIMS/OperationAanesthesia/frmSelectPatientNew2.cs @@ -32,7 +32,7 @@ namespace AIMS.OperationAanesthesia private void frmSelectPatientNew2_Load(object sender, EventArgs e) { - ControlExtension.GetOperationSiteRoom(labelSite, CboOperationSite, cboRoom,"手术室"); + ControlExtension.GetOperationSiteRoom(labelSite, CboOperationSite, cboRoom, "手术室"); FillDgv(); this.cboRoom.SelectedIndexChanged += new System.EventHandler(this.cboRoom_SelectedIndexChanged); @@ -58,21 +58,25 @@ namespace AIMS.OperationAanesthesia panel3.Controls.Clear(); panel2.Visible = false; + string cboRoomStr = ""; + if (cboRoom.SelectedValue != null) + cboRoomStr = cboRoom.SelectedValue.ToString(); + DataTable dt = new DataTable(); if (txtquery.Text.Trim() != "") dt = SelectPatient.GetSelectPatientDataTable(txtquery.Text); else - dt = SelectPatient.GetSelectPatientDataTable(DateTime.Parse(dtpSelectPatientTime.Value.ToString("yyyy-MM-dd").ToString()), cboRoom.SelectedValue.ToString()); + dt = SelectPatient.GetSelectPatientDataTable(DateTime.Parse(dtpSelectPatientTime.Value.ToString("yyyy-MM-dd").ToString()), cboRoomStr); DataTable dt2 = new DataTable(); if (txtquery.Text.Trim() != "") dt2 = SelectPatient.GetRelieveLockingPatientDataTable(txtquery.Text); else - dt2 = SelectPatient.GetRelieveLockingPatientDataTable(DateTime.Parse(dtpSelectPatientTime.Value.ToString("yyyy-MM-dd").ToString()), cboRoom.SelectedValue.ToString()); - + dt2 = SelectPatient.GetRelieveLockingPatientDataTable(DateTime.Parse(dtpSelectPatientTime.Value.ToString("yyyy-MM-dd").ToString()), cboRoomStr); + if (CboOperationSite.Visible == true && CboOperationSite.SelectedIndex > 0) { - dt = AIMSExtension.PublicMethod.GetNewDataTable(dt, " OperationSite ='" + CboOperationSite.SelectedValue + "' ", ""); + dt = AIMSExtension.PublicMethod.GetNewDataTable(dt, " OperationSite ='" + CboOperationSite.SelectedValue + "' ", ""); dt2 = AIMSExtension.PublicMethod.GetNewDataTable(dt2, " OperationSite ='" + CboOperationSite.SelectedValue + "' ", ""); } diff --git a/AIMS/Template/护士收费单QHD.xlt b/AIMS/Template/护士收费单QHD.xlt new file mode 100644 index 0000000000000000000000000000000000000000..1fa25d2e76c6f25f22e930e6d55cbbe8fab557bb GIT binary patch literal 28160 zcmeHQ36ND)dj9Y0x7=<7x>*`*pm{X=(k$IAqJXb)L$r~t8QBB|cny?{7^a8lj0`=C zNg3Q|7<7P{i3?>CCr(f^IMIw4i9@CuO(GW2P(~BAOfg|bk|}45`tp6}-uv$I&V9U_ zp{$y!cV3;l{OA13`Op8K^Pkh_R{!IxHE%zBxb7VZq${LCKFd`~(gQc}e2Md3Ehx|B z`0CtS@C;Bn{T^wc(nLol6S88#iPS$xOp>O^TJ+;Pc>b&Si@1vXJMt>IjnC=NGhL}< z_@Y4>j>7n68%Z$$tB`}Z*2u+_NcyR3e|7zls{6dU&PK^^cCHY);r7NEs3*W(7Hd`Y z?p4n+h^b2FPjDH{}7Ey!=rtX6#zIWWj}mKLfhCorUzn;9>G?f`l_P za!xV~z@MjreDcRb;HRMjU48N$prKEAjTUY|Z-snGza<1-sfEX6ke0qkRS3K#1U^d( zHzcFwD{_UlzDT78ejIwx*$I1A2X765>*&Z+7&&R=$f+~&u&Pl#*2jlo zY#!_>Te bw1zdP%`W^2n2?dhzjAA0G)3>-{wXR8+M~Wr8$`tVx6VgtTJ6COy-B zwdHXE4UG-zrFBiZK0aB-;|EkP-h{LlX+qkEk&#Jqxt|$?aLL=KJ{SmOGA`5UGEt^^ zm^yXyd|f~Qvko>l5QE()tC8bpt{P`QuNq$;9}a!jc}tbDd{xrW_>g=R^6}8XE6I!o zk#wMrpOUKhHvEq1*Ex*P`E)c*c&ZG)pn9Ns4e{tX7SJV&1KMa9?F9g0T1Rf?&82zV1=zKo}9#x*lLg*Y0fj?uzD=mNdjn!R<8x$Nt zjRpT7KfKa`pOl4o9PZSw^22*Ma6DLaPSS&=Zvi|&|01V;z)pG>z%4uJsRO3LPT`7#rIyeNg;CpLo9_;mCFNyC{dZ2}?`g=P%UKswuaETvL@EQjmkiTCD z9CMOI=cEc2F(^9zGEpl}3X_0N&H)acyndcg@?Z?M<*cc(P` zRM9Df|49h^Cn0dl4h!j6c324iYegsJ$aAo!rnXlt^uJ%h1@n@DxJg=SYFg8+>1unN zvEb0Q77lHyVi0pD36@)W@BadIje$mFB1lgDmvfR4o%-WPxu z*AIdjt$rxK5u%^!5O~!3e*Hia=ox$wfT?8bArGG+)!zPvgIM(g@UVWj^aE;vcDZoB zJ-BecoEH74dZRvrdZYa4Uv0mmev3|@XmtQ?$q9I%--jqWWP4q{cbWs_P7d7pv{v4F zf7G!ZW~1!z!C4_Dy%85x;0Xb?r~nEo zMB*S834xsw34zmZBm~aOkq|gxM?&C?9SMO`c_akR@sSWXnHNQv6YvKP{uSZ=5Lb?p z?V!nF6^C_NI=#aT5`nXqLWE`*P6Q)EDMV>N;dk5?8Qiv4qouQ== zX=*OsJHtvNQoMJtF?0UrG&L9R9jqWqAyT||(xnk8-a8{oBjWF!;7s2DB1MP7Ai_u= z0%v7!XkZi$d!u|}1`%SW9b^>m|Iwuo$z_TY8B+?8pd|*|KNdt>g%vcXu>IrmTp9Bm zlw{7Uuo&kK7UX{RN-lhe8}B26rL3OF%fIvzSsIwdCV)shd=^V-dcxZ~&L1iYqrZtD z?CPY1aBBcfsA~yDGhov8?4d)43WUmJG6h0;VUAFQS){p1Zwc>(752pxRJZ!VX{b-ALIf^A zTm*3Qn^vJgPXmHAwP^do(Q&TJ$Tz!?Yg3*pbytGPG@lP47;d%r#5{OYpj~;tJ9E$@ zX0VI-$643zsCl0@9U?lr^LD4B6ECdvE)EJcJs{L}y->NH@8(-};hiCFk_6=8lj_GX;g$S zL`AqMD#Eg;2+N})tcZ%RGAhEVs0cSlMOYmbVNG#_J+X`NXPhcAny~9WTGG;p-1>*x zzL~~mdAB(i83gQP#OrfaIHXZnlhLms7fC9f?Ku7Zhq(lwIi(_W9?k7>@~P4DY0~g% z(DGq`Z1YKEJIK4Y|e7+2eTlG%pxXq_B+wtjtzM!{vwYQ$O_n$qY=QCK(M`v$iwS2tx z*3?{RbFrR}&fX?!`FQQEr>*Dcn|eNVdOkXPo1*38wYQ$OBX516=QBjlM`v%% zT0UNT>uLMs^=I^ahLX?plI$%FKDwH&y)`v|=jl^=KEw2UboMq%%g1YPP0era+pFhO zujiw)w{coNUVCe5K6dJWp3iVSADz8T((>`zTT}DlKmD1WPg>7MXKz!re7yG7)ZBgI zw4TohJs+LDwP^Wx?X9W#;}`DN@rg@AS0dMK4#lvE@z732B9W_*uWwH-K6wj4dt#L` z5-U9;wdtXUy3L9H$`yTcF<}W8gK93tKEd#LJJeii?1}Z3QP?$5xYj&9JAhxEiz|GV z(sqM1Vkzl^$y#K=H~tolAjQ!xMOti-Vojc+Wu+k$bD76q;B-lfV_b@~%^<~od5V@j zhETK|E~Y4sbt%#crvzHvKTnaCSExBeAt@P$K*czFbGJ$RVpmwnFoxs|Ig5bIn!ys> z^~3%%rQ$O;sqIJxYU>j8aG=u+L8r}FeeCW$YkvU5<4It>V|gL#Ic-CdjU2BIm zx3+E8l{kt8qnW#9=GubEvf^U!X9;(dlrp{ilb#MYub*fsEx>Bf>4%A9PRMuLFF_sanW!{aH^x<6(ey!Ww>PLvxf-Fn80mJZz3g&*H z(_(IBs}@sg7IMSdlG=SUePxxtw>`1GG8sxRj&6Eyj5^;s%pVjamp!jEf{JB-_v?G(*?&lxfA9~BBv>kV8 zH`A}n_%L*pQ|jo`oguKCL-*xhSp?~g&(rgUDI#4P9?{dA>C)rW5v13cr{@hv@L|voU)Ix` z<Ucblt0PYo>UV#KOoUn~*2zCGS@U)vd8 zxhL(Kv-Refv-Refv-NhLxlHc!aCiWGYVd2vRJBgFNLH3er`(~Q=HqRHY?iOcm*g@W zfZimBXZo0b`jDh7*_6$8P9vlbcZwZI6CqvP*>xbz z`^~|!-y@eb0a|}cdlcWGJ?beV-aY7oFW~p25$D_+9|R|Ma0cTOi!@MqxXXs6@W%@S zDug4*i-w6TGVF{YpUC3|&rdO9>gCC(8`e$P_+EDSMru0=*K-nr5*Gi{9gnRH79mPw z(Sil*_IQbwuO1(zE5v_ zaTf~{o<`WXuPskQL%rLBxUexce|q+^dzUWp=tIZHZr7BJiLM|QTLiQH;a!(Q?S2vL z!sot!_il4_u+S#@*t#>zf<-x;r#0maT#9G#UPZ_J3itJ9EixYLREs;JJUG-oSj|39 z$(8RJasaRc9vH3T9>DJLz(|Pa2(2$4t9@TS_KFQ)u}Z^mJ%>N6t(_zIQ$8FRa>d{; zebsXft~_RK$|ryR;Xlt`w=lCt!5IV!zCYsin+no}I!+pmNfw8Ojc=gj#W;BlME;hl z{cUv}gWCJQ%k)lWES_Kb^|)2{|J~nb#^L$d`n%37diIsfcs&2X?5b0b-gY80U*2+v z{|2ID)o{k>Yu4S4D+$5k7StN3>gHheBzV&5?FPHpkdS#0jSB|bI} zO9LdLH2lRN(eb=izBb^=x$k`SSjLcp<``s<2uZ*As#CBOG)&o{tW4x@O!lX!cYayw zeNVu(I&0nXB*u$Js@(S!X5L5oS??0#xlRl^>PkV(7{?5L1vpqWHI0FYFus^_mQ1D9 zhVjLemwhm-D*;>PgVB0SndgIX&h z8-($IY!F6W1z{YbgD`3^2&>V+`e|VOH86TykRClS2;(RdgbmWb25VqE5E;a+)4+x( zn7@B{`p}f;l)cb4ek!%fUKWY}my%C0hOv7W!#4!=c-Y3k%ju`20d6GYZ1dbHnml#w37bkJ+Je{s7!fiHF03QC+n%~fg!u-;NABL!-T zG#2K6^RVEZ3ob07?dwa}4t)vrsxP58=u7Am`VxAEzJ&gvFQJ#{OXw^55_*ijgnpwh zq4(%Z=tKGvdXm0`{-iIVSLsXWTlx}un7)L5R#-x-ptoHo>%#uh1S7>+A!B+E`o*D!D_BoHb+mLqvi|x*$~jXNtStjmW|POuT{U5vQn-@UI_}P z;Co3J=2SRq9roQQ@%4Br?Y9sZSH$|skCPk{T9KJnBJV;}vx~-?Pb)C@^py%ah!qRt zDfynnjI<2JuL4fPJNHMb@M9R&ODQRiZGgP=zybd=WaSTS(L>xmQotA?Tx9d2aQ~HGb67{Vpd80WCL6b2@ z#nr`PLTereWtC#reBSY3hf43Oc+h!fJZPm4R6OWBU#NIc;#NFJQ=(GEj=+wqPUThL zD_N`zJ8|8nYJ5HyT|C&V(rX##e*SoH7Pl%?vf@D}esiFhGwFBgwbcb`{4QqsomEH8 z+<3g87S}nqY;k3abB*wKvpAOypFYD@u@y=B;WXs8@A|>H-!9lx{lsolCXRjjjj4b= zgv>#g<*mq!2CqZrXw;6(0evkpv`Xdf8|t(vVwU`}+NF7>o5)J~pe}X{*ABh1)jY+PS8EbLW=qm*pax05>2=|g7I(uT<7x;7*GFktld89JVj)K$9Y)(DKhWnRGJ1B9;b|QB(}(CkrScy|a&#V~1kPA*mGw%7tm=Vi^33>uw0{yA+x-6z<5XQ^ literal 0 HcmV?d00001 diff --git a/AIMS/Template/麻醉收费单QHD.xlt b/AIMS/Template/麻醉收费单QHD.xlt new file mode 100644 index 0000000000000000000000000000000000000000..22daf28dd3c0fb26f7cb8a23f9712632bde4a7f5 GIT binary patch literal 28160 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 literal 0 HcmV?d00001 diff --git a/AIMSExtension/AIMSExtension.csproj b/AIMSExtension/AIMSExtension.csproj index d1e1ba9..b99908e 100644 --- a/AIMSExtension/AIMSExtension.csproj +++ b/AIMSExtension/AIMSExtension.csproj @@ -44,6 +44,7 @@ + @@ -72,6 +73,7 @@ + diff --git a/DrawGraphManagement/PdfFilePrinter.cs b/AIMSExtension/PdfFilePrinter.cs similarity index 99% rename from DrawGraphManagement/PdfFilePrinter.cs rename to AIMSExtension/PdfFilePrinter.cs index 997a436..b69c723 100644 --- a/DrawGraphManagement/PdfFilePrinter.cs +++ b/AIMSExtension/PdfFilePrinter.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Printing; using System.Runtime.InteropServices; -namespace DrawGraphManagement +namespace AIMSExtension { public class PdfFilePrinter { diff --git a/DrawGraphManagement/DrawGraphManagement.csproj b/DrawGraphManagement/DrawGraphManagement.csproj index 869fb5a..464b850 100644 --- a/DrawGraphManagement/DrawGraphManagement.csproj +++ b/DrawGraphManagement/DrawGraphManagement.csproj @@ -139,7 +139,6 @@ - diff --git a/DrawGraphManagement/MainUp.cs b/DrawGraphManagement/MainUp.cs index 59e5ccd..9d9080e 100644 --- a/DrawGraphManagement/MainUp.cs +++ b/DrawGraphManagement/MainUp.cs @@ -13,6 +13,7 @@ using System.IO; using System.IO.Packaging; using System.Linq; using System.Reflection; +using System.Threading; using System.Windows.Documents; using System.Windows.Forms; using System.Windows.Xps; @@ -638,6 +639,8 @@ namespace DrawGraphManagement pDoc.DefaultPageSettings.PrinterSettings.PrinterName = "Microsoft XPS Document Writer"; pDoc.Print(); + Thread.Sleep(1000); + byte[] bytes = File.ReadAllBytes(Application.StartupPath + "\\" + DocumentName + ".xps"); // Print to PDF var outputFilePath = @"E:\PatientDocuments\" + DocumentName + ".pdf";