Merge branch 'optimize' into optimize-zxc

src/components/ChronicInfo/index.jsx

@@ -520,8 +520,8 @@ class ChronicInfo extends React.Component{
                                 handleConfirm={this.comfirnTable}/>;
     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"]} onClick={this.slideToggle}>
+        <div className={`${style["tips-title"]} ${style["chronic"]}`} onClick={this.slideToggle}>
+          <div className={style["tips-name"]}>
             <img src={chronicPic} />
             <h2>{chronicMagItem&&chronicMagItem.name||chronicDesease&&chronicDesease.name||'病情提示'}<span className={style["redTips"]}>(页面信息有更新可能影响评估结果)</span></h2>
           </div>

src/components/EmergencyProcedure/EmergencyModal/index.less

@@ -83,24 +83,26 @@
   }
   .imageModal {
     position: fixed;
-    // top: 7%;
-    // bottom: 7%;
+    top: 7%;
+    bottom: 7%;
     // height: 86%;
     background-color: #fff;
     overflow: hidden;
     z-index: 500;
     width: 1000px;
     margin-left: -500px;
-    transform: translateY(-50%);
     // margin-top: -420px;
     // height: 840px;
     // transform: translateX(-50%);
     left: 50%;
-    top: 50%;
+    // top: 50%;
     img{
-      width: 100%;
+      // width: 100%;
       height: 100%;
-      float: left;
+      position: absolute;
+      left: 50%;
+      transform: translateX(-50%);
+      // float: left;
       top: 0;
     }
   }

src/components/EmergencyProcedure/index.jsx

@@ -11,6 +11,7 @@ class EmergencyProcedure extends React.Component {
       show:false,
       data:{}
     }
+    this.handleShow=this.handleShow.bind(this)
   }
   
   slideToggle(type){
@@ -32,6 +33,7 @@ class EmergencyProcedure extends React.Component {
     this.setState({
       show:type
     })
+    !type&&this.slideToggle(0)
   }
   render(){
     const {data,setDataIdx,idx} = this.props;

src/components/MedicalInfo/index.jsx

@@ -21,14 +21,13 @@ class MedicalInfo extends Component {
     }
     getSearchList() {
         const { getAllConceptDetail,searchResult } = this.props;
-      let showSubName = false;
         return searchResult && searchResult.map((item) => {
-          showSubName = item.type == 51 ? true : false;
           return <li key={item.conceptId}
                      title='点击查看详情'
                      onClick={() => getAllConceptDetail({name: item.name, type: item.type, uname: item.uniqueName})}>
-            <span>{item.name}{showSubName ? '(' + item.retrievalName + ')' : ''}</span>
+            <span>{item.name}</span>
             <i>( {item.libTypeName} )</i>
+            {item.retrievalName?<p>• {item.retrievalName}</p>:''}
             {/*<button>查看</button>*/}
           </li>;
             });
@@ -95,7 +94,7 @@ class MedicalInfo extends Component {
         return (
             <div className={style['search-cont']} ref={this.$cont}>
               <div className={style['search-box']}>
-                <p className={style['title']}>医学知识搜索<i>(支持同义词检索)</i></p>
+                <p className={style['title']}>医学知识搜索</p>
                 <p className={style['cont']}>
                   <input type="text" className={style['input']} ref={this.$inp} onInput={this.handleChange} onKeyUp={this.handleEnter}/>
                   {val?<img src={delIcon} alt="清空" onClick={this.clear}/>:''}

src/components/MedicalInfo/index.less

@@ -32,10 +32,10 @@
         font-size: 12px;
         color:#979797;
         margin-bottom: 10px;
-        i {
+        /*i {
             color: #f93333;
             font-size: 12px;
-        }
+        }*/
     }
     .input{
         display: inline-block;
@@ -62,8 +62,15 @@
         box-sizing: border-box;
         li{
             border-bottom:1px #CECECE solid;
-            line-height: 42px;
+            line-height: 30px;
+            padding-top: 5px;
             cursor: pointer;
+            p{
+                color:#979797;
+                font-size: 12px;
+                margin-bottom: 10px;
+                line-height: 20px;
+            }
             span{
                 font-size: 14px;
                 color: #000;

src/components/PushItems/TipsMsg/index.jsx

@@ -6,11 +6,13 @@ class TipsMsg extends Component {
     constructor(props) {
         super(props);
     }
-    componentWillReceiveProps(){
+    componentWillReceiveProps(next){
         //滚动条定位到提示信息模块
+      if(JSON.stringify(next.tips)!=JSON.stringify(this.props.tips)){
         const {patDom} = this.props;
         const ht = $(patDom.current).height();
         $(patDom.current).scrollTop(ht);
+      }
     }
 
     render() {

src/components/PushItems/index.jsx

@@ -123,7 +123,7 @@ class PushItems extends Component {
 
   showTips() {
     const { getTipsDetails, showTipsDetailsModal, clickDiag } = this.props;console.log(this.props)
-    getTipsDetails && getTipsDetails({name: clickDiag.name, type: clickDiag.type,position:0}); 
+    getTipsDetails && getTipsDetails({name: clickDiag.name, type: clickDiag.type,position:0});
     //showTipsDetailsModal && showTipsDetailsModal()
   }
   hideTips() {
@@ -186,26 +186,25 @@ class PushItems extends Component {
             )}
             {/* 不展示确诊 */}
             {/* {determine && determine.length>0 && <PushDiag titleBg='#FAEBEC' icon={possibleImg} title='确诊' diagList={determine} maxShowNum={28}/>} */}
-            {doubt && doubt.length > 0 && (
+            {possible && possible.length > 0 && (
               <PushDiag
                 titleBg="#FAEBEC"
-                icon={doubtImg}
+                icon={possibleImg}
                 title="可能诊断"
-                diagList={doubt}
+                diagList={possible}
                 maxShowNum={24}
               />
             )}
-            {possible && possible.length > 0 && (
+            {doubt && doubt.length > 0 && (
               <PushDiag
                 titleBg="#FAEBEC"
-                icon={possibleImg}
+                icon={doubtImg}
                 title="初步诊断"
-                diagList={possible}
+                diagList={doubt}
                 maxShowNum={24}
               />
             )}
             
-            
             {likely && likely.length > 0 && (
               <PushDiag
                 titleBg="#FAEBEC"
@@ -225,7 +224,7 @@ class PushItems extends Component {
                   <div className={style["doubt"]}>
                     <h1>
                       <img src={doubtImg} />
-                      可能诊断
+                      疑似诊断
                     </h1>
                     <div className={style["no-push"]}>无</div>
                   </div>

src/components/RadioInpDrop/index.jsx

@@ -251,7 +251,7 @@ class InputComp extends Component{
                  className={style['inner-inp']}
                  onClick={(e)=>{e.stopPropagation()}}
                  onFocus={(e)=>{e.stopPropagation()}}
-                 onBlur={this.handleBlur}>{value}</span>:<span>{value}</span>
+                 onBlur={this.handleBlur}>&nbsp;{value}</span>:<span>&nbsp;{value}</span>
   }
 }
 

src/components/ScaleSearch/index.jsx

@@ -42,6 +42,7 @@ class ScaleSearch extends Component {
                  title='点击查看详情'
                  onClick={this.showScale.bind(this,{conceptId:item.conceptId,name:item.name})}>
         <span className={style['scale-name']}>{item.name}{this.getResult(item.conceptId)}</span>
+        {item.showType===0?<p>• {item.searchName}</p>:''}
         {/*<button>查看</button>*/}
       </li>;
     });

src/components/ScaleSearch/index.less

@@ -60,6 +60,12 @@
       border-bottom:1px #CECECE solid;
       line-height: 42px;
       cursor: pointer;
+      p{
+        color:#979797;
+        font-size: 12px;
+        margin-bottom: 10px;
+        line-height: 20px;
+      }
       span{
         font-size: 14px;
         color: #000;

src/store/actions/mainSuit.js

@@ -413,6 +413,7 @@ export const insertSearch = (state,action)=>{
         res.data.splice(focusIndex+1,0,nText);
         res.saveText.splice(focusIndex+1,0,searchData);
         res.data[focusIndex].value = value;
+        res.saveText[focusIndex] = value;
       }
       span.current.innerText?(span.current.innerText = value):(span.current.innerHTML=value);
     }