Merge branch 'bugFix20190722' into dev/new1

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

@@ -150,9 +150,10 @@ 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>
+          {/* <h4 style={{"padding":"0"}}>{''}</h4> */}
+          <div className={`${styles.emergencyBtn} ${styles.btn}`} style={{"display":"inline-block","float":"right"}}>胸外科会诊</div>
+          <div style={{"clear":"both"}}></div>
           <div style={{display:reback?'block':'none'}} className={`${styles.nextWar} ${styles.next}`}>
             <span>是</span> 
             <i onClick={()=>{makeSureCom('',true,1,false)}}>确定</i>

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

@@ -281,7 +281,7 @@ class PartTrd extends React.Component {
           {
             num ? <React.Fragment>
               <div className={`${styles.emergencyBtn} ${styles.btn}`}>呼吸科会诊</div>
-              <h4>建议检查CTPA（肺动脉造影）</h4>
+              <h4>建议检查CTPA（CT肺动脉造影）</h4>
               <div className={`${styles.hold}`}>
                 <span className={styles.holdLeft}>阳性</span>
                 <span className={styles.holdRight}>按肺栓塞治疗</span>
@@ -304,7 +304,7 @@ class PartTrd extends React.Component {
         </div>
         
         <div className={`${styles.emergencyBtn} ${styles.btn}`}>血管外科内会诊</div>
-        <div className={`${styles.emergencyBtn} ${styles.btn}`}>心内会诊</div>
+        <div className={`${styles.emergencyBtn} ${styles.btn}`}>心外会诊</div>
         <h4>判断检查结果数据</h4>
         {
           trdShow ? <React.Fragment>
@@ -554,7 +554,7 @@ class PartTrd extends React.Component {
                         </div>
                         <h4>治疗方案</h4>
                         <div className={`${styles.goDownPub} ${styles.goDownB}`}>
-                          <span>{'推荐早期浸入治疗（<24h）'}</span>
+                          <span>{'推荐早期侵入治疗（<24h）'}</span>
                         </div>
                         <div className={`${styles.goDownPub} ${styles.goDownImg}`}>
                           <img src={down} alt="" />
@@ -574,7 +574,7 @@ class PartTrd extends React.Component {
                         </div>
                         <h4>治疗方案</h4>
                         <div className={`${styles.goDownPub} ${styles.goDownB}`}>
-                          <span>{'推荐浸入治疗（<72h）'}</span>
+                          <span>{'推荐侵入治疗（<72h）'}</span>
                         </div>
                         <div className={`${styles.goDownPub} ${styles.goDownImg}`}>
                           <img src={down} alt="" />

src/components/EmergencyProcedure/emergency.js

@@ -252,7 +252,7 @@ let data = [
                     link:''
                   },
                   {
-                    message:'生命体征稳定建议检查CTPA（肺动脉造影）',
+                    message:'生命体征稳定建议检查CTPA（CT肺动脉造影）',
                     text:'',
                     link:''
                   },
@@ -293,7 +293,7 @@ let data = [
             choose:[
               {
                 actionname:'评分高或DDI阳性',
-                description:'建议检查CTPA（肺动脉造影）',
+                description:'建议检查CTPA（CT肺动脉造影）',
                 links:[
                   {
                     message:'阳性',

src/store/reducers/wrapModalBody.js

@@ -91,7 +91,7 @@ export default (state = initWrapModal, action) => {
             warArr.push(listWrap.lisExcelWrapper[m])
             checked.push(tmpName)
           }
-          newState.btnMsg = "取消选中全部异常值数据集"
+          newState.btnMsg = "取消选中全部异常值数据"
         }else{//全部的选中就去掉所有异常选中的
           for(let n = 0;n < tmpCheckedLis.length;n++){
             if(tmpType == 0 && tmpName == tmpCheckedLis[n]){//已选的正常的选项要保留
@@ -188,19 +188,18 @@ export default (state = initWrapModal, action) => {
 
       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
+      let tmpListWrap = JSON.parse(JSON.stringify(newState.hospitalInspectObj))
+      for(let m =0;m < tmpListWrap.lisExcelWrapper.length;m++){
+          let tmpName = tmpListWrap.lisExcelWrapper[m].itemName
+          let tmpType = tmpListWrap.lisExcelWrapper[m].type
+          if(tmpType != 0&& (tmpCheckedList.filter(item=>item == tmpName)).length == 0){
+            selectNum = selectNum+1
         }
       }
-      for(let m =0;m < listWrap.lisExcelWrapper.length;m++){
-        if(selectNum>0){
+      if(selectNum>0){//说明有没选中的
           newState.btnMsg = "选中全部异常值数据"
-        }else{
-          newState.btnMsg = "取消选中全部异常值数据集"
-        }
+      }else{
+          newState.btnMsg = "取消选中全部异常值数据"
       }
       return newState;
   }
@@ -225,7 +224,7 @@ export default (state = initWrapModal, action) => {
         if(numFst==0){
           tmpGroup.push(listWrap)
         }
-        newState.btnMsg = "取消选中全部异常值数据集"
+        newState.btnMsg = "取消选中全部异常值数据"
         newState.checkedList=[...tmpCheckedLis]
         newState.selectGroupList = [...tmpGroup]
       }else{//反选