6 vuotta sitten · 09e01cca73
--- a/src/common/components/InspectCommon/index.jsx
+++ b/src/common/components/InspectCommon/index.jsx
@@ -16,7 +16,7 @@ class InspectCommon extends React.Component {
 
				             {children}
			
 
				             <div className={style.btnWrap}>
			
 
				                 <span className={style.clear + ' red'} onClick={handleClear}>清空选项</span>
			
 
				-                <span className={style.sure} onClick={handleConfirm}>确 定</span>
			
 
				+                <span className={style.sure} onClick={handleConfirm}>确定</span>
			
 
				             </div>
			
 
				         </div>
			
 
				     }
			
--- a/src/common/components/InspectCommon/index.less
+++ b/src/common/components/InspectCommon/index.less
@@ -24,10 +24,12 @@
 
				     .sure {
			
 
				         float: right;
			
 
				         color: @blue;
			
 
				-        border: 1px solid @blue;
			
 
				+        font-weight: bold;
			
 
				     }
			
 
				     .clear {
			
 
				         float: left;
			
 
				+        // font-weight: bold;
			
 
				+        bottom: 0;
			
 
				     }
			
 
				 }
			
 
				 
			
--- a/src/common/components/Notify/index.less
+++ b/src/common/components/Notify/index.less
@@ -27,7 +27,7 @@
 
				 .notify-text {
			
 
				   min-width: 224px;
			
 
				   height: 70px;
			
 
				-  
			
 
				+  padding:  0 40px 0 0;
			
 
				   // overflow: hidden;
			
 
				   position: relative;
			
 
				   left: 66px;
			
--- a/src/common/components/NumberPan/index.jsx
+++ b/src/common/components/NumberPan/index.jsx
@@ -1,6 +1,7 @@
 
				 import React,{Component} from 'react';
			
 
				 import style from './index.less';
			
 
				 import ReactDom from "react-dom";
			
 
				+import backspace from '../../images/backspace.png'
			
 
				 
			
 
				 class NumberPan extends Component{
			
 
				   constructor(props){
			
@@ -55,7 +56,7 @@ class NumberPan extends Component{
 
				       display:show?'table':'none'        //table onBlur阻止冒泡是为了修复multSpread中数字键盘点击触发最外层数字组件onBlur事件
			
 
				     }
			
 
				   }
			
 
				-  render(){  
			
 
				+  render(){
			
 
				     const select = this.handleSelect.bind(this); 
			
 
				     const domNode = document.getElementById('root');
			
 
				     return ReactDom.createPortal(
			
@@ -74,19 +75,19 @@ class NumberPan extends Component{
 
				           <td><button onClick={select}>4</button></td>
			
 
				           <td><button onClick={select}>5</button></td>
			
 
				           <td><button onClick={select}>6</button></td>
			
 
				-          <td><button onClick={this.handleBack.bind(this)}>回退</button></td>
			
 
				+          <td><button onClick={this.handleBack.bind(this)}><img src={backspace} onClick={this.handleBack.bind(this)} /></button></td>
			
 
				         </tr>
			
 
				         <tr>
			
 
				           <td><button onClick={select}>7</button></td>
			
 
				           <td><button onClick={select}>8</button></td>
			
 
				           <td><button onClick={select}>9</button></td>
			
 
				-          <td><button onClick={this.handleClear.bind(this)}>清空</button></td>
			
 
				+          <td><button onClick={this.handleClear.bind(this)} className={style['clearN']}>清空</button></td>
			
 
				         </tr>
			
 
				         <tr>
			
 
				           <td><button onClick={select}>.</button></td>
			
 
				           <td><button onClick={select}>0</button></td>
			
 
				           <td><button onClick={select}>～</button></td>
			
 
				-          <td><button onClick={this.handleClose.bind(this)}>确定</button></td>
			
 
				+          <td><button onClick={this.handleClose.bind(this)} className={style['confirm']}>确定</button></td>
			
 
				         </tr>
			
 
				       </table>
			
 
				       </div>
			
--- a/src/common/components/NumberPan/index.less
+++ b/src/common/components/NumberPan/index.less
@@ -21,4 +21,24 @@
 
				   button:hover{
			
 
				     border-color: @blue;
			
 
				   }
			
 
				+  .confirm{
			
 
				+    color: #3B9ED0;
			
 
				+    font-weight: bold;
			
 
				+    text-align: center;
			
 
				+    padding-left: 14px;
			
 
				+    font-size: 14px;
			
 
				+    line-height: normal;
			
 
				+  }
			
 
				+  .imgN{
			
 
				+    text-align: right;
			
 
				+    vertical-align: middle;
			
 
				+    padding-right: 8px;
			
 
				+    cursor: pointer;
			
 
				+  }
			
 
				+  .clearN{
			
 
				+    color:#F6514A;
			
 
				+    text-align: center;
			
 
				+    padding-left: 8px;
			
 
				+    font-weight: bold;
			
 
				+  }
			
 
				 }
			
--- a/src/common/js/func.js
+++ b/src/common/js/func.js
@@ -82,7 +82,8 @@ function notTextLabel(label){
 
				 * 入参：arr源数组，
			
 
				 *       noPre是否不添加前置文本标签，默认false即添加
			
 
				 *       noEnd是否不添加后置文本标签，默认false即添加
			
 
				-*       ifEmpty是否添加空标签，默认true即添加，传false添加逗号，如查体
			
 
				+*       ifEmpty是否添加空标签，默认true即添加，传false添加逗号，如查体,
			
 
				+*       showInCheck是否默认在查体中展开
			
 
				 * */
			
 
				 export const fullfillText = (arr,noPre=false,noEnd=false,ifEmpty=true)=>{
			
 
				   let newArr =[],
			
@@ -92,19 +93,22 @@ export const fullfillText = (arr,noPre=false,noEnd=false,ifEmpty=true)=>{
 
				       notText = true,
			
 
				       saveText=[],
			
 
				       tempText = '',
			
 
				-      value = '';
			
 
				+      value = '',
			
 
				+      item={},
			
 
				+      checkHiddenDefault=false;
			
 
				   arr.map((it,i)=>{
			
 
				     notText = notTextLabel(it);
			
 
				     value = it.value||'';
			
 
				-    textLabel = JSON.parse(config.textLabel);
			
 
				-    _textLabel = JSON.parse(config._textLabel);
			
 
				+    textLabel = !ifEmpty&&i==0?Object.assign({},JSON.parse(config.textLabel),{showInCheck:true}):JSON.parse(config.textLabel);
			
 
				+    _textLabel = !ifEmpty&&i<config.showCheckNum+1?Object.assign({},JSON.parse(config._textLabel),{showInCheck:true}):JSON.parse(config._textLabel);
			
 
				     if(i===0){
			
 
				       //第一个标签不是文本标签时在前面添加文本标签
			
 
				       if(!noPre&&notText){
			
 
				         newArr.push(textLabel);
			
 
				         saveText.push('');
			
 
				       }
			
 
				-      newArr.push(it);
			
 
				+      item = ifEmpty?it:Object.assign({},it,{showInCheck:true});
			
 
				+      newArr.push(item);
			
 
				       if(it.tagType != 3){
			
 
				         tempText = value?it.labelPrefix+value+it.labelSuffix:'';
			
 
				         tempText = notText?tempText:it.value||it.name;
			
@@ -114,23 +118,25 @@ export const fullfillText = (arr,noPre=false,noEnd=false,ifEmpty=true)=>{
 
				       saveText.push(tempText);
			
 
				     }else{
			
 
				       pre = arr[i-1];
			
 
				+      item = !ifEmpty&&i<config.showCheckNum?Object.assign({},it,{showInCheck:true}):it;
			
 
				+      //判断单选项是否有默认选中，位置在隐藏区域时，查体所有标签展示
			
 
				+      if(!ifEmpty&&!checkHiddenDefault&&i>config.showCheckNum&&+it.tagType===1&&(+it.controlType===0||+it.controlType===1)){
			
 
				+        if(it.questionDetailList.find((it)=>it.defaultSelect=='1')){
			
 
				+          checkHiddenDefault=true;
			
 
				+        }
			
 
				+      }
			
 
				       //如果本身不是文本标签且前面一个也不是文本标签,该标签前面添加文本标签
			
 
				       if(notTextLabel(pre)&&notText){
			
 
				           // newArr.push(textLabel,it);
			
 
				-          ifEmpty?newArr.push(textLabel,it):newArr.push(_textLabel,it);
			
 
				+          ifEmpty?newArr.push(textLabel,it):newArr.push(_textLabel,item);
			
 
				           if(it.tagType != 3) {
			
 
				             tempText = value ? it.labelPrefix + value + it.labelSuffix : '';
			
 
				           }else{
			
 
				             tempText = getSaveText(it);
			
 
				           }
			
 
				-          saveText.push("",tempText); 
			
 
				-        //最后一个非文本标签，后面添加一个文本标签
			
 
				-        /*if(!noEnd&&i===arr.length-1){
			
 
				-          newArr.push(textLabel);
			
 
				-          saveText.push("");
			
 
				-        }*/
			
 
				+          saveText.push("",tempText);
			
 
				       }else{    //本身是或者前面是文本标签时，前面不添加文本标签
			
 
				-        newArr.push(it);
			
 
				+        newArr.push(item);
			
 
				         if(it.tagType != 3) {
			
 
				           tempText = value ? it.labelPrefix + value + it.labelSuffix : '';
			
 
				           // tempText = notText?tempText:it.value||it.name;
			
@@ -147,7 +153,7 @@ export const fullfillText = (arr,noPre=false,noEnd=false,ifEmpty=true)=>{
 
				       }
			
 
				     }
			
 
				   });
			
 
				-  return {newArr,saveText};
			
 
				+  return {newArr,saveText,checkHiddenDefault};
			
 
				 };
			
 
				 
			
 
				 
			
--- a/src/components/AddInspect/SlideExcel/index.jsx
+++ b/src/components/AddInspect/SlideExcel/index.jsx
@@ -31,7 +31,7 @@ class SlideExcel extends Component {
 
				     })
			
 
				   }
			
 
				   render() {
			
 
				-    const {items,item,idx} = this.props;
			
 
				+    const {items,item,idx,dateTime} = this.props;
			
 
				     const {show} = this.state;
			
 
				     return (
			
 
				       <li className={styles.excelDataLis} style={{border:items.lisExcelRes.length-1 == idx? 0:''}}>
			
@@ -46,7 +46,7 @@ class SlideExcel extends Component {
 
				                       <td style={{width:'25%'}}>
			
 
				                           {normalVal(value.min,value.max)}
			
 
				                       </td>
			
 
				-                      <td style={{width:'25%'}}>{value.time == ''?('导入时间: '+this.state.dateTime):'化验时间: '+this.toTime(value.time)}</td>
			
 
				+                      <td style={{width:'25%'}}>{value.time == ''?('导入时间: '+dateTime):'化验时间: '+this.toTime(value.time)}</td>
			
 
				                   </tr>
			
 
				                 })):(item.lisExcelItem && item.lisExcelItem.map((value,idx)=>{
			
 
				                   if(idx < 4){
			
@@ -56,7 +56,7 @@ class SlideExcel extends Component {
 
				                         <td style={{width:'25%'}}>
			
 
				                             {normalVal(value.min,value.max)}
			
 
				                         </td>
			
 
				-                        <td style={{width:'25%'}}>{value.time == ''?('导入时间: '+this.state.dateTime):'化验时间: '+this.toTime(value.time)}</td>
			
 
				+                        <td style={{width:'25%'}}>{value.time == ''?('导入时间: '+dateTime):'化验时间: '+this.toTime(value.time)}</td>
			
 
				                     </tr>
			
 
				                   }
			
 
				                 }))
			
--- a/src/components/AddInspect/SlideSelect/index.jsx
+++ b/src/components/AddInspect/SlideSelect/index.jsx
@@ -117,6 +117,7 @@ class SlideSelect extends Component {
 
				                             handlePush&&handlePush();     //右侧推送
			
 
				                         }}
			
 
				                     >
			
 
				+                    
			
 
				                         <div className={styles.searchResultT}>
			
 
				                             <img style={{"position":"absolute","top":"8px","right":"8px"}} src={date1} alt="" onClick={handleShowDate}/>
			
 
				                             <p style={{position:"absolute",right:"38px",top:"4px",lineHeight:"28px"}}>
			
--- a/src/components/AddInspect/index.less
+++ b/src/components/AddInspect/index.less
@@ -118,6 +118,7 @@
 
				     margin-bottom: 5px;
			
 
				     border-top: 1px solid #EAEDF1;
			
 
				     overflow: hidden;
			
 
				+    box-sizing: border-box;
			
 
				 }
			
 
				 .itemPart {
			
 
				     height: 28px;
			
--- a/src/components/Advice/Textarea/index.jsx
+++ b/src/components/Advice/Textarea/index.jsx
@@ -31,8 +31,12 @@ class Textarea extends Component {
 
				   }
			
 
				   componentWillReceiveProps(next){
			
 
				     const isRead = this.props.isRead;
			
 
				-    if(next.isRead != isRead && next.value!=this.props.value){      //value对比解决复诊不显示bug
			
 
				-      next.value ? this.$dom.current.innerText = next.value :  ''
			
 
				+    // if(next.isRead != isRead && next.value!=this.props.value){      //value对比解决复诊不显示bug
			
 
				+    //   next.value ? this.$dom.current.innerText = next.value :  this.$dom.current.innerText = next.value 
			
 
				+    //   // this.$dom.current.innerText?(this.$dom.current.innerText = next.value||''):(this.$dom.current.innerHTML = next.value||'');
			
 
				+    // }
			
 
				+    if(next.isRead != isRead && next.value || next.isRead != isRead && next.value!=this.props.value){      //value对比解决复诊不显示bug
			
 
				+      next.value ? this.$dom.current.innerText = next.value :  this.$dom.current.innerText = '' 
			
 
				       // this.$dom.current.innerText?(this.$dom.current.innerText = next.value||''):(this.$dom.current.innerHTML = next.value||'');
			
 
				     }
			
 
				   }
			
@@ -40,6 +44,7 @@ class Textarea extends Component {
 
				     const {value} = this.props;
			
 
				     if(value && value.trim()){
			
 
				       this.$dom.current.innerText = value
			
 
				+      // this.$dom.current.focus()
			
 
				       // this.$dom.current.innerText ? (this.$dom.current.innerText = value) : (this.$dom.current.innerHTML = value)
			
 
				     //   this.$dom.current.nextSibling.innerText?(this.$dom.current.nextSibling.innerText = ''):(this.$dom.current.nextSibling.innerHTML = '')
			
 
				     }
			
--- a/src/components/Advice/index.jsx
+++ b/src/components/Advice/index.jsx
@@ -60,7 +60,6 @@ class Advice extends Component{
 
				   componentDidMount(){
			
 
				   //   this.$dom.current.nextSibling.innerText?(this.$dom.current.nextSibling.innerText = ''):(this.$dom.current.nextSibling.innerHTML = '')
			
 
				   // const {advice} = this.props.pushMessage.advice
			
 
				-  // console.log('adviceInput', this.props.pushMessage)
			
 
				   
			
 
				 }
			
 
				 
			
@@ -101,8 +100,9 @@ class Advice extends Component{
 
				           {scheme}
			
 
				         </div>}
			
 
				         <div className={style['billing']} > 
			
 
				-            {!advice.adviceInput && <Textarea value='' isRead={isRead} handleChangeAssistValue={this.handleAdviceInput} ></Textarea>}
			
 
				-            {advice.adviceInput && <Textarea value={advice.adviceInput} isRead={isRead} handleChangeAssistValue={this.handleAdviceInput} ></Textarea>}
			
 
				+            {/* {!advice.adviceInput && <Textarea value='' isRead={isRead} handleChangeAssistValue={this.handleAdviceInput} ></Textarea>}
			
 
				+            {advice.adviceInput && <Textarea value={advice.adviceInput} isRead={isRead} handleChangeAssistValue={this.handleAdviceInput} ></Textarea>} */}
			
 
				+            <Textarea value={advice.adviceInput} isRead={isRead} handleChangeAssistValue={this.handleAdviceInput} ></Textarea>
			
 
				         </div>
			
 
				       </ItemBox>
			
 
				     </div>
			
--- a/src/components/AssistCheck/index.jsx
+++ b/src/components/AssistCheck/index.jsx
@@ -14,7 +14,7 @@ class AssistCheck extends React.Component {
 
				         return (
			
 
				             <div className={styles.wrapper}>
			
 
				                 <div className={styles.top}>
			
 
				-                    <span>辅检结果数据</span>
			
 
				+                    <span id="assistResultData">辅检结果数据</span>
			
 
				                     {/* <button>导入化验结果</button> */}
			
 
				                 </div>
			
 
				                 <ItemBox 
			
--- a/src/components/CheckBody/index.jsx
+++ b/src/components/CheckBody/index.jsx
@@ -31,15 +31,25 @@ class CheckBody extends Component{
 
				   }
			
 
				   getLabels(){
			
 
				     const {data,showArr,saveText,selecteds} = this.props;
			
 
				-    let arr = [],list=[];
			
 
				-    const {boxMark,showAll} = this.state;
			
 
				-    const showData = showAll?[...data]:[...data].splice(0,config.showCheckNum*2+1);
			
 
				+    let arr = [],list=[];//console.log(data,saveText)
			
 
				+    const {boxMark,showAll} = this.state;//console.log(data)
			
 
				+    const moreNum =data.length-[...data].reverse().findIndex((it)=>it.showInCheck)-1;//被隐藏的位置
			
 
				+    //console.log(moreNum,this.props.defaultShowAll,showAll);
			
 
				+    const moreText = filterDataArr([...saveText].splice(moreNum));      //被收起的标签中是否有有值得，有则不能再收起showMoreBtn?more:''
			
 
				+    const more = this.props.defaultShowAll||showAll?<span className={style['more']} onClick={this.showHide}>收起<img src={hideImg} /></span>:<span className={style['more']} onClick={this.showHide}>展开<img src={showImg} /></span>;
			
 
				+    const showMoreBtn = data.length>moreNum&&!moreText;
			
 
				+    let showArray = data.filter((it)=>{
			
 
				+      if(it.showInCheck)
			
 
				+        return it;
			
 
				+    });
			
 
				+    const showData = moreText||this.props.defaultShowAll||showAll?[...data]:showArray;//[...data].splice(0,config.showCheckNum*2+1);
			
 
				     if(showData){
			
 
				       list = showData;
			
 
				       arr = list.map((it,i)=>{
			
 
				         return chooseType({item:it,boxMark,i,showArr,saveText,selecteds});
			
 
				       });
			
 
				     }
			
 
				+    showMoreBtn&&arr.push(more);      //是否显示收起展开按钮
			
 
				     return arr;
			
 
				   }
			
 
				   handleClick(e){//让搜索框跟随鼠标点击移动
			
@@ -89,6 +99,14 @@ class CheckBody extends Component{
 
				     //有主诉时且本身无数据，第一次点击获取数据，(不论获取成功与否)再点击不获取（直到刷新成空白页或清空）
			
 
				     if(hasMain&&isEmpty!=false){
			
 
				       this.props.getInit();
			
 
				+      //隐藏区域有默认选中项，默认全部展开-有延迟，弃用
			
 
				+      /*const that = this;
			
 
				+      setTimeout(function(){
			
 
				+        that.props.showAll&&that.setState({
			
 
				+          showAll:true
			
 
				+        });
			
 
				+      },900)*/
			
 
				+
			
 
				     }
			
 
				   }
			
 
				   showHide(){
			
@@ -105,15 +123,11 @@ class CheckBody extends Component{
 
				   }
			
 
				   render(){
			
 
				     const {searchData,totalHide,data,boxLeft,boxTop,saveText} = this.props;
			
 
				-    const {showAll} = this.state;
			
 
				-    const moreNum =config.showCheckNum*2+1;
			
 
				-    const moreText = filterDataArr([...saveText].splice(moreNum));
			
 
				-    const more = showAll?<span className={style['more']} onClick={this.showHide}>收起<img src={hideImg} /></span>:<span className={style['more']} onClick={this.showHide}>展开<img src={showImg} /></span>;
			
 
				-    const showMoreBtn = data.length>moreNum&&!moreText;
			
 
				+
			
 
				     return  <div className={style['container']}>
			
 
				       <ItemBox title='查体' handleClick={this.handleClick}>
			
 
				         {this.getLabels()}
			
 
				-        {showMoreBtn?more:''}
			
 
				+        {/*{showMoreBtn?more:''}*/}
			
 
				         {searchData && searchData.length>0?<SearchDrop data={searchData} show={!totalHide} left={boxLeft} top={boxTop} onSelect={this.handleSearchSelect}></SearchDrop>:''}
			
 
				       </ItemBox>
			
 
				     </div>
			
--- a/src/components/CopyRight/index.jsx
+++ b/src/components/CopyRight/index.jsx
@@ -59,7 +59,7 @@ class CopyRight extends Component {
 
				   render() {
			
 
				     const { number, date, content, copyVisible, disVisible, disContent, hasNewVersion } = this.props.copyRight;
			
 
				     const { showCopyModal, closeCopyModal, showDisclatmerModal, closeDisclatmerModal } = this;
			
 
				-    const copyContent = content.map(item => {
			
 
				+    const copyContent = content&&content.map(item => {
			
 
				       return (
			
 
				         <div className={style['message']}>
			
 
				           {item.title}
			
--- a/src/components/Diagnosis/index.jsx
+++ b/src/components/Diagnosis/index.jsx
@@ -41,7 +41,7 @@ class Diagnosis extends Component {
 
				     render() {
			
 
				         
			
 
				         
			
 
				-        return (<div>
			
 
				+        return (<div id="diagnosisResult">
			
 
				             <ItemBox  id="diagnosis" title='诊断'  boxHeight='auto' titleTop='22px' marginTop='9px' backgroundColor='#EAF7FD'>
			
 
				                 <DiagnosticList></DiagnosticList>
			
 
				                 <div style={{marginLeft:'10px', position:'relative'}}>
			
--- a/src/components/DiagnosticItem/index.jsx
+++ b/src/components/DiagnosticItem/index.jsx
@@ -54,17 +54,18 @@ class DiagnosticItem extends Component{
 
				         //         visible: false,
			
 
				         //     },()=>{
			
 
				                 const { diagnosticList, addDiagnostic, clearInput, hideSearch } = this.props;
			
 
				-                for (let i = 0; i < diagnosticList.length; i++) {
			
 
				-                    if(diagnosticList[i].id === item.id && diagnosticList[i].name === item.name) {
			
 
				-                        Notify.info('该诊断已存在');
			
 
				-                        return
			
 
				-                    }
			
 
				-                }
			
 
				+                // for (let i = 0; i < diagnosticList.length; i++) {
			
 
				+                //     if(diagnosticList[i].id === item.id && diagnosticList[i].name === item.name) {
			
 
				+                //         Notify.info('该诊断已存在');
			
 
				+                //         return
			
 
				+                //     }
			
 
				+                // }
			
 
				                 addDiagnostic&&addDiagnostic(item);
			
 
				                 clearInput&&clearInput();
			
 
				                 hideSearch&&hideSearch()
			
 
				         //     })
			
 
				         // }, 0)
			
 
				+        document.getElementById("diagnosisResult").scrollIntoView(true)
			
 
				     }
			
 
				 
			
 
				     render(){
			
--- a/src/components/DiagnosticList/index.jsx
+++ b/src/components/DiagnosticList/index.jsx
@@ -63,7 +63,7 @@ class DiagnosticList extends Component {
 
				         })
			
 
				     }
			
 
				     showTreat(item, index) {
			
 
				-        item.treatIndex = index
			
 
				+        // item.treatIndex = index
			
 
				         const  { showTreat, getTreatResult } = this.props;
			
 
				         getTreatResult && getTreatResult(item);
			
 
				         showTreat && showTreat();
			
@@ -84,7 +84,7 @@ class DiagnosticList extends Component {
 
				         return(
			
 
				                 <div className={style['diaglist-wrap']}>
			
 
				                     {list && (list.length > 0) && list.map((item, index) => {
			
 
				-                        const hasTreat = item.treat && (item.treat.commonTreatment || item.treat.surgeryTreatment || item.treat.treatment.length>0)
			
 
				+                        const hasTreat = item.treat && (item.treat.commonTreatment.content || item.treat.surgeryTreatment.content || item.treat.treatment.length>0)
			
 
				                         return (<div draggable={true} className={style['diag-box'] + ' clearfix'}  key={item.id} >
			
 
				                                     {index === 0 ? '' : <span className={style['diag-up']} onClick={() => {this.upDiagnostic(index)}}><img className={style["diag-up"]} src={diagUp}/></span>}
			
 
				                                     {list.length === 1 ? '' : index !== 0 ? '' : <span onClick={() => {this.downDiagnostic(index)}} className={style['diag-down']}><img className={style["diag-down"]} src={diagDown}/></span>}
			
@@ -92,7 +92,8 @@ class DiagnosticList extends Component {
 
				                                     <span className={style['diag-name']} onClick={()=>{this.handleClickDiag(item)}}>{item.name}<span></span></span> 
			
 
				                                     {item.type === 1 ? <span className={style['diag-first']}>初诊</span> :<span className={style['diag-second']}> 复诊</span>}
			
 
				                                     <span className={style['treat']}
			
 
				-                                          style ={{ color: hasTreat ?'' : 'gray', border: hasTreat ?'1px solid #3B9ED0' : '1px solid gray'}}
			
 
				+                                        //   style ={{ color: hasTreat ?'' : 'gray', border: hasTreat ?'1px solid #3B9ED0' : '1px solid gray', cursor: hasTreat ? '' : 'text'}}
			
 
				+                                          style ={hasTreat ? '' : { color: 'gray', border: '1px solid gray', cursor: 'auto'}}
			
 
				                                           onClick={() =>{hasTreat && this.showTreat(item, index)}}>
			
 
				                                           治疗方案
			
 
				                                     </span>
			
--- a/src/components/DiagnosticList/index.less
+++ b/src/components/DiagnosticList/index.less
@@ -101,4 +101,5 @@
 
				 .diag-up, .diag-down, .diag-del {
			
 
				     width: 20px;
			
 
				     margin-bottom: 4px;
			
 
				+    cursor: pointer;
			
 
				 }
			
--- a/src/components/Inspect/index.jsx
+++ b/src/components/Inspect/index.jsx
@@ -6,8 +6,8 @@ import { getExcelList } from '@store/actions/inspect';
 
				 import Notify from '@commonComp/Notify';
			
 
				 import store from '@store';
			
 
				 import $ from 'jquery';
			
 
				-import { host } from '@utils/config.js';
			
 
				-import {isIE} from '@utils/tools.js';
			
 
				+import { host,prefix } from '@utils/config.js';
			
 
				+import {isIE,getUrlArgObject} from '@utils/tools.js';
			
 
				 
			
 
				 
			
 
				 (function ($) {
			
@@ -27,9 +27,9 @@ import {isIE} from '@utils/tools.js';
 
				 import "./dists/FileAPI.js";
			
 
				 
			
 
				 const isLocal = window.location.hostname.indexOf('localhost')!=-1;
			
 
				-const qhost = isLocal?host:'';
			
 
				+const qhost = isLocal?host+prefix:prefix;
			
 
				 const api = {
			
 
				-    upload: qhost+'/api/icss/lisExcelRes/lisExcelAnalysis'
			
 
				+    upload: qhost+'/lisExcelRes/lisExcelAnalysis'
			
 
				 };
			
 
				 
			
 
				 class Inspect extends React.Component {
			
@@ -78,13 +78,19 @@ class Inspect extends React.Component {
 
				             },
			
 
				             function (files, rejected){
			
 
				                 if( files.length ){
			
 
				-                    console.log(files[0])
			
 
				+                    //console.log(files[0])
			
 
				+                  const securityCode = getUrlArgObject("code");
			
 
				+                  const appKeyId = getUrlArgObject("appI");
			
 
				+                  const appKeySecret = getUrlArgObject("appS");
			
 
				                     FileAPI.upload({
			
 
				                         // url: '/api/icss/lisExcelRes/lisExcelAnalysis',
			
 
				                         url: api.upload,
			
 
				                         data:{ hospitalCode:baseData == '{}'? '' : baseData.hospitalCode },
			
 
				                         files: { uploadfile: files[0] },
			
 
				                         headers:{
			
 
				+                          appKeyId:appKeyId,
			
 
				+                          appKeySecret:appKeySecret,
			
 
				+                          securityCode:securityCode
			
 
				                             // 'Content-Type':'Content-Type: multipart/form-data'
			
 
				                             // 'Content-Type':'application/json;charset=UTF-8'
			
 
				                             // 'Content-type': "text/plain"
			
@@ -97,7 +103,7 @@ class Inspect extends React.Component {
 
				                                 let message = res.data.messages;
			
 
				                                 store.dispatch(getExcelList(res.data));
			
 
				                                 fetchPushInfos&&fetchPushInfos();
			
 
				-                                if (message.length != 0) {
			
 
				+                                if (message&&message.length != 0) {
			
 
				                                     that.setState({
			
 
				                                         visible:true,
			
 
				                                         dom:message,
			
@@ -146,9 +152,8 @@ class Inspect extends React.Component {
 
				         return (
			
 
				             <div className={styles.wrapper} >
			
 
				                 {/* 导入功能插件，ie8/9权限问题暂未解决，先隐藏 */}
			
 
				-
			
 
				                 <div className={styles.top}>
			
 
				-                    <span>化验结果数据</span>
			
 
				+                    <span id="inspectResultData">化验结果数据</span>
			
 
				                     <div className={this.getStyle()} onClick={ieVersion&&ieVersion<=9?null:this.handleImportExcel}>
			
 
				                        {/* <button disabled={ieVersion&&ieVersion>9?true:false}>导入化验结果</button>*/}
			
 
				                         <div className={styles.pushButton}>导入化验结果</div>
			
--- a/src/components/Inspect/index.less
+++ b/src/components/Inspect/index.less
@@ -40,6 +40,7 @@
 
				         line-height: 28px;
			
 
				         border-radius: 5px;
			
 
				         color: @template-color;
			
 
				+        cursor: pointer;
			
 
				     }
			
 
				 }
			
 
				 .title {
			
--- a/src/components/MultSpread/index.jsx
+++ b/src/components/MultSpread/index.jsx
@@ -2,7 +2,9 @@ import React,{Component} from 'react';
 
				 import classNames from 'classnames';
			
 
				 import RadioDrop from "@containers/RadioDrop";
			
 
				 import NumberDrop from "@containers/NumberDrop";
			
 
				+import RadioInpDrop from "@containers/RadioInpDrop";
			
 
				 import InlineTag from '@containers/InlineTag';
			
 
				+import Multiple from '@containers/Multiple';
			
 
				 import addIcon from '@images/addItem.png';
			
 
				 import style from "./index.less";
			
 
				 import tools from '@utils/tools';
			
@@ -39,7 +41,7 @@ class MultSpread extends Component{
 
				     return classNames(isSelected,hasAdd);
			
 
				   }
			
 
				   getLabels(){
			
 
				-    const {data,ikey,showArr,copyId} = this.props;
			
 
				+    const {data,ikey,showArr,copyId,selecteds,boxMark} = this.props;
			
 
				     const {editable}= this.state;
			
 
				     let show = false;
			
 
				     let inx = '';
			
@@ -52,6 +54,7 @@ class MultSpread extends Component{
 
				         case +it.controlType===1:
			
 
				           const list = it.questionDetailList&&it.questionDetailList.length>0?it.questionDetailList:it.questionMapping;
			
 
				           return <RadioDrop data={list}
			
 
				+                            boxMark={boxMark}
			
 
				                             prefix={it.labelPrefix}
			
 
				                             suffix={it.labelSuffix}
			
 
				                             placeholder={it.name}
			
@@ -61,6 +64,21 @@ class MultSpread extends Component{
 
				                             id={it.id}
			
 
				                             patId = {copyId}
			
 
				                             hideTag={true}></RadioDrop>;
			
 
				+        case +it.controlType===2:
			
 
				+          const dataList = it.questionDetailList&&it.questionDetailList.length>0?it.questionDetailList:it.questionMapping;
			
 
				+          return <Multiple data={dataList}
			
 
				+                           ikey={inx}
			
 
				+                           placeholder={it.name}
			
 
				+                           value={it.value}
			
 
				+                           copyType={it.copyType}
			
 
				+                           selecteds={selecteds ?selecteds[i]:[]}
			
 
				+                           show={showArr&&showArr[inx]}
			
 
				+                           order={it.textGenerate}
			
 
				+                           type={boxMark}
			
 
				+                           textPrefix={it.labelPrefix}
			
 
				+                           textSuffix={it.labelSuffix}
			
 
				+                           id={it.id}
			
 
				+                           hideTag={true}></Multiple>;
			
 
				         case +it.controlType===5://带单位数字键盘
			
 
				         return <NumberUnitDrop prefix={it.labelPrefix}
			
 
				                                suffix={it.labelSuffix}
			
@@ -83,6 +101,8 @@ class MultSpread extends Component{
 
				           return <NumberDrop prefix={it.labelPrefix}
			
 
				                              suffix={it.labelSuffix}
			
 
				                              placeholder={it.name}
			
 
				+                             min={it.minValue}
			
 
				+                             max={it.maxValue}
			
 
				                              show={show}
			
 
				                              allClick={false}
			
 
				                              ikey={inx}
			
@@ -90,6 +110,16 @@ class MultSpread extends Component{
 
				                              patId = {copyId}
			
 
				                              value={it.value}
			
 
				                              hideTag={true}></NumberDrop>;
			
 
				+        case +it.controlType===11:
			
 
				+          return <RadioInpDrop data={it.questionDetailList}
			
 
				+                             vals={it.vals}
			
 
				+                             placeholder={it.name}
			
 
				+                             show={showArr&&showArr[inx]}
			
 
				+                             value = {it.value}
			
 
				+                             boxMark={boxMark}
			
 
				+                             id={it.id}
			
 
				+                             ikey={inx}
			
 
				+                             hideTag={true}></RadioInpDrop>;
			
 
				         default:
			
 
				           return it.name;
			
 
				       }
			
--- a/src/components/Multiple/index.jsx
+++ b/src/components/Multiple/index.jsx
@@ -40,15 +40,16 @@ class Multiple extends react.Component{
 
				   }
			
 
				 
			
 
				   getClass(){
			
 
				-    if(this.props.show){
			
 
				+    const {show,value,hideTag} = this.props;
			
 
				+    if(show){
			
 
				       $(this.$div.current).addClass(style['borderd']);
			
 
				     }else{
			
 
				       $(this.$div.current).removeClass(style['borderd']);
			
 
				     }
			
 
				-    if(this.props.value){
			
 
				-      return style['selected-tag'];
			
 
				+    if(value){
			
 
				+      return hideTag?style['hide-tag']:style['selected-tag'];
			
 
				     }
			
 
				-    return style['tag'];
			
 
				+    return hideTag?'':style['tag'];
			
 
				   }
			
 
				 
			
 
				   getListClass(){
			
--- a/src/components/Multiple/index.less
+++ b/src/components/Multiple/index.less
@@ -16,6 +16,11 @@
 
				   border-bottom: 1px @border-color solid;
			
 
				   line-height: 22px;
			
 
				 }
			
 
				+.hide-tag{
			
 
				+  padding: 0;
			
 
				+  color: @text-color;
			
 
				+  line-height: 22px;
			
 
				+}
			
 
				 .list{
			
 
				   .pop;
			
 
				   padding: 0 0 10px;
			
--- a/src/components/NumberDrop/index.jsx
+++ b/src/components/NumberDrop/index.jsx
@@ -1,6 +1,6 @@
 
				 import React,{Component} from 'react';
			
 
				 import className from 'classnames';
			
 
				-import {NumberPan} from '@commonComp';
			
 
				+import {NumberPan,Notify} from '@commonComp';
			
 
				 import style from './index.less';
			
 
				 import $ from "jquery";
			
 
				 import {handleEnter,getPageCoordinate} from '@utils/tools.js';
			
@@ -20,6 +20,7 @@ class NumberDrop extends Component{
 
				     this.state={
			
 
				       editable:false,      //标签是否可输入
			
 
				       timer:null,
			
 
				+      sltTimer:null,
			
 
				       hasSelect:false,       //是否点过下拉键盘
			
 
				       boxLeft:0,
			
 
				       boxTop:0,
			
@@ -39,13 +40,49 @@ class NumberDrop extends Component{
 
				     this.handleBlur = this.handleBlur.bind(this);
			
 
				     this.changeToEdit = this.changeToEdit.bind(this);
			
 
				     this.handleKeyDowm = this.handleKeyDowm.bind(this);
			
 
				+    this.beyondArea = this.beyondArea.bind(this);
			
 
				   }
			
 
				   select(text){        //选中键盘上数字事件
			
 
				+    let timer = null;
			
 
				+    clearTimeout(this.state.sltTimer);
			
 
				+    const {handleSelect,ikey,suffix,prefix,mainSaveText,min,max} = this.props;
			
 
				+    const needCompare=min!=undefined&&max!=undefined;
			
 
				+    if(!text){
			
 
				+      this.setState({
			
 
				+        placeholder:this.props.placeholder
			
 
				+      });
			
 
				+    }else{
			
 
				+      //console.log(text,isNaN(+text),max<+text)
			
 
				+      if(needCompare){
			
 
				+        if(!isNaN(+text)&&max<+text){     //数值过大
			
 
				+          this.beyondArea();
			
 
				+          return;
			
 
				+        }
			
 
				+        const that = this;
			
 
				+        timer = setTimeout(function(){
			
 
				+          clearTimeout(that.state.sltTimer);
			
 
				+          if(!that.props.show&&!isNaN(+text)&&min>+text){
			
 
				+            that.beyondArea();
			
 
				+            return;
			
 
				+          }
			
 
				+        },1500);
			
 
				+      }
			
 
				+      this.setState({
			
 
				+        hasSelect:true,
			
 
				+        sltTimer:timer
			
 
				+      });
			
 
				+    }
			
 
				+
			
 
				+    handleSelect&&handleSelect({ikey,text,suffix,prefix,mainSaveText});
			
 
				+  }
			
 
				+  beyondArea(){
			
 
				     const {handleSelect,ikey,suffix,prefix,mainSaveText} = this.props;
			
 
				+    Notify.info("输入数值不在合理值范围内，请重新输入！");
			
 
				+    handleSelect&&handleSelect({ikey,text:'',suffix,prefix,mainSaveText});
			
 
				     this.setState({
			
 
				-      hasSelect:true
			
 
				+      placeholder:this.props.placeholder,
			
 
				+      hasSelect:false
			
 
				     });
			
 
				-    handleSelect&&handleSelect({ikey,text,suffix,prefix,mainSaveText});
			
 
				   }
			
 
				   handleNumFocus(e){       //数字框可编辑状态下聚集事件，处理是否显示下拉等
			
 
				     const {placeholder} = this.state;
			
@@ -60,7 +97,6 @@ class NumberDrop extends Component{
 
				   }
			
 
				   handleNumClick(e){     //数字框不可编辑的状态时点击事件，点击将数字框变为可输入且下拉不再显示直到失焦后再次聚集
			
 
				     const {show,handleShow,ikey,id,patId,handleHide,value} = this.props;
			
 
				-    this.$span.current.focus();
			
 
				     if(show) {
			
 
				       handleHide && handleHide();
			
 
				       return;
			
@@ -73,6 +109,11 @@ class NumberDrop extends Component{
 
				       //双击时不显示下拉
			
 
				       clearTimeout(that.state.timer);
			
 
				       const timer = setTimeout(function(){
			
 
				+        //只有弹窗关闭则点击数字键盘会清空当前数据
			
 
				+        that.$span.current.focus();
			
 
				+        that.setState({
			
 
				+          hasSelect:false
			
 
				+        });
			
 
				         handleShow&&handleShow({ikey,id:patId||id});
			
 
				       },300);
			
 
				       this.setState({
			
@@ -93,31 +134,38 @@ class NumberDrop extends Component{
 
				   }
			
 
				   numInpBlur(e){        //数字框失焦，保存值到store中
			
 
				     e.stopPropagation();
			
 
				-    const that = this;
			
 
				-    setTimeout(function(){      //第一次选中数字时placeholder闪一下优化
			
 
				-      if(!that.state.hasSelect&&!e.target.innerText.trim()){
			
 
				-        that.setState({
			
 
				-          placeholder:that.props.placeholder
			
 
				-        });
			
 
				-      }
			
 
				-    },100);
			
 
				-
			
 
				-    if(this.props.show){      //修改清空后第一次点击键盘不触发click事件bug
			
 
				+    const {handleSelect,ikey,suffix,prefix,mainSaveText,min,max,show} = this.props;
			
 
				+    if(show){      //修改清空后第一次点击键盘不触发click事件bug
			
 
				       return;
			
 
				     }
			
 
				-    this.setState({
			
 
				+    //输入超出合理范围提示且清空
			
 
				+    const txt = e.target.innerText.replace(/^\s*/,'');
			
 
				+    if(max!=undefined&&!isNaN(+txt)&&(min>+txt||max<+txt)){
			
 
				+      this.beyondArea();
			
 
				+      return;
			
 
				+    }
			
 
				+    //输入为空时显示placeholder
			
 
				+    if(!e.target.innerText.trim()){
			
 
				+      this.setState({
			
 
				+        placeholder:this.props.placeholder
			
 
				+      });
			
 
				+    }
			
 
				+
			
 
				+    /*this.setState({
			
 
				       hasSelect:false
			
 
				-    });
			
 
				+    });*/
			
 
				     const val = e.target.innerText.replace(/^\s*/,'');
			
 
				-    const {handleSelect,ikey,suffix,prefix,mainSaveText} = this.props;
			
 
				     const {placeholder} = this.state;
			
 
				-    const text = val===placeholder?'':val;
			
 
				+    let text = val===placeholder?'':val.replace(/[\u4e00-\u9fa5]/g,'');
			
 
				     e.target.innerText = '';      //避免出现重复输入值
			
 
				     handleSelect&&handleSelect({ikey,text,suffix,prefix,mainSaveText});
			
 
				   }
			
 
				   handleSpanInp(e){   //数字框输入事件
			
 
				     e.stopPropagation();
			
 
				     const {handleHide} = this.props;
			
 
				+    /*this.setState({     //再键盘点击数字要清空
			
 
				+      hasSelect:false
			
 
				+    });*/
			
 
				     handleHide&&handleHide();
			
 
				   }
			
 
				   handleKeyDowm(e){
			
@@ -126,14 +174,15 @@ class NumberDrop extends Component{
 
				     const key = e.key;
			
 
				     const ctrlOn = e.ctrlKey;
			
 
				     const isCopyPaste = ctrlOn&&(key=='v'||key=='c');
			
 
				-    if(!/[0-9|.|～|\/]/.test(key)&&key.length==1&&!isCopyPaste){
			
 
				+    if((!/[0-9|.|～|\/]/.test(key)&&key.length==1&&!isCopyPaste)){
			
 
				       e.preventDefault();
			
 
				       return false;
			
 
				     }
			
 
				   }
			
 
				   getClasses(){         //整个标签是否有值的状态
			
 
				     const {hideTag,placeholder,value} = this.props;
			
 
				-    const val = this.$span.current&&this.$span.current.innerText.trim()||value;
			
 
				+    const $span = this.$span.current;
			
 
				+    const val = value;//$span&&$span.innerText.trim()||value;
			
 
				     const blueBorder = this.state.editable?style['blue-border']:'';
			
 
				     const isSelected = val&&val!=placeholder?style['selected']:style['container'];
			
 
				     const noTag = hideTag?style['no-tag']:'';
			
--- a/src/components/Operation/index.jsx
+++ b/src/components/Operation/index.jsx
@@ -166,7 +166,7 @@ class Operation extends Component {
 
				       return false
			
 
				     }
			
 
				     console.log(jsonStr,'文本')
			
 
				-    console.log(jsonData.chief,'结构')       //测试需要用到，不要删了
			
 
				+    console.log(jsonData,'结构')       //测试需要用到，不要删了
			
 
				     for(let i = 0;i <tmpLis.length;i++){
			
 
				       let dataStr = tmpLis[i].preview;
			
 
				       let dataJson = tmpLis[i].dataJson;
			
@@ -346,4 +346,4 @@ class Operation extends Component {
 
				   }
			
 
				 }
			
 
				 
			
 
				-export default Operation;
			
 
				+export default Operation;
			
--- a/src/components/PreviewBody/index.jsx
+++ b/src/components/PreviewBody/index.jsx
@@ -3,6 +3,7 @@ import style from "./index.less";
 
				 import { normalVal, filterDataArr, filterOtherDataArr,timestampToTime } from '@utils/tools';
			
 
				 import Notify from '@commonComp/Notify';
			
 
				 import $ from "jquery";
			
 
				+import { relative } from "path";
			
 
				 
			
 
				 (function ($) {
			
 
				   var opt;
			
@@ -235,9 +236,12 @@ class PreviewBody extends Component {
 
				               }
			
 
				               {
			
 
				                 dataJson.lis.labelList && dataJson.lis.labelList.map((item, idx) => {
			
 
				-                  if (item.show) {
			
 
				+                  // if (item.show) {
			
 
				                     return <table style={{ margin: '8px 0', width: '100%' }}>
			
 
				-                      <tr style={{ fontSize: '14px', lineHeight: '1.5' }}><td><span style={{ borderBottom: '1px solid #666666' }}>{item.name}</span></td></tr>
			
 
				+                      {
			
 
				+                        item.show?<tr style={{ fontSize: '14px', lineHeight: '1.5' }}><td><span style={{ borderBottom: '1px solid #666666' }}> {item.name} </span></td></tr>:
			
 
				+                        <tr style={{ fontSize: '14px', lineHeight: '1.5' }}><td><span style={{ position:'relative',left:'-10px' }}>「{item.name}」</span></td></tr>
			
 
				+                      }
			
 
				                       {
			
 
				                         item.details.map((val) => {
			
 
				                           if (val.value && val.value != '') {
			
@@ -253,7 +257,7 @@ class PreviewBody extends Component {
 
				                         })
			
 
				                       }
			
 
				                     </table>
			
 
				-                  }
			
 
				+                  // }
			
 
				                 })
			
 
				               }
			
 
				             </td>
			
--- a/src/components/PushItems/index.jsx
+++ b/src/components/PushItems/index.jsx
@@ -78,12 +78,17 @@ class PushItems extends Component {
 
				       value:''
			
 
				     }
			
 
				     if(checkedAssay.length > 0){
			
 
				-      let assayArr = []
			
 
				+      let assayArr = [],tmpDetail=[]
			
 
				       for(let i = 0;i < checkedAssay.length;i++){
			
 
				         let tmpObj = JSON.parse(JSON.stringify(obj));
			
 
				+        if (checkedAssay[i].controlType == 0) {
			
 
				+          tmpDetail = checkedAssay[i].questionMapping
			
 
				+        }else if(checkedAssay[i].controlType == 1 || checkedAssay[i].controlType == 6){
			
 
				+          tmpDetail.push(checkedAssay[i])
			
 
				+        }
			
 
				         tmpObj.questionId = checkedAssay[i].id
			
 
				         tmpObj.name = checkedAssay[i].name
			
 
				-        tmpObj.details = checkedAssay[i].questionMapping
			
 
				+        tmpObj.details = tmpDetail
			
 
				         assayArr.push(tmpObj)
			
 
				       }
			
 
				       store.dispatch(addLabel(assayArr))
			
@@ -98,6 +103,15 @@ class PushItems extends Component {
 
				       }
			
 
				       store.dispatch(addAssistLabel(checkArr))
			
 
				     }
			
 
				+    if(checkedAssay.length > 0){
			
 
				+      document.getElementById("inspectResultData").scrollIntoView(true)
			
 
				+    }else{
			
 
				+      if(checkedCheck.length > 0){
			
 
				+        document.getElementById("assistResultData").scrollIntoView(true)
			
 
				+      }else{
			
 
				+        return;
			
 
				+      }
			
 
				+    }
			
 
				   }
			
 
				 
			
 
				   changeAssay(item) {
			
@@ -156,7 +170,7 @@ class PushItems extends Component {
 
				       assayNum = assayNum + item.name.length + 2;
			
 
				       if (assayNum > 28) {
			
 
				         assayNum2 = assayNum2 + item.name.length + 2; 
			
 
				-        if(assayNum2 > 23) {
			
 
				+        if(assayNum2 > 21) {
			
 
				           return;
			
 
				         } else {
			
 
				           return (
			
@@ -208,7 +222,7 @@ class PushItems extends Component {
 
				       checkNum = checkNum + item.name.length + 2;
			
 
				       if (checkNum > 28) {
			
 
				         checkNum2 = checkNum2 + item.name.length + 2; 
			
 
				-        if(checkNum2 > 23) {
			
 
				+        if(checkNum2 > 21) {
			
 
				           return;
			
 
				         }else {
			
 
				           return (
			
@@ -330,7 +344,7 @@ class PushItems extends Component {
 
				                           : moreAssay
			
 
				                           ? assays
			
 
				                           : assayHide}
			
 
				-                        {assayNum2 > 23 ? (
			
 
				+                        {assayNum2 > 21 ? (
			
 
				                           <span
			
 
				                             style={
			
 
				                               moreAssay
			
@@ -368,7 +382,7 @@ class PushItems extends Component {
 
				                           : moreCheck
			
 
				                           ? checks
			
 
				                           : checkHide}
			
 
				-                        {checkNum2 > 23 ? (
			
 
				+                        {checkNum2 > 21 ? (
			
 
				                           <span
			
 
				                             style={
			
 
				                               moreCheck
			
@@ -436,7 +450,7 @@ class PushItems extends Component {
 
				                               />
			
 
				                               {item.isReason === 1 && (
			
 
				                                 <div className={style["warn"]}>
			
 
				-                                  {tipsDiscalimer.data.data[0].description}
			
 
				+                                  {tipsDiscalimer.data.data[0]&&tipsDiscalimer.data.data[0].description}
			
 
				                                 </div>
			
 
				                               )}
			
 
				                             </div>
			
@@ -451,7 +465,7 @@ class PushItems extends Component {
 
				             </div>
			
 
				           </div>
			
 
				         </div>
			
 
				-        {tipsDiscalimer.data && <div className={style['disTips']} dangerouslySetInnerHTML={{__html: tipsDiscalimer.data.data[1].description}}></div>}
			
 
				+        {tipsDiscalimer.data && <div className={style['disTips']} dangerouslySetInnerHTML={{__html: tipsDiscalimer.data.data[1]&&tipsDiscalimer.data.data[1].description}}></div>}
			
 
				         {showTipsDetails && <DetailsModal  
			
 
				             showTipsDetails = {showTipsDetails}
			
 
				             hideTips = {this.hideTips}
			
--- a/src/components/RadioInpDrop/index.jsx
+++ b/src/components/RadioInpDrop/index.jsx
@@ -55,7 +55,7 @@ class RadioInpDrop extends Component{
 
				     return style['tag'];
			
 
				   }
			
 
				   handleSelect(item){
			
 
				-    const {handleSelect,ikey,mainSaveText,value,placeholder} = this.props;
			
 
				+    const {handleSelect,ikey,value,placeholder} = this.props;
			
 
				     let vals = {}, inx = 0;
			
 
				     if(!item){
			
 
				       handleSelect&&handleSelect({ikey});  //清空
			
@@ -75,7 +75,7 @@ class RadioInpDrop extends Component{
 
				     this.setState({
			
 
				       texts:vals
			
 
				     });
			
 
				-    handleSelect&&handleSelect({ikey,id:item.id,values:vals,mainSaveText});
			
 
				+    handleSelect&&handleSelect({ikey,id:item.id,values:vals});
			
 
				   }
			
 
				   handleShow(e){
			
 
				     //e.stopPropagation();
			
--- a/src/components/SpreadDrop/index.jsx
+++ b/src/components/SpreadDrop/index.jsx
@@ -228,7 +228,7 @@ class SpreadDrop extends Component{
 
				       const tIndex= exists.findIndex((it)=>it.questionId===item.questionId);
			
 
				       const bIndex= withs.findIndex((it)=>it.questionId===item.questionId);
			
 
				       if(tIndex!=-1){
			
 
				-        exists.splice(tIndex,1,item);
			
 
				+        exists.splice(tIndex,1,Object.assign({},item,{name}));    //修改单选列连接字符不显示bug
			
 
				         this.setState({
			
 
				           exists,
			
 
				         })
			
--- a/src/components/Treat/DrugTreat/index.jsx
+++ b/src/components/Treat/DrugTreat/index.jsx
@@ -78,7 +78,7 @@ class DrugTreat extends Component {
 
				     }
			
 
				     showTreatDesc() {
			
 
				         $('#treatDescBox').css({'display': 'block'});
			
 
				-        $('#treatWrapper').animate({'margin-left': '-470px'}, 300);
			
 
				+        $('#treatWrapper').animate({'margin-left': '-471px','left':'50%'}, 300);
			
 
				         $('#treatDescBox').animate({'width': '260px'}, 500);
			
 
				         
			
 
				     }
			
--- a/src/components/Treat/index.jsx
+++ b/src/components/Treat/index.jsx
@@ -3,6 +3,7 @@ import style from './index.less';
 
				 import GeneralTreat from './GeneralTreat/index.jsx';
			
 
				 import DrugTreat from './DrugTreat/index.jsx';
			
 
				 import TreatDesc from '@components/TreatDesc'
			
 
				+import {dragBox,windowRemoveEventHandler} from '@utils/tools'
			
 
				 import DrugInfo from '@components/TreatDesc/DrugInfo';
			
 
				 import Notify from '@commonComp/Notify'
			
 
				 import close from './img/close.png';
			
@@ -13,15 +14,23 @@ import $ from "jquery";
 
				 class Treat extends Component {
			
 
				     constructor(props){
			
 
				         super(props);
			
 
				+        this.state = {
			
 
				+          zIndex:301
			
 
				+        }
			
 
				         this.hideTreat = this.hideTreat.bind(this);
			
 
				         this.handlePrescription = this.handlePrescription.bind(this);
			
 
				         this.handleDetermine = this.handleDetermine.bind(this);
			
 
				+        this.setTreatBox = this.setTreatBox.bind(this);
			
 
				     }
			
 
				-
			
 
				+    componentDidMount(){
			
 
				+      dragBox('treatWrapper','dragTreatTitle')
			
 
				+    }
			
 
				+    
			
 
				     hideTreat() {
			
 
				         const { hideTreat,clearTreat } = this.props;
			
 
				         clearTreat && clearTreat();
			
 
				         hideTreat && hideTreat();
			
 
				+        // windowRemoveEventHandler('mousemove',handleMove,document)
			
 
				     }
			
 
				     handlePrescription() {
			
 
				         Notify.info('该功能即将上线，敬请期待。', 2000)
			
@@ -36,18 +45,22 @@ class Treat extends Component {
 
				         const {  showDrugInfo } = this.props;
			
 
				         showDrugInfo && showDrugInfo();
			
 
				     }
			
 
				-
			
 
				+    setTreatBox(idx){
			
 
				+      this.setState({
			
 
				+        zIndex:idx == 300?300 : 500
			
 
				+      })
			
 
				+    }
			
 
				     render(){
			
 
				-    
			
 
				-    
			
 
				         const { generalTreat, treatment, treatItem, surgeryTreat, selectDrug, drugInfo, treatDesc, setOtherRecommend, setDrugInfo, showDrug, showDrugInfo,hideDrugInfo, title, drugInfoList, hideDrugInfoMore} = this.props;
			
 
				         const { setDrugInfoMore } = this.props
			
 
				+        const { zIndex } = this.state
			
 
				         return(
			
 
				             <div   className={style['treat-wrapper']}>
			
 
				                 <div className={style['treat-mask']} onClick={this.hideTreat}>
			
 
				                 </div>
			
 
				-                <div id='treatWrapper' className={style['treat-box']}>
			
 
				-                    <div className={style['treat-title']}>治疗方案 ({treatItem.name})<img onClick={this.hideTreat} src={close}/></div>
			
 
				+                <div id="treatWrapper" className={style['treat-box']}  onselectstart="return false" style={{zIndex:zIndex}}>
			
 
				+                    <img className={style.close} onClick={this.hideTreat} src={close}/>
			
 
				+                    <div onMouseDown={this.setTreatBox} id="dragTreatTitle" className={style['treat-title']}>治疗方案 ({treatItem.name})</div>
			
 
				 
			
 
				                     <div className={style['treat-inner-box']}>
			
 
				                         <GeneralTreat icon={generalIcon} title='一般治疗'   generalTreat={generalTreat}></GeneralTreat>
			
@@ -75,14 +88,10 @@ class Treat extends Component {
 
				                     </TreatDesc>}
			
 
				                 </div>
			
 
				                 
			
 
				-                
			
 
				-                {showDrug && drugInfo && <DrugInfo drugInfo = {drugInfo} hideDrugInfo = {hideDrugInfo}></DrugInfo>}
			
 
				+                {showDrug && drugInfo && <DrugInfo setTreatBox={this.setTreatBox} drugInfo = {drugInfo} hideDrugInfo = {hideDrugInfo}></DrugInfo>}
			
 
				                 {/* 查询多个药品说明书 （添加数据查看药品说明书用）*/}
			
 
				                 {/* {showDrug && <DrugInfo drugInfoList = {drugInfoList} hideDrugInfoMore = {hideDrugInfoMore}></DrugInfo>} */}
			
 
				             </div>
			
 
				-                
			
 
				-            
			
 
				-        
			
 
				         )
			
 
				     }
			
 
				 }
			
--- a/src/components/Treat/index.less
+++ b/src/components/Treat/index.less
@@ -14,6 +14,12 @@
 
				     // z-index: 301;
			
 
				     z-index: 300;
			
 
				 }
			
 
				+.close {
			
 
				+  position: absolute;
			
 
				+  z-index:9999;
			
 
				+  top: 0;
			
 
				+  right: 0;
			
 
				+}
			
 
				 .treat-mask {
			
 
				     position: fixed;
			
 
				     width: 100%;
			
@@ -37,6 +43,7 @@
 
				     z-index: 301;
			
 
				     padding-top: 40px;
			
 
				     padding-bottom: 80px;
			
 
				+    box-shadow: 2px 0px 5px -2px #ccc;
			
 
				 }
			
 
				 .treat-title {
			
 
				     width: 100%;
			
@@ -47,6 +54,14 @@
 
				     line-height: 40px;
			
 
				     border-bottom: 1px solid #e0e2e4;
			
 
				     padding-left: 20px;
			
 
				+    cursor: move;
			
 
				+    moz-user-select: -moz-none;
			
 
				+    -moz-user-select: none;
			
 
				+    -o-user-select:none;
			
 
				+    -khtml-user-select:none;
			
 
				+    -webkit-user-select:none;
			
 
				+    -ms-user-select:none;
			
 
				+    user-select:none;
			
 
				     img{
			
 
				         float: right;
			
 
				         cursor: pointer;
			
--- a/src/components/TreatDesc/DrugInfo/index.jsx
+++ b/src/components/TreatDesc/DrugInfo/index.jsx
@@ -2,14 +2,20 @@ import React, { Component } from 'react';
 
				 import style from './index.less';
			
 
				 import close from './../img/close.png';
			
 
				 import $ from "jquery";
			
 
				+import {dragBox} from '@utils/tools'
			
 
				 
			
 
				 
			
 
				 class DrugInfo extends Component {
			
 
				     constructor(props) {
			
 
				         super(props);
			
 
				         this.state = {
			
 
				-            currentIndex: 0
			
 
				+            currentIndex: 0,
			
 
				+            zIndex:301
			
 
				         }
			
 
				+        this.setDragBox = this.setDragBox.bind(this)
			
 
				+    }
			
 
				+    componentDidMount(){
			
 
				+      dragBox('drugWrapper','drugTitle')
			
 
				     }
			
 
				     handleClickMenu(index, item, drugDesc) {
			
 
				         const that = this
			
@@ -40,12 +46,19 @@ class DrugInfo extends Component {
 
				             }
			
 
				         }
			
 
				     }
			
 
				-
			
 
				+    setDragBox(){
			
 
				+      const {zIndex,setTreatBox} = this.props
			
 
				+      setTreatBox(300)
			
 
				+      this.setState({
			
 
				+        zIndex:zIndex+10
			
 
				+      })
			
 
				+    }
			
 
				     render() {
			
 
				         const { drugInfo, hideDrugInfo, drugInfoList,hideDrugInfoMore } = this.props
			
 
				-        const { currentIndex } = this.state
			
 
				-        return (<div className={style['drug-info-wrapper']}>
			
 
				-                <h3 className={style['drug-title']}>{drugInfo.title}说明书  <img src={close} onClick={hideDrugInfo} className={style['close-drug-desc']}/> </h3>
			
 
				+        const { currentIndex,zIndex } = this.state
			
 
				+        return (<div className={style['drug-info-wrapper']} id="drugWrapper" style={{zIndex:zIndex}}>
			
 
				+                <img src={close} onClick={hideDrugInfo} className={style['close-drug-desc']}/>
			
 
				+                <h3 onMouseDown={this.setDragBox} id="drugTitle" className={style['drug-title']}>{drugInfo.title}说明书  </h3>
			
 
				                 { drugInfo && drugInfo.drugDesc.length > 0 && <div className={style['drug-desc-wrapper']} id='drugDesc' onScroll={this.handleScrollModal.bind(this,  drugInfo.drugDesc)}>
			
 
				                     <div className={style['drug-title1']} >{drugInfo.title}说明书</div>
			
 
				                     {drugInfo.drugDesc.map((item, index) =>{
			
@@ -55,7 +68,6 @@ class DrugInfo extends Component {
 
				                         </div>
			
 
				                     })}
			
 
				                     <div className={style['content-menu-box']}>
			
 
				-                        
			
 
				                         <div className={style['content-menu']}>
			
 
				                             {drugInfo.drugDesc.map((item, index) => {
			
 
				                                 return (<div >
			
@@ -67,18 +79,14 @@ class DrugInfo extends Component {
 
				                                     </div>
			
 
				                                 </div>)
			
 
				                             })}
			
 
				-
			
 
				                         </div>
			
 
				-                    
			
 
				                     </div>
			
 
				                 </div> }
			
 
				                 { !drugInfo || (drugInfo && drugInfo.drugDesc.length === 0) && <div className={style['drug-desc-wrapper']}>
			
 
				                     <div>
			
 
				                         该药品暂无说明
			
 
				                     </div>
			
 
				-                    
			
 
				                 </div> }
			
 
				-
			
 
				         </div>)
			
 
				 
			
 
				 
			
--- a/src/components/TreatDesc/DrugInfo/index.less
+++ b/src/components/TreatDesc/DrugInfo/index.less
@@ -9,7 +9,7 @@
 
				     background: #fff;
			
 
				     z-index: 303;
			
 
				     padding: 40px 0 60px;
			
 
				-    
			
 
				+    box-shadow: 2px 0px 5px -2px #ccc;
			
 
				 }
			
 
				 .drug-desc-wrapper {
			
 
				     height: 100%;
			
@@ -24,10 +24,20 @@
 
				     line-height: 40px;
			
 
				     padding: 0 40px;
			
 
				     border-bottom: 1px solid #979797;
			
 
				+    cursor: move;
			
 
				+    moz-user-select: -moz-none;
			
 
				+    -moz-user-select: none;
			
 
				+    -o-user-select:none;
			
 
				+    -khtml-user-select:none;
			
 
				+    -webkit-user-select:none;
			
 
				+    -ms-user-select:none;
			
 
				+    user-select:none;
			
 
				 }
			
 
				 .close-drug-desc {
			
 
				     position: absolute;
			
 
				     right: 0;
			
 
				+    top: 0;
			
 
				+    z-index: 9999;
			
 
				     width: 40px;
			
 
				 }
			
 
				 .drug-desc-item {
			
--- a/src/components/TreatDesc/img/info2.png
+++ b/src/components/TreatDesc/img/info2.png
--- a/src/components/TreatDesc/img/info3.png
+++ b/src/components/TreatDesc/img/info3.png
--- a/src/components/TreatDesc/index.jsx
+++ b/src/components/TreatDesc/index.jsx
@@ -4,29 +4,53 @@ import $ from "jquery";
 
				 import close from './img/close.png';
			
 
				 import info from './img/info.png';
			
 
				 import info1 from './img/info1.png';
			
 
				+import info2 from './img/info2.png';
			
 
				+import info3 from './img/info3.png';
			
 
				 
			
 
				 
			
 
				 class TreatDesc extends Component {
			
 
				     constructor(props){
			
 
				         super(props);
			
 
				         this.state = {
			
 
				-            currentIndex: -1
			
 
				+            currentIndex: -1,
			
 
				+            hasEnterImg: false
			
 
				         }
			
 
				         this.hideTreatDesc = this.hideTreatDesc.bind(this);
			
 
				         this.handleSelect= this.handleSelect.bind(this);
			
 
				+        this.handleMouseEnterDrug = this.handleMouseEnterDrug.bind(this)
			
 
				+        this.handleMouseLeaveDrug = this.handleMouseLeaveDrug.bind(this)
			
 
				+        this.handleMouseEnterImg = this.handleMouseEnterImg.bind(this)
			
 
				         this.handleMouseLeaveImg = this.handleMouseLeaveImg.bind(this)
			
 
				+
			
 
				     }
			
 
				 
			
 
				-    handleMouseEnterImg(index) {
			
 
				+    handleMouseEnterDrug( index, item) {
			
 
				+        // console.log('item', item)
			
 
				+        const drugNameWidth = parseInt($('#'+item.medicitionName)[0].offsetWidth)
			
 
				+        
			
 
				+        const imgLeft = drugNameWidth/2-10
			
 
				+        console.log('imgLeft', imgLeft)
			
 
				+        $('#'+item.medicitionName).find('img').css('left', imgLeft)
			
 
				+       
			
 
				         this.setState({
			
 
				             currentIndex: index,
			
 
				         })
			
 
				     }
			
 
				-    handleMouseLeaveImg() {
			
 
				+    handleMouseLeaveDrug() {
			
 
				         this.setState({
			
 
				             currentIndex: -1,
			
 
				         })
			
 
				     }
			
 
				+    handleMouseEnterImg() {
			
 
				+        this.setState({
			
 
				+            hasEnterImg: true
			
 
				+        })
			
 
				+    }
			
 
				+    handleMouseLeaveImg() {
			
 
				+        this.setState({
			
 
				+            hasEnterImg: false
			
 
				+        })
			
 
				+    }
			
 
				     handleSelect(index,ii) {
			
 
				         const { selectDrug } = this.props;
			
 
				         selectDrug && selectDrug(index,ii);
			
@@ -34,13 +58,13 @@ class TreatDesc extends Component {
 
				     hideTreatDesc() {
			
 
				         $('#treatDescBox').css({'display': 'none'});
			
 
				         $('#treatDescBox').animate({'display': 'none'}, 500);
			
 
				-        $('#treatWrapper').animate({'margin-left': '-340px'}, 500);
			
 
				+        $('#treatWrapper').animate({'margin-left': '-340px','left':'50%'}, 500);
			
 
				     }
			
 
				 
			
 
				     render(){
			
 
				         const  { treatment, treatDesc, setDrugInfo, showDrugInfo} = this.props
			
 
				         const { title, basic, otherDrugIndex, drugDesc} = treatDesc
			
 
				-        const { currentIndex } = this.state
			
 
				+        const { currentIndex, hasEnterImg } = this.state
			
 
				         return (treatment && treatment.length >0 && <div  className={style['treat-desc-box']}>
			
 
				             
			
 
				             {title && title === '药品推荐' ? <div className={style['similar-drug-box']} id='treatDescBox'>
			
@@ -57,22 +81,32 @@ class TreatDesc extends Component {
 
				                     {treatment[otherDrugIndex].medicitionsList.map((item, index) =>{
			
 
				                         return (<span >
			
 
				                         {index === 0 ? '' : ', '}     
			
 
				-                        <span className={style['drug-name-box']}>
			
 
				+                        <span className={style['drug-name-box']}
			
 
				+                            onMouseEnter={this.handleMouseEnterDrug.bind(this, index, item )}
			
 
				+                            onMouseLeave = {this.handleMouseLeaveDrug}
			
 
				+                            id={item.medicitionName}
			
 
				+                        >
			
 
				                             <span className={style['drug-name']} 
			
 
				                                 // onDoubleClick={() =>{setDrugInfo(item);showDrugInfo();}} 
			
 
				                                 onClick={()=>{item.forbidden === '2' ? '' : this.handleSelect(otherDrugIndex,index)}} 
			
 
				                                 style={item.forbidden === '2' ? {opacity: '0.3', filter:'alpha(opacity=30)',filter:'progid:DXImageTransform.Microsoft.Alpha(opacity=30)'} : item.selected ? {color: '#3B9ED0'}:''}
			
 
				-                              
			
 
				                                 >
			
 
				                                 {item.medicitionName}
			
 
				                             </span>
			
 
				+                            {<img className={style['info-img']}  
			
 
				+                                style ={currentIndex === index ? {display: "inline-block"} : {display: "none"}}
			
 
				+                                src={currentIndex === index ?  (hasEnterImg ? info3 : info2) : info2} 
			
 
				+                                onMouseEnter={this.handleMouseEnterImg.bind(this, index)}
			
 
				+                                onMouseLeave = {this.handleMouseLeaveImg}
			
 
				+                                onClick={() =>{setDrugInfo(item);showDrugInfo();}}
			
 
				+                                />}
			
 
				                         </span>              
			
 
				                         
			
 
				-                        {<img className={style['info-img']}    
			
 
				+                        {/* {<img className={style['info-img']}    
			
 
				                             src={currentIndex === index ? info1 : info} 
			
 
				                             onMouseEnter={this.handleMouseEnterImg.bind(this, index)}
			
 
				                             onMouseLeave = {this.handleMouseLeaveImg}
			
 
				-                            onClick={() =>{setDrugInfo(item);showDrugInfo();}}/>}
			
 
				+                            onClick={() =>{setDrugInfo(item);showDrugInfo();}}/>} */}
			
 
				                         {item.forbidden === '1' ? <span className={style['info-flag']} style={{border: '1px solid #F4C051', background: '#F4C051',marginLeft: '5px'}}>慎用</span>: item.forbidden === '2' ? <span className={style['info-flag']} style={{opacity: '0.3', filter:'alpha(opacity=30)',filter:'progid:DXImageTransform.Microsoft.Alpha(opacity=30)',border: '1px solid #000',marginLeft: '5px'}}>禁用</span> : ''},
			
 
				                         <span  style={item.forbidden === '2' ? {opacity: '0.3', filter:'alpha(opacity=30)',filter:'progid:DXImageTransform.Microsoft.Alpha(opacity=30)'} : ''}> 使用率{item.rate}</span>
			
 
				                         
			
--- a/src/components/TreatDesc/index.less
+++ b/src/components/TreatDesc/index.less
@@ -45,10 +45,12 @@
 
				     top: 0;
			
 
				     background: #fff;
			
 
				     padding: 60px 20px 80px;
			
 
				+    box-shadow: 2px 0px 5px -2px #ccc;
			
 
				 }
			
 
				 .drug-name-box {
			
 
				     display: inline-block;
			
 
				     height: 30px;
			
 
				+    position: relative;
			
 
				 }
			
 
				 .drug-name {
			
 
				     border-bottom: 1px solid #666;
			
@@ -57,9 +59,11 @@
 
				     
			
 
				 }
			
 
				 .info-img {
			
 
				-    width: 12px;
			
 
				+    width: 15px;
			
 
				     margin: 0 3px -1px;
			
 
				     cursor: pointer;
			
 
				+    position: absolute;
			
 
				+    top: -10px;
			
 
				 }
			
 
				 .info-flag {
			
 
				     display: inline-block;
			
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -43,7 +43,7 @@ export default {
 
				       age:"岁",
			
 
				     },
			
 
				     showCheckNum:16,        //查体默认展开非自由文本标签的个数
			
 
				-    radioOptionPer:'( )',     //单选项输入占位符
			
 
				+    radioOptionPer:'（）',     //单选项输入占位符
			
 
				     textReg:new RegExp("([\u4E00-\uFA29]|[\uE7C7-\uE7F3]|[a-zA-Z0-9])"), //包含中英文或数字
			
 
				-    Params
			
 
				+  Params
			
 
				 };
			
--- a/src/containers/AdviceContainer.js
+++ b/src/containers/AdviceContainer.js
@@ -7,6 +7,7 @@ function mapStateToProps(state) {
 
				     return ({
			
 
				         pushMessage: state.pushMessage,
			
 
				         isRead:state.homePage.isRead,
			
 
				+        adviceInput: state.pushMessage.advice.adviceInput
			
 
				     })
			
 
				 }
			
 
				 
			
--- a/src/containers/CheckBody.js
+++ b/src/containers/CheckBody.js
@@ -11,6 +11,7 @@ function mapStateToProps(state){
 
				   const hasMain = filterDataArr(mainSuit.saveText);//||mainSuit.data.length;
			
 
				   return {
			
 
				     data:checkBody.data,
			
 
				+    defaultShowAll:checkBody.showAll,
			
 
				     isEmpty:checkBody.isEmpty,
			
 
				     update:checkBody.update,   //用于触发更新
			
 
				     showArr:homePage.showDrop,
			
--- a/src/containers/Inspect.js
+++ b/src/containers/Inspect.js
@@ -4,7 +4,7 @@ import Inspect from '@components/Inspect';
 
				 import {getSearchList,getSublableList} from '@store/async-actions/inspect';
			
 
				 import {setLabel,fillActived,fillActiveDetail,checkValueIsChange,delExcelLis,clearLabel,delPartItem} from '@store/actions/inspect';
			
 
				 import {billing} from '@store/async-actions/pushMessage';
			
 
				-function mapStateToProps(state) {
			
 
				+function mapStateToProps(state) {//console.log(state)
			
 
				     return {
			
 
				         list:state.inspect.list,
			
 
				         labelList:state.inspect.labelList,
			
--- a/src/containers/Multiple.js
+++ b/src/containers/Multiple.js
@@ -32,7 +32,7 @@ function handleCurrent(dispatch,params){
 
				   const index = getLabelIndex(ikey);
			
 
				   dispatch({
			
 
				     type:CURRENT_MUL,
			
 
				-    data:{seleData,seleId,ikey:index}
			
 
				+    data:{seleData,seleId,ikey:index,fullIkey:ikey}
			
 
				   })
			
 
				 }
			
 
				 
			
@@ -41,7 +41,7 @@ function handleOtherHis(dispatch,params){
 
				   const index = getLabelIndex(ikey);
			
 
				   dispatch({
			
 
				     type:OTHERHIS_MUL,
			
 
				-    data:{seleData,seleId,ikey:index}
			
 
				+    data:{seleData,seleId,ikey:index,fullIkey:ikey}
			
 
				   })
			
 
				 }
			
 
				 
			
@@ -50,7 +50,7 @@ function handleCheckBody(dispatch,params){
 
				   const index = getLabelIndex(ikey);
			
 
				   dispatch({
			
 
				     type:CHECKBODY_MUL,
			
 
				-    data:{seleData,seleId,ikey:index}
			
 
				+    data:{seleData,seleId,ikey:index,fullIkey:ikey}
			
 
				   })
			
 
				 }
			
 
				 
			
--- a/src/containers/RadioInpDrop.js
+++ b/src/containers/RadioInpDrop.js
@@ -14,7 +14,7 @@ import config from '@config/index.js';
 
				 
			
 
				 function mapStateToProps(state){
			
 
				   return {
			
 
				-    mainSaveText:state.mainSuit.saveText,
			
 
				+    //mainSaveText:state.mainSuit.saveText,
			
 
				   }
			
 
				 }
			
 
				 
			
@@ -64,11 +64,10 @@ function otherSelect(dispatch,params){
 
				 //查体单选下拉选中事件
			
 
				 function checkSelect(dispatch,params){
			
 
				   const {ikey,id,values} = params;
			
 
				-  let index = getLabelIndex(ikey);
			
 
				   dispatch({
			
 
				     type:SET_CK_RADIO_INPUT_VAL,
			
 
				     data:{
			
 
				-      ikey:index,
			
 
				+      ikey,
			
 
				       id,
			
 
				       values
			
 
				     }
			
@@ -148,7 +147,7 @@ function mapDispatchToProps(dispatch,store){
 
				       let ikey = getLabelIndex(index);
			
 
				       dispatch({
			
 
				         type:InputActions[+boxMark],
			
 
				-        data:{values:params.values,ikey:ikey}
			
 
				+        data:{values:params.values,ikey:boxMark==4?params.ikey:ikey}
			
 
				       });
			
 
				       dispatch(billing());
			
 
				       dispatch({
			
--- a/src/containers/eleType.js
+++ b/src/containers/eleType.js
@@ -19,14 +19,15 @@ import Multiple from '@containers/Multiple';
 
				  * *******/
			
 
				 //单选类型
			
 
				 export function singleRadio(params){
			
 
				-  const data = params.item;//console.log(111,data);
			
 
				+  const data = params.item;
			
 
				   const {i,hideTag,boxMark,showArr,selecteds,boxTop,boxLeft} = params;
			
 
				   const showInx = boxMark+i+'0';    //单括号多标签的情况下需要识别同一个标签内多个下拉组件的显示状态
			
 
				   switch (+data.controlType){
			
 
				     case 0:
			
 
				     case 1:
			
 
				+      const custom= JSON.parse(localStorage.getItem('radio'+data.id));
			
 
				       const list = data.questionDetailList&&data.questionDetailList.length>0?data.questionDetailList:data.questionMapping;
			
 
				-      return <RadioDrop data={list}
			
 
				+      return <RadioDrop data={custom&&custom.length?[...custom,...list]:list}
			
 
				                         prefix={data.labelPrefix}
			
 
				                         suffix={data.labelSuffix}
			
 
				                         placeholder={data.name}
			
@@ -73,6 +74,8 @@ export function singleRadio(params){
 
				     case 7:
			
 
				       return <NumberDrop prefix={data.labelPrefix}
			
 
				                          suffix={data.labelSuffix}
			
 
				+                         min={data.minValue}
			
 
				+                         max={data.maxValue}
			
 
				                          placeholder={data.name}
			
 
				                          boxMark={boxMark}
			
 
				                          id={data.id}
			
@@ -98,14 +101,16 @@ export function singleRadio(params){
 
				 //多标签组合型
			
 
				 function multLabels(params){
			
 
				   const data = params.item;
			
 
				-  const {i,boxMark,showArr,saveText} = params;
			
 
				+  const {i,boxMark,showArr,saveText,selecteds} = params;
			
 
				   return <MultSpread data={data.questionMapping}
			
 
				                      showAdd = {+data.showAdd===1}
			
 
				                      copyId={data.id}
			
 
				                      fullData = {data}
			
 
				                      showArr={showArr||{}}
			
 
				                      update={Math.random()}
			
 
				+                     boxMark={boxMark}
			
 
				                      ikey={boxMark+i}
			
 
				+                     selecteds={selecteds&&selecteds[i]}
			
 
				                      saveText={saveText}
			
 
				                      name={data.name||data.tagName}
			
 
				                      textPrefix={data.prefix}
			
--- a/src/store/actions/checkBody.js
+++ b/src/store/actions/checkBody.js
@@ -4,8 +4,10 @@ import {getLabelIndex,fullfillText} from '@common/js/func.js';
 
				 export function set(state,action){
			
 
				   let res = Object.assign({},state);
			
 
				   const {data} = action;
			
 
				-  res.data = [...data];
			
 
				-  res.saveText = fullfillText(res.data).saveText;//存逗号
			
 
				+  const obj = fullfillText(data,false,false,false);
			
 
				+  res.data = obj.newArr;
			
 
				+  res.saveText = obj.saveText;//存逗号
			
 
				+  res.showAll = obj.checkHiddenDefault;
			
 
				   res.update = Math.random();
			
 
				   res.isEmpty = action.isEmpty;
			
 
				   return res;
			
@@ -103,7 +105,11 @@ export function setRadioValue(state,action){
 
				   }
			
 
				   if(+item.tagType===1){      //独立单选组件
			
 
				     item.value = text;
			
 
				-    res.saveText[labelInx] = item.labelPrefix+text+item.labelSuffix;
			
 
				+    const exist = JSON.parse(localStorage.getItem('radio'+item.id)||null);
			
 
				+    if(exist){    //选中状态处理
			
 
				+      exist[0].selected=exist[0].id==id;
			
 
				+      localStorage.setItem('radio'+item.id,JSON.stringify(exist));
			
 
				+    }
			
 
				     item.questionDetailList.map((its)=>{
			
 
				       if(its.id === id){
			
 
				         its.selected = true;
			
@@ -111,6 +117,7 @@ export function setRadioValue(state,action){
 
				         its.selected = false;
			
 
				       }
			
 
				     });
			
 
				+    res.saveText[labelInx] = item.labelPrefix+text+item.labelSuffix;
			
 
				   }else{      //组合组件中的单选组件
			
 
				     item.questionMapping[subInx].value = text;
			
 
				     let hasValue = false;
			
@@ -138,8 +145,13 @@ export function setRadioValue(state,action){
 
				 export const setRadioInputValue = (state,action)=>{
			
 
				   const res = Object.assign({},state);
			
 
				   const {ikey,values,id} = action.data;
			
 
				-  const item = res.data[ikey];
			
 
				-  let str='',temp='',obj=res.data[ikey].questionDetailList;
			
 
				+  let index = getLabelIndex(ikey);
			
 
				+  let innerInx = ikey.substr(ikey.length-1);
			
 
				+  let item = res.data[index];
			
 
				+  if(item.tagType==3){      //在组合项中
			
 
				+    item = res.data[index].questionMapping[innerInx];
			
 
				+  }
			
 
				+  let str='',temp='',obj=item.questionDetailList;
			
 
				   if(!values){    //清空
			
 
				     let sld=obj.find((item)=>{
			
 
				       return item.selected==true;
			
@@ -147,7 +159,18 @@ export const setRadioInputValue = (state,action)=>{
 
				     sld?sld.selected=false:'';
			
 
				     item.vals = null;
			
 
				     item.value = '';
			
 
				-    res.saveText[ikey] = '';
			
 
				+    if(res.data[index].tagType==3){
			
 
				+      let hasValue = false;
			
 
				+      const sub = res.data[index].questionMapping.map((it)=>{
			
 
				+        if(it.value){     //至少有一个子值才黑显
			
 
				+          hasValue = true;
			
 
				+        }
			
 
				+        return (it.labelPrefix||'')+(it.value||'')+(it.labelSuffix||'');
			
 
				+      });
			
 
				+      res.saveText[index] = hasValue?sub.join(''):'';
			
 
				+    }else{
			
 
				+      res.saveText[index] = '';
			
 
				+    }
			
 
				     res.update = Math.random();
			
 
				     return res;
			
 
				   }
			
@@ -171,7 +194,15 @@ export const setRadioInputValue = (state,action)=>{
 
				   }
			
 
				   item.vals = values;
			
 
				   item.value = str;
			
 
				-  res.saveText[ikey] = str;
			
 
				+  if(res.data[index].tagType==3){
			
 
				+    let hasValue = false;
			
 
				+    const sub = res.data[index].questionMapping.map((it)=>{
			
 
				+      return (it.labelPrefix||'')+(it.value||'')+(it.labelSuffix||'');
			
 
				+    });
			
 
				+    res.saveText[index] = sub.join('');
			
 
				+  }else {
			
 
				+    res.saveText[ikey] = str;
			
 
				+  }
			
 
				   res.update = Math.random();
			
 
				   return res;
			
 
				 }
			
@@ -179,7 +210,7 @@ export const setRadioInputValue = (state,action)=>{
 
				 export function addLabelItem(state,action){
			
 
				   let res = Object.assign({},state);
			
 
				   const {data,i} = action;
			
 
				-  const textLabel = JSON.parse(config.textLabel);
			
 
				+  const textLabel = Object.assign({},JSON.parse(config._textLabel),{showInCheck:JSON.parse(data).showInCheck});
			
 
				   //使用Object.assign({},data)拷贝操作时复制项和原项会同步修改
			
 
				   if(!data) return res;
			
 
				   res.data.splice(+i+2,0,JSON.parse(data),textLabel);
			
@@ -230,11 +261,17 @@ export function setSearchData(state,action){
 
				 //插入标签数据-搜索
			
 
				 export function insertLabelData(state,action){
			
 
				   let res = Object.assign({},state);
			
 
				-  const text = Object.assign({},JSON.parse(config.textLabel));
			
 
				   const searchStr = res.searchStr;
			
 
				-  const {index,data,isReplace,span,searchInEnd}=action;console.log("查体",data);
			
 
				+  const {index,data,isReplace,span,searchInEnd}=action;
			
 
				   const showText = res.saveText[index];
			
 
				-  const spreadLabels = data.tagType==4?fullfillText(data.questionMapping).newArr:[data];
			
 
				+  let tempLabels = data.tagType==4?fullfillText(data.questionMapping).newArr:[data];
			
 
				+  //查体中，默认显示区域搜索出来的标签要默认显示，隐藏区域搜索出的默认隐藏
			
 
				+  let hideAreaIndex = [...res.data].reverse().findIndex((it)=>it.showInCheck);
			
 
				+  hideAreaIndex = res.data.length-hideAreaIndex-1;        //默认显示的最后一个标签的位置
			
 
				+  const text = Object.assign({},JSON.parse(config._textLabel),{showInCheck:index>hideAreaIndex?false:true});
			
 
				+  let spreadLabels =tempLabels.map((it)=>{
			
 
				+    return Object.assign({},it,{showInCheck:index>hideAreaIndex?false:true});
			
 
				+  });
			
 
				   let reg = searchInEnd?new RegExp(searchStr+"$"):new RegExp("^"+searchStr);
			
 
				   const newText=showText.replace(reg,'')||'';
			
 
				   if(!isReplace){
			
@@ -284,6 +321,33 @@ export const changeLabelVal = (state,action)=>{//双击标签输入改变值
 
				   if(labText && labText.trim()){
			
 
				     if(item){
			
 
				       item.value = newVal;
			
 
				+      const canAdd=hasNoSame(item.questionDetailList,labText);
			
 
				+      //单选双击编辑的内容自动加到下拉选项中,双击编辑但未修改不添加
			
 
				+      if(canAdd&&+item.tagType===1&&(+item.controlType===1||+item.controlType===0)){
			
 
				+        const li = {
			
 
				+          id:-Math.floor(Math.random()*1000),
			
 
				+          name:labText,
			
 
				+          questionId:item.id,
			
 
				+          orderNo:0,
			
 
				+          code:0,
			
 
				+          defaultSelect:"0",
			
 
				+          remark:null,
			
 
				+          abnormal:0,
			
 
				+          selected:true
			
 
				+        };
			
 
				+
			
 
				+        const exist = JSON.parse(localStorage.getItem('radio'+item.id)||null);
			
 
				+        //console.log(exist)
			
 
				+        if(exist&&typeof exist=='object'){     //已添加过编辑的数据
			
 
				+          //exist.push(li);
			
 
				+          exist[0]=li;        //暂限添1条
			
 
				+          localStorage.setItem('radio'+item.id,JSON.stringify(exist));
			
 
				+        }else{
			
 
				+          localStorage.setItem('radio'+item.id,JSON.stringify([li]));
			
 
				+        }
			
 
				+        //取消原选中状态
			
 
				+        item.questionDetailList.find((it)=>it.selected==true).selected=false;
			
 
				+      }
			
 
				       item.labelPrefix = prefix||'';
			
 
				       item.labelSuffix = suffix||'';
			
 
				       // res.saveText[index] = totalVal;
			
@@ -299,6 +363,10 @@ export const changeLabelVal = (state,action)=>{//双击标签输入改变值
 
				   return res;
			
 
				 }
			
 
				 
			
 
				+function hasNoSame(arr,text){
			
 
				+  return arr.findIndex((it)=>text==it.name)==-1;
			
 
				+}
			
 
				+
			
 
				 // 数字键盘较特殊，有直接输入
			
 
				 export const changeNumLabelVal = (state,action)=>{
			
 
				   const res = Object.assign({},state);
			
@@ -384,8 +452,23 @@ export function backspaceText(state,action){
 
				 // 单列多选
			
 
				 export function multipleComfirn(state,action){
			
 
				   let res = Object.assign({},state);
			
 
				-  const {ikey,seleData} = action.data;
			
 
				-  let data = res.data;
			
 
				+  const {ikey,seleData,fullIkey} = action.data;
			
 
				+  let data = res.data;//console.log(action,data[ikey])
			
 
				+  let index = fullIkey.substr(fullIkey.length-1,1);
			
 
				+  if(data[ikey].tagType==3){    //在组合项中
			
 
				+    let item = data[ikey].questionMapping;
			
 
				+    let arr=[];
			
 
				+    item[index].value = seleData;
			
 
				+    item.map((it)=>{
			
 
				+      if(it.value){
			
 
				+        arr.push(it.labelPrefix+it.value+it.labelSuffix);
			
 
				+      }
			
 
				+    });
			
 
				+    res.saveText[ikey] = arr.join("");
			
 
				+    res.update = Math.random();
			
 
				+    res.selecteds[ikey] = {[index]:action.data};
			
 
				+    return res;
			
 
				+  }
			
 
				   data[ikey].value = seleData;
			
 
				   res.saveText[ikey] = seleData;
			
 
				   res.selecteds[ikey] = action.data;
			
--- a/src/store/actions/currentIll.js
+++ b/src/store/actions/currentIll.js
@@ -444,6 +444,11 @@ export function setRadioValue(state,action){
 
				   if(+item.tagType===1){
			
 
				     item.value = text;
			
 
				     res.saveText[labelInx] = item.labelPrefix+text+item.labelSuffix;
			
 
				+    const exist = JSON.parse(localStorage.getItem('radio'+item.id)||null);
			
 
				+    if(exist){    //选中状态处理
			
 
				+      exist[0].selected=exist[0].id==id;
			
 
				+      localStorage.setItem('radio'+item.id,JSON.stringify(exist));
			
 
				+    }
			
 
				     item.questionDetailList.map((its)=>{
			
 
				       if(its.id === id){
			
 
				         its.selected = true;
			
@@ -536,6 +541,33 @@ export const changeLabelVal = (state,action)=>{
 
				   if(labText.trim()){
			
 
				     if(item){
			
 
				       item.value = newVal;
			
 
				+      const canAdd=hasNoSame(item.questionDetailList,labText);
			
 
				+      //单选双击编辑的内容自动加到下拉选项中,双击编辑但未修改不添加
			
 
				+      if(canAdd&&+item.tagType===1&&(+item.controlType===1||+item.controlType===0)){
			
 
				+        const li = {
			
 
				+          id:-Math.floor(Math.random()*1000),
			
 
				+          name:labText,
			
 
				+          questionId:item.id,
			
 
				+          orderNo:0,
			
 
				+          code:0,
			
 
				+          defaultSelect:"0",
			
 
				+          remark:null,
			
 
				+          abnormal:0,
			
 
				+          selected:true
			
 
				+        };
			
 
				+
			
 
				+        const exist = JSON.parse(localStorage.getItem('radio'+item.id)||null);
			
 
				+        //console.log(exist)
			
 
				+        if(exist&&typeof exist=='object'){     //已添加过编辑的数据
			
 
				+          //exist.push(li);
			
 
				+          exist[0]=li;        //暂限添1条
			
 
				+          localStorage.setItem('radio'+item.id,JSON.stringify(exist));
			
 
				+        }else{
			
 
				+          localStorage.setItem('radio'+item.id,JSON.stringify([li]));
			
 
				+        }
			
 
				+        //取消原选中状态
			
 
				+        item.questionDetailList.find((it)=>it.selected==true).selected=false;
			
 
				+      }
			
 
				       item.labelPrefix = prefix||'';
			
 
				       item.labelSuffix = suffix||'';
			
 
				       res.saveText[index] = labText;
			
@@ -549,6 +581,9 @@ export const changeLabelVal = (state,action)=>{
 
				   return res;
			
 
				 }
			
 
				 
			
 
				+function hasNoSame(arr,text){
			
 
				+  return arr.findIndex((it)=>text==it.name)==-1;
			
 
				+}
			
 
				 // 数字键盘较特殊，有直接输入
			
 
				 export const changeNumLabelVal = (state,action)=>{
			
 
				   const res = Object.assign({},state);
			
@@ -843,12 +878,26 @@ export function removeId(state,action){
 
				 // 单列多选
			
 
				 export function multipleComfirn(state,action){
			
 
				   let res = Object.assign({},state);
			
 
				-  const {ikey,seleData} = action.data;
			
 
				-  let data = res.data;
			
 
				+  const {ikey,seleData,fullIkey} = action.data;
			
 
				+  let data = res.data;//console.log(action,data[ikey])
			
 
				+  let index = fullIkey.substr(fullIkey.length-1,1);
			
 
				+  if(data[ikey].tagType==3){    //在组合项中
			
 
				+    let item = data[ikey].questionMapping;
			
 
				+    let arr=[];
			
 
				+    item[index].value = seleData;
			
 
				+    item.map((it)=>{
			
 
				+      if(it.value){
			
 
				+        arr.push(it.labelPrefix+it.value+it.labelSuffix);
			
 
				+      }
			
 
				+    });
			
 
				+    res.saveText[ikey] = arr.join("");
			
 
				+    res.update = Math.random();
			
 
				+    res.selecteds[ikey] = {[index]:action.data};
			
 
				+    return res;
			
 
				+  }
			
 
				   data[ikey].value = seleData;
			
 
				   res.saveText[ikey] = seleData;
			
 
				   res.selecteds[ikey] = action.data;
			
 
				-  res.update = Math.random();
			
 
				   return res;
			
 
				 }
			
 
				 
			
--- a/src/store/actions/diagnosticList.js
+++ b/src/store/actions/diagnosticList.js
@@ -55,7 +55,7 @@ export const getDiagnosticStr = (state, action) => {
 
				     let diagnosticStrNoType = ''
			
 
				     for (let i = 0; i < diagnosticList.length; i++) {
			
 
				         diagnosticStr = diagnosticStr + diagnosticList[i].name + '(' + getDiagType(diagnosticList[i].type) + '); '
			
 
				-        diagnosticStrNoType = diagnosticStrNoType + diagnosticList[i].name + ';'
			
 
				+        diagnosticStrNoType = diagnosticStrNoType + diagnosticList[i].name + ','
			
 
				     }
			
 
				     res.diagnosticStrNoType = diagnosticStrNoType
			
 
				     res.diagnosticStr = diagnosticStr
			
@@ -67,11 +67,13 @@ export const setDiagToMainSuit = (state, action) => {
 
				     res.mainSuitStr = action.data;
			
 
				     return res;
			
 
				 }
			
 
				+
			
 
				 export const clearAllDiag = (state, action) => {
			
 
				     const res = Object.assign({}, state);
			
 
				     res.diagnosticList = action.data
			
 
				     res.diagnosticStr = action.saveText
			
 
				     res.mainSuitStr = action.mainSuitStr
			
 
				+    res.diagnosticStrNoType = action.saveText
			
 
				     return res;
			
 
				 }
			
 
				 
			
--- a/src/store/actions/otherHistory.js
+++ b/src/store/actions/otherHistory.js
@@ -69,6 +69,11 @@ export function setRadioValue(state,action){
 
				   if(+item.tagType===1){
			
 
				     item.value = text;
			
 
				     res.saveText[labelInx] = item.labelPrefix+text+item.labelSuffix;
			
 
				+    const exist = JSON.parse(localStorage.getItem('radio'+item.id)||null);
			
 
				+    if(exist){    //选中状态处理
			
 
				+      exist[0].selected=exist[0].id==id;
			
 
				+      localStorage.setItem('radio'+item.id,JSON.stringify(exist));
			
 
				+    }
			
 
				     item.questionDetailList.map((its)=>{
			
 
				       if(its.id === id){
			
 
				         its.selected = true;
			
@@ -274,12 +279,47 @@ export function changeTextLabel(state,action) {
 
				   if(labText.trim()){
			
 
				     if(item){
			
 
				       item.value = newVal;
			
 
				+      //月经史特殊处理
			
 
				+      if(item.formulaCode){
			
 
				+        res[item.formulaCode] = newVal;
			
 
				+      }
			
 
				+      const canAdd=hasNoSame(item.questionDetailList,labText);
			
 
				+      //单选双击编辑的内容自动加到下拉选项中,双击编辑但未修改不添加
			
 
				+      if(canAdd&&+item.tagType===1&&(+item.controlType===1||+item.controlType===0)){
			
 
				+        const li = {
			
 
				+          id:-Math.floor(Math.random()*1000),
			
 
				+          name:labText,
			
 
				+          questionId:item.id,
			
 
				+          orderNo:0,
			
 
				+          code:0,
			
 
				+          defaultSelect:"0",
			
 
				+          remark:null,
			
 
				+          abnormal:0,
			
 
				+          selected:true
			
 
				+        };
			
 
				+
			
 
				+        const exist = JSON.parse(localStorage.getItem('radio'+item.id)||null);
			
 
				+        //console.log(exist)
			
 
				+        if(exist&&typeof exist=='object'){     //已添加过编辑的数据
			
 
				+          //exist.push(li);
			
 
				+          exist[0]=li;        //暂限添1条
			
 
				+          localStorage.setItem('radio'+item.id,JSON.stringify(exist));
			
 
				+        }else{
			
 
				+          localStorage.setItem('radio'+item.id,JSON.stringify([li]));
			
 
				+        }
			
 
				+        //取消原选中状态
			
 
				+        item.questionDetailList.find((it)=>it.selected==true).selected=false;
			
 
				+      }
			
 
				       item.labelPrefix = prefix||'';
			
 
				       item.labelSuffix = suffix||'';
			
 
				       res.saveText[index] = labText;
			
 
				     }
			
 
				   }else{//删除完标签内容则删除该标签
			
 
				     const num = nextIsDot?2:1;
			
 
				+    //月经史特殊处理
			
 
				+    if(res.data[index].formulaCode){
			
 
				+      res[res.data[index].formulaCode]=undefined;
			
 
				+    }
			
 
				     res.data.splice(index,num);
			
 
				     res.selecteds.splice(index,num);//杂音类样式选中状态对应
			
 
				     res.saveText = fullfillText(res.data).saveText;
			
@@ -288,6 +328,10 @@ export function changeTextLabel(state,action) {
 
				   return res;
			
 
				 }
			
 
				 
			
 
				+function hasNoSame(arr,text){
			
 
				+  return arr.findIndex((it)=>text==it.name)==-1;
			
 
				+}
			
 
				+
			
 
				 // 数字键盘较特殊，有直接输入
			
 
				 export const changeNumLabelVal = (state,action)=>{
			
 
				   const res = Object.assign({},state);
			
@@ -368,6 +412,10 @@ export function backspaceText(state,action){
 
				     res.saveText.splice(delIndex,1);
			
 
				   }
			
 
				   else{
			
 
				+    //月经史删除处理
			
 
				+    if(data[delIndex-1].formulaCode){
			
 
				+      res[data[delIndex-1].formulaCode]=undefined;
			
 
				+    }
			
 
				     data.splice(delIndex-1,2);
			
 
				     res.saveText.splice(delIndex-1,2);
			
 
				   }
			
@@ -392,12 +440,26 @@ export function removeId(state,action){
 
				 // 单列多选
			
 
				 export function multipleComfirn(state,action){
			
 
				   let res = Object.assign({},state);
			
 
				-  const {ikey,seleData} = action.data;
			
 
				-  let data = res.data;
			
 
				+  const {ikey,seleData,fullIkey} = action.data;
			
 
				+  let data = res.data;//console.log(action,data[ikey])
			
 
				+  let index = fullIkey.substr(fullIkey.length-1,1);
			
 
				+  if(data[ikey].tagType==3){    //在组合项中
			
 
				+    let item = data[ikey].questionMapping;
			
 
				+    let arr=[];
			
 
				+    item[index].value = seleData;
			
 
				+    item.map((it)=>{
			
 
				+      if(it.value){
			
 
				+        arr.push(it.labelPrefix+it.value+it.labelSuffix);
			
 
				+      }
			
 
				+    });
			
 
				+    res.saveText[ikey] = arr.join("");
			
 
				+    res.update = Math.random();
			
 
				+    res.selecteds[ikey] = {[index]:action.data};
			
 
				+    return res;
			
 
				+  }
			
 
				   data[ikey].value = seleData;
			
 
				   res.saveText[ikey] = seleData;
			
 
				   res.selecteds[ikey] = action.data;
			
 
				-  res.update = Math.random();
			
 
				   return res;
			
 
				 }
			
 
				 
			
--- a/src/store/actions/patInfo.js
+++ b/src/store/actions/patInfo.js
@@ -26,8 +26,8 @@ export const updatePatientMessage=(state,action)=>{
 
				       // sex: 2
			
 
				     // };
			
 
				     res.message = action.data;
			
 
				-    if(!action.data.selfDeptId){    //selfDeptId这个参数是跟外部对接用的
			
 
				-        res.message = mock;
			
 
				-    }
			
 
				+    /*if(!action.data.selfDeptId){    //selfDeptId这个参数是跟外部对接用的
			
 
				+        res.message = {};
			
 
				+    }*/
			
 
				     return res;
			
 
				 };
			
--- a/src/store/actions/treat.js
+++ b/src/store/actions/treat.js
@@ -105,3 +105,9 @@ export const isFirstMainDiag = (state, action) => {
 
				     res.isFirstMainDiag = false;
			
 
				     return res;
			
 
				 }
			
 
				+//回读清除是否第一次主诊断
			
 
				+export const clearFirstMainDiag = (state, action) => {
			
 
				+    const res = Object.assign({}, state);
			
 
				+    res.isFirstMainDiag = action.flag;
			
 
				+    return res;
			
 
				+}
			
--- a/src/store/async-actions/assistCheck.js
+++ b/src/store/async-actions/assistCheck.js
@@ -11,7 +11,7 @@ export const getSearchList = (val) => {
 
				     let baseList = store.getState();
			
 
				     let sex = baseList.patInfo.message.patientSex;
			
 
				     return (dispatch) => {
			
 
				-        axios.json('/api/icss/retrieval/getTagInfos',{
			
 
				+        axios.json('/retrieval/getTagInfos',{
			
 
				             type:'6',
			
 
				             age:baseList.patInfo.message.patientAge,
			
 
				             inputStr:val,
			
--- a/src/store/async-actions/copyRight.js
+++ b/src/store/async-actions/copyRight.js
@@ -5,7 +5,7 @@ import { storageLocal } from "@utils/tools"
 
				 export const getMessage = (dispatch, getState) => {
			
 
				     const state = getState();
			
 
				     // 请求地址
			
 
				-    post('/api/icss/versionInfo/getVersionInfoAlls')
			
 
				+    post('/versionInfo/getVersionInfoAlls')
			
 
				     .then((data) => {
			
 
				         
			
 
				         const versionInfo = JSON.parse(storageLocal.get('versionInfo'));
			
@@ -33,7 +33,7 @@ export const getMessage = (dispatch, getState) => {
 
				 export const getDisMessage = (dispatch, getState) => {
			
 
				     const state = getState();
			
 
				     // 请求地址
			
 
				-    post('/api/icss/disclaimerInformation/getDisclaimerInformations')
			
 
				+    post('/disclaimerInformation/getDisclaimerInformations')
			
 
				     .then((data) => {
			
 
				         dispatch({
			
 
				             type: GET_DISCLAIMER_MESSAGE,
			
--- a/src/store/async-actions/diagnosticSearch.js
+++ b/src/store/async-actions/diagnosticSearch.js
@@ -18,7 +18,7 @@ export const getSearchList = (val) => {
 
				         for(let i = 0; i < diagnosticList.length; i++) {
			
 
				             noIds.push(diagnosticList[i].id)
			
 
				         }
			
 
				-        json('/api/icss/retrieval/getTagInfos',{
			
 
				+        json('/retrieval/getTagInfos',{
			
 
				             type:'7',
			
 
				             age:state.patInfo.message.patientAge,
			
 
				             inputStr:val,
			
--- a/src/store/async-actions/fetchModules.js
+++ b/src/store/async-actions/fetchModules.js
@@ -9,13 +9,13 @@ import {SETOTHERHISTORY} from "../types/homePage";
 
				 import config from "@config/index";
			
 
				 
			
 
				 const api={
			
 
				-  getSpreadModule:'/api/icss/questionInfo/getByIds',
			
 
				-  getModule:'/api/icss/questionInfo/getById',
			
 
				-  searchURL: '/api/icss/retrieval/getTagInfos',
			
 
				-  getOtherHisRecord: '/api/icss/inquiryInfo/getLastOther',
			
 
				-  getBigPush:'/api/icss/push/pushInner',
			
 
				-  saveMode:'/api/icss/doctorPageMode/saveDoctorPageModes',
			
 
				-  getSymptomFeature:'/api/icss/feature/getSymptomFeature'
			
 
				+  getSpreadModule:'/questionInfo/getByIds',
			
 
				+  getModule:'/questionInfo/getById',
			
 
				+  searchURL: '/retrieval/getTagInfos',
			
 
				+  getOtherHisRecord: '/inquiryInfo/getLastOther',
			
 
				+  getBigPush:'/push/pushInner',
			
 
				+  saveMode:'/doctorPageMode/saveDoctorPageModes',
			
 
				+  getSymptomFeature:'/feature/getSymptomFeature'
			
 
				 };
			
 
				 
			
 
				 export const getFeature = (item)=>{
			
@@ -147,11 +147,11 @@ export function getInitData(){
 
				     json(api.getBigPush,param).then((res)=>{
			
 
				       if(+res.data.code === 0){
			
 
				         const data = res.data.data&&res.data.data.vital;
			
 
				-        const str = JSON.stringify(data);
			
 
				-        const arr = fullfillText(JSON.parse(str),false,false,false).newArr;
			
 
				+        //const str = JSON.stringify(data);
			
 
				+        //const arr = fullfillText(JSON.parse(str),false,false,false).newArr;
			
 
				         dispatch({
			
 
				           type:SET,
			
 
				-          data:[...arr],
			
 
				+          data:[...data],
			
 
				           isEmpty:false
			
 
				         });
			
 
				       }else{
			
--- a/src/store/async-actions/getInfoByUuid.js
+++ b/src/store/async-actions/getInfoByUuid.js
@@ -6,7 +6,7 @@ import { getUrlArgObject } from '@utils/tools';
 
				 
			
 
				 export const initPersonInfo = () => {        //初始化数据
			
 
				     return (dispatch) => {
			
 
				-        axios.json('/api/icss/tranFieldInfo/getInfoByUuid',{
			
 
				+        axios.json('/tranFieldInfo/getInfoByUuid',{
			
 
				             "uuid":getUrlArgObject('hospitalId'),
			
 
				         }).then((res)=>{
			
 
				             const data =res.data;
			
--- a/src/store/async-actions/historyTemplates.js
+++ b/src/store/async-actions/historyTemplates.js
@@ -8,7 +8,7 @@ export const initItemList = () => {
 
				     // let whichSign = baseList.typeConfig.typeConfig;
			
 
				     let state = baseList.patInfo.message;
			
 
				     return (dispatch) => {
			
 
				-        axios.json('/api/icss/inquiryInfo/hisInquirys',{
			
 
				+        axios.json('/inquiryInfo/hisInquirys',{
			
 
				             "hospitalId": state.hospitalId, 
			
 
				             "patientId": state.patientId, 
			
 
				             // "sign":whichSign
			
--- a/src/store/async-actions/homePage.js
+++ b/src/store/async-actions/homePage.js
@@ -5,12 +5,13 @@ import {SET_MAINSUIT} from '@store/types/mainSuit';
 
				 import config from '@config/index.js';
			
 
				 import store from '@store';
			
 
				 import {fullfillText} from '@common/js/func';
			
 
				+import {formatContinueDots} from '@utils/tools';
			
 
				 import {getOtherHisRecord,getInitData} from '@store/async-actions/fetchModules.js';
			
 
				 import {initHistoryDetails} from '@store/async-actions/patInfo';
			
 
				 
			
 
				 const api = {
			
 
				-  getModules:'/api/icss/moduleInfo/getAll',
			
 
				-  clickCount:'/api/icss/buriedSomeStatistical/saveBuriedSomeStatisticals' //埋点统计
			
 
				+  getModules:'/moduleInfo/getAll',
			
 
				+  clickCount:'/buriedSomeStatistical/saveBuriedSomeStatisticals' //埋点统计
			
 
				 };
			
 
				 
			
 
				 function modulesParseJson(data){
			
@@ -18,7 +19,7 @@ function modulesParseJson(data){
 
				   data.map((it)=>{
			
 
				     moduleName[config.moduleCP[it.id]] = it.name;//添加病情变化/病程变化子模板需要使用模板名称
			
 
				     obj = fullfillText(it.moduleDetailDTOList);
			
 
				-    json[config.moduleCP[it.id]] = obj.newArr;
			
 
				+    json[config.moduleCP[it.id]] = formatContinueDots(obj.newArr);
			
 
				     saveTextJson[config.moduleCP[it.id]] = obj.saveText;
			
 
				   });
			
 
				   return {json,saveTextJson,moduleName};
			
--- a/src/store/async-actions/inspect.js
+++ b/src/store/async-actions/inspect.js
@@ -12,7 +12,7 @@ export const getSearchList = (val) => {
 
				     let baseList = store.getState();
			
 
				     let sex = baseList.patInfo.message.patientSex;
			
 
				     return (dispatch) => {
			
 
				-        axios.json('/api/icss/retrieval/getTagInfos',{
			
 
				+        axios.json('/retrieval/getTagInfos',{
			
 
				             type:'5',
			
 
				             age:baseList.patInfo.message.patientAge,
			
 
				             inputStr:val,
			
@@ -28,7 +28,7 @@ export const getSublableList = (id,idx) => {
 
				     let baseList = store.getState();
			
 
				     let sex = baseList.patInfo.message.patientSex;
			
 
				     return (dispatch) => {
			
 
				-        axios.json('/api/icss/questionInfo/getById',{
			
 
				+        axios.json('/questionInfo/getById',{
			
 
				             age:baseList.patInfo.message.patientAge,
			
 
				             sexType:sex == '男'?'1' : sex == '女'?'2':'3',
			
 
				             id: id
			
--- a/src/store/async-actions/mainSuit.js
+++ b/src/store/async-actions/mainSuit.js
@@ -4,8 +4,8 @@ import {getEMRParams} from '@utils/tools';
 
				 
			
 
				 const host = '/api/icss/';
			
 
				 const api = {
			
 
				-  'getCommSymptoms': host + 'questionUsual/getQuestionUsual',
			
 
				-  'symptomPush': host +'push/pushInner',
			
 
				+  'getCommSymptoms': '/questionUsual/getQuestionUsual',
			
 
				+  'symptomPush':'/push/pushInner',
			
 
				 }
			
 
				 
			
 
				 
			
--- a/src/store/async-actions/patInfo.js
+++ b/src/store/async-actions/patInfo.js
@@ -9,13 +9,13 @@ import {ISREAD,MODI_LOADING} from "../types/homePage";
 
				 import { initItemList } from '@store/async-actions/tabTemplate';
			
 
				 
			
 
				 const api = {
			
 
				-    getPatInfo: '/api/icss/patientInfo/getTopPatientInfo',
			
 
				-    getPatBaseInfo: '/api/icss/patientInfo/getPatientInfo'
			
 
				+    getPatInfo: '/patientInfo/getTopPatientInfo',
			
 
				+    getPatBaseInfo: '/patientInfo/getPatientInfo'
			
 
				 };
			
 
				 
			
 
				 //参数转换
			
 
				 export const initPersonInfo = (dispatch, getState) => {
			
 
				-    json('/api/icss/tranFieldInfo/getInfoByUuid', {
			
 
				+    json('/tranFieldInfo/getInfoByUuid', {
			
 
				         "uuid": getUrlArgObject('hospitalId'),
			
 
				     }).then((res) => {
			
 
				         const data = res.data;
			
@@ -34,7 +34,7 @@ export const initHistoryDetails = (dispatch) => {
 
				     let baseList = store.getState();
			
 
				     let state = baseList.patInfo.message;
			
 
				     return (dispatch) => {
			
 
				-        json('/api/icss/inquiryInfo/readInquiry', {
			
 
				+        json('/inquiryInfo/readInquiry', {
			
 
				             "doctorId": state.doctorId,
			
 
				             "hospitalDeptId": state.hospitalDeptId,
			
 
				             "hospitalId": state.hospitalId,
			
--- a/src/store/async-actions/print.js
+++ b/src/store/async-actions/print.js
@@ -18,7 +18,7 @@ export const saveMessage = (bool) => {
 
				     let jsonData = getAllDataList(baseList);
			
 
				     // console.log(jsonStr.diag,'保存历史病历')
			
 
				     
			
 
				-    json('/api/icss/inquiryInfo/saveInquiry', {
			
 
				+    json('/inquiryInfo/saveInquiry', {
			
 
				         "doctorId": state.doctorId,
			
 
				         "hospitalDeptId": state.hospitalDeptId,
			
 
				         "hospitalId": state.hospitalId,
			
@@ -73,7 +73,7 @@ export const saveMessage = (bool) => {
 
				         }
			
 
				     })
			
 
				     if(bool){
			
 
				-        json('/api/icss/printRecord/savePrintRecords', {
			
 
				+        json('/printRecord/savePrintRecords', {
			
 
				             "dataJson": JSON.stringify(getAllDataList(baseList)),
			
 
				             "doctorId": state.doctorId,
			
 
				             "hospitalDeptId": state.hospitalDeptId,
			
--- a/src/store/async-actions/pushMessage.js
+++ b/src/store/async-actions/pushMessage.js
@@ -4,8 +4,8 @@ import { SET_CLICK_DIAG } from '../types/diagnosticList';
 
				 import {storageLocal,getEMRParams} from '@utils/tools';
			
 
				 
			
 
				 const api={
			
 
				-  push:'/api/icss/push/pushInner',
			
 
				-  textPush:'/api/icss/push/pushText'
			
 
				+  push:'/push/pushInner',
			
 
				+  textPush:'/push/pushText'
			
 
				 }
			
 
				 
			
 
				 //获取右侧推送信息
			
@@ -74,7 +74,7 @@ export const getTips = (diagItem) =>{
 
				             type: SET_CLICK_DIAG,
			
 
				             clickDiag: diagItem
			
 
				         })
			
 
				-        const url = '/api/icss/introduceInfo/getByQuestionId';
			
 
				+        const url = '/introduceInfo/getByQuestionId';
			
 
				         const params = {
			
 
				             questionId: diagItem.id,
			
 
				             type: 7,
			
@@ -100,7 +100,7 @@ export const getTipsDetails = () => {
 
				         // window.open(`/static/pages/information.html?type=7&&questionId=${state.diagnosticList.clickDiag.id}`);
			
 
				 
			
 
				         //弹窗显示
			
 
				-        const url ='/api/icss/introduceInfo/getByQuestionId'
			
 
				+        const url ='/introduceInfo/getByQuestionId'
			
 
				         const imageUrlPrefix = 'http://192.168.2.241:82'
			
 
				         
			
 
				         const params = {
			
--- a/src/store/async-actions/tabTemplate.js
+++ b/src/store/async-actions/tabTemplate.js
@@ -21,7 +21,7 @@ export const initItemList = (type) => { //初始化数据
 
				   let state = baseList.patInfo.message;
			
 
				 
			
 
				   return (dispatch) => {
			
 
				-    axios.json('/api/icss/templateInfo/getByDoctorIdTemplates', {
			
 
				+    axios.json('/templateInfo/getByDoctorIdTemplates', {
			
 
				       "doctorId": state.doctorId,
			
 
				       "hospitalDeptId": state.hospitalDeptId,
			
 
				       "hospitalId": state.hospitalId,
			
@@ -67,7 +67,7 @@ export const saveTemplateDetail = (val,sex) => { //保存为模板
 
				     return tmpObj;
			
 
				   }
			
 
				   return (dispatch) => {
			
 
				-    axios.json('/api/icss/templateInfo/saveTemplateInfo', getdata()).then((res) => {
			
 
				+    axios.json('/templateInfo/saveTemplateInfo', getdata()).then((res) => {
			
 
				       const data = res.data;
			
 
				       if (data.code == 0) {
			
 
				         Notify.success('模板保存成功');
			
@@ -97,7 +97,7 @@ export const saveTemplateDetail = (val,sex) => { //保存为模板
 
				 
			
 
				 export const delItem = (id) => { //删除
			
 
				   return (dispatch) => {
			
 
				-    axios.json('/api/icss/templateInfo/cancelTemplateInfos', {
			
 
				+    axios.json('/templateInfo/cancelTemplateInfos', {
			
 
				       ids: id
			
 
				     }).then((res) => {
			
 
				       let data = res.data;
			
@@ -112,7 +112,7 @@ export const delItem = (id) => { //删除
 
				 };
			
 
				 export const delBatchItem = (ids) => { //批量删除
			
 
				   return (dispatch) => {
			
 
				-    axios.json('/api/icss/templateInfo/cancelTemplateInfos', {
			
 
				+    axios.json('/templateInfo/cancelTemplateInfos', {
			
 
				       ids: ids.join(",")
			
 
				     }).then((res) => {
			
 
				       let data = res.data;
			
@@ -133,7 +133,7 @@ export const changeTitleAsync = (obj) => { //改标题
 
				     return;
			
 
				   }
			
 
				   return (dispatch) => {
			
 
				-    axios.json('/api/icss/templateInfo/updateByIdUsNames', {
			
 
				+    axios.json('/templateInfo/updateByIdUsNames', {
			
 
				       "doctorId": state.doctorId,
			
 
				       "hospitalDeptId": state.hospitalDeptId,
			
 
				       "hospitalId": state.hospitalId,
			
--- a/src/store/async-actions/treat.js
+++ b/src/store/async-actions/treat.js
@@ -7,8 +7,8 @@ import {storageLocal,getEMRParams} from '@utils/tools';
 
				 import { isAddMainSuit } from '@store/async-actions/diagnosticList';
			
 
				 
			
 
				 const api={
			
 
				-    push:'/api/icss/push/pushInner',
			
 
				-    textPush:'/api/icss/push/pushText'
			
 
				+    push:'/push/pushInner',
			
 
				+    textPush:'/push/pushText'
			
 
				 }
			
 
				 
			
 
				 export const addDiagnostic = (item) => {
			
@@ -219,7 +219,7 @@ export const getTreatResult = (item) =>{
 
				 export const getInstroduce = (item)=>{
			
 
				 
			
 
				     return (dispatch, getState) =>{
			
 
				-        const url = '/api/icss/introduceInfo/getByQuestionId';
			
 
				+        const url = '/introduceInfo/getByQuestionId';
			
 
				         const params = {
			
 
				             questionId: item.id,
			
 
				             type: 8,
			
@@ -253,7 +253,7 @@ export const  getInstroduceMore = (drugIdList) =>{
 
				     return (dispatch, getState) =>{
			
 
				         let drugInfoList = [];
			
 
				         for (let i = 0; i < drugIdList.drugIdList.length; i++ ) {
			
 
				-            const url = '/api/icss/introduceInfo/getByQuestionId';
			
 
				+            const url = '/introduceInfo/getByQuestionId';
			
 
				             const params = {
			
 
				                 questionId: drugIdList.drugIdList[i],
			
 
				                 type: 8,
			
@@ -293,7 +293,7 @@ export const  getInstroduceMore = (drugIdList) =>{
 
				 export const commonTreatAddToAdvice = () => {
			
 
				     return (dispatch, getState) => {
			
 
				         const state = getState();
			
 
				-        if(state.treat.treatItem.treatIndex === 0 && state.treat.isFirstMainDiag) {
			
 
				+        if(state.treat.treatItem.id === state.diagnosticList.diagnosticList[0].id && state.treat.isFirstMainDiag) {
			
 
				             dispatch({
			
 
				                 type: IS_FIRST_MAIN_DIAG
			
 
				             })
			
--- a/src/store/reducers/diagnosticList.js
+++ b/src/store/reducers/diagnosticList.js
@@ -30,7 +30,8 @@ const initState = {
 
				         //     type: 1
			
 
				         // }
			
 
				     ],
			
 
				-    mainSuitStr:''
			
 
				+    mainSuitStr:'',
			
 
				+    diagnosticStrNoType:'',
			
 
				 
			
 
				 }
			
 
				 
			
--- a/src/store/reducers/inspect.js
+++ b/src/store/reducers/inspect.js
@@ -23,6 +23,7 @@ const initSearchList = {
 
				 
			
 
				     getExcelDataList: [], //导入的数据
			
 
				     pushItem:[],    //推送的数据
			
 
				+    pushItems:[],    //右侧模板预览的数据
			
 
				 }
			
 
				 
			
 
				 export default (state = initSearchList, action) => {
			
@@ -41,6 +42,11 @@ export default (state = initSearchList, action) => {
 
				                 newState.labelList = [...tempArrs]
			
 
				             }
			
 
				         }
			
 
				+        
			
 
				+        let tmpArr = newState.getExcelDataList;
			
 
				+        let tmpArr2 = newState.labelList;
			
 
				+        newState.pushItems = getPushLists(tmpArr,tmpArr2);
			
 
				+        newState.inspectStrPlus = getStringPlus(newState.pushItems)
			
 
				         return newState;
			
 
				     }
			
 
				     if (action.type == RESET_LABEL) {             //选中的结果重组
			
@@ -56,6 +62,11 @@ export default (state = initSearchList, action) => {
 
				           tempArr.push(action.lis[i]);
			
 
				         }
			
 
				         newState.labelList = [...tempArr]
			
 
				+        
			
 
				+        let tmpArr = newState.getExcelDataList;
			
 
				+        let tmpArr2 = newState.labelList;
			
 
				+        newState.pushItems = getPushLists(tmpArr,tmpArr2);
			
 
				+        newState.inspectStrPlus = getStringPlus(newState.pushItems);
			
 
				         return newState;
			
 
				     }
			
 
				     if (action.type == FILL_ACTIVE) {                        //点击标签放到暂存里
			
@@ -79,7 +90,8 @@ export default (state = initSearchList, action) => {
 
				         }
			
 
				         tempArrs.show = false;
			
 
				         newState.pushItem = getPushList(tmpArr,tmpArr2);
			
 
				-        newState.inspectStrPlus = getStringPlus(newState.pushItem)
			
 
				+        newState.pushItems = getPushLists(tmpArr,tmpArr2);
			
 
				+        newState.inspectStrPlus = getStringPlus(newState.pushItems)
			
 
				         return newState;
			
 
				     }
			
 
				     if (action.type == GET_EXCEL) {              //导入数据
			
@@ -120,7 +132,8 @@ export default (state = initSearchList, action) => {
 
				         newState.getExcelDataList = [...tmpArr];
			
 
				         let tempArr1 = newState.getExcelDataList;
			
 
				         newState.pushItem = getPushList(tempArr1,tempArr2);
			
 
				-        newState.inspectStrPlus = getStringPlus(newState.pushItem)
			
 
				+        newState.pushItems = getPushLists(tempArr1,tempArr2);
			
 
				+        newState.inspectStrPlus = getStringPlus(newState.pushItems)
			
 
				         return newState;
			
 
				     }
			
 
				     if (action.type == CHECK_VALUE_IS_CHANGE) {     //数据添加后显示与否
			
@@ -135,7 +148,8 @@ export default (state = initSearchList, action) => {
 
				         newState.labelList = tempArrs;
			
 
				         // tempArrAct.show = true;
			
 
				         newState.pushItem = getPushList(tmpArr,tempArrs);
			
 
				-        newState.inspectStrPlus = getStringPlus(newState.pushItem)
			
 
				+        newState.pushItems = getPushLists(tmpArr,tempArrs);
			
 
				+        newState.inspectStrPlus = getStringPlus(newState.pushItems)
			
 
				         return newState;
			
 
				     }
			
 
				     if (action.type == CLEAR_ALL_LABEL) {     //清空所有数据
			
@@ -155,7 +169,8 @@ export default (state = initSearchList, action) => {
 
				         newState.labelList = [...tempArr];
			
 
				         let tmpArr = newState.getExcelDataList;
			
 
				         newState.pushItem = getPushList(tmpArr,tempArr);
			
 
				-        newState.inspectStrPlus = getStringPlus(newState.pushItem)
			
 
				+        newState.pushItems = getPushLists(tmpArr,tempArr);
			
 
				+        newState.inspectStrPlus = getStringPlus(newState.pushItems)
			
 
				         return newState;
			
 
				     }
			
 
				     return state;
			
@@ -163,7 +178,7 @@ export default (state = initSearchList, action) => {
 
				 
			
 
				 function getExcelString(action,newState,tmpArr,tmpArr2) {
			
 
				   let tmpString = '';
			
 
				-  if(JSON.stringify(action.data) != '{}' && action.data.lisExcelRes.length > 0){
			
 
				+  if(JSON.stringify(action.data||{}) != '{}' && action.data.lisExcelRes.length > 0){
			
 
				     action.data.lisExcelRes.map((item)=>{
			
 
				         item.lisExcelItem.map((part)=>{
			
 
				             if(part.type == 1){
			
@@ -186,7 +201,8 @@ function getExcelString(action,newState,tmpArr,tmpArr2) {
 
				         })
			
 
				     })
			
 
				     newState.pushItem = getPushList(tmpArr,tmpArr2);
			
 
				-    newState.inspectStrPlus = getStringPlus(newState.pushItem)
			
 
				+    newState.pushItems = getPushLists(tmpArr,tmpArr2);
			
 
				+    newState.inspectStrPlus = getStringPlus(newState.pushItems)
			
 
				   }else{
			
 
				     newState.inspectStrPlus = '';
			
 
				     newState.pushItem = []
			
@@ -224,8 +240,13 @@ function getString(lists) {
 
				 function getStringPlus(dataList){
			
 
				   let strPlus = '';
			
 
				   dataList && dataList.map((item)=>{
			
 
				-    let strTmp = item.name + ',' + item.detailName + ',' + (item.otherValue ? item.otherValue : (item.value + item.units)) +';'
			
 
				-    strPlus += strTmp;
			
 
				+    if(item.detailName){
			
 
				+      let strTmp = item.name + ',' + item.detailName + ',' + (item.otherValue ? item.otherValue : (item.value + item.units)) +';'
			
 
				+      strPlus += strTmp;
			
 
				+    }else{
			
 
				+      let strTmp = item.name+';'
			
 
				+      strPlus += strTmp;
			
 
				+    }
			
 
				   })
			
 
				   return strPlus;
			
 
				 }
			
@@ -256,7 +277,49 @@ function getPushList(data1,data2){     //推送数据
 
				         })
			
 
				     })
			
 
				     data2.length>0 && data2.map((item)=>{        //填写单数据拼接
			
 
				-        item.details.map((val)=>{
			
 
				+      item.details && item.details.map((val)=>{
			
 
				+            if(val.value != undefined && val.value != ''){
			
 
				+                let tmpObj = {};
			
 
				+                tmpObj.name = item.name || '';
			
 
				+                tmpObj.detailName = val.name || '';
			
 
				+                tmpObj.uniqueName = val.uniqueName || '';//公表名称
			
 
				+                tmpObj.source = '0';     //数据来源
			
 
				+                tmpObj.maxValue = val.maxValue ? val.maxValue : '';
			
 
				+                tmpObj.minValue = val.minValue ? val.minValue : '';
			
 
				+                tmpObj.units = val.labelSuffix || '';
			
 
				+                tmpObj.value = (val.value-0) === (val.value-0) ? val.value:'';
			
 
				+                tmpObj.otherValue = (val.value-0) === (val.value-0) ?'':val.value;
			
 
				+                tmpArr2.push(tmpObj);
			
 
				+            }
			
 
				+        })
			
 
				+    })
			
 
				+    totalTmpArr = tmpArr1.concat(tmpArr2);
			
 
				+    return totalTmpArr;
			
 
				+}
			
 
				+function getPushLists(data1,data2){     //推送数据
			
 
				+    let tmpArr1 = [];
			
 
				+    let tmpArr2 = [];
			
 
				+    let totalTmpArr = [];
			
 
				+    data1.length>0 && data1.map((items)=>{    //excel导入的数据拼接
			
 
				+        items.lisExcelRes.map((item)=>{
			
 
				+            item.lisExcelItem.map((part)=>{
			
 
				+                let tmpObj = {};
			
 
				+                tmpObj.name = part.mealName || '';//套餐名
			
 
				+                tmpObj.detailName = part.itemName || '';//化验项名
			
 
				+                tmpObj.uniqueName = part.uniqueName || '';//公表名称
			
 
				+                tmpObj.source = '1';//数据来源
			
 
				+                tmpObj.maxValue = part.max || ''; 
			
 
				+                tmpObj.minValue = part.min || '';
			
 
				+                tmpObj.units = part.unit || '';//单位
			
 
				+                tmpObj.value = (part.value-0) === (part.value-0) ? part.value:'';//值
			
 
				+                tmpObj.otherValue = (part.value-0) === (part.value-0) ?'':part.value; //阴性阳性
			
 
				+                tmpArr1.push(tmpObj);
			
 
				+            })
			
 
				+        })
			
 
				+    })
			
 
				+    data2.length>0 && data2.map((item)=>{        //填写单数据拼接
			
 
				+      if(item.show){
			
 
				+          item.details.map((val)=>{
			
 
				             if(val.value != undefined && val.value != ''){
			
 
				                 let tmpObj = {};
			
 
				                 tmpObj.name = item.name || '';
			
@@ -271,6 +334,11 @@ function getPushList(data1,data2){     //推送数据
 
				                 tmpArr2.push(tmpObj);
			
 
				             }
			
 
				         })
			
 
				+      }else{
			
 
				+        let tmpObj = {};
			
 
				+        tmpObj.name = item.name;
			
 
				+        tmpArr2.push(tmpObj);
			
 
				+      }
			
 
				     })
			
 
				     totalTmpArr = tmpArr1.concat(tmpArr2);
			
 
				     return totalTmpArr;
			
--- a/src/store/reducers/treat.js
+++ b/src/store/reducers/treat.js
@@ -1,5 +1,5 @@
 
				-import { SELECT_DRUG, SET_TREAT_INFO, SET_OTHER_DRUG, SET_DRUG_INFO, CLEAR_DRUG_INFO,SHOW_TREAT, HIDE_TREAT, CLEAR_TREAT, SHOW_DRUG_INFO, HIDE_DRUG_INFO, SET_GENERAL_TREAT, SET_TREATMENT, SET_SURGERY_TREAT, SET_RECOMMEND_BASIC, SET_DRUG_INFO_LIST,IS_FIRST_MAIN_DIAG } from '../types/treat'
			
 
				-import { selectDrug, setTreatInfo, setOtherDrug, setDrugInfo, clearDrugInfo, showTreat, hideTreat, clearTreat, showDrugInfo, hideDrugInfo, setTreatment, setGeneralTreat, setSurgeryTreat, setRecommendBasic, setDrugInfoList, isFirstMainDiag } from '../actions/treat'
			
 
				+import { SELECT_DRUG, SET_TREAT_INFO, SET_OTHER_DRUG, SET_DRUG_INFO, CLEAR_DRUG_INFO,SHOW_TREAT, HIDE_TREAT, CLEAR_TREAT, SHOW_DRUG_INFO, HIDE_DRUG_INFO, SET_GENERAL_TREAT, SET_TREATMENT, SET_SURGERY_TREAT, SET_RECOMMEND_BASIC, SET_DRUG_INFO_LIST,IS_FIRST_MAIN_DIAG,CLEAR_FIRST_MAIN_DIAG } from '../types/treat'
			
 
				+import { selectDrug, setTreatInfo, setOtherDrug, setDrugInfo, clearDrugInfo, showTreat, hideTreat, clearTreat, showDrugInfo, hideDrugInfo, setTreatment, setGeneralTreat, setSurgeryTreat, setRecommendBasic, setDrugInfoList, isFirstMainDiag,clearFirstMainDiag } from '../actions/treat'
			
 
				 const initState = {
			
 
				     show: false, //治疗方案显示隐藏
			
 
				     showDrugInfo: false, //药品信息显示隐藏
			
@@ -200,6 +200,8 @@ export default function(state=initState, action){
 
				             return setDrugInfoList(state, action);
			
 
				         case IS_FIRST_MAIN_DIAG: 
			
 
				             return isFirstMainDiag(state, action)
			
 
				+        case CLEAR_FIRST_MAIN_DIAG: 
			
 
				+            return clearFirstMainDiag(state, action)
			
 
				         default:
			
 
				             return state
			
 
				     }
			
--- a/src/store/types/treat.js
+++ b/src/store/types/treat.js
@@ -14,4 +14,5 @@ export const SET_RECOMMEND_BASIC = 'SET_RECOMMEND_BASIC'//设置其他推荐推
 
				 export const SET_TREAT_INFO = 'SET_TREAT_INFO' //设置治疗方案信息（name,id等）
			
 
				 export const SET_DRUG_INFO_LIST = 'SET_DRUG_INFO_LIST' //查询多个药品说明书（添加数据时查看药品说明用）
			
 
				 export const IS_FIRST_MAIN_DIAG = 'IS_FIRST_MAIN_DIAG' //是否为主诊断第一次开单
			
 
				+export const CLEAR_FIRST_MAIN_DIAG = 'CLEAR_FIRST_MAIN_DIAG' //回读清空是否为主诊断第一次开单
			
 
				 
			
--- a/src/utils/ajax.js
+++ b/src/utils/ajax.js
@@ -1,20 +1,24 @@
 
				-import {host} from './config'
			
 
				+import {host,prefix} from './config'
			
 
				 import { getUrlArgObject } from "@utils/tools";
			
 
				 const $ = require('jquery');
			
 
				 $.support.cors = true;
			
 
				 const axios=require('axios');
			
 
				 const qs=require('querystring');
			
 
				 const isLocal = window.location.hostname.indexOf('localhost')!=-1;
			
 
				-const qhost = isLocal?host:'';
			
 
				+const qhost = isLocal?host+prefix:prefix;
			
 
				 axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded';
			
 
				 //axios.defaults.baseURL = host;       //默认地址
			
 
				 // axios.defaults.timeout = 60000;       //请求超时
			
 
				 
			
 
				 
			
 
				-    // const appkeyId = getUrlArgObject("appkey");
			
 
				+    const securityCode = getUrlArgObject("code");
			
 
				+    const appKeyId = getUrlArgObject("appI");
			
 
				+    const appKeySecret = getUrlArgObject("appS");
			
 
				     axios.interceptors.request.use(
			
 
				         req => {
			
 
				-            // req.headers.appKey = appkeyId;
			
 
				+          req.headers.appKeyId = appKeyId;
			
 
				+          req.headers.appKeySecret = appKeySecret;
			
 
				+          req.headers.securityCode = securityCode;
			
 
				             return req;
			
 
				         },
			
 
				         error => {
			
@@ -33,10 +37,10 @@ axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded
 
				             if (error.response) {
			
 
				                 switch (error.response.status) {
			
 
				                     case 401:
			
 
				-                        //alert(401)
			
 
				+                        //alert("服务正在升级，请稍后再试");
			
 
				                         break;
			
 
				                     case 500:
			
 
				-                        //alert(500)
			
 
				+                        //alert('后台接口报错');
			
 
				                         break;
			
 
				                     default:
			
 
				                         //alert('其他')
			
@@ -61,7 +65,11 @@ const post=(url,data)=>{
 
				 //json传参
			
 
				 const json=(url,data)=>{
			
 
				   //兼容ie8,axios在ie8下content-type设置不成功且会把headers置为null
			
 
				-  return new Promise((resolve,reject)=>{
			
 
				+  return axios({
			
 
				+    method:'post',
			
 
				+    url:qhost+url,
			
 
				+    data
			
 
				+  });/*new Promise((resolve,reject)=>{
			
 
				     $.ajax({
			
 
				       method:'post',
			
 
				       url:qhost+url,
			
@@ -74,7 +82,7 @@ const json=(url,data)=>{
 
				         reject(error);
			
 
				       },
			
 
				     });
			
 
				-  });
			
 
				+  });*/
			
 
				 };
			
 
				 
			
 
				 const get=(url)=>{
			
--- a/src/utils/config.js
+++ b/src/utils/config.js
@@ -6,5 +6,7 @@ const host='http://192.168.2.241:5050';//后端接口访问地址
 
				 // const host='http://192.168.3.117:8080'; //周铁刚
			
 
				 // const newIcssVisitUrl = '223.93.170.82:13000';    //icss服务访问地址（跳转目的地），不能加http://
			
 
				 module.exports={
			
 
				-    host
			
 
				+    host,
			
 
				+    // prefix:'/api/icssyz'            //带权限验证的api
			
 
				+    prefix:'/api/icss'            //带权限验证的api
			
 
				 };
			
--- a/src/utils/tools.js
+++ b/src/utils/tools.js
@@ -8,6 +8,7 @@ import {clearAllLabel} from '@store/actions/inspect';
 
				 import {CLEAR_ALL_DIAG} from '@store/types/diagnosticList';
			
 
				 import {CLEAR_ALL_PUSH_MESSAGE, SET_TIPS} from '@store/types/pushMessage';
			
 
				 import {ISREAD, SETREADDITEMS} from "../store/types/homePage";
			
 
				+import {CLEAR_FIRST_MAIN_DIAG} from "../store/types/treat";
			
 
				 import {tabChange} from '@store/actions/tabTemplate';
			
 
				 import config from '@config/index.js';
			
 
				 
			
@@ -187,7 +188,8 @@ const getAllDataList =(baseList) =>{           //获取所有模块结构化的
 
				     jsonData.addItems = baseList.homePage.addItems||{};
			
 
				     jsonData.mainsuitIds = baseList.mainSuit.mainIds;      //主诉去重
			
 
				     jsonData.currentIds = baseList.currentIll.symptomIds;      //现病史去重
			
 
				-    //console.log(jsonData,'结构化数据获取')
			
 
				+    jsonData.isFirstMainDiag = baseList.treat.isFirstMainDiag;      //治疗方案
			
 
				+    // console.log(jsonData,'结构化数据获取')
			
 
				     return jsonData;
			
 
				 }
			
 
				 const getAllDataStringList =(baseList) =>{           //获取所有模块文本的数据
			
@@ -260,6 +262,10 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
 
				             data:{},
			
 
				             saveText:'',
			
 
				         });
			
 
				+        store.dispatch({
			
 
				+          type:CLEAR_FIRST_MAIN_DIAG,
			
 
				+          flag:true
			
 
				+        });
			
 
				         storageLocal.remove('emrParam');
			
 
				        // Notify.success('页面已清空')
			
 
				     }else{
			
@@ -325,6 +331,10 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
 
				                   type:SETREADDITEMS,
			
 
				                   data:dataJson.addItems
			
 
				                 });
			
 
				+                store.dispatch({
			
 
				+                  type:CLEAR_FIRST_MAIN_DIAG,
			
 
				+                  flag:dataJson.isFirstMainDiag
			
 
				+                });
			
 
				               //tab跳回辅助信息
			
 
				               store.dispatch(tabChange('0'));
			
 
				             }else{    //结构化历史病历回读
			
@@ -389,6 +399,10 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
 
				                 type:SETREADDITEMS,
			
 
				                 data:dataJson.addItems
			
 
				               });
			
 
				+              store.dispatch({
			
 
				+                type:CLEAR_FIRST_MAIN_DIAG,
			
 
				+                flag:dataJson.isFirstMainDiag
			
 
				+              });
			
 
				             }
			
 
				         } else {
			
 
				             if(type == 'template'){     //纯文本模板回读
			
@@ -438,6 +452,10 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
 
				                 type:SETREADDITEMS,
			
 
				                 data:dataJson.addItems
			
 
				               });
			
 
				+              store.dispatch({
			
 
				+                type:CLEAR_FIRST_MAIN_DIAG,
			
 
				+                flag:dataJson.isFirstMainDiag
			
 
				+              });
			
 
				               //tab跳回辅助信息
			
 
				               store.dispatch(tabChange('0'));
			
 
				             }else{  //纯文本历史病历回读
			
@@ -493,6 +511,10 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
 
				                 type:SETREADDITEMS,
			
 
				                 data:dataJson.addItems
			
 
				               });
			
 
				+              store.dispatch({
			
 
				+                type:CLEAR_FIRST_MAIN_DIAG,
			
 
				+                flag:dataJson.isFirstMainDiag
			
 
				+              });
			
 
				             }
			
 
				         }
			
 
				     }
			
@@ -513,6 +535,7 @@ function filterArr(arr){
 
				 function filterDataArr(arrTmp){   //数据处理
			
 
				     let tmpArr = [];
			
 
				     tmpArr = arrTmp.map((it,i)=>{     //连续的标点符号保留第一个
			
 
				+      if(!it)return '';
			
 
				       if(!it.match(config.punctuationReg)&&!arrTmp[i-1]){        //只有标点符号或者前一个标签无值是（说明本标点灰显，不显示在预览中）
			
 
				           return '';
			
 
				       }
			
@@ -549,8 +572,9 @@ function filterOtherDataArr(arrTmp,jsonArr){
 
				       return word.substr(0,1);
			
 
				     });
			
 
				   });
			
 
				-  const str1 = [...tmpArr].splice(0,index1).join("");
			
 
				-  const str2 = [...tmpArr].splice(index1).join("");
			
 
				+  const splitNum = [index1,index2,index3,index4].find((i)=>i!=-1);
			
 
				+  const str1 = [...tmpArr].splice(0,splitNum).join("");
			
 
				+  const str2 = [...tmpArr].splice(splitNum).join("");
			
 
				   return {str1:trimDots(str1),str2:trimDots(str2),index:index1};
			
 
				 }
			
 
				 //去掉开头的标点符号，最后的标点保留第一个,中间连续的保留第一个
			
@@ -560,6 +584,16 @@ function trimDots(str){
 
				   }).replace(/^[,，.。:："“？?”；;、!！\s]+/,'');
			
 
				 }
			
 
				 
			
 
				+//标签间连续标点只保留一个，保留前面一个
			
 
				+function formatContinueDots(data){
			
 
				+  let arr=data.filter((it,i)=>{
			
 
				+    if(!(it.name=='，'&&data[i-1].name=='，')){
			
 
				+      return it;
			
 
				+    }
			
 
				+  });
			
 
				+  return arr;
			
 
				+}
			
 
				+
			
 
				 // 取消默认行为
			
 
				 function preventDefault(event) {
			
 
				     if (event.preventDefault) {
			
@@ -693,6 +727,89 @@ function timestampToTime(timestamp) {     //excel导入2019年5月1日会转换
 
				   var s = date.getSeconds();
			
 
				   return Y+M+D+h+m+s;
			
 
				 }
			
 
				+function getPageLength(event) {     //兼容ie8获取页面距离左和上的距离，包括滚动距离
			
 
				+  let e = event || window.event;
			
 
				+  let scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
			
 
				+  let scrollY = document.documentElement.scrollTop || document.body.scrollTop;
			
 
				+  let x = e.pageX || e.clientX + scrollX;
			
 
				+  let y = e.pageY || e.clientY + scrollY;
			
 
				+  let page = {
			
 
				+    pageX:x,
			
 
				+    pageY:y
			
 
				+  }
			
 
				+  return page;
			
 
				+}
			
 
				+function dragBox(domWrap,domDrag){
			
 
				+  let drag = document.getElementById(domDrag);//拖拽区域
			
 
				+  let wrap = document.getElementById(domWrap);//被拖拽的元素
			
 
				+  let width = window.innerWidth||document.documentElement.clientWidth||document.body.clientWidth;//屏幕宽度
			
 
				+  let height = window.innerHeight||document.documentElement.clientHeight||document.body.clientHeight;//屏幕高度
			
 
				+  let mouseX = 0,mouseY = 0,dragX = 0,dragY = 0,isDrag = false,isMove = false;
			
 
				+  windowEventHandler('mousedown',(event)=>{    //鼠标位置获取，计算点击位置到拖拽元素左边的距离
			
 
				+    let wrap = document.getElementById(domWrap);
			
 
				+    let page = getPageLength(event);
			
 
				+    drag = document.getElementById(domDrag);
			
 
				+    mouseX = page.pageX - wrap.offsetLeft      //鼠标到拖拽元素的左边界的距离
			
 
				+    mouseY = page.pageY - wrap.offsetTop       //鼠标到拖拽元素的上边界的距离
			
 
				+    isDrag = true
			
 
				+    isMove = false
			
 
				+  },drag)
			
 
				+  // windowEventHandler('mousemove',handleMove,document)
			
 
				+  windowEventHandler('mousemove',(event)=>{      //移动的
			
 
				+    let dragDes = document.getElementById('treatDescBox');//展開区域
			
 
				+    let page = getPageLength(event);
			
 
				+    let maxDragX = 0,dragDesWidth = 0;
			
 
				+    let maxDragY = height - wrap.offsetHeight;//最大可拖拽y方向距离
			
 
				+
			
 
				+    if(domDrag == 'dragTreatTitle'){//最大可推拽x方向距离
			
 
				+      if(dragDes != null){
			
 
				+        dragDesWidth = dragDes.offsetWidth
			
 
				+      }else{
			
 
				+        dragDesWidth = 0
			
 
				+      }
			
 
				+      maxDragX = width - wrap.offsetWidth - dragDesWidth
			
 
				+    }else{
			
 
				+      maxDragX = width - wrap.offsetWidth
			
 
				+    }
			
 
				+    if(isDrag){
			
 
				+      dragX = page.pageX - mouseX          //鼠标可拖拽到左边的最大距离
			
 
				+      dragY = page.pageY - mouseY          //鼠标可拖拽到上边的最大距离
			
 
				+      if(dragX < 0){      //不能超出左边界
			
 
				+        dragX = 0
			
 
				+      }
			
 
				+      if(dragY < 0){      //不能超出上边界
			
 
				+        dragY = 0
			
 
				+      }
			
 
				+      if(domDrag == 'dragTreatTitle'){
			
 
				+        if(width-dragX-dragDesWidth < wrap.offsetWidth){    //不能超出右边界
			
 
				+          dragX = maxDragX
			
 
				+        }
			
 
				+      }else{
			
 
				+        if(width-dragX < wrap.offsetWidth){    //不能超出右边界
			
 
				+          dragX = maxDragX
			
 
				+        }
			
 
				+      }
			
 
				+      if(height-dragY < wrap.offsetHeight){     //不能超出下边界
			
 
				+        dragY = maxDragY
			
 
				+      }
			
 
				+      isMove = true
			
 
				+      wrap.style.left = dragX + 'px'
			
 
				+      wrap.style.marginLeft = 0 + 'px'
			
 
				+      wrap.style.top = dragY + 'px'
			
 
				+    }
			
 
				+  },document)
			
 
				+  windowEventHandler('mouseup',()=>{
			
 
				+    if(isMove){ //有move就设置位置没有移动就不处理
			
 
				+      wrap.style.left = dragX + 'px'
			
 
				+      wrap.style.top = dragY + 'px'
			
 
				+    }
			
 
				+    isDrag = false
			
 
				+    return false
			
 
				+  },document)
			
 
				+}
			
 
				+// function handleMove(event,mouseX){
			
 
				+//     console.log(event)
			
 
				+// }
			
 
				 module.exports = {
			
 
				     checkType: Type.checkType,
			
 
				     regexp,
			
@@ -720,5 +837,8 @@ module.exports = {
 
				     normalVal,
			
 
				     getPageCoordinate,
			
 
				     windowRemoveEventHandler,
			
 
				-    timestampToTime
			
 
				+    timestampToTime,
			
 
				+    getPageLength,
			
 
				+    dragBox,
			
 
				+    formatContinueDots
			
 
				 };
			
--- a/static/pages/hisLib/diag_push.js
+++ b/static/pages/hisLib/diag_push.js
@@ -123,9 +123,9 @@
 
				     var key='',modeClass='.'+config.mode;
			
 
				     mapItem(modeClass+" .box5", data['lisList'],5);   //化验
			
 
				     mapItem(modeClass+" .box6", data['pacsList'],6);   //辅捡
			
 
				-    data['dis']['可能诊断'].length>0&&mapItem(modeClass+" .box7", data['dis']['可能诊断'],7);   //初步诊断
			
 
				-    data['dis']['确诊'].length>0&&mapItem(modeClass+" .box8", data['dis']['确诊'],7);   //疑似诊断
			
 
				-    data['dis']['警惕'].length>0&&mapItem(modeClass+" .box9", data['dis']['警惕'],7);   //警惕
			
 
				+    data['dis']['可能诊断']&&data['dis']['可能诊断'].length>0&&mapItem(modeClass+" .box7", data['dis']['可能诊断'],7);   //初步诊断
			
 
				+    data['dis']['确诊']&&data['dis']['确诊'].length>0&&mapItem(modeClass+" .box8", data['dis']['确诊'],7);   //疑似诊断
			
 
				+    data['dis']['警惕']&&data['dis']['警惕'].length>0&&mapItem(modeClass+" .box9", data['dis']['警惕'],7);   //警惕
			
 
				 
			
 
				     $("a.info").click(function(e){
			
 
				       getTreatInfo($(e.target).attr('type'),$(e.target).attr('name'),$(e.target).attr('detailName'))
			
@@ -136,11 +136,13 @@
 
				   //遍历数据
			
 
				   function mapItem(dom,item,type){
			
 
				     var itemDom = '';
			
 
				-    for(var i=0;i<item.length;i++){
			
 
				-      if(i>config.num-1){
			
 
				-        itemDom += '<p class="inner-item"><a href="##" class="hide">'+(item[i].name||item[i].uniqueName)+'</a><a class="info hide" target="_blank name="'+item[i].name+'" type='+type+' detail="'+item[i].detailName+'>i</a></p>';
			
 
				-      }else{
			
 
				-        itemDom += '<p class="inner-item"><a href="##">'+(item[i].name||item[i].uniqueName)+'</a><a class="info" target="_blank" name='+item[i].name+' type="'+type+'" detail="'+item[i].detailName+'">i</a></p>';
			
 
				+    if(item){
			
 
				+      for(var i=0;i<item.length;i++){
			
 
				+        if(i>config.num-1){
			
 
				+          itemDom += '<p class="inner-item"><a href="##" class="hide">'+(item[i].name||item[i].uniqueName)+'</a><a class="info hide" target="_blank name="'+item[i].name+'" type='+type+' detail="'+item[i].detailName+'>i</a></p>';
			
 
				+        }else{
			
 
				+          itemDom += '<p class="inner-item"><a href="##">'+(item[i].name||item[i].uniqueName)+'</a><a class="info" target="_blank" name='+item[i].name+' type="'+type+'" detail="'+item[i].detailName+'">i</a></p>';
			
 
				+        }
			
 
				       }
			
 
				     }
			
 
				     $(dom+" .item-content").html(itemDom||"无");