From 8a952a68655d517df6af7175cdaf1bdcba087e16 Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Mon, 17 Jun 2019 16:37:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=B8=E5=9F=8E=E6=AF=8D=E5=AD=90=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E3=80=81=E9=87=8D=E7=82=B9=E5=AD=95=E5=A6=87=E7=99=BB?=
 =?UTF-8?q?=E8=AE=B0=E8=A1=A8=EF=BC=8C=E5=AF=BC=E5=87=BA=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/PatientFacade.java  |   6 +++++-
 platform-operate-api/src/main/resources/zddc.xls    | Bin 24576 -> 24576 bytes
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index f328f2f..9f9e632 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -1131,7 +1131,11 @@ public class PatientFacade {
                     getrFactor(patients, keyPregnantWomenExcelModel, factor);
                     //高危等级：展示红/橙/黄/紫 （不显示绿色）==rLevel
                     getRiskLevelId(patients, keyPregnantWomenExcelModel);
-
+                    String str = keyPregnantWomenExcelModel.getrLevel();
+                    if(str.contains("(") && str.contains(")") ){
+                        String jieguo = str.substring(str.indexOf("("),str.indexOf(")")+1);
+                        keyPregnantWomenExcelModel.setrLevel(str.replace(jieguo, ""));
+                    }
                     keyPregnantWomenExcelModel.setAcknowledgingTiem(DateUtil.getyyyy_MM_dd(new Date()));
                     keyPregnantWomenExcelModel.setExportime(DateUtil.getyyyy_MM_dd(new Date()));
 
diff --git a/platform-operate-api/src/main/resources/zddc.xls b/platform-operate-api/src/main/resources/zddc.xls
index 8a004e27a0f3ee0e9d2b75be69f74c8fafa2fbea..851da0105be57ffff90f8ad44b5d8a855cd9fdc0 100644
GIT binary patch
delta 1487
zcmai!(MwZN9LK-s-n;F(ySsVUbQWbd!(kMKA(0WAOxI>6rOpQBgJFUXJtPDXDI0_q
z_);8tC<>zI9+Vq_6tO=c3L<cbL^9|f5Ff;T_uhH$bQ|qHocsBn-#Opk@1EaTp~wnF
zwtP?WEI)p>S?06SQ#NmGOIfd!O>dTs5#^hZ|1Pkl+hf<e5kUz+6P_~~uvn$fFop~G
zA{^AuG|;66dI`1r<oAptb&N}p5U_N%FCjBgt!_MnTqjY}xTn6Jr;2MUD?vcCt^we0
zp!YP;FW1!>5|;0^{h!*bEM9kkL<eLZP3@PEop|GK=#-qlsA+wApAHoD4O--<Eg8bV
z0i9&hn*n`)yvNdy)WqBS{9nJjXROdhFN7)s!A{80Co9GW^%+;6lOvdu%~bb(SCLo|
z-x}*}pH!CSTd{WjCl+QI=WWo~ij~8izvAWsFUDr3ryq1LAc&EnD&@SXlnwFHnsnml
zSx}b&v2(x#jUQ<IO=Gkh7^bH0HFo2hinnV3_?YI2+#6$Y=(UvZryc?3X(^+p=yzFw
zk1kR_&D!%aHKne(^G(!qlM$EwbVeJh%L)_}f-VQ30<A6wDff5TfGdO$LZQv&W;#~A
z#bu3di(X|Argqq<GB{**f|)S?al;r-;wUBl)oL6s`swju$08X?9HTj#nlJ#-AwN=R
zan>nBDf%>aq>3wiZ6tL%iS|l7qY{%i?ofb8Ct`w^Qc;oQL!+H+fX|Mm(n)kw;zaUG
zQ>}IeBK<q0%?7qyM0kiahrGy`O<$SwA;Wh@qf;5W5O!@MRWwMCQi%xAd#e+#5}kA?
zNP9&c3K6wA)J$~PAq|84;n<Sc^-ATv<2gQ&?eNjNr|)x|FJxE5f~7z5(de06jT@`u
mQD*iY6%Fhru**v~@31K&o_ooJ?O`L4yU&c&ttagLg!B*X%L&2&

delta 1448
zcmZ{kO=uHA6vzLwAL%B$$tG#qw0_iWwHB$Ul~P5dt!*||8j*fci#^msp$88Zya<&<
z#0vJHGC7NQ(o>ZcPg>$pya;+Thf<J&H$eo!qHnV4Zrf~j2{XU{zBli^nKvnvSfRvT
z-B8qc()wEBi^>CLJAahPkh1*rOUW72KTG)yiLG3lxYC0Z$^gQ6%xJ*!4t;?!^x>Vf
zS3h1ySL*0x)UK1?4x9=IT!sRpqO)BIi9{2D_6%A;q9Sl_u%4%iYbz^5LOL)25UHd0
z*3r)g>I?&wxVhb1Eh_5|bWrGk#L?95gyz{hKg?rVzD1mqcuLkfIjJ;b*az&<b<&?m
zabf5_l56kjgS+(zAw#nMIwP)q4%LNRhuXkF`jVEyl2#2^87^V#Zr>Z{cgx!-8|G$L
z8~=MW$uiz7>zG}e$<9*0unu8jVSfHr&wa$uI=VwSEtFMf|G95U``QUmHvzGez$}eL
z8aHVCcM7;n&E4*#2fpiSJOeB_Z1jwpH>nMPJLJXaEk%6RsL!l~&tYn#xs=ZlYLoS-
z&pLDzVm=#)0?j_hD9vYv&n8S1dRu%UjyS9)pA&QetQ`T8bTaEA0N2NyDH{hU@ij_9
z?2TBg0b3Q)VB;XEE`>1!*`o+X(B%2)L?cwXYZ=8w-Z*Y|+i0uWGb+i(A&(3qi-<`f
z+N>ySes8>!4e^)bcHTxu)lQ~(!<3JkflL>Cm@3;Ql_=p+2pQ3Dl?-I6AcICCvA#^(
zf1#>}Nl%e3s+H-NrB|<hGicrnDpC|7Q&L$R_7;qhW7;E=NZb(DGEUU$Q36@MI<X?Z
zc=(7fPEGUTWJd$d)xl3i{(kbcj1{5ZZlF<}`&e{-PNkV4TBq_?3Q6Lr>FZK=&WX<4
WWPJ1L5%$3`W`0TB%AI{atNaI64)hcN

-- 
1.8.3.1