Squashed commit of the following:

commit f45feb4822d8cf4101ff64909bc6541d09e8d1a5
Merge: 8152ae4 96c3c29
Author: liucf <liucf@zjlantone.com>
Date:   Mon May 6 13:19:36 2019 +0800

    Merge branch 'ChronicMag' of http://192.168.2.236:10080/zhouna/newICSS into ChronicMag

commit 8152ae4d3e94567e76d9b8e65429b102df4bd25e
Author: liucf <liucf@zjlantone.com>
Date:   Mon May 6 13:19:26 2019 +0800

    主诉搜索结果容错处理

commit 96c3c2945cee7f7f19ef3c8b83dd331999f455b3
Author: zhouna <zhouna@zjlantone.com>
Date:   Sun May 5 17:44:09 2019 +0800

    历史病例中评估文字判断，删除按钮删除

src/components/AssessResult/AssessHis/index.jsx

@@ -73,11 +73,10 @@ class AssessResultHis extends Component {
     });
   }*/
   render() {
-    const { list,inquiryId,loading } = this.props;
-    const data = list&&list[inquiryId]&&list[inquiryId].data;
+    const { loading,isChronic } = this.props;
     return <div className={style['assess-cont']}>
       <div className={style['assess-result']}>
-        <p className={style['enter']}>管理和评估结果：<a onClick={this.showAssessFn}>查看结果<img src={arrow} /></a></p>
+        <p className={style['enter']}>{isChronic?'管理和评估':'推荐'}结果：<a onClick={this.showAssessFn}>查看结果<img src={arrow} /></a></p>
       </div>
       <div className={style['assess-box']}>
         {loading?<p className={style['loading']}><img src={loadingIcon} alt='loading...'/></p>:''}

src/components/AssessResult/ScaleItem/index.jsx

@@ -264,9 +264,6 @@ class ScaleItem extends Component {
         arr.push(<li>
           <span>{item.name}：</span>
           <div className={style['row']}>{temp}</div>
-          <div className={style["recommend"]} onClick={()=>this.props.handleRemove(i,j)}>
-            <img className={style["deleteIcon"]} src={deleteIcon} />
-          </div>
         </li>);
       }
     });

src/components/PreviewBody/index.jsx

@@ -222,7 +222,7 @@ class PreviewBody extends Component {
           </tr>
         </table>
         <p style={{textAlign:'right',marginTop:'15px'}}>医生签名：<span style={{minWidth: '60px',padding: '0 5px 2px 5px',borderBottom: '1px solid #333',}}>{baseObj ? baseObj.doctorName : (noData ? '' : preInfo.doctorName)}</span></p>
-        {showAssessBtn?<AssessResultHis inquiryId={baseObj&&baseObj.id} inquiryDate={baseObj&&baseObj.inquiryDate}></AssessResultHis>:""}
+        {showAssessBtn?<AssessResultHis isChronic={dataJson.diagChronicMagItem&&dataJson.diagChronicMagItem.name?true:false} inquiryId={baseObj&&baseObj.id} inquiryDate={baseObj&&baseObj.inquiryDate}></AssessResultHis>:""}
         
         <div onClick={() => { this.surePrint(dataStr) }} style={{
           display: show ? 'inline-block' : 'none',

src/components/ScaleTable/index.jsx

@@ -129,7 +129,9 @@ class ScaleTable extends React.Component{
     for(let i=0; i<group.length; i++){
       let rows = group[i].rows;
       for(let j=0; j<rows.length; j++){
-        if(rows[j].required==1&& (rows[j].row.filter((it,i)=>{return !it.isSelect})).length>0){
+        // if(rows[j].required==1&& (rows[j].row.filter((it,i)=>{return !it.isSelect})).length>0){
+        // 必填项下有一项选中既可
+        if(rows[j].required==1&& (rows[j].row.filter((it,i)=>{return it.isSelect})).length==0){
           unfinish = true;
           break;
         }

src/store/actions/mainSuit.js

@@ -360,7 +360,8 @@ export const insertSearch = (state,action)=>{
       }
     })
     // flag=1前是文本标签就替换，否则插入
-    const iftext = moduleData[inserIndx-1].tagType;
+    // const iftext = moduleData[inserIndx-1].tagType;
+    const iftext = inserIndx&&moduleData[inserIndx-1]&&moduleData[inserIndx-1].tagType;
     if(iftext==config.tagType){
        moduleData.splice(inserIndx-1,1,{id:id,name:searchData,value:searchData,tagType:config.tagType,exist:1});
      }else{

src/utils/config.js

@@ -1,7 +1,7 @@
 // const host='http://192.168.3.1:5050';//赵
 // const host='http://192.168.3.100:5050';//王峰
-// const host='http://192.168.2.241:5050';//后端接口访问地址
-const host='http://192.168.2.236:5050';//后端接口访问地址
+const host='http://192.168.2.241:5050';//后端接口访问地址
+// const host='http://192.168.2.236:5050';//后端接口访问地址
 // const host='http://192.168.3.11:5050';//王宇
 //const host='http://192.168.2.164:8080';
 // const host='http://192.168.3.117:5050'; //周铁刚