From d72b28afc20f925c57e29cd74386be9ed982e105 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Fri, 26 Sep 2025 15:53:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReportTemplate_IRECIST_CN_V1.docx         | Bin 170377 -> 170654 bytes
 .../General/GeneralCalculateService.cs        |  20 ++++++-
 .../IRECIST1Point1CalculateService.cs         |  54 +++++++++++++++---
 .../MRECISTHCCCalculateService.cs             |  10 ++--
 .../ReadingCalculate/PCWG3CalculateService.cs |  10 ++--
 .../RECIST1Point1CalculateService.cs          |  10 ++--
 .../RECIST1Point1_BMCalculateService.cs       |  10 ++--
 7 files changed, 85 insertions(+), 29 deletions(-)

diff --git a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_IRECIST_CN_V1.docx b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_IRECIST_CN_V1.docx
index 97cf20af8aca43c3219f7ac5c289d2d6c4964bc1..ecebae91e87854d67070bb7d014e57b67bc90771 100644
GIT binary patch
delta 10852
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
TpOcvX1}ZcN<eK!4Yy|xuq0HVj

delta 10559
zcmZ8{Ra6|nw(QK{u7MC-g1ZykEx5Y}ch|uQE<+gH-Q5WU4er6+3GU9#Irpvi)_Om?
zd-X?s)wb%&ZbFW1Ku+L-+qHCwwN3oO2rmAW9#lb9LdIqMSqL7ssrkDMl_<OD%X8(i
zm`Y98=}AK05^?YN5HHpFVMy~g$W^Bd4(Eu+awhkYns1Ilk?i*wH<wy?o+AQrAIhKL
zkgOJT|GAIYNvtN2JGOS)!Qf-(WOABiOxMPM<iuQIHeUgouolg(SSt#KXw&fvN^t&B
z?dU3Fsv&O8#?E_`ho-_?udA<zxwc4j0in6XCGQf!)x;py;%ZoyfC=V@T6rMCU;bVV
zv=ddaS$P(XLWRf=HHW+TK#b+7TdrDpQ5VDPPB(u{znM&|M(&ZkdCI8Z^&H^I529M~
z$!*$*z@DF<AWyblE>&Gw)DNTYD`5Ra{=>!dEOqnmF*5)oDSTYJEW*a5L>K&sHKE5>
znhg92*C$v$mdEyhwgb<KtDzcdh6Uk_O5J&b<~{ec5AJGO0~#vH<9LgzNVKbh<vcYz
z-sw(A)>y9n+c?VdFtE4)000pXp|~wlajx883j_cfKmY*NzgKfdGi8^CU7!w-M1u3v
zbb#BBa=5}D7%;v%uiczcG))U<`9iNR-;Q`1^kDqZknpV$nlw=W0PTiNOnD@5_!;aW
z1;Ck-RyXKarGP?8nig;=rLtIOb#H=Oq`P-3eyW@#Zx=o>aF|Y(3Oi5UsFz2{y!)A&
zx+GrZjV+)wdHU$*r6_AU@^3s4v9XAO+DmResGpwRMj$Hy7&>(nXND)~0vV9Q^dgZn
zCOE|-x*{EAR|>#jwA8@kbrk_~S5Pk3<*JEC{a&6Tr%LFVYU@@fThOEAI8$M+`=e$Z
zsaS6}rkX~^Qs<mP7w5M^9UkS<_*^S1Q3u*eS8O$14g&VCaC$Tf6YroKxS>VHIkafb
zZn+Ov++A?3c4Sw2cs2_ejjyl^w|!jCQI73SpIDic)ge8+4qm6gy{7{=jK7Eo2(DqZ
zYZz(}tj&@ln#t%ZKyQ4=aJ48`jwu{#;{EOgbr<F0iQhVRxCDODE)U%-ns#N_%WLg-
zJkRyHB`@5)jHENKXhqyPaO4n6&EJIYl0+IhbiT}>qfW*h6I8<=Z40m8#0m>A(jNJP
z3~=ICa<WONV_W`AUhjY#qVk3OIS8xCqhBpvA9q*A%fM_G#lExUS!m~JQPF-~>w=D{
zM%UM}T%GWneYM#EOh*Q@4`u;Ocbsf9hYKQv;N57^4|BfnY;KGGsx_}ebqXZQyLGXK
zrzcNkW*I__M`js(jnf_Fr#Imaqbuc=!n2UTzJsZNd3B8jrW6Jx^w<Lkf<ggyYx-GE
zjex=4f}}Q-=4R$wgfQJ<t{G?FrR?JQJKTRL2whDDeQIza+D8Wu@rSuBQvv`u1)%?O
z(9_YyoaG-8-R&(L+?c)W?M@AB9SIM9y#4HXLkJ>8`He@H*q-ZVGOK9Uqk%T;AjBNL
zE0b=;DLxkSbww<2HPhU+jIgjSno42Cz5#tXEa?p1y2Ck>w1N6Fc*JPYb$xV|x3g1R
zH8W8Wl)9Y&=I}enauuHBJ17zEXt11E`$N1?TV<2y<&ei(qKDRDt-UheTb02wR)f2*
zuhfv9Zms9j<fP?^BHVFN^L{mZr#tI#a(<M;g8;2vZSts4VLI_Lv^{<CZmBCcw?1nV
zEZADC?%K<;UGzOTtzs(3%W+&$y!NxsYwdZn;qwp&dm21+rGH!dvl`sGYIr_>lH%~o
z(SB(nd%x|#&hq&sd;jFDWq<3KX`JIY+}g`?YZ>K(H$jK)qGu&nU9LA+)NACEQG!>Z
zC9j}o;zh^H*r+MOB1^WX8_pkNy|cJ!WCzOA`As~}-6RK$_Q)0A;upgX4gKRs!S@tt
zZ+Iv%xC$+vqSbhE51YGSSZSH#QE2lTE!*ZLsz9IB2hMv<aJ=><tf*spO7jCgynT5t
zs=mwxWG}l3V|4|);CxD{Ik0HZBmtk;w|kGJ#3IJC$@Wh*m}%E8><5#&kHfe|y9ma)
z<CzuHnvvpY)oDj|m#5A(=X?99$FqLNUbd|^SS%s5wWigJL<m`te(aR%Pqn>XbHThq
zYm0}ob+rNGBzXufbKpt&%6P}a@w~#NOCJ{4&c{>1zq-pqkE0^YWvi3-1)Io53#Fo>
zNEP^YbJo1sKF**19%icv0mDgH%^W}jQ$!}}N0*o$ke`9Le$=bpzEvg}+`mceHySR%
zRlYU4+NR*fM);RG&^x)>#??%=UW?%3T%#rb;GN=e4mab1)v?y>8@KQ)^hi;7lEl^P
z`R~5_X?0h;XI~Db!&A!E<79nt#{MLiBG!q{FNl&)<+gQC$pD;k@|BB_&IAAYfnQsR
zKXZ@P8B2KgEz+&zkQD`&eV^?(_tpaVlAU2xGJr6#@5go&S?+I>NBaN^Z&9WCUbKS|
zV$rv)Q_5qFoux>%8YL_drzJ`yQI0q=^@DPf6ru{0(ciTEgwM38T<7i8Z84V#@Oyk{
zQtoKZVc`i~F}l8KW42T{B^Ie&?6bm$4b(V&ZzjWuTLrE47mlkxtv;>bF^2ks%Yf9i
zXPYc_=a*b97x20-j#ZEBRt;#Yu+@}{*1^OE^0sS@iPyWgy9i`=qC7n+vm&>h+9n{x
zjqg?BlD`^fN71|;YE$mg7v&G&R<86PdgDyIbL(!H>^E*Mu&f;V0EFAcbtN6He|>x%
z`qpQAdV^~WVV$!ckc29utAV=UHrI#shI8R<l+p%^*85#{Jo%Sa-<t65v9p%O{`jDp
zEy=r@>b5WIAKn+|76lvB+-%?eP*>AD%=_|RH@Ux1pKx`EdReT*)NCU;Ez1^?QNwQq
zJD(B<v}YD9g8a%6Z4KTx`)LsaR92H{WQ4v7b+oVRE}TD<YfT}L{6t>??>pA=uFo{z
z%Ewio8qWMuxk4kjv|h1VKK-N|+J`HZitQ=-b*ba|L?wUiIjNv&k&uvNDaE?Q@k9?T
zo;V0@N2vkk>M@E`M4>$rZ*-60q~h1J``u3m&e#V!oUQnoBnq%sZAlDf8U{mYvW}5m
z-tY+}owMc(4vp_7i0Z};%!2oD+WQNL6QAk4l%(XeCgOzVr2It*Bfk6n__5?Z2YgQs
z<sRF=8+Hc1?~uaQS2i-nhnlAeH1EithL_o*t4fZ=Y_NZIqBNx4c@G{Q=(}RpC$^BM
zrYPcQ2R5&;3yc$45Vqc>^FCX+nf+-J^bhao{mk{uV;uS>XMp?}ynC%>7+IN7VNsmn
z@B1BhSq6S%N!cpb6M-N!sWBn0l`9L!-}B`OL%RF*db&?~Eq;UV?ReZ$>F3$cXUT&;
zPn=emvvC}BrTpo1w3dh}_MM6G{`ru6GIgqNR5lxyzh2>%2k}WDsLz0%_5}BR6cM*l
z)JUxF0rf3ozJZt}U`L+#L-XK`hCcgzo%AeO=5LEVz2lNDdl@I^^mfcNrVnP?g)N;?
z86U1cK(g#xb#usI&Bw9F#A43s{XL(hJei6(%qB`_+NM(@X3FYXtC!QwoY{Ur_%cFU
zUT}xp<mICoGPfvxtqc@J$tX#n<7)*Kq-{nKF@GSZLymZy0Gsqg(h(Lb5~!gf-Ifaw
zf7c0{!L_l(CeQFjKBtZpr(!$WrIvOfkh~xHBa_U98=)qjv^5z4<1_8VRKhZhL_^?c
zCXlv5o54v=77vS|xDuSoLq!`_h*Sz7$dM-<cvzO$CbEl$focq9`tD4LP{xRDaWMo8
zTnvB=j1C3fz@^uJF#`OqWcw3SML#NAK%KV`5Hg-`p|{}?b+P@lz#Y9a;O8gNuN&i1
zR<Pb5ntvPeSlO_lVSfT)|Kg@Nb4r-P)M<LdM)y8HoPM3CSw9wd@Xg+n8h0p$5RQ>i
zw<VS&uQ$fV(plgrc0W%0-#Q;;b?@uM*d2SS>X43s!PInOs^(1LrD=*&Is=^(IXKso
zj@iQg9FwZM+jk;*uwAeuIt34(;^EEdl)qkb-P9BWX(HDJIbif{fi{;TflCs~3KUH=
znCg`Lo>kR$$pu3%FA#*G2;p5-@z)ur*dzF*Vj4c$i4=4S#iWqD8J%yYHl=sdpc{P`
zH&Xv;@axHaTQcbamy&1Kc=$Kb$2AcKd{_$?A4lt;ov)@-NMq74+^aR2n3!=g^>OAX
zCpN{Kw^VxUlzOlU7Z{G7>j4bV`l9`h2|VGS9!+FLwnTR12dABahG+D`+1hT@SEGp0
z2Pc%3tsYFLchCIZTP6rG+QB|e&(ACr!}gsx;1o>Fn)zxf@`u3uQcXgIBB9Uwb;_~2
z=DA&X;<sg469fTd)sCaB1w3&5h1t%P$z*zw&C#H%6g;g*dkG8{Ic0?#C!KJ({0Ig~
z_+MMkclqq)N~cE>&i>^Gac0Xwc4+um6>o0gGU>u}-SvjsyQUg5dlWD>C1pv51`5eO
zU>R<c9X$|&6qAWw*<4CBD=c0AFa=y^5PZKczpR7-qdAnr&H!@*#RHRDxr))<hkDS-
z6Q9KMTaPP<Oz<ND4mVpn#`}`@71^&TV~H{6nJ79UjWS$#*@|rWUiHSA;dUg}R>HxL
zE+njTvVWL{_q9oAG(3Sx<B-4b?D~nh;O8OY?t*Urg~yk!H&p_(7zrmQr15=2FLY<|
zZ>=WjZNI&|3WbM*P$2bvW2mfm1sixDnPwoEnYdedUuz6r6Is14H-BAX7)hUDpQ<>t
zqS2Qy=g}x6iMbu6Icbs1WHd}?tVwSOfo~K(IrIRqonf3qYH?cklaFCP)3bP(f~%c6
zU#JP`4VdwoK=&8%-H%s~E4wS=J9P84V&R~o3trc=6)n{vr{R_eY_o32=25eXOYn`B
z4z-+V>HY0phG&hA-d$VH3ae1h1?rlDmXG*PL1&o0Z<d2!2qFlX|2p)s>GIN35c4O%
z$e%d*EC!V!*@<Pv5&Q;!{>Cdf26nQ?SoYj-vP;#i=lM?Bb1*L3(!<(JP9mI2;+4mX
zi;<8wHE8u9W3}ykv)r;4-+dO~l!|$1c2?h$5xcroE7o9lMM@btUe71^Ad@x_O+kV`
zn(sj6)7nXqUO$9h!=CVYWVHQ}Vv7<|BB!#*;v9%m@~K-tvzr)w%^c}RGI(m7Dkuh5
zVQRcVz|Y(#JSn;EH3&k$o-8L`^(96?=zXnaRa34uDIp9<6vzU5#z-}WPo<E6q@b(|
z8Z2ylahthXbQKiPJvFDc&-}gH^tS!4`v3U+i={#X8-Ap0`%zg^#4&zn$nkaoLtlQg
zyZ1*5C8GSHKc-PO`cJ9~dN3~UfXmcWD94}^8PHGt=+`fl@ExDZj<MX|=HNe~7+Km8
z+Ljk5Q*WQXs+uw1B<VBS5C)1JqOI7(_3>j4Qmm7&^M!P}x(+#|@2};J!4OFc3C8S-
z@CA{ekHz54^8GH!$yDm@O#jj@FZ7BlnniOut2E)M9F#OZb)%v~%>(vvu$gE^e?<iX
z+D%%()qEY10U?KHl*g#W+%j;56xSZ1U&nN65GfqJ0%jR`2%<Z|TXwc|b(y$I=_G!!
zsnnxi#kZ&=Y?oNyd`25rc<$)B4McEj`CF=6X7Q)Xe_wX$s^Kb_3a&-E>nEJ=en(Z%
z4<*7HFvcEC_IaLE90yCAm}g;4hQ=$@HvUl{G=aQS<?upbmZL0EW(gc~{oub1mV4@^
z<y|QoF@D(<Vl022F#3`s6nh^(_>6Vo%!TV+>JOW8g7>lL<_JcWr?1N3G{tRXUMe)=
zdA}@+;55C&!=VsZwp>;RuuF%4)4o--J|H`Kuf^mITqfERkbuE9X)LYy$#l-Eh%r@5
z)OHGlpbdr(K#Z>fWA|d&bnI~Mv(net);3ctrp1LvFjb=ZY)b$oE-Hg`Pfo?+;P<WB
z?Or)C-MND+p#yovGgqJ@-J9uyUXCIx8HH@m7SCrxiZ*%T0u{1_MdKJN=$D^<of@5+
zvUjr<`TUf35#VG`3d6roDKaM^g$TeE?h5AilC}5#r+(K;xl8<%fKfI}f|*ImHh4B!
zHZ4i*sgpJLzL_<fJVvW*8N#sV3CU5ea@jg^K5s7MDCI2?Ox(Z;tT&U;#^>US)UV$>
z5F@>m04~J><cSZ)QhrVi_K@%Q+)h`pIUjK*$nKkDWWfDq`s|S5Ws!auYYd#rvCIQ0
zFGti`d(Kmj@n(S`ZZoWSvP`b700eqD^s|s4hKmm$@ZTfwxpyD9C5-V5OV@xXoxs`K
zv_mRlL+YPb>)2Ow@U^)|1*|WWz{(kln?!R8>VL_Yxq4w7_KAddz85p@yQKN-Whf~`
zgP-_T4$QfndM#Aa8N$gW;B=#HM_*}RM!Ls1g16X6-A`K{W(^%vWUer<%;$*hN)F3I
zqU08MSXDZ^t+D>F&xlC6{%9P!8j-GFa1=;)!k`MDZKS6lh=GXWJI&Q-CBU-*%KU`S
z+urOeyHP*<rFT<)&~&LJxlN>EL_%QK6VW;@87%FzG~8=33HujwF0(DZpC7W9)!Dw|
zU)5IHt0IvGk&i2ju54!9B=I47Kj71HA43_fHRSWhOnw3>8v$w-&c`ET)ODyM^r}|!
zf{Bh%H(RWyRTbzb9nB5HTtpBjZ7_>Q*l`duePEQsI6fjl<gLo4%mS9eO}TL!yn&nU
zV9S|vb(2fjAL62f$jiL_0svJy#EYTL!9lDD2{w<u0vKm)CU->b0(2k;=g&D;oKmUm
zcjg`}6$oIOMY)RNOK_tmKNq~Lf@?j7j0RttJgW_MV0-X692e3@qFAlG>bp-Re<Kr%
zji4CV(dn>==|$AQ)u{q%U_%t=!0J>kcq(ogwzKnG6|HOx;*x`U!`NpzJ|#gyIfzYu
zW};Ep^Kp(g@Dm(rw8U-}PN@bU^6}?&pCZs11LxW)T3aiOrKDUZ(C5di%XX+lE4pLe
zbP0`KB?Y$?nk<)9v7n7$!?}5d{U@4b4s2jB{j+3sOu^nw^k`(ns6Tp5t>bkTSS=pE
zOpuhmvaolg_ak6--aIkprh93I@hE-RZb?y%#5%Qo-}t;NoES??FC3{$OpCs$h#{X#
zvN6O$yhUIw5jYP)RUG~?n@l<yL5*OLR<aOZ%8Xs*@*YuQDC#zWJiXAcm{@+&fzd7G
z<Mw{o<XG1KQ&(BTxNcXoeU`=wyuM2p&H76<WSjkbLAdsvRrb6gy#EaA`wZ^yd}-k)
z(_apMD(%aX{=4>k;t*X~{LkKV3!2P(yzTurWf2JnRCFht6HYN{&|7p0vEifUbahTJ
z2DeXh?!sVl6R_c{65SpDjgT8nvgTCB26QRq_GfEH=yu<v^u#hB2Z1fVWhtv0F<NHT
zO)vNJ_w#pk79?#<<n^kATEkSREOd;eEcVUvH83d;e=a$G=g@eqX(@XF$G(_efGv#4
zW`{vPEL=iJ_O&8t{bHWL>?gyulT{|d%o{N)fWXv<)Ppg0jDckB?^(;-s?RaxZ7Ea`
z1-53`X^x;IG^IcJcwoRB2mtw=2IPxP9=;Y;RDV~xeHTgrVuk934_*IB!<aX9A;zOq
zS;9)?A?%q@7uz;r9@$GPC_$a0-yV4Jfw$4*pUtt$*<O8VDc)3~S&!tg&IbjkfqY7z
zlFC^)Vp?TC(6r&vi53%#s~eHV7KOZIa1nh2xd~S8V}}YLfjzO$O0-+mH2j&%j~m$k
zlJvh-_M+`X`R3l3Y-bbPs+$@y-IN``=0N36>HvLRT1<>}!u4O&!r^EYugRX-wMG)j
z<gK0CCdr=r>+bh{P#D6t2_f#skR+)vv7sVZs87a*{|j-j-_(_gdq>2aO^QlRqSRuI
z_J%hGDW!41jFl&pNr`V|{p&VfjJwFMUuybp9tfYEM4l?@X;CT0YE_hZJi`1xP)@uE
z&L{f!TUck=$3$hpsS7i>)>_sTq%6*oJx?jO5ix|6$?Nxy<2VQbc{V7$!i&2as6Ib4
zr^qd>NX<Gd7*iyeWw7m-;KvyIdgdGrHJ@@CxisQ|eZ?PYhPS&F>0E<g6NXLcEolA#
zZBkz@3ORm#f#s)e;(%Kpu9#d|NROr`l5AxY%Yf}4$FQ0oce>ZK$+or6_%aA<=FfmY
z4PV+p1oI(o+A>-HN^LhuO;N8*jG&PH0bTjYmr4CuzVFnPdo}xefM0$|u;(W)jAHz{
znTJXVFxSQ5p)xLhL2JL#&Na?J39ZoHP|5eaK}*_!sSgNnxnE1<yiWjVfixjpv^9VK
zX+v5llIz(y-IA5bdQ8dqtVtHV88#+$+ucixJX<2HE0nY$5>#eEZ0#i*m(1yd%}od}
zI-3-XJvf;ZNrp7NSe9h(z@}><pU9DeGCz`!;JA2D?$slMr^FxypF*A{EUA=DMHaz;
zbww7T=)dr(&#HuPNlCFZb8Oz;YxH{Ff=AhUI*}8*Qgk2(n@Z4P%55eDu$4mmmx6}C
z^oPYA6>jNnH(4}Xx^=l&<o8&ct^cYY3B~CvwfCGTg3(#gDH$)ath8nS)jcG^#J#)U
zy|jPP)B+;CurF7k8sz+}e%~}6^6STd6xqn{vi&*m6eQH!(~>|=Jr`qE)JMz9N|7)G
zwrVd-c~?TI`Y##9`4DUbqp%7FLkF4K^<vM3ISWk1Icaf=Yk8+q1+G^L{p6h}p4{Db
z?{wQINhHh4Vz5Qx--E*~mm(!_nJ}f_#2Jg2Gp8B$FgdK{o*qFoe$ft+uxX*k7cl2z
zEP;wb_mSC|?s9X$@O0CfJYyG?d;CRy-!j)7)`z)Y)OV8*g^B*(o|<+y>2H&-{o3zs
zBedSF)MWmFX(qqVkQG1sCq$C4sINOkjS$L&bFj+1PutEp2cl9bdA3S}^HYy0_doUO
z8~^=H#qCa%8wWGzEV72RJ&YsfhLgWCRHLYPT55hNk}^rZl$v6TYqIjw%#eppVib+S
zW%yrBs-@?&-aEmh`UX=-ErSL^%!X~YSu0L~v2`!7?yvu-OP^}2oZKhxASX|myox!W
z!<)}4c01=9=z|WpSCh2_w<k>?vZ%}gVT+V!fi_=y#2D!F03;BQn}28?t&}7iy|9!d
zy$y(7jxAt-&7O9?>=e*MjH%ic{=}4A454dV4Rh652?7{PW+9Yb1C+VlNkn+xrrg5h
z_yoyJa~q<PKiODjpH9H&1D`R(MM#r^2Okt7V{(_3%3pVn;68v!?ZTh*EYiBFDdz9x
zJ6+p*{F8Wt42p^7BKLDC)CDS^a7Zways@t=Re!6632Qt|qVsXnslk<cr6yQX3;uXe
zixmFxATDck9XB|i_5HKR--yD;y;Ck>Q^1BXA}-1F<s|eK@mW8xV^t7lN>UA3$A^?@
z*+>`Lo-RKEUkeI;Oe%;N-P^@}M<(<g02{rbD^!|}2XN@j4Ckl|@QS<Ns7njmAFk|P
zJh|_w3o846Q+}qLpY}WhukiU5JRb^wQ8Efko}4atmag%apTC(8)&)cEK8fDrFvSVM
zha9dlnq5t3tSzozLdZB76P!#rO<%IdkW{$@n+T6NlFh&|$Ut_87%OpVx=RhITg1T}
zV)xgFJ$$=S$}Y}eLr{fMy2sS_;DnJ-^}ECoh#Eira5&@R9%BNZ{uXV1qNuz|2)~U}
zgxnVc)Es>m>Y_5)qaNxab*rTOsa^c_IP|-OfPaZ+P`cCp&3@^C`@~~|=>Ff@^&1dk
zg(z33R0w7ny8mh;qeO9}W*|5}A96x&z)oi%_KOZ#ad;EgdA_hUYFiVx<!VQ>UlU@=
zFwlc1jhX9L!tP7ofd9QRpsjs%z#HdMOWjUs;BJ#trB3j}$~^#O{u8W|dcJU@!k&4x
z=WC+<i#^d~mO63tM)HzTd0*j|F*U=8C7i98IePGh%b1p-Y>!%ws4aJjy%STF`|O}<
z_9B8TJDdcv#;Q`+b^t5g{kUdc4}LJo8fOi8I1W!g=62DK5xHM2mM^LeEBFd#D@hnR
z_{DjZ#?T!ouPaH;Dq3P9B}ow4u-q;jEn$xxj8~}5dD&fn$E^{)Q>%)McWSHUH=z%k
zYC!P6X!#Q$Tvr(2?9SEp@1ozWPba%m>7WYy`5$RqtRRJ~gdjAtni(pOM1tUvzG!Ft
zbCNu9k^d*kGOPReFAl<HYkpH*{?0Y_uRY;a>NfIPuq={Y&|LJtg<bgCL=|Qfs5yHJ
z7`AV)bXXBL4Xuz0q0;ED$*b>glIbE~EIWdW^qO_RQ2cwt^`^Mlj-37Vw}XZ5FHgG)
z$C#MqswL>aRlih4d2)JbV^BEj5)9iC)no)No4BX*_;QMzT+6<reZDtNPsjP`*utMM
z3zh~C{5T9SZ@`PD*mAHAkHGJYkH`O}qdnNZ=$N9?A1T!zE@dY%ss2-RX6nH^Tbv-1
z0-4+it~v6+FR+aZ%m3+?xhA1z8LF>I@d5Qh?Q(Kd^6PCe@@Uqw1&D?4Op?SPTK$Y)
zPWH}ionH+@B#^5)hH|Lmeen&%EAYNVoC`j`QIgn<M2h@VDej3K#3tkH*VrmgZ9h76
zc|dewcc;xJkkzfj2geGna=<>Y%JG1UjPC`i$p+N6I8jO}eo^VLh4r5i2(0Hm2R<_3
z-Ve00lvPBQF$^5yeWU(ME%(5o#o3!E6TtTYyfX7?QvoFV=ay*&7;2L^r2Vk+H@v80
zUMwv(kbO&`saE@P!|o)*|0#CIi|#DSvXrD^;#`~jFRS>wjDKCJA3Rv3u2d)RJ8mg1
z4}yZKPL$T^++rz|lSV0@A_J-O@3Mg}X;AzeV_-U*as!~8WFEjGJzroew9U_e$7gdH
z60-gq)g2{aHys^UdJPowf4be2j*o*l_r+S8PfH+qqd;W<?#JNvzTcVWANG5V*O2FE
zxNb&qCV)5)^F*+0sS)57CDlM-kqWyh=n~W@@O9HH6dhnS9MsOLpETSnVh+bv0;$;7
zGar};3BN%_B3HoR7xuHpymo#0E+W73hs_k>?_S1aUjd`?NXAKFLr1V_C|QrTDCU9}
za4<JPQ(d7q`m3&jqf)fE<!21<)!7^NZLB^OL;yv&Q5X2}WOzY(!+-Aer6E*|WK)ua
zDFT1Gy3E1h-zO6>33+s6Bs1Wm&1$Eyz5X}-x_9BQ;|{D*>o*giJ0Y=B&RK8HvjXgv
z)@jNMaQ;a)8OD0@))sfEs_d<vs5JR_SG!U9w#AH?XkPK4p1bqaodb_;mHq5c0T(ld
z!lvCim<Vinz6d$KRvu^wREkEC?dp1YJ#+oJIxU31`S%XLZ{x|FzC+2F4;-8KcZ)rG
zbg$n7Pg2IVwj<iFqqRMKZZE%8*K}iFm=+viJUh1+oT&VzJWKbpD``+nD7qn)d)ubi
zxPwXk_2AF>i>8PK#GsBWgnM6~Ka+HJ2A40V2wC8JQjZOA$8$srP9<sbIi_DPe)Zpn
zZYyLYhpG&dDp{%MCi`Qn)q$sNRJ)K}8onVOT|YGu-30%WsHMfvYLJVu(j%_2vdjSN
z0bmp&UQ+ki>roA(V*5O-?p;42f#OHZA=IspwZbnc3<wBj+t+FG@-HGUWNwuBb4mT1
zTpZx>11UyFQhe>nV7`7#%V2W#Bpp6;I7!CN^FK-A48J6GqI)6YgbwKn==Rmb%WBO2
zJZ_#FHxpI1zCPQGG|IHtBZJtMmybN3uhbWUwVy-t>^Y*hcS8>~QjpwGKU#>M?Z#1X
zST<Dt_-@#n86wqe{R}JlJ=;$)h4XW{FrhuTB(zk^jb(cMh^a{tfijb%kVDyzXbqv_
zn=thn*zZFr&E+;s3?c$lU`=Y<2ob?kdMCGjX*UC|OU_Rhc1ent_j6%y8O0IDCv^%U
zBIMBj9ji6N(OPqhDN(O;(l~Gs{@h1!_uC_|es&t&861_>1SW^4Fy@-M-dw2MgLgc=
zm;hUw<#1e7x=O-fZY4_a2nd|NZMYEa2C4KX;3*RmqEkv}hU}%FzhSviw7!Byf*#F5
zi`g9OWDR8gE8)|8Qp>CY>$21SoSXFo2UG#P-T}Ei!jG|C3T{bN$z=7JEb-0~t3{^V
zfEy$YrD<()JPfu6FY~5y2N$bhaGrvli3fF&qy5ITz)rKGQ^VH@;WQm08XBpH5%xBk
zV;q6D!X<av$P*eg-s|CPfk{-~Y>9id0$&#nwh%^v;!etPDS1UrP3?iVxKx&H18Ee}
zAa$?y%1}iI<jU~NT%UX^F<N47j_=}>V`w=z0@SZ@p3|JoRf7J>I_t9%V2RSybP?kQ
zda$MrwQj#~T7~_XC;G<u>igB<u=KyCaI*usceEQ52Jehc@H;+AbF)m63i|on9KKCM
z-)H$=V7n>fiQX@)4;)GR5^rxG54xW_o1IDCx||<}XmUPz?LCtc3BK5Z@FaRn2Dnd;
zeQb%d-31yDBbH8b7oAVQ>^}dUYVDSlPiALR%c)Xiatc)}B0utc>_N|rG5cx)(7M1d
z?KD{hoo(j02|tfclVZeUy!+h@XT0bMb${e~z;lMDi+-U+5j}lHOt%GKK9_<}=YZ!m
zM%m|Y_oN*;ulzItyx4hOhZ}Y)9lq%e9Y@yaQQ!i)rzc(Icd#zg%S!a!=c>BVD&XT9
zLnV;)otgtjk%**>UiDASnDFxuLKcFNvmKSgn54kf%ltxo!1d?Dk>Az1k3Cg$xwd3H
z-qX~`7(_%+@7|t8-cC1{*W}<edd&xj+xfgxfJLbZ*6K#+u?2m_9M6}9DK%Dk-zO<E
z(fbtguHg2xQ}8m(e*4^be^gr0k0Of+*hH~U-l^AZ0uYzAIh1tUR=d4+El3!ns#`05
zBav<0Y;x~UljC&A)ROxst4Y$TTv4-|WGUi6uAC63NtWQ42<bk`G>0l0VvAGzdBF7J
z#af;w8vJ%>ZK2_BeFo*frTyd>`Yca2Io-F`Qc|v26<{CUegj<qJj^tN9=4Kf+leb5
zZSvvIqlEO@*U8e!7Ft52Oj?Ph42(F^?z<g`5_aJdRcGC%H%3;B1M86IsFOZMU;cbA
zwvzLMv<-hcOvoR3lzh$*lJ5H6fn2Y9jQ5iOCod;uS5zfW)Rpb=*7k0HpPPesLEhHG
z_V&M~a^PUkMz6gOPKWW`Py8{$$1hJ=mhTV6*WKrD8x=J)Qz$sNoJatPs~*iat)e#G
zQDm9@@F!%1bqhza>ABj<F~YD2Owyn8G9+py1k^l+5+PCQj~3wXYUK@-W%hL>gZ6nJ
za=y#62_|M}wU|&Dj1q@WJZ})c?%z8b@P|Bk{s4DL#X37VEjf5KL)vY3Xo>Lmt96pR
z63Q&~hjeldg|f<i5$&B7u(apwLC$!9SwS$r5N_!uMNtEUets>7Xc=>15Fn0Z%Zb#9
zQoN4g*u7Js$~FFnr!`KD2TPv!IfAdrge_#n{O^H6q~~IN@e?5n@kaiXORI1kN{(Kg
z;OV8fYA$z6@r@bcHJd|MbopDpf4hEO9sN@Ze3xUJ$WpyM>rWg-#1hY5n#N|H^PutI
zJ&}QVIBsGOgtzKS#;6_*Tf%UKd=0af&4(H6kO(%cL3sK4mQ`dVAt@gup*<d8(1;6`
z);Ls~sj@od;`Ht(0>j|TXUZ=h4Z~!a#S7Kl=H)D2;+nb<pgTrZ%V?-KeJT!?dG80?
z(2ID&@P)uV7QCe*!p%kdE0nql7>41hFyX%**UV-tt=mFRpYh*FLrjz-Oq78wCdwcY
zNl;Z1wBQFw7#1rY1b_xYL3q%YAD~Ylu6XFj6p;G=+6<x2DIh-B|JdK4)hQr6U=MU4
z1tbL2g~CEXBEUMRBoxFB(o2APLqR;C&;)2b6eI)lGZ6&6NCFW-2~t6rg#W*9>7RWL
z00fZzi{em;RFDwps}eNy-wB+C_N9UZfeKJy8b}ZnrV15F`v+RB3fWM@hbE-`gZjTd
tI_m$m;r&0T-_VY<e-Lxfr!<fN@CeG24&nu3L!Ht=wD6|M|6F^3{{e<|X}JIZ

diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
index b03d5f3b6..18de31f8c 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
@@ -530,7 +530,25 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                         {
                             if (item2.Value.ToString() == string.Empty || item.Value == null)
                             {
-                                column[item2.Key] = "-";
+                                bool isOrgan = false;
+                                try
+                                {
+                                    if (item2.Key == "Organ" && column["RowMark"] == string.Empty || column["RowMark"] == "-")
+                                    {
+                                        column[item2.Key] = string.Empty;
+                                        isOrgan = true;
+                                    }
+                                }
+                                catch (Exception)
+                                {
+
+                                    
+                                }
+                                if (!isOrgan)
+                                {
+                                    column[item2.Key] = "-";
+                                }
+                              
                             };
                         }
 
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
index 947bd6a25..70b06f09f 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
@@ -411,6 +411,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 taskIds.Add(relatedVisitTask.Item1[count - 1].VisitTaskId);
 
             }
+
+             var isConvertedTaskList = await _visitTaskRepository.Where(x => taskIds.Contains(x.Id)).Select(x => new { x.Id, x.IsConvertedTask }).ToListAsync();
+
             relatedVisitTask.Item1 = relatedVisitTask.Item1.Where(x => taskIds.Contains(x.VisitTaskId)).ToList();
             // 所有访视问题的答案
             var answerList = await _readingTaskQuestionAnswerRepository.Where(x => taskIds.Contains(x.VisitTaskId)).Include(x => x.ReadingQuestionTrial).ToListAsync();
@@ -455,11 +458,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 {
                     Dictionary<string, object> target = new Dictionary<string, object>()
                 {
-                  { "RowMark","-"},
-                  { "Organ","-"},
-                  { "FirstVisit","-" },
-                  { "SecondVisit", "-" },
-                  { "ThirdlyVisit", "-" },
+                  { "RowMark",string.Empty},
+                  { "Organ",string.Empty},
+                  { "FirstVisit",string.Empty },
+                  { "SecondVisit", string.Empty },
+                  { "ThirdlyVisit", string.Empty },
                 };
                     targetInfo.Add(target);
                 }
@@ -509,18 +512,53 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 foreach (var item in exports)
                 {
                     item.QuestionName = _generalCalculateService.GetTrialQuestionName(trialQuestion, item.QuestionType);
+
                     Dictionary<string, object> questionAnswer = new Dictionary<string, object>()
                      {
                         {"Name",  item.QuestionName},
-                        {"FirstVisit", _generalCalculateService.GetTaskanswer(answerList,dictionList,unitDictionary,taskIds[0],item.QuestionType)},
-                        {"SecondVisit", relatedCount>=2? _generalCalculateService.GetTaskanswer(answerList,dictionList,unitDictionary,taskIds[1],item.QuestionType):string.Empty },
-                        {"ThirdlyVisit", relatedCount>=3? _generalCalculateService.GetTaskanswer(answerList,dictionList,unitDictionary,taskIds[2],item.QuestionType):string.Empty  },
+                        {"FirstVisit", GetAnswerWithFallback(taskIds[0],item) },
+                        {"SecondVisit", relatedCount>=2? GetAnswerWithFallback(taskIds[1],item):string.Empty },
+                        {"ThirdlyVisit", relatedCount>=3? GetAnswerWithFallback(taskIds[2],item):string.Empty  },
                     };
+
+
+
+
+
                     questionAnswerList.Add(questionAnswer);
                 }
                 return questionAnswerList;
             }
 
+            string GetAnswerWithFallback(Guid taskId, ExportReportQuestion item)
+            {
+
+                var answer=string.Empty;
+
+                List<QuestionType> questionTypes = new List<QuestionType>() {
+                 QuestionType.ComparedTriggeringSODChange,
+                  QuestionType.ISOD,
+                   QuestionType.ComparedTriggeringiSODChange,
+                    QuestionType.NewTargetLesion,
+                   QuestionType.NewNoTargetLesion,
+                   QuestionType.OtherNewTargetLesion,
+                   QuestionType.IRECISTNewTargetLesion,
+                   QuestionType.NewLesionEvaluation,
+
+                };
+
+                if (questionTypes.Contains(item.QuestionType) && !isConvertedTaskList.Any(x => x.IsConvertedTask && x.Id == taskId))
+                {
+                    answer= "NA";
+                }
+                else
+                {
+                    answer = _generalCalculateService.GetTaskanswer(answerList, dictionList, unitDictionary, taskId, item.QuestionType);
+                }
+  
+                return answer;
+            }
+
             #endregion
 
             var studyInfo = (await _dicomStudyRepository.Where(x => x.SubjectVisitId == taskinfo.SourceSubjectVisitId).Select(x => new
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
index 09576976c..6889112b8 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
@@ -376,11 +376,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 {
                       Dictionary<string, object> target = new Dictionary<string, object>()
                      {
-                       { "RowMark","-"},
-                       { "Organ","-"},
-                       { "FirstVisit","-" },
-                       { "SecondVisit", "-" },
-                       { "ThirdlyVisit", "-" },
+                       { "RowMark",string.Empty},
+                       { "Organ",string.Empty},
+                       { "FirstVisit",string.Empty },
+                       { "SecondVisit", string.Empty },
+                       { "ThirdlyVisit", string.Empty },
                      };
                     targetInfo.Add(target);
                 }
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
index b11ca7854..825861e56 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
@@ -170,11 +170,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 {
                     Dictionary<string, object> target = new Dictionary<string, object>()
                     {
-                      { "RowMark","-"},
-                      { "Organ","-"},
-                      { "FirstVisit","-" },
-                      { "SecondVisit", "-" },
-                      { "ThirdlyVisit", "-" },
+                      { "RowMark",string.Empty},
+                      { "Organ",string.Empty},
+                      { "FirstVisit",string.Empty },
+                      { "SecondVisit", string.Empty },
+                      { "ThirdlyVisit", string.Empty },
                     };
                     targetInfo.Add(target);
                 }
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
index aca03d84c..db653d1c6 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
@@ -373,11 +373,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 {
                     Dictionary<string, object> target = new Dictionary<string, object>()
                     {
-                      { "RowMark","-"},
-                      { "Organ","-"},
-                      { "FirstVisit","-" },
-                      { "SecondVisit", "-" },
-                      { "ThirdlyVisit", "-" },
+                      { "RowMark",string.Empty},
+                      { "Organ",string.Empty},
+                      { "FirstVisit",string.Empty },
+                      { "SecondVisit", string.Empty },
+                      { "ThirdlyVisit", string.Empty },
                     };
                     targetInfo.Add(target);
                 }
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
index bf9f3504d..0412fc796 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
@@ -366,11 +366,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 {
                     Dictionary<string, object> target = new Dictionary<string, object>()
                     {
-                      { "RowMark","-"},
-                      { "Organ","-"},
-                      { "FirstVisit","-" },
-                      { "SecondVisit", "-" },
-                      { "ThirdlyVisit", "-" },
+                      { "RowMark",string.Empty},
+                      { "Organ",string.Empty},
+                      { "FirstVisit",string.Empty },
+                      { "SecondVisit", string.Empty },
+                      { "ThirdlyVisit", string.Empty },
                     };
                     targetInfo.Add(target);
                 }