diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrgCouponController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrgCouponController.java index b27dea2..40c0833 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrgCouponController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrgCouponController.java @@ -47,19 +47,18 @@ public class OrgCouponController extends BaseController { * @param endDate * @param exportType 1 = 孕期优惠券使用统计详情导出, 2 = 产后优惠券使用统计详情导出, 3 = 儿童优惠券使用统计详情导出 * @param response - * @param couponType */ @ResponseBody @TokenRequired @RequestMapping(value = "/coupon/info/export", method = RequestMethod.GET) public void couponInfoExport(HttpServletRequest request, HttpServletResponse response, Date startDate, Date endDate, Integer type, - String couponType, Integer exportType) { + String couponType, Integer exportType, String doctor, String key) { String hospitalId = autoMatchFacade.getHospitalId(getUserId(request)); Map param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate, "endDate", endDate != null ? DateUtil.addDay(endDate, 1) : endDate, "hospitalId", CollectionUtils.asList(hospitalId), "type", 4, - "couponType", couponType, "exportType", exportType); + "couponType", couponType, "exportType", exportType, "doctor", doctor, "key", key); orgCouponService.exportCouponInfo(param, response); } diff --git a/platform-operate-api/src/main/resources/qhdnb.xls b/platform-operate-api/src/main/resources/qhdnb.xls index 6921f811973a9f4af44caa13b7ebb4e4d8f361fe..968b8689521bf0f57a700367951951ffa7951187 100644 GIT binary patch delta 5101 zcmbtXYfN0%5uSVZ8e{X`g#{MaU6zMm7#0kE#Wt`QD8v{7SVn%NBKF!Lc7WiAl-TlG zQR_cZ(kN3kY3f#P8@Wo_bC?7S!ueKt2Y=b&xoBKzA*8qsT-{l496J>?wC zKlz8}|1$p3b?d_WzxwCN+dSi(vu}*f-g0hcWxswGIM*!?S3AB-xos9#<(0`>PPX;f z-jTs(3e(3hmQ7DuXlx=rlULJeq{Z}lT1w{@@O@eqzg z`Oo=fTwKt~ucGb9_wyv$WI-8U#CvZ+ls^NnBhTSq0xRv41%7@T@AiTKzYFKj~|THT)hG)BnupQ{GSbjJJ#@eZ>i*{jzJ+smQcy_)UxO zmo35%EW!`X=O>8F0ITN<=J6XA;V2x+!%x{#YZaw=C{puHO_TofH^UsGg|1d0x z&J*=PUcW;3_piw3$Eyl?4mMs4gi32MT@U49H}R+*QDZc^Zxvq&HuA-wcS)LxhEh~7 ze0aPnBKmx@qK)H~&HST4Vd-jP3tKGFIL&G8S0h2*7>Qt3d3-psn%lz>*Y2C4THaC7 z&({s-U*Sm(2P1qMwy$X)*%L{P9Dt?YR}}IzVi~LS@ws4_lZdhO|5P33pCPW&|FE`2 zwd)YicMx0Q+4W)mu8N3{-$efdWA!$yz7R_LbcTy6zQ|vxyfk}c#U~}!1N`}|BTK*G zOkhr%W`DT#w;uj!CnvHf&n8*Wr;c1Zd+Nw{c238`pu)5SkA=-Shc#8qG1}8g^c31Zq75Ma{cS{#qJ0JJhiLzfwh0H~*7Zau&>qP4Yx zlXbb5=)yhx=+5&~1GFBH0h*u#G(%H#4DTU24u{5Qh(^$E2j>8tpa&^VlS;B1$O-h~ zX!Xx>DC-7|c|3E3Ni3shb6T?xqE|p;wvAT4M4i;i5ADBuqa3I5lUDfB;tYpw=5Kr7 z&Rr2Iw03xM>E~~KI)jtCGH02=STOb_KD+;{`#z9J85T$(h>?NOe$~eq|IZZrCZ|sv zk4;Qc&*1RD$l$Kwu5KFc9@)NQ2kn}in28^gUf*Qmczot)eEj6Z7l*{#}CIx zAD)g=|4?`DK>Q#L&P>E7kB=Xpn3|-a!Qs*2&c0FVnmT%P{CHfc49Aa69X+AsgVWM9 z)6n>Id}d_gkvQ$>9v$r-7W~xAz|_GwwY1(hJ#FGa{52=IQ4Z*VvF*Dp%>SDdK{6x} z^4Lhjn8X{u_u5mfMd!2Y@gleZJ~&vMXs33%np>bUL$;h%gwm8>2i|O3idXvAP&YVn ztPaJK(09=NDg!B=jJ1%5`us1R7&5p74Bn>YU`biZFG*p1E!w%rGl-2yYviM3#e<~M zFQ9v97;8<-ieOC~N>VMp-bHNfq=XDJh#|FFwJ|AyjliTBt#ze!Fe)=jVkac3&oDYj z4K8Xe){)FHsg`l0Ya{APn_)xZn}l_umdOkw3+LRflw^)E%EDKil-$N>sWOp^zD-@~ zaa`#V`W$wV6gCT3Swl$*0K1fnhDu6xj4UcLvM6L;9v>>_>7nHu9?DMCyVh2?7|YHA zW+g__KCA*?vL=(XXtnEu4uM5$AVWYz#H7cIa2v=vL$w3C5tKL~Ygv2kL50PzqP30( z>5b6}LwP{0G?YU3{-2WqY1=NNu2 z4r2Lls|U%WZWk{F+GMO2fQlMaq0ufPapM#B9D@r9h*kE<#JJ?(2n<#Wq z5=aO8s5s?yE%-8!#h~QQtdS)O>35N(28sMT*y;4p8d|QP0T)_fpn|N-KvpSa&_#wa zkl_quwL(T*WKA0Bh0$6A-2$r4oUi(fb?)m|0dJ>YBPvN8(nA!mdaN<~-}W}!ORva* zPaSv<;_brwSau;^bj%MME#l}2ssrD`=89hSSFwB1viIq-y_?JSuaaWLdT;07?Ax%+ zy$4brKeMm7)P`GI@kqN3kF>ZC^8NU4*S9yqzI`nfYjCge;HklMJdl^;kv2d9erfOB zd}MD6-`-o6Q-K%?E<|C@-rL6S>sibuxTg6AXbnK|6E|FXK$ LN1gm{-Rt}Zf;Dw> delta 4998 zcma)8YiwLs5uSVZ`jKwDyMAr#-SxiLi5+{rcI-HD8$Y)V>$E11hQ|*agW9SjRa6xL zDygzjfT9YigifI<%Ab~qpo$h$M-@bo6C@;18$}>RMFj~Z5~&a^q-sNj0@QqS&$(xJ z?JnZ3?w&i}d^2axoH>sZm#q`OvVP{+EqNmPXmxefK|92)_79gY*hTBROU=(X4+Ktj zNB7*gb=5jy&7Qh(iyw2Iv=8rFzU{oz*nIxXanblV<+Q)Lam?Z`27~-wu!G+XhC@ku z5AK@jl!eBo^L)G|!=-?~;Wq;FOrYKUYUj@fH}R!lnE#IV-C!4A2uAp|Ko?I2!hAUp z;WvYMJ{^eh5**(Tya>)Cfl>Z3_~BrIzXJIq;BVu7Iv8#|2mh<(iD=fiehy;wI1ps`%@170`NI1+*TA{}^U&y<*snG{Dod0)!@@GSA2u7@!z8O{8op5e9(<2=y_Pf?D6n( z_>jj@Ga2Jdc=ud405{HOTU(#=Kj$Y$r6XeShaS3^xR@Yk-0h{)!z;b;-#UA&D8CWj zU9Oue&&tFwrgFFrSG}zFv#kz)vKp^0*PX5+zODmRHJA@GY&ASJ?2T2pN{6Z%ENI2A z4BPeJ>fxtbTf=@1bxrX8?lb&!S0mrsmFIMKfxp&uhCl4?aJK*A?cZ`B@+KdRj`7)C zi0|$FCjUEjkZ&f(_>G{7x`9?#FR$_w@i@Pd^rT{D zpvA=xCHn)^KsNs*kzIpCGg)oBCl%qFi8fD4=6N((EhXcgG#=0M<3@KX8Rx}lh;JHw zV+@1B9g>0U`lkub3J~wjNNoJ z&%ZXhKS8%>qWp4pT94&C;$1d2uSfHnWZC$r1>1uUU$VKYS$eo9&wnuf}Y zHj16Lz($4K2VAC5(qmD-_ElEdv#<(EB)24`&TF;Go<+k(D_66THG%BVUF-x)=5K{! zU`?!H=@FxpS1>TC1t8w|_hWJ-P8&%sp`cJ)h~IY8rSN9pQu!+=DH{p(+|BFqv!N}K zoa$13HokAX*?M55d zT2|H`0ArU0xq8v;clt45XSzjN2e2oH}|mA!9E4MTOM{sS-*%B%Dmz zro-4su~%%uH8z{X#+!d1%FT;k)7wAdahbBvD!P#xoh-JBZq(@9`IiM(QEoR%>0TCHMYluitEE!+Gmt8EKMM(UubFdYh?Tl8!pRDS-Lutmy_XKS-88u-4o)R*!{0kJ(jLW`B)f0|M~Ac-%JTf7J)J(B+AS^;#ECAN zcIx2Ui({E-^ea8>!cW>s{G^@2PrOglG{3sohiGh6_y8YX9F{8rw%loHFoq)cFOF|0 Zx)M