преди 6 години · 33206f827b
--- a/src/common/components/EditableSpan/index.jsx
+++ b/src/common/components/EditableSpan/index.jsx
@@ -146,9 +146,9 @@ class EditableSpan extends Component{
 
				 
			
 
				   handleKeydown(e){
			
 
				     const ev = e||window.event;
			
 
				-    const {i} = this.props;
			
 
				+    const {i,setSearchLocation} = this.props;
			
 
				     const target = ev.target||ev.srcElement;
			
 
				-    let innerVal = target.innerText;
			
 
				+    let innerVal = target.innerText || target.innerHTML,ele,boxTop;
			
 
				     //禁止回车事件
			
 
				     if(ev.keyCode==13){return false;}
			
 
				     //backspace事件
			
@@ -185,31 +185,30 @@ class EditableSpan extends Component{
 
				         obj.focus();
			
 
				       }
			
 
				     }
			
 
				+    ele = document.activeElement;
			
 
				+    boxTop = target.innerText?getPageCoordinate(e).boxTop:$(ele).offset().top+30;
			
 
				+    setSearchLocation(boxTop,ele.offsetLeft)     //搜索框的位置动态获取
			
 
				   }  
			
 
				   handleKeyup(e){
			
 
				     const {boxMark,handleKeydown,i,value,removeId,handleClear,delSingleLable,setSearchLocation} = this.props;
			
 
				     const {preVal,index} = this.state;
			
 
				     const ev = e||window.event;
			
 
				     const target = ev.target||ev.srcElement;
			
 
				-    let innerVal = target.innerText || target.innerHTML;
			
 
				+    let innerVal = target.innerText || target.innerHTML,ele,boxTop;
			
 
				     if(ev.keyCode==8){     
			
 
				-      let ele = document.activeElement;
			
 
				-      let boxTop = getPageCoordinate(e).boxTop;
			
 
				-      // setSearchLocation(boxTop,ele.offsetLeft)     //搜索框的位置动态获取
			
 
				       // 主诉现病史去重：删除最后一个字的时候移除该数据（将name、id和value替换成空）并移除id
			
 
				       // 前面是标签，内容为空时再删一次才移除标签；前面是文本，则直接移除；
			
 
				       let preObj = $(this.$span.current).prev();
			
 
				       if(index!==0&&preVal.trim().length==1&& !innerVal){
			
 
				-          removeId && removeId({boxMark,i:index,text:""});
			
 
				-          handleClear && handleClear({boxMark});//删除最后一个字时清空搜索结果，避免现病史搜索框不立即消失的情况
			
 
				-          if(preObj[0].nodeName !=="DIV"){
			
 
				-            this.moveEnd(preObj[0]);
			
 
				-          }
			
 
				+        removeId && removeId({boxMark,i:index,text:""});
			
 
				+        handleClear && handleClear({boxMark});//删除最后一个字时清空搜索结果，避免现病史搜索框不立即消失的情况
			
 
				+        if(preObj[0].nodeName !=="DIV"){
			
 
				+          this.moveEnd(preObj[0]);
			
 
				         }
			
 
				-
			
 
				-      // if(innerVal !==preVal){return false}
			
 
				-      if(innerVal !==preVal){
			
 
				-
			
 
				+      }
			
 
				+      
			
 
				+      if(innerVal !== preVal){
			
 
				+        
			
 
				       }
			
 
				       else{
			
 
				         // 中英文数字和下划线--单独删除标签
			
@@ -235,7 +234,11 @@ class EditableSpan extends Component{
 
				           })
			
 
				         }
			
 
				       }
			
 
				+      ele = document.activeElement;
			
 
				+      boxTop = target.innerText?getPageCoordinate(e).boxTop:$(ele).offset().top+30;
			
 
				+      setSearchLocation(boxTop,ele.offsetLeft)     //搜索框的位置动态获取
			
 
				     }
			
 
				+    
			
 
				   }
			
 
				   componentWillReceiveProps(next){
			
 
				     const isRead = this.props.isRead;
			
--- a/src/components/AddInspect/SlideExcel/index.jsx
+++ b/src/components/AddInspect/SlideExcel/index.jsx
@@ -63,9 +63,11 @@ class SlideExcel extends Component {
 
				             }
			
 
				         </table>
			
 
				         {
			
 
				-          item.lisExcelItem && item.lisExcelItem.length > 5 ?  
			
 
				+          item.lisExcelItem && item.lisExcelItem.length > 5 ?
			
 
				           <div className={styles.slides} onClick={this.handleSlide}>
			
 
				-              <span>{show ?'收起':'展开'}</span>
			
 
				+              {
			
 
				+                show ? <span>收起</span> :<span>剩余<span className={styles.num}>{item.lisExcelItem.length-4}</span>项</span>
			
 
				+              }
			
 
				               <img src={show ?slideUp:slideDown} alt=""/>
			
 
				           </div>:null
			
 
				         }
			
--- a/src/components/AddInspect/SlideExcel/index.less
+++ b/src/components/AddInspect/SlideExcel/index.less
@@ -127,7 +127,7 @@
 
				     padding-bottom: 50px;
			
 
				 }
			
 
				 .slides {
			
 
				-  background-color: #ccc;
			
 
				+  background-color: #EDEDED;
			
 
				   text-align: center;
			
 
				   height: 28px;
			
 
				   line-height: 28px;
			
@@ -139,4 +139,7 @@
 
				   img{
			
 
				     vertical-align: middle;
			
 
				   }
			
 
				+  .num {
			
 
				+    color: @blue;
			
 
				+  }
			
 
				 }
			
--- a/src/components/AddInspect/SlideSelect/index.jsx
+++ b/src/components/AddInspect/SlideSelect/index.jsx
@@ -10,7 +10,7 @@ class SlideSelect extends Component {
 
				   constructor(props) {
			
 
				     super(props);
			
 
				     this.state = {
			
 
				-      show:false
			
 
				+      show:false,
			
 
				     };
			
 
				     this.toTime = this.toTime.bind(this)
			
 
				     this.handleSlide = this.handleSlide.bind(this)
			
@@ -36,6 +36,7 @@ class SlideSelect extends Component {
 
				   render() {
			
 
				     const {handleConfirm,changeActivePart,handleDelClick,getItemList,date,item,idx,handleFillShow,showDetails,handleLabelSub,showFill,changeShowFill,handlePush,dateTime,currentIdx,currentData,fillActive,handleShowDate,handleChangeDate} = this.props;
			
 
				     const {show} = this.state;
			
 
				+    let numPlus = 0,numPlus1 = 0;
			
 
				     return (
			
 
				       <li key={item.questionId} className={styles.slideLi}> 
			
 
				         {
			
@@ -48,6 +49,14 @@ class SlideSelect extends Component {
 
				                 <i data-flg="current" onClick={(e) => { handleLabelSub(e,item.questionId,idx); handleFillShow(e,idx) }}>{item.name}</i>
			
 
				             </p>
			
 
				         }
			
 
				+        
			
 
				+        {
			
 
				+          item.details && item.details.map((val)=>{
			
 
				+            if(val.value && val.value != ''){
			
 
				+                numPlus = ++numPlus
			
 
				+              }
			
 
				+            })
			
 
				+          }
			
 
				         {
			
 
				             item.show ? 
			
 
				                 <table className={styles.table}>
			
@@ -64,24 +73,29 @@ class SlideSelect extends Component {
 
				                                 </tr>
			
 
				                             }
			
 
				                         })):(item.details.map((val,num)=>{
			
 
				-                          if(val.value && val.value != '' && num < 4 ){
			
 
				-                              return <tr>
			
 
				-                                  <td style={{width:'30%'}}>{val.name}</td>
			
 
				-                                  {showDetails(val)}
			
 
				-                                  <td style={{width:'25%'}}>
			
 
				-                                      {normalVal(val.minValue,val.maxValue)}
			
 
				-                                  </td>
			
 
				-                                  <td style={{width:'25%'}}>{'化验时间:'+item.time}</td>
			
 
				-                              </tr>
			
 
				+                          if(val.value && val.value != '' ){
			
 
				+                              ++numPlus1;
			
 
				+                              if(numPlus1 < 5){
			
 
				+                                return <tr>
			
 
				+                                    <td style={{width:'30%'}}>{val.name}</td>
			
 
				+                                    {showDetails(val)}
			
 
				+                                    <td style={{width:'25%'}}>
			
 
				+                                        {normalVal(val.minValue,val.maxValue)}
			
 
				+                                    </td>
			
 
				+                                    <td style={{width:'25%'}}>{'化验时间:'+item.time}</td>
			
 
				+                                </tr>
			
 
				+                              }
			
 
				                           }
			
 
				                       }))
			
 
				                     }
			
 
				                 </table>:null
			
 
				         }
			
 
				         {
			
 
				-          item.details && item.details.length > 5 ?  
			
 
				+          numPlus > 4 ?  
			
 
				           <div className={styles.slides} onClick={this.handleSlide}>
			
 
				-              <span>{show ?'收起':'展开'}</span>
			
 
				+              {
			
 
				+                show ? <span>收起</span> :<span>剩余<span className={styles.num}>{numPlus-4}</span>项</span>
			
 
				+              }
			
 
				               <img src={show ?slideUp:slideDown} alt=""/>
			
 
				           </div>:null
			
 
				         }
			
--- a/src/components/AddInspect/SlideSelect/index.less
+++ b/src/components/AddInspect/SlideSelect/index.less
@@ -148,4 +148,7 @@
 
				   img{
			
 
				     vertical-align: middle;
			
 
				   }
			
 
				+  .num {
			
 
				+    color: @blue;
			
 
				+  }
			
 
				 }
			
--- a/src/components/AddInspect/index.less
+++ b/src/components/AddInspect/index.less
@@ -159,7 +159,7 @@
 
				 }
			
 
				 .excelDataLists {
			
 
				     position: relative;
			
 
				-    background-color: #f1f1f1;
			
 
				+    background-color: rgba(237,237,237,0.4);
			
 
				     border: 1px solid #ccc;
			
 
				     .close {
			
 
				         width: 13px;
			
--- a/src/components/Advice/Textarea/index.jsx
+++ b/src/components/Advice/Textarea/index.jsx
@@ -0,0 +1,62 @@
 
				+import React, { Component } from "react";
			
 
				+import style from "./index.less";
			
 
				+import config from '@config/index';
			
 
				+import $ from 'jquery';
			
 
				+
			
 
				+class Textarea extends Component {
			
 
				+  constructor(props) {
			
 
				+    super(props);
			
 
				+    this.state = {
			
 
				+      timer:null,
			
 
				+      val:'报告描述或意见'
			
 
				+    };
			
 
				+    this.textInput = React.createRef();
			
 
				+    this.$dom = React.createRef();
			
 
				+    this.$domW = React.createRef();
			
 
				+    this.handleInput = this.handleInput.bind(this);
			
 
				+  }
			
 
				+  handleInput(e){
			
 
				+    e.stopPropagation();
			
 
				+    const {handleChangeAssistValue,idx,handlePush} = this.props;
			
 
				+    const text = e.target.innerText || e.target.innerHTML;
			
 
				+    const stimer = this.state.timer;
			
 
				+    handleChangeAssistValue&&handleChangeAssistValue(text);
			
 
				+   
			
 
				+  }
			
 
				+  shouldComponentUpdate(next){
			
 
				+    if(JSON.stringify(next) == JSON.stringify(this.props)){
			
 
				+      return false;
			
 
				+    }
			
 
				+    return true;
			
 
				+  }
			
 
				+  componentWillReceiveProps(next){
			
 
				+    const isRead = this.props.isRead;
			
 
				+    if(next.isRead != isRead && next.value!=this.props.value){      //value对比解决复诊不显示bug
			
 
				+      next.value ? this.$dom.current.innerText = next.value :  ''
			
 
				+      // this.$dom.current.innerText?(this.$dom.current.innerText = next.value||''):(this.$dom.current.innerHTML = next.value||'');
			
 
				+    }
			
 
				+  }
			
 
				+  componentDidMount(){
			
 
				+    const {value} = this.props;
			
 
				+    if(value && value.trim()){
			
 
				+      this.$dom.current.innerText = value
			
 
				+      // this.$dom.current.innerText ? (this.$dom.current.innerText = value) : (this.$dom.current.innerHTML = value)
			
 
				+    //   this.$dom.current.nextSibling.innerText?(this.$dom.current.nextSibling.innerText = ''):(this.$dom.current.nextSibling.innerHTML = '')
			
 
				+    }
			
 
				+  }
			
 
				+ 
			
 
				+  render() {
			
 
				+    return (
			
 
				+      <div>
			
 
				+        <div 
			
 
				+            style={{outline: 'none'}}
			
 
				+            contenteditable={true}
			
 
				+            ref={this.$dom}
			
 
				+            onInput={this.handleInput}
			
 
				+            onKeyUp={this.handleInput}
			
 
				+        ></div>
			
 
				+      </div>
			
 
				+    );
			
 
				+  }
			
 
				+}
			
 
				+export default Textarea;
			
--- a/src/components/Advice/Textarea/index.less
+++ b/src/components/Advice/Textarea/index.less
--- a/src/components/Advice/index.jsx
+++ b/src/components/Advice/index.jsx
@@ -1,6 +1,7 @@
 
				 import React,{Component} from 'react';
			
 
				 import style from './index.less';
			
 
				 import {ItemBox} from '@commonComp';
			
 
				+import Textarea from './Textarea';
			
 
				 
			
 
				 class Advice extends Component{
			
 
				   constructor(props){
			
@@ -9,11 +10,26 @@ class Advice extends Component{
 
				     this.treatInput = React.createRef();
			
 
				     this.assayRef = React.createRef();
			
 
				     this.checkRef = React.createRef();
			
 
				+    this.adviceInputRef = React.createRef();
			
 
				     this.handleTreatInput = this.handleTreatInput.bind(this);
			
 
				     this.handleAssayInput = this.handleAssayInput.bind(this);
			
 
				     this.handleCheckInput = this.handleCheckInput.bind(this);
			
 
				+    this.handleComTreatInput = this.handleComTreatInput.bind(this);
			
 
				+    this.handleAdviceInput = this.handleAdviceInput.bind(this);
			
 
				   }
			
 
				 
			
 
				+  shouldComponentUpdate(next){
			
 
				+    if(JSON.stringify(next) == JSON.stringify(this.props)){
			
 
				+      return false;
			
 
				+    }
			
 
				+    return true;
			
 
				+  }
			
 
				+  componentWillReceiveProps(next){
			
 
				+    const isRead = this.props.isRead;
			
 
				+    // if(next.isRead != isRead||next.value!=this.props.value){      //value对比解决复诊不显示bug
			
 
				+    //   this.adviceInputRef.current.innerText?(this.adviceInputRef.current.innerText = next.value||''):(this.adviceInputRef.current.innerHTML = next.value||'');
			
 
				+    // }
			
 
				+  }
			
 
				   handleTreatInput(e, index, ii) {
			
 
				     const {advice} = this.props.pushMessage;
			
 
				     const changeInput = e.target.value //改变的同类药的值
			
@@ -22,37 +38,37 @@ class Advice extends Component{
 
				   }
			
 
				 
			
 
				   handleAssayInput(e) {
			
 
				-    console.log(e.target.value)
			
 
				     const changeInput = e.target.value
			
 
				     const { setChangeAdviceAssay } = this.props;
			
 
				     setChangeAdviceAssay && setChangeAdviceAssay(changeInput)
			
 
				   }
			
 
				   handleCheckInput(e) {
			
 
				-    console.log(e.target.value)
			
 
				     const changeInput = e.target.value
			
 
				     const { setChangeAdviceCheck } = this.props;
			
 
				     setChangeAdviceCheck && setChangeAdviceCheck(changeInput)
			
 
				   }
			
 
				+  handleComTreatInput(text) {
			
 
				+    const { comTreatChange } = this.props;
			
 
				+    comTreatChange && comTreatChange(text)
			
 
				+
			
 
				+  }
			
 
				+  handleAdviceInput(text) {
			
 
				+    const { adviceInputChange } = this.props;
			
 
				+    adviceInputChange && adviceInputChange(text)
			
 
				+
			
 
				+  }
			
 
				+  componentDidMount(){
			
 
				+  //   this.$dom.current.nextSibling.innerText?(this.$dom.current.nextSibling.innerText = ''):(this.$dom.current.nextSibling.innerHTML = '')
			
 
				+  // const {advice} = this.props.pushMessage.advice
			
 
				+  // console.log('adviceInput', this.props.pushMessage)
			
 
				+  
			
 
				+}
			
 
				 
			
 
				   render(){
			
 
				     const {advice} = this.props.pushMessage;
			
 
				-    let billing = ''
			
 
				+    const {isRead} = this.props
			
 
				 
			
 
				-    // advice.assay.forEach((item, index) => {
			
 
				-    //   if(index === advice.assay.length - 1){
			
 
				-    //     billing = billing + (index + 1) + '：' + item + '；'
			
 
				-    //   }else{
			
 
				-    //     billing = billing + (index + 1) + '：' + item + '，'
			
 
				-    //   }
			
 
				-    // })
			
 
				-
			
 
				-    // advice.check.forEach((item, index) => {
			
 
				-    //   if(index === advice.check.length - 1){
			
 
				-    //     billing = billing + (index + 1) + '：' + item + '；'
			
 
				-    //   }else{
			
 
				-    //     billing = billing + (index + 1) + '：' + item + '，'
			
 
				-    //   }
			
 
				-    // })
			
 
				+    
			
 
				 
			
 
				     let scheme = advice.scheme && advice.scheme.map((item, index) => {
			
 
				       return <p>{item.treatment.map((it,ii) =>{
			
@@ -70,15 +86,23 @@ class Advice extends Component{
 
				 
			
 
				     return  <div className={`${'mainsuit-box'} ${style['main-suit']}`}>
			
 
				       <ItemBox title='医嘱' editable={false} border={true} marginTop="10px">
			
 
				-        <div className={style['billing']}>
			
 
				+        {/* <div className={style['billing']}>
			
 
				           {advice.assay && advice.assay.length > 0 || advice.check && advice.check.length > 0 ? <h1>开单项目</h1> : ''}
			
 
				             {advice.assay && <span className={style['treat-input']}> {advice.assay}</span>}
			
 
				             {advice.check && <span className={style['treat-input']}> {advice.check}</span>}
			
 
				-          {/* {billing} */}
			
 
				-        </div>
			
 
				-        <div className={style['scheme']}>
			
 
				+        </div> */}
			
 
				+        {advice.commontreatment && advice.commontreatment.length > 0 &&<div className={style['billing']}  >
			
 
				+          {advice.commontreatment && advice.commontreatment.length > 0 && <h1>一般治疗</h1>}
			
 
				+            {/* {advice.commontreatment && <div className={style['treat-input']}  onInput={this.handleComTreatInput}  contentEditable={true} style = {{outline: 'none'}}></div>} */}
			
 
				+            {<Textarea value={advice.commontreatment} isRead={isRead} handleChangeAssistValue={this.handleComTreatInput} ></Textarea>}
			
 
				+        </div>}
			
 
				+        {advice.scheme && advice.scheme.length > 0 &&<div contentEditable='false' className={style['scheme']}>
			
 
				           {advice.scheme && advice.scheme.length > 0  && <h1>治疗方案</h1>}
			
 
				           {scheme}
			
 
				+        </div>}
			
 
				+        <div className={style['billing']} > 
			
 
				+            {!advice.adviceInput && <Textarea value='' isRead={isRead} handleChangeAssistValue={this.handleAdviceInput} ></Textarea>}
			
 
				+            {advice.adviceInput && <Textarea value={advice.adviceInput} isRead={isRead} handleChangeAssistValue={this.handleAdviceInput} ></Textarea>}
			
 
				         </div>
			
 
				       </ItemBox>
			
 
				     </div>
			
--- a/src/components/Advice/index.less
+++ b/src/components/Advice/index.less
@@ -9,13 +9,13 @@
 
				 .billing {
			
 
				   padding: 0px 10px;
			
 
				   h1{
			
 
				-    margin: 10px 0px;
			
 
				+    margin: 5px 0px;
			
 
				   }
			
 
				 }
			
 
				 .scheme {
			
 
				-  padding: 10px;
			
 
				+  padding: 0px 10px;
			
 
				   h1{
			
 
				-    margin: 10px 0px;
			
 
				+    margin: 5px 0px;
			
 
				   }
			
 
				   p{
			
 
				     line-height: 18px;
			
--- a/src/components/DiagnosticList/index.jsx
+++ b/src/components/DiagnosticList/index.jsx
@@ -62,7 +62,8 @@ class DiagnosticList extends Component {
 
				             delItem: item,
			
 
				         })
			
 
				     }
			
 
				-    showTreat(item) {
			
 
				+    showTreat(item, index) {
			
 
				+        item.treatIndex = index
			
 
				         const  { showTreat, getTreatResult } = this.props;
			
 
				         getTreatResult && getTreatResult(item);
			
 
				         showTreat && showTreat();
			
@@ -92,7 +93,7 @@ class DiagnosticList extends Component {
 
				                                     {item.type === 1 ? <span className={style['diag-first']}>初诊</span> :<span className={style['diag-second']}> 复诊</span>}
			
 
				                                     <span className={style['treat']}
			
 
				                                           style ={{ color: hasTreat ?'' : 'gray', border: hasTreat ?'1px solid #3B9ED0' : '1px solid gray'}}
			
 
				-                                          onClick={() =>{hasTreat && this.showTreat(item)}}>
			
 
				+                                          onClick={() =>{hasTreat && this.showTreat(item, index)}}>
			
 
				                                           治疗方案
			
 
				                                     </span>
			
 
				                                     <img className={style['diag-del']} src={del_icon} onClick={()=>{this.handleDeleteItem(item)}}/>
			
--- a/src/components/NumberDrop/index.jsx
+++ b/src/components/NumberDrop/index.jsx
@@ -93,11 +93,15 @@ class NumberDrop extends Component{
 
				   }
			
 
				   numInpBlur(e){        //数字框失焦，保存值到store中
			
 
				     e.stopPropagation();
			
 
				-    if(!e.target.innerText.trim()){
			
 
				-      this.setState({
			
 
				-        placeholder:this.props.placeholder
			
 
				-      });
			
 
				-    }
			
 
				+    const that = this;
			
 
				+    setTimeout(function(){      //第一次选中数字时placeholder闪一下优化
			
 
				+      if(!that.state.hasSelect&&!e.target.innerText.trim()){
			
 
				+        that.setState({
			
 
				+          placeholder:that.props.placeholder
			
 
				+        });
			
 
				+      }
			
 
				+    },100);
			
 
				+
			
 
				     if(this.props.show){      //修改清空后第一次点击键盘不触发click事件bug
			
 
				       return;
			
 
				     }
			
--- a/src/components/PreviewBody/index.jsx
+++ b/src/components/PreviewBody/index.jsx
@@ -164,7 +164,7 @@ class PreviewBody extends Component {
 
				         <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',width:'70px' }}>主诉：</td>
			
 
				-            <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px', lineHeight: '20px',wordBreak:"break-word" }}>
			
 
				+            <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px', lineHeight: '20px',wordBreak:"break-all" }}>
			
 
				               {
			
 
				                 filterDataArr(JSON.parse(dataStr.chief))
			
 
				               }
			
@@ -172,7 +172,7 @@ class PreviewBody extends Component {
 
				           </tr>
			
 
				           <tr style={{ verticalAlign: 'top', borderBottom: "1px solid #e2e4e6" }}>
			
 
				             <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px',width:'70px' }}>现病史：</td>
			
 
				-            <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px', lineHeight: '20px',wordBreak:"break-word" }}>
			
 
				+            <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px', lineHeight: '20px',wordBreak:"break-all" }}>
			
 
				               {
			
 
				                 filterDataArr(JSON.parse(dataStr.present))
			
 
				               }
			
@@ -180,7 +180,7 @@ class PreviewBody extends Component {
 
				           </tr>
			
 
				           <tr style={{ verticalAlign: 'top', borderBottom: "1px solid #e2e4e6" }}>
			
 
				             <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px',width:'70px' }}>其他史：</td>
			
 
				-            <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px', lineHeight: '20px',wordBreak:"break-word" }}>
			
 
				+            <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px', lineHeight: '20px',wordBreak:"break-all" }}>
			
 
				               {
			
 
				                 other_yjs.str1
			
 
				               }
			
@@ -202,7 +202,7 @@ class PreviewBody extends Component {
 
				           </tr>
			
 
				           <tr style={{ verticalAlign: 'top', borderBottom: "1px solid #e2e4e6" }}>
			
 
				             <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px',width:'70px' }}>查体：</td>
			
 
				-            <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px', lineHeight: '20px',wordBreak:"break-word" }}>
			
 
				+            <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px', lineHeight: '20px',wordBreak:"break-all" }}>
			
 
				               {
			
 
				                 filterDataArr(JSON.parse(dataStr.vital))
			
 
				               }
			
@@ -210,7 +210,7 @@ class PreviewBody extends Component {
 
				           </tr>
			
 
				           <tr style={{ verticalAlign: 'top', borderBottom: "1px solid #e2e4e6" }}>
			
 
				             <td style={{ width: 70, textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px',width:'70px' }}>化验：</td>
			
 
				-            <td style={{ fontSize: '14px', padding: '4px 0px 8px 0px', lineHeight: '20px', maxWidth: '650px',wordBreak:"break-word" }}>
			
 
				+            <td style={{ fontSize: '14px', padding: '4px 0px 8px 0px', lineHeight: '20px', maxWidth: '650px',wordBreak:"break-all" }}>
			
 
				               {
			
 
				                 dataJson.lis.getExcelDataList && dataJson.lis.getExcelDataList.map((items) => {
			
 
				                   return items.lisExcelRes && items.lisExcelRes.map((item) => {
			
@@ -263,7 +263,7 @@ class PreviewBody extends Component {
 
				             <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',wordBreak:"break-word" }}>{item}</div>
			
 
				+                  return <div style={{ fontSize: '14px',wordBreak:"break-all" }}>{item}</div>
			
 
				                 })
			
 
				               }
			
 
				             </td>
			
@@ -281,14 +281,9 @@ class PreviewBody extends Component {
 
				           <tr style={{ verticalAlign: 'top', borderBottom: "1px solid #e2e4e6" }}>
			
 
				             <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px',width:'70px' }}>医嘱：</td>
			
 
				             <td style={{ fontSize: '14px', padding: '1px 0px 8px 0px', lineHeight: '20px' }}>
			
 
				+              {dataJson.advice.commontreatment && dataJson.advice.commontreatment.length > 0 && <p style={{ fontSize: '14px', marginBottom: '8px', marginTop: '8px' }}><span>一般治疗</span></p>}
			
 
				               {
			
 
				-                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.commontreatment && <div style={{ padding: '0px 0px 5px 0px',wordBreak:"break-all" }}>{dataJson.advice.commontreatment}</div>
			
 
				               }
			
 
				               {dataJson.advice.scheme && dataJson.advice.scheme.length > 0 && <p style={{ fontSize: '14px', marginBottom: '8px', marginTop: '8px' }}><span>治疗方案</span></p>}
			
 
				               {
			
@@ -296,8 +291,11 @@ class PreviewBody extends Component {
 
				                   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>
			
 
				-                })
			
 
				+                    })}</p>
			
 
				+                  })
			
 
				+              }
			
 
				+              {
			
 
				+                dataJson.advice.adviceInput && <div style={{ padding: '0px 0px 5px 0px',wordBreak:"break-all" }}>{dataJson.advice.adviceInput}</div>
			
 
				               }
			
 
				             </td>
			
 
				           </tr>
			
--- a/src/components/Treat/GeneralTreat/index.jsx
+++ b/src/components/Treat/GeneralTreat/index.jsx
@@ -9,10 +9,10 @@ class GeneralTreat extends Component {
 
				     render() {
			
 
				         const { icon, titleStyle,titleBg, filter, title, generalTreat } = this.props
			
 
				         return(
			
 
				-            generalTreat && generalTreat.length > 0 && <div className={style['general-wrapper']}>
			
 
				+            generalTreat.content && generalTreat.content.length > 0 && <div className={style['general-wrapper']}>
			
 
				                 <div className={style['general-title-box']} style={titleStyle}></div>
			
 
				                 <div className={style['general-title']} ><img className={style['general-icon']} src={icon}/>{title}</div>
			
 
				-                <div className={style['general-item']} dangerouslySetInnerHTML={{__html: generalTreat}}>
			
 
				+                <div className={style['general-item']} dangerouslySetInnerHTML={{__html: generalTreat.content}}>
			
 
				                 </div>
			
 
				 
			
 
				             </div>
			
--- a/src/components/Treat/index.jsx
+++ b/src/components/Treat/index.jsx
@@ -27,7 +27,7 @@ class Treat extends Component {
 
				         Notify.info('该功能即将上线，敬请期待。', 2000)
			
 
				     }
			
 
				     handleDetermine() {
			
 
				-        const { title, treatment } = this.props
			
 
				+        const { title, treatment, advice } = this.props
			
 
				         const { addScheme } = this.props
			
 
				         addScheme && addScheme(title, treatment);
			
 
				         this.hideTreat()
			
--- a/src/containers/AdviceContainer.js
+++ b/src/containers/AdviceContainer.js
@@ -1,10 +1,13 @@
 
				 import React from 'react';
			
 
				 import {connect} from 'react-redux';
			
 
				 import Advice from '../components/Advice'
			
 
				-import { SET_CHANGE_ADVICE_TREATMENT, SET_CHANGE_ADVICE_ASSAY, SET_CHANGE_ADVICE_CHECK } from '@store/types/pushMessage';
			
 
				+import { SET_CHANGE_ADVICE_TREATMENT, SET_CHANGE_ADVICE_ASSAY, SET_CHANGE_ADVICE_CHECK, SET_COMMONTREATMENT ,SET_ADVICE_INPUT} from '@store/types/pushMessage';
			
 
				 
			
 
				-function mapStateToProps({pushMessage}) {
			
 
				-    return ({pushMessage})
			
 
				+function mapStateToProps(state) {
			
 
				+    return ({
			
 
				+        pushMessage: state.pushMessage,
			
 
				+        isRead:state.homePage.isRead,
			
 
				+    })
			
 
				 }
			
 
				 
			
 
				 function mapDispatchToProps(dispatch) {
			
@@ -28,7 +31,19 @@ function mapDispatchToProps(dispatch) {
 
				                 type: SET_CHANGE_ADVICE_CHECK,
			
 
				                 changeInput:changeInput
			
 
				             })
			
 
				-        }
			
 
				+        },
			
 
				+        comTreatChange: (text) => {
			
 
				+            dispatch({
			
 
				+                type: SET_COMMONTREATMENT,
			
 
				+                commontreatment: text,
			
 
				+            })
			
 
				+        },
			
 
				+        adviceInputChange: (text) => {
			
 
				+            dispatch({
			
 
				+                type: SET_ADVICE_INPUT,
			
 
				+                adviceInput: text,
			
 
				+            })
			
 
				+        },
			
 
				     }
			
 
				 }
			
 
				 
			
--- 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, getInstroduceMore } from '@store/async-actions/treat';
			
 
				+import { getInstroduce, getRecommendBasic, getInstroduceMore, commonTreatAddToAdvice } from '@store/async-actions/treat';
			
 
				 import { ADD_SCHEME } from '@store/types/pushMessage.js'
			
 
				 import { showDrugInfo } from '../store/actions/treat';
			
 
				 
			
@@ -18,6 +18,7 @@ function mapStateToProps(state){
 
				         showDrug: treat.showDrugInfo,
			
 
				         treatItem: treat.treatItem,
			
 
				         drugInfoList: treat.drugInfoList,   //药品说明书列表（查询多个药品说明书）
			
 
				+
			
 
				     }
			
 
				 }
			
 
				  
			
@@ -71,6 +72,7 @@ function mapDispatchToProps(dispatch) {
 
				                 title: title,
			
 
				                 treatment: treatment
			
 
				             })
			
 
				+            dispatch(commonTreatAddToAdvice())
			
 
				         },
			
 
				         //查询多条药品说明数据（添加数据用）
			
 
				         setDrugInfoMore:(drugIdList) => {
			
--- a/src/store/actions/homePage.js
+++ b/src/store/actions/homePage.js
@@ -95,6 +95,7 @@ export const setLabelToEdit = (state,action)=>{
 
				 //编辑状态
			
 
				 export const searchDropLocation = (state,action)=>{
			
 
				   let res = Object.assign({},state);
			
 
				+  // console.log(action,'dir')
			
 
				   res.boxTop = action.top?action.top:res.boxTop;
			
 
				   res.boxLeft = action.left?action.left+action.dis:res.left;
			
 
				   return res;
			
--- a/src/store/actions/pushMessage.js
+++ b/src/store/actions/pushMessage.js
@@ -35,9 +35,11 @@ export const setAdvice=(state,action)=>{
 
				 
			
 
				 //获取医嘱信息字符串
			
 
				 function getAdviceStr(advice) {
			
 
				+	const commontreatment = advice.commontreatment
			
 
				 	const scheme = advice.scheme || '';
			
 
				-	const assay = advice.assay || '';
			
 
				-	const check = advice.check || '';
			
 
				+	const adviceInput = advice.adviceInput || '';
			
 
				+	// const assay = advice.assay || '';
			
 
				+	// const check = advice.check || '';
			
 
				 	let AdviceStr = advice.AdviceStr || '';
			
 
				 	for (let i = 0; i < scheme.length; i++) {
			
 
				 		for (let j = 0; j < scheme[i].treatment.length; j++) {
			
@@ -49,8 +51,11 @@ function getAdviceStr(advice) {
 
				 			
			
 
				 		}
			
 
				 	}
			
 
				-	if(assay || check)  { 
			
 
				-		AdviceStr = assay + check +'; ' + AdviceStr;
			
 
				+	if(commontreatment)  { 
			
 
				+		AdviceStr = commontreatment +'; ' + AdviceStr;
			
 
				+	}	
			
 
				+	if(adviceInput)  { 
			
 
				+		AdviceStr = AdviceStr +'; ' + adviceInput;
			
 
				 	}	
			
 
				 	return AdviceStr;
			
 
				 }
			
@@ -229,4 +234,19 @@ export const hideTipsDetails = (state, action) => {
 
				 	const res = Object.assign({}, state);
			
 
				 	res.showTipsDetails = false;
			
 
				 	return res;
			
 
				+}
			
 
				+
			
 
				+//一般治疗添加到医嘱
			
 
				+export const setCommontreatment = (state, action) => {
			
 
				+	const res = JSON.parse(JSON.stringify(state));
			
 
				+	res.advice.commontreatment = action.commontreatment;
			
 
				+	res.AdviceStr = getAdviceStr(res.advice)
			
 
				+	return res;
			
 
				+}
			
 
				+
			
 
				+export const setAdviceInput = (state, action) => {
			
 
				+	const res = JSON.parse(JSON.stringify(state));
			
 
				+	res.advice.adviceInput = action.adviceInput;
			
 
				+	res.AdviceStr = getAdviceStr(res.advice)
			
 
				+	return res;
			
 
				 }
			
--- a/src/store/actions/treat.js
+++ b/src/store/actions/treat.js
@@ -99,3 +99,9 @@ export const setDrugInfoList = (state, action) => {
 
				     return res
			
 
				 }
			
 
				 
			
 
				+//是否第一次主诊断
			
 
				+export const isFirstMainDiag = (state, action) => {
			
 
				+    const res = Object.assign({}, state);
			
 
				+    res.isFirstMainDiag = false;
			
 
				+    return res;
			
 
				+}
			
--- a/src/store/async-actions/treat.js
+++ b/src/store/async-actions/treat.js
@@ -1,7 +1,8 @@
 
				 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, SET_DRUG_INFO_LIST } from '@store/types/treat';
			
 
				+import { SET_COMMONTREATMENT } from '@store/types/pushMessage'
			
 
				+import { SET_DRUG_INFO, SET_TREATMENT, SET_TREAT_INFO, SET_RECOMMEND_BASIC, SET_DRUG_INFO_LIST, IS_FIRST_MAIN_DIAG } from '@store/types/treat';
			
 
				 import {storageLocal,getEMRParams} from '@utils/tools';
			
 
				 import { isAddMainSuit } from '@store/async-actions/diagnosticList';
			
 
				 
			
@@ -288,6 +289,24 @@ export const  getInstroduceMore = (drugIdList) =>{
 
				     }
			
 
				 }
			
 
				 
			
 
				+//一般治疗添加到医嘱
			
 
				+export const commonTreatAddToAdvice = () => {
			
 
				+    return (dispatch, getState) => {
			
 
				+        const state = getState();
			
 
				+        if(state.treat.treatItem.treatIndex === 0 && state.treat.isFirstMainDiag) {
			
 
				+            dispatch({
			
 
				+                type: IS_FIRST_MAIN_DIAG
			
 
				+            })
			
 
				+            dispatch({
			
 
				+                type: SET_COMMONTREATMENT,
			
 
				+                commontreatment: state.treat.treatItem.treat.commonTreatment.text
			
 
				+            })
			
 
				+        } else {
			
 
				+            return
			
 
				+        }
			
 
				+    }
			
 
				+}
			
 
				+
			
 
				 //其他推荐推荐依据不用展示
			
 
				 // export const getRecommendBasic = (item)=>{
			
 
				     
			
--- a/src/store/reducers/pushMessage.js
+++ b/src/store/reducers/pushMessage.js
@@ -1,5 +1,5 @@
 
				-import {CHANGE_ASSAY, CHANGE_CHECK, BILLING_ADVICE, ADD_SCHEME, SET_TIPS,  SET_TIPS_DETAILS, SET_CHANGE_ADVICE_TREATMENT, SET_CHANGE_ADVICE_ASSAY, SET_CHANGE_ADVICE_CHECK, ADD_BILLING,CLEAR_ALL_PUSH_MESSAGE,SHOW_TIPS_DETAILS, HIDE_TIPS_DETAILS } from '../types/pushMessage';
			
 
				-import {changeAssay, changeCheck, setAdvice, addScheme, setTips, setTipsDetails, setChangeAdviceTreatment, setChangeAdviceAssay, setChangeAdviceCheck, addBilling, clearAllPushMessage, showTipsDetails, hideTipsDetails } from '../actions/pushMessage';
			
 
				+import {CHANGE_ASSAY, CHANGE_CHECK, BILLING_ADVICE, ADD_SCHEME, SET_TIPS,  SET_TIPS_DETAILS, SET_CHANGE_ADVICE_TREATMENT, SET_CHANGE_ADVICE_ASSAY, SET_CHANGE_ADVICE_CHECK, ADD_BILLING,CLEAR_ALL_PUSH_MESSAGE,SHOW_TIPS_DETAILS, HIDE_TIPS_DETAILS, SET_COMMONTREATMENT, IS_FIRST_MAIN_DIAG, SET_ADVICE_INPUT } from '../types/pushMessage';
			
 
				+import {changeAssay, changeCheck, setAdvice, addScheme, setTips, setTipsDetails, setChangeAdviceTreatment, setChangeAdviceAssay, setChangeAdviceCheck, addBilling, clearAllPushMessage, showTipsDetails, hideTipsDetails, setCommontreatment, isFirstMainDiag, setAdviceInput } from '../actions/pushMessage';
			
 
				 
			
 
				 const initState = {
			
 
				   vigilant: [],
			
@@ -46,6 +46,12 @@ export default function(state = initState, action) {
 
				       return showTipsDetails(state, action);
			
 
				     case HIDE_TIPS_DETAILS:
			
 
				       return hideTipsDetails(state, action);
			
 
				+    case SET_COMMONTREATMENT:
			
 
				+      return setCommontreatment(state, action);
			
 
				+    case IS_FIRST_MAIN_DIAG:
			
 
				+      return isFirstMainDiag(state, action);
			
 
				+    case SET_ADVICE_INPUT:
			
 
				+      return setAdviceInput(state, action)
			
 
				     default:
			
 
				       return state;
			
 
				   }
			
--- a/src/store/reducers/treat.js
+++ b/src/store/reducers/treat.js
@@ -1,8 +1,9 @@
 
				-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'
			
 
				+import { SELECT_DRUG, SET_TREAT_INFO, SET_OTHER_DRUG, SET_DRUG_INFO, CLEAR_DRUG_INFO,SHOW_TREAT, HIDE_TREAT, CLEAR_TREAT, SHOW_DRUG_INFO, HIDE_DRUG_INFO, SET_GENERAL_TREAT, SET_TREATMENT, SET_SURGERY_TREAT, SET_RECOMMEND_BASIC, SET_DRUG_INFO_LIST,IS_FIRST_MAIN_DIAG } from '../types/treat'
			
 
				+import { selectDrug, setTreatInfo, setOtherDrug, setDrugInfo, clearDrugInfo, showTreat, hideTreat, clearTreat, showDrugInfo, hideDrugInfo, setTreatment, setGeneralTreat, setSurgeryTreat, setRecommendBasic, setDrugInfoList, isFirstMainDiag } from '../actions/treat'
			
 
				 const initState = {
			
 
				     show: false, //治疗方案显示隐藏
			
 
				     showDrugInfo: false, //药品信息显示隐藏
			
 
				+    isFirstMainDiag: true, //是否为第一次主诊断开单
			
 
				     generalTreat: '',
			
 
				     surgeryTreat: '',
			
 
				     treatment: [],
			
@@ -196,7 +197,9 @@ export default function(state=initState, action){
 
				         case CLEAR_DRUG_INFO:
			
 
				             return clearDrugInfo(state, action);
			
 
				         case SET_DRUG_INFO_LIST:
			
 
				-        return setDrugInfoList(state, action);
			
 
				+            return setDrugInfoList(state, action);
			
 
				+        case IS_FIRST_MAIN_DIAG: 
			
 
				+            return isFirstMainDiag(state, action)
			
 
				         default:
			
 
				             return state
			
 
				     }
			
--- a/src/store/types/pushMessage.js
+++ b/src/store/types/pushMessage.js
@@ -13,5 +13,7 @@ export const SET_CHANGE_ADVICE_CHECK = 'SET_CHANGE_ADVICE_CHECK';   //改变医
 
				 export const CLEAR_ALL_PUSH_MESSAGE = 'CLEAR_ALL_PUSH_MESSAGE';   //清除所有推送信息
			
 
				 export const SHOW_TIPS_DETAILS = 'SHOW_TIPS_DETAILS'; //显示提示详情页
			
 
				 export const HIDE_TIPS_DETAILS = 'HIDE_TIPS_DETAILS'; //显示提示详情页
			
 
				+export const SET_COMMONTREATMENT = 'SET_COMMONTREATMENT'    //设置常见治疗
			
 
				+export const SET_ADVICE_INPUT = 'SET_ADVICE_INPUT'  //设置医嘱自由输入内容
			
 
				 
			
 
				 
			
--- a/src/store/types/treat.js
+++ b/src/store/types/treat.js
@@ -13,3 +13,5 @@ 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' //查询多个药品说明书（添加数据时查看药品说明用）
			
 
				+export const IS_FIRST_MAIN_DIAG = 'IS_FIRST_MAIN_DIAG' //是否为主诊断第一次开单
			
 
				+