From 4c147a9764bef831011623467c886065c1cfaedf Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Thu, 3 Dec 2015 16:12:04 +0100 Subject: [PATCH 1/4] Fix XmlException (report ID 6a36e38b). - VERBESSERT: Fehlermeldung "Ein Name darf nicht mit dem Zeichen ' ' beginnen" wurde abgestellt (Fehlernr. 6a36e38b). --- zaaReloaded2/Defaults/clinic.zaaReloaded | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zaaReloaded2/Defaults/clinic.zaaReloaded b/zaaReloaded2/Defaults/clinic.zaaReloaded index e97c1f7..c263e28 100755 --- a/zaaReloaded2/Defaults/clinic.zaaReloaded +++ b/zaaReloaded2/Defaults/clinic.zaaReloaded @@ -171,7 +171,7 @@ 2 -Autoantikörper: ANCA (IF) 1: (Ref. < 1:40), MPO-ANCA (ELISA) IU/ml (Ref. < 9), PR3-ANCA (ELISA) IU/ml (Ref. < 3,5), ANA (IF), AnDNA (ELISA), AnDNA (RIA) +Autoantikörper: ANCA (IF) 1: (Ref. < 1:40), MPO-ANCA (ELISA) IU/ml (Ref. < 9), PR3-ANCA (ELISA) IU/ml (Ref. < 3,5), ANA (IF), AnDNA (ELISA), AnDNA (RIA) From 0d4b60096a8ec216eee5e5975c63e8e60a361011 Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Thu, 3 Dec 2015 16:13:34 +0100 Subject: [PATCH 2/4] Fix typo in demo document. --- zaaReloaded2/Demo/Demo.docx | Bin 24384 -> 24444 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/zaaReloaded2/Demo/Demo.docx b/zaaReloaded2/Demo/Demo.docx index 7957a0417a81aec04a6038e28f5b315fcc93a025..6206475a3356c47100b5154642e42c1093dd8918 100755 GIT binary patch delta 13092 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 delta 13014 zcmZ9TQ*b6gx2|KG6Wg}!Wa8wDZ5tDP!Nlgowr$(CZBFbn|2})~Q+4{Tt9tcCclBG( zTI=nPZqVLt&{{uOpz1EqX)rwqNK6+P2r38&h=+r-DU+##iJP67y(^=qo$aOXn*D)h z{nb0Rob`d?-098LR^MtmYzl*{Cj$%O8Nsm*?*n;1cT)_L*0R3DK2RL_1aC zmQ#Dk7T@~2>*slH9TmSpOGo?J>R-zneJ}5Cr;ncRm7blZb_EMdnGNjL;H#!t%7Xv+0A5;Sz{yYO>#vk~r>z;)H~{sy;{x7dokguyBC ztEj6C-G}I0>>=SLa{;1mWB8&}#NO0{o2&yr4M~dT%a%W1%lu19O2v?1`w6 zEyTw0!4rzu&Qbi#jyHm0W7mQ3jU$)>Jblx&JbX((pi~2|pOk#oBlBF;EJMOg?Wo46 zpZSM8{Z?(_20c}JqhlQzKx?N)&w^XJd%9Qi%3f%rWvt86L~t*otjX}Ch-k`t9+9&7 zdZb%0&b$A-(eHXKrlLjOr+}}D)KcP_KuoJK>ssIwKdb{QN&flVQc*pFYF(nM9lOUh zysD%ec>b%(%PYInlhNTJ?@SS?r|=JMv@?2!KD-&ObN@ti(%yG*-x=tDVP z_nE+;LyFBF-u6J+pH4vj3R1z`3lB_j-kYABDWs&A5HI;0&@5$BPFF zzuZT7Vytg6nzY!$`B9>#nj*^R>Dt>f_*r@g(3fsAWlmt-1$YgGKF`I!<8Ss$(h)lwcM2yraAJ9#)RCA=2q)*4 zungH60#V&I+_TbdLmOQ^eLN5flHhPDbHiUCDT9=&`-=D~$avxYafH+5(Reap;LGp} zc(-2b^c<3&GGm#23h3(|<^MSekSTk_w&5Va`lx#4}dpJpBsubID7i@ zlI5Ds5Te<==RarjHVfa~8){gSrZ7WXFp5P5@U}dE3QCAauj+)AXD?1?1B=2Ikrglt zy;qRCv7Ps6EMpEmNn4W5xCDM(d>g5s2IbwfxIO=y5JhmWK!$8fcSaJdE(ripE0NR9 zDr>SUbg%&E+YcW^Lsj-0{quJ1g$(jy&C%KZn2gs5GB&q&Ib2-Ljo7JoRN1p-(S$i! zd#LGi3hNcJ4TPDu2kXq-{x{kMChd#T@OD~mtq;)i^uG9ZEL_{h_bsyW6*kF-mfdhI z3Q*iIt>QfaZji}}M9AP^BNAl^A5I+P z@Nt4c$4qv~O$09-RvDANN2`KshV3gXh8Q`mAxN>u)f8?sLU#zCmN&rl+S&x6Q9h?5 zL#>63PxK8r~sy$kkk8lwc_x@-!2cwo}v2l5id3x4vbo}TGJ{O zan)nVk}Nt(Y8zE?Z4D?{iyq~671p9;7m!CjZPOg$3#s&_Ff~qaPOZy4b+YhcHqtJ#?6LviY*{izx7$L-Y~v! zTo#AY7?Mh!A!$*9At@=B-qVVJjnkh$XR&%ZmsQZI+TfEB{yIWMhs$kP>#k39LU~hp&YQ@WK*%oT2 zkp}SAEa@;HNfqjNU_S-zCZkG2xhQHg{&Qk7B#%zTX#@`22FICxn`AR~;89B>CLIjL79MGE~*stoZ(Ll?oza@wqWqGib$ zvOtDy-J_4>en}df;yWFW2cK5-#TPiMOf>f%IogSTc7 zonEXydUVO^m^9X%f5vA$s2*K*5@eV^lIVs9d zV$CgvP_spfpoFF3eKjNvA)HVvD`46&bAbCCaQ+%W2qK2F%zkv`R%0-Kq2ukh3+5Xz&9}JnQ))}E#lvZrotK%Z@6|!uwPJ#ps2x^mwbN#82cQ&lcd%$Ad zxG682a5gy*``&dN1_T&X@;=Kw8CKAwx|4$7I@^9z$bw*Hh%VhCh7xuUs-jnI(p+og zD}80>RMbvq!~BPh+8|3>(lH<|ZkCShRQQZr#H3}CJ!p)&uJSAL3yP0KZvVK->7}xf zM!y;y^Dvx|G0XMeH(b;;TF41mGhhS}*zB2;(#e?mN2QLtREr}8mltpqU3b0fk(FB|) zzUCMx%c(uPYH^T58(E4#$vn*$6y0!PaxVPBRl4?i?lyuqyIVBelwfH{7$61m(BrH3 zhc_V#C_51VbojfGPDK8410m~mEZ5yM?Fc_2^f!GKH z_Kpb~fl}ZPfEhGSEv(6y(jTIZ94d|;h8R=|5?ngu7YG`2I>nE33J~%{!?-dGH1)zpwJ5RLin5MI2zQ%VvP#?>Z<1)0(a+t_lsxQ+TQ2Gt-p-B9@MYZ3-k%6TRRl@pF*gv%HP zmFWnLLNnqjCrmm-eg$%3mAs;pD7H&PV)D=vZKQ40gz?ZbT`lKL1+W)$-ufKC{ng#KxPTh68*qGP@6Ub(A}(K?$lv zCL9~&{-kjtkGy{p0jR)W=ucTTwgSD8?FU?+dzeN(*spztt8cChkgP7yb%uBM?4I2LVsv{o`v3AS8FWsh8 zB`h_lTyAjM2@HQrh_TT<@5dl5_ix`Z;$1yb2fbOwW1Vb zcVc1ACyD*Glxr#35O8o_EXj_Ne7te9l%e_ZiY408yefa`Ac`>z9`@PZ7&z$y4NiGT zJ5qjN+M5P$J*-~t{p*+Rl(AXv8F=bSQMs&!sV({n5QGD zilN#^30&UmOQUhqXyJp2%16B-X^#l(#i8Vs&P3I&B$dHi?j2D0$(wPcFFpy$5h2BS zD$RAK5X`gaU2Kx4Fy!-bE_*l5?E43%#tvC%w!E3p1z9*Ge7B(5L0h%Vk*RMmTqc~V zHntyMsH$9r0Ao*iVQ5Y^N(adr#?5J>FT)WT8u%G6$3aUQV>{7$WGH#>oJP#WDR6I;^D-TD=WW47}!om!SrqTY2?n7%#h_Zl$?h}E-?8+zB z3vkm02Gk|m$S>LmbN71otO6x!QdH-`p@(4qJ4|3u8IA%yU+Mp1ja;LMI5}z9M%e#S zjd9FirVXotdEbByj1(=!%N~h>Vg(gRR29m+aq~QFcqX}NSf_6q7}^1TxDH8ZC1l&R z=}Ho1#u7Qls61yI5OM_-h>zVhT&qy#P|Y&ggtoA%!RvxI3O!lHVoUtUS~6TKYXMN! zB2_kl=`pvCHVXHIE2$F~{c^EJz$5n|M?@Aciipblghu2*;mO@G){b+*-80fprAP>> zUm&oSy_TQ{fbos8wQKyjp35#@ZfpnetQ8D~cJQ%lOrr60p%QumeRzU`ih4%$*xHEG z=DRjwn519yPdNMOT*&yZliPeVA=gm0i~}Zak`LA6_p+q_+K)46UCwEQuVs&C9L3oh+#qp8tME-BXoWphtG`hm zgJdkGX@easSarx`CnlHSS#?%uqHEaC)vyW*kGe2vE>F0C@H4IrCO^+6wRAw;0x!oC zm8p1EY=`JgqXW$__Gv@BRrt}Fb);JD%$tk((TmckConKk?u^rhZS~~5E?LiiD^o@B z((s=b=JiUOE{=(oCQ?r3LMl;-SM!Ii;cB<`mZI~2sx8WBsqa4hJd@}Bv({cniZfoC zXl3}$Q;Kd01e45iBu!JM+RShrkdp=4YEUg(%8G|-r z?k~OfP86Sq&~Z%fI&LwqAi8YbMjei?Isc#V8Me?0es=|a2qo*0BF)=Ak1h_TAgx`1kvD-=ORSeyH zCH!rNRKiRsxP6i&<6e~6l^l#Wj~+R!Z7M`Qx}tu2;T+a({}`c@a^o&Lys6(L z&XyI-Vyz7879vr?rFs2YtC=|&Q9=@jCrHyXHbJ{i#Z~a(FtWw=i%msq!oQ3T@&t&i zE3?~V;VhrGfuTX`(}HAi`eQm7PPMfdaPA1mD&l0k?xqik}(4_&c4F4;O!X ziKeVPKG3BIoe3DQHYY4D@=V1g_k>z!olOa7Mrb4ewKI@e;ZV8>72Kx4*D-T$rlpnr z81?-@Ww5UHoM21tokqP)yH{zW(b9#NfKDJHk1s-zJg8=Gi^Fky&sRjF>WWdrDf>GbsUvAdrT)lX4xp19(;OrOCK6w1kG1E^3g3~eyi zTRD@_p_2A41IuIS!0aH{xNxUOU)1coGIXz?@4!s%RMHjA7_*0*WTFq&b*CG*X70em zF2ehnrSWns#j$U2T=*_39CG;ir| zYgU`@lBq~YyuS3TJ?N8pR-X5jb#BBBc2C`kSgYc9C;u=pZ%H4rSDzR)!lsMU8XhAmviar=Tc8>J6HW6s<#?27+Q}fj}B* z2dd@d&n?HmMQ@*0U%gIGA&y(x=xp#_z9ye0)tmI&vH1rcq~ec6?WamG(H9p&op1y7 zs7Kax3xgDcAb2}!TV;E@!LYFgsB_W}#4}t2cNfbTD?TEBJOKTbe1T8L2;7UTGFTy+ zt6q#fwW;Opt+k$G`2Qf9=f5D@lZR*8HhF_}cR`($L-lXY;C1g%UZr%iM!adul=1cp z9QBoNkPBYs#_pzMo(rDZcwsWQD~l6@W{Qc5wP@$kl>fimHlMch;gVg# zJ>lfl1V96wx=(iJ-P#9q4t?3pFlCoi%t#ekgj!gBA)av7w?$L_5Vkns3~b%M5dawHK5>6vnX~G%Sb?j83`J)nFdwIiE?EUkEJ3zV6!b$OsM@>i`LK-caU+*u z9z%?&%XNrq#Y*far!t~E_7NbAKBGfZlBc@<4cbBUE;pWb)I~_cf0-M_jTDnE3hWl@ zZ(l15wbxbn%HMyyUXWESLhV?23SAgTgdzvLnZ@N2<5};YOCgoeA&or$532*xk^iwe z<(+&3?^IoRskcnj>{syi4ylm)=P;(TVLbEh%D`W^U=oE#9fNjB9{|~Hpho^Pqx_cC zA5()lT`Af2uh7`TS?v6Zmj(%{o4=Lut?8>U znv;LDd_}DJkkM5Ruz6aX0z?I^h?{BEJjq+UsGIfUP$7x;2W^q7Obrp!=9IbzZ^O!& z`hSXxQC@4?L%ABK-QD?Wx$QIoAMi5s7vBl=g3e0$*1-qtKSq{j2jSmlJ)Xe0a4m=t z6S=T`@-ZS6Qtg_Vap@ zRVy`!@Qh2)zo@G5POyL?LXjvuQQ{hR1tnC zzRyKwqxqIsvF&Dk(D6>LNH8g1DZd#x@z!uO#GS+e+j8)^fTQ$sH1WGjwjk^TQvP?wn}yGQl+Ez_P~DgLzfinfW(@8?)#WQXpS8*uf&d<6 zSXe&d9C$kL1z|kVqV6B)81`Hpl!f`T(P8spi|B7v4nuX%AHyT>4MIUVb+G2kXB;GE z>V0W{CLq+c{9)mmC>N|nkJZI<(|^;Ewvq4KjBKsThmUbEeRO?ZnM z=L>e%!t+NS#Vw!6f?GHkXYbxXAKcbnBBEo?e~{aH52(fa1+rbegm&_#)ZW6|d*^8- zJyiY9+2;=YQL}3tJ&0STiCdO=c-Z7sp=M|GcvY*5r8-=3h>Lbn_&b~L_k+p(;58~B z4Ru~8@Ij~JSAq(Zc7=+K)l@$Xcoo3dtXHd{t9rA(at$guVBIpA(igKic@3~#TGffb zZ3cOh1*8oHgNh1NM~?PV1%M1^1TVvPEam=&YTLr-a)Ic`CugtRkqspVv*KZ`fs&XZ4ZR2TK2}mIT{P7oea00M_gOZkG1TC>nt@OPx zd%8*L1jnr@Knx%|hxR`j#Qckeq(a z+;Mzi=A@PQCON*hl3r6we0=}V{j_CHqOX>|wHBm=AmZZw`Q>?&BK`3ycS0*jvBE=l zgq>da^U0vAs+^-%T;=v=;|BDX5ftu}6;ND(%$_~Eb!?EA*dsaxKub7Y{05OEe=puq zsu7N}@ECQy)Ydr{fD9E{g4=~YYmBu2e1`bg2@nuaWNafJp1H$TeI7&V`H5Hzm*eRc zVwy%U;=1`e;9k8*3t13))mScj&Rfd6`(ueoITI4~D%8`mjD_N_=m2T=?2XF}A26vf zQ}c?XH{PGmB8fqe21`|va^{X;um+%Ce2)hD)9O8~CfOS*lU=q+W2%k^-4> zCrV#-DzBzR;0;~q;1`Lz#@oNvQTmdz1R^Dp0X3nlZ7mVaqnjV90UByg%>T5G8qHa} ze7{fpMV}(=jg=+jjCo`OfmsD<@>A0;^GDS>T@}*7oJk3AJJNJ5vdQ7N$oiMIw}Vn} z50Z|>!Q-Cte8y8aU0lu}$v1e}Aj#B7quaXsM;v2DuADWJh0zVh<66(hjV_LXgrG75 z_4>Uz$PO@9Gl3CBTqXKm;(wutVs*o6g|qGD`OFe6EX&lZ?r_F`0`uTmgR8BiDqj&k zF*q%KMehSS#`a!kW+6;}G|88-ryQQfk|)?W4>4hl=FpovBy!kAP7$V-ZmKTX{*2F3 zaOaIYboIM@Ky27>BlV~GDnK|nQCwt>B9L{b zZW+nbZFu!5jx7%p1inpAO=Us+iDExFJn)cY)79@G8Rc$Y%vCA**((+eqiIt*-+(q2n0xixB`n z2^_WbSyAVNtE2jxf{FvfQ^MP4ur01W@Ovi@g70~?c^l)!tNZt;nWX|EF(4To*V%hc zI$#W%$s<&OgMwO3N9D3x7h!%{&wAhw<8!a7CFi=X2;!g)hMih5Jg8EP#h{5;YOXL# z;MNtjPCkxs@r}bXB+K2EzFg(L4esB@g0pbHf4y5#v+rA*P0O-HRm?J1Q>jQ_|70eY zAPGNwpobgF<=dSMnaNF?$cw{pAXwo5Ves&Mh?QmmDv+)ubA5DeHxxm;gt8t#`U}z6 zMphQ5((!1LxyJnjE%RIR=oB%KdPAAd&;KsDSGk@v&R&ve4>%$iuA@cQD@^nQPlub} zHT0Wf*S16DK>`!TYEMl4PljU|3zp5a@jnSpJw;gRCVwLe3Gbp`<)3f+KJy&+sW0IB zeT9qWGtbIxJ{D|Y(&&OLYN$j=i!iR*b(755_pKC|iXS zt3-3K4U+~hONoEX}ZWhK0lN<5n%b-3% zg~Ch8x6le;eVj+VLf`X#B_6XjvQc+c)>EeP(Jz3$ldDwXtGH3G`Edy3bO2>u^1eUo z)o+_r>|HYQ+kc0^r!NXB!yG8&niOZ#!a(Zv#o=7;O-2$21j3_Q?op20vbGj0 zNoW(3Dt(yGnCUBMMHkRc;r^C@lgjJ0Sr1u*(-Qb@mpvmCHw+YJ?+=28$rlDMIwBe7 zH0DnFi8-i4+QC@&&02x!M^*)3mW|!{n|LLAAQ`bzZI3*q39WK!?qkwmGgfUDuPZ0n z>)n1tr2E5T{{5SPbsZmYfgD4Epz% zI2NiNIX#_9`q{Fb^sR@%5K zeUxliTY}P9t1P#R)?_FVtE_!3T;wrcUQ>k~t^vv}VJ{B4A2&3@VVu$HD>(Ub!Lm;c zW&%|tx7pai4iHTdmMP8ere@(|zfa`qDDK772WcBznhk6+9YV#_QIqT?7L^5o0agD3 za2@!DEIW$;32Ty0uce8Kpo5>wxsu`fn?$C?=uj_7X*Yk=guw2~>LQ}Mo=$P1PF94_ zsHVhK7y*tyEMkUhPeR_u>wJ;Pv;Nr{q6)guS7zm{*NGFSRaZhFcc1?o{m-Vp!mo;; zJ!W@FI$15J>db55MrT3+qU9{&I$;-i!ARY}c5k|^d=%xZqvv=sVb|1rV$8`=&Ma8Z zh=1~5)mu}zm0W$Pe=hLrT=tW5R?G6TK_#>;ON31C#5I+STX)e&q0=hIlA!K;?{P#f z|C+?s8!`r}4=caYmwo?4!@@!YhaD%`QU*WQKsX*dEsz;{1nent&`6bi-mJ;l%Si+{ zg39p*vyLXgRJ4wUDERhVJeZoRsHD@bUvh)XWrR-i)_eK`K^vQ(=a1e2CpGezCuo~N zrL%TbX4WuK&UIF@FV&0joZJJAkZ4v0QOCx z>)cfLf)w`PZsS53S@KQmi_V)zd#DCbz&9*(Xvz^GpDrn~_{sHtVOKKSB)uEM0N)!4 zf$FnKOe7u|+DY6l_~QUtuP33nz{9L1DSqt|8gp?kyc?%j?6jEcwRXO1$!-JNWBy83 zXKa(tLl8F|z?4INkNV_0rXb;!P(N@_b@tCdv=91=7Y07MT-tmVzwCy#a_;~LjJ%#5 zQYFS+rYP;Wf(@6=x9PG&vQk0%!j;FAU$3S5I1L{(ApDkyrM%3`NSkMx?<#=Y{ig24 z5hhbu&#oD${M9R6Y3L*Q;r7-_^JXNokn|Lr|NXKQ+kFsTmGPX-KRS9DyjSGZkdC|198viJ7{&sySv{xOo)s)4ueZ^RD(I3$wTViQIALUKo;U z5~^nY+BGUQ!(}i2(qomdx-`N_PzrsH&v!vl<08Nb8&rf_bMZ$g<3qRaw_nT4uFJ)S zVYl>6b{`0LA~?~~^6m~Wz5JJlY4AL{jS`EtWKDfqgD%Ru7WSEaI?tH9*xGZ{6@Xrh zssU&3*VS}gYJsi$`Rm`vH*OtNid0QlpTE_iDc`O($jMkYBs6I zGS5qei(I%snpQAP1#OX&I};%{75h_uiN`#P;*_%@=N5E>;37OLBk_vS%mtn!k@x#Nkaw+Q27Om7 z*kI?c&l?q@$ELk@Wp>Y>>0E!=(^;N_&t#nw%uZqiKF%`0L)W~SBnzKFW*u9_c7eO# z6X&zejG(Ukfza?AtG>S*n!VZSn6Al(a8)8%k~2TKQsYMhu0niJJ$b8z8a*gICLj`B zE)HC~GCTA~0bfV-6C6JjXIzy2Nc=K?W8t`HAdBssP~}P6(b`PF0grb4%__!Po4t7_ z=Z+rx?Gr@X*Bh0VeX)9WI$|q!EHT5-CXN2sxP~wy=hyACVOD~DvAK&V@M#}n;BjB3 z|Mx3{$T%|%ND)Tp>+yh^50;Iz>)#Y6@s&U&XmA&jJ$x;oaW1@;*Ho_R>kSKm-c@1Esd=s6a;f4BBob+##L5-3tEteyhHIQ_(<|F>|O7x$&D8H1jSqV;M2 zBvROarTr++4b7{N1oNi=qr1<|92=8nRDzAaRAROZu-qav)Kti@P3?_Y~#GHagah zLDF^(05;1KOC7clT`8S@JU@>Pg3I36-dF%^af?8C-C=+1P*pCh=2WDhC6nF>lxbTv zsRAY_uu}5abE{0sEcP3cHFGa@9E-ctXT!Z@h2+;`;ZFsOJ5-46`6o8G;HnsgW?pyM z4Wb@0LKiMW=5JzX-xZdu?09*St3~jeM(sV5T{G0g>vNyEyQc=kF5?47zMl`WfU3dJ zOe(%FGkvq;MeeQK=Q~h`ZGtN+ZPlu)y=Or`U=7E3G_xi5Y1hhGOgCHa1!k3km~O$! zvlOtIfM|;H6zd4C%WgblvBNj~81s5gU(aqfgDWPeMCR)faZVW&D7pDT0Nq7m-@AI+=y5hZYwhjHyq?!k5v-|Q5|Ih0D{S6M% zpvidz1zgD@5J>|E0U?3~`F|#87c*B^D|-u<|Cpc~0XhyFoEUyYwcm!PzhcOB-0>L{ zP)F|8N%bRXyw~t3=CDw=g;fBX20dabQRl;m5t!brZrv_IM999M*J*Qepmg#O29jqI zXwl3y;_@$kIG>-bI86ERoM9_raKM;9bEp@mTT?YXx*l!A!~W@n0r1r>0EU9$A88|X z)wq*!-6&`-AReMDrn{1wfG+xx^Os zcW1u5bL>bWnHgMZ3ff8zgfL|TMzP;LtuhT7G5XrRpj9!xm#ghy_v}t3Brfs>YdLAn zIs4!=m@0mg!XO!t6@QVv88K*S;>zV3PN9B0O2BZQJBO=7ih=P`%3$c^4)ZOl+=q?# z!@$x)L)(1@gK2}*Nt7W8+R!(tMS}DhzA%oFew5`J zbp;=kAYP?udsYWQN+Ga5&1d)MC?CM&0^&8~U+q<^0xH0)Jvg$F$#?B(RZOU}_WSW^ zwuS#fz6Lt{`m9?D>5XSAlm{A%g>Rx2{eJ7U z+3lNwiX1?>;x?LF;>G_$>;KI{KDK1%1zckrE=QEE&z=F;>=db*rkhs0zq?2`r<-|H zxQz05{cPB986}lxDmjTCdVq5;BpbJa+L?KCXGwFYu0(Xrt;slYm-hv5t$dk|u^VTH zd4wfLQZ);^e!6w=jTQLp5|#YFFP)w-xCW zJ_YUQi)AJEPkq1aPuN3NektWA3u>3dJ&?oh&C_3eqS_O}z&mfHNYw7vMs){j>jQbI zFPI6}7mlE|nLXABQFfpi7d<<#NA#4{S3Qs%;*)CCgo`#yCV*iHz9uT(A_zW9x7%&8 z&O&E(;RCx9#@FEL&8)N6$bdc~kqRM%daF2jXdGLYnm>s3T5(fQYy6|TU02Sl8Jf!d zIfiz@1<5xMMfn4d@5H*2HR8<%w?w%jXal-e?jbf5ow)`pUaq5eY?n^D=-@yy@-iH+ zW*guA(oGvxS3Zm?p1G#%%6k6z7;96M)DGpWAAAwO#7JKbS}<4om`ePVPX|FK*+!b$ z-yVH1kQ5#2A07An9}R7<*bT43C2$Z#pUxc(g>sajzyxK*erA-B9r+I=xt$hw1O%<- zc$yGM%{i`i48-~mrcU3FjTQ}EVcC36@Z5|+Y;xwulP!PX}wZ?)s z3s2peZc9elQe+kGRYW7KnJrVcw#k1ERW9CE%0aHfF=vy>p#MuWs+wqrS8EwC79kkL zc%Aglfq~lC=ZJu$t5c}kusA+l|DsIo2)x`HFH&9-o{M=c5I=j&df`15EHFip(Lv zDtasROI`=7PxA??Rpr5qj<;%69$fLaas4#+-}Yab^wO!#q2=<r#(z3*4|}Q`^q-_c z|I<_@IdF)?I(^&*ONB8c*#G@tlE|y41WKM5sYi|f|Lg5PG5+uI&Yw7=CjdH-h^Q|D y_AHX9q)-1}mz(IXj|B=y{G%@jij=sl&kwc@NW?G@1UuDCR5KujBGLU%{Qm(Z3QRlz From 573cd743d1a6a8fa3a75741335d29583b5e9946d Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Thu, 3 Dec 2015 16:13:53 +0100 Subject: [PATCH 3/4] Fix parsing of single-prescription lines. - VERBESSERT: 'Alternative' Verordnungen wurden nicht erkannt, wenn in der selben Zeile nicht auch eine 'kanonische' Verordnung stand. --- zaaReloaded2/Medication/Importer.cs | 2 +- zaaReloaded2/Medication/Prescription.cs | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/zaaReloaded2/Medication/Importer.cs b/zaaReloaded2/Medication/Importer.cs index 393ac34..c3f1c8b 100755 --- a/zaaReloaded2/Medication/Importer.cs +++ b/zaaReloaded2/Medication/Importer.cs @@ -180,7 +180,7 @@ namespace zaaReloaded2.Medication string[] lines = Helpers.SplitParagraphs(text); foreach (string line in lines) { - if (Prescription.IsCanonicalPrescriptionLine(line)) + if (Prescription.IsPotentialPrescriptionLine(line)) { addition = Prescription.ManyFromLine(line); columns = System.Math.Max(columns, addition.Count); diff --git a/zaaReloaded2/Medication/Prescription.cs b/zaaReloaded2/Medication/Prescription.cs index adbe5c7..f549804 100755 --- a/zaaReloaded2/Medication/Prescription.cs +++ b/zaaReloaded2/Medication/Prescription.cs @@ -40,9 +40,15 @@ namespace zaaReloaded2.Medication return canonicalRegex.IsMatch(line); } + /// + /// Determines if a line contains prescriptions, either canonical + /// ones or alternative ones (in the form "Ramipril 5 mg \t alle 2 Tage"). + /// + /// Line to examine. + /// True if the line potentially contains prescriptions. public static bool IsPotentialPrescriptionLine(string line) { - return alternativeRegex.IsMatch(line); + return unifiedRegex.IsMatch(line); } #endregion From 687ce567e3c8e722e4a94a9dbcba39bb1fd8c3e1 Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Thu, 3 Dec 2015 16:16:42 +0100 Subject: [PATCH 4/4] Prepare release 2.2.1. --- HISTORY.md | 9 +++++++++ www/versioninfo.txt | 4 ++-- zaaReloaded2/VERSION | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 6c9ab41..e41a1af 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,12 @@ +Version 2.2.1 (2015-12-03) +======================================================================== + +- VERBESSERT: 'Alternative' Verordnungen wurden nicht erkannt, wenn in der selben Zeile nicht auch eine 'kanonische' Verordnung stand. +- VERBESSERT: Fehlermeldung "Ein Name darf nicht mit dem Zeichen ' ' beginnen" wurde abgestellt (Fehlernr. 6a36e38b). + +* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + + Version 2.2.0 (2015-12-03) ======================================================================== diff --git a/www/versioninfo.txt b/www/versioninfo.txt index 39edb10..d22af2e 100644 --- a/www/versioninfo.txt +++ b/www/versioninfo.txt @@ -1,4 +1,4 @@ -2.2.0 +2.2.1 http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe -aef576f192cb58aef59670df6407e36e2403675dc558af56430babbd218b6c0e publish/release/zaaReloaded-2.2.0.exe +5d961a309294b43c88b17905206f1162791e14e7dad8d367dc47c21205a60e3e publish/release/zaaReloaded-2.2.1.exe diff --git a/zaaReloaded2/VERSION b/zaaReloaded2/VERSION index 3c80d93..ae32db3 100755 --- a/zaaReloaded2/VERSION +++ b/zaaReloaded2/VERSION @@ -1,2 +1,2 @@ -2.2.0 -2.2.0.0 +2.2.1 +2.2.1.0