From 581c4009aa9574ea723790e1f3b242f0a9cde4fd Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 11 Jan 2023 20:44:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E5=85=B3=E6=B3=A8=E5=90=8D=E5=8D=95=E5=AF=BC=E5=85=A5=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E8=AF=81=E4=BB=B6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/attention_vaccination_template.xlsx | Bin 8732 -> 8815 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/attention_vaccination_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/attention_vaccination_template.xlsx index 8999a528399b358ceb21053dd6dd22b85aa70df7..9047ad60b9b18127f050954289bdeee73f94f2a5 100644 GIT binary patch delta 4860 zcmZ8l2QVC3_g`zH_Z}=(f2(eEOSEML(R;6t=zS5fN%XeLYS9usl88>!=v{Qd>LhqN zL89gJ=9~ZjecyLy?wLF1o_p@hDKqEy%S9X_s<3#(ZpNxNH= zO7%j05pwddIxp?z2kvx0fGQ7noZ_C~(*-qdj1$X3%{ox9iJ(#05})sh3Y2R2`1k4e zv4I^&gY-@@CW~pPiZ~}ffXCJBty7fe*3=Q%y;&cgU^9V%aR$Nc&35j|0Qf^RP4|T_!&J;VdnLZXyaJ24)9MG3#+k4(t3`-Koc7)li^Y$=vk-6v zRx)Z#=lEvtuTm=sK|?5@RA5w$O(XLXrXnPtO zW__K6d49Ve{)&tECz2OyUIU-;bT#oobN~Q=2oSBkt_V`Hwc@)AHU$s>puN*NdO7I& zdU^YaI0X3ldwB?>gFM_zQXad7D^f)rM&3p{9X7MOCMc1snefZkjfsi{TK0lKZP@dchVUW(E%mPTr(Fc!vZs3UTVhk z_mNJ2>4UC4wvi56tH7LB4rtdq!)tN*yk$9Mua9WABf-sN?M8ZLM${O&q0~vPEcaG! zb$dz?SSgG7?4!z+$C$yFx2SZCq$98n0tYS2MpUCc$k{B~4^kz+qThejgjuPbQ1Oz+Y z;$dMRW-Jt>L=ojfPcM2G(OM7yzy!eVL735rhB(ZEC|zjfG`i}#y~*1`k^8+6UA?|Q zMaVPBFT~YV8`F}Y+xGr1QIR$2l9a2gI^RbUbZUa6p^qqRKa2;cP4O3iTtAZPd5K+~ z_FsBx#0Gp2&YG5R`~k{%xOuoDWbP5z0Q3gkcg>j?YWkC{Kf~lrR-!+?#6j8u|Mw&G zth)n_$yPN;eK07Q8*2*Fo5I+6E_W3S>wB9%X*bbr!Spwz66G0pFz^9!bRJxs%&%`fwne|1Xlx`RA zSX0qWWVWYz6qVcorjv%I{iL3AX*=y0Gu4no0fN-}@}xUxibu9-CeC%XUue2hy@p$U zyz<-?71xQP)2(Uq*Azm>cNxtEFpZXWXU3l=do|yH>@8$^5{j;1JRyh0Z_#U{tcsjU zYRGojSDKbp5xp)-Ii5K1G5SF+W_;pzvneW7`i5u=GH9)RH0eWte7F{B=dbB~*}4<; z3&oX}1YZGi|$B=WKLBl}4G-U72G0i?XN0T+pJ zsuA9F`e!gVL{^Ttt9rynh|$#ZL7b+XmY1ZLKwnw*y%)M_x}?~~18EYc{Ie6T+>{@c z*FSwmI#&MF6U-52{pEGeHC7bFQaeDvM}Rh|HYm{~0RXsl008p4E)8-Q@$(OMck&ay zYtI==k0hKa{Vk>kU8Ubi*rR3NAMAsAP=dX$DInxh!az){`|VNgeNBwKw6;VoQMqO# znIM$rFJ-%Wn&FQczZ3~gsSJl3uAH;QPoMk-Zne){EN{vNmO1o4DaJTlwJL1oqMue) z)&}ecZ9^OPZ8v{fmlb->LgV(&uG=@j{?L`rPdw`chWP7R+rM4rFO}!c6%EzzSE4=K z=<+|EC#v8m=xx^$Wz)Mw<(kbaFd@x7%5MDi2DmE$}MjS}YA^1p~Mp=HV-)oTeBiHTc;!AHxax%f1PUR zmgm&VT+I=`xT<#>PMqHQCBh%y#^_`7Nn>BDwH@&ans{(N+i_uO*W!J}7^iizYnZMxjgJ2VcoH%!s!v*}Hp)k}AzZLATH<{Klp=oc0Z`+@lrM#-n ziQj+clhJcxVz2P^nXx^(Hp_kvsxjhPG7##jKRTF4rL+~< zIX${aWY6RIee-i^&T$9F$+L!{LMODZ=hNYOLWtHTaBG$7hWv(0yyCQb zoV`nFrJ5pi%y+GdSr37x=8=2#GFmrJBPfQQGsOtz#(MdqT8VxM(Nwk^AJ73UUM6u> zGcR4%OlW!|uuusEk76$YjYg4!eT)2=aGisuW zQQwL9R9X%bqLcAJAC8|VD6+0S1Vb6=s55oI6${%!ZL^as=GdQd?}Jmo%0qgHs*<%2 zkWK!Y$YiboCS}aJk;mTE#2snY3^5 zw#IRs5XMOl22Yz(0uS(bY)HfIvZBxiVfZKT4gu(AP{%&ub0Mm2GuVRfa|%0HCR^&P zO1rz4*+;)sau3RUMV!+1kMYx8w$S=Pm933VRtvC~nEJ+hQzY^rmiVOF|AgGob|ugo z?zB>gM2A!vcoBxVTqw7e;0NGLjM7g53w}!S061L`CDr54Qfvpf7qL>oqW9uvsAV$# zBHDG;LP{sy@O_05e%=Yf_L@gzxtE%e8hvw#kP(j;U##Jt>@B4B*eq~~;N#($)a$oM zm=)UOFL?{ME41Q7`Bs4h)nvQoKged=8W-@;qDupJ5-Z%viF{qap~D4uVEvx1Y+@Ds z;+0fRo`!4IY}ztNronUKQpjQrqB~ESkS%#Hg;A;EgDgY7L9Pj8&aD&%C88^LTX!&( zGl!=)LF!hW2D*6Wc{ycPLI60=Z`MLdah8M1OatbWLwdEgp}MK+r=B3ojHyJZRD>FO z+|j(t);5;QPn%{L_0l+UOiYiuSbz>Hb&d#gXn#r2ENfF80&MA$E>S$?(V)+%2$j=> z=NMx9K8r4xt`91=ASZRnqZpm^Qdn{zNi~9h&~n%nSuIA*Olk))RAo0|T3+-oZ_>PGEe+q;q6(F*DDV%rWa)1nGM4LU4I4*U zf*$>AwJmkv=u^kGJ89wzmev0IaIrZA*G@-YYUlU*C9Ul;hLBXUQVL&6v#qj^7EIW6 zJ#guHt>swwtNb!#Y+5E5=nvQ{lzR{#J{82=TZ}zi^o@QyUcfGW*l~#lG;%?LlYkVY zpqDr>#>eHW1H3JlF82Ar$S^z+n`DnXZ^Z-<)0l zxG^mz0_$1;^APMWq=9CwbbTWgns%_8pFgg#3j6?h4Q}Pw)&wc9!@WTp-p|k2X`C)6 zR_v9jAFfKqP9n^;IF*TJ8F;vB`(M9wD@C!5#nReMC$GmaGcwB7t#@`3WcOIYOH8( zb)Lz9u`V+u_vY8P`R*)41ctZqXbL{1AfLVXdueldX{X<&r;am3(JuB=50t#8P9r|X zRb33J|J|%g)pVvLB>7#9OL&a%(VL#A9R-~-)GgyqJQCfTn^|&SH28;LyN#e)HeJUS zD(rTB2Ycr~nKx3m&>2$PQ@cw1Fu=duG1l4Px?5mh4*#(^A?=y1J0kf7K99EcUO+-( zOk*?Ma_mBncX@me*XP6sHbS)ZcJAMG`Jy{hCy2$}mYd#W^a!MG_s|1n`NseayN{T- zFT<;;kI}?Wb$Q%rZaU{;vLf>wX(Vapyl6f4Y~ILRZE`-IwMCsS>C8PzS$ zt}Oct+D}y~af#$b)wL}X<1O%(mQuYb*QM7=@+u1Ks58?U#xP~i?H@q&CS}(sTPx)z zC4u&s^)W+Vfg(ulLnnm=Uz@rU9T|+lnd}6>Yip<8ydql+#3^BaS=Yc3= zNhR+(!+BmRS827VYBOv75xva}Qx&j73lC4GM96T_IHyxByR4T3I)4e_iz}%3q?XX0 z;-*>+X$t@qlF6%*?{b9r63TmyHR|mp#PQ0nl;&vi6zQF0j%<5}!4}cQyBDg*Hz6ly zzs{4?%ckruQ$MmzE^XMS<$tNUDtdqxQ}}O`EaWcBD}INP5AQbRzvpk1m#>>W_6-ve zI_0rWw+N1|hX+bV`=WGrMuSQ#0gMRFOtq((y8(cF&!Bf~&W4SJ2Xp&Y&ttG_>!} zFTu(5vz!T*;Tf_er}Z)1H<;+YBHaSCazg!@S*qo!xeF<>Yw>sV+K|3xsCP}pL?2gA z5p~KeWx6MjE?%Eykqr!+5Em&dZKEW}qJ}(#g7vhqsFsbq~o9u2OfrWh3UzkI*W@;6kj z-MOy_!fVDt*%X1C%vg7}2S7Du>>IY!|Db^2?2@ei%Te4V0DuSJxRdz!*hF>(JPYh7 zyC|L~_Lf}|n9hQ=W?>c3)x-nR0si4R{=aPRGWfUl@AYpVjo4=#e60VAu>QGMBFA=c z$N(t_u~!@tKnX(ZF#$am387;7-=g^ENhj79B8L}>t%N{W{+kN;+vfj1ev93O2oUJA H{jK>I9{uC@ delta 4780 zcmZ8l2QVDm7G_x`h-g`?*wt5y5;aJa)qD4gp6DfdX9)?b1*`X7qFY^vUJ_RCiI!+t zqW*~b{O_N6@BQ!0+&gp2Idks0=gvLfw-3*P*P?KVpFLWP;Kjwk;YDTP(jsCLWHiJ1 zAH3aXzagBIXn32PMlc^{qnVKwIpOQLxM0f6tNy}z&ir+#Y2SAD_mhs_7d9nE5It~E zh?jb)DxB&K^LPO&b~$;we7SE9=APp?yrdzAj9VRVYx@Wbw=6&(SV-W_imnz&PsS1J z7Id7wv)t`tr1nvE-G;hIR3KW&i@#a+_Jdb&HHe4n0Ap-t4CGz&BXCby6#{PQJjH`keMZy8V4heJgwo2UJz^~Gs@3qh`=ScF+O}Lz;(QuD^X3 zbNIS#X$a8LSLzN2{*rhR#0U=sd5sUiP`IzCSDm8V4RX+#Oa5UWl2nWA)#}9xg-z=! zvM7$8)&`%D=cYTjD>`xF=}}(zGQ^gQg)hMX92^hSCwvw}CjWz=nrTGsRi}wN8%6CRd#rJJ zvO&i)2^%5$FMwbn6;-GTQPmIOqczVZ=?op#dUGfI9b-?`$of)Qf zU_31>(9Pxp=8*(2q7Pre_Nxo!GH=)LQjnp4_~M=pOwvF9x1OZAm(| zDe+}cLqyo;6Oy#KB~W9~KTu zs`RoLgx<;r(lW0H^f^S*eq))H>pN!*4Z1NL{1HVoA+wT-(dqR*NKVf#<4w>iIEAHY zatfFZw}VQ-`~DS=W{3E=udHyL6~Wy?aVWb*^Z7g-$Fqxvr{xmOhwFHdL!tiW=R| z7gU^rHfjn1eA9x`@mqia#sy9Q>YW5Vi)L6n@90 zTW0y-#ZR>!`)vCWo}7Y6xWH_fa@5wP4@L@+dZzQjFfO9ned@mK;MpRLvu+ivY3}$k z&S$*(YTMtZ@DJ^tp`(iwY=C#WyH!Lo_tMJEtO0Fy%W0$BQXI9#+S|R)meh|-s||XW z^Q9Vk)NhAQS2IH)q*X*3VPOuw)bj?<;c&U;4;2m_Pa7C&>N_@K-+i;B=8{7Ekl%|! zDD!dt$P~SBohXBazZl#P;}T7pOHy5F_f-C-Hv|5R-99M=KLK@K9w$ILI%RH5Ti?9C zydf*rQHLL0HB#R&AD^qOeoU(o|B^a>v!D6Io&V*)*XAb%qd}UFe+cP}m6A5uY3NiU zuT*8omRV-R+Lm76t-O?()sGZxtM8!cL{xokFzL#TW1c!TeXhkELIMAyx32!3NbAeM z8*J(O{k8V{RZ#pB3fW%x9RKOML`2*c;kH%sP+CIxZ%XCv?%?*xJ?|P3Z++oZvB0@# z;(*6!Gc%0N9vu^iBR|8(LRWugQwR7o8Yt4XjUI{I<9lf5IZ-Md8lrOkqNEFWh`@R? zg{a2nu43o~<%XPDQZ0>_zdkH-J1~*|Y&~RLZ%v1c=rN#Gv6!AsiB1H@J9+(V+_6eGaEKF z$5q1W@oGrSxepKjM6qn^N!rCHAdL0l>3(N27TI=BtC7EnWLLZ{l%m7#uRvrx=)}ux z4Mg2Y8X$;0-=NF+cTKHve1_tU#~;#o>t^3PFI@P5ttu(8dTGE1v0+8_6GXnAb{Nf= zom8)S`_a7YN_fFMGM#sGlc1%wd?s_$=8I6n8w&&5qi8Y@K}zZGGdt9H*Fq?S^IhF|C2o?zUqzB#$u z|M)L&UK@93!@BqaVwF8}AB2EObYL}&adhD08$RT7$*Q-=lTOHqWvDW8&RghYKG$Sv z*?mt2AD!MME(X74xg{EPzJeV^xQ_c&;;o=f#46dThY@gMZrxg2$q4d# zRthhNCG4EXrn#_?{DVh&PG;%Q!HT3z3TTTn#gZi;Ja^Obfn$X2MRm4cl0N8MaBGM*jTCAws?b_&wP+hq?&KC@4m zWSW9&I*hz47a7Swm~oV68G19r4d~`oUMyFx!8Rw7m}J+#l19mk49F42z@?VFYVw)B z58^##Naw}D9EL0r;=F*48w)JDhumMYbO}^?$LL<)Vcm)e6>X3*3T+A-+R6VD%b2zJ zYT~zVJm#VEtH=fVTE?+s{mMd?vmX(KYn_ig4`+!hft_t(2tpn2VBv`nQ-AIQmUhtE zD1%*A5HZ_?La34QBmaGOu312NEm&UT_X6SN%Kj_3l1$P?+YeYYO zK>q+s$!WiCD)oo;8{c}8jqnXSP<>Q34Oa89xezYWk^HGNfBVmr`D_B;TKEB+#ZWTR zO@MGD#Z0jS(ZIsIrG$5SFJ&233pLhZ)8127fUB2bu?!Tg=LJmdS%+^o3^&^*n=7bRwnU1SPRgF7bnvyYRO*3>fY=EzlVMxJjw)=V` zz&MjCtk@WGhF-`dQ>V-_X>?R(0r->#DdrMSt9Mci7O7=2lv&ILKV_7; z+dflb)`E?ZCV*YEv~7WQbv`6roPM`k`k8JXdy5_|x;(l-F_5QfZBz+ajcl+Rmq*^r zTWycMyp5zEIe?y-kH|(1R@ZAc`z^VlZZ|Mg%}3@;KCJQp?$Y>;iV!o2nQKw{bdQS3 zR};bS1E4XHY_&@j|Drw(?{FVQ4yeD!-%lys*;+TRCfqI48o<@u%gg`F$Cc63)9(zZa( za+hjAYq6IGV|b_~*oy5l%P7QTAm3_oSR9cWS|A${y!w%>72~X|v{Dq(3kY3pQjE-G zv74tRH|u?EIPjiP9rAIoyzRNWi7!huKH#)+gmQXj9|rz>j;$%VZISwYy>q^H9X<9e zJ^0`)KtFSyRcw!P5~3G6v4*? z!J}-VU{{|Jh45@nuk=1VHF65KT7;Yo<*lBFw0~s;k>ot(iKG)O@bK7blV&~-YWYO! z_85J9saH=VW#pe6uO!)}2huK8tqX9&rfNc@iUj57yO)`fBh#;JyQ$V}RRs8-1*r8$ z4NVoFl|~g4$iPMp7!R7~OkK+Bb$7BO5n=4PD;ZZi zPJw4W-zAzka)Z_F(@s+JN>o@tu!!vwQDg-4HGuTr|~@N zt3QrB;%IoKOq$|}aCuyLLf&x1S%5%uA_SS{o>pA?^iN! zwlMu29H^BnZ35I_;2Ibg_!YUgzA=yz)3LXVL?`y(OD$~KS)}kC`hBRHwzgAc92`ih zM_TJfrae(YEw$zOyiHJy=Nhfn+pw1hI{S&lA5%i&8*(Zx##;{>4u}}+7CcFeFNfYV zD;~_+E-vBmUz{Sk=vybeF09*o;t(M|GjcKO?aS^i7Zf%V)wSP6Co(09u9gNTGMPTQ z;N2!`uQqV+@9qg1w+EO86_)=J5>@N1c5ZNxXa@_U(dhOi=km5iKae27b@11Xm!nyi zWUcvABv<1Qc&3yu(-4F-D@W><+r7$x`}ZSp3wLqPwdyBO5fOtM`u5psR}Og4?qe-* zRtl{)+0Oow^DX3`nD2vuZo%YTg-V9PfWQcJUCq#_HcXY53o|l?))$<9qNSrWs*2GZ z9#L)9zenaa)u^Qdd#pU7sys40rrN0gL5C+GMy zFiNB9JhNZ;lt%GB7j1wx*i&#?<##Unf%4@@&VIV`a<*3S3k3oKn~PRtx}VCu;opd2 zKei^75*2Te{&a507cO3!nG5oy7YQ!g3WB#`1;k^G6)N< z8$eVR!KM>s=%NyD;~8?e1vx z`nBU-X^wD;)mGQ+S~dyh|cCy-dTO{i7BZyh;KRm%9w1 zqi8Xb&elP%OMa%Wilkb}E7aHsqd{7T9n9lXb0KCUhv{={7ZP9OKZ+r(IDp(Y*Ee1- zOs$enRY(j`U`>QLeuKm2l0{k|j|3)!YI+iXp>S>BYMLq>dcYB)i~D?UfwkizXH_E8 z9huhR2S;;19zWRr_Dk6NP-mYB+o0PSAQMzZmF+4%h7L}-^?ROH(#j+#3iHR33lw8d z-MCd%Imx-zmFGX~bh$F3dWK9bf@m2rThUo3D*La%fJf`0Pk}LxV-Ve&J7|oSq?g9W zwM7LnN(08|P@fnD0mpQxW5&e);bh_0IeeSm^O`EkK0 zZKw!97L2L`GoXs055WIP&AYq$i=_BV{?_wGjYBy&{vTxhcYTfYe;^m?5CTO#W4aHh zCO~O02?J&bP}+nvs0^kD;Q!Bt|61@z^)pFI3E=A|O^iVL9rw>N)N dCjVgu?sn4trG6)W`)G=K#>`D{`{=Kke*r))+cW?G From ce6fcb18756ce900a23eaed39d441275fd0f4b63 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 11 Jan 2023 21:05:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?/epmetuser/epidemicPrevention/info=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E9=87=87=E6=A0=B7=E6=97=B6=E9=97=B4=E3=80=81ic=5Fnat.?= =?UTF-8?q?id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/result/NatListDTO.java | 9 +++++++++ .../epmet/controller/IcEpidemicPreventionController.java | 6 ++++++ .../java/com/epmet/service/impl/IcNatServiceImpl.java | 2 ++ 3 files changed, 17 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListDTO.java index 279a66393b..20964eceb4 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatListDTO.java @@ -1,9 +1,11 @@ package com.epmet.dto.result; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.Date; /** * @Description @@ -17,4 +19,11 @@ public class NatListDTO implements Serializable { private String testTime; private String address; private String result; + //01.11,增加以下两个参数 + private String idNatId; + /** + * 采样时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date sampleTime; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java index b841e4b6af..e00f730bfc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java @@ -99,6 +99,12 @@ public class IcEpidemicPreventionController{ return new Result().ok(result); } + /** + * 居民防疫信息-点击查看 + * @param tokenDto + * @param formDTO + * @return + */ @PostMapping("info") public Result info(@LoginUser TokenDto tokenDto, @RequestBody EpidemicPreventionFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java index f58d457652..b9cb1331f1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java @@ -457,6 +457,8 @@ public class IcNatServiceImpl extends BaseServiceImpl imp } return list.stream().map(item -> { NatListDTO dto = new NatListDTO(); + dto.setIdNatId(item.getId()); + dto.setSampleTime(item.getSampleTime()); dto.setAddress(item.getNatAddress()); dto.setTestTime(DateUtils.format(item.getNatTime(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE)); if(StringUtils.isNotBlank(item.getNatResult())){