Merge branch 'dev5.3.1' into dev/new1

src/components/Advice/Textarea/index.jsx

@@ -57,13 +57,13 @@ class Textarea extends Component {
     return (
       <div>
         <div 
-            style={{outline: 'none'}}
+            style={{outline: 'none',minHeight:'20px'}}
             contenteditable={true}
             ref={this.$dom}
             onInput={this.handleInput}
             onKeyUp={this.handleInput}
             onkeydown={(e) => {e.stopPropagation()}}
-        ></div>
+        > </div>
       </div>
     );
   }

src/components/ChronicInfo/index.jsx

@@ -366,7 +366,12 @@ class ChronicInfo extends React.Component{
   getDetail(){
     const {data,formulaResult,calcuResult,chronicMagItem} = this.props;
     const {formulaId,optionId,possible,radioVal,calcuValues,currentIndex,hasEnterImg} = this.state;
+    /*let names = [];*/
     let list = data&&data.map((v,i)=>{
+                    /*if(this.getCritical(v)&&names.includes(v.name)){    //重复项
+                      return '';
+                    }
+                    names.push(v.name);*/
                     return <div className={style["list"]}>
                       {v.name?<p>
                                 {this.getCritical(v) ? '':<span>患者可能有</span>}
@@ -499,7 +504,7 @@ class ChronicInfo extends React.Component{
                         }
                       })}
                     </div>
-                  })
+                  });
     return list;
   }
   componentWillReceiveProps(next){

src/components/EmergencyProcedure/EmergencyModal/index.less

@@ -49,6 +49,7 @@
     background-color: #fff;
     box-shadow: 0 10px 20px 0 #989DA3;
     border: 1px solid #dedede;
+    z-index: 1;
     i {
       width: 0;
       height: 0;