Merge branch 'byll6.0' into newVersion6.0

src/components/AddNewInspect/SlidePic/index.jsx

@@ -113,10 +113,10 @@ class SlidePic extends Component {
     return (
       <li key={item.time} className={`${styles.slideLi} clearfix`}> 
           <img className={styles.imgCheck} src={item.check?checkOn:checkOff} onClick={()=>this.checkOnOff(item,idx)} alt=""/>
-          <span className={styles.bigname} title={item.name}>{item.name}</span>
+          <span className={styles.bigname} title={item.uniqueName}>{item.uniqueName}</span>
           <span className={styles.smallname}>{item.flg == 5?'药品':item.flg == 6?'手术/操作':'输血'}</span>
           <span className={styles.medType}>
-            <a style={{display:item.flg == 5?'block':'none'}} id="selectJiTypeWrap" onClick={()=>this.handleSelectShow(idx)}>
+            <a style={{display:item.flg == 5?'block':'none',color:item.form=='选择剂型'||!item.form?"#AAAAAA":"#333"}} id="selectJiTypeWrap" onClick={()=>this.handleSelectShow(idx)}>
               {item.form||'选择剂型'}
               <img src={dowm} alt=""/>
             </a>

src/utils/tools.js

@@ -929,7 +929,12 @@ function getEMRParams(){
   let temppacs = assistCheck.assistLabel
   temppacs = temppacs.filter((item)=>!item.check)
   let tempdrug = newAdvice.labelListBig
-  tempdrug = tempdrug.filter((item)=>!item.check)
+  tempdrug = tempdrug.filter((item)=>{
+    if(!item.check){
+      item.name = (item.uniqueName+item.form||'')
+      return item
+    }
+  })
   let tempoperation = newAdvice.labelListSmall
   tempoperation = tempoperation.filter((item)=>!item.check)
   let tempblood = newAdvice.labelListBlood||[]