Merge remote-tracking branch 'origin/dev5.3.1' into dev/new1

src/components/AddInspect/index.less

@@ -1,3 +1,4 @@
+
 @import "~@less/variables.less";
 .labelWrap>li {
     // cursor: pointer;
@@ -182,7 +183,7 @@
         position: absolute;
         top: -5px;
         right: -5px;
-        z-index: 30;
+        z-index: 1;
         border-radius: 50%;
         background: @closeIcon;
         // background: url('/img/close.png') no-repeat center center;

src/components/AssessResult/ScaleItem/index.jsx

@@ -211,30 +211,37 @@ class ScaleItem extends Component {
                           if(item1.controlType==0){//单选
                             return <tr>
                               <td>
-                                <span>{'请选择'+item1.name+'：'}</span>
+                                <span>{item1.isShow == '0' ? item1.name+'：' : '请选择'+item1.name+'：'}</span>
                               </td>
                               <td>
-                                {item1.details.map((ii,ind)=>{
-                                  return <div className={style["chooseItem"]}>
-                                    <Radio label={ii.detailName}
-                                           isSelect={ii.state == 1}
-                                           handleClick={this.handleForRadio.bind(this,item.conceptId,details,idd,ind)}>
-                                      >
-                                    </Radio>
-                                  </div>
-                                })}
+                              {Array.isArray(item1.details)&&item1.isShow == '0'&&item1.details.map((ii,ind)=>{
+                                return ii.state == 1 && <div className={style["chooseItem"]}>
+                                          {ii.detailName}
+                                      </div>
+                              })}
+                              {Array.isArray(item1.details)&&item1.isShow != '0'&&item1.details.map((ii,ind)=>{
+                                return <div className={style["chooseItem"]}>
+                                        <Radio label={ii.detailName}
+                                                  isSelect={ii.state == 1}
+                                                  handleClick={this.handleForRadio.bind(this,item.conceptId,details,idd,ind)}>
+                                          </Radio>
+                                      </div>
+                              })}          
+                                
+
+                               
                               </td>
                             </tr>
                           }else if(item1.controlType==2){//输入框
                             return <tr>
                               <td>
-                                <span>{'请输入'+item1.name+'：'}</span>
+                                <span>{item1.isShow == '0' ? item1.name+'：':'请输入'+item1.name+'：'}</span>
                               </td>
                               <td>
-                                <input type="text" placeholder="请输入"  value={item1.value} onKeyDown={this.handleReg.bind(this)} onInput={(e)=>this.handleInputformula(item.conceptId,details,idd,e)}/>
+                                {item1.isShow == '0' ? item1.value + ' ' +item1.uint : <input type="text" placeholder="请输入"  value={item1.value} onKeyDown={this.handleReg.bind(this)} onInput={(e)=>this.handleInputformula(item.conceptId,details,idd,e)}/>}
                               </td>
                               <td>
-                                <span>{item1.uint}</span>
+                                {item1.isShow != '0'&&<span>{item1.uint}</span>}  
                               </td>
 
                             </tr>

src/components/ChronicInfo/index.jsx

@@ -412,8 +412,8 @@ class ChronicInfo extends React.Component{
                                         </td>
                                         <td>
                                         {Array.isArray(item.details)&&item.isShow == '0'&&item.details.map((ii,ind)=>{
-                                            return <div className={style["chooseItem"]}>
-                                                      {ii.state == 1 && ii.detailName}
+                                            return ii.state == 1 && <div className={style["chooseItem"]}>
+                                                      {ii.detailName}
                                                   </div>
                                           })}
                                           {Array.isArray(item.details)&&item.isShow != '0'&&item.details.map((ii,ind)=>{

src/components/CurrentIll/index.jsx

@@ -125,7 +125,7 @@ class CurrentIll extends Component{
     const {hasMain,readMode,fuzhen,isChronic,type,fetchPushInfos,handleInput,isRead,saveText,searchData,totalHide,editClear,data} = this.props;
     const {forbidInput,boxLeft,boxTop} = this.state;
     const searchFlag = searchData.length > 0 ? true : false;
-    const mode = readMode===-1?type:readMode;
+    const mode = !readMode||readMode===-1?type:readMode;
     if(+mode===1){      //文本模式
       return <Textarea  title='现病史' boxMark='2'
                         isRead={isRead}

src/components/MainSuit/index.jsx

@@ -259,7 +259,7 @@ class MainSuit extends Component{
     const searchFlag = searchData.length>0 ? true : false;
     const boxTop1 = datas.length>0?boxTop:45;
     const boxLeft1 = datas.length>0?boxLeft:85;
-    const mode = readMode===-1?type:readMode;
+    const mode = !readMode||readMode===-1?type:readMode;
     if(+mode===1){      //文本模式
       return <Textarea title='主诉' boxMark='1' isRead={isRead} value={saveText[0]} handlePush={fetchPushInfos} handleInput={handleInput} />;
     }

src/components/OtherHistory/index.jsx

@@ -58,7 +58,7 @@ class OtherHistory extends Component{
   render(){
     const {readMode,hasMain,totalHide,searchData,isRead,type,fetchPushInfos,handleInput,saveText} = this.props;
     const {boxLeft,boxTop} = this.state;
-    const mode = readMode===-1?type:readMode;
+    const mode = !readMode||readMode===-1?type:readMode;
     //智能模式有数据时不切换文本，文本模式有数据时不切换智能
     if(+mode===1){      //文本模式
       return <Textarea title='其他史' boxMark='3'