Merge branch 'byll6.0' into newVersion6.0

src/components/AddInspect/index.jsx

@@ -271,17 +271,17 @@ class Inspect extends React.Component {
     return <ul className={`${styles.searchLiUl} ${styles.searchIsp}`} style={{height:'205px',width:'356px',overflow:'auto'}}>
       {
         list && list.map((item, idx) => {
-          let renderText = item.name ? item.name + `(${item.uniqueName})` : item.uniqueName   // 有大项需要显示大项
+          let renderText = item.uniqueName ? item.uniqueName + `(${item.name})` : item.name   // 有大项需要显示大项
           return <li key={idx}
             className={styles.searchLi}
-            title={item.uniqueName}
+            title={renderText}
             onClick={() => {
               this.props.setHighter(48)
               this.handleSign(item, idx, 'search');
               this.setState({ show: false })
             }}
           >
-            {item.uniqueName}
+            {renderText}
           </li>
         })
       }

src/components/DiagnosticList/index.jsx

@@ -286,7 +286,7 @@ class DiagnosticList extends Component {
     render(){
         const { list, treatment,pushMessage, showReferRecord, showHistoryCase ,chronicMagItem,loading,refreshScroller,windowWidth,hideChronic} = this.props;
       const {showTipsDetails,tipsDetails,showAllName}=pushMessage;
-        const {visible, treatTitle, showAssess, isAssessConfirm, assessId, disName, hasOndel, hasOnIndex,hasEnterItem,hasEnterImg} = this.state;
+        const {visible, treatTitle, showAssess, isAssessConfirm, assessId, disName, hasOndel, hasOnIndex,hasEnterItem,hasEnterImg,delItem} = this.state;
         const chronicList = JSON.parse(localStorage.getItem('chronic')||null);
         //let isChronic = false;      //是否要显示管理评估
         const footer = <Footer print={true}
@@ -359,7 +359,7 @@ class DiagnosticList extends Component {
                                   cancel={this.cancel}
                                   close={this.close}
                                   >
-                                  <div className={style['del-msg']}>是否删除该诊断？</div> 
+                                  <div className={style['del-msg']}>是否删除诊断{delItem.name}？</div> 
                     </ConfirmModal>
                     {/*<ConfirmModal visible={showReferRecord} okText='是' cancelText='否' confirm={this.referRecord}  cancel={this.noReferRecord} close={this.noReferRecord}>
                         <div className={style['confirm-info']}>是否引用往期病历</div>