量表弹窗显示bug修改-全部量表

src/components/ChronicInfo/index.jsx

@@ -498,43 +498,69 @@ class ChronicInfo extends React.Component{
   }
   render(){
     const {comfirnFlag,flag,ff} = this.state;
-    const {chronicMagItem,chronicDesease,formulaResult,showHide,slideUp} = this.props;
+    const {chronicMagItem,chronicDesease,data,showHide,slideUp} = this.props;
+    console.log(showHide)
     const scaleFooter = <Footer print={true}
                                 footText={showHide.isPop||!chronicMagItem?"确定":"加入病例记录"}
                                 handlePrint={this.onPrint}
                                 handleConfirm={this.comfirnTable}/>;
-    return <div className={style["tips"]} style={{marginBottom:'15px'}}>
-              <div className={`${style["tips-title"]} ${style["chronic"]}`}>
-                <div className={style["tips-name"]}>
-                  <img src={chronicPic} />
-                  <h2>{chronicMagItem&&chronicMagItem.name||chronicDesease&&chronicDesease.name||'病情提示'}</h2>
-                  <span className={style["redTips"]}>(页面信息有更新可能影响评估结果)</span>
-                </div>
-                <div className={style['toggle-btn']}>
-                  <img src={slideUp?down:up} alt="展开/收起" onClick={this.slideToggle}/>
-                </div>
-              </div>
-              <div className={style["content"]} ref={this.$content}>
-                  {this.getDetail()}
-              </div>
-              {showHide&&showHide.showTable?<ComplexModal onclose={()=>this.closeTable(true)} footer={scaleFooter}
-                      title={showHide.name}
-                      icon={tableIcon}
-                      top={20}
-                      bottom={20}
-                      width={820}>
-                <ScaleTable title={showHide.name} 
-                            tableId={showHide.id} 
-                            comfirnFlag={comfirnFlag} 
-                            flag={flag}
-                            flagT={ff}
-                            resetFlag={this.resetComfirnFlag}
-                            unscroeClose={this.unscroeClose}
-                            closeTable={this.closeTable}
-							resRef={this.$result}
-                            ></ScaleTable>
-              </ComplexModal>:''}
+    if(data&&data.length>0){
+      return <div className={style["tips"]} style={{marginBottom:'15px'}}>
+        <div className={`${style["tips-title"]} ${style["chronic"]}`}>
+          <div className={style["tips-name"]}>
+            <img src={chronicPic} />
+            <h2>{chronicMagItem&&chronicMagItem.name||chronicDesease&&chronicDesease.name||'病情提示'}</h2>
+            <span className={style["redTips"]}>(页面信息有更新可能影响评估结果)</span>
+          </div>
+          <div className={style['toggle-btn']}>
+            <img src={slideUp?down:up} alt="展开/收起" onClick={this.slideToggle}/>
+          </div>
+        </div>
+        <div className={style["content"]} ref={this.$content}>
+          {this.getDetail()}
+        </div>
+        {showHide&&showHide.showTable?<ComplexModal onclose={()=>this.closeTable(true)} footer={scaleFooter}
+                                                    title={showHide.name}
+                                                    icon={tableIcon}
+                                                    top={20}
+                                                    bottom={20}
+                                                    width={820}>
+          <ScaleTable title={showHide.name}
+                      tableId={showHide.id}
+                      comfirnFlag={comfirnFlag}
+                      flag={flag}
+                      flagT={ff}
+                      resetFlag={this.resetComfirnFlag}
+                      unscroeClose={this.unscroeClose}
+                      closeTable={this.closeTable}
+                      resRef={this.$result}
+          ></ScaleTable>
+        </ComplexModal>:''}
       </div>
+    }
+    //量表弹窗-无指标推送时量表弹窗要单独加载
+    if(showHide&&showHide.showTable){
+      return <ComplexModal onclose={()=>this.closeTable(true)} footer={scaleFooter}
+                           title={showHide.name}
+                           icon={tableIcon}
+                           top={20}
+                           bottom={20}
+                           width={820}>
+        <ScaleTable title={showHide.name}
+                    tableId={showHide.id}
+                    comfirnFlag={comfirnFlag}
+                    flag={flag}
+                    flagT={ff}
+                    resetFlag={this.resetComfirnFlag}
+                    unscroeClose={this.unscroeClose}
+                    closeTable={this.closeTable}
+                    resRef={this.$result}
+        ></ScaleTable>
+      </ComplexModal>;
+    }
+
+
+
   }
 }
 export default ChronicInfo;

src/components/PushItems/index.jsx

@@ -251,7 +251,7 @@ class PushItems extends Component {
               </div>
             </div>
             {/*{chronicPushItems&&chronicPushItems.length>0?<ChronicInfo data={chronicPushItems}></ChronicInfo>:''}*/}
-            {chronicPushItems&&chronicPushItems.length>0?<ChronicInfo data={chronicPushItems}></ChronicInfo>:''}
+            {<ChronicInfo data={chronicPushItems}></ChronicInfo>}
             <TipsMsg
               patDom={this.$cont}
              tmpFlg = {tmpFlg}