回退急诊前-

src/components/EmergencyProcedure/EmergencyPart/PartSec/index.jsx

@@ -75,8 +75,6 @@ class PartSec extends React.Component{
             <span>心包积液</span> 
             <img onClick={()=>{this.backSec()}} src={back} alt=""/>
           </div>
-          <div className={`${styles.emergencyBtn} ${styles.btn}`}>心外会诊</div>
-          <div className={`${styles.emergencyBtn} ${styles.btn}`}>心内会诊</div>
           <h4>{'判断是否心包填塞'}</h4>
           <div className={`${styles.goDownPub} ${styles.goDownY}`}>
             <span>是</span> 
@@ -99,7 +97,6 @@ class PartSec extends React.Component{
           <div className={`${styles.goDownPub} ${styles.goDownB}`}>
             <span>抢救室待床！</span>
           </div>
-          <br/>
           <div className={`${styles.goDownPub} ${styles.goDownN}`}>
             <span>否</span> 
           </div>
@@ -150,9 +147,7 @@ class PartSec extends React.Component{
             <span>气胸患者</span> 
             <img onClick={()=>{this.backSec(true)}} src={back} alt=""/>
           </div>
-          <div className={`${styles.emergencyBtn} ${styles.btn}`} style={{"position":"relative","top":"30px"}}>胸外科会诊</div>
-          <h4>{'结合症状体征是否危机生命是否'}</h4>
-          <h4 style={{"padding":"0"}}>{'濒死休克'}</h4>
+          <h4>{'结合症状体征是否危机生命是否濒死休克'}</h4>
           <div style={{display:reback?'block':'none'}} className={`${styles.nextWar} ${styles.next}`}>
             <span>是</span> 
             <i onClick={()=>{makeSureCom('',true,1,false)}}>确定</i>
@@ -219,8 +214,7 @@ class PartSec extends React.Component{
             <span>DDI阴性或TTE阴性</span> 
             <img onClick={()=>{this.backSec()}} src={back} alt=""/>
           </div>
-          {/* <span className={styles.emergencyBtnS}>排除AD</span> */}
-          <h4>再次详细询问病史、查体，必要时行主动脉CTA</h4>
+          <span className={styles.emergencyBtnS}>排除AD</span>
           <h4>请相关科室会诊寻找病因</h4>
         </React.Fragment>
       }
@@ -245,11 +239,11 @@ class PartSec extends React.Component{
   render(){
     const {data,idx} = this.props
     return <div className={`${styles.partSec} ${styles.partPub} clearfix`} style={{borderBottom:idx==1?'0':null}}>
-      {/* {
+      {
         data.select.map((item,idx)=>{
           return <div className={`${idx == 0&&data.select.length>1?styles.commonBtn:styles.emergencyBtn} ${styles.btn}`}>{item}</div>
         })
-      } */}
+      }
       <p>步骤2</p>
       {
         data.waring?<h4>{data.waring}</h4>:null

src/components/EmergencyProcedure/EmergencyPart/PartTrd/index.jsx

@@ -203,7 +203,7 @@ class PartTrd extends React.Component {
         </div>
         {
           num ? <React.Fragment>
-            <span className={styles.emergencyBtnS}>急诊胸腔闭式引流</span>
+            <span className={styles.emergencyBtnS}>急诊胸穿</span>
             <p className={styles.warMessage}>抢救室待救</p>
           </React.Fragment> : <React.Fragment>
               <h4>判断肺压缩大于25%或小于25%</h4>
@@ -219,7 +219,7 @@ class PartTrd extends React.Component {
               </div>
               <div className={`${styles.hold}`}>
                 <span className={styles.holdLeft}>病情好转</span>
-                <span className={styles.holdRight}>胸外科随诊</span>
+                <span className={styles.holdRight}>门诊随访</span>
               </div>
             </React.Fragment>
         }
@@ -233,10 +233,9 @@ class PartTrd extends React.Component {
           </div>
           {
             num ? <React.Fragment>
-              <div className={`${styles.emergencyBtn} ${styles.btn}`}>呼吸科会诊</div>
               <h4>生命体征不稳定</h4>
               <div className={`${styles.goDownPub} ${styles.goDownB}`}>
-                <span>根据病史、体征、Well、Geneva肺栓塞评分判断病情</span>
+                <span>根据病史、体征、PE评分判断病情</span>
               </div>
               <div className={`${styles.goDownPub} ${styles.goDownImg}`}>
                 <img src={down} alt="" />
@@ -256,8 +255,8 @@ class PartTrd extends React.Component {
               <div className={`${styles.goDownPub} ${styles.goDownB}`}>
                 <span>收入ICU</span>
               </div>
-              <h4>生命体征稳定建议检查CTPA（CT肺动脉造影）</h4>
-              {/* <h4>建议检查肺动脉增强CT</h4> */}
+              <h4>生命体征稳定建议检查CTPA（肺动脉造影）</h4>
+              <h4>建议检查肺动脉增强CT</h4>
               <div className={`${styles.hold}`}>
                 <span className={styles.holdLeft}>阳性</span>
                 <span className={styles.holdRight}>按肺栓塞治疗</span>
@@ -280,7 +279,6 @@ class PartTrd extends React.Component {
           </div>
           {
             num ? <React.Fragment>
-              <div className={`${styles.emergencyBtn} ${styles.btn}`}>呼吸科会诊</div>
               <h4>建议检查CTPA（肺动脉造影）</h4>
               <div className={`${styles.hold}`}>
                 <span className={styles.holdLeft}>阳性</span>
@@ -291,7 +289,7 @@ class PartTrd extends React.Component {
                 <span className={styles.holdRight}>请相关科室会诊寻找病因</span>
               </div>
             </React.Fragment> : <React.Fragment>
-                {/* <span className={styles.emergencyBtnS}>排除肺栓塞</span> */}
+                <span className={styles.emergencyBtnS}>排除肺栓塞</span>
                 <h4>请相关科室会诊寻找病因</h4>
               </React.Fragment>
           }
@@ -300,11 +298,8 @@ class PartTrd extends React.Component {
     } else if (idx == 5) {
       return <React.Fragment>
         <div className={`${styles.nextWar} ${styles.next}`}>
-          <span>立即检查主动脉CTA</span>
+          <span>立即检查CTA（血管造影）</span>
         </div>
-        
-        <div className={`${styles.emergencyBtn} ${styles.btn}`}>血管外科内会诊</div>
-        <div className={`${styles.emergencyBtn} ${styles.btn}`}>心内会诊</div>
         <h4>判断检查结果数据</h4>
         {
           trdShow ? <React.Fragment>
@@ -350,23 +345,23 @@ class PartTrd extends React.Component {
           {
             trdShow ? <React.Fragment>
               <div className={`${styles.nextWar} ${styles.next}`}>
-                <span>发病小于12小时</span>
-                <i onClick={() => { this.changeTrdShow(false, 0) }}>确定</i>
-              </div>
-              <div className={`${styles.nextCom} ${styles.next}`}>
                 <span>发病大于12小时</span>
                 <i onClick={() => { this.changeTrdShow(false, 1) }}>确定</i>
               </div>
+              <div className={`${styles.nextCom} ${styles.next}`}>
+                <span>发病小于12小时</span>
+                <i onClick={() => { this.changeTrdShow(false, 0) }}>确定</i>
+              </div>
             </React.Fragment> : <React.Fragment>
-                <div className={`${trdFlg ? styles.nextCom : styles.nextWar} ${styles.next}`}>
+                <div className={`${trdFlg ? styles.nextWar : styles.nextCom} ${styles.next}`}>
                   <span>{trdFlg ? '发病大于12小时' : '发病小于12小时'}</span>
                   <img onClick={() => { this.changeTrdShow(true, 1) }} src={back} alt="" />
                 </div>
-                <h4>{trdFlg ? '判断患者是否有急诊PCI指征' : ''}</h4>
+                <h4>{trdFlg ? '判断患者是否有急诊PCI指证' : '启动导管室、获取知情同意联系床位'}</h4>
                 {
                   trdFlg ? <React.Fragment>
                     <div className={`${styles.goDownPub} ${styles.goDownY}`}>
-                      <span>是，有急诊PCI指征</span>
+                      <span>是</span>
                     </div>
                     <div className={`${styles.goDownPub} ${styles.goDownImg}`}>
                       <img src={down} alt="" />
@@ -377,18 +372,6 @@ class PartTrd extends React.Component {
                     <div className={`${styles.goDownPub} ${styles.goDownImg}`}>
                       <img src={down} alt="" />
                     </div>
-                    <div className={`${styles.goDownPub} ${styles.goDownB}`}>
-                      <span>{'家属同意-导管室直接运转'}</span>
-                    </div>
-                    <div className={`${styles.goDownPub} ${styles.goDownImg}`}>
-                      <img src={down} alt="" />
-                    </div>
-                    <div className={`${styles.goDownPub} ${styles.goDownB}`}>
-                      <span>{'控制D-B时间<90min'}</span>
-                    </div>
-                    <div className={`${styles.goDownPub} ${styles.goDownImg}`}>
-                      <img src={down} alt="" />
-                    </div>
                     <div className={`${styles.goDownPub} ${styles.goDownB}`}>
                       <span>{'家属不同意或者导管室到达>60min'}</span>
                     </div>
@@ -399,17 +382,16 @@ class PartTrd extends React.Component {
                       <span>{'排除禁忌后考虑立即溶栓（D-D <30min）'}</span>
                     </div>
                     <br />
-                    <br />
-                    {/* <div className={styles.line}></div>
+                    <div className={styles.line}></div>
                     <div className={`${styles.goDownPub} ${styles.goDownB}`} style={{ color: '#2599ff', border: '1px solid #2599ff' }}>
                       <span>{'家属同意-导管室直接运转'}</span>
                     </div>
                     <div className={`${styles.goDownPub} ${styles.goDownB}`} style={{ border: '0' }}>
                       <span>{'控制D-B时间<90min'}</span>
-                    </div> */}
-                    {/* <div className={styles.line} style={{ marginBottom: "-8px" }}></div> */}
+                    </div>
+                    <div className={styles.line} style={{ marginBottom: "-8px" }}></div>
                     <div className={`${styles.goDownPub} ${styles.goDownN}`}>
-                      <span>否，没有急诊PCI指征</span>
+                      <span>否</span>
                     </div>
                     <div className={`${styles.goDownPub} ${styles.goDownImg}`}>
                       <img src={down} alt="" />
@@ -418,24 +400,6 @@ class PartTrd extends React.Component {
                       <span>收住ICU/CCU</span>
                     </div>
                   </React.Fragment> : <React.Fragment>
-                      <div className={`${styles.goDownPub} ${styles.goDownB}`}>
-                        <span>{'启动导管室、获取知情同意联系床位'}</span>
-                      </div>
-                      <div className={`${styles.goDownPub} ${styles.goDownImg}`}>
-                        <img src={down} alt="" />
-                      </div>
-                      <div className={`${styles.goDownPub} ${styles.goDownB}`}>
-                        <span>{'家属同意-导管室直接运转'}</span>
-                      </div>
-                      <div className={`${styles.goDownPub} ${styles.goDownImg}`}>
-                        <img src={down} alt="" />
-                      </div>
-                      <div className={`${styles.goDownPub} ${styles.goDownB}`}>
-                        <span>{'控制D-B时间<90min'}</span>
-                      </div>
-                      <div className={`${styles.goDownPub} ${styles.goDownImg}`}>
-                        <img src={down} alt="" />
-                      </div>
                       <div className={`${styles.goDownPub} ${styles.goDownB}`}>
                         <span>{'家属不同意或者导管室到达>60min'}</span>
                       </div>
@@ -446,13 +410,13 @@ class PartTrd extends React.Component {
                         <span>{'排除禁忌后考虑立即溶栓（D-D <30min）'}</span>
                       </div>
                       <br />
-                      {/* <div className={styles.line}></div>
+                      <div className={styles.line}></div>
                       <div className={`${styles.goDownPub} ${styles.goDownB}`} style={{ color: '#2599ff', border: '1px solid #2599ff' }}>
                         <span>{'家属同意-导管室直接运转'}</span>
                       </div>
                       <div className={`${styles.goDownPub} ${styles.goDownB}`} style={{ border: '0' }}>
                         <span>{'控制D-B时间<90min'}</span>
-                      </div> */}
+                      </div>
                     </React.Fragment>
                 }
               </React.Fragment>
@@ -463,9 +427,8 @@ class PartTrd extends React.Component {
           <h4>进一步诊疗</h4>
           <p>{'（STEMI处置时间<10min）'}</p>
           <h4>查血：检查心肌酶谱+Troponinl</h4>
-          <p style={{ color: "#000", lineHeight: "18px" }}>必要时可 Q4-6h 复查</p>
-          {/* <p style={{ color: "#000", lineHeight: "18px" }}>判读结果同时结果回馈心内科会诊</p> */}
-          <div className={`${styles.commonBtn} ${styles.btn}`}>普通心内科会诊</div>
+          <p style={{ color: "#000", lineHeight: "18px" }}>必要时可 Q1-4h 复查</p>
+          <p style={{ color: "#000", lineHeight: "18px" }}>判读结果同时结果回馈心内科会诊</p>
           <h4>判断检查结果是否异常</h4>
           {
             trdShow ? <React.Fragment>
@@ -510,7 +473,7 @@ class PartTrd extends React.Component {
                     {
                       (show0 && currentIdx==0) ? <React.Fragment>
                         <div className={`${styles.goDownPub} ${styles.goDownD}`}>
-                          <span>极高危患者</span>
+                          <span>患者危机程度：极高危患者</span>
                         </div>
                         <h4>治疗方案</h4>
                         <div className={`${styles.goDownPub} ${styles.goDownB}`}>
@@ -519,18 +482,6 @@ class PartTrd extends React.Component {
                         <div className={`${styles.goDownPub} ${styles.goDownImg}`}>
                           <img src={down} alt="" />
                         </div>
-                        <div className={`${styles.goDownPub} ${styles.goDownB}`}>
-                          <span>{'家属同意-导管室直接运转'}</span>
-                        </div>
-                        <div className={`${styles.goDownPub} ${styles.goDownImg}`}>
-                          <img src={down} alt="" />
-                        </div>
-                        <div className={`${styles.goDownPub} ${styles.goDownB}`}>
-                          <span>{'控制D-B时间<90min'}</span>
-                        </div>
-                        <div className={`${styles.goDownPub} ${styles.goDownImg}`}>
-                          <img src={down} alt="" />
-                        </div>
                         <div className={`${styles.goDownPub} ${styles.goDownB}`}>
                           <span>{'家属不同意或者导管室到达>60min'}</span>
                         </div>
@@ -541,16 +492,16 @@ class PartTrd extends React.Component {
                           <span>{'排除禁忌后考虑立即溶栓（D-D <30min）'}</span>
                         </div>
                         <br />
-                        {/* <div className={styles.line}></div>
+                        <div className={styles.line}></div>
                         <div className={`${styles.goDownPub} ${styles.goDownB}`} style={{ color: '#2599ff', border: '1px solid #2599ff' }}>
                           <span>{'家属同意-导管室直接运转'}</span>
                         </div>
                         <div className={`${styles.goDownPub} ${styles.goDownB}`} style={{ border: '0' }}>
                           <span>{'控制D-B时间<90min'}</span>
-                        </div> */}
+                        </div>
                       </React.Fragment> : (show1 && currentIdx==1) ? <React.Fragment>
                         <div className={`${styles.goDownPub} ${styles.goDownD}`}>
-                          <span>高危患者</span>
+                          <span>患者危机程度：高危患者</span>
                         </div>
                         <h4>治疗方案</h4>
                         <div className={`${styles.goDownPub} ${styles.goDownB}`}>
@@ -570,7 +521,7 @@ class PartTrd extends React.Component {
                         </div>
                       </React.Fragment>: (show2&& currentIdx==2) ? <React.Fragment>
                         <div className={`${styles.goDownPub} ${styles.goDownD}`}>
-                          <span>中危患者</span>
+                          <span>患者危机程度：中危患者</span>
                         </div>
                         <h4>治疗方案</h4>
                         <div className={`${styles.goDownPub} ${styles.goDownB}`}>
@@ -590,7 +541,7 @@ class PartTrd extends React.Component {
                         </div>
                       </React.Fragment> :(currentIdx==3) ? <React.Fragment>
                         <div className={`${styles.goDownPub} ${styles.goDownD}`}>
-                          <span>低危患者</span>
+                          <span>患者危机程度：低危患者</span>
                         </div>
                         <h4>留观或收住心内科</h4>
                       </React.Fragment>:null
@@ -604,25 +555,17 @@ class PartTrd extends React.Component {
     }
   }
   render() {
-    const { idx, num ,trdNum } = this.props
-    console.log(idx, num ,trdNum)
+    const { idx, num } = this.props
     return <div className={`${styles.partTrd} ${styles.partPub}`}>
       {
-        idx == 3 && num == 1 ? <React.Fragment>
-          {/* <div className={`${styles.emergencyBtn} ${styles.btn}`}>{this.state.select3[0]}</div><br /> */}
-          </React.Fragment>
+        idx == 3 && num == 1 ? <React.Fragment><div className={`${styles.emergencyBtn} ${styles.btn}`}>{this.state.select3[0]}</div><br /></React.Fragment>
           : idx == 5 ? <React.Fragment>
-            {/* <div className={`${styles.commonBtn} ${styles.btn}`}>{this.state.select5[1]}</div>
-            <div className={`${styles.emergencyBtn} ${styles.btn}`}>{this.state.select5[0]}</div> */}
+            <div className={`${styles.commonBtn} ${styles.btn}`}>{this.state.select5[1]}</div>
+            <div className={`${styles.emergencyBtn} ${styles.btn}`}>{this.state.select5[0]}</div>
             <br />
           </React.Fragment> : null
       }
       <p>步骤3</p>
-      {/* commonBtn emergencyBtn */}
-      {
-        idx == 4 && trdNum == 0 ?<div className={`${styles.emergencyBtn} ${styles.btn}`}>紧急心内会诊</div>:null
-      }
-      
       {
         this.handleTrdPart()
       }

src/components/EmergencyProcedure/EmergencyPart/index.jsx

@@ -21,12 +21,12 @@ class EmergencyProcedure extends React.Component {
   componentDidMount(){
     const height = getWindowInnerHeight()-144;
     this.$cont.current.style.height = height+"px";
-    windowEventHandler('resize', ()=>{
-      if(this.$cont.current){
+    if(this.$cont.current){
+      windowEventHandler('resize', ()=>{
         const height = getWindowInnerHeight()-144;
         this.$cont.current.style.height = height+"px";
-      }
-    });
+      });
+    }
   }
   componentWillReceiveProps(nextState){
     if(nextState.idx != this.props.idx){

src/components/EmergencyProcedure/EmergencyPart/index.less

@@ -11,7 +11,7 @@
     h4 {
       color: #FF1D1D;
       font-size: 16px;
-      padding: 10px 0;
+      padding: 10px 0  5px 0;
       font-weight: bold;
       line-height: 20px;
     }
@@ -215,7 +215,7 @@
       line-height: 36px;
       padding: 0 18px;
       float: right;
-      // border: 1px solid #818181;
+      border: 1px solid #818181;
       border-radius: 4px;
       margin-top: 12px;
     }

src/components/EmergencyProcedure/emergency.js

@@ -72,7 +72,7 @@ let data = [
       emergencyillname:'心包积液',
       idx:1,
       step1:{//步骤1
-        checks:'进行全血细胞计数+血型鉴定、术前免疫、凝血功能、超声心动图等检查',
+        checks:'检查超声心动图',
       },
       step2:{//步骤2
         waring:'',
@@ -157,7 +157,7 @@ let data = [
         checks:'听诊呼吸音是否减弱或消失',
       },
       step2:{//步骤2
-        waring:'进行全血细胞计数+血型鉴定、术前免疫、凝血功能、肺部B超、X线或者CT检查',
+        waring:'检查X线或者CT检查',
         tips:'',
         select:['胸外科会诊'],//按钮
         items:[
@@ -204,7 +204,7 @@ let data = [
                   },
                   {
                     message:'病情好转',
-                    result:'胸外科随诊',
+                    result:'门诊随访',
                     text:'',
                     link:''
                   }
@@ -228,7 +228,7 @@ let data = [
       emergencyillname:'肺栓塞',
       idx:3,
       step1:{//步骤1
-        checks:'立即进行全血细胞计数+血型鉴定、术前免疫、凝血功能、D-二聚体、床旁超声心动图检查',
+        checks:'立即检查D-二聚体+床旁超声心动图',
       },
       step2:{//步骤2
         waring:'判断血压是否正常或休克',
@@ -253,7 +253,7 @@ let data = [
                   },
                   {
                     message:'生命体征稳定建议检查CTPA（肺动脉造影）',
-                    text:'',
+                    text:'建议检查肺动脉增强CT',
                     link:''
                   },
                   {
@@ -313,7 +313,7 @@ let data = [
                 actionname:'评分低且DDI阴性',
                 links:[
                   {
-                    message:'',
+                    message:'排除肺栓塞',
                     text:'请相关科室会诊寻找病因'
                   }
                 ]
@@ -328,7 +328,7 @@ let data = [
       emergencyillname:'急性冠脉综合征',
       idx:4,
       step1:{//步骤1
-        checks:'立即检查12导联或18导联心电图',
+        checks:'立即检查18导联心电图',
       },
       step2:{//步骤2
         waring:'判断心电图ST段是否有异常！',
@@ -440,7 +440,7 @@ let data = [
       emergencyillname:'主动脉夹层',
       idx:5,
       step1:{//步骤1
-        checks:'立即进行全血细胞计数+血型鉴定、术前免疫、凝血功能、D-二聚体、床旁超声心动图检查',
+        checks:'立即检查D-二聚体+床旁超声心动图',
       },
       step2:{//步骤2
         waring:'判断DDI和TTE阴性或阳性！',

src/components/MedicalInfo/index.jsx

@@ -76,12 +76,12 @@ class MedicalInfo extends Component {
   componentDidMount(){
     const height = getWindowInnerHeight()-170;
     this.$cont.current.style.height = height+"px";
-    windowEventHandler('resize', ()=>{
-      if(this.$cont.current){
+    if(this.$cont.current){
+      windowEventHandler('resize', ()=>{
         const height = getWindowInnerHeight()-170;
         this.$cont.current.style.height = height+"px";
-      }
-    });
+      });
+    }
   }
   componentWillReceiveProps(){
     this.setState({

src/components/Operation/index.jsx

@@ -154,6 +154,7 @@ class Operation extends Component {
     let jsonStr = getAllDataStringList(baseList);
     let whichSign = baseList.typeConfig.typeConfig;
     let tmpLis = baseList.tabTemplate.items;
+    
     let flg = isAllClear(jsonData,jsonStr,baseList)
     if(!flg){
       Notify.info('模板数据不能为空')
@@ -165,9 +166,8 @@ class Operation extends Component {
     for(let i = 0;i <tmpLis.length;i++){
       let dataStr = tmpLis[i].preview;
       // let dataJson = tmpLis[i].dataJson;
-      // console.log(jsonStr.diag , JSON.parse(dataStr).diag)
+      // console.log(jsonStr.chief , JSON.stringify(eval('('+JSON.parse(dataStr).chief+')')))
       if(whichSign == 0){
-        // console.log(filterDataArr(JSON.parse(jsonStr.present)) , filterDataArr(JSON.parse(JSON.parse(dataStr).present)))
         if(
           filterDataArr(JSON.parse(jsonStr.chief)) == filterDataArr(eval('('+JSON.parse(dataStr).chief+')')) && 
           filterDataArr(JSON.parse(jsonStr.present)) == filterDataArr(eval('('+JSON.parse(dataStr).present+')')) && 
@@ -195,6 +195,7 @@ class Operation extends Component {
           Notify.info('该模板已保存');
           return false;
         }
+
       }else if(whichSign == 1){
         if(
           jsonStr.chief == JSON.stringify(eval('('+JSON.parse(dataStr).chief+')')) && 

src/components/PushItems/index.jsx

@@ -136,10 +136,8 @@ class PushItems extends Component {
     this.$cont.current.style.height = height + "px";
 
     windowEventHandler('resize', ()=>{
-      if(this.$cont.current){
-        const height = getWindowInnerHeight() - 200;
-        this.$cont.current.style.height = height + "px";
-      }
+      const height = getWindowInnerHeight() - 200;
+      this.$cont.current.style.height = height + "px";
     });
   }
 

src/components/ScaleSearch/index.jsx

@@ -91,12 +91,12 @@ class ScaleSearch extends Component {
   componentDidMount(){
     const height = getWindowInnerHeight()-170;
     this.$cont.current.style.height = height+"px";
-    windowEventHandler('resize', ()=>{
-      if(this.$cont.current){
+    if(this.$cont.current){
+      windowEventHandler('resize', ()=>{
         const height = getWindowInnerHeight()-170;
         this.$cont.current.style.height = height+"px";
-      }
-    });
+      });
+    }
   }
   componentWillReceiveProps(){
     this.setState({

src/components/TemplateItems/index.jsx

@@ -17,12 +17,12 @@ class TemplateItems extends React.Component {
     componentDidMount(){
         const height = getWindowInnerHeight()-206;
         this.$cont.current.style.height = height+"px";
-        windowEventHandler('resize', ()=>{
-            if(this.$cont.current){
-                const height = getWindowInnerHeight()-206;
-                this.$cont.current.style.height = height+"px";
-            }
-        });
+        if(this.$cont.current){
+          windowEventHandler('resize', ()=>{
+            const height = getWindowInnerHeight()-206;
+            this.$cont.current.style.height = height+"px";
+          });
+        }
     }
     genItems() {
         const Items = [];

src/components/WrapModalBody/WrapModalTableSon/index.jsx

@@ -7,34 +7,86 @@ import {getStatusImg} from '@utils/tools';
 class WrapModalTableSon extends React.Component {
   constructor(props) {
     super(props);
+    this.state = {
+      msg:'选中异常值数据'
+    }
     this.getImgPath = this.getImgPath.bind(this)
+    this.selectWaring = this.selectWaring.bind(this)
+    this.allCheckImportIns = this.allCheckImportIns.bind(this)
+    this.selectOneCheck = this.selectOneCheck.bind(this)
+  }
+  selectOneCheck(name,groupName,item){
+    const {selectOneCheck,allCheck} = this.props
+    selectOneCheck&&selectOneCheck(name,groupName,item)
+    
+    setTimeout(() => {
+      console.log(allCheck,78787)
+    }, 1000);
   }
   getImgPath(name,groupName,item){
-    const { checkedList,selectOneCheck } = this.props;
+    const { checkedList } = this.props;
     let num = 0;
     for(let k = 0;k < checkedList.length;k++){
       let tmpLis = checkedList[k];
       if(tmpLis == name){
-        return <img className={style.check} onClick={()=>selectOneCheck(name,groupName,item)} src={check_right} alt="" />
+        return <img className={style.check} onClick={()=>this.selectOneCheck(name,groupName,item)} src={check_right} alt="" />
       }else{
         ++num
       }
     }
     if(num == checkedList.length){
-      return <img className={style.check} onClick={()=>selectOneCheck(name,groupName,item)} src={check_circle} alt="" />
+      return <img className={style.check} onClick={()=>this.selectOneCheck(name,groupName,item)} src={check_circle} alt="" />
     }
   }
-
+  selectWaring(){
+    let tmpMsg = this.state.msg
+    const { selectWaring,hospitalSonInspect,checkedList,allCheck } = this.props;
+    // console.log(checkedList)
+    // let tmpAll = false,num=0;
+    // if(hospitalSonInspect&&hospitalSonInspect.lisExcelWrapper){
+    //   for(let i = 0;i < hospitalSonInspect.lisExcelWrapper.length;i++){
+    //     for(let j = 0;j < checkedList.length;j++){
+    //       if(hospitalSonInspect.lisExcelWrapper[i].itemName == checkedList[j]&&hospitalSonInspect.lisExcelWrapper[i].type!=0){
+    //         num++
+    //       }
+          
+    //     }
+    //   }
+    // }
+    // console.log(num,'sssssssssssssss')
+    // this.setState({
+    //   msg:(num == 0)?'取消选中异常值数据集':'选中异常值数据'
+    // },()=>{
+    //   selectWaring&&selectWaring()
+    // })
+    this.setState({
+      msg:tmpMsg=='取消选中异常值数据集'?'选中异常值数据':'取消选中异常值数据集'
+    })
+    selectWaring&&selectWaring()
+  }
+  allCheckImportIns(){
+    const { allCheckImportIns,allCheck } = this.props;
+    if(!allCheck){
+      this.setState({
+        msg:'取消选中异常值数据集'
+      })
+    }else{
+      this.setState({
+        msg:'选中异常值数据'
+      })
+    }
+    allCheckImportIns&&allCheckImportIns()
+  }
   render() {
-    const { hospitalSonInspect,allCheck,btnMsg,selectWaring,allCheckImportIns } = this.props;
+    const { hospitalSonInspect,allCheck } = this.props;
     return <div className={style['modalTable']}>
       <div className={style.sonTitle}>
-        <span>组名称 : {hospitalSonInspect.groupName}</span><span className={style.btn} onClick={selectWaring}>{btnMsg}</span>
+        <span>组名称 : {hospitalSonInspect.groupName}</span><span className={style.btn} onClick={this.selectWaring}>{this.state.msg}</span>
       </div>
       <div className={`${style.SonTable}`}>
         <table>
           <tr className={style.head}>
-            <td className={`${style.fst}`} onClick={allCheckImportIns}><img className={style.check} src={allCheck?check_right:check_circle} alt="" />全选</td>
+            <td className={`${style.fst}`} onClick={this.allCheckImportIns}><img className={style.check} src={allCheck?check_right:check_circle} alt="" />全选</td>
             <td className={`${style.sec}`}>编号</td>
             <td className={`${style.trd}`}>项目名称</td>
             <td className={`${style.four}`}>结果</td>

src/components/WrapModalBody/index.jsx

@@ -18,7 +18,7 @@ class WrapModalBody extends React.Component {
     dragBox('previewWrapper', 'previewStatic', 'del')
   }
   render() {
-    const { btnMsg,handleSearch, hospitalInspect,height,selectOneCheck, handleGetSonList,selectWaring,message, hospitalSonInspect,allCheckImportIns,allCheck,checkedList,selectGroupList } = this.props;
+    const { handleSearch, hospitalInspect,height,selectOneCheck, handleGetSonList,selectWaring,message, hospitalSonInspect,allCheckImportIns,allCheck,checkedList,selectGroupList } = this.props;
     return <div className={style['container']}>
       <div className={`${style.left}`}>
         <WrapModalTitle handleSearch={handleSearch} message={message}></WrapModalTitle>
@@ -36,7 +36,6 @@ class WrapModalBody extends React.Component {
             selectOneCheck={selectOneCheck}
             selectGroupList={selectGroupList}
             hospitalSonInspect={hospitalSonInspect}
-            btnMsg={btnMsg}
           ></WrapModalTableSon>:null
         }
       </div>

src/containers/WrapModalBody.js

@@ -24,7 +24,6 @@ function mapStateToProps(state) {
     allCheck: state.wrapModalBody.allCheck,
     selectGroupList: state.wrapModalBody.selectGroupList,
     checkedList: state.wrapModalBody.checkedList,
-    btnMsg: state.wrapModalBody.btnMsg,
   }
 }
 

src/store/actions/wrapModalBody.js

@@ -28,4 +28,3 @@ export const getHospitalInspectDetailList = (list,name,time) => ({         //检
 })
 
 
-

src/store/reducers/diagnosticList.js

@@ -35,7 +35,6 @@ const initState = {
     ],
     mainSuitStr:'',
     diagnosticStrNoType:'',
-    diagnosticStr:''
 
 }
 

src/store/reducers/wrapModalBody.js

@@ -20,7 +20,6 @@ const initWrapModal = {
   selectGroupList:[],//选的组的明细可能有多个组
   allCheck:false,//全选反选
   checkedList:[],//选中的小项
-  btnMsg:'选中全部异常值数据'
 }
 
 export default (state = initWrapModal, action) => {
@@ -91,7 +90,6 @@ export default (state = initWrapModal, action) => {
             warArr.push(listWrap.lisExcelWrapper[m])
             checked.push(tmpName)
           }
-          newState.btnMsg = "取消选中全部异常值数据集"
         }else{//全部的选中就去掉所有异常选中的
           for(let n = 0;n < tmpCheckedLis.length;n++){
             if(tmpType == 0 && tmpName == tmpCheckedLis[n]){//已选的正常的选项要保留
@@ -101,7 +99,6 @@ export default (state = initWrapModal, action) => {
               checked.push(tmpName)
             }
           }
-          newState.btnMsg = "选中全部异常值数据"
         }
       }
       for(let i = 0;i < tmpGroup.length;i++){
@@ -185,23 +182,6 @@ export default (state = initWrapModal, action) => {
           newState.allCheck = false;
         }
       }
-
-      let selectNum=0;
-      let tmpCheckedList = JSON.parse(JSON.stringify(newState.checkedList))
-      for(let m =0;m < listWrap.lisExcelWrapper.length;m++){
-        let tmpName = listWrap.lisExcelWrapper[m].itemName
-        let tmpType = listWrap.lisExcelWrapper[m].type
-        if(tmpType != 0 && (tmpCheckedList.filter(item=>item == tmpName)).length == 0){
-          ++selectNum
-        }
-      }
-      for(let m =0;m < listWrap.lisExcelWrapper.length;m++){
-        if(selectNum>0){
-          newState.btnMsg = "选中全部异常值数据"
-        }else{
-          newState.btnMsg = "取消选中全部异常值数据集"
-        }
-      }
       return newState;
   }
   if (action.type == SET_ALLCHECK_INS) {
@@ -225,7 +205,6 @@ export default (state = initWrapModal, action) => {
         if(numFst==0){
           tmpGroup.push(listWrap)
         }
-        newState.btnMsg = "取消选中全部异常值数据集"
         newState.checkedList=[...tmpCheckedLis]
         newState.selectGroupList = [...tmpGroup]
       }else{//反选
@@ -234,7 +213,6 @@ export default (state = initWrapModal, action) => {
             tmpGroup.splice(j,1)
           }
         }
-        newState.btnMsg = "选中全部异常值数据"
         newState.checkedList=[]
         newState.selectGroupList = [...tmpGroup]
       }

src/utils/tools.js

@@ -151,7 +151,7 @@ const getUrlArgObject = (parm) => {
     return args[parm];//返回对象  
 } 
 const getAllDataList =(baseList) =>{           //获取所有模块结构化的数据
-    let jsonData = {};//console.log(111,baseList)
+    let jsonData = {};console.log(111,baseList)
     //月经史公式
     const other = baseList.otherHistory;
     jsonData.lis = {};