Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

src/components/Treat/DrugTreat/index.jsx

@@ -76,7 +76,7 @@ class DrugTreat extends Component {
                 {treatment.map((item, index) => {
                     return(<div className={style['drug-content']}>
                         <div  className={style['drug-name-box']}>
-                            {index + 1 + '. ' }{item.drugsName}:&nbsp;
+                            <span>{index + 1 + '. ' }{item.bigdrugsName}<span>({item.subdrugsName})</span>:&nbsp;</span>
                             {item.medicitionsList.map((it, ii) => {
                                 return ((it.isShow == 1 || it.selected) && <span style={it.forbidden === '2' ? {opacity: '0.3', filter:'alpha(opacity=30)'} : ''}>
                                         {ii === 0 ? '' : ', '}