From b35d1dbc4406874c1b6c7648c8ef4419c436dcb7 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Thu, 25 Jul 2024 20:17:56 +0800
Subject: [PATCH] pic

---
 .../files/检验结果导入模板_横向.xls |  Bin 0 -> 26624 bytes
 .../files/检验结果导入模板_纵向.xls |  Bin 0 -> 30720 bytes
 src/components/doctorCheck/CheckItemList.vue  |   40 +-
 .../patientRegister/PatientRegisterList.vue   |    9 +
 src/router/index.js                           |    6 +
 .../customerOrg/patientRegisterImport.vue     |    7 +-
 src/views/doctorCheck/checkPicImport.vue      |  194 ++-
 src/views/doctorCheck/lisResultImport.vue     | 1294 +++++++++++++++++
 8 files changed, 1496 insertions(+), 54 deletions(-)
 create mode 100644 public/files/检验结果导入模板_横向.xls
 create mode 100644 public/files/检验结果导入模板_纵向.xls
 create mode 100644 src/views/doctorCheck/lisResultImport.vue

diff --git a/public/files/检验结果导入模板_横向.xls b/public/files/检验结果导入模板_横向.xls
new file mode 100644
index 0000000000000000000000000000000000000000..e134371aa8eddc78db02180449a4958afbd7d7bb
GIT binary patch
literal 26624
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
CI0Rb&

literal 0
HcmV?d00001

diff --git a/public/files/检验结果导入模板_纵向.xls b/public/files/检验结果导入模板_纵向.xls
new file mode 100644
index 0000000000000000000000000000000000000000..e3e829235df5e4a342582d42e490b043194268fe
GIT binary patch
literal 30720
zcmeHw34Baf`~R8AB$*(xNFrjJL=Z$InQSQ8QzQt2s(nes-l9QErIxk`f)*iFrAjGE
zb+OgjqSDsBRBKD^yO%d8&HwqHlbgA7=gt&A|KI2TzW>}fbMJl5bH3*}-}9X3+<Wew
zao|_Cv!AT<ImZ-Rb7sf>E_PxLGP#D1k@)7ySRFdR`QOFG#X`s!9hPnXK@2=0TkBKj
z*-_F_vZsVTcci4J<V2|)rSg<2P;#bJk&+7~aslQ>$(>RqN*<IvDS1(<Ov#&46-qvo
zs#2;(sXC<^lxk8kQ1YeZN2wMie@e9}!Jm)<=(wKj+!n1y(hH*$PAP&?B&8@yjVU#u
z1iZ4%l7aSY82yc;zDQ(4X+NBeA-0}=^CFLtP_<OdpvNa;+xaI;5<BtP>-wvAUpoDp
zrY@bvz}aZ)OtlYZgIFJK#~>kmhEI2<)kyVY|1?EmVXK#gW+F?YmXD^EC$Qf1+52e#
zWI7&HzlP2+ex9~|6kjiBBKA74H`oyR>&>}uNxhK4Ie}y(8$icHQNYR;P||+T`Ly+8
zEVqEsv^nW%6g$|n&CWkN?#R|K2O9k6n3jF1+d-d<ou|}|y+(FwqG(`+Fe7~${_k&b
z+=kv7*sz^!ZAM2LiY7RxKBv!0{BteW*up=X@kqqjjqYa}VeDgex~GZZdeix*AOEaK
zpBnZpFY_ChgiwsyOZs}23tkA`UK7jOvz9EDrBI_i*zY7R9?x^xyTtjlt{vJwk6c!Z
z1x^KCyT(H9VMShIt%ZI$(F!wpCbcV^Z2@s+^53bkl~wcut?28l$ia^~KJ}dnKJ=Tb
z+JiW*W+&z%b$OT-e7zNYH!J$CR^*ke$epanmHkpf*MP=PC8qIX7mEF8stcr4iv_c$
zOh~%1hB9dlT{um_-fHSy$tTlUKi1t!!AP37t5_BcqPncrCh}_NV#)bySTAb3W(i~f
ztItB2rYAF$7+9Z<OznldDKpPCZ@Zd?AF<=dONp{E{J4g$GhH0i6O~!326Af^AkP}~
z80w-X*4rVPt7fZtW!CjX#nCKUrCt450}45uMDunj;VfIHreUk9Ml|+4nWh_EddYjK
z9`#Z;7C=cZ??!Cb&^0E{^ieNj@)2u=o04}{RTh?vR<Bj$in<f2W`nKbwk$9Ko#j`m
zjNLD}TF~qCG<|M2K(3*<bibJ9#CvqWH`{UqR5g8TazLu-|2NCQDK<IJjGUbF|3E1Z
zv?6!1BClsfUSCy?dmD-W7(<Lf>UZ4lsL62;#O3*JZeHcR$}^o0_Y>R~sp;chNllJx
zE;Tvsskr<IBWq&lmPz;<?z7b7xc8FD=~heVm&(a+<?X_K8rT28&23)!d1QZmZa?nb
zBzg0i&1*896PM$DPLd0KA;&$QkY{8F{b;U_`#vr|!g|FRw$tsNum|^oCGy@ehTzh6
z;r@`zH<Z{}Vh`>a&E<_aKJFvU<qf!;02T6JF30_*xxT=$l-IO^6KF*q_Kf(VUQ0Wx
zTfrB6TH0yNerxz%R`5fu*f0FqvR-RETa$-d!MA3=HU7P=*dO(b_||w3a&i;$6Z)X>
zVjh>u<Yx2ZQ}Tm#BMse4(A9wjpFI9kAeDF?tM_1I5m-yNRMy}^?a#;Q8?td`azqO)
ztvS(MHrF-X-&dq7YOQ4fgb`DLY?fWRAW%|ZoT3KA7YDkt5H+k{zrM6UITe|sicGH}
z)0N1IiwjEetXPZyVX~OC|ET~*swjXp2PA2;QUjLXOf`%jKVDfwtb!A))!EVQfJf=7
zpi~2T!b+`55G?lnk3q0nD1j75mn<1^V{BNWbRsM_+9Yh2qWv|gfMcmo$O)5tLN1eh
zLN1ehLM|)yiGsY+4v;)MIy$RVR?>?~qYP$7MMp=M7LbgR%Os=ZGRY{pOfu^3-MgiD
zCZkMsSTV}i%qV$lC8Ojr$tbx@GD<G9Wz?f_76U}dl%JVV^43a5$z_sJa+ze5TqYT{
zY}qmkrsNB6B}^%YLoG5&crqecakj<+M5SdN6^`joMRnwwmID(OV_>Qc5$W=qvT5m_
zhfSq*Sar9f!XgU(c<UDn>u52uRAvRFju}Yt9!rpX=I~D-b<IJp<(C$a+%iA?A1w(e
z1+m5nDU@zjnu8|~f)hKIp7ET-ibpFT){YgVJSRv4nI)k{HIUM_(1Dfa1j<0fV;-rH
z6iTIY?5%(_q%0FBnDeDg0(lB&3!*X-NI}YTf;5tWgc{XAB+Ib3(wtx!h<NNJ6_T1G
zonvnWB!sf0=A>uf{!-c`kf-1zl*&jT1u4%7f@fe7NT^W_M6wKfE6oX$fr!U|QX#21
z(mD24K=2e!vLrpjQC30%c?wSO7*7HzNO?{WJO`9OLXB!5GUKc@CrSoFm$9-EQgdV?
zYaoqfAn6%uAWy*w9%V|+DM)!vkft(_P@@{iQ#9u#8HjjHEEReNPMXO;(lfB8B5e}L
zQ*hFp%9uELPLOCBNT^W_M6wKf?)G!E6pFK1@oc>hn=NCJo(C3dSyYeRQ=keh*KE6D
z?A@|;eD9uZ&-azG9r)fO+mY`*v-N!MmF+}(Ct94P2UV8`|1`^@3T-*60y&}zXS(gu
zF-^v_R%!302lk(>uVHSHwtTUUNx7nk6MvYdam<`Q-vZsvh0u{BR9$G<m7f0<PWfq8
z-ChFUpui6=wr8e%$*8I@3OEK@(6%tj&XtUka-|~GOhrOfinx^)LBs^R&h$z_X)Q*T
zBJQO{5FbU68m1y)Dn%-l7C|&b5hr?Kf%;<3%=C5^Y-v4+E#ye52BG>$Mb(q5J}Oo9
zh3Y5M=DlT!>P4!^5vVTA4}Gvb^FsfQ9pc-)lsQ|k?1ReG2c~?fSS=L$`-5eDtrhd8
zVy1kl4gN6f<-tvRSr}$lg$zTEP<5nNHZ)8#uFGt_H&F?p*fbiSVhtPD1!r@#j`X$=
zsom^usaBQLZgv-HPOL5}*5)>BV^OiD8dZ!Oq3THwDD+Izq^DiZd+D9K=FcBKLAY5R
zb2D_+i}g&YB_Mq1iAF`H38jZ)wV8n)GZ`!tXY1jHP#2p<SEINhJ>#-o0(x__zVsxF
zpu=n^T0++(Xj>&D=mvm}cqV8ALE9=Jpgrlimj$OFK*_1E1*g(@^d%Z?atb&lr+zj$
zH9-g2=2Q*3mQ7Ag(2Z<!ss`<ElT!)WllsYmQv@m{r?o9Ol>(M8g-@HD0#3<k9h;n*
zphInQss>%xCZ{H7qis&rpaX1jDnWbFFtOkikzC1XJqu2yi0(_TE7;@|a7s?=+vL;)
z9bubOHRuL5IW<8?+U8UZI?yJk60|41FK5ANxC*BYEjY#Hz6g4aZF34ZC8t3)IW<8y
zvCXL(bR(ObnxLE7=2Q(j*e0hEv?qJXlG6wkPD3m>#odqKw3%&A0jK0N)F!7U=;pRL
zRf9I#<kSQmZJSdy=rEg{O3+nU484)6iKiFi2Gh$~=`4%VV0w=tgr?mpELJ@;lxN1N
zXBv5Cyn1FB&rDFy4Ck4N>X{KdGf6!&l4rh*OuU0RN~I|+)H6j>TB>J?rnFMe6irE1
z&lF8bQO^`jX|0|a$@=QOC~=SFA6})0bM-%0m@CUcMryL14$sLMd#}y;80@7DYZfCj
z(}$!tvaW+C=0eA$=|M6*M;kO|uGcs^n@S0fAmp0-xOMNLz5AyR4;npWuyaA{a=Q$!
zG3Um8GAj3EWZ%sJiG9}ZU$gn&EI!{ScF*ENAD=pYp>Sg4FK0ZCE=+dr5}5DkJT?92
zp!dJMJvMN8)fK<BsP;qP;B$LCFJ2k#y>G+xN@rT`9no%Ft)sb<SAYG7;n>#=j{4pT
z{G-Q4|AEb>z1;co;i7uy6R$O>Q%)Q8M1uyJ%ucC3_rNJy#WK*-9gt^Xb_fi<(WUjU
zs*$c+D_<V}%Jr?Y`dzCP>gV`P^YeAG+!I<&t@e5Mf%Du(Z8X$ty2*3jx|nyC3^<tl
z&gnM;esgG%-Q!Tt!idC$+K1(<5AWQd{gQ!u_WCyL)6@Uv!gGZMx1Bd`8h*cb+}6GY
z_Pqz}S=)W(qZ)1Oyk>`8eK6|fi8F)#T9g~$?3P~d=7SM|k5_H3`Sxq}H}-nhJz@7(
z+V#aVY9{C1NUQIc-P=ECU4`Yh2k#s`!GG+9cD4V!tb1H%!}^Y^BN{mQeST|Mfacq8
z>r`^@HGb5&Z`$q{Re!RNKA>j(<)f=tZ8NBx@5Lp_8%O12?s>0DTvq5#mu0uw`TM_g
z`9a4gmpW&yO*_!0cftjSuDgaVE-trury+mnmBwSjg6gh5UiJRP9#?wWt?0Jre%B`%
z+qyhD%sg~o9?G9~<*RjPPTvYI_l4%C=q6)}Ufp_Q!Q{xt!`8ljdeDmT<=4h;EPmwk
zcJSpmkA_<uE<E_r=ldSRhP-jjtH;FQV@EijS$XsR)rO=MQv1qC=k7zozTG_S=-gbV
zrH*YzZ*Es}!#CwFC3~dBcj-QGs#EfX&t6SFVE3aVOO2W8-?CZbUvKN|Q@3?b*f+n@
zt=xolX@?hA&&j#;Fx7DE-6J`R^iliz?b)`-_k>&W+O<6&KX~+m@z(um%a_kw^l|e?
z7w+9DJp6L>rSAiG*?o}o*|}A>wmtakRNJlF7L6;qy07!lEx~uT72i8KY}?yc9CkK;
zHT2Dg_YX%eiXQjy=S$=NzP(#>rZ98x&X@gn?A$!1?Uts2?|gk_`-y@(^S9;w5RkNc
zeN4!MtnY5_KcPLHU+e158-1IOE{baLe)-Wu{=NNtlbnYs?t2O%&+pdO2uUicGRooX
zy9@Tee>-z-(#?Gj3wHkzd-+88sLIPa4gBk?3LEBp*Db5>;DcLQx2xZ7Qis51_j6i@
zWPNe7xo@X#Gh1xW>s9H>A9YVR_xmL`XYYynpDsJ7X=!LQqH=7DuRRwoed~1drE5AC
z-Cj3+lJh$&CO+18XpnRKK+2Nc7lu!AAL#Jdb>E4^;Zc{~nR2bXQ{If=^d8Z><Gvd_
z^z~QP&bn9CQ1j-7ng_@9skPC+!@OVPch8@4ecgb_q?Q+VR&43B@Wjj?JX(2-`8IFl
zj+yhf#vd8A*RECMXMfe$(P`7KUK2Ji&abm9{hbwcjW_pR2ru~JQT1Q0=z6aXHC&(D
zqpp9m4qN_J<@ElnJ!cAcZyZyx)9yDb-HZ-6*eoo0Sl<(#*BV~k8n>-;X7Tv72NwSO
zF2#jq9ur%w+STjr^T#gT>Q{K@t+;^dKQ;d0y||CJ+lMWFjZOTiP0uE;kEy=D&w~|N
zp((x2`OVlceNW!wNqa|oFRjq#R(Q|GQxeWKaqsb??suR2UmpH;=ix5Hckg_Btjns;
zt7Zh%(C)i1`s;Qxc1@4HcsXOxm^t<T81&7o@9zZZ15QQy_D;!|b0RA@v!O%B+<Q-a
zCR{Xp()r(=UfEDRFsMP%w6xXh*ueBoXD9u+W8=!g$g91yNv{ow^LVd*+c7IEpFFy6
z?83a$9x1D|D{r@7x*|LMvr|*A{dnQ?qZgKC%}D9$pELZcmY4Tlu2H9t$N42qj$R&<
zxn;nbQ~N)7^<G-Q)K|R2UY%Dw{fER6&RMH|i|NpzUgp)0Mn1lnW!I`sOqV?$Z@*E!
zd7UapW~A2bnow)>L(dkAhCP@Tko@E1>%MN6G{=|BSrr@Sf3ZgGmU}wyZ*(}O!)o6J
zU5Av{o%^WvafdErj_-{<bi==JpU&}6%I1(IejkmupZx3BJ0GSk>{;!Lz>^gYHOtvm
zX;@1C#}y~I585!WezvdM?WxP>zHIcr-D$nY`t&EO!#<14`uX^TP4C`)J>e^F&+0#T
z{HxlUWm`U7y6wY|;O{*Ly_@ahThHfQRD0)R6;>W?y?@QD5hqT(@oPl;S;mABCyfm|
zw(EX)b)RDurbT?|zJFTyn2AUIb{`1(x#GvkMJxaOrt+)b4sR2%S*P2Q^YPMai<bI&
zADKI+%Mp*lH>z}6&^_n3t$o*RH?H_-c}wq=XS#jYeM;Apwek<|I6JvX^oiA-8dhlS
zb*WYL0Z(>KepueFYBalZdB^78t9<BJS?~PY6G!Xw9p=QI!_x<k;B%sB%2;-6`K3*i
z7ePy;c)LvK1VMB1%wGrY3a;?pt;t&_9vs*1&@S)VS&f$E#y46zj-3k_pXpciRMl&z
z+U{{Ew^={w(_2NKH~V|dw1?+DxMc8Ju+m}I`S|Glndh>aZ5uyf-{eo1*VcC({o1=r
z-#Ybm&n>A3m%j9KNY!O6z6t)&-R1q0ZMU>v6W8zHKG#F75>JKo@gKi@*6Tfw*POqo
z%GrpN!}q<~ACK&{X6A~0#b50TE?Crd$N05@7ZP<tBR@zP@MoV-Rx~Q?ur+r@`pP3U
z4t)LH!((DrRKGNESImlPlsF&E{dg_uRV7OBAW=Sx3Vr1zKnY!~%k2#Im{c@jlz!N-
z!<$@Z)%oN71FMhNP5Lw3IU?G>-Sr#JYXbE_@AdvZZ@}hxAMLBuH}rH!=1L!ZlPe#-
zzF^0Y@2<~?Y46o$%E_kvzU(z&#<0j6p8aPf2ehu^-##EHWd87qbz9BJKQJ}zVfLD+
zr87JI>9_Q=*u9$%v?zLG+~PY6HDiD9-`dCZt)r~U+|&idUp<NPnbN;eO|R~Mw~HNd
za<YBEk{=7s)>^nSMfX$JO`CR~F~4#!eBpoS0kyRnJy)(o`>yfBhK@`hI<jZlnAg%r
zbjM}G>RJ2S><V^GENbz1;)RB-^4G`cYhRhLXU3i-W4G_k^Y_|!V*T=te-))1N{d@z
z@ERO=vT)<2(cRV*6)w*5p7XD?D;;}ePVP6ZaK);7e_gD%`Dp!+RJ)0FzqqHF)8qKO
z$`>xW2G_gtS=yCFjeoB)XYkBgpZ@OX|M`aIGq$gv{*hC!=*96Px_d<a_+}sfUq=6Q
z;Ejjb4F@}Rn)z1a<_i+4&F)mRXIiCIhg^4_4g7Ncg6iRC0#3&5T{hzTId4`z^kHV^
zh`GTX-*yNbw>EUaWuLTRt`F^#4h9F#+`aZ%{o-cVa=sYWwg0+1SxtX3+--dK&qsAH
z8gp}uf4huvYU(uq;jn9MQ<F7X4|?<}T^lN?q6}J-G|*=>E%>VtCjiv_(e!u?uTpx@
zlO@R`%_~(7Q&KLeG^(@=_rj;I3=qP#ZI!`wve;mtKPCBauvHR6O>8Jxm9F09CDog$
z9C|1(xJ_0quR0KgQKk-4UKN`_?P-L|jpE1r8d-^<ydf}QU>(^4Lw0+RnrzQI*@<2S
zil)(($sHkwzA%-exS^S@@5iRgWO(bqf!5tCFh{bJwqggm8+H^=?rF8#(d<lbcIISu
zR)L>|V%>|%P1na-)PqOgw8F1JWhE78WyjnIm_Ptk$fzya>9ks)G}g|lu@3Z@NR;xo
zD5W(k^{jf0Ebu^EX;acOV6te6IG(P5jv{R>YC)gcs72muqMs!8r3QAlfW%|vr-T%a
zAVI2E@Epy2jv_G@&Cr?kr!AM2sCZhR2(+ln+;_}*m`;x`l^&`wvu(OQ-a^A{AXs{j
zc@<IvnpwbL4B6;QbC?<W(QJln;LoPQRp>8`UYF`ai&E+I?aq<(janR~()T;l*$7G_
z=}VM7X`!kw{iXA7-G)%^09wexH*wWVgj$rCsZU}vWp(4lFx39+b?4HPyIdI(!BFfL
zn=%h_DJk>tW*hRbSLR`CBM*CJ9w<j1_R2i;D)O*b=ApgF!-!V0p{1oNu<`7?Dr-Rv
zNT^MjC$$*lDf1-D>C(a?PqG{~D$8NcMSZxYSLV5u<Y8`C=HX3dl*2bilzHAIdH9xy
zG7ql@qa3~|qRhjaz{rD5v+29QQM9M1Os`?{*YZj}=#<X!QOvTTQ1X#Y`)r)h!S?Oj
zX_w9N=;hZuV+N@fumaN0pub|0vkW@tFH2{0EMN*ej=(Wc3l-w!3aET>aURQ~^Wr=z
zOSpxFh0It`Kr+%q%A-WnNJd5;n>%+dV^ps(j|4QG8Y$)RL^5L@B_r9E$9iedr<3Wb
zu@~MeVGf!OER#klMr{aNKqF;=Y@~o2Y!Kxz9qUAYJ2ZMq^ljLyTK1S-rzZg77ZB{2
zrgwkM=%NnveEV=0=QKKZ%na;b)Pde!xY{POlTU7kT*?|V|7I36-p=pu#5BSDd2j>~
zA4S!N(I*va(|^g^+uo*w&Mc0_BU+`>L)R2KY)`$VX^ki7t?3JWq|u(f*4|khK$Rpd
zXqN`H6sV;Lwbmr;gj^i7poWwj#6zbAg)+)Ym7r3osx+aTN~H*@4b<8YR56V@A2yI)
z>w$;DyT$j*UCq8<US5k!Jh4@xU2Pf;o08zU1VbgY^bJ=Re(Xk{@IF0z{P~?jt^1@#
z_vG^WT;70xPT-Pk-UkA+Hoa;?@8Ga^kk1!cJt<=%*Pg^b>&Ue0%8v0yfwa|=9e+Y^
zUpSFfqQAB5740i9%xu%Je0uztZvrsOH9zS{R_NI{&Jtro%A>V9eokz%mU`1Uz45?K
z$<FPFcz-8TzK+Tbk>%TyJG68(<vY*-KII_JnHJ+;+$M^ssn=p;;~2w@u^5dDgADDI
zWUNGn1}kOaLRXZP^mHnEh=t0sWSNBwaZ#xULX|SaRHY2wrj#LuDrN9Yr3^7sDFatZ
z8DgYT1_qTf#A&4rcU5xP6Fxo|!)*v-;!Hzl;9i_*=?tukGdns1-{MS1XJA^K+0z*~
z#u>`DrJAHO4V{74?|Gh<&e{@=(A3d51HW%;QO=&v0k@-(hk8vY7?&m#_@oI1p6f!R
zL!jWg4lJ=4puk=e3I!1vik%q>Uf^?~5&{MHBS7)sC}^h%1!LP}i_Q!MqrrvGoM;iQ
zXMy6)QNWK0g@UFGg<guMGl>^_jsiac3Pu!ATsaDOHK90|p*WbKIB*nr7Eo|INGQQ?
zaTN523B}P2#nBAKk)yyDf#N7oQpa)>^qdKWp54=#)YE!16g@{lD}bUeX;CsqLC={`
zXwH$LIGLe1aTNGFP@Duxb`nQH&zVr*O(t95O(u5HFE0FdgMb2lVVCG>j8_v%c{7yq
zW+?PURw{=v1(fn;DCjv8N(D0%%q}KdDsU9cK|rZshJv0mp*WkNV5TymICB)tX+Uun
zD7kNNUeI$U6nf!=&ZIuV?~s^KDsmLeR6xNSro_va*&GE7nNVEJP!QWqC@vfYj}U?4
zB2an>ThMbR6hwKGEv{xLt{eqdlt6JU;U$vWg4kw4aWg}~d~LGDjicb&6DV$GyrAby
zDDGw`_<a`>iaST4=b{|Ny~LKpnB(+@-4+^-nVK~EnW2CBYp!)?5g5EIh7zvHuuY@I
zoN2NdyC2nDomjKODhw`tvG!B3VjhY8o%-u5v;Hz=3X1sRk6nVe(&2#raUYm15bF`C
z5og6rZTb6O`28%5D~t+I1CNA1mHn<3eBeKK!}Ynwfw?Tu9z|H<R|9{!ysO>v-LbS(
zy2GMXN4CA>0`Gr&4|`|~itV5Fq$RU&(WR1N*vaHvO6RWdb(Ou8&&yN3wY^l{8zBYw
zXa7t0AO!9E-`P_rrOi}dkqcsu6WbBX*rXt}IQuu*CazX_(b5mN%h|~v-+kCN({<G>
zJ!??+tCPVb^QH`3t04asO0;G7q7THtOiJ*Jk(AJ{izy-AAD{#~&Qe1ByG{x7*8@tp
zc5o#yl>d?n<6K9DYSJEcV8b!=<M}VVjUfEqv?6Gr`{{IA0USVUg5p=+MwI9RBbC1s
zmd@7<`;l%RT17M{5J-(<!{)HT-;aIcHO6PR>>1w_gwyZr#Xw>IqdWM`J=lN&-kFd)
z5K`v*FQK_S?qmPFn=SseM}Iz=A5_(K&OG8j@ZlQp-+~hC)ldqcL|ZoGxbnm5k}IVc
zN=iPFk4@T(v$D_sDFgQ8g~P}T@f(C<E&ADhk1&dQN<RBNjXj~HR1KGrFKBz#`d?7B
zr7-`$*I!CR*+CftWek)tP{u$R17!@9F;K=p83Sbulrd1o!2h!hSX;lr`ipY?CV^!3
ziZz`alD()kom^V{!8#i@EKXsK=m89&H6koj;ZRR|`o~=9K?T;4ylGJj&nyh|7!zxD
z0klAbb*^AqsMFIviXK$p38x2PW8JSG?QssQ+LYpG<pb+)LuvJ61pOK4$x|OTkgv>*
z<mdRJDgI}SbpF3Y80h~5u=YPRz^*zk5Hp0Z(8d>uiM1E-^&&Biga__lBxV@lp&wr)
zCcc#opLmg&5rhYSLO-?SZ&3+9!y0Zft+ckK_159!LH)?j`jQvH-v-d?Z$El-3ah)=
z;ET$&V>o{>z48@LzcrFTFRX>r`=Uwo0$3QG#nVb@I33~lJR<0SxJe>OJblIzdKBr0
zk$xoouO?9>!Dl#~M{uc;v}5TkiBKZBb{OSGk|dP=P(GH<lSs=*h#|B`Ek=HnKv?m-
zwnWlH4WV=%OZiEZAH_?>(msM?$5KA*OXL_v(vKyrF!}@<%AqaDMNLR?yhJETg6RzQ
zB+(IGe2buCBWZ`zIWQ6^N7OCqL+eprBK<{hq;NViay>8?N*MSL5Mt>lfyyUQU2$|2
zM|miLb|;kVA;CFV0N;_6)0oPm#oz-BN01Jfh$pQ`{ufS1!5lG+G$MJPzzL;u*b+yj
z8uNC9)80rZ=rQyP_TiKt!mYy|y%k43fi-*h0eU`(P!g$z1j+{sQB)FEMiClb4@5m^
zDP9qTC9oTHgi<NkBQXO;V@U&y#*rLsf^paaOOOMr5=aZ}1=qn`6WFK)9u!FlOoA8K
z6G4AqEQ(Okz7YD0BstI`Ne^uTWAHyP97j2@4@`o8cmq5L-UMz!=m?DB6B00l(r6XD
zN3<W7M{-@@z&5lAcAyM=8tsOsKp(mAA&dtwDe|F#-UANC0mfB4)hxVC)Bt|b3M1*F
zR~vKOBsvE&tP=f)R>S+zBfv@EEx<TH-$DX5Fd9)CYK9f47g!iyiKK(F@GbZ@{M6(J
z&=xkLh6JvMHo>FO$_UB@v+=Ztjj#?r0slp9QB(%jU@XQ{DQKf_kO%!Z!Vw+@@4yH|
ztI==p+(?cKU%)YX56r<Yp@rxH&q0r1lnD;N3yzR)B+KBDhyWOGunds{J%%#qZ^VZX
z%EKrVJqT~c2!d~+U8n~hgSLioY@i};g;Gg)4(t@Z2xd?}{1D7y6rrzSC1MVGRFp(7
zpby|_U<sCh4MalViGIN-0spWVo{XM?ZAhpYJpgv#<A@6wx6no&Y(wORk7LAu1$a7`
z6}|>-F*XxP1Gb}$;26ijGCx2s!C!!cQ3K{+3G4&2(1xFZO?U(B65|TJDMmlM7%>+p
zVr~$z1hEgg7*XH>V-(Dzl{muKLT!lp@J?W$C5Q?bo8SaiiGBvhhyjSe@B#DzIFd#s
zc!M241`2F}4El&&V%z}{{s?^Z3GfkJU^_TPj;KS5wBQ@w51Y|vq7N_*gpZ0AzzQTW
zcO{k}29rf7iRh0=fVhJh2$2q4Vx(cDqTS#Jb;Do8SVj+Gu7*d6xeP3!bzn%aj{ZgL
zh$K0VF`I~(C88!QM~sK9$QQjQW(IjYK!3w)gulV-MchP;f=`H&V$Q@Ehex5c@KG^?
z!7fB|^b=Txw~A;VOvi`?@N(FW{tTyc^g0kQ{)Oct`Tzx94;Il%_`jIl#MKI9;1t}V
zmn960KQV%Y{|KKGK8>D6n}i3V2QXVeiWb8o5G%j{(1C-fh?yJ_0zD^YB18ZYM}RA?
zrNn#^&fA5)K=cI%@K$J}2f-J57voKMDwq)72%kVJ(RxHt$l=-WVsMM`h&Tob{2t=~
zy^B6azrt>ed-yKK0C<KMVB}*Y!mr_Fz(Yy2LDYe{1ASwf7l4o6LyfQreu3BqG<+fw
zfe#UH&@b>dpg|X!h`z!@#W(_%un#t%c6bhO#QcuvE&2j+6kNbt(XY7r0dwdZ%t~l2
z+Ke`#HxZqHhU+>ojb29&qCa3i#+ZnFV&(uQ?8b}+8xiwR2a>282x2Z0F;~<Gt`Yw*
z(}`;jF(xpg#q0)lFq-ivuC5U^aUFulhql6Jzy$cmA7(lc9dKQQ*aH6%qg0G|umqk_
z0(?L!{1ammo&ryW*P@@`_lVMn`xrMUhY^VDV)!t$;Lq?O)P+`KJ`h&{B9h}i3D=1O
zC?Pr_-lIPeQ^nN@d;sMz?tqBC0N3aTFpD~2HO4lgIieoC24h0hirV3IVm?7EKq>SS
zJOjOk`p`0Q%_d?BMkRU;;}@-k4qAvAPs|@EEm|k8f?y%6!kmMv6KrUkKPBN~7+L5&
z@CwfqF&g!v29y*tK3XQ?Gol$<h@XeTy)W?GDWSy}eGR!hh(7WELt!skDrzUi|MKns
E0F3k0QUCw|

literal 0
HcmV?d00001

diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue
index c2bba45..627160c 100644
--- a/src/components/doctorCheck/CheckItemList.vue
+++ b/src/components/doctorCheck/CheckItemList.vue
@@ -31,7 +31,10 @@
       <!-- 结果录入模版 -->
       <el-dialog title="结果录入模版" :visible.sync="dialogWinMoreResult" width="800px" :close-on-click-modal="false">
         <div style="margin-top: -10px;">
-          <div style="overflow-y:auto; height:300px;width:100%;display: flex;flex-wrap: wrap;align-content: flex-start;">
+          <el-checkbox v-model="isSplitChooseResult" size="small" true-label="Y"
+            false-label="N">选结果模板时自动添加分隔符；</el-checkbox>
+          <div
+            style="overflow-y:auto; height:300px;width:100%;display: flex;flex-wrap: wrap;align-content: flex-start;">
             <div v-for="item in moreResult.data" :key="item.id" style="margin: 5px;cursor:pointer;"
               @click="clickResult(item)" @dblclick="dblclickResult(item)">
               <el-tag size="samll"
@@ -41,7 +44,7 @@
           </div>
           <div>特殊符号：</div>
           <div style="overflow-y:auto; width:100%;display: flex;flex-wrap: wrap;align-content: flex-start;">
-            <div v-for="item in symbols" :key="item.id" style="margin: 1px; 2px;cursor:pointer;"
+            <div v-for="item in symbols" :key="item.id" style="margin: 1px 2px;cursor:pointer;"
               @click="insertSymbols(item.displayName)">
               <el-tag
                 style="padding: 0 3px;height: 24px;line-height: 24px;font-size: 15px;color: #303133;background-color: white;">
@@ -49,7 +52,18 @@
               </el-tag>
             </div>
           </div>
-          <div>录入结果：</div>
+          <div style="display: flex;justify-content: space-between;">
+            <div style="margin-top: 5px;">录入结果：</div>
+            <div style="overflow-y:auto; display: flex;flex-wrap: wrap;">
+              <div v-for="item in splitSymbols" :key="item" style="margin: 1px 2px;cursor:pointer;"
+                @click="insertSymbols(item)">
+                <el-tag
+                  style="padding: 0 3px;height: 24px;line-height: 24px;font-size: 15px;color: #303133;background-color: white;">
+                  {{ item }}
+                </el-tag>
+              </div>
+            </div>
+          </div>
           <el-input id="resultBox" style="width: 100%;" class="commonFont" type="textarea"
             :autosize="{ minRows: 4, maxRows: 4 }" v-model="moreResult.result" />
         </div>
@@ -70,7 +84,7 @@ import { arrayExistObj, dddw, deepCopy } from '../../utlis/proFunc'
 
 export default {
   components: {},
-  props: ["isCheckPicture", "registerCheckId","doctor_check_check_charge"],
+  props: ["isCheckPicture", "registerCheckId", "doctor_check_check_charge"],
   data() {
     return {
       resultStatus: [], //结果状态提示数据
@@ -103,11 +117,12 @@ export default {
         result: '',
         index: 0, // 明细序列
       }, //结果模版
-
+      isSplitChooseResult: 'N', // 选结果时，是否自动加上分隔符
       selection: { // 光标位置
         start: 0, end: 0
       },
       symbols: [], //特殊符号
+      splitSymbols: ['；', '、'],  // 分隔符
       userId: '',
     };
   },
@@ -380,12 +395,19 @@ export default {
       this.clickResult(item)
       this.btnOkResult()
     },
+
     // 单击选择结果模版的结果
     clickResult(item) {
       let result = []
       if (this.moreResult.result) result = this.moreResult.result.split('；')
-      if (result.indexOf(item.result) > -1) return
-      result.push(item.result)
+      // 不用分隔符时，不判断包含关系
+      if (this.isSplitChooseResult == 'Y' && result.indexOf(item.result) > -1) return
+      if (this.isSplitChooseResult == 'Y' || result.length == 0) {
+        result.push(item.result)
+      } else {
+        result[result.length - 1] = result[result.length - 1] + item.result
+      }
+
       let ret = ''
       result.forEach((e, i) => {
         let splitStr = '；'
@@ -435,7 +457,7 @@ export default {
           if (res.code > -1) {
             this.doctorCheck.RegisterCheckEdit = res.data
             if (res.data.isCharge != 'Y' && this.doctor_check_check_charge == 'Y') {
-              this.$message.warning({showClose:true,message:`该体检人员未缴清费用！`})             
+              this.$message.warning({ showClose: true, message: `该体检人员未缴清费用！` })
             }
             if (this.doctorCheck.RegisterCheckEdit.completeFlag == '0') {
               this.doctorCheck.RegisterCheckEdit.checkDoctorId = this.userId
@@ -689,5 +711,3 @@ export default {
   font-family: "Microsoft YaHei";
 }
 </style>
-
-
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 8fb7595..7249c7d 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -1144,10 +1144,19 @@ export default {
             this.loadOpts.totalCount = res.data.totalCount
             let curLoad = res.data.items
             // let oldCount = 0
+            // 处理分组/套餐 排序混乱的问题
+            curLoad.forEach(e => {
+              if(e.customerOrgId == this.dict.personOrgId){
+                e.groupPack = e.medicalPackageId
+              }else{
+                e.groupPack = e.customerOrgGroupId
+              }
+            });
 
             if (body.skipCount == 0) {  //查询
               this.tableData = [];
             }
+
             this.tableData = this.tableData.concat(curLoad)
             // else {
             //   // 懒加载 ,原数据集不用清空
diff --git a/src/router/index.js b/src/router/index.js
index 2517a46..6d911b2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -459,6 +459,12 @@ const routes = [{
                 name: "批量导入图片",
                 component: () =>
                     import ("../views/doctorCheck/checkPicImport.vue"),
+            },   
+            {
+                path: "/lisResultImport",
+                name: "从文件导入检验结果",
+                component: () =>
+                    import ("../views/doctorCheck/lisResultImport.vue"),
             },            
             //----------------------  体   检  end  ----------------------
             //----------------------  体检查询 start ----------------------
diff --git a/src/views/customerOrg/patientRegisterImport.vue b/src/views/customerOrg/patientRegisterImport.vue
index 6ef9e74..6fea375 100644
--- a/src/views/customerOrg/patientRegisterImport.vue
+++ b/src/views/customerOrg/patientRegisterImport.vue
@@ -93,7 +93,7 @@
       <el-dialog title="导入EXCEL注意事项" :visible.sync="dialogGroup.fileReadme" width="700px" :show-close="false"
         :append-to-body="true" :close-on-click-modal="false">
         <div style="height:400px;padding: 0 20px; ">
-          <br />导入Excel时，Excel的格式必须符合一定规范，该格式的模板文件放在程序的执行目录下，文件名为："单位体检人员名单导入模板.xls"
+          <br />导入Excel时，Excel的格式必须符合一定规范，该格式的模板文件可通过下载模板获取。
           <br />注意事项如下:
           <br />
           <div style="margin-left: 25px;">1、姓名不能为空，其余数据可根据实际情况选择是否填写。
@@ -138,11 +138,12 @@
         :close-on-click-modal="false"> <!--:append-to-body="true" -->
         <div style="height:400px;">
           <div style="margin-top: -10px;">
-            1、按住 Ctr1 或 Shift 键可进行多选，在标题列右击鼠标可设置列名，即：标题列有√；<br>
+            1、在标题列右击鼠标可设置列名，即：标题列有 √ 的，才参与数据导入；<br>
             2、身份证号有值且合法时，将以身份证号为主自动换算性别、出生日期及年龄；<br>
+            3、按住 Ctr1 或 Shift 键可进行多选。<br>
           </div>
           <div style="margin: 5px 0px 0px;" @contextmenu.prevent=""> <!-- -->
-            <el-table :data="excelData" border ref="excelData" @header-contextmenu="headerContextmenu" height="360"
+            <el-table :data="excelData" border ref="excelData" @header-contextmenu="headerContextmenu" height="340"
               @row-click="chooseDataImport" row-key="id" highlight-current-row size="small"
               :row-class-name="handleRowClassName">
               <el-table-column type="index" align="center" label="序号" min-width="40" />
diff --git a/src/views/doctorCheck/checkPicImport.vue b/src/views/doctorCheck/checkPicImport.vue
index 76ce097..ce0f22e 100644
--- a/src/views/doctorCheck/checkPicImport.vue
+++ b/src/views/doctorCheck/checkPicImport.vue
@@ -65,20 +65,38 @@
               </div>
             </el-upload>
           </div>
-          <div style="display: flex;margin-top: 10px;justify-content:space-between;">
+          <div style="display: flex;margin: 5px 0;">
+            <span>条码方式：</span>
+            <div>
+              <el-radio-group v-model="upPic.barcodeMode" @change="upPic.asbitemId = ''">
+                <el-radio label="0">人员条码</el-radio>
+                <el-radio label="1">检验条码</el-radio>
+                <el-radio label="2">检查条码</el-radio>
+              </el-radio-group>
+            </div>
+            <div v-show="upPic.barcodeMode != '2'">
+              <el-select v-model="upPic.asbitemId" placeholder="请选择检查项目" filterable clearable size="small"
+                style="width:240px;margin: -5px 0 0 25px;" @focus="getAsbitems()">
+                <el-option v-for="item in asbitems" :key="item.asbitemId" :label="item.asbitemName"
+                  :value="item.asbitemId" />
+              </el-select>
+            </div>
+          </div>
+          <div style="display: flex;justify-content:space-between;">
             <div>
               <div style="display: flex;">
+                <span style="margin: 5px 0;">条码号：</span>
                 <el-select v-model="upPic.getCheckNoMode" placeholder="截取检查号" filterable size="small"
                   style="width:180px;margin: 0 5px 0 0;">
-                  <el-option label="文件名即检查号" value="0" />
+                  <el-option label="文件名即条码号" value="0" />
                   <el-option label="文件名左侧 ? 个字符" value="1" />
                   <el-option label="文件名右侧 ? 个字符" value="2" />
                   <el-option label="文件名第 ? 至 ? 个字符" value="3" />
                 </el-select>
-                <el-input v-model="upPic.startLen" style="width:150px;" size="small"
+                <el-input v-model="upPic.startLen" style="width:100px;" size="small"
                   v-if="upPic.getCheckNoMode == '1' || upPic.getCheckNoMode == '2' || upPic.getCheckNoMode == '3'" />
                 <span v-if="upPic.getCheckNoMode == '3'" style="padding: 5px 5px;">至</span>
-                <el-input v-model="upPic.endLen" style="width:150px;" size="small" v-if="upPic.getCheckNoMode == '3'" />
+                <el-input v-model="upPic.endLen" style="width:100px;" size="small" v-if="upPic.getCheckNoMode == '3'" />
               </div>
             </div>
             <div>
@@ -121,12 +139,16 @@ export default {
         routeUrlorPageName: 'patientRegisterBatch', //当前页面归属路由或归属页面权限名称
         privs: [] // 页面权限
       },
+
       upPic: {
         visible: false,
+        barcodeMode: '0',
+        asbitemId: '',
         getCheckNoMode: '3',
-        startLen: null,
-        endLen: null
+        startLen: 1,
+        endLen: 6
       },
+      asbitems: [],
       tableData: [],
       dialogImageUrl: '',
       dialogVisible: false,
@@ -140,9 +162,6 @@ export default {
     //获取用户当前页面的权限
     let userPriv = window.sessionStorage.getItem('userPriv')
     if (userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
-
-
-
   },
 
   //页面挂载完成，一般页面渲染数据放在这里
@@ -169,6 +188,72 @@ export default {
 
     },
 
+    // 获取检查项目
+    getAsbitems() {
+      if (!(this.fileList && typeof this.fileList == 'object' && this.fileList.length > 0)) {
+        this.$message.warning({ showClose: true, message: "请选择要上传的文件！" })
+        return
+      }
+      let err = ''
+      let file = this.fileList[0]
+      let fileName = ""
+      let dotIndex = file.name.lastIndexOf('.');
+      if (dotIndex > -1) fileName = file.name.substring(0, dotIndex);
+
+      let barcodeName = '人员'
+
+      switch (this.upPic.barcodeMode) {
+        case '1':
+          barcodeName = "检验"
+          break;
+        case '2':
+          barcodeName = "检查"
+          break;
+        default:
+          break;
+      }
+
+      let barcode = fileName
+      switch (this.upPic.getCheckNoMode) {
+        case '1':
+          barcode = fileName.substring(0, this.upPic.startLen)
+          if (barcode.length != this.upPic.startLen) err = `从 ${fileName} 截取的 ${barcodeName}条码号 长度不够`
+          break;
+        case '2':
+          barcode = fileName.substring(fileName.length - this.upPic.startLen)
+          if (barcode.length != this.upPic.startLen) err = `从 ${fileName} 截取的 ${barcodeName}条码号 长度不够`
+          break;
+        case '3':
+          barcode = fileName.substring(this.upPic.startLen - 1, this.upPic.endLen)
+          if (barcode.length != Number(this.upPic.endLen - this.upPic.startLen) + Number(1)) err = `从 ${fileName} 截取的 ${barcodeName}条码号 长度不够`
+          break;
+        default:
+          break;
+      }
+      if (err) {
+        this.$message.warning({ showClose: true, message: err })
+        return
+      }
+
+      this.upPic.asbitemId = ''
+      this.asbitems = []
+      switch (this.upPic.barcodeMode) {
+        case "0":
+          postapi('/api/app/RegisterCheck/GetRegisterCheckAsbitemsByPatientRegisterNos', { patientRegisterNos: [barcode] })
+            .then(res => {
+              if (res.code > -1) this.asbitems = res.data
+            })
+          break;
+        case "1":
+
+          break;
+        default:
+          break;
+      }
+
+
+    },
+
     // 导入完后，状态统计
     getSummaries(param) {
       const { columns, data } = param;
@@ -222,6 +307,7 @@ export default {
         this.$message.warning({ showClose: true, message: "请选择要上传的文件！" })
         return
       }
+
       let checkSize = []
       this.fileList.forEach(e => {
         if (e.size > 1024 * 1024 * 20) checkSize.push(e.name)
@@ -232,6 +318,11 @@ export default {
         return;
       }
 
+      if (this.upPic.barcodeMode != '2' && !this.upPic.asbitemId) {
+        this.$message.error({ showClose: true, message: `请选择检查项目` })
+        return;
+      }
+
       let that = this;
       let count = 0, err = '';
       console.log('this.fileList', this.fileList)
@@ -239,7 +330,7 @@ export default {
         let file = this.fileList[i]
         console.log('file', file)
         let reader = new FileReader();
-        
+
         // 定义读取文件
         reader.onload = (event) => {
           let fileName = ""
@@ -265,35 +356,52 @@ export default {
               break;
           }
           count++;
-          if (err) {            
+          if (err) {
             that.tableData.push({
-              importState:'导入失败',
-              importDes:err,
+              importState: '导入失败',
+              importDes: err,
               fileName,
-            })            
-          } else {   
+            })
+          } else {
             let rd = {
-              importState:'导入失败',
-              importDes:err,
+              importState: '导入失败',
+              importDes: err,
               fileName,
-            }         
+            }
+
+
             let body = {
-              checkRequestNo,
+              checkRequestNo, // 检查条码
               pictureName: fileName,
-              pictureBase64: data
+              pictureBase64: data,
+              patientRegisterNo: checkRequestNo, // 人员条码
+              asbitemId: this.upPic.asbitemId
+            }
+
+            let url = '/api/app/RegisterCheckPicture/ImportRegisterCheckPicture'
+
+            switch (this.upPic.barcodeMode) {
+              case '0':
+                url = '/api/app/RegisterCheckPicture/ImportRegisterCheckPictureByPatientRegisterNo'
+                break;
+              case '1':
+                url = '/api/app/RegisterCheckPicture/ImportRegisterCheckPictureByLisRequestNo'
+                break;
+              default:
+                break;
             }
-            postapi('/api/app/RegisterCheckPicture/ImportRegisterCheckPicture', body)
-              .then(res => {
 
-                if (res.code > -1) {                  
+            postapi(url, body)
+              .then(res => {
+                if (res.code > -1) {
                   rd.importState = "导入成功"
-                  rd.importDes = ""                  
+                  rd.importDes = ""
                 } else {
-                  rd.importDes = res.message                  
+                  rd.importDes = res.message
                 }
               })
               .catch(error => {
-                rd.importDes = `${error}`                
+                rd.importDes = `${error}`
               })
               .finally(() => {
                 that.tableData.push(rd)
@@ -316,27 +424,13 @@ export default {
       };
     },
 
-    closePicUpload(){
+    closePicUpload() {
       this.upPic.visible = false
 
     },
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     //导入完后，导入状态显示
     importRowClassName({ row, rowIndex }) {
       if (row.importState == '导入失败') {
@@ -470,4 +564,22 @@ input[type="number"]::-webkit-outer-spin-button {
 ::v-deep .menu_item {
   line-height: 24px;
 }
+
+::v-deep .el-upload--picture-card {
+  width: 148px;
+  height: 148px;
+  line-height: 146px;
+}
+
+::v-deep .el-upload-list--item-thumbnail {
+  width: 72px;
+  height: 72px;
+  line-height: 72px;
+}
+
+::v-deep .el-upload-list--item-actions {
+  width: 72px;
+  height: 72px;
+  line-height: 72px;
+}
 </style>
diff --git a/src/views/doctorCheck/lisResultImport.vue b/src/views/doctorCheck/lisResultImport.vue
new file mode 100644
index 0000000..5b3077a
--- /dev/null
+++ b/src/views/doctorCheck/lisResultImport.vue
@@ -0,0 +1,1294 @@
+<template>
+  <div>
+    <!--主体-->
+    <div>
+      <div class="middlebox">
+        <div class="contenttitle">
+          体检 /
+          <span class="contenttitleBold">从文件导入检验结果</span>
+        </div>
+      </div>
+      <div style="margin-bottom: 15px;display: flex;justify-content: space-between;
+        background-color: #fff;border-radius: 8px;padding: 15px;margin-top: 7px;">
+        <div></div>
+        <div style="display: flex;">
+          <div style="padding: 0 5px;">
+            <a :underline="false" href="/files/检验结果导入模板_纵向.xls"><el-button class="commonbutton"
+                size="small">下载纵向模版</el-button></a>
+          </div>
+          <div style="padding: 0 5px;">
+            <a :underline="false" href="/files/检验结果导入模板_横向.xls"><el-button class="commonbutton"
+                size="small">下载横向模版</el-button></a>
+          </div>
+          <div style="padding: 0 5px;">
+            <el-button class="commonbutton" @click="seq = 10" size="small">导入</el-button>
+          </div>
+          <div style="padding: 0 5px;">
+            <el-button class="commonbutton" @click="btnExport('tableData')" size="small"
+              style="width:140px;">导入后结果状态导出</el-button>
+          </div>
+        </div>
+      </div>
+      <div id="tableData" style="padding: 15px;background-color: #fff;border-radius: 8px;">
+        <el-table :data="tableData"  :row-class-name="importRowClassName"
+          :height="window.pageHeight < 600 ? 440 : (window.pageHeight - 210)" highlight-current-row size="small"
+          :summary-method="getSummaries" show-summary>
+          <el-table-column type="index" label="序号" width="40" align="center" />
+          <el-table-column prop="importState" label="导入状态" min-width="80" sortable />
+          <el-table-column prop="importDes" label="导入描述" min-width="180" sortable />
+          <el-table-column v-for="(item, index) in importCols" :key="`col${index}`" :prop="item.dispLabel"
+            align="center" :label="item.dataLabel || item.dispLabel" min-width="100" />
+        </el-table>
+      </div>
+    </div>
+
+    <!--弹窗-->
+    <div>
+      <el-dialog title="导入EXCEL注意事项" :visible.sync="dialogGroup.fileReadme" width="700px" :show-close="false"
+        :append-to-body="true" :close-on-click-modal="false">
+        <div style="height:400px;padding: 0 20px; ">
+          <br />导入Excel时，Excel的格式必须符合一定规范，该格式的模板文件可通过下载模板获取。
+          <br />注意事项如下:
+          <br />
+          <div style="margin-left: 25px;">1、条码号不能为空，当条码号为检查项目条码时，姓名可以为空，否则不能为空；
+            <br />2、从仪器导出的数据可能含有标本号与仪器通道，但标本号与仪器通道不参与数据导入；
+            <br />3、Excel结果纵向排列时，须检查项目与结果的匹配，横向排列时自动匹配；
+            <br />4、Excel中标题列不能有单元格合并。
+          </div>
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <el-button class="commonbutton" type="primary" @click="seq++">下一步</el-button>
+          <el-button class="commonbutton" @click="seq = -1">关闭</el-button>
+        </span>
+      </el-dialog>
+
+      <el-dialog title="选择文件" :visible.sync="dialogGroup.fileChoose" width="700px" :show-close="false"
+        :append-to-body="true" :close-on-click-modal="false">
+        <div style="height:400px;padding: 0 50px; ">
+          <!-- webkitdirectory 选择文件属性， multiple 多选属性-->
+          <div><input id="fileNames" type="file" accept=".xlsx,.xls" @change="changeFileChoose" @focus="fileGetFocus" />
+          </div>
+          <div style="margin: 5px 70px;width:240px;">
+            <el-table :data="sheetNames" border ref="sheetNames" height="200" row-click="chooseSheetName"
+              highlight-current-row size="small">
+              <el-table-column prop="sheetName" label="Excel表单名" min-width="200" align="center" />
+            </el-table>
+          </div>
+          <div style="display: flex;flex-wrap: wrap;">
+            <span style="margin-top: 6px;">标题行： 第</span>
+            <el-input type="number" v-model="readDataOpts.titleRow" size="small" style="width:60px;margin: 0 5px;" />
+            <span style="margin-top: 6px;">行</span>
+          </div>
+          <div style="display: flex;flex-wrap: wrap;">
+            <span style="margin-top: 6px;">Excel结果排列方式：</span>
+            <el-radio v-model="readDataOpts.resultMode" label="V">纵向排列</el-radio>
+            <el-radio v-model="readDataOpts.resultMode" label="H">横向排列</el-radio>
+          </div>
+          <div style="display: flex;flex-wrap: wrap;">
+            <span style="margin-top: 6px;">条码方式：</span>
+            <el-radio v-model="dataImportOpts.barcodeMode" label="0">人员条码</el-radio>
+            <el-radio v-model="dataImportOpts.barcodeMode" label="1">项目条码</el-radio>
+          </div>
+          <div style="display: flex;flex-wrap: wrap;">
+            <span style="margin-top: 6px;">未填检查时间时起始检查时间：</span>
+            <el-date-picker v-model="dataImportOpts.startCheckDate" type="datetime" placeholder="选择起始检查时间" align="right"
+              :picker-options="pickerOptions" value-format="yyyy-MM-dd HH:mm:ss">
+            </el-date-picker>
+            <span style="margin-top: 6px;">标本间隔时间：</span>
+            <el-input type="number" v-model="dataImportOpts.checkInterval" size="small" style="width:60px;margin: 0 5px;">
+              <template slot="append">秒</template>
+            </el-input>
+          </div>
+
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <el-button class="commonbutton" type="primary" @click="seq--">上一步</el-button>
+          <el-button class="commonbutton" type="primary" @click="seq++">下一步</el-button>
+          <el-button class="commonbutton" @click="seq = -1">关闭</el-button>
+        </span>
+      </el-dialog>
+
+      <el-dialog title="选择待导入的结果信息，并执行导入" :visible.sync="dialogGroup.fileDataOpr" width="700px" :show-close="false"
+        :close-on-click-modal="false"> <!--:append-to-body="true" -->
+        <div style="height:400px;">
+          <div style="margin-top: -10px;">
+            1、在标题列右击鼠标可设置实际导入数据的列名，即：标题列有√；（横向排列时，项目列不显示√）<br>
+            2、按住 Ctr1 或 Shift 键可进行多选；<br>
+          </div>
+          <div style="margin: 5px 0px 0px;" @contextmenu.prevent=""> <!-- -->
+            <el-table :data="excelData" border ref="excelData" @header-contextmenu="headerContextmenu" height="360"
+              @row-click="chooseDataImport" row-key="id" highlight-current-row size="small"
+              :row-class-name="handleRowClassName">
+              <el-table-column type="index" align="center" label="序号" min-width="40" />
+              <!-- 
+            <el-table-column prop="choosed" align="center" label="选中" min-width="40"/>
+            -->
+              <el-table-column v-for="(item, index) in excelCols" :key="`col_${index}`" :prop="item.dispLabel"
+                align="center" :label="(item.val ? '√ ' : '') + (item.dataLabel || item.dispLabel)"
+                :min-width="100 + index" />
+            </el-table>
+          </div>
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <div style="display: flex;justify-content: space-between;">
+            <div style="display: flex;">
+              <el-button class="commonbutton" type="primary" @click="btnChoose('excelData', 'all')">全选</el-button>
+              <el-button class="commonbutton" type="primary" @click="btnChoose('excelData')">取消全选</el-button>
+            </div>
+            <div style="display: flex;">
+              <el-button class="commonbutton" type="primary" @click="seq--">上一步</el-button>
+              <el-button class="commonbutton" type="primary" @click="btnImport">确定导入</el-button>
+              <el-button class="commonbutton" @click="seq = -1">关闭</el-button>
+            </div>
+          </div>
+        </span>
+      </el-dialog>
+    
+      <!-- 通用进度条 -->
+      <el-dialog title="数据处理中……" :visible.sync="elProgress.display" width="700px" height="400" :show-close="false"
+        :close-on-click-modal="false" :append-to-body="true">
+        <ElProgressOCX />
+      </el-dialog>
+    </div>
+  </div>
+</template>
+<script>
+import moment from "moment"
+import { mapState, mapActions } from "vuex";
+import { read, readFile, utils } from "xlsx";
+import FileSaver from 'file-saver';
+
+import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import { getPagePriv, checkPagePriv, deepCopy, arrayExistObj, arrayFilter, dddw, tcdate } from '../../utlis/proFunc';
+import ElProgressOCX from "../../components/report/ElProgressOCX.vue";
+
+
+export default {
+  components: {
+    ElProgressOCX,
+  },
+  data() {
+    return {
+      
+      startPoint: -1, // 多选起点 -1 表示未选择
+      endPoint: -1, // 多选终点 -1 表示未选择
+      rClickRow: null, //右击的行
+      rClickColumn: null, //右击的列（预留）
+
+      dialogGroup: {
+        fileReadme: true,   //导入EXCEL注意事项
+        fileChoose: false,   //选择文件
+        fileDataOpr: false,  //文件数据分析操作 及导入       
+      },
+      oldSeq: -2,       //旧的步骤（辅助区分上一步，下一步）
+      seq: 10,          //当前显示窗口     
+      
+      excelCols: [{ dispLabel: '', val: '', dataLabel: '' }],    //excel数据列名 {dispLabel:'',val:'',dataLabel:''}
+      importCols: [], // 实际导入的列（即有设置与 dataCols 匹配的列）
+      excelData: [],   // excel表格数据 
+      choosedData: [],  // 选中的待导入的数据
+
+      dataCols: [
+        { dispLabel: '不设置', val: '' },
+        { dispLabel: '条码号', val: 'barcode' },
+        { dispLabel: '姓名', val: 'patientName' },
+        { dispLabel: '标本号', val: 'sampleNo' },
+        { dispLabel: '仪器通道', val: 'deviceChannel' },
+        { dispLabel: '检查时间', val: 'checkDate' },
+        { dispLabel: '项目', val: 'itemName' },
+        { dispLabel: '结果', val: 'itemResult' }
+      ],
+      
+
+      tableData: [],   //导入数据状态显示
+
+      workBook: null, //EXCEL 工作薄
+      sheetNames: [], //EXCEL 工作薄中的表单 {sheetName:}
+      readDataOpts: {
+        file: '',      //选中的文件名 
+        sheetNameChoosed: '',   //当前选中的表格
+        titleRow: 1,   //标题行    
+        resultMode: 'V',      //Excel 结果排列方式 H:横向 V:纵向
+      },
+      readDataOptsInit: {},
+
+      dataImportOpts: {        
+        startRow: 0,   //从 excelData 的第几行开始导入
+        barcodeMode: '1',  // 条码方式： '0'/人员条码；'1'/项目条码  
+        startCheckDate:'', // 检查起始时间
+        checkInterval:30,  // 标本间隔时间（秒）
+      },
+      dataImportOptsInit: {},     
+      
+      pickerOptions: {
+        shortcuts: [{
+          text: '今天',
+          onClick(picker) {
+            picker.$emit('pick', new Date());
+          }
+        }, {
+          text: '昨天',
+          onClick(picker) {
+            const date = new Date();
+            date.setTime(date.getTime() - 3600 * 1000 * 24);
+            picker.$emit('pick', date);
+          }
+        }, {
+          text: '前天',
+          onClick(picker) {
+            const date = new Date();
+            date.setTime(date.getTime() - 3600 * 1000 * 48);
+            picker.$emit('pick', date);
+          }
+        }, {
+          text: '一周前',
+          onClick(picker) {
+            const date = new Date();
+            date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', date);
+          }
+        }]
+      },
+    };
+  },
+
+
+  //组件创建完成，一般页面初始布局放在这里
+  created() {
+    this.seq = 10    
+    this.readDataOptsInit = Object.assign({}, this.readDataOpts)
+    this.dataImportOptsInit = Object.assign({}, this.dataImportOpts)
+  },
+
+  //页面挂载完成，一般页面渲染数据放在这里
+  mounted() {
+    this.dictInit()
+
+  },
+
+  computed: {
+    ...mapState(["window", "dict", "elProgress", "patientRegister", "customerOrg"]),
+  },
+
+  methods: {
+    dddw, moment, checkPagePriv,
+    dictInit() {
+
+      // 获取单位列表树  
+      this.getCustomerOrgTree()
+
+      //性别（查询 仅档案用）
+      getapi("/api/app/sex").then((res) => {
+        if (res.code == 1) {
+          this.dict.sex = res.data;
+        }
+      });
+
+    },
+
+    //清空进度数据数据
+    clearProcess() {
+
+      let elo = document.getElementById('fileNames')
+      if (elo) elo.value = ''; // 清空选择的文件
+
+      this.workBook = null //EXCEL 工作薄
+      this.sheetNames = [] //EXCEL 工作薄中的表单 {sheetName:}
+
+      this.readDataOpts = Object.assign({}, this.readDataOptsInit)
+      this.dataImportOpts = Object.assign({}, this.dataImportOptsInit)
+
+      this.customerOrgIds = [] //选中单位节点
+      this.customerOrgRegisterList = [] //体检次数列表
+      this.customerOrgRegister = {} //体检次数
+
+      this.startPoint = -1 // 多选起点 -1 表示未选择
+      this.endPoint = -1 // 多选终点 -1 表示未选择
+
+    },
+
+    // 获取单位列表树
+    getCustomerOrgTree() {
+      getapi("/api/app/customerorg/getbycodeall?IsHidePerson=1").then((res) => {
+        // console.log("res.data", res.data);
+        if (res.code != -1) {
+          this.customerOrgTree = res.data;
+          let lfind = arrayExistObj(this.customerOrgTree, 'id', this.dict.personOrgId)
+          if (lfind > -1) this.customerOrgTree.splice(lfind, 1)
+          tcdate(this.customerOrgTree)
+        }
+      });
+    },
+
+
+    //选择单位
+    changeCustomerOrg(v) {
+      this.chooseCustomerOrg(v)
+    },
+
+    //选择单位查询条件
+    changeQueryCustomerOrg(v) {
+      this.chooseCustomerOrg(v, 'query')
+    },
+
+    chooseCustomerOrg(v, obj) {
+      let id = ''
+      if (typeof v == 'string') {
+        id = v
+      } else {
+        id = v[0]
+      }
+
+      getapi(
+        `/api/app/customerorgregister/getlistincustomerorgid?CustomerOrgId=${id}`
+      ).then((res) => {
+        if (res.code != -1) {
+          if (obj == 'query') {
+            this.query.customerOrgRegisterList = res.data
+            if (this.query.customerOrgRegisterList.length > 0) {
+              this.query.customerOrgRegister = this.query.customerOrgRegisterList[this.query.customerOrgRegisterList.length - 1];
+            } else {
+              this.query.customerOrgRegister = {};
+              // this.customerOrgGroups = [];
+            }
+          }
+
+          this.customerOrgRegisterList = arrayFilter(res.data, 'isComplete', 'N')  //不显示已完成的体检次数
+          if (this.customerOrgRegisterList.length > 0) {
+            this.customerOrgRegister = this.customerOrgRegisterList[this.customerOrgRegisterList.length - 1];
+            // this.getCustomerOrgGroup(this.customerOrgRegister.id);
+          } else {
+            this.customerOrgRegister = {};
+            // this.customerOrgGroups = [];
+          }
+
+        }
+      });
+    },
+
+    //第一次点下一步
+    btnFirst() {
+      if (!this.peisid || this.peisid == 'null') {
+        this.$message.warning("该用户未选归属体检中心，不能执行此操作！");
+        return
+      }
+      this.seq = 11
+    },
+
+    // 导入过程 上一步，下一步
+    async btnProcess(seq) {
+      let keys = Object.keys(this.dialogGroup)
+      let count = 0  //选中待导入的人员数
+
+      if (seq == 9 || seq == 29) {
+        this.workBook = null
+        this.sheetNameChoosed = ''
+        seq = 0
+      }
+      if (seq == 19) seq = 0
+
+      // console.log('keys',keys)
+      switch (seq) {
+        case -1:
+          //关闭所有弹窗
+          keys.forEach(e => {
+            this.dialogGroup[e] = false
+          })
+          this.clearProcess()
+          break;        
+        case 10:
+          this.excelCols = []
+          this.tableData = []          
+          this.startPoint = -1 // 多选起点 -1 表示未选择
+          this.endPoint = -1 // 多选终点 -1 表示未选择
+          //显示 EXCEL 导入
+          keys.forEach(e => {
+            if (e == 'fileReadme') {
+              this.dialogGroup[e] = true
+            } else {
+              this.dialogGroup[e] = false
+            }
+          })
+          break;
+        case 11:
+          //显示 文件选择 窗口
+          keys.forEach(e => {
+            if (e == 'fileChoose') {
+              this.dialogGroup[e] = true
+            } else {
+              this.dialogGroup[e] = false
+            }
+          })
+          break;
+        case 12:
+          // 从后面退回时，无需读数据
+          if (this.oldSeq < seq) {
+            if (!this.readData()) {
+              this.seq--
+              break;
+            }
+          }
+
+          //显示 数据分析操作 窗口
+          keys.forEach(e => {
+            if (e == 'fileDataOpr') {
+              this.dialogGroup[e] = true
+            } else {
+              this.dialogGroup[e] = false
+            }
+          })
+          break;
+        case 13:
+          count = 0
+          this.excelData.forEach(e => {
+            if (e.choosed) count++
+          })
+          if (count == 0) {
+            this.$message.warning("未选中要导入的记录")
+            this.seq--
+            break;
+          }
+
+          //显示 文件数据导入前参数设定 窗口
+          keys.forEach(e => {
+            if (e == 'fileDataOpts') {
+              this.dialogGroup[e] = true
+            } else {
+              this.dialogGroup[e] = false
+            }
+          })
+          break;        
+
+        default:
+
+          break;
+      }
+
+    },
+
+    //导入完后，导入状态显示
+    importRowClassName({ row, rowIndex }) {
+      if (row.importState == '导入失败') {
+        return "danger";
+      } else {
+        return "";
+      }
+    },
+
+    //多选 颜色标记 
+    handleRowClassName({ row, rowIndex }) {
+      if (row.choosed) {
+        return "current-row";
+      } else {
+        return "";
+      }
+    },
+
+    // 导入完后，状态统计
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sumCol = [2]; //需合计的列
+      const sums = [];
+      let success = 0, fail = 0;
+
+      columns.forEach((column, index) => {
+        //显示合计列
+        if (index === 1) {
+          sums[index] = "导入合计";
+          return;
+        }
+
+        //不合计的列
+        if (sumCol.indexOf(index) == -1) {
+          sums[index] = "";
+          return;
+        }
+
+        data.forEach((item) => {
+          console.log('item,column.property', item, column.property)
+          if (item[column.property]) {
+            fail++
+          } else {
+            success++
+          }
+        });
+
+      });
+      sums[2] = `成功：${success} 条，失败：${fail} 条。`
+
+      return sums;
+    },
+
+
+    //清除所选文件
+    fileGetFocus(e) {
+      console.log('fileGetFocus(e)', e)
+      e.value = '' //未起作用的 
+      // e.target.files = []
+    },
+
+    // 获取选择的文件
+    changeFileChoose(e) {
+      if (e.target.files.length <= 0) return;
+      // console.log('file',e.target.files[0])
+      this.readDataOpts.file = e.target.files[0];
+      // 调用导入Excel文件的方法
+      // File {name: 'vulkan-1.dll',
+      // console.log('file',file,file.type)
+      let fileName = this.readDataOpts.file.name.split('.')
+      let fileNameExt = fileName[fileName.length - 1].toLowerCase()
+      if (fileNameExt != 'xls' && fileNameExt != 'xlsx') {
+        this.$message.warning("你选的文件可能不是标准的Excel文件！")
+      }
+      this.readFile(this.readDataOpts.file);
+    },
+
+    //sheetjs 读取文件
+    readFile(file) {
+      const reader = new FileReader();
+
+      // reader.readAsArrayBuffer(file);
+      // 定义读取文件
+      reader.onload = (e) => {
+        let data = e.target.result;
+        // let typedArray = new Uint8Array(data);
+        // var workBook = read(typedArray,{type:'array'})
+        // this.workBook = read(data,{type:'binary',cellDates:true})  //日期将转成 标准 日期格式，显示会 undefined
+        this.workBook = read(data, { type: 'binary' })
+        // var workBook = readFile(file); //后端读法
+
+        this.sheetNames = []
+        this.workBook.SheetNames.forEach(e => {
+          this.sheetNames.push({ sheetName: e })
+        })
+
+        this.$nextTick(() => {
+          this.$refs['sheetNames'].setCurrentRow(this.sheetNames[0]);
+          this.chooseSheetName(this.sheetNames[0])
+        })
+      }
+
+      // 错误处理
+      reader.onerror = function (event) {
+        // 读取失败时执行的代码
+        console.error("File could not be read!" + event.target.error);
+      };
+
+
+      reader.readAsBinaryString(file);
+    },
+
+    //选择要导入的Excel表单名
+    chooseSheetName(row) {
+      this.readDataOpts.sheetNameChoosed = row.sheetName
+    },
+
+    //读取数据
+    readData() {
+      let ret = 1
+      if (!this.readDataOpts.file || !this.workBook || !this.readDataOpts.sheetNameChoosed) {
+        this.$message.warning("请选择文件及要导入的表格")
+        return 0
+      }
+
+      if (this.readDataOpts.titleRow <= 0) {
+        this.$message.warning("标题行不能小于1")
+        return 0
+      }
+
+
+      let worksheet = this.workBook.Sheets[this.readDataOpts.sheetNameChoosed];
+
+      //分析标题信息
+      let head = utils.sheet_to_json(worksheet, { header: 1 });
+
+      this.excelCols = []
+      head[this.readDataOpts.titleRow - 1].forEach(e => {
+        let lfind = arrayExistObj(this.dataCols, 'dispTitle', e), val = '', dataLabel = '';
+        if (lfind > -1) {
+          val = this.dataCols[lfind].val
+          dataLabel = this.dataCols[lfind].dataLabel
+        }
+        this.excelCols.push({
+          dispLabel: e,
+          val,
+          dataLabel
+        })
+      })
+      //console.log('head,',head,this.excelCols)
+
+      this.excelData = utils.sheet_to_json(worksheet, { raw: false, range: this.readDataOpts.titleRow - 1 }); //raw:false,range:1 从第1行开始读取
+      this.excelData.forEach((e, index) => {
+        e.choosed = false;
+        e.index = index;
+        e.id = 'excelData' + index;
+
+      });
+      //console.log('this.excelCols',this.excelCols)
+      // console.log('sheet_to_json excelData',this.excelData)
+
+      // 导入后，批量分析Excel列 与 数据字段 的匹配关系
+      this.parseExcelData()
+
+      return ret
+    },
+
+    //选择要导入的数据 
+    chooseDataImport(row) {
+      // console.log("this.excelData",this.excelData);
+
+      // 按住了shift键
+      if (this.window.shift) {
+        //清除所有选择
+        this.excelData.forEach((e, index) => {
+          e.choosed = false;
+          e.index = index;
+        });
+
+        if (this.startPoint == -1) {
+          this.excelData[row.index].choosed = true;
+          this.startPoint = row.index;
+        } else {
+          if (this.startPoint > row.index) {
+            for (let i = row.index; i <= this.startPoint; i++) {
+              this.excelData[i].choosed = true;
+            }
+          } else if (this.startPoint <= row.index) {
+            for (let i = this.startPoint; i <= row.index; i++) {
+              this.excelData[i].choosed = true;
+            }
+          }
+        }
+      } else if (this.window.ctrl) {  // 按住了ctrl 键
+        this.excelData[row.index].choosed = true;
+        if (this.startPoint == -1) {
+          this.startPoint = row.index;
+        }
+      } else {
+        // 未按住了ctrl 、shift 键
+        //清除所有选择
+        console.log("清除所有选择");
+        this.excelData.forEach((e, index) => {
+          e.choosed = false;
+          e.index = index;
+        });
+        // console.log(this.excelData,row.index);       
+        // console.log(this.excelData[row.index].choosed);
+
+        this.excelData[row.index].choosed = true;
+        this.startPoint = row.index;
+      }
+    },
+
+    // 全选（取消全选）
+    btnChoose(refName, type) {
+      let choosed = false
+      if (type && type == 'all') {
+        choosed = true
+      }
+      this[refName].forEach(e => {
+        e.choosed = choosed
+        if (choosed) {
+          this.$refs[refName].setCurrentRow(e)
+        }
+      })
+
+      if (!choosed) {
+        this.$refs[refName].setCurrentRow()
+      }
+
+    },
+
+    //右击标题
+    headerContextmenu(column, event) {
+      let chooseCol = column.minWidth - 100
+      let items = [] //菜单
+
+      this.dataCols.forEach(e => {
+        items.push({
+          label: e.dispLabel,
+          onClick: () => {
+            this.setColumn(chooseCol, e)
+          },
+        })
+      })
+
+      //右击显示的菜单
+      this.$contextmenu({
+        items,
+        event,
+        //x: event.clientX,
+        //y: event.clientY,
+        customClass: "custom-class",
+        zIndex: 30000,  //够大再能在最上面显示
+        minWidth: 80,
+        height: 20
+      });
+
+      return false;
+    },
+
+    //设置真实数据字段列
+    setColumn(oldColNum, newColObj) {
+      // console.log('oldColNum,newColObj',oldColNum,newColObj)
+      //如果数据字段已设置过，则将之前设置的先清空
+      if (newColObj.dispLabel != "不设置") {
+        let lfind = arrayExistObj(this.excelCols, 'dataLabel', newColObj.dispLabel)
+        if (lfind > -1) {
+          this.excelCols[lfind].dataLabel = ''
+          this.excelCols[lfind].val = ''
+        }
+      }
+
+      this.excelCols[oldColNum].dataLabel = newColObj.dispLabel
+      this.excelCols[oldColNum].val = newColObj.val
+      // console.log('newColObj.val',newColObj.val)
+      let tempDate = ''
+      if (newColObj.val == 'birthDate') {
+        this.excelData.forEach(e => {
+          tempDate = e[this.excelCols[oldColNum].dispLabel]
+          // console.log('birthDate',tempDate)
+          e[this.excelCols[oldColNum].dispLabel] = tempDate ? moment(new Date(tempDate)).format('yyyy-MM-DD') : ''
+        })
+      }
+    },
+
+    // 选择EXCEL文件后，批量分析Excel列 与 数据字段 的匹配关系
+    parseExcelData() {
+      let lfind = -1
+      this.excelCols.forEach((e, i) => {
+        lfind = arrayExistObj(this.dataCols, 'dispLabel', e.dispLabel)
+        if (lfind > -1) this.setColumn(i, this.dataCols[lfind])
+      });
+    },
+
+    // 确定导入数据库
+    btnImport() {
+      if (!this.customerOrgIds || this.customerOrgIds.length == 0) {
+        this.$message.warning("请选择单位")
+        return
+      }
+      if (!this.customerOrgRegister || !this.customerOrgRegister.id) {
+        this.$message.warning("请选择单位体检次数")
+        return
+      }
+
+
+      this.elProgress.display = true;
+      this.elProgress.percentage = 0;
+
+      this.importCols = []
+      this.excelCols.forEach(e => {
+        if (e.val) {
+          this.importCols.push(e)
+        }
+      })
+      this.tableData = []  // 记录导入后结果状态
+      this.choosedData = []  //选中待导入的数据
+      this.excelData.forEach(e => {
+        if (e.choosed) this.choosedData.push(e)
+      });
+
+      //导入进行中
+      this.importing(this.dataImportOpts.startRow, this.dataImportOpts.nameType)
+      // 开始导入时，清除选择的 文件
+      document.getElementById('fileNames').value = '';
+
+    },
+
+    //导入进行时
+    // startRow : 从第几行开始导入，同名判断交互时，续接导入
+    // startRowNameType : 续接导入的第1行，执行 同名判断模式， 3.不提示，按新人导入(前端不用管)
+    async importing(startRow, startRowNameType) {
+      let body = {}
+      for (let i = startRow; i < this.choosedData.length; i++) {
+        this.elProgress.percentage = Math.floor(
+          ((i + 1) * 100) / this.choosedData.length
+        );
+
+
+        // 将Excel的数据转换成接口的数据
+        body = this.excelDataToApiBody(this.choosedData[i])
+        if (i == startRow) body.nameType = startRowNameType
+        console.log(`this.choosedData[${i}],startRowNameType,body`)
+
+        try {
+          // 同一人判断
+          if (this.choosedSameMan.patientNo) {
+            // 上一次循环已经判断是否同一人，此次循环不需再判断了
+            if (this.choosedSameMan.patientNo == '$newPatient$') {
+              body.nameType = '3'
+            } else {
+              body.patientNo = this.choosedSameMan.patientNo
+            }
+          } else if (startRowNameType != '3') {
+            let result = await this.isSamePatient(startRowNameType, body)
+            if (result.isContinue) {
+              if (result.err) {
+                this.tableData.push(Object.assign({ importState: '导入失败', importDes: result.err }, this.choosedData[i]))
+                continue
+              }
+            } else {
+              this.dataImportOpts.startRow = i
+              break; // 跳出循环，重新从 i 开执行 this.importing
+            }
+          }
+
+          // 旧接口：/api/app/patientregister/createpatientregisterexcel                                 
+          let res = await postapi('/api/app/patientregister/CreatePatientRegisterFromExcel', body)
+          this.choosedSameMan = {}  // 清除选择同一人员的记录
+          if (res.code >= 0) {
+            this.tableData.push(Object.assign({ importState: '导入成功' }, this.choosedData[i]))
+          } else {
+            this.tableData.push(Object.assign({ importState: '导入失败', importDes: res.message }, this.choosedData[i]))
+          }
+        } catch (error) {
+          this.tableData.push(Object.assign({ importState: '导入失败', importDes: `${error}` }, this.choosedData[i]))
+        }
+
+
+        // 结束导入
+        if (i == this.choosedData.length - 1) {
+          this.elProgress.display = false;
+          this.seq = -1
+        }
+      }
+    },
+
+    // 同一人判断
+    async isSamePatient(startRowNameType, body) {
+      console.log('isSamePatient', startRowNameType, body)
+      let result = {
+        isContinue: true,
+        err: ''
+      }
+      let res
+      if (body.idNo) {
+        try {
+          res = await postapi('/api/app/patient/GetByIdNo', { idNo: body.idNo })
+          if (res.code < 0) {
+            result.err = `身份证号查重错误，原因：${res.message}`
+            return result
+          } else if (res.code == 1) {
+            body.patientNo = res.data.patientNo
+            return result
+          }
+        } catch (error) {
+          result.err = `身份证号查重错误，原因：${error}`
+          return result
+        }
+      }
+
+      // 没有身份证号或身份证号未找到同名人员时，按姓名查重
+      let url, localBody = {
+        customerOrgId: body.customerOrgId,
+        name: body.patientName
+      }
+      switch (startRowNameType) {
+        case '1':
+        case '2':
+          if (startRowNameType == '1') url = '/api/app/patientregister/GetSameNamePatient'
+          if (startRowNameType == '2') url = '/api/app/patientregister/GetCustomerOrgSameNamePatient'
+          res = await postapi(url, localBody)
+          if (res.code >= 0) {
+            if (res.data.length > 0) {
+              result.isContinue = false
+              this.sameMans = res.data
+              this.dialogSameMan = true
+            }
+          } else {
+            result.err = `${startRowNameType == '2' ? '同单位内' : ''}同名查重错误，原因：${res.message}`
+          }
+          break;
+        default:
+          break;
+      }
+      return result
+
+      // if (this.choosedSameMan.patientNo) {
+      //   body.patientNo = this.choosedSameMan.patientNo
+      //   // body.patientId = this.choosedSameMan.patientId
+      //   this.choosedSameMan = {} // 清除选择人员
+      // }
+      // try {
+      //   switch (key) {
+      //     case value:
+
+      //       break;
+
+      //     default:
+      //       break;
+      //   }
+
+      //   { dispLabel: '姓名', val: 'patientName' },
+      //   { dispLabel: '性别', val: 'sexName' },
+      //   { dispLabel: '年龄', val: 'age' },
+      //   { dispLabel: '出生日期', val: 'birthDate' },
+      //   { dispLabel: '婚姻状况', val: 'maritalStatusName' },
+      //   { dispLabel: '民族', val: 'nationName' },
+      //   { dispLabel: '身份证号', val: 'idNo' },
+    },
+
+
+
+
+    //将Excel的数据转换成接口的数据
+    excelDataToApiBody(ExcelData) {
+      let body = {
+        customerOrgId: this.customerOrgIds[this.customerOrgIds.length - 1],
+        customerOrgRegisterId: this.customerOrgRegister.id,
+        medicalCenterId: this.peisid,
+        nameType: this.dataImportOpts.nameType,
+        completeFlag: this.dataImportOpts.completeFlag,
+        isAutoCreateDepartment: this.dataImportOpts.isAutoCreateDepartment ? 'Y' : 'N',
+        isAutoCreatePatientNo: this.dataImportOpts.isAutoCreatePatientNo ? 'Y' : 'N',
+        cardStartNum: this.dataImportOpts.cardStartNum,
+        cardLength: this.dataImportOpts.cardLength
+      }
+
+      this.excelCols.forEach(e => {
+        if (e.val) {
+          switch (e.val) {
+            case 'age':
+              if (ExcelData[e.dispLabel]) body[e.val] = parseInt(ExcelData[e.dispLabel])
+              break;
+            // case 'birthDate':
+            //   if(ExcelData[e.dispLabel]) body[e.val] = moment(new Date(ExcelData[e.dispLabel])).format('yyyy-MM-DD')
+            //   break;
+            case 'poisons':
+              if (ExcelData[e.dispLabel]) body[e.val] = ExcelData[e.dispLabel].replaceAll("，", ",").split(",")
+              break;
+            default:
+              body[e.val] = ExcelData[e.dispLabel]
+              break;
+          }
+        }
+      })
+      if (this.seq > 30) {
+        body.isOccupationalDisease = 'Y'
+        body.isDefaultMedicalType = 'Y'
+      }
+      return body
+    },
+
+    //选中同名人员档案
+    rowClickSameMan(row) {
+      this.choosedSameMan = deepCopy(row)
+    },
+    // 同名人员，按档案人员导入
+    btnOldMan() {
+      if (!this.choosedSameMan.patientNo) {
+        this.$message.warning("请选择要导入的档案人员")
+        return
+      }
+      this.importing(this.dataImportOpts.startRow, this.dataImportOpts.nameType)
+      this.dialogSameMan = false
+    },
+
+    // 同名人员，按新人方式导入
+    btnNewMan() {
+      this.choosedSameMan = { patientNo: '$newPatient$' } // 约定按新人导入 
+      this.importing(this.dataImportOpts.startRow, this.dataImportOpts.nameType)
+      this.dialogSameMan = false
+    },
+
+
+    // 查询档案人员 
+    async getPrList() {
+      let ret = false
+      if (!this.query.customerOrgIds || this.query.customerOrgIds.length == 0) {
+        this.$message.warning("请选择单位或部门")
+        return false
+      }
+
+      if (!this.query.customerOrgRegister || !this.query.customerOrgRegister.id) {
+        this.$message.warning("请选择单位体检次数")
+        return false
+      }
+
+      this.query.customerOrgId = this.query.customerOrgIds[this.query.customerOrgIds.length - 1]
+      this.query.customerOrgRegisterId = this.query.customerOrgRegister.id
+      let body = Object.assign({}, this.query)
+      delete body.customerOrgIds
+      delete body.customerOrgRegister
+      delete body.customerOrgRegisterList
+
+      if (!body.completeFlag) delete body.completeFlag
+      if (!body.patientName) delete body.patientName
+      if (!body.startPatientNo && !body.endPatientNo) {
+        delete body.startPatientNo
+        delete body.endPatientNo
+      } else if (!body.startPatientNo) {
+        this.$message.warning("请填写起始档案号")
+        return false
+      } else if (!body.endPatientNo) {
+        this.$message.warning("请填写截止档案号")
+        return false
+      }
+
+      if (!body.startDate && !body.endDate) {
+        delete body.startDate
+        delete body.endDate
+      } else if (!body.startDate) {
+        this.$message.warning("请填写起始登记日期")
+        return false
+      } else if (!body.endDate) {
+        this.$message.warning("请填写截止登记日期")
+        return false
+      } else {
+        body.startDate = moment(new Date(body.startDate)).format('yyyy-MM-DD')
+        body.endDate = moment(new Date(body.endDate)).format('yyyy-MM-DD')
+      }
+
+      const loading = this.$loading({
+        lock: true,
+        text: "Loading",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+
+      try {
+        let res = await postapi('/api/patientregister/getpatientregisterimportlist', body)
+        if (res.code != -1) {
+          this.prList = res.data
+          if (res.data.length == 0) {
+            this.$message.warning("没有符合条件的数据")
+          } else {
+            ret = true
+          }
+        }
+      } catch (error) {
+        //
+      }
+
+      loading.close()
+
+      return ret
+
+    },
+
+
+    //选择要导入的数据 
+    rowClickPrList(row) {
+      // console.log("this.excelData",this.excelData);
+
+      // 按住了shift键
+      if (this.window.shift) {
+        //清除所有选择
+        this.prList.forEach((e, index) => {
+          e.choosed = false;
+          e.index = index;
+        });
+
+        if (this.startPoint == -1) {
+          this.prList[row.index].choosed = true;
+          this.startPoint = row.index;
+        } else {
+          if (this.startPoint > row.index) {
+            for (let i = row.index; i <= this.startPoint; i++) {
+              this.prList[i].choosed = true;
+            }
+          } else if (this.startPoint <= row.index) {
+            for (let i = this.startPoint; i <= row.index; i++) {
+              this.prList[i].choosed = true;
+            }
+          }
+        }
+      } else if (this.window.ctrl) {  // 按住了ctrl 键
+        this.prList[row.index].choosed = true;
+        if (this.startPoint == -1) {
+          this.startPoint = row.index;
+        }
+      } else {
+        // 未按住了ctrl 、shift 键
+        //清除所有选择
+        console.log("清除所有选择");
+        this.prList.forEach((e, index) => {
+          e.choosed = false;
+          e.index = index;
+        });
+        // console.log(this.excelData,row.index);       
+        // console.log(this.excelData[row.index].choosed);
+
+        this.prList[row.index].choosed = true;
+        this.startPoint = row.index;
+      }
+    },
+
+    //获取分组
+    getGroups(customerOrgRegisterId) {
+      ///api/app/customerorggroup/getlistinfilter?CustomerOrgRegisterId=3fa85f64-5717-4562-b3fc-2c963f66afa6
+      getapi(`/api/app/customerorggroup/getlistinfilter?CustomerOrgRegisterId=${customerOrgRegisterId}`).then(res => {
+        if (res.code != - 1) {
+          this.groups = res.data;
+          this.curGroup = null  //清除已选分组
+        }
+      })
+    },
+
+    //确定从档案中导入数据
+    async btnImportFromDataBase() {
+      let customerOrgIds = []
+      let customerOrgId = ""
+      if (this.newCustomerOrgFlag) {
+        customerOrgIds = this.customerOrgIds
+      } else {
+        customerOrgIds = this.query.customerOrgIds
+      }
+      if (customerOrgIds && customerOrgIds.length > 0) customerOrgId = customerOrgIds[customerOrgIds.length - 1]
+      if (!customerOrgId) {
+        this.$message.warning("请选择新导入的体检单位或部门")
+        return
+      }
+
+      if (!this.curGroup || !this.customerOrgRegister) {
+        this.$message.warning("请选择新导入的体检次数与分组")
+        return
+      }
+
+      let body = {
+        customerOrgRegisterId: this.customerOrgRegister.id,
+        customerOrgGroupId: this.curGroup.id,
+        completeFlag: this.dataImportOpts.completeFlag,
+        payTypeFlag: this.payTypeFlag,
+        medicalCenterId: this.peisid,
+      }
+
+      //{
+      //   "patientRegisterId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+      //   "customerOrgId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+      //   "customerOrgRegisterId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+      //   "customerOrgGroupId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+      //   "completeFlag": "string",
+      //   "payTypeFlag": "string",
+      //   "medicalCenterId": "3fa85f64-5717-4562-b3fc-2c963f66afa6"
+      // }
+
+      this.elProgress.display = true
+      this.elProgress.percentage = 0
+      for (let i = 0; i < this.prList.length; i++) {
+        this.elProgress.percentage = Math.floor(((i + 1) * 100) / this.prList.length);
+        if (!this.prList[i].choosed) continue
+
+        body.patientRegisterId = this.prList[i].id
+        body.customerOrgId = this.newCustomerOrgFlag ? customerOrgId : this.prList[i].customerOrgId
+
+        try {
+          // 旧接口：/api/app/patientregister/createpatientregisterhistory
+          let res = await postapi('/api/app/patientregister/CreatePatientRegisterFromHistory', body)
+          if (res.code >= 0) {
+            this.tableData.push(Object.assign({ importState: '导入成功' }, this.prList[i]))
+          } else {
+            this.tableData.push(Object.assign({ importState: '导入失败', importDes: res.message }, this.prList[i]))
+          }
+        } catch (error) {
+          this.tableData.push(Object.assign({ importState: '导入失败', importDes: res.message }, this.prList[i]))
+        }
+      }
+
+      this.elProgress.display = false
+      this.seq = -1
+
+    },
+
+    //通用导出
+    btnExport(elId) {
+      let table = document.getElementById(elId);
+      let tableData = table.innerHTML
+      let fileName = moment(new Date()).format('yyyyMMDDHHmmss') + '.xls'
+      let blob = new Blob([tableData], { type: "text/plain;charset=utf-8" });
+      FileSaver.saveAs(blob, fileName);
+    },
+
+  },
+
+  watch: {
+    "seq": {
+      immediate: true, // 立即执行
+      // // deep: true, // 深度监听复杂类型内变化
+      handler(newVal, oldVal) {
+        console.log('watch:seq:', newVal, oldVal)
+        if (!oldVal && oldVal != 0) {
+          this.oldSeq = -2
+        } else {
+          this.oldSeq = oldVal
+        }
+        if (newVal != oldVal) {
+          this.btnProcess(newVal);
+        }
+      }
+    },
+
+    "readDataOpts.titleRow": {
+      // immediate: true, // 立即执行
+      // deep: true, // 深度监听复杂类型内变化
+      handler(newVal, oldVal) {
+        console.log('watch:readDataOpts.titleRow:', newVal, oldVal)
+        if (newVal && newVal != oldVal) {
+          if (this.seq == 11) this.readData()
+        }
+      }
+    },
+
+    //所选体检次数改变时，自动获取登记日期
+    "query.customerOrgRegister.id": {
+      // immediate: true, // 立即执行
+      // deep: true, // 深度监听复杂类型内变化
+      handler(newVal, oldVal) {
+        if (newVal && newVal != oldVal) {
+          this.query.startDate = new Date(this.query.customerOrgRegister.beginTime)
+          this.query.endDate = this.query.customerOrgRegister.isComplete == 'N' ? new Date() : new Date(this.query.customerOrgRegister.endTime)
+        }
+      }
+    },
+
+    //选体检新体检次数改变时，获取分组数据
+    "customerOrgRegister.id": {
+      // immediate: true, // 立即执行
+      // deep: true, // 深度监听复杂类型内变化
+      handler(newVal, oldVal) {
+        if (newVal && newVal != oldVal) {
+          this.getGroups(newVal)
+        }
+      }
+    },
+
+
+  },
+
+
+};
+</script>
+<style scoped>
+@import '../../assets/css/global_button.css';
+@import '../../assets/css/global_card.css';
+@import '../../assets/css/global_dialog.css';
+@import '../../assets/css/global_form.css';
+@import '../../assets/css/global_input.css';
+@import '../../assets/css/global_table.css';
+@import '../../assets/css/global_menu.css';
+@import '../../assets/css/global.css';
+
+
+.spanLeftClass {
+  margin-top: 6px;
+  width: 70px;
+}
+
+.spanMidClass {
+  text-align: center;
+  margin-top: 6px;
+  width: 50px;
+}
+
+/* type=number 显示微调按钮 */
+::v-deep input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  -webkit-appearance: button !important;
+  margin: 0 -12px 0 0 !important;
+}
+
+::v-deep .el-table__header th {
+  font-family: "Microsoft YaHei";
+}
+</style>