6 éve · b37ea33157
--- a/src/common/components/EditableSpan/index.jsx
+++ b/src/common/components/EditableSpan/index.jsx
@@ -96,8 +96,11 @@ class EditableSpan extends Component{
 
				       temp = newText.replace(searchPre,'');
			
 
				       isEnd = !(newText.indexOf(searchPre)>0);
			
 
				       search = temp.replace(/[(^\s*)|(\s*$)|(^\,*)|(\,*$)]/g,'');
			
 
				+      if(!search&&searchPre){
			
 
				+        search = searchPre;
			
 
				+      }
			
 
				       //console.log(labelVal,'旧：',searchPre,'新：',newText,'搜索：',search);
			
 
				-      if(config.punctuationReg.test(search)){     //只有标点符号时不搜索
			
 
				+      if(config.punctuationReg.test(search)){    //只有标点符号时不搜索
			
 
				         handleSearch&&handleSearch({text:search,isEnd,boxMark,mainIds});
			
 
				       }else{//只有标点符号时要清空搜索结果
			
 
				         handleClear && handleClear({boxMark})
			
--- a/src/components/AddAssistCheck/Textarea/index.jsx
+++ b/src/components/AddAssistCheck/Textarea/index.jsx
@@ -47,6 +47,9 @@ class Textarea extends Component {
 
				     if(next.isRead != isRead){
			
 
				       this.$dom.current.innerText = next.value||'';
			
 
				     }
			
 
				+    if(next.value && next.value.trim() != ''){
			
 
				+      $("#textareaWarring").html('')
			
 
				+    }
			
 
				   }
			
 
				   componentDidMount(){
			
 
				     const {value} = this.props;
			
--- a/src/components/AddAssistCheck/index.jsx
+++ b/src/components/AddAssistCheck/index.jsx
@@ -88,12 +88,12 @@ class AddAssistCheck extends React.Component {
 
				         const {handleSign} = this.props;
			
 
				         return <ul>
			
 
				         {
			
 
				-            list && list.map((item) => {
			
 
				+            list && list.map((item,idx) => {
			
 
				                 return <li key={item.id}
			
 
				                     className={styles.searchLi}
			
 
				                     title={item.name}
			
 
				                     onClick={() => {
			
 
				-                        handleSign(item.questionId);
			
 
				+                        handleSign(item.questionId,idx);
			
 
				                         this.setState({ show: false })
			
 
				                     }}
			
 
				                 >
			
@@ -104,12 +104,12 @@ class AddAssistCheck extends React.Component {
 
				     </ul>
			
 
				     }
			
 
				     getAssistLabel(){
			
 
				-        const {assistLabel,handleChangeAssistValue,handleChangeDate,isRead,handlePush} = this.props;
			
 
				+        const {assistLabel,handleChangeAssistValue,handleChangeDate,isRead,handlePush,winWidth} = this.props;
			
 
				         return <ul className={styles.labelWrap} id="datePick">
			
 
				             {
			
 
				                 assistLabel.map((item,idx) => {
			
 
				                     return (<li key={item.id} className={styles.assistLists}>
			
 
				-                        <span className={styles.assistName}>{item.name}：</span>
			
 
				+                        <span className={styles.assistName} style={{width:winWidth < 1200?'120px':'auto'}}>{item.name}：</span>
			
 
				                         <div className={styles.textareaWrap}>
			
 
				                             <Textarea value={item.value} handlePush={handlePush} isRead={isRead} handleChangeAssistValue={handleChangeAssistValue} idx={idx}></Textarea>
			
 
				                         </div>
			
@@ -132,7 +132,7 @@ class AddAssistCheck extends React.Component {
 
				         return (
			
 
				             <div className={styles.wrapper}>
			
 
				                 {this.getAssistLabel()}
			
 
				-                <div id="searchWrapAssist" style={{position:"relative"}}>
			
 
				+                <div id="searchWrapAssist" style={{position:"relative",clear:'both'}}>
			
 
				                     <Add showText="添加辅检项" handleClick={(e) => this.handleSearchShow(e)} id="assistCheck"/>
			
 
				                   {this.state.show?<SearchOption handleChangeValue={handleChangeValue} visible={true}>
			
 
				                         {this.getSearchList(list)}
			
--- a/src/components/AddAssistCheck/index.less
+++ b/src/components/AddAssistCheck/index.less
@@ -69,8 +69,8 @@
 
				             }
			
 
				         }
			
 
				         .assistName {
			
 
				-            height: 20px;
			
 
				-            line-height: 20px;
			
 
				+            // height: 20px;
			
 
				+            // line-height: 20px;
			
 
				             box-sizing: border-box;
			
 
				             float: left;
			
 
				         }
			
--- a/src/components/AddInspect/index.jsx
+++ b/src/components/AddInspect/index.jsx
@@ -1,6 +1,6 @@
 
				 import React from 'react';
			
 
				 import { SearchOption, InspectCommon, Calendar ,Notify,ConfirmModal,Add} from '@commonComp';
			
 
				-import { deepClone,normalVal } from '@utils/tools';
			
 
				+import { deepClone,normalVal,timestampToTime,filterDataArr } from '@utils/tools';
			
 
				 import styles from './index.less';
			
 
				 import date1 from './img/date1.png';
			
 
				 import date2 from './img/date2.png';
			
@@ -131,7 +131,7 @@ class Inspect extends React.Component {
 
				         this.setState({dateTime:date})
			
 
				         return date;
			
 
				     }
			
 
				-    changeActivePart(idx,val){
			
 
				+    changeActivePart(idx,val,clear){
			
 
				         let nums = this.state.num;
			
 
				         let fillActive;
			
 
				         if(nums == 0){
			
@@ -142,22 +142,33 @@ class Inspect extends React.Component {
 
				         ++nums;
			
 
				         this.setState({num:nums});
			
 
				         let tempArr = deepClone(fillActive);
			
 
				-        let tempNumPlus = 0;
			
 
				-        for (let i = 0; i < tempArr.details.length; i++) {
			
 
				-            if (i == idx) {
			
 
				-                tempArr.details[i].value = val
			
 
				-            }
			
 
				-            if(tempArr.details[i].value != undefined && tempArr.details[i].value != ''){
			
 
				-                tempArr.show = true;
			
 
				-            }else{
			
 
				-                ++tempNumPlus;
			
 
				-                if(tempNumPlus == tempArr.details.length){
			
 
				-                    tempArr.show = false;
			
 
				-                }
			
 
				-            }
			
 
				+        
			
 
				+        if(clear){    //点击清空按钮，至清初输入的数字
			
 
				+          for (let i = 0; i < tempArr.details.length; i++) {
			
 
				+            tempArr.details[i].value = ''
			
 
				+            tempArr.show = false;
			
 
				+          }
			
 
				+          tempArr.time = this.getCurrentDate();
			
 
				+          this.setState({currentData:tempArr})
			
 
				+          return;
			
 
				+        }else{
			
 
				+          let tempNumPlus = 0;
			
 
				+          for (let i = 0; i < tempArr.details.length; i++) {
			
 
				+              if (i == idx) {
			
 
				+                  tempArr.details[i].value = val
			
 
				+              }
			
 
				+              if(tempArr.details[i].value != undefined && tempArr.details[i].value != ''){
			
 
				+                  tempArr.show = true;
			
 
				+              }else{
			
 
				+                  ++tempNumPlus;
			
 
				+                  if(tempNumPlus == tempArr.details.length){
			
 
				+                      tempArr.show = false;
			
 
				+                  }
			
 
				+              }
			
 
				+          }
			
 
				+          tempArr.time = this.state.dateTime;
			
 
				+          this.setState({currentData:tempArr})
			
 
				         }
			
 
				-        tempArr.time = this.state.dateTime;
			
 
				-        this.setState({currentData:tempArr})
			
 
				     }
			
 
				     getItemList(){        //填写单展示
			
 
				         let number = this.state.num;
			
@@ -242,6 +253,18 @@ class Inspect extends React.Component {
 
				             return <td style={{width:'20%'}}><span className={(val.value - 0).toString() == 'NaN'?"red":(val.maxValue || val.minValue) ? (val.value > val.maxValue || val.value < val.minValue?"red":''):''}>{val.value}</span> { val.labelSuffix}</td>
			
 
				         }
			
 
				     }
			
 
				+    toTime(time){
			
 
				+      let tmpTim = time.split(',').join('')-0
			
 
				+      if(time && tmpTim.toString() != 'NaN'){
			
 
				+        let date = new Date('1900-01-01');
			
 
				+        let dateTim = date.getTime();
			
 
				+        let times = (tmpTim-2)*24*60*60*1000;
			
 
				+        let result = timestampToTime(dateTim+times).split(' ')[0]
			
 
				+        return result;
			
 
				+      }else{
			
 
				+        return time;
			
 
				+      }
			
 
				+    }
			
 
				     render() {
			
 
				         const { handleChangeValue, list, labelList,delPartItem, handleLabelSub, handleClear, handleConfirm, fillActive,getExcelDataList,handleCloseExcel,handlePush } = this.props;
			
 
				         const {toastText,visible} = this.state;
			
@@ -269,7 +292,7 @@ class Inspect extends React.Component {
 
				                                                                 <td style={{width:'25%'}}>
			
 
				                                                                     {normalVal(value.min,value.max)}
			
 
				                                                                 </td>
			
 
				-                                                                <td style={{width:'25%'}}>{value.time == ''?('导入时间: '+this.state.dateTime):'化验时间: '+value.time}</td>
			
 
				+                                                                <td style={{width:'25%'}}>{value.time == ''?('导入时间: '+this.state.dateTime):'化验时间: '+this.toTime(value.time)}</td>
			
 
				                                                             </tr>
			
 
				                                                         })
			
 
				                                                     }
			
@@ -290,7 +313,7 @@ class Inspect extends React.Component {
 
				                                         // 标签，血常规。。
			
 
				                                         item.show ?
			
 
				                                         <p className={styles.staticTagActive}>
			
 
				-                                            <span data-flg="current" style={{color:"#333"}} onClick={(e) => { handleLabelSub(e, item.questionId,idx); this.handleFillShow(e,idx) }}>{item.name}</span>
			
 
				+                                            <span data-flg="current" style={{color:"#000"}} onClick={(e) => { handleLabelSub(e, item.questionId,idx); this.handleFillShow(e,idx) }}>{item.name}</span>
			
 
				                                         </p>:
			
 
				                                         <p>
			
 
				                                             <i data-flg="current" onClick={(e) => { handleLabelSub(e,item.questionId,idx); this.handleFillShow(e,idx) }}>{item.name}</i>
			
@@ -321,9 +344,10 @@ class Inspect extends React.Component {
 
				                                                 <InspectCommon
			
 
				                                                     showFill={this.state.showFill}
			
 
				                                                     handleClear={(e)=>{
			
 
				-                                                        handleClear(e,idx)
			
 
				+                                                        // handleClear(e,idx)
			
 
				+                                                        this.changeActivePart('','',true)
			
 
				                                                         this.setState({
			
 
				-                                                          currentData:fillActive
			
 
				+                                                          // currentData:fillActive
			
 
				                                                         })
			
 
				                                                     }}
			
 
				                                                     handleConfirm={(e)=>{
			
@@ -361,7 +385,7 @@ class Inspect extends React.Component {
 
				                         }
			
 
				                     </ul>
			
 
				                 </div>
			
 
				-                <div style={{position:"relative"}}>
			
 
				+                <div style={{position:"relative",clear:"both"}}>
			
 
				                     <Add showText="添加化验项" handleClick={(e) => this.handleSearchShow(e)} id="searchWrap"/>
			
 
				                   {this.state.show?<SearchOption handleChangeValue={handleChangeValue} visible={true}>
			
 
				                         {this.getSearchList(list)}
			
--- a/src/components/AssistCheck/index.jsx
+++ b/src/components/AssistCheck/index.jsx
@@ -10,7 +10,7 @@ class AssistCheck extends React.Component {
 
				     }
			
 
				 
			
 
				     render(){
			
 
				-        const {list,assistLabel,handleChangeValue,handleSign,fetchPushInfos,handleDelAssist,handleChangeAssistValue,handleChangeDate,isRead} = this.props;
			
 
				+        const {list,assistLabel,handleChangeValue,handleSign,fetchPushInfos,handleDelAssist,handleChangeAssistValue,handleChangeDate,isRead,winWidth} = this.props;
			
 
				         return (
			
 
				             <div className={styles.wrapper}>
			
 
				                 <div className={styles.top}>
			
@@ -35,6 +35,7 @@ class AssistCheck extends React.Component {
 
				                             handleChangeAssistValue={handleChangeAssistValue}
			
 
				                             handleChangeDate={handleChangeDate}
			
 
				                             isRead={isRead}
			
 
				+                            winWidth={winWidth}
			
 
				                         >
			
 
				 
			
 
				                         </AddAssistCheck>
			
--- a/src/components/DiagnosticItem/index.jsx
+++ b/src/components/DiagnosticItem/index.jsx
@@ -1,6 +1,7 @@
 
				 import React, { Component } from 'react';
			
 
				 import style from './index.less';
			
 
				 import {ConfirmModal} from '@commonComp';
			
 
				+import Notify from '@commonComp/Notify';
			
 
				 
			
 
				 class DiagnosticItem extends Component{
			
 
				     constructor(props){
			
@@ -45,7 +46,13 @@ class DiagnosticItem extends Component{
 
				         //     this.setState({
			
 
				         //         visible: false,
			
 
				         //     },()=>{
			
 
				-                const { addDiagnostic, clearInput, hideSearch } = this.props;
			
 
				+                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
			
 
				+                    }
			
 
				+                }
			
 
				                 addDiagnostic&&addDiagnostic(item);
			
 
				                 clearInput&&clearInput();
			
 
				                 hideSearch&&hideSearch()
			
--- a/src/components/HistoryCaseContainer/index.jsx
+++ b/src/components/HistoryCaseContainer/index.jsx
@@ -8,6 +8,7 @@ import store from '@store';
 
				 import { ConfirmModal } from '@commonComp';
			
 
				 import { pushAllDataList } from '@utils/tools';
			
 
				 import { CONFIRM_TYPE } from "@store/types/typeConfig";
			
 
				+import {billing} from '@store/async-actions/pushMessage';
			
 
				 
			
 
				 class HistoryCaseContainer extends React.Component {
			
 
				     constructor(props){
			
@@ -24,6 +25,7 @@ class HistoryCaseContainer extends React.Component {
 
				         store.dispatch(showHistory(false))
			
 
				         store.dispatch({type: CONFIRM_TYPE, confirmType: baseObj.sign});
			
 
				         pushAllDataList(baseObj.sign,'push',baseObj,'history')       //引用
			
 
				+        store.dispatch(billing())
			
 
				     }
			
 
				     close(){
			
 
				       store.dispatch(visibleHistory(false));
			
--- a/src/components/MainSuit/index.jsx
+++ b/src/components/MainSuit/index.jsx
@@ -62,8 +62,9 @@ class MainSuit extends Component{
 
				 
			
 
				   handleFocus(e){
			
 
				     e.stopPropagation();
			
 
				-    const {getCommonSymptoms,datas} = this.props;
			
 
				-    let innerText = e.target.innerText;
			
 
				+    const {getCommonSymptoms,datas,clearDiagnose} = this.props;
			
 
				+    let innerText = e.target.innerText || e.target.innerHTML;//兼容火狐43
			
 
				+    clearDiagnose&&clearDiagnose();//清除复诊数据
			
 
				     if(!isIE()){//IE会触发onfocus和onblur事件
			
 
				       if(!innerText.trim()){//有内容就走搜索接口
			
 
				         getCommonSymptoms && getCommonSymptoms();
			
@@ -112,7 +113,7 @@ class MainSuit extends Component{
 
				   }
			
 
				 
			
 
				 
			
 
				-  handleSearchSelect(item){console.log("触发选中点击");
			
 
				+  handleSearchSelect(item){
			
 
				     const {clearSearch,insertSearch,datas,span,saveText} = this.props;
			
 
				     let mainText = filterDataArr(saveText);//主诉字数
			
 
				     const itemL = item.name.length;
			
@@ -146,11 +147,12 @@ class MainSuit extends Component{
 
				     // e.stopPropagation(); //冒泡到最顶层关闭其他下拉
			
 
				     //若使用e.target，因为是onClick事件中，值可能是itembox的而不是span因此会有bug
			
 
				     let leftL=0;      //用焦点元素的左边距替换鼠标点击的左边距，高度还是鼠标点击的位置
			
 
				+    let num = this.props.datas.length == 0?0:60
			
 
				     if(isIE()){
			
 
				       leftL = getPageCoordinate(e).boxLeft
			
 
				     }else{
			
 
				       const ele = document.activeElement;
			
 
				-      leftL = ele.offsetLeft+60
			
 
				+      leftL = ele.offsetLeft+num
			
 
				     }
			
 
				     this.setState({
			
 
				       // boxLeft:getPageCoordinate(e).boxLeft,
			
@@ -224,6 +226,7 @@ class MainSuit extends Component{
 
				     let data = this.state.inpText;
			
 
				     if(!isIE()){
			
 
				       e.target.innerText="";
			
 
				+      e.target.innerHTML="";//兼容火狐43
			
 
				       freeText && freeText(data.trim());
			
 
				     }else{
			
 
				       if(datas.length==0){
			
--- a/src/components/MultSpread/index.jsx
+++ b/src/components/MultSpread/index.jsx
@@ -26,6 +26,7 @@ class MultSpread extends Component{
 
				     this.state = {
			
 
				       editable: false,
			
 
				     };
			
 
				+    this.$cont = React.createRef();
			
 
				     this.changeToEdit = this.changeToEdit.bind(this);
			
 
				     this.handleEdit = this.handleEdit.bind(this);
			
 
				   }
			
@@ -103,7 +104,10 @@ class MultSpread extends Component{
 
				       this.setState({
			
 
				         editable: true
			
 
				       });
			
 
				-      //e.target.focus();
			
 
				+      //失焦关闭编辑状态
			
 
				+      setTimeout(()=>{
			
 
				+        this.$cont.current.focus();
			
 
				+      });
			
 
				       //双击埋点记录
			
 
				       handleDbclick && handleDbclick({id:copyId});
			
 
				     }
			
@@ -135,6 +139,7 @@ class MultSpread extends Component{
 
				     return (<div className={this.getContClass()}
			
 
				                  style={{display:'inline-block'}}
			
 
				                  onDoubleClick={this.changeToEdit}
			
 
				+                 ref = {this.$cont}
			
 
				                  contentEditable={this.state.editable}
			
 
				                  onBlur={this.handleEdit}
			
 
				                  onkeydown={tools.handleEnter}>
			
--- a/src/components/NumberDrop/index.less
+++ b/src/components/NumberDrop/index.less
@@ -1,9 +1,10 @@
 
				 @import "~@less/variables.less";
			
 
				 .container{
			
 
				   .tag;
			
 
				-}
			
 
				-.no-tag{
			
 
				-  .no-tag;
			
 
				+  .blued{
			
 
				+    background: @blue;
			
 
				+    color: #fff;
			
 
				+  }
			
 
				 }
			
 
				 .selected{
			
 
				   .selected-tag;
			
@@ -13,8 +14,8 @@
 
				   &:after{
			
 
				     content: unset;
			
 
				   }
			
 
				-}
			
 
				-.blued{
			
 
				-  background: @blue;
			
 
				-  color: #fff;
			
 
				+  .blued{
			
 
				+    background: @blue;
			
 
				+    color: #fff;
			
 
				+  }
			
 
				 }
			
--- a/src/components/NumberUnitDrop/index.jsx
+++ b/src/components/NumberUnitDrop/index.jsx
@@ -151,7 +151,10 @@ class NumberUnitDrop extends Component{
 
				         editable: true,
			
 
				         labelVal:text
			
 
				       });
			
 
				-      e.target.focus();
			
 
				+      //失焦关闭编辑状态
			
 
				+      setTimeout(()=>{
			
 
				+        e.target.focus();
			
 
				+      })
			
 
				       //双击埋点记录
			
 
				       handleDbclick && handleDbclick({id:patId||id});
			
 
				     }
			
--- a/src/components/Operation/index.jsx
+++ b/src/components/Operation/index.jsx
@@ -114,36 +114,7 @@ class Operation extends Component {
 
				       Notify.info('当前页面数据已清空');
			
 
				     }
			
 
				   }
			
 
				-  isClear(){
			
 
				-    let baseList = store.getState();
			
 
				-    let jsonData = getAllDataList(baseList);
			
 
				-    let jsonStr = getAllDataStringList(baseList);
			
 
				-    if (      //结构化和文本数据都为空
			
 
				-      JSON.stringify(jsonData.advice) == '{}' &&
			
 
				-      jsonData.chief.length < 1 &&
			
 
				-      jsonData.diag.length < 1 &&
			
 
				-      jsonData.vital.length < 1 &&
			
 
				-      jsonData.other.length < 1 &&
			
 
				-      jsonData.pacs.length < 1 &&
			
 
				-      jsonData.present.length < 1 &&
			
 
				-      jsonData.lis.labelList.length < 1 &&
			
 
				-      jsonData.lis.getExcelDataList.length < 1 &&
			
 
				-      JSON.stringify(jsonData.advice) == '{}' && 
			
 
				-      jsonStr.chief == '[]' && 
			
 
				-      jsonStr.present == '[]' && 
			
 
				-      jsonStr.other == '[]' && 
			
 
				-      jsonData.vital.length < 1 && 
			
 
				-      jsonData.diag.length < 1 && 
			
 
				-      jsonData.pacs.length < 1 && 
			
 
				-      jsonData.lis.labelList.length < 1 && 
			
 
				-      jsonData.lis.getExcelDataList.length < 1
			
 
				-    ) {
			
 
				-      Notify.info('当前页面数据已清空');
			
 
				-      return false;
			
 
				-    }else{
			
 
				-      return true;
			
 
				-    }
			
 
				-  }
			
 
				+  
			
 
				   onchange(val) {
			
 
				     this.setState({
			
 
				       title: val
			
@@ -187,34 +158,31 @@ class Operation extends Component {
 
				     let jsonStr = getAllDataStringList(baseList);
			
 
				     let whichSign = baseList.typeConfig.typeConfig;
			
 
				     let tmpLis = baseList.tabTemplate.items;
			
 
				-    console.log(jsonStr,'文本')
			
 
				-    console.log(jsonData,'结构')       //测试需要用到，不要删了
			
 
				+    // console.log(jsonStr,'文本')
			
 
				+    // console.log(jsonData.chief,'结构')       //测试需要用到，不要删了
			
 
				     for(let i = 0;i <tmpLis.length;i++){
			
 
				       let dataStr = tmpLis[i].preview;
			
 
				-      let jsStr = tmpLis[i].dataJson;
			
 
				+      let dataJson = tmpLis[i].dataJson;
			
 
				       // console.log(JSON.stringify(eval('('+JSON.parse(dataStr).chief+')')),111)
			
 
				-      // if(JSON.stringify(eval('('+JSON.stringify(JSON.parse(dataStr))+')')) == JSON.stringify(jsonStr) && jsStr == JSON.stringify(jsonData)){
			
 
				-      //   Notify.info('该模板已保存');
			
 
				-      //   return false;
			
 
				-      // }
			
 
				+      console.log(JSON.stringify(jsonData.other) ,787878,JSON.stringify(JSON.parse(dataJson).other))
			
 
				       if(
			
 
				         jsonStr.chief == JSON.stringify(eval('('+JSON.parse(dataStr).chief+')')) && 
			
 
				         jsonStr.present == JSON.stringify(eval('('+JSON.parse(dataStr).present+')')) && 
			
 
				         jsonStr.other == JSON.stringify(eval('('+JSON.parse(dataStr).other+')')) && 
			
 
				         jsonStr.vital == JSON.stringify(eval('('+JSON.parse(dataStr).vital+')'))  &&
			
 
				-        JSON.stringify(jsonData.chief) == JSON.stringify(JSON.parse(jsStr).chief) &&    
			
 
				-        JSON.stringify(jsonData.present) == JSON.stringify(JSON.parse(jsStr).present) &&    
			
 
				-        JSON.stringify(jsonData.other) == JSON.stringify(JSON.parse(jsStr).other) &&      
			
 
				-        JSON.stringify(jsonData.vital) == JSON.stringify(JSON.parse(jsStr).vital) &&   
			
 
				-        JSON.stringify(jsonData.lis) == JSON.stringify(JSON.parse(jsStr).lis) &&  
			
 
				-        JSON.stringify(jsonData.pacs) == JSON.stringify(JSON.parse(jsStr).pacs) &&     
			
 
				-        JSON.stringify(jsonData.diag) == JSON.stringify(JSON.parse(jsStr).diag) &&    
			
 
				-        JSON.stringify(jsonData.advice) == JSON.stringify(JSON.parse(jsStr).advice) &&      
			
 
				-        JSON.stringify(jsonData.mainSuitSelecteds) == JSON.stringify(JSON.parse(jsStr).mainSuitSelecteds) &&      
			
 
				-        JSON.stringify(jsonData.currentIllSelecteds) == JSON.stringify(JSON.parse(jsStr).currentIllSelecteds) &&     
			
 
				-        JSON.stringify(jsonData.otherHistorySelecteds) == JSON.stringify(JSON.parse(jsStr).otherHistorySelecteds) && 
			
 
				-        JSON.stringify(jsonData.checkBodySelecteds) == JSON.stringify(JSON.parse(jsStr).checkBodySelecteds) &&     
			
 
				-        JSON.stringify(jsonData.addItems) == JSON.stringify(JSON.parse(jsStr).addItems)
			
 
				+        JSON.stringify(jsonData.chief) == JSON.stringify(JSON.parse(dataJson).chief) &&    
			
 
				+        JSON.stringify(jsonData.present) == JSON.stringify(JSON.parse(dataJson).present)  &&     
			
 
				+        // JSON.stringify(jsonData.other) == JSON.stringify(JSON.parse(dataJson).other) &&      
			
 
				+        JSON.stringify(jsonData.vital) == JSON.stringify(JSON.parse(dataJson).vital)  
			
 
				+        // JSON.stringify(jsonData.lis) == JSON.stringify(JSON.parse(dataJson).lis) &&  
			
 
				+        // JSON.stringify(jsonData.pacs) == JSON.stringify(JSON.parse(dataJson).pacs) &&     
			
 
				+        // JSON.stringify(jsonData.diag) == JSON.stringify(JSON.parse(dataJson).diag) &&    
			
 
				+        // JSON.stringify(jsonData.advice) == JSON.stringify(JSON.parse(dataJson).advice) &&    
			
 
				+        // JSON.stringify(jsonData.mainSuitSelecteds) == JSON.stringify(JSON.parse(dataJson).mainSuitSelecteds) &&      
			
 
				+        // JSON.stringify(jsonData.currentIllSelecteds) == JSON.stringify(JSON.parse(dataJson).currentIllSelecteds) &&     
			
 
				+        // JSON.stringify(jsonData.otherHistorySelecteds) == JSON.stringify(JSON.parse(dataJson).otherHistorySelecteds) && 
			
 
				+        // JSON.stringify(jsonData.checkBodySelecteds) == JSON.stringify(JSON.parse(dataJson).checkBodySelecteds) &&     
			
 
				+        // JSON.stringify(jsonData.addItems) == JSON.stringify(JSON.parse(dataJson).addItems)
			
 
				       ){
			
 
				         Notify.info('该模板已保存');
			
 
				         return false;
			
--- a/src/components/PreviewBody/index.jsx
+++ b/src/components/PreviewBody/index.jsx
@@ -1,282 +1,296 @@
 
				 import React, { Component } from "react";
			
 
				 import style from "./index.less";
			
 
				-import { normalVal } from '@utils/tools';
			
 
				+import { normalVal, filterDataArr } from '@utils/tools';
			
 
				+import Notify from '@commonComp/Notify';
			
 
				 import $ from "jquery";
			
 
				 
			
 
				 (function ($) {
			
 
				   var opt;
			
 
				 
			
 
				   $.fn.jqprint = function (options) {
			
 
				-      opt = $.extend({}, $.fn.jqprint.defaults, options);
			
 
				+    opt = $.extend({}, $.fn.jqprint.defaults, options);
			
 
				 
			
 
				-      var $element = (this instanceof $) ? this : $(this);
			
 
				+    var $element = (this instanceof $) ? this : $(this);
			
 
				 
			
 
				-      if (opt.operaSupport && $.browser.opera) {
			
 
				-          var tab = window.open("", "jqPrint-preview");
			
 
				-          tab.document.open();
			
 
				+    if (opt.operaSupport && $.browser.opera) {
			
 
				+      var tab = window.open("", "jqPrint-preview");
			
 
				+      tab.document.open();
			
 
				 
			
 
				-          var doc = tab.document;
			
 
				-      }
			
 
				-      else {
			
 
				-          var $iframe = $("<iframe  />");
			
 
				+      var doc = tab.document;
			
 
				+    }
			
 
				+    else {
			
 
				+      var $iframe = $("<iframe  />");
			
 
				 
			
 
				-          if (!opt.debug) { $iframe.css({ position: "absolute", width: "0px", height: "0px", left: "-300px", top: "-300px" }); }
			
 
				+      if (!opt.debug) { $iframe.css({ position: "absolute", width: "0px", height: "0px", left: "-300px", top: "-300px" }); }
			
 
				 
			
 
				-          $iframe.appendTo("body");
			
 
				-          var doc = $iframe[0].contentWindow.document;
			
 
				-      }
			
 
				+      $iframe.appendTo("body");
			
 
				+      var doc = $iframe[0].contentWindow.document;
			
 
				+    }
			
 
				 
			
 
				-      if (opt.importCSS) {
			
 
				-          if ($("link[media=print]").length > 0) {
			
 
				-              $("link[media=print]").each(function () {
			
 
				-                  doc.write("<link type='text/css' rel='stylesheet' href='" + $(this).attr("href") + "' media='print' />");
			
 
				-              });
			
 
				-          }
			
 
				-          else {
			
 
				-              $("link").each(function () {
			
 
				-                  doc.write("<link type='text/css' rel='stylesheet' href='" + $(this).attr("href") + "' />");
			
 
				-              });
			
 
				-          }
			
 
				+    if (opt.importCSS) {
			
 
				+      if ($("link[media=print]").length > 0) {
			
 
				+        $("link[media=print]").each(function () {
			
 
				+          doc.write("<link type='text/css' rel='stylesheet' href='" + $(this).attr("href") + "' media='print' />");
			
 
				+        });
			
 
				+      }
			
 
				+      else {
			
 
				+        $("link").each(function () {
			
 
				+          doc.write("<link type='text/css' rel='stylesheet' href='" + $(this).attr("href") + "' />");
			
 
				+        });
			
 
				       }
			
 
				+    }
			
 
				 
			
 
				-      if (opt.printContainer) { doc.write($element.outer()); }
			
 
				-      else { $element.each(function () { doc.write($(this).html()); }); }
			
 
				+    if (opt.printContainer) { doc.write($element.outer()); }
			
 
				+    else { $element.each(function () { doc.write($(this).html()); }); }
			
 
				 
			
 
				-      doc.close();
			
 
				+    doc.close();
			
 
				 
			
 
				-      (opt.operaSupport && $.browser.opera ? tab : $iframe[0].contentWindow).focus();
			
 
				-      setTimeout(function () { (opt.operaSupport && $.browser.opera ? tab : $iframe[0].contentWindow).print(); if (tab) { tab.close(); } }, 1000);
			
 
				+    (opt.operaSupport && $.browser.opera ? tab : $iframe[0].contentWindow).focus();
			
 
				+    setTimeout(function () { (opt.operaSupport && $.browser.opera ? tab : $iframe[0].contentWindow).print(); if (tab) { tab.close(); } }, 1000);
			
 
				   }
			
 
				 
			
 
				   $.fn.jqprint.defaults = {
			
 
				-      debug: false,
			
 
				-      importCSS: true,
			
 
				-      printContainer: true,
			
 
				-      operaSupport: true
			
 
				+    debug: false,
			
 
				+    importCSS: true,
			
 
				+    printContainer: true,
			
 
				+    operaSupport: true
			
 
				   };
			
 
				 
			
 
				   $.fn.outer = function () {
			
 
				-      return $($('<div></div>').html(this.clone())).html();
			
 
				+    return $($('<div></div>').html(this.clone())).html();
			
 
				   }
			
 
				 })($);
			
 
				 
			
 
				-import {filterDataArr} from '@utils/tools'
			
 
				 class PreviewBody extends Component {
			
 
				-    constructor(props) {
			
 
				-        super(props)
			
 
				-        this.state={
			
 
				-            dateTime:"",
			
 
				-        }
			
 
				-        this.$content = React.createRef();
			
 
				-        this.getCurrentDate = this.getCurrentDate.bind(this);
			
 
				-        this.onPrint = this.onPrint.bind(this);
			
 
				-    }
			
 
				-    componentDidMount(){
			
 
				-        this.getCurrentDate();
			
 
				-    }
			
 
				-    componentWillReceiveProps(){
			
 
				-        $(this.$content.current)[0].scrollIntoView(true);
			
 
				+  constructor(props) {
			
 
				+    super(props)
			
 
				+    this.state = {
			
 
				+      dateTime: "",
			
 
				     }
			
 
				-    onPrint() {
			
 
				-      $("#content").jqprint({
			
 
				-          debug: false,
			
 
				-          importCSS: true,
			
 
				-          printContainer: true,
			
 
				-          operaSupport: false,
			
 
				-      });
			
 
				-      this.props.onClose()
			
 
				+    this.$content = React.createRef();
			
 
				+    this.getCurrentDate = this.getCurrentDate.bind(this);
			
 
				+    this.onPrint = this.onPrint.bind(this);
			
 
				   }
			
 
				-    getCurrentDate(){
			
 
				-        let myDate = new Date();
			
 
				-        let year = myDate.getFullYear();       //获取完整的年份(4位,1970-????)
			
 
				-        let mon = myDate.getMonth()-0+1;       //获取当前月份(0-11,0代表1月)
			
 
				-        let day = myDate.getDate();            //获取当前日(1-31)
			
 
				-        let date = year+'-'+(mon<10?'0'+mon:mon)+'-'+(day<10?'0'+day:day);
			
 
				-        this.setState({dateTime:date})
			
 
				+  componentDidMount() {
			
 
				+    this.getCurrentDate();
			
 
				+  }
			
 
				+  componentWillReceiveProps() {
			
 
				+    $(this.$content.current)[0].scrollIntoView(true);
			
 
				+  }
			
 
				+  onPrint() {
			
 
				+    $("#content").jqprint({
			
 
				+      debug: false,
			
 
				+      importCSS: true,
			
 
				+      printContainer: true,
			
 
				+      operaSupport: false,
			
 
				+    });
			
 
				+    this.props.onClose()
			
 
				+  }
			
 
				+
			
 
				+  surePrint(jsonStr) {
			
 
				+    if (filterDataArr(JSON.parse(jsonStr.chief)) == '') {
			
 
				+      Notify.info('主诉不能为空');
			
 
				+      return false;
			
 
				+    } else if (!jsonStr.diag || jsonStr.diag.trim().length < 1) {
			
 
				+      Notify.info('诊断不能为空');
			
 
				+      return false;
			
 
				+    } else {
			
 
				+      this.onPrint();
			
 
				+      this.props.save(true)
			
 
				     }
			
 
				-    showDetails(val){
			
 
				-        if(val.questionDetailList.length > 0){
			
 
				-            return val.questionDetailList.map((item)=>{
			
 
				-                if(val.value == item.name){
			
 
				-                    return <td style={{width:'16%',fontSize:'12px'}}><span style={{color:item.abnormal != '0' ?"red":null}}>{val.value}</span> { val.labelSuffix}</td>
			
 
				-                }
			
 
				-            })
			
 
				-        }else{ 
			
 
				-            return <td style={{width:'16%',fontSize:'12px'}}><span style={{color:(val.value - 0).toString() == 'NaN'?"red":(val.maxValue || val.minValue)?(val.value > val.maxValue || val.value < val.minValue?"red":null):null}}>{val.value}</span> { val.labelSuffix}</td>
			
 
				+    // if(filterDataArr(JSON.parse(jsonStr.chief)) == ''){
			
 
				+    //   Notify.info('主诉不能为空');
			
 
				+    //     return false;
			
 
				+    // }else if(!jsonStr.diag || jsonStr.diag.trim().length < 1){
			
 
				+    //     Notify.info('诊断不能为空');
			
 
				+    //     return false;
			
 
				+    // }else{
			
 
				+    //     this.onPrint();
			
 
				+    //     this.props.save(true)
			
 
				+    // }
			
 
				+  }
			
 
				+  getCurrentDate() {
			
 
				+    let myDate = new Date();
			
 
				+    let year = myDate.getFullYear();       //获取完整的年份(4位,1970-????)
			
 
				+    let mon = myDate.getMonth() - 0 + 1;       //获取当前月份(0-11,0代表1月)
			
 
				+    let day = myDate.getDate();            //获取当前日(1-31)
			
 
				+    let date = year + '-' + (mon < 10 ? '0' + mon : mon) + '-' + (day < 10 ? '0' + day : day);
			
 
				+    this.setState({ dateTime: date })
			
 
				+  }
			
 
				+  showDetails(val) {
			
 
				+    if (val.questionDetailList.length > 0) {
			
 
				+      return val.questionDetailList.map((item) => {
			
 
				+        if (val.value == item.name) {
			
 
				+          return <td style={{ width: '16%', fontSize: '12px' }}><span style={{ color: item.abnormal != '0' ? "red" : null }}>{val.value}</span> {val.labelSuffix}</td>
			
 
				         }
			
 
				+      })
			
 
				+    } else {
			
 
				+      return <td style={{ width: '16%', fontSize: '12px' }}><span style={{ color: (val.value - 0).toString() == 'NaN' ? "red" : (val.maxValue || val.minValue) ? (val.value > val.maxValue || val.value < val.minValue ? "red" : null) : null }}>{val.value}</span> {val.labelSuffix}</td>
			
 
				     }
			
 
				-    render() {
			
 
				-        const { show, preInfo, dataJson, dataStr,baseObj,flg } = this.props;
			
 
				+  }
			
 
				+  render() {
			
 
				+    const { show, preInfo, dataJson, dataStr, baseObj, flg } = this.props;
			
 
				 
			
 
				-        return <div className={style['content']} style={{width:flg?'700':'820'}}>
			
 
				-            <div className={style['contents']} id="content" style={{margin:"0 auto",maxWidth:"600px"}}>
			
 
				-                <div ref={this.$content} style={{ clear: 'both', fontSize: '24px', margin: '0px 0px 30px 0px',textAlign:'center' }}>{preInfo.hospitalName}</div>
			
 
				-                <table className={style['patInfo']} style={{ margin: '0px 0px 30px 0px', borderCollapse: 'collapse', width: "100%" }}>
			
 
				-                    <tr>
			
 
				-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '31%',fontSize:"14px" }}>卡号：{baseObj?baseObj.patientIdNo:JSON.stringify(preInfo) == '{}'?'':preInfo.patientIdNo}</td>
			
 
				-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '23%',fontSize:"14px" }}>姓名：{baseObj?baseObj.patientName:JSON.stringify(preInfo) == '{}'?'':preInfo.patientName}</td>
			
 
				-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '23%',fontSize:"14px" }}>年龄：{baseObj?baseObj.patientAge:JSON.stringify(preInfo) == '{}'?'':preInfo.patientAge}</td>
			
 
				-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '23%',fontSize:"14px" }}>性别：{baseObj?baseObj.patientSex:JSON.stringify(preInfo) == '{}'?'':preInfo.patientSex}</td>
			
 
				-                    </tr>
			
 
				-                    <tr>
			
 
				-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '31%',fontSize:"14px" }}>就诊时间：{baseObj?baseObj.inquiryDate:(JSON.stringify(preInfo) == '{}'?'':preInfo.systemTime.split(' ')[0])}</td>
			
 
				-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '23%',fontSize:"14px" }}>科室：{baseObj?baseObj.hospitalDeptName:(JSON.stringify(preInfo) == '{}'?'':preInfo.hospitalDeptName)}</td>
			
 
				-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '23%',fontSize:"14px" }}>医生：{baseObj?baseObj.doctorName:(JSON.stringify(preInfo) == '{}'?'':preInfo.doctorName)}</td>
			
 
				-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '23%',fontSize:"14px" }}>门诊号：{baseObj?baseObj.inquiryCode:(JSON.stringify(preInfo) == '{}'?'':preInfo.recordId)}</td>
			
 
				-                    </tr>
			
 
				-                </table>
			
 
				-                <table style={{width:"100%", borderCollapse: 'collapse'}}>
			
 
				-                    <tr style={{ verticalAlign:'top',borderBottom:"1px solid #e2e4e6" }}>
			
 
				-                        <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>主诉：</td>
			
 
				-                        <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px',lineHeight:'20px' }}>
			
 
				-                            {
			
 
				-                                filterDataArr(JSON.parse(dataStr.chief))
			
 
				-                            }
			
 
				-                        </td>
			
 
				-                    </tr>
			
 
				-                    <tr style={{ verticalAlign:'top',borderBottom:"1px solid #e2e4e6" }}>
			
 
				-                        <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>现病史：</td>
			
 
				-                        <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px',lineHeight:'20px' }}>
			
 
				-                            {
			
 
				-                                filterDataArr(JSON.parse(dataStr.present))
			
 
				-                            }
			
 
				-                        </td>
			
 
				-                    </tr>
			
 
				-                    <tr style={{ verticalAlign:'top',borderBottom:"1px solid #e2e4e6" }}>
			
 
				-                        <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>其他史：</td>
			
 
				-                        <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px',lineHeight:'20px'  }}>
			
 
				-                            {
			
 
				-                                filterDataArr(JSON.parse(dataStr.other))
			
 
				-                            }
			
 
				-                        </td>
			
 
				-                    </tr>
			
 
				-                    <tr style={{ verticalAlign:'top',borderBottom:"1px solid #e2e4e6" }}>
			
 
				-                        <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>查体：</td>
			
 
				-                        <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px',lineHeight:'20px'  }}>
			
 
				-                            {
			
 
				-                                filterDataArr(JSON.parse(dataStr.vital))
			
 
				-                            }
			
 
				-                        </td>
			
 
				-                    </tr>
			
 
				-                    <tr style={{ verticalAlign:'top',borderBottom:"1px solid #e2e4e6" }}>
			
 
				-                        <td style={{ width: 70, textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>化验：</td>
			
 
				-                        <td style={{ fontSize: '14px', padding: '4px 0px 8px 0px',lineHeight:'20px',maxWidth:'650px'}}>
			
 
				-                                {
			
 
				-                                    dataJson.lis.getExcelDataList && dataJson.lis.getExcelDataList.map((items)=>{
			
 
				-                                        return items.lisExcelRes && items.lisExcelRes.map((item)=>{
			
 
				-                                            return <table style={{marginBottom:'10px',width:'100%',fontSize:'12px'}}>
			
 
				-                                                <tr style={{fontSize:'14px',lineHeight:'1.5'}}><td><span style={{borderBottom:'1px solid #666666'}}>{item.menus}</span></td></tr>
			
 
				-                                                {
			
 
				-                                                    item.lisExcelItem && item.lisExcelItem.map((value)=>{
			
 
				-                                                        return <tr style={{lineHeight:'1.5',maxWidth:'650px'}}>
			
 
				-                                                            <td style={{width:'32%',fontSize:'12px'}}>{value.itemName}</td>
			
 
				-                                                            <td style={{width:'16%',fontSize:'12px'}}><span style={{fontSize:'12px',color:value.type == 1?"red":null}}>{value.value}</span> {value.unit}</td>
			
 
				-                                                            <td style={{width:'24%',fontSize:'12px'}}>
			
 
				-                                                                {normalVal(value.min,value.max)}
			
 
				-                                                            </td>
			
 
				-                                                            <td style={{width:'28%',fontSize:'12px'}}>{value.time == ''?('导入时间: '+this.state.dateTime):'化验时间: '+value.time}</td>
			
 
				-                                                        </tr>
			
 
				-                                                    })
			
 
				-                                                }
			
 
				-                                            </table>
			
 
				-                                        })
			
 
				-                                    })
			
 
				-                                }
			
 
				-                                {
			
 
				-                                    dataJson.lis.labelList && dataJson.lis.labelList.map((item,idx) => {
			
 
				-                                        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.details.map((val)=>{
			
 
				-                                                        if(val.value && val.value != ''){
			
 
				-                                                            return <tr style={{lineHeight:'1.5',width:'100%',fontSize:'12px'}}>
			
 
				-                                                                <td style={{width:'32%',fontSize:'12px'}}>{val.name}</td>
			
 
				-                                                                {this.showDetails(val)}
			
 
				-                                                                <td style={{width:'24%',fontSize:'12px'}}>
			
 
				-                                                                    {normalVal(val.minValue,val.maxValue)}
			
 
				-                                                                </td>
			
 
				-                                                                <td style={{width:'28%',fontSize:'12px'}}>{'化验时间:'+item.time}</td>
			
 
				-                                                            </tr>
			
 
				-                                                        }
			
 
				-                                                    })
			
 
				-                                                }
			
 
				-                                            </table>
			
 
				-                                        }
			
 
				-                                    })
			
 
				-                                }
			
 
				-                        </td>
			
 
				-                    </tr>
			
 
				-                    <tr style={{ verticalAlign:'top',borderBottom:"1px solid #e2e4e6" }}>
			
 
				-                        <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>辅检：</td>
			
 
				-                        <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px',lineHeight:'20px' }}>
			
 
				-                            {
			
 
				-                                dataStr.pacs && dataStr.pacs != '' && dataStr.pacs.split(';').map((item)=>{
			
 
				-                                    return <div style={{ fontSize: '14px' }}>{item}</div>
			
 
				-                                })
			
 
				-                            }
			
 
				-                        </td>
			
 
				-                    </tr>
			
 
				-                    <tr style={{ verticalAlign:'top',borderBottom:"1px solid #e2e4e6" }}>
			
 
				-                        <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>诊断：</td>
			
 
				-                        <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px',lineHeight:'20px' }}>
			
 
				-                            {
			
 
				-                                dataStr.diag && dataStr.diag != '' && dataStr.diag.split(';').map((item)=>{
			
 
				-                                    return <div style={{ fontSize: '14px'}}>{item}</div>
			
 
				-                                })
			
 
				-                            }
			
 
				-                        </td>
			
 
				-                    </tr>
			
 
				-                    <tr style={{ verticalAlign:'top',borderBottom:"1px solid #e2e4e6" }}>
			
 
				-                        <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>医嘱：</td>
			
 
				-                        <td style={{ fontSize: '14px', padding: '1px 0px 8px 0px',lineHeight:'20px' }}>
			
 
				-                            {
			
 
				-                                dataJson.advice.assay && dataJson.advice.assay.length > 0 || dataJson.advice.check && dataJson.advice.check.length > 0 ? <p style={{fontSize:'14px',marginBottom:"8px"}}><span>开单项目</span></p> : ''
			
 
				-                            }
			
 
				-                            {
			
 
				-                                dataJson.advice.assay && <div style={{ padding: '0px 0px 5px 0px' }}>{dataJson.advice.assay}</div>
			
 
				-                            }
			
 
				-                            {
			
 
				-                                dataJson.advice.check && <div style={{ padding: '0px 0px 5px 0px' }}>{dataJson.advice.check}</div>
			
 
				-                            }
			
 
				-                            {dataJson.advice.scheme && dataJson.advice.scheme.length > 0  && <p style={{fontSize:'14px', marginBottom: '8px',marginTop:'8px'}}><span>治疗方案</span></p>}
			
 
				-                            {
			
 
				-                                dataJson.advice.scheme && dataJson.advice.scheme.map((item, index) => {
			
 
				-                                    return <p>{item.treatment.map((it,ii) =>{
			
 
				-                                      return(it.treatmentStr && it.treatmentStr.length > 0 ? 
			
 
				-                                        <div style={{ padding: '0px 0px 5px 0px' }}>{ it.treatmentStr }</div>: '')
			
 
				-                                    })}</p>
			
 
				-                                  })
			
 
				-                            }
			
 
				-                        </td>
			
 
				-                    </tr>
			
 
				-                </table>
			
 
				-                <table style={{ marginTop: '10px',marginBottom:'30px',position:'absolute',minWidth:'200px',right:'0',display: show ? 'block' : 'none' }}>
			
 
				-                    <tr style={{textAlign:'right',verticalAlign: 'top',position:'absolute',right:'0'}}>
			
 
				-                        <td>医生签名：</td>
			
 
				-                        <td style={{
			
 
				-                          minWidth:'50px',
			
 
				-                          padding:'0 5px 2px 5px',
			
 
				-                          borderBottom:'1px solid #333',
			
 
				-                        }}>{baseObj?baseObj.doctorName:(JSON.stringify(preInfo) == '{}'?'':preInfo.doctorName)}</td>
			
 
				-                    </tr>
			
 
				-                </table>
			
 
				-            </div>
			
 
				-            
			
 
				-            <div onClick={()=>{this.onPrint()}} style={{
			
 
				-                display: show ? 'inline-block' : 'none',
			
 
				-                padding: '10px 20px',
			
 
				-                float:'right',
			
 
				-                marginTop:'15px',
			
 
				-                background: '#3B9ED0',
			
 
				-                color: '#fff',
			
 
				-                borderRadius: '4px',
			
 
				-                cursor: 'pointer',
			
 
				-                position:'absolute',
			
 
				-                right:'40px'
			
 
				-            }}>打印</div>
			
 
				-        </div>
			
 
				-    }
			
 
				+    return <div className={style['content']} style={{ width: flg ? '700' : '820' }}>
			
 
				+      <div className={style['contents']} id="content" style={{ margin: "0 auto", maxWidth: "600px" }}>
			
 
				+        <div ref={this.$content} style={{ clear: 'both', fontSize: '24px', margin: '0px 0px 30px 0px', textAlign: 'center' }}>{preInfo.hospitalName}</div>
			
 
				+        <table className={style['patInfo']} style={{ margin: '0px 0px 30px 0px', borderCollapse: 'collapse', width: "100%" }}>
			
 
				+          <tr>
			
 
				+            <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '31%', fontSize: "14px" }}>卡号：{baseObj ? baseObj.patientIdNo : JSON.stringify(preInfo) == '{}' ? '' : preInfo.patientIdNo}</td>
			
 
				+            <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '23%', fontSize: "14px" }}>姓名：{baseObj ? baseObj.patientName : JSON.stringify(preInfo) == '{}' ? '' : preInfo.patientName}</td>
			
 
				+            <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '23%', fontSize: "14px" }}>年龄：{baseObj ? baseObj.patientAge : JSON.stringify(preInfo) == '{}' ? '' : preInfo.patientAge}</td>
			
 
				+            <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '23%', fontSize: "14px" }}>性别：{baseObj ? baseObj.patientSex : JSON.stringify(preInfo) == '{}' ? '' : preInfo.patientSex}</td>
			
 
				+          </tr>
			
 
				+          <tr>
			
 
				+            <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '31%', fontSize: "14px" }}>就诊时间：{baseObj ? baseObj.inquiryDate : (JSON.stringify(preInfo) == '{}' ? '' : preInfo.systemTime.split(' ')[0])}</td>
			
 
				+            <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '23%', fontSize: "14px" }}>科室：{baseObj ? baseObj.hospitalDeptName : (JSON.stringify(preInfo) == '{}' ? '' : preInfo.hospitalDeptName)}</td>
			
 
				+            <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '23%', fontSize: "14px" }}>医生：{baseObj ? baseObj.doctorName : (JSON.stringify(preInfo) == '{}' ? '' : preInfo.doctorName)}</td>
			
 
				+            <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '23%', fontSize: "14px" }}>门诊号：{baseObj ? baseObj.inquiryCode : (JSON.stringify(preInfo) == '{}' ? '' : preInfo.recordId)}</td>
			
 
				+          </tr>
			
 
				+        </table>
			
 
				+        <table style={{ width: "100%", borderCollapse: 'collapse' }}>
			
 
				+          <tr style={{ verticalAlign: 'top', borderBottom: "1px solid #e2e4e6" }}>
			
 
				+            <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>主诉：</td>
			
 
				+            <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px', lineHeight: '20px' }}>
			
 
				+              {
			
 
				+                filterDataArr(JSON.parse(dataStr.chief))
			
 
				+              }
			
 
				+            </td>
			
 
				+          </tr>
			
 
				+          <tr style={{ verticalAlign: 'top', borderBottom: "1px solid #e2e4e6" }}>
			
 
				+            <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>现病史：</td>
			
 
				+            <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px', lineHeight: '20px' }}>
			
 
				+              {
			
 
				+                filterDataArr(JSON.parse(dataStr.present))
			
 
				+              }
			
 
				+            </td>
			
 
				+          </tr>
			
 
				+          <tr style={{ verticalAlign: 'top', borderBottom: "1px solid #e2e4e6" }}>
			
 
				+            <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>其他史：</td>
			
 
				+            <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px', lineHeight: '20px' }}>
			
 
				+              {
			
 
				+                filterDataArr(JSON.parse(dataStr.other))
			
 
				+              }
			
 
				+            </td>
			
 
				+          </tr>
			
 
				+          <tr style={{ verticalAlign: 'top', borderBottom: "1px solid #e2e4e6" }}>
			
 
				+            <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>查体：</td>
			
 
				+            <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px', lineHeight: '20px' }}>
			
 
				+              {
			
 
				+                filterDataArr(JSON.parse(dataStr.vital))
			
 
				+              }
			
 
				+            </td>
			
 
				+          </tr>
			
 
				+          <tr style={{ verticalAlign: 'top', borderBottom: "1px solid #e2e4e6" }}>
			
 
				+            <td style={{ width: 70, textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>化验：</td>
			
 
				+            <td style={{ fontSize: '14px', padding: '4px 0px 8px 0px', lineHeight: '20px', maxWidth: '650px' }}>
			
 
				+              {
			
 
				+                dataJson.lis.getExcelDataList && dataJson.lis.getExcelDataList.map((items) => {
			
 
				+                  return items.lisExcelRes && items.lisExcelRes.map((item) => {
			
 
				+                    return <table style={{ marginBottom: '10px', width: '100%', fontSize: '12px' }}>
			
 
				+                      <tr style={{ fontSize: '14px', lineHeight: '1.5' }}><td><span style={{ borderBottom: '1px solid #666666' }}>{item.menus}</span></td></tr>
			
 
				+                      {
			
 
				+                        item.lisExcelItem && item.lisExcelItem.map((value) => {
			
 
				+                          return <tr style={{ lineHeight: '1.5', maxWidth: '650px' }}>
			
 
				+                            <td style={{ width: '32%', fontSize: '12px' }}>{value.itemName}</td>
			
 
				+                            <td style={{ width: '16%', fontSize: '12px' }}><span style={{ fontSize: '12px', color: value.type == 1 ? "red" : null }}>{value.value}</span> {value.unit}</td>
			
 
				+                            <td style={{ width: '24%', fontSize: '12px' }}>
			
 
				+                              {normalVal(value.min, value.max)}
			
 
				+                            </td>
			
 
				+                            <td style={{ width: '28%', fontSize: '12px' }}>{value.time == '' ? ('导入时间: ' + this.state.dateTime) : '化验时间: ' + value.time}</td>
			
 
				+                          </tr>
			
 
				+                        })
			
 
				+                      }
			
 
				+                    </table>
			
 
				+                  })
			
 
				+                })
			
 
				+              }
			
 
				+              {
			
 
				+                dataJson.lis.labelList && dataJson.lis.labelList.map((item, idx) => {
			
 
				+                  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.details.map((val) => {
			
 
				+                          if (val.value && val.value != '') {
			
 
				+                            return <tr style={{ lineHeight: '1.5', width: '100%', fontSize: '12px' }}>
			
 
				+                              <td style={{ width: '32%', fontSize: '12px' }}>{val.name}</td>
			
 
				+                              {this.showDetails(val)}
			
 
				+                              <td style={{ width: '24%', fontSize: '12px' }}>
			
 
				+                                {normalVal(val.minValue, val.maxValue)}
			
 
				+                              </td>
			
 
				+                              <td style={{ width: '28%', fontSize: '12px' }}>{'化验时间:' + item.time}</td>
			
 
				+                            </tr>
			
 
				+                          }
			
 
				+                        })
			
 
				+                      }
			
 
				+                    </table>
			
 
				+                  }
			
 
				+                })
			
 
				+              }
			
 
				+            </td>
			
 
				+          </tr>
			
 
				+          <tr style={{ verticalAlign: 'top', borderBottom: "1px solid #e2e4e6" }}>
			
 
				+            <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>辅检：</td>
			
 
				+            <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px', lineHeight: '20px' }}>
			
 
				+              {
			
 
				+                dataStr.pacs && dataStr.pacs != '' && dataStr.pacs.split(';').map((item) => {
			
 
				+                  return <div style={{ fontSize: '14px' }}>{item}</div>
			
 
				+                })
			
 
				+              }
			
 
				+            </td>
			
 
				+          </tr>
			
 
				+          <tr style={{ verticalAlign: 'top', borderBottom: "1px solid #e2e4e6" }}>
			
 
				+            <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>诊断：</td>
			
 
				+            <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px', lineHeight: '20px' }}>
			
 
				+              {
			
 
				+                dataStr.diag && dataStr.diag != '' && dataStr.diag.split(';').map((item) => {
			
 
				+                  return <div style={{ fontSize: '14px' }}>{item}</div>
			
 
				+                })
			
 
				+              }
			
 
				+            </td>
			
 
				+          </tr>
			
 
				+          <tr style={{ verticalAlign: 'top', borderBottom: "1px solid #e2e4e6" }}>
			
 
				+            <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>医嘱：</td>
			
 
				+            <td style={{ fontSize: '14px', padding: '1px 0px 8px 0px', lineHeight: '20px' }}>
			
 
				+              {
			
 
				+                dataJson.advice.assay && dataJson.advice.assay.length > 0 || dataJson.advice.check && dataJson.advice.check.length > 0 ? <p style={{ fontSize: '14px', marginBottom: "8px" }}><span>开单项目</span></p> : ''
			
 
				+              }
			
 
				+              {
			
 
				+                dataJson.advice.assay && <div style={{ padding: '0px 0px 5px 0px' }}>{dataJson.advice.assay}</div>
			
 
				+              }
			
 
				+              {
			
 
				+                dataJson.advice.check && <div style={{ padding: '0px 0px 5px 0px' }}>{dataJson.advice.check}</div>
			
 
				+              }
			
 
				+              {dataJson.advice.scheme && dataJson.advice.scheme.length > 0 && <p style={{ fontSize: '14px', marginBottom: '8px', marginTop: '8px' }}><span>治疗方案</span></p>}
			
 
				+              {
			
 
				+                dataJson.advice.scheme && dataJson.advice.scheme.map((item, index) => {
			
 
				+                  return <p>{item.treatment.map((it, ii) => {
			
 
				+                    return (it.treatmentStr && it.treatmentStr.length > 0 ?
			
 
				+                      <div style={{ padding: '0px 0px 5px 0px' }}>{it.treatmentStr}</div> : '')
			
 
				+                  })}</p>
			
 
				+                })
			
 
				+              }
			
 
				+            </td>
			
 
				+          </tr>
			
 
				+        </table>
			
 
				+        <p style={{textAlign:'right',marginTop:'15px'}}>医生签名：<span style={{minWidth: '60px',padding: '0 5px 2px 5px',borderBottom: '1px solid #333',}}>{baseObj ? baseObj.doctorName : (JSON.stringify(preInfo) == '{}' ? '' : preInfo.doctorName)}</span></p>
			
 
				+      </div>
			
 
				+
			
 
				+      <div onClick={() => { this.surePrint(dataStr) }} style={{
			
 
				+        display: show ? 'inline-block' : 'none',
			
 
				+        padding: '10px 20px',
			
 
				+        float: 'right',
			
 
				+        marginTop: '15px',
			
 
				+        background: '#3B9ED0',
			
 
				+        color: '#fff',
			
 
				+        borderRadius: '4px',
			
 
				+        cursor: 'pointer',
			
 
				+        position: 'absolute',
			
 
				+        right: '40px'
			
 
				+      }}>打印</div>
			
 
				+    </div>
			
 
				+  }
			
 
				 }
			
 
				 
			
 
				 export default PreviewBody;
			
--- a/src/components/PrintPreview/index.jsx
+++ b/src/components/PrintPreview/index.jsx
@@ -24,7 +24,7 @@ class PrintPreview extends Component {
 
				         }
			
 
				     }
			
 
				     render() {
			
 
				-        const { onClose, visible, preInfo } = this.props;
			
 
				+        const { onClose, visible, preInfo,save } = this.props;
			
 
				         let baseList = store.getState();
			
 
				         const dataJson = getAllDataList(baseList);
			
 
				         const dataStr = getAllDataStringList(baseList);
			
@@ -40,6 +40,7 @@ class PrintPreview extends Component {
 
				                         dataStr={dataStr}
			
 
				                         show={true}
			
 
				                         onClose={onClose}
			
 
				+                        save={save}
			
 
				                     ></PreviewBody>
			
 
				                 {/* </div> */}
			
 
				             </div>
			
--- a/src/components/PushContainer/index.jsx
+++ b/src/components/PushContainer/index.jsx
@@ -7,6 +7,7 @@ import { initItemList,delItem,delBatchItem,changeTitleAsync,saveTemplateDetail }
 
				 import { CHANGE_TYPE } from "@store/types/typeConfig";
			
 
				 import { connect } from "react-redux";
			
 
				 import store from '@store';
			
 
				+import {billing} from '@store/async-actions/pushMessage';
			
 
				 
			
 
				 import TemplateContainer from '@components/TemplateContainer';
			
 
				 import TemplateItems from '@components/TemplateItems';
			
@@ -223,6 +224,7 @@ class PushContainer extends Component {
 
				                     let typeConfig = part.type;
			
 
				                     store.dispatch(keepPushData(part,'part'))                 //引用数据的存储，用于保存模板是判断数据是否变化
			
 
				                     pushAllDataList(typeConfig,'push',part,'template')       //引用
			
 
				+                    store.dispatch(billing())
			
 
				                 }
			
 
				             })
			
 
				             store.dispatch(changeVisible(false))
			
--- a/src/components/PushItems/DetailsModal/index.less
+++ b/src/components/PushItems/DetailsModal/index.less
@@ -80,6 +80,7 @@
 
				 .details-content-menu-name {
			
 
				     color: #33475f;
			
 
				     font-size: 13px;
			
 
				+    cursor: pointer;
			
 
				 }
			
 
				 .details-content-menu-circle {
			
 
				     display: inline-block;
			
--- a/src/components/PushItems/index.jsx
+++ b/src/components/PushItems/index.jsx
@@ -47,12 +47,11 @@ class PushItems extends Component {
 
				     const checkedCheck = check.filter(item => item.checked);
			
 
				     this.props.billing(checkedAssay, checkedCheck);
			
 
				     if(checkedAssay.length > 0 || checkedCheck.length > 0) {
			
 
				-      console.log('checkedCheck',checkedAssay, checkedCheck)
			
 
				       const Height = $(".src-components-BodyContainer-2SgEx").height();
			
 
				       const adviceHeight = $(".src-common-components-ItemBox-1Bpz3").height();
			
 
				       const winHeight = window.innerHeight;
			
 
				       const scrollTop = Height;
			
 
				-      document.documentElement.scrollTop = 10000;
			
 
				+      $('#addScrollEvent').scrollTop(100000)
			
 
				     }
			
 
				     
			
 
				   }
			
@@ -230,7 +229,12 @@ class PushItems extends Component {
 
				             <div className={style["recommend"]}>
			
 
				               <h1>
			
 
				                 <img src={recommendImg} />
			
 
				-                推荐检验检查<div className={style["billing"]}  onClick={billing}>开单</div>
			
 
				+                推荐检验检查
			
 
				+                <div className={style["billing"]} 
			
 
				+                     style={assay.length === 0 && check.length === 0 ? {color: 'gray', border: '1px solid gray'} : ''} 
			
 
				+                     onClick={assay.length === 0 && check.length === 0 ? '' : billing}>
			
 
				+                    开单
			
 
				+                </div>
			
 
				               </h1>
			
 
				               <div>
			
 
				                 {assay.length === 0 && check.length === 0 ? (
			
--- a/src/components/RadioDrop/index.jsx
+++ b/src/components/RadioDrop/index.jsx
@@ -135,6 +135,10 @@ class RadioDrop extends Component{
 
				         editable: true
			
 
				       });
			
 
				     };
			
 
				+    //失焦关闭编辑状态
			
 
				+    setTimeout(()=>{
			
 
				+      e.target.focus();
			
 
				+    })
			
 
				     handleDbclick&&handleDbclick({id:patId||id});
			
 
				   }
			
 
				   render(){
			
--- a/src/components/SpreadDrop/index.jsx
+++ b/src/components/SpreadDrop/index.jsx
@@ -104,7 +104,10 @@ class SpreadDrop extends Component{
 
				         labelVal:text,
			
 
				         editable:true
			
 
				       });
			
 
				-      e.target.focus();
			
 
				+      //失焦关闭编辑状态
			
 
				+      setTimeout(()=>{
			
 
				+        e.target.focus();
			
 
				+      })
			
 
				       handleDbclick && handleDbclick({value,id,placeholder});
			
 
				     }
			
 
				   }
			
@@ -190,14 +193,14 @@ class SpreadDrop extends Component{
 
				   }
			
 
				   handleConfirm(e){
			
 
				     e.stopPropagation();
			
 
				-    const {handleConfirm,ikey,type,tagType,order,mainSaveText,copyType,value} = this.props;
			
 
				-    const params = Object.assign({},this.state,{ikey,type,tagType,order,mainSaveText,copyType,value});
			
 
				+    const {handleConfirm,ikey,type,tagType,order,mainSaveText,copyType,value,mainData} = this.props;
			
 
				+    const params = Object.assign({},this.state,{ikey,type,tagType,order,mainSaveText,copyType,value,mainData});
			
 
				     handleConfirm&&handleConfirm(params);
			
 
				 	this.btnClickFlag = true;
			
 
				     //点确定后隐藏弹窗
			
 
				     this.props.handleHide();
			
 
				   }
			
 
				-  handleSelect(item,isExclu,joint,listIndex,selected){
			
 
				+  handleSelect(item,isExclu,joint,listIndex,selected){//console.log(item,selected)
			
 
				     let {withOn,withs,noneOn,exclusion,exists,nowOn,nones,noneIds,ban} = this.state;
			
 
				     /*if(this.props.selecteds)
			
 
				     console.log(exists,this.props.selecteds.exists,exists===this.props.selecteds.exists)*/
			
@@ -222,9 +225,9 @@ class SpreadDrop extends Component{
 
				     }
			
 
				     //操作单选项
			
 
				     if(selected){
			
 
				-      const tIndex= exists.findIndex((it)=>it.id===selected.id);
			
 
				+      const tIndex= exists.findIndex((it)=>it.questionId===item.questionId);
			
 
				       if(tIndex!=-1){
			
 
				-        exists.splice(tIndex,1,{id,name,listIndex});
			
 
				+        exists.splice(tIndex,1,item);
			
 
				         this.setState({
			
 
				           exists,
			
 
				         })
			
@@ -286,7 +289,7 @@ class SpreadDrop extends Component{
 
				       }else if(nowOn=='with'){
			
 
				         withs.push({id:id,name:name});
			
 
				       }else{
			
 
				-        exists.push({id:id,name:name,listIndex});
			
 
				+        exists.push({id:id,name:name,listIndex,questionId:item.questionId});
			
 
				       }
			
 
				     }
			
 
				     this.setState({
			
@@ -407,9 +410,16 @@ class ListItem extends Component{
 
				     const index=listIndex+''+i;
			
 
				     //列单选处理
			
 
				     if(isRadio){
			
 
				-      const selected = data.find((it)=>{
			
 
				-        return exists.findIndex((i)=>i.id===it.id)!==-1||noneIds.includes(it.id)||withs.findIndex((i)=>i.id===it.id)!==-1;
			
 
				+      let selected = exists.find((i)=>{
			
 
				+        return i.questionId===item.questionId;
			
 
				+      })||withs.find((i)=>{
			
 
				+        return i.questionId===item.questionId;
			
 
				+      })||noneIds.find((i)=>{
			
 
				+        return i.id===item.questionId;
			
 
				       });
			
 
				+      /*const selected = data.find((it)=>{console.log(exists)
			
 
				+        return exists.findIndex((i)=>i.questionId===it.id)!==-1||noneIds.includes(it.id)||withs.findIndex((i)=>i.questionId===it.id)!==-1;
			
 
				+      });*/
			
 
				       if(selected&&selected.id!=item.id){     //该列已有选中项，传回已选中的id,name取消选中
			
 
				         handleClick&&handleClick(item,isExclu,joint,index,{id:selected.id,name:selected.name});
			
 
				       }else{
			
@@ -428,7 +438,7 @@ class ListItem extends Component{
 
				         return style['exclusion'];
			
 
				       }
			
 
				     }else{
			
 
				-      if(isExclu&&[...noneIds,...exists,...withs].length>0){
			
 
				+      if(isExclu&&([...noneIds,...exists,...withs].length>0||ban.id)){
			
 
				         return style['exclusion'];
			
 
				       }
			
 
				       if(noneIds.includes(id)){
			
--- a/src/components/TemplateItems/index.jsx
+++ b/src/components/TemplateItems/index.jsx
@@ -66,7 +66,7 @@ class TemplateItems extends React.Component {
 
				                         </div> :
			
 
				                         <div className={style.wrapperTop}>
			
 
				                             <span className={`${style['fr-element']} ${style['manger']}`} onClick={handleMangerTemplate}>管理</span>
			
 
				-                    </div>) : null
			
 
				+                    </div>) : <div style={{height:'36px'}}></div>
			
 
				                 }
			
 
				                 <div className={style.tempLists} ref={this.$cont}>
			
 
				                     {
			
--- a/src/components/Treat/DrugTreat/index.jsx
+++ b/src/components/Treat/DrugTreat/index.jsx
@@ -16,7 +16,7 @@ class DrugTreat extends Component {
 
				         this.setOtherRecommend = this.setOtherRecommend.bind(this);
			
 
				         this.setDrugInfo = this.setDrugInfo.bind(this);
			
 
				         this.showTreatDesc = this.showTreatDesc.bind(this);
			
 
				-        this.handleMouseLeaveImg = this.handleMouseLeaveImg.bind(this)
			
 
				+        this.handleMouseLeaveImg = this.handleMouseLeaveImg.bind(this);
			
 
				     }
			
 
				 
			
 
				     handleSelect(index,ii) {
			
@@ -46,13 +46,14 @@ class DrugTreat extends Component {
 
				     //搜索药品说明书（查看数据用）
			
 
				     handleInputDrug(e) {
			
 
				         this.setState({
			
 
				-            drugId: e.target.value
			
 
				+            drugIdList: e.target.value
			
 
				          })
			
 
				     }
			
 
				     //搜索药品说明书（查看数据用）
			
 
				     searchDrug() {
			
 
				-        const { showDrugInfo } = this.props
			
 
				-        this.setDrugInfo({id: this.state.drugId})
			
 
				+        const { showDrugInfo, setDrugInfoMore } = this.props
			
 
				+        const drugIdList = this.state.drugIdList.split(' ')
			
 
				+        setDrugInfoMore({drugIdList: drugIdList})
			
 
				         showDrugInfo && showDrugInfo();
			
 
				 
			
 
				     }
			
@@ -76,7 +77,7 @@ class DrugTreat extends Component {
 
				                 {treatment.map((item, index) => {
			
 
				                     return(<div className={style['drug-content']}>
			
 
				                         <div  className={style['drug-name-box']}>
			
 
				-                            <span>{index + 1 + '. ' }{item.bigdrugsName}<span>({item.subdrugsName})</span>:&nbsp;</span>
			
 
				+                            <span style={item.drugsForbidden === '2'? {opacity: '0.3', filter:'alpha(opacity=30)',filter:'progid:DXImageTransform.Microsoft.Alpha(opacity=30)'} : ''}>{index + 1 + '. ' }{item.bigdrugsName}<span>({item.subdrugsName})</span>:&nbsp;</span>
			
 
				                             {item.medicitionsList.map((it, ii) => {
			
 
				                                 return ((it.isShow == 1 || it.selected) && <span >
			
 
				                                         {ii === 0 ? '' : ', '}
			
@@ -92,7 +93,8 @@ class DrugTreat extends Component {
 
				                                               onMouseEnter={this.handleMouseEnterImg.bind(this, ii, index)}
			
 
				                                               onMouseLeave = {this.handleMouseLeaveImg}
			
 
				                                               onClick={() =>{this.setDrugInfo(it);showDrugInfo();}}/>}
			
 
				-                                        {it.forbidden === '1' ? <span className={style['info-flag']} style={{opacity: '0.3',border: '1px solid #F4C051', background: '#F4C051',marginLeft: '5px'}}>慎用</span>: it.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> : ''}, 使用率{it.rate}
			
 
				+                                        {it.forbidden === '1' ? <span className={style['info-flag']} style={{opacity: '0.3',border: '1px solid #F4C051', background: '#F4C051',marginLeft: '5px'}}>慎用</span>: it.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={it.forbidden === '2' ? {opacity: '0.3', filter:'alpha(opacity=30)',filter:'progid:DXImageTransform.Microsoft.Alpha(opacity=30)'} : ''}> 使用率{it.rate}</span>
			
 
				                                         
			
 
				                                     </span>)
			
 
				                             })}
			
--- a/src/components/Treat/index.jsx
+++ b/src/components/Treat/index.jsx
@@ -38,7 +38,10 @@ class Treat extends Component {
 
				     }
			
 
				 
			
 
				     render(){
			
 
				-        const { generalTreat, treatment, treatItem, surgeryTreat, selectDrug, drugInfo, treatDesc, setOtherRecommend, setDrugInfo, showDrug, showDrugInfo,hideDrugInfo, title} = this.props;
			
 
				+    
			
 
				+    
			
 
				+        const { generalTreat, treatment, treatItem, surgeryTreat, selectDrug, drugInfo, treatDesc, setOtherRecommend, setDrugInfo, showDrug, showDrugInfo,hideDrugInfo, title, drugInfoList, hideDrugInfoMore} = this.props;
			
 
				+        const { setDrugInfoMore } = this.props
			
 
				         return(
			
 
				             <div   className={style['treat-wrapper']}>
			
 
				                 <div className={style['treat-mask']}>
			
@@ -52,7 +55,9 @@ class Treat extends Component {
 
				                                 selectDrug={selectDrug} 
			
 
				                                 setOtherRecommend={ setOtherRecommend } 
			
 
				                                 showDrugInfo = {showDrugInfo}
			
 
				-                                setDrugInfo={ setDrugInfo }>
			
 
				+                                setDrugInfo={ setDrugInfo }
			
 
				+                                setDrugInfoMore = {setDrugInfoMore} //查询多条药品说明数据
			
 
				+                            >
			
 
				                         </DrugTreat> 
			
 
				                         <GeneralTreat icon={surgicalIcon} title='手术治疗' titleStyle={{background:'#FAEAEA',opacity:'1', filter:'alpha(opacity=100);',filter:'progid:DXImageTransform.Microsoft.Alpha(opacity=100);'}} titleBg='#FAEAEA' generalTreat={surgeryTreat}></GeneralTreat>
			
 
				                     </div>
			
@@ -71,7 +76,9 @@ class Treat extends Component {
 
				                 </div>
			
 
				                 
			
 
				                 
			
 
				-                {showDrug && drugInfo && <DrugInfo drugInfo = {drugInfo} hideDrugInfo = {hideDrugInfo}></DrugInfo>}
			
 
				+                {/* {showDrug && drugInfo && <DrugInfo drugInfo = {drugInfo} hideDrugInfo = {hideDrugInfo}></DrugInfo>} */}
			
 
				+                {/* 查询多个药品说明书 （添加数据查看药品说明书用）*/}
			
 
				+                {showDrug && <DrugInfo drugInfoList = {drugInfoList} hideDrugInfoMore = {hideDrugInfoMore}></DrugInfo>}
			
 
				             </div>
			
 
				                 
			
 
				             
			
--- a/src/components/TreatDesc/DrugInfo/index.jsx
+++ b/src/components/TreatDesc/DrugInfo/index.jsx
@@ -8,23 +8,47 @@ class DrugInfo extends Component {
 
				     }
			
 
				 
			
 
				     render() {
			
 
				-        const { drugInfo, hideDrugInfo } = this.props
			
 
				-        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>
			
 
				-                { drugInfo && drugInfo.drugDesc.length > 0 && <div className={style['drug-desc-wrapper']}>
			
 
				-                    <div className={style['drug-title1']}>{drugInfo.title}说明书</div>
			
 
				-                    {drugInfo.drugDesc.map((item, index) =>{
			
 
				-                        return <div className={style['drug-desc-item']}><span className={style['drug-desc-title']}>{item.title.trim()}</span> <div className={style['drug-desc-content']} dangerouslySetInnerHTML ={{__html: item.content}}></div> </div>
			
 
				-                    })}
			
 
				-                </div> }
			
 
				-                { !drugInfo || (drugInfo && drugInfo.drugDesc.length === 0) && <div className={style['drug-desc-wrapper']}>
			
 
				-                    <div>
			
 
				-                        该药品暂无说明
			
 
				-                    </div>
			
 
				+        const { drugInfo, hideDrugInfo, drugInfoList,hideDrugInfoMore } = this.props
			
 
				+        // 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>
			
 
				+        //         { drugInfo && drugInfo.drugDesc.length > 0 && <div className={style['drug-desc-wrapper']}>
			
 
				+        //             <div className={style['drug-title1']}>{drugInfo.title}说明书</div>
			
 
				+        //             {drugInfo.drugDesc.map((item, index) =>{
			
 
				+        //                 return <div className={style['drug-desc-item']}><span className={style['drug-desc-title']}>{item.title.trim()}</span> <div className={style['drug-desc-content']} dangerouslySetInnerHTML ={{__html: item.content}}></div> </div>
			
 
				+        //             })}
			
 
				+        //         </div> }
			
 
				+        //         { !drugInfo || (drugInfo && drugInfo.drugDesc.length === 0) && <div className={style['drug-desc-wrapper']}>
			
 
				+        //             <div>
			
 
				+        //                 该药品暂无说明
			
 
				+        //             </div>
			
 
				                     
			
 
				+        //         </div> }
			
 
				+
			
 
				+        // </div>)
			
 
				+
			
 
				+         return (<div className={style['drug-info-wrapper']}>
			
 
				+                <h3 className={style['drug-title']}>说明书  <img src={close} onClick={hideDrugInfoMore} className={style['close-drug-desc']}/> </h3>
			
 
				+                { drugInfoList && drugInfoList.length > 0 && <div className={style['drug-desc-wrapper']}>
			
 
				+                    {drugInfoList.map((item,index) => {
			
 
				+                        return <div>
			
 
				+                            <h3 style={{height:' 50px', fontSize:'40px', fontWeight: '800'}}>{'【'+item.id+'】'}{item.name}说明书  </h3>
			
 
				+                            {item.introduceDetailList&&item.introduceDetailList.length>0&&item.introduceDetailList.map((it, index) =>{
			
 
				+                                return <div className={style['drug-desc-item']}><span className={style['drug-desc-title']}>{it.title.trim()}</span> <div className={style['drug-desc-content']} dangerouslySetInnerHTML ={{__html: it.content}}></div> </div>
			
 
				+                            })}
			
 
				+                             <br/>
			
 
				+                            <br/> <br/> <br/> <br/>
			
 
				+                        </div>
			
 
				+                        
			
 
				+                       
			
 
				+
			
 
				+                    })}
			
 
				+                   
			
 
				                 </div> }
			
 
				+               
			
 
				 
			
 
				         </div>)
			
 
				+
			
 
				+
			
 
				     }
			
 
				 }
			
 
				 
			
--- a/src/components/TreatDesc/index.jsx
+++ b/src/components/TreatDesc/index.jsx
@@ -53,7 +53,7 @@ class TreatDesc extends Component {
 
				                     
			
 
				                 </div> } */}
			
 
				                 { otherDrugIndex > -1 && <div  className={style['similar-drug']}>
			
 
				-                    <h3 className={style['drug-desc-title']}><span className={style['drug-desc-class-title']} title={'同类药物(' + treatment[otherDrugIndex].drugsName + ')'}>同类药物({treatment[otherDrugIndex].drugsName})</span>  <img src={close} onClick={this.hideTreatDesc} className={style['close-drug-desc']} /></h3>
			
 
				+                    <h3 className={style['drug-desc-title']}><span className={style['drug-desc-class-title']} title={'同类药物(' + treatment[otherDrugIndex].drugsName + ')'}>同类药物({treatment[otherDrugIndex].bigdrugsName})</span>  <img src={close} onClick={this.hideTreatDesc} className={style['close-drug-desc']} /></h3>
			
 
				                     {treatment[otherDrugIndex].medicitionsList.map((item, index) =>{
			
 
				                         return (<span >
			
 
				                         {index === 0 ? '' : ', '}     
			
@@ -73,7 +73,8 @@ class TreatDesc extends Component {
 
				                             onMouseEnter={this.handleMouseEnterImg.bind(this, index)}
			
 
				                             onMouseLeave = {this.handleMouseLeaveImg}
			
 
				                             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> : ''}, 使用率{item.rate}
			
 
				+                        {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>
			
 
				                         
			
 
				                     </span>)
			
 
				                     })}
			
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -31,6 +31,7 @@ export default {
 
				     delayPushTime:1000,    //延迟推送时间
			
 
				     pushDelay:1000,
			
 
				     punctuationReg:/[^,，.。；;、]/g,       //正则表达式，全局查找不是括号内标点的字符
			
 
				+    punReg:/[,，.。；;、]+/g,
			
 
				     currentText:"患者XX因XX诊断为(**)，经XX治疗后，目前XX症状已缓解，仍有XX，各项指标情况：XX，辅助检查：XX。今来复诊，进一步治疗",
			
 
				     timeUnit:{
			
 
				       minute:"分",
			
--- a/src/containers/AssistCheck.js
+++ b/src/containers/AssistCheck.js
@@ -7,11 +7,12 @@ import { assistLable,delAssistLabel,changeAssistVal,changeDate } from '@store/ac
 
				 import { getSearchList } from '@store/async-actions/assistCheck';
			
 
				 import {billing} from '@store/async-actions/pushMessage';
			
 
				 
			
 
				-function mapStateToProps(state) {  
			
 
				+function mapStateToProps(state) {
			
 
				     return {
			
 
				         list:state.assistCheck.list,
			
 
				         assistLabel:state.assistCheck.assistLabel,
			
 
				         isRead:state.homePage.isRead,
			
 
				+        winWidth:state.homePage.windowWidth,
			
 
				     }
			
 
				 }
			
 
				 
			
@@ -20,8 +21,8 @@ function mapDispatchToProps(dispatch, store) {
 
				         handleChangeValue(val) {
			
 
				             dispatch(getSearchList(val))
			
 
				         },
			
 
				-        handleSign(id){
			
 
				-            dispatch(assistLable(id))
			
 
				+        handleSign(id,idx){
			
 
				+            dispatch(assistLable(id,idx))
			
 
				         },
			
 
				         handleDelAssist(idx){
			
 
				             dispatch(delAssistLabel(idx))
			
--- a/src/containers/DiagnosticItem.js
+++ b/src/containers/DiagnosticItem.js
@@ -10,7 +10,7 @@ import {billing, getTips} from '../store/async-actions/pushMessage';
 
				 
			
 
				 function mapStateToProps(state) {
			
 
				     return {
			
 
				-
			
 
				+        diagnosticList: state.diagnosticList.diagnosticList
			
 
				     }
			
 
				 }
			
 
				 
			
--- a/src/containers/MainSuit.js
+++ b/src/containers/MainSuit.js
@@ -5,6 +5,7 @@ import {CLEAR_COMSYMPTOMS,SHOW_TAIL,INSERT_MAIN,CLEAR_SEARCH,SET_SEARCH,SAVE_FRE
 
				 import {RESET,CLICKCOUNT,ISREAD} from '@store/types/homePage.js';
			
 
				 import {getCommSymptoms,getCommSymptomPush} from '@store/async-actions/mainSuit.js'
			
 
				 import {SET_MAIN_SUIT} from '@store/types/fillInfo';
			
 
				+import {CLEAR_DIAGNOSE} from '@store/types/diagnosticList';
			
 
				 import {getSearch} from '@store/async-actions/fetchModules';
			
 
				 import {billing} from '@store/async-actions/pushMessage';
			
 
				 import {filterArr,didPushParamChange,filterDataArr} from '@utils/tools.js';
			
@@ -151,6 +152,11 @@ function mapDispatchToProps(dispatch) {
 
				             text:obj.text
			
 
				           })
			
 
				       },
			
 
				+      clearDiagnose(){//清除复诊
			
 
				+        dispatch({
			
 
				+            type:CLEAR_DIAGNOSE,
			
 
				+          })
			
 
				+      }
			
 
				     }
			
 
				 }
			
 
				 
			
--- a/src/containers/OtherHistory.js
+++ b/src/containers/OtherHistory.js
@@ -40,11 +40,13 @@ function mapDispatchToProps(dispatch,store){
 
				         const model = JSON.parse(JSON.stringify(initData.otherHisModel));
			
 
				         const arr = JSON.parse(JSON.stringify(initData.otherHis||null));
			
 
				         const arrSave = JSON.parse(JSON.stringify(initData.otherHisSave||null));
			
 
				+        const selects = JSON.parse(JSON.stringify(initData.otherSelecteds||null));
			
 
				         const isHis = initData.otherIsHis;
			
 
				         const listObj = isHis?{newArr:arr,saveText:arrSave||[]}:fullfillText(model);
			
 
				         dispatch({
			
 
				           type:SETDATA,
			
 
				           data:listObj.newArr,
			
 
				+          selecteds:selects,
			
 
				           save:listObj.saveText,
			
 
				           isEmpty:false
			
 
				         });
			
--- a/src/containers/SpreadDrop.js
+++ b/src/containers/SpreadDrop.js
@@ -15,9 +15,10 @@ import {Notify} from '@commonComp';
 
				 import {filterArr,didPushParamChange,filterDataArr} from '@utils/tools.js';
			
 
				 import config from '@config/index.js';
			
 
				 
			
 
				-function mapStateToProps(state) {
			
 
				+function mapStateToProps(state) {//console.log(state);
			
 
				   return {
			
 
				     mainSaveText:state.mainSuit.saveText,
			
 
				+    mainData:state.mainSuit.data,
			
 
				   }
			
 
				 }
			
 
				 
			
@@ -35,33 +36,82 @@ function getNames(data,order){//从exist withs 中获取name字段
 
				   return nameData;
			
 
				 }
			
 
				 
			
 
				+function addPoint(data,num){//给伴随添加顿号
			
 
				+  for(let i=num; i<data.length; i++){
			
 
				+    data[i].name = '、'+ data[i].name;
			
 
				+  }
			
 
				+  return data;
			
 
				+}
			
 
				 
			
 
				 /***********************标签展开确定事件***************************/
			
 
				 
			
 
				 // 主诉--不用展开标签
			
 
				 function mainSuitModule(dispatch,store,params){
			
 
				-  const {nones,exists,withs,exclusion,excluName,ban,mainSaveText} = params;
			
 
				-  let existsName = getNames(exists);
			
 
				-  let withsName = getNames(withs);
			
 
				-  let banName = ban.name;
			
 
				+  const {nones,exists,withs,exclusion,excluName,ban,mainSaveText,mainData} = params;
			
 
				   let text = filterDataArr(mainSaveText);
			
 
				   if(text.length >= config.limited){
			
 
				     Notify.info(config.limitText);
			
 
				     return
			
 
				   }
			
 
				+  // let existsName = getNames(exists);
			
 
				+  // let withsName = getNames(withs);
			
 
				+  const copExists = JSON.parse(JSON.stringify(exists));
			
 
				+  const copWiths = JSON.parse(JSON.stringify(withs)); 
			
 
				+  let banName = ban.name;
			
 
				+  const index = params.ikey;
			
 
				+  let ikey = getLabelIndex(index);
			
 
				+  let num = 0;
			
 
				+  let existNum = 0;
			
 
				+  let forwardId;
			
 
				+  let mainText;
			
 
				+  for(let n=ikey-1; n>0; n--){
			
 
				+    if(mainData[n].flag && mainData[n].flag==1){
			
 
				+      forwardId = n;
			
 
				+      continue;
			
 
				+    }
			
 
				+  }
			
 
				+  
			
 
				+  if(forwardId){
			
 
				+    mainText = mainSaveText.slice(forwardId,ikey);
			
 
				+    const mainSlice = mainData.slice(forwardId,ikey);
			
 
				+    let banIndex = mainText.indexOf('伴'); 
			
 
				+    if(banIndex==-1){
			
 
				+      num = 1;
			
 
				+    }
			
 
				+    console.log(11,exists,mainSlice);
			
 
				+    // ikey前的data里没有exist=1的数据，则existNum=1
			
 
				+    if(exists.length>0){
			
 
				+      for(let i=0; i<mainSlice.length; i++){
			
 
				+        if(!mainSlice[i].exist && mainSlice[i].exist!==1){
			
 
				+          existNum = 1;
			
 
				+          continue;
			
 
				+        }
			
 
				+      }
			
 
				+    }
			
 
				+    
			
 
				+  }else{
			
 
				+    let banIndex = mainSaveText.indexOf("伴");
			
 
				+    if(banIndex==-1){
			
 
				+      num = 1;
			
 
				+    }
			
 
				+  }
			
 
				+  let withsName = getNames(addPoint(copWiths,num));
			
 
				+  let existsName = getNames(addPoint(copExists,existNum));
			
 
				   let names;
			
 
				   if(banName){
			
 
				     names = existsName + banName + withsName;
			
 
				   }else{
			
 
				     names = existsName + withsName;
			
 
				-  }  
			
 
				-  let lengths = text.length + names.length;console.log(5656,mainSaveText,text,text.length,names.length,lengths);
			
 
				+  } 
			
 
				+  // num==0 说明有“伴”，减1;
			
 
				+  let lengths = num==0?text.length + names.length - 1:text.length + names.length;
			
 
				+  // console.log(5656,num,existNum,text,text.length,names,lengths);
			
 
				   if(lengths > config.limited){
			
 
				     Notify.info(config.limitText);
			
 
				     return
			
 
				   }
			
 
				-  const index = params.ikey;
			
 
				-  let ikey = getLabelIndex(index);
			
 
				+  // const index = params.ikey;
			
 
				+  // let ikey = getLabelIndex(index);
			
 
				   dispatch({
			
 
				     type: MIX_CONFIRM,
			
 
				     data: {exists:exists,withs:withs,withsName:withsName,existsName:existsName,ikey,ban}
			
--- a/src/containers/Treat.js
+++ b/src/containers/Treat.js
@@ -2,7 +2,7 @@ import React from 'react';
 
				 import { connect } from 'react-redux';
			
 
				 import Treat from '@components/Treat';
			
 
				 import { SELECT_DRUG, SET_OTHER_DRUG, SET_DRUG_INFO, CLEAR_DRUG_INFO,HIDE_TREAT, CLEAR_TREAT, SHOW_DRUG_INFO, HIDE_DRUG_INFO } from '@store/types/treat.js';
			
 
				-import { getInstroduce, getRecommendBasic } from '@store/async-actions/treat';
			
 
				+import { getInstroduce, getRecommendBasic, getInstroduceMore } from '@store/async-actions/treat';
			
 
				 import { ADD_SCHEME } from '@store/types/pushMessage.js'
			
 
				 import { showDrugInfo } from '../store/actions/treat';
			
 
				 
			
@@ -17,6 +17,7 @@ function mapStateToProps(state){
 
				         drugInfo: treat.drugInfo,
			
 
				         showDrug: treat.showDrugInfo,
			
 
				         treatItem: treat.treatItem,
			
 
				+        drugInfoList: treat.drugInfoList,   //药品说明书列表（查询多个药品说明书）
			
 
				     }
			
 
				 }
			
 
				  
			
@@ -70,6 +71,15 @@ function mapDispatchToProps(dispatch) {
 
				                 title: title,
			
 
				                 treatment: treatment
			
 
				             })
			
 
				+        },
			
 
				+        //查询多条药品说明数据（添加数据用）
			
 
				+        setDrugInfoMore:(drugIdList) => {
			
 
				+            dispatch(getInstroduceMore(drugIdList));
			
 
				+        },
			
 
				+        hideDrugInfoMore: () =>{
			
 
				+            dispatch({
			
 
				+                type: HIDE_DRUG_INFO
			
 
				+            })
			
 
				         }
			
 
				     }
			
 
				 }
			
--- a/src/store/actions/assistCheck.js
+++ b/src/store/actions/assistCheck.js
@@ -4,9 +4,10 @@ export const searchList = (list) => ({         //获取搜索数据
 
				     type:GET_ASSIST_SEARCH_LIST,
			
 
				     list
			
 
				 })
			
 
				-export const assistLable = (id) => ({         //添加数据
			
 
				+export const assistLable = (id,idx) => ({         //添加数据
			
 
				     type:GET_ASSIST_LABEL,
			
 
				-    id
			
 
				+    id,
			
 
				+    idx
			
 
				 })
			
 
				 export const delAssistLabel = (idx) => ({         //删除数据
			
 
				     type:DEL_ASSIST_LABEL,
			
--- a/src/store/actions/checkBody.js
+++ b/src/store/actions/checkBody.js
@@ -80,7 +80,7 @@ export function setNumberValue(state,action){
 
				       if(it.value){     //至少有一个子值才黑显
			
 
				         hasValue = true;
			
 
				       }
			
 
				-        return (it.labelPrefix||'')+(it.value||'')+(it.labelSuffix||'');
			
 
				+      return (it.labelPrefix||'')+(it.value||'')+(it.labelSuffix||'');
			
 
				     });
			
 
				     res.saveText[labelInx] = hasValue?sub.join(''):'';
			
 
				   }
			
@@ -279,8 +279,8 @@ export const changeNumLabelVal = (state,action)=>{
 
				     const num = nextIsDot?2:1;
			
 
				     res.data.splice(index,num);
			
 
				     res.saveText = fullfillText(res.data).saveText;
			
 
				-  } 
			
 
				-  
			
 
				+  }
			
 
				+
			
 
				   res.update = Math.random();
			
 
				   return res;
			
 
				 }
			
@@ -323,7 +323,7 @@ export function backspaceText(state,action){
 
				   const {delIndex} = action;
			
 
				   const data = res.data;
			
 
				   if(data[delIndex-1].flag&&data[delIndex-1].flag==3){
			
 
				-  // if(data[delIndex-1].tagType==8 ||data[delIndex-1].flag&&data[delIndex-1].flag==3){
			
 
				+    // if(data[delIndex-1].tagType==8 ||data[delIndex-1].flag&&data[delIndex-1].flag==3){
			
 
				     // 前一个是文本标签或者子模板 不做处理
			
 
				   }else if(data[delIndex-1].tagType==8){
			
 
				     data.splice(delIndex,1);
			
--- a/src/store/actions/diagnosticList.js
+++ b/src/store/actions/diagnosticList.js
@@ -6,7 +6,7 @@ export const addDiagnostic = (state, action) => {
 
				 
			
 
				 export const delDiagnostic = (state, action) => {
			
 
				     const res = JSON.parse(JSON.stringify(state));
			
 
				-    res.diagnosticList = res.diagnosticList.filter(item => (item.id !== action.item.id && item.name !== action.item.name && item.retrievalName !== action.item.retrievalName));
			
 
				+    res.diagnosticList = res.diagnosticList.filter(item => (item.id !== action.item.id && item.name !== action.item.name));
			
 
				     return res;
			
 
				 }
			
 
				 
			
--- a/src/store/actions/mainSuit.js
+++ b/src/store/actions/mainSuit.js
@@ -148,7 +148,8 @@ export const confirm = (state,action) =>{
 
				   let forwardId;
			
 
				   let text;
			
 
				   for(let n=labelIndx-1; n>0; n--){
			
 
				-    if(arr[n].id==8){
			
 
				+    // if(arr[n].id==8){
			
 
				+    if(arr[n].flag && arr[n].flag==1){//添加症状打标flag=1
			
 
				       forwardId = n;
			
 
				       continue;
			
 
				     }
			
--- a/src/store/actions/otherHistory.js
+++ b/src/store/actions/otherHistory.js
@@ -37,21 +37,21 @@ export const confirm = (state,action) =>{
 
				     return res;
			
 
				   }
			
 
				   //有，伴，无随配
			
 
				-    //arr.splice(ikey-1,1);
			
 
				-    let flabel = items[items.length-1];         //要插入的最后一个标签
			
 
				-    let labelText = flabel.value!==undefined?flabel.value:flabel.name;
			
 
				-    let text = labelText;
			
 
				-    //要插入的最后一个标签为自由文本，则和后面的文本标签文字合并
			
 
				-    if(flabel.tagType==8){
			
 
				-      flabel.value = labelText+nones;
			
 
				-      text = flabel.value;
			
 
				-    }
			
 
				-    arr.splice(ikey,0,...exists,...withs);
			
 
				-    //arr[ikey-1].value = text;
			
 
				-    //res.saveText[ikey+items.length] = text;
			
 
				-    res.saveText = fullfillText(arr).saveText;
			
 
				-    res.update=Math.random();         //用于触发组件更新（data变化了因在对象中无法被组件检测到）
			
 
				-    return res;
			
 
				+  //arr.splice(ikey-1,1);
			
 
				+  let flabel = items[items.length-1];         //要插入的最后一个标签
			
 
				+  let labelText = flabel.value!==undefined?flabel.value:flabel.name;
			
 
				+  let text = labelText;
			
 
				+  //要插入的最后一个标签为自由文本，则和后面的文本标签文字合并
			
 
				+  if(flabel.tagType==8){
			
 
				+    flabel.value = labelText+nones;
			
 
				+    text = flabel.value;
			
 
				+  }
			
 
				+  arr.splice(ikey,0,...exists,...withs);
			
 
				+  //arr[ikey-1].value = text;
			
 
				+  //res.saveText[ikey+items.length] = text;
			
 
				+  res.saveText = fullfillText(arr).saveText;
			
 
				+  res.update=Math.random();         //用于触发组件更新（data变化了因在对象中无法被组件检测到）
			
 
				+  return res;
			
 
				 };
			
 
				 
			
 
				 //单选下拉选中
			
@@ -269,14 +269,14 @@ export const changeNumLabelVal = (state,action)=>{
 
				 }
			
 
				 
			
 
				 export function clearOtherHistory(state,action){       //清空数据
			
 
				-    let res = Object.assign({},state);
			
 
				-    res.data = action.data;
			
 
				-    res.saveText = action.saveText;
			
 
				-    res.selecteds = action.selecteds;
			
 
				-    res.editClear = action.editClear;
			
 
				-    res.isEmpty = action.isEmpty;
			
 
				-    return res;
			
 
				-  }
			
 
				+  let res = Object.assign({},state);
			
 
				+  res.data = action.data;
			
 
				+  res.saveText = action.saveText;
			
 
				+  res.selecteds = action.selecteds;
			
 
				+  res.editClear = action.editClear;
			
 
				+  res.isEmpty = action.isEmpty;
			
 
				+  return res;
			
 
				+}
			
 
				 //文本模式下值保存
			
 
				 export const setTextModeValue = (state,action)=>{
			
 
				   const res = Object.assign({},state);
			
@@ -286,19 +286,19 @@ export const setTextModeValue = (state,action)=>{
 
				 
			
 
				 //复制标签（如血压）事件
			
 
				 export function addLabelItem(state,action){
			
 
				-    let res = Object.assign({},state);
			
 
				-    const {data,i} = action;
			
 
				-    const textLabel = JSON.parse(config.textLabel);
			
 
				-    //使用Object.assign({},data)拷贝操作时复制项和原项会同步修改
			
 
				-    if(!data) return res;
			
 
				-    res.data.splice(i+1,0,JSON.parse(data),textLabel);
			
 
				-    res.update = Math.random();
			
 
				-    return res;
			
 
				+  let res = Object.assign({},state);
			
 
				+  const {data,i} = action;
			
 
				+  const textLabel = JSON.parse(config.textLabel);
			
 
				+  //使用Object.assign({},data)拷贝操作时复制项和原项会同步修改
			
 
				+  if(!data) return res;
			
 
				+  res.data.splice(i+1,0,JSON.parse(data),textLabel);
			
 
				+  res.update = Math.random();
			
 
				+  return res;
			
 
				 }
			
 
				 export const otherEditClear = (state,action)=>{
			
 
				-    const res = Object.assign({},state);
			
 
				-    res.editClear = action.bool;
			
 
				-    return res;
			
 
				+  const res = Object.assign({},state);
			
 
				+  res.editClear = action.bool;
			
 
				+  return res;
			
 
				 };
			
 
				 
			
 
				 // backspace删除
			
--- a/src/store/actions/pushMessage.js
+++ b/src/store/actions/pushMessage.js
@@ -89,10 +89,10 @@ export const addScheme = (state, action) => {
 
				     }
			
 
				   })
			
 
				   if (isRepeat) {
			
 
				-   //将同类药添加到一起
			
 
				+	 //将同类药添加到一起
			
 
				 	for (let i = 0; i < scheme[RepeatIndex].treatment.length; i++) {
			
 
				 		for (let j = 0; j < treatment.length; j++) {
			
 
				-			if (scheme[RepeatIndex].treatment[i].id === treatment[j].id) {
			
 
				+			if (scheme[RepeatIndex].treatment[i].id === treatment[j].id && scheme[RepeatIndex].treatment[i].bigdrugsName === treatment[j].bigdrugsName) {
			
 
				 				for(let z = 0; z < treatment[j].medicitionsList.length; z++) {
			
 
				 					if(treatment[j].medicitionsList[z].selected) {
			
 
				 						if(scheme[RepeatIndex].treatment[i].treatmentStr !== '') {
			
--- a/src/store/actions/treat.js
+++ b/src/store/actions/treat.js
@@ -91,3 +91,11 @@ export const setTreatInfo = (state, action) => {
 
				     return res;
			
 
				 }
			
 
				 
			
 
				+//设置多个药品说明书（添加数据时查看数据用）
			
 
				+export const setDrugInfoList = (state, action) => {
			
 
				+    const res = JSON.parse(JSON.stringify(state));
			
 
				+    const drugInfoList = action.drugInfoList;
			
 
				+    res.drugInfoList = drugInfoList
			
 
				+    return res
			
 
				+}
			
 
				+
			
--- a/src/store/async-actions/fetchModules.js
+++ b/src/store/async-actions/fetchModules.js
@@ -78,6 +78,7 @@ export const getOtherHisRecord = ()=>{
 
				           dispatch({
			
 
				             type:SETOTHERHISTORY,
			
 
				             data:arr,
			
 
				+            selecteds:obj.otherHistorySelecteds,
			
 
				             save:objStr
			
 
				           });
			
 
				         }
			
@@ -99,7 +100,7 @@ export function getInitData(){
 
				       pacs: emrData.pacs,
			
 
				       sex: emrData.sex,
			
 
				       vital:emrData.vital,
			
 
				-      symptom: emrData.current||emrData.main
			
 
				+      symptom: emrData.current+emrData.main
			
 
				     };
			
 
				     json(api.getBigPush,param).then((res)=>{
			
 
				       if(+res.data.code === 0){
			
--- a/src/store/async-actions/patInfo.js
+++ b/src/store/async-actions/patInfo.js
@@ -57,6 +57,8 @@ export const initHistoryDetails = (dispatch) => {
 
				                     if(baseList.tabTemplate.items.length == 0){
			
 
				                       dispatch(initItemList());        //模板列表没有就获取模板列表用于保存时做数据对比是否保存过
			
 
				                     }
			
 
				+                }else{
			
 
				+                  dispatch(initItemList(baseList.typeConfig.typeConfig))
			
 
				                 }
			
 
				             } else {
			
 
				                 console.log(res)
			
--- a/src/store/async-actions/treat.js
+++ b/src/store/async-actions/treat.js
@@ -1,7 +1,7 @@
 
				 import { json } from "@utils/ajax";
			
 
				 import { SET_TREAT } from '@store/types/diagnosticList';
			
 
				 import { ADD_DIAGNOSTIC, GET_DIAGNOSTIC_STR} from '@store/types/diagnosticList';
			
 
				-import { SET_DRUG_INFO, SET_TREATMENT, SET_TREAT_INFO, SET_RECOMMEND_BASIC } from '@store/types/treat';
			
 
				+import { SET_DRUG_INFO, SET_TREATMENT, SET_TREAT_INFO, SET_RECOMMEND_BASIC, SET_DRUG_INFO_LIST } from '@store/types/treat';
			
 
				 import {storageLocal,getEMRParams} from '@utils/tools';
			
 
				 import { isAddMainSuit } from '@store/async-actions/diagnosticList';
			
 
				 
			
@@ -248,6 +248,46 @@ export const getInstroduce = (item)=>{
 
				 
			
 
				 }
			
 
				 
			
 
				+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 params = {
			
 
				+                questionId: drugIdList.drugIdList[i],
			
 
				+                type: 8,
			
 
				+                position: 5
			
 
				+            }
			
 
				+            json(url, params)
			
 
				+            .then((data)=>{
			
 
				+                    if(data.data.data) {
			
 
				+                        drugInfoList.push(data.data.data)
			
 
				+                        dispatch({
			
 
				+                            type: SET_DRUG_INFO_LIST,
			
 
				+                            drugInfoList: drugInfoList,
			
 
				+                        })
			
 
				+                        console.log('drugInfoList', drugInfoList)
			
 
				+                    } else {
			
 
				+                        drugInfoList.push([])
			
 
				+                        dispatch({
			
 
				+                            type: SET_DRUG_INFO_LIST,
			
 
				+                            drugInfoList: drugInfoList,
			
 
				+                        })
			
 
				+                    }
			
 
				+                    
			
 
				+            }).catch((e) => {
			
 
				+                console.log(e)
			
 
				+            })
			
 
				+
			
 
				+
			
 
				+
			
 
				+
			
 
				+        }
			
 
				+        
			
 
				+
			
 
				+    }
			
 
				+}
			
 
				+
			
 
				 //其他推荐推荐依据不用展示
			
 
				 // export const getRecommendBasic = (item)=>{
			
 
				     
			
--- a/src/store/reducers/assistCheck.js
+++ b/src/store/reducers/assistCheck.js
@@ -32,14 +32,15 @@ export default (state = initSearchList, action) => {
 
				         const tempArrs = newState.assistLabel;
			
 
				         let tmpString = '';
			
 
				         for (let i = 0; i < tempArr.length; i++) {
			
 
				-            if (tempArr[i].questionId == action.id) {
			
 
				+            if (tempArr[i].questionId == action.id && i == action.idx) {
			
 
				                 tempArr[i].time = getCurrentDate();
			
 
				                 tempArrs.push(tempArr[i]);
			
 
				                 newState.assistLabel = [...tempArrs];
			
 
				             }
			
 
				         }
			
 
				         for (let j = 0; j < tempArrs.length; j++) {
			
 
				-            tmpString += (tempArrs[j].name+(tempArrs[j].value?(':'+tempArrs[j].value)+', ':': ')+(tempArrs[j].time?'报告日期:'+tempArrs[j].time:'')+';')
			
 
				+            let tmpVal = tempArrs[j].value?tempArrs[j].value.trim():tempArrs[j].value;
			
 
				+            tmpString += (tempArrs[j].name+(tmpVal?(':'+tmpVal)+', ':': ')+(tempArrs[j].time?'报告日期:'+tempArrs[j].time:'')+';')
			
 
				         }
			
 
				         newState.dataString = tmpString
			
 
				         return newState;
			
@@ -54,7 +55,8 @@ export default (state = initSearchList, action) => {
 
				             return
			
 
				         }
			
 
				         for (let i = 0; i < tempArr.length; i++) {
			
 
				-            tmpString += (tempArr[i].name+(tempArr[i].value?(':'+tempArr[i].value)+', ':': ')+(tempArr[i].time?'报告日期:'+tempArr[i].time:'')+';')
			
 
				+            let tmpVal = tempArr[i].value?tempArr[i].value.trim():tempArr[i].value;
			
 
				+            tmpString += (tempArr[i].name+(tmpVal?(':'+tmpVal)+', ':': ')+(tempArr[i].time?'报告日期:'+tempArr[i].time:'')+';')
			
 
				         }
			
 
				         newState.assistLabel = [...tempArr]
			
 
				         newState.dataString = tmpString
			
@@ -69,7 +71,8 @@ export default (state = initSearchList, action) => {
 
				                 tempArr[i].value = action.val
			
 
				                 newState.assistLabel = [...tempArr]
			
 
				             }
			
 
				-            tmpString += (tempArr[i].name+(tempArr[i].value?(':'+tempArr[i].value)+', ':': ')+(tempArr[i].time?'报告日期:'+tempArr[i].time:'')+';')
			
 
				+            let tmpVal = tempArr[i].value?tempArr[i].value.trim():tempArr[i].value;
			
 
				+            tmpString += (tempArr[i].name+(tmpVal?(':'+tmpVal)+', ':': ')+(tempArr[i].time?'报告日期:'+tempArr[i].time:'')+';')
			
 
				         }
			
 
				         newState.dataString = tmpString
			
 
				         return newState;
			
@@ -83,7 +86,8 @@ export default (state = initSearchList, action) => {
 
				                 tempArr[i].time = action.date
			
 
				                 newState.assistLabel = [...tempArr]
			
 
				             }
			
 
				-            tmpString += (tempArr[i].name+(tempArr[i].value?(':'+tempArr[i].value)+', ':': ')+(tempArr[i].time?'报告日期:'+tempArr[i].time:'')+';')
			
 
				+            let tmpVal = tempArr[i].value?tempArr[i].value.trim():tempArr[i].value;
			
 
				+            tmpString += (tempArr[i].name+(tmpVal?(':'+tmpVal)+', ':': ')+(tempArr[i].time?'报告日期:'+tempArr[i].time:'')+';')
			
 
				         }
			
 
				         newState.dataString = tmpString
			
 
				         return newState;
			
--- a/src/store/reducers/diagnosticList.js
+++ b/src/store/reducers/diagnosticList.js
@@ -1,4 +1,4 @@
 
				-import { ADD_DIAGNOSTIC,  DEL_DIAGNOSTIC, UP_DIAGNOSTIC, DOWN_DIAGNOSTIC, SET_TREAT, GET_DIAGNOSTIC_STR, SET_DIAG_TO_MAINSUIT, GET_IS_FIRST,CLEAR_ALL_DIAG, SET_CLICK_DIAG } from '../types/diagnosticList';
			
 
				+import { ADD_DIAGNOSTIC,  DEL_DIAGNOSTIC, UP_DIAGNOSTIC, DOWN_DIAGNOSTIC, SET_TREAT, GET_DIAGNOSTIC_STR, SET_DIAG_TO_MAINSUIT, GET_IS_FIRST,CLEAR_ALL_DIAG, SET_CLICK_DIAG ,CLEAR_DIAGNOSE} from '../types/diagnosticList';
			
 
				 import { addDiagnostic,  delDiagnostic, upDiagnostic, downDiagnostic, setTreat, getDiagnosticStr, setDiagToMainSuit, getIsFirst,clearAllDiag, setClickDiag} from '../actions/diagnosticList';
			
 
				 
			
 
				 const initState = {
			
@@ -35,6 +35,7 @@ const initState = {
 
				 }
			
 
				 
			
 
				 export default function (state=initState, action) {
			
 
				+    const res = Object.assign({},state);
			
 
				     switch(action.type) {
			
 
				         case ADD_DIAGNOSTIC:
			
 
				             return addDiagnostic(state, action);
			
@@ -56,6 +57,9 @@ export default function (state=initState, action) {
 
				             return clearAllDiag(state, action);
			
 
				         case SET_CLICK_DIAG: 
			
 
				             return setClickDiag(state, action);
			
 
				+        case CLEAR_DIAGNOSE: 
			
 
				+            res.mainSuitStr = "";
			
 
				+            return res;
			
 
				         default:
			
 
				             return state;
			
 
				     }
			
--- a/src/store/reducers/homePage.js
+++ b/src/store/reducers/homePage.js
@@ -44,6 +44,7 @@ export default function (state=initState,action) {
 
				     case SETOTHERHISTORY:
			
 
				       res.initData.otherHis = action.data;
			
 
				       res.initData.otherHisSave = action.save;
			
 
				+      res.initData.otherSelecteds = action.selecteds;
			
 
				       res.initData.otherIsHis = action.otherIsHis!=undefined?action.otherIsHis:true;
			
 
				       return res;
			
 
				     /*case SETTEXTFOCUS:
			
--- a/src/store/reducers/inspect.js
+++ b/src/store/reducers/inspect.js
@@ -65,7 +65,7 @@ export default (state = initSearchList, action) => {
 
				         let tmpArr = newState.getExcelDataList;
			
 
				         let tmpArr2 = newState.labelList;
			
 
				         for (let i = 0; i < tempArr.length; i++) {
			
 
				-            tempArr[i].value = ''
			
 
				+          // tempArr[i].value = ''
			
 
				         }
			
 
				         tempArrs.show = false;
			
 
				         newState.pushItem = getPushList(tmpArr,tmpArr2);
			
@@ -97,6 +97,7 @@ export default (state = initSearchList, action) => {
 
				     }
			
 
				     if (action.type == CHECK_VALUE_IS_CHANGE) {     //数据添加后显示与否
			
 
				         const newState = Object.assign({}, state);
			
 
				+        // const tempArrAct = newState.fillActive;
			
 
				         const tempArr = action.arr;
			
 
				         tempArr.time = action.time;
			
 
				         let tmpArr = newState.getExcelDataList;
			
@@ -104,6 +105,7 @@ export default (state = initSearchList, action) => {
 
				         tempArrs[action.idx] = tempArr;
			
 
				         newState.fillActive = tempArr;
			
 
				         newState.labelList = tempArrs;
			
 
				+        // tempArrAct.show = true;
			
 
				         newState.pushItem = getPushList(tmpArr,tempArrs);
			
 
				         newState.inspectStrPlus = getStringPlus(newState.pushItem)
			
 
				         return newState;
			
--- a/src/store/reducers/otherHistory.js
+++ b/src/store/reducers/otherHistory.js
@@ -17,6 +17,7 @@ export default function(state=initState,action){//console.log(state)
 
				   switch (action.type){
			
 
				     case SETDATA:
			
 
				       res.data = action.data;
			
 
				+      res.selecteds = action.selecteds;
			
 
				       res.saveText = action.save||[];
			
 
				       res.isEmpty = action.isEmpty;
			
 
				       return res;
			
--- 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 } from '../types/treat'
			
 
				-import { selectDrug, setTreatInfo, setOtherDrug, setDrugInfo, clearDrugInfo, showTreat, hideTreat, clearTreat, showDrugInfo, hideDrugInfo, setTreatment, setGeneralTreat, setSurgeryTreat, setRecommendBasic } 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 } from '../types/treat'
			
 
				+import { selectDrug, setTreatInfo, setOtherDrug, setDrugInfo, clearDrugInfo, showTreat, hideTreat, clearTreat, showDrugInfo, hideDrugInfo, setTreatment, setGeneralTreat, setSurgeryTreat, setRecommendBasic, setDrugInfoList } from '../actions/treat'
			
 
				 const initState = {
			
 
				     show: false, //治疗方案显示隐藏
			
 
				     showDrugInfo: false, //药品信息显示隐藏
			
@@ -195,6 +195,8 @@ export default function(state=initState, action){
 
				             return setTreatInfo(state, action);
			
 
				         case CLEAR_DRUG_INFO:
			
 
				             return clearDrugInfo(state, action);
			
 
				+        case SET_DRUG_INFO_LIST:
			
 
				+        return setDrugInfoList(state, action);
			
 
				         default:
			
 
				             return state
			
 
				     }
			
--- a/src/store/types/diagnosticList.js
+++ b/src/store/types/diagnosticList.js
@@ -8,4 +8,5 @@ export const GET_DIAGNOSTIC_STR = 'GET_DIAGNOSTIC_STR';
 
				 export const SET_DIAG_TO_MAINSUIT = 'SET_DIAG_TO_MAINSUIT'; //判断第一次添加诊断是否添加到主诉
			
 
				 export const GET_IS_FIRST = 'GET_IS_FIRST'; //判断是否第一次添加诊断
			
 
				 export const CLEAR_ALL_DIAG = 'CLEAR_ALL_DIAG'; //清除所有诊断
			
 
				-export const SET_CLICK_DIAG = 'SET_CLICK_DIAG' //设置点击的诊断，获取提示详情时需要
			
 
				+export const SET_CLICK_DIAG = 'SET_CLICK_DIAG' //设置点击的诊断，获取提示详情时需要
			
 
				+export const CLEAR_DIAGNOSE = 'CLEAR_DIAGNOSE' //
			
--- a/src/store/types/treat.js
+++ b/src/store/types/treat.js
@@ -12,3 +12,4 @@ export const SET_SURGERY_TREAT = 'SET_SURGERY_TREAT'; //设置手术治疗
 
				 export const SET_TREATMENT = 'SET_TREATMENT' //设置治疗方案
			
 
				 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' //查询多个药品说明书（添加数据时查看药品说明用）
			
--- a/src/utils/tools.js
+++ b/src/utils/tools.js
@@ -490,37 +490,18 @@ function filterArr(arr){
 
				 
			
 
				 function filterDataArr(arrTmp){   //数据处理
			
 
				     let tmpArr = [];
			
 
				-    let arr = arrTmp.join('').split('');
			
 
				-    for(let i = 0;i < arr.length;i++){
			
 
				-        if(!(arr[i].match(config.punctuationReg)||arr[i-1])){        //只有标点符号或者前一个标签无值是（说明本标点灰显，不显示在预览中）
			
 
				-            arr.splice(i,1,'');
			
 
				-        }
			
 
				-        if(arr[i] && arr[i].indexOf('undefined') == -1){
			
 
				-            if(tmpArr[tmpArr.length-1] != '，' && tmpArr[tmpArr.length-1] != ',' ){
			
 
				-                tmpArr.push(arr[i])
			
 
				-            }else if((tmpArr[tmpArr.length-1] == '，' && (arr[i] != '，' || arr[i] != ',')) || (tmpArr[tmpArr.length-1] == ',' && (arr[i] != ',' || arr[i] != ','))) {
			
 
				-              if(arr[i] == '。'){     //前面逗号后面句号 [',','。']
			
 
				-                tmpArr.pop();
			
 
				-                tmpArr.push(arr[i]);
			
 
				-              }else if(tmpArr[tmpArr.length-2] == '。' && (tmpArr[tmpArr.length-1] == '，' || tmpArr[tmpArr.length-1] == ',')){//前面句号后面逗号 ['。',',']
			
 
				-                tmpArr.pop();
			
 
				-                tmpArr.push(arr[i]);
			
 
				-              }else if(arr[i] == ',' || arr[i] == '，'){    //  中英文逗号交替[',','，']
			
 
				-                tmpArr.pop();
			
 
				-                tmpArr.push(arr[i]);
			
 
				-              }else if(arr[i] == '、'){    //前面逗号后面句号 [',','、']
			
 
				-                tmpArr.pop();
			
 
				-                tmpArr.push(arr[i]);
			
 
				-              }else if(tmpArr[tmpArr.length-2] == '、' && (tmpArr[tmpArr.length-1] == '，' || tmpArr[tmpArr.length-1] == ',')){    //前面逗号后面句号 ['、',',']
			
 
				-                tmpArr.splice(tmpArr.length-2,1);
			
 
				-                tmpArr.push(arr[i]);
			
 
				-              }else{
			
 
				-                tmpArr.push(arr[i]);
			
 
				-              }
			
 
				-            }
			
 
				-        }
			
 
				-    }
			
 
				-    return (tmpArr.join('')).replace(/^,+/,"").replace(/,+$/,"").replace(/^，+$/,"").replace(/，+$/,"").replace(/^。+/,"").replace(/。+$/,"。");
			
 
				+    tmpArr = arrTmp.map((it,i)=>{     //连续的标点符号保留第一个
			
 
				+      if(!it.match(config.punctuationReg)&&!arrTmp[i-1]){        //只有标点符号或者前一个标签无值是（说明本标点灰显，不显示在预览中）
			
 
				+          return '';
			
 
				+      }
			
 
				+      return it.replace(config.punReg,function(word){
			
 
				+        return word.substr(0,1);
			
 
				+      });
			
 
				+    });
			
 
				+
			
 
				+    return tmpArr.join('').replace(config.punReg,function(word){
			
 
				+      return word.substr(0,1);
			
 
				+    }).replace(/^[,，.。；;、]+/,'');      //去掉开头的标点符号，最后的标点保留第一个,中间连续的保留第一个
			
 
				 }
			
 
				 // 取消默认行为
			
 
				 function preventDefault(event) {
			
@@ -608,15 +589,10 @@ function isAllClear(jsonData,jsonStr,baseList){
 
				     jsonData.pacs.length < 1 &&
			
 
				     jsonData.lis.labelList.length < 1 &&
			
 
				     jsonData.lis.getExcelDataList.length < 1 &&
			
 
				-    JSON.stringify(jsonData.advice) == '{}' &&
			
 
				     filterDataArr(JSON.parse(jsonStr.chief)) == '' &&
			
 
				     filterDataArr(JSON.parse(jsonStr.present)) == '' &&
			
 
				     filterDataArr(JSON.parse(jsonStr.other)) == '' &&           //这里都是filterDataArr不是filterArr，要去符号的
			
 
				-    filterDataArr(JSON.parse(jsonStr.vital)) == '' &&
			
 
				-    jsonData.diag.length < 1 &&
			
 
				-    jsonData.pacs.length < 1 &&
			
 
				-    jsonData.lis.labelList.length < 1 &&
			
 
				-    jsonData.lis.getExcelDataList.length < 1
			
 
				+    filterDataArr(JSON.parse(jsonStr.vital)) == ''
			
 
				   ) {
			
 
				     return false;
			
 
				   }else{
			
@@ -650,6 +626,16 @@ function getPageCoordinate(event){
 
				     }
			
 
				     return obj;
			
 
				 }
			
 
				+function timestampToTime(timestamp) {     //excel导入2019年5月1日会转换成时间戳
			
 
				+  var date = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
			
 
				+  var Y = date.getFullYear() + '-';
			
 
				+  var M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '-';
			
 
				+  var D = date.getDate() + ' ';
			
 
				+  var h = date.getHours() + ':';
			
 
				+  var m = date.getMinutes() + ':';
			
 
				+  var s = date.getSeconds();
			
 
				+  return Y+M+D+h+m+s;
			
 
				+}
			
 
				 module.exports = {
			
 
				     checkType: Type.checkType,
			
 
				     regexp,
			
@@ -675,5 +661,6 @@ module.exports = {
 
				     isAllClear,
			
 
				     normalVal,
			
 
				     getPageCoordinate,
			
 
				-    windowRemoveEventHandler
			
 
				+    windowRemoveEventHandler,
			
 
				+    timestampToTime
			
 
				 };