6 år sedan · 5b1fecad08
--- a/src/common/components/ConfirmModal/NewPortal/index.jsx
+++ b/src/common/components/ConfirmModal/NewPortal/index.jsx
@@ -9,7 +9,6 @@ class NewPortal extends Component {
 
				         this.node = document.createElement('div');
			
 
				         document.body.appendChild(this.node);
			
 
				     }
			
 
				-
			
 
				     render() {
			
 
				         const { visible,children } = this.props;
			
 
				         
			
--- a/src/common/components/EditableSpan/index.jsx
+++ b/src/common/components/EditableSpan/index.jsx
@@ -153,9 +153,13 @@ class EditableSpan extends Component{
 
				     let innerVal = target.innerText;
			
 
				     if(ev.keyCode==8){
			
 
				       // 主诉现病史去重：删除最后一个字的时候移除该数据（将name、id和value替换成空）并移除id
			
 
				+      // 前面是标签，内容为空时再删一次才移除标签；前面是文本，则直接移除；
			
 
				+      let preObj = $(this.$span.current).prev();
			
 
				       if(preVal.trim().length==1){
			
 
				           removeId && removeId({boxMark,i:index,text:""});
			
 
				-          // this.moveEnd(obj[0]);
			
 
				+          if(preObj[0].nodeName !=="DIV"){
			
 
				+            this.moveEnd(preObj[0]);
			
 
				+          }
			
 
				         }
			
 
				       
			
 
				       if(innerVal !==preVal){return false}
			
@@ -163,7 +167,7 @@ class EditableSpan extends Component{
 
				       //判断是否为空、中英文：, 。、；,且不是第一位
			
 
				       let pattern = new RegExp(/^\,?$|^\，?$|^\.?$|^\。?$|^\、?$|^\;?$|^\；?$|^\:?$|^\：?$\s/);
			
 
				       if(index!==0 && pattern.test(data)){
			
 
				-        let preObj = $(this.$span.current).prev();
			
 
				+        // let preObj = $(this.$span.current).prev();
			
 
				         let obj = preObj[0].nodeName=="DIV"?preObj.prev():preObj;
			
 
				         handleKeydown&&handleKeydown({boxMark,i:index,text:data});
			
 
				         this.moveEnd(obj[0]);  
			
--- a/src/common/components/SearchOption/index.jsx
+++ b/src/common/components/SearchOption/index.jsx
@@ -57,7 +57,7 @@ class SearchOption extends React.Component {
 
				               show:true
			
 
				           })
			
 
				       }else{
			
 
				-          // this.handleClearVal()
			
 
				+          this.handleClearVal('')            //这个要放开，输入为空清除列表
			
 
				           this.setState({
			
 
				               show:false
			
 
				           })
			
--- a/src/common/js/func.js
+++ b/src/common/js/func.js
@@ -66,7 +66,7 @@ export const strTrim = (str) =>{
 
				 };
			
 
				 
			
 
				 //获取组合组件已填文字填入saveText
			
 
				-function getSaveText(data){//console.log(data)
			
 
				+function getSaveText(data){console.log(data)
			
 
				   const arr = data.questionMapping.map((it)=>{
			
 
				     return it.value?(it.labelPrefix||'')+(it.value||'')+(it.labelSuffix||''):'';
			
 
				   });
			
--- a/src/common/less/variables.less
+++ b/src/common/less/variables.less
@@ -57,8 +57,8 @@
 
				   top:30px;
			
 
				   background: #fff;
			
 
				   box-shadow: 0 10px 20px 0 #989DA3;
			
 
				-  filter:progid:DXImageTransform.Microsoft.Shadow(color='#989DA3',Direction=125,Strength=6);
			
 
				-  border: 1px solid #f3f0f0;
			
 
				+  // filter:progid:DXImageTransform.Microsoft.Shadow(color='#989DA3',Direction=125,Strength=6);
			
 
				+  border: 1px solid #dedede;
			
 
				   z-index: 203;
			
 
				   padding: 20px;
			
 
				   white-space: nowrap;
			
@@ -159,8 +159,8 @@
 
				 
			
 
				 .llStyle{
			
 
				   box-shadow: 0 10px 20px 0 #989DA3;
			
 
				-  filter:progid:DXImageTransform.Microsoft.Shadow(color='#989DA3',Direction=125,Strength=6);
			
 
				-  border: 1px solid #f3f0f0;
			
 
				+  // filter:progid:DXImageTransform.Microsoft.Shadow(color='#989DA3',Direction=125,Strength=6);
			
 
				+  border: 1px solid #dedede;
			
 
				 }
			
 
				 
			
 
				 .borderd{
			
--- 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 } from '@utils/tools';
			
 
				+import { deepClone,normalVal } from '@utils/tools';
			
 
				 import styles from './index.less';
			
 
				 import date1 from './img/date1.png';
			
 
				 import date2 from './img/date2.png';
			
@@ -30,7 +30,6 @@ class Inspect extends React.Component {
 
				         this.getItemList = this.getItemList.bind(this)
			
 
				         this.getSearchList = this.getSearchList.bind(this)
			
 
				         this.changeActivePart = this.changeActivePart.bind(this)
			
 
				-        this.normalVal = this.normalVal.bind(this)
			
 
				         this.showDetails = this.showDetails.bind(this)
			
 
				         this.delConfirm = this.delConfirm.bind(this)
			
 
				         this.handleCancel = this.handleCancel.bind(this)
			
@@ -232,21 +231,6 @@ class Inspect extends React.Component {
 
				         }
			
 
				     </ul>
			
 
				     }
			
 
				-    normalVal(min,max){
			
 
				-        if((min-0) && (max-0)){
			
 
				-            return `正常值: (${min}~${max})`
			
 
				-        }else if((min-0) && !(max-0)){
			
 
				-            return `正常值: (>=${min})`
			
 
				-        }else if(!(min-0) && (max-0)){
			
 
				-            if(min == '' || min == null){
			
 
				-                return `正常值: (<=${max})`
			
 
				-            }else{
			
 
				-                return `正常值: (${min}~${max})`
			
 
				-            }
			
 
				-        }else{
			
 
				-            return null;
			
 
				-        }
			
 
				-    }
			
 
				     showDetails(val){
			
 
				         if(val.questionDetailList.length > 0){
			
 
				             return val.questionDetailList.map((item)=>{
			
@@ -255,7 +239,7 @@ class Inspect extends React.Component {
 
				                 }
			
 
				             })
			
 
				         }else{
			
 
				-            return <td><span className={val.value > val.maxValue || val.value < val.minValue?"red":''}>{val.value}</span> { val.labelSuffix}</td>
			
 
				+            return <td><span className={(val.maxValue || val.minValue) ? (val.value > val.maxValue || val.value < val.minValue?"red":''):''}>{val.value}</span> { val.labelSuffix}</td>
			
 
				         }
			
 
				     }
			
 
				     render() {
			
@@ -283,7 +267,7 @@ class Inspect extends React.Component {
 
				                                                                 <td>{value.itemName}</td>
			
 
				                                                                 <td><span className={value.type == 1?'red':null}>{value.value}</span> {value.unit}</td>
			
 
				                                                                 <td>
			
 
				-                                                                    {this.normalVal(value.min,value.max)}
			
 
				+                                                                    {normalVal(value.min,value.max)}
			
 
				                                                                 </td>
			
 
				                                                                 <td>{value.time == ''?('导入时间: '+this.state.dateTime):'化验时间: '+value.time}</td>
			
 
				                                                             </tr>
			
@@ -322,7 +306,7 @@ class Inspect extends React.Component {
 
				                                                                 <td>{val.name}</td>
			
 
				                                                                 {this.showDetails(val)}
			
 
				                                                                 <td>
			
 
				-                                                                    {this.normalVal(val.minValue,val.maxValue)}
			
 
				+                                                                    {normalVal(val.minValue,val.maxValue)}
			
 
				                                                                 </td>
			
 
				                                                                 <td>{'化验时间:'+item.time}</td>
			
 
				                                                             </tr>
			
--- a/src/components/CheckBody/index.jsx
+++ b/src/components/CheckBody/index.jsx
@@ -63,7 +63,7 @@ class CheckBody extends Component{
 
				       return ;
			
 
				     }
			
 
				     //有主诉时且本身无数据，第一次点击获取数据，(不论获取成功与否)再点击不获取（直到刷新成空白页或清空）
			
 
				-    if(hasMain&&isEmpty){
			
 
				+    if(hasMain&&isEmpty!=false){
			
 
				       this.props.getInit();
			
 
				     }
			
 
				   }
			
--- a/src/components/CurrentIll/index.jsx
+++ b/src/components/CurrentIll/index.jsx
@@ -34,7 +34,7 @@ class CurrentIll extends Component{
 
				 
			
 
				   handleFocus(e){
			
 
				     // 判断主诉是否为空
			
 
				-    const {mainData,mainText,setData,moduleNum,mainIds,data,changeEditIll,editClear,mainSymptIds} = this.props;
			
 
				+    const {mainData,mainText,setData,moduleNum,mainIds,data,changeEditIll,editClear} = this.props;
			
 
				     const that = this;
			
 
				     let mainFinallyText = filterDataArr(mainText);
			
 
				     // if(mainData.length == 0 && !mainText[0]){
			
@@ -46,11 +46,11 @@ class CurrentIll extends Component{
 
				       })
			
 
				     }else {
			
 
				       // let useEmpty = mainData.length>0?false:true;
			
 
				-      let useEmpty = mainSymptIds.length>0?false:true;
			
 
				       let num = moduleNum.num;//主诉使用了几个模板
			
 
				       // if(editClear && data.length==0){//第一次聚焦去设置现病史的data
			
 
				       if(data.length==0){//第一次聚焦去设置现病史的data
			
 
				-        setData && setData({useEmpty,num,mainData,mainIds});//是否使用空模板 及数据处理
			
 
				+        // setData && setData({useEmpty,num,mainData,mainIds});//是否使用空模板 及数据处理
			
 
				+        setData && setData({num,mainData,mainIds});//是否使用空模板 及数据处理
			
 
				       }
			
 
				       this.setState({
			
 
				           showMoudle:true,
			
--- a/src/components/DiagResultSearch/index.less
+++ b/src/components/DiagResultSearch/index.less
@@ -4,10 +4,12 @@
 
				     width: 316px;
			
 
				     margin: 0 10px 10px;
			
 
				     padding: 0 8px;
			
 
				-    box-shadow: 0 6px 20px 0 #989DA3;
			
 
				+    // box-shadow: 0 6px 20px 0 #989DA3;
			
 
				     background: #fff;
			
 
				     z-index: 99;
			
 
				     margin-bottom: 80px;
			
 
				+    .llStyle;
			
 
				+    
			
 
				 }
			
 
				 .search {
			
 
				     width: 100%;
			
@@ -18,6 +20,7 @@
 
				 .search-input {
			
 
				     width: 300px;
			
 
				     height: 34px;
			
 
				+    line-height: 34px;
			
 
				     position: relative;
			
 
				     padding: 0  30px;
			
 
				 }
			
--- a/src/components/Operation/index.jsx
+++ b/src/components/Operation/index.jsx
@@ -6,7 +6,7 @@ import saveHistory from '@common/images/saveHistory.png';
 
				 import PrintPreviewContainer from '@containers/PrintPreviewContainer';
			
 
				 import PreviewContainer from '@containers/PreviewContainer';
			
 
				 import { ConfirmModal, Notify } from '@commonComp';
			
 
				-import {getAllDataList,getAllDataStringList} from '@utils/tools';
			
 
				+import {getAllDataList,getAllDataStringList,isAllClear} from '@utils/tools';
			
 
				 import store from '@store';
			
 
				 
			
 
				 
			
@@ -94,7 +94,10 @@ class Operation extends Component {
 
				     }
			
 
				   }
			
 
				   clearAll(type) {
			
 
				-    let flg = this.isClear();
			
 
				+    let baseList = store.getState();
			
 
				+    let jsonData = getAllDataList(baseList);
			
 
				+    let jsonStr = getAllDataStringList(baseList);
			
 
				+    let flg = isAllClear(jsonData,jsonStr);
			
 
				     if(flg){
			
 
				       this.setState({
			
 
				         type: type,
			
@@ -106,6 +109,8 @@ class Operation extends Component {
 
				       })
			
 
				       
			
 
				       this.props.diagShowTmp(true)
			
 
				+    }else{
			
 
				+      Notify.info('当前页面数据已清空');
			
 
				     }
			
 
				   }
			
 
				   isClear(){
			
@@ -180,51 +185,44 @@ class Operation extends Component {
 
				     let jsonStr = getAllDataStringList(baseList);
			
 
				     let whichSign = baseList.typeConfig.typeConfig;
			
 
				     let tmpLis = baseList.tabTemplate.items;
			
 
				+    // console.log(jsonStr.present,'2222')
			
 
				     for(let i = 0;i <tmpLis.length;i++){
			
 
				       let dataStr = tmpLis[i].preview;
			
 
				       let jsStr = tmpLis[i].dataJson;
			
 
				-      // console.log(JSON.stringify(JSON.parse(dataStr)))
			
 
				-      // console.log(JSON.stringify(jsonStr))
			
 
				-      if(JSON.stringify(JSON.parse(dataStr)) == JSON.stringify(jsonStr) && jsStr == JSON.stringify(jsonData)){
			
 
				+      // 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;
			
 
				+      // }
			
 
				+      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)    
			
 
				+      ){
			
 
				         Notify.info('该模板已保存');
			
 
				         return false;
			
 
				       }
			
 
				     }
			
 
				-    if (whichSign == 0) {
			
 
				-      if (
			
 
				-        JSON.stringify(jsonData.advice) == '{}' &&
			
 
				-        (jsonData.chief.length < 1 && jsonStr.chief == '[]') &&
			
 
				-        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
			
 
				-      ) {
			
 
				-        Notify.info('模板数据不能为空');
			
 
				-        return false;
			
 
				-      }else{
			
 
				-        return true;
			
 
				-      }
			
 
				-    } else if(whichSign == 1) {
			
 
				-      if (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;
			
 
				-      }
			
 
				+    let flg = isAllClear(jsonData,jsonStr)
			
 
				+    if(!flg){
			
 
				+      Notify.info('模板数据不能为空')
			
 
				+      return false
			
 
				     }else{
			
 
				-      return true;
			
 
				+      return true
			
 
				     }
			
 
				   }
			
 
				   changeTitle() {
			
--- a/src/components/PreviewBody/index.jsx
+++ b/src/components/PreviewBody/index.jsx
@@ -1,5 +1,6 @@
 
				 import React, { Component } from "react";
			
 
				 import style from "./index.less";
			
 
				+import { normalVal } from '@utils/tools';
			
 
				 import $ from "jquery";
			
 
				 
			
 
				 (function ($) {
			
@@ -67,7 +68,6 @@ class PreviewBody extends Component {
 
				             dateTime:"",
			
 
				         }
			
 
				         this.$content = React.createRef();
			
 
				-        this.normalVal = this.normalVal.bind(this);
			
 
				         this.getCurrentDate = this.getCurrentDate.bind(this);
			
 
				         this.onPrint = this.onPrint.bind(this);
			
 
				     }
			
@@ -94,21 +94,6 @@ class PreviewBody extends Component {
 
				         let date = year+'-'+(mon<10?'0'+mon:mon)+'-'+(day<10?'0'+day:day);
			
 
				         this.setState({dateTime:date})
			
 
				     }
			
 
				-    normalVal(min,max){
			
 
				-        if((min-0) && (max-0)){
			
 
				-            return `正常值: (${min}~${max})`
			
 
				-        }else if((min-0) && !(max-0)){
			
 
				-            return `正常值: (>=${min})`
			
 
				-        }else if(!(min-0) && (max-0)){
			
 
				-            if(min == '' || min == null){
			
 
				-                return `正常值: (<=${max})`
			
 
				-            }else{
			
 
				-                return `正常值: (${min}~${max})`
			
 
				-            }
			
 
				-        }else{
			
 
				-            return null;
			
 
				-        }
			
 
				-    }
			
 
				     showDetails(val){
			
 
				         if(val.questionDetailList.length > 0){
			
 
				             return val.questionDetailList.map((item)=>{
			
@@ -116,8 +101,8 @@ class PreviewBody extends Component {
 
				                     return <td style={{width:'23%'}}><span style={{color:item.abnormal != '0' ?"red":null}}>{val.value}</span> { val.labelSuffix}</td>
			
 
				                 }
			
 
				             })
			
 
				-        }else{
			
 
				-            return <td style={{width:'23%'}}><span style={{color:val.value > val.maxValue || val.value < val.minValue?"red":null}}>{val.value}</span> { val.labelSuffix}</td>
			
 
				+        }else{ 
			
 
				+            return <td style={{width:'23%'}}><span style={{color:(val.maxValue || val.minValue)?(val.value > val.maxValue || val.value < val.minValue?"red":null):null}}>{val.value}</span> { val.labelSuffix}</td>
			
 
				         }
			
 
				     }
			
 
				     render() {
			
@@ -188,7 +173,7 @@ class PreviewBody extends Component {
 
				                                                             <td style={{width:'25%',fontSize:'12px'}}>{value.itemName}</td>
			
 
				                                                             <td style={{width:'23%',fontSize:'12px'}}><span style={{fontSize:'12px',color:value.type == 1?"red":null}}>{value.value}</span> {value.unit}</td>
			
 
				                                                             <td style={{width:'24%',fontSize:'12px'}}>
			
 
				-                                                                {this.normalVal(value.min,value.max)}
			
 
				+                                                                {normalVal(value.min,value.max)}
			
 
				                                                             </td>
			
 
				                                                             <td style={{width:'28%',fontSize:'12px'}}>{value.time == ''?('导入时间: '+this.state.dateTime):'化验时间: '+value.time}</td>
			
 
				                                                         </tr>
			
@@ -211,7 +196,7 @@ class PreviewBody extends Component {
 
				                                                                 {this.showDetails(val)}
			
 
				                                                                 
			
 
				                                                                 <td style={{width:'24%'}}>
			
 
				-                                                                    {this.normalVal(val.minValue,val.maxValue)}
			
 
				+                                                                    {normalVal(val.minValue,val.maxValue)}
			
 
				                                                                 </td>
			
 
				                                                                 <td style={{width:'28%'}}>{'化验时间:'+item.time}</td>
			
 
				                                                             </tr>
			
--- a/src/components/PushContainer/index.jsx
+++ b/src/components/PushContainer/index.jsx
@@ -46,6 +46,7 @@ class PushContainer extends Component {
 
				         this.handleAllCheckbox=this.handleAllCheckbox.bind(this)
			
 
				         this.handleMangerTemplate=this.handleMangerTemplate.bind(this)
			
 
				         this.handleDelList=this.handleDelList.bind(this)
			
 
				+        this.makeSure=this.makeSure.bind(this)
			
 
				         this.handleClose = this.handleClose.bind(this);
			
 
				     }
			
 
				     componentDidMount(){
			
@@ -115,7 +116,6 @@ class PushContainer extends Component {
 
				         let e = event?event:window.event;
			
 
				         if(e.keyCode == 13) {
			
 
				             this.makeSure()
			
 
				-            // store.dispatch(changeVisible(false))
			
 
				         }
			
 
				     }
			
 
				     handleInput(e){
			
@@ -147,14 +147,15 @@ class PushContainer extends Component {
 
				     }
			
 
				     /**
			
 
				      * 改变模板标题
			
 
				-     * @param {模板id和模板title} obj 
			
 
				+     * @param {模板id和模板title} obj
			
 
				      */
			
 
				-    handleTitleChange(obj) {
			
 
				+    handleTitleChange(id,text) {
			
 
				         store.dispatch(changeVisible(true))
			
 
				         this.setState({
			
 
				             type:3,
			
 
				-            obj:obj,
			
 
				-            title:obj.text,
			
 
				+            currId:id,
			
 
				+            title:text,
			
 
				+            text:text,
			
 
				             okText:'保存',
			
 
				             okBorderColor:'#3B9ED0',
			
 
				             okColor:'#fff',
			
@@ -200,13 +201,13 @@ class PushContainer extends Component {
 
				             store.dispatch(delBatchItem(this.props.checkItems))
			
 
				             store.dispatch(changeVisible(false))
			
 
				         }else if(this.state.type == 3){
			
 
				-            if(this.state.title == this.state.obj.text){
			
 
				+            if(this.state.title == this.state.text){
			
 
				                 store.dispatch(changeVisible(false))
			
 
				                 Notify.success('标题修改成功');
			
 
				                 return;
			
 
				             }
			
 
				             let tempObj = {
			
 
				-                id:this.state.obj.id,
			
 
				+                id:this.state.currId,
			
 
				                 title:this.state.title
			
 
				             }
			
 
				             store.dispatch(changeTitleAsync(tempObj))
			
--- a/src/components/PushItems/DetailsModal/NewPortal/index.jsx
+++ b/src/components/PushItems/DetailsModal/NewPortal/index.jsx
@@ -0,0 +1,29 @@
 
				+import React, { Component } from 'react';
			
 
				+import ReactDOM from 'react-dom';
			
 
				+
			
 
				+//传送门，将dom渲染到body节点
			
 
				+class NewPortal extends Component {
			
 
				+    constructor(props) {
			
 
				+        super(props)
			
 
				+        // 初始化创建渲染的父元素并添加到body下
			
 
				+        this.node = document.createElement('div');
			
 
				+    }
			
 
				+
			
 
				+    componentDidMount() {
			
 
				+        document.body.appendChild(this.node);
			
 
				+    }
			
 
				+
			
 
				+    componentWillUnmount() {
			
 
				+        document.body.removeChild(this.node);
			
 
				+    }
			
 
				+    render() {
			
 
				+        const { visible,children } = this.props;
			
 
				+        
			
 
				+        return visible && ReactDOM.createPortal(
			
 
				+            children,
			
 
				+            this.node
			
 
				+        )
			
 
				+    }
			
 
				+}
			
 
				+
			
 
				+export default NewPortal;
			
--- a/src/components/PushItems/DetailsModal/index.jsx
+++ b/src/components/PushItems/DetailsModal/index.jsx
@@ -0,0 +1,41 @@
 
				+import React, { Component } from "react";
			
 
				+import styles from "./index.less";
			
 
				+import NewPortal from './NewPortal'
			
 
				+import close from "./../img/close.png";
			
 
				+class DetailsModal extends Component {
			
 
				+    constructor(props) {
			
 
				+        super(props);
			
 
				+        this.hideTips = this.hideTips.bind(this)
			
 
				+    }
			
 
				+    hideTips() {
			
 
				+        const { hideTips } = this.props;
			
 
				+        hideTips && hideTips();
			
 
				+    }
			
 
				+
			
 
				+    render() {
			
 
				+        const {showTipsDetails, tipsDetails} = this.props;
			
 
				+        const imageUrlPrefix = 'http://192.168.2.241:82'; //图片服务器地址
			
 
				+        return (<NewPortal visible={showTipsDetails}>
			
 
				+        <div className={styles['details-wrapper']}>
			
 
				+           <div className={styles['details-content-wrapper']}>
			
 
				+                <h1 className={styles['details-content-name']} >{tipsDetails && tipsDetails.name} <img className={styles['details-close']} onClick={this.hideTips} src={close} /></h1>
			
 
				+                <div className={styles['details-content']}>
			
 
				+                    {tipsDetails && tipsDetails.introduceDetailList && tipsDetails.introduceDetailList.map((item, index) => {
			
 
				+                        return (<div>
			
 
				+                            <div className={styles['details-content-title-box']}>
			
 
				+                                <span className={styles['details-content-title-name']}>{item.title}</span>
			
 
				+                                <div className={styles['details-content-title-line']}></div>
			
 
				+                            </div>
			
 
				+                            <div dangerouslySetInnerHTML ={{__html: item.content.replace(/{imageUrlPrefix}/g, imageUrlPrefix)}}></div>
			
 
				+                        </div>)
			
 
				+                    })}
			
 
				+                </div>
			
 
				+           </div>
			
 
				+           <div className={styles['details-mask']}>
			
 
				+           </div>
			
 
				+        </div>
			
 
				+    </NewPortal>)
			
 
				+    }
			
 
				+}
			
 
				+
			
 
				+export default DetailsModal;
			
--- a/src/components/PushItems/DetailsModal/index.less
+++ b/src/components/PushItems/DetailsModal/index.less
@@ -0,0 +1,72 @@
 
				+.details-wrapper {
			
 
				+    position: fixed;
			
 
				+    width: 100%;
			
 
				+    height: 100%;
			
 
				+    left: 0;
			
 
				+    top: 0;
			
 
				+    z-index: 205;
			
 
				+}
			
 
				+
			
 
				+.details-content-wrapper {
			
 
				+    position: fixed;
			
 
				+    padding: 50px 0;
			
 
				+    width: 80%;
			
 
				+    height: 80%;
			
 
				+    left: 10%;
			
 
				+    top: 10%;
			
 
				+    background: #fff;
			
 
				+    z-index: 10;
			
 
				+}
			
 
				+
			
 
				+.details-content-name {
			
 
				+    position: absolute;
			
 
				+    top: 0;
			
 
				+    width: 100%;
			
 
				+    padding: 0 40px;
			
 
				+    height: 50px;
			
 
				+    line-height: 50px;
			
 
				+    font-size: 24px;
			
 
				+}
			
 
				+
			
 
				+.details-content-title-box {
			
 
				+    position: relative;
			
 
				+    height: 40px;
			
 
				+    line-height: 40px;
			
 
				+    font-size: 20px;
			
 
				+}
			
 
				+
			
 
				+.details-content-title-name {
			
 
				+    position: absolute;
			
 
				+    background: #fff;
			
 
				+    padding-right: 5px;
			
 
				+    font-size: 20px;
			
 
				+    z-index: 10;
			
 
				+}
			
 
				+
			
 
				+.details-content-title-line {
			
 
				+    position: absolute;
			
 
				+    width: 100%;
			
 
				+    height: 20px;
			
 
				+    top: 0;
			
 
				+    border-bottom: 1px dashed #ccc;
			
 
				+}
			
 
				+.details-close {
			
 
				+    position: absolute;
			
 
				+    right: 0;
			
 
				+}
			
 
				+.details-content {
			
 
				+    height: 100%;
			
 
				+    padding: 0 40px;
			
 
				+    overflow-y: auto;
			
 
				+}
			
 
				+.details-mask {
			
 
				+    position: fixed;
			
 
				+    width: 100%;
			
 
				+    height: 100%;
			
 
				+    left: 0;
			
 
				+    top: 0;
			
 
				+    background: #000;
			
 
				+    opacity: .6;
			
 
				+    filter:alpha(opacity=60);
			
 
				+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=60);";
			
 
				+}
			
--- a/src/components/PushItems/index.jsx
+++ b/src/components/PushItems/index.jsx
@@ -7,7 +7,7 @@ import tipsImg from "../../common/images/tips.png";
 
				 import vigilantImg from "../../common/images/vigilant.png";
			
 
				 import showImg from "../../common/images/show.png";
			
 
				 import hideImg from "../../common/images/close.png";
			
 
				-
			
 
				+import DetailsModal from './DetailsModal';
			
 
				 import PushDiag from "./PushDiag";
			
 
				 import DiagnosticItem from "@containers/DiagnosticItem";
			
 
				 import $ from "jquery";
			
@@ -29,6 +29,7 @@ class PushItems extends Component {
 
				     this.changeAssay = this.changeAssay.bind(this);
			
 
				     this.changeCheck = this.changeCheck.bind(this);
			
 
				     this.showTips = this.showTips.bind(this);
			
 
				+    this.hideTips = this.hideTips.bind(this)
			
 
				     this.$cont = React.createRef();
			
 
				   }
			
 
				 
			
@@ -61,8 +62,13 @@ class PushItems extends Component {
 
				   }
			
 
				 
			
 
				   showTips(tips) {
			
 
				-    const { getTipsDetails } = this.props;
			
 
				+    const { getTipsDetails, showTipsDetailsModal } = this.props;
			
 
				     getTipsDetails && getTipsDetails();
			
 
				+    showTipsDetailsModal && showTipsDetailsModal()
			
 
				+  }
			
 
				+  hideTips() {
			
 
				+    const { hideTipsDetailsModal } = this.props;
			
 
				+    hideTipsDetailsModal && hideTipsDetailsModal()
			
 
				   }
			
 
				   componentDidMount() {
			
 
				     const height = getWindowInnerHeight() - 200;
			
@@ -82,7 +88,9 @@ class PushItems extends Component {
 
				       possible,
			
 
				       assay,
			
 
				       check,
			
 
				-      tips
			
 
				+      tips,
			
 
				+      showTipsDetails,
			
 
				+      tipsDetails
			
 
				     } = this.props.pushMessage;
			
 
				     const { tipsDiscalimer } = this.props;
			
 
				     const { moreAssay, moreCheck } = this.state;
			
@@ -355,7 +363,10 @@ class PushItems extends Component {
 
				           </div>
			
 
				         </div>
			
 
				         {tipsDiscalimer.data && <div className={style['disTips']} dangerouslySetInnerHTML={{__html: tipsDiscalimer.data.data[1].description}}></div>}
			
 
				-        
			
 
				+        {showTipsDetails && <DetailsModal  
			
 
				+            showTipsDetails = {showTipsDetails}
			
 
				+            hideTips = {this.hideTips}
			
 
				+            tipsDetails = {tipsDetails}/>}
			
 
				         
			
 
				       </div>
			
 
				     );
			
--- a/src/components/RadioDrop/index.jsx
+++ b/src/components/RadioDrop/index.jsx
@@ -94,13 +94,10 @@ class RadioDrop extends Component{
 
				   }
			
 
				   handleEditLabel(e){
			
 
				     e.stopPropagation();
			
 
				+    if(!this.state.editable){     //ie8点开下拉未选值存值bug修改
			
 
				+      return;
			
 
				+    }
			
 
				     const {ikey,boxMark,handleLabelEdit} = this.props;
			
 
				-    /*const {editable} = this.state;
			
 
				-    if(editable){
			
 
				-      // 更改标签的value值
			
 
				-      let changeVal = e.target.innerText;
			
 
				-      handleLabelEdit && handleLabelEdit({ikey,changeVal,type:boxMark});
			
 
				-    }*/
			
 
				     this.setState({
			
 
				       editable:false
			
 
				     });  
			
--- a/src/components/SpreadDrop/index.jsx
+++ b/src/components/SpreadDrop/index.jsx
@@ -175,10 +175,10 @@ class SpreadDrop extends Component{
 
				   }
			
 
				   handleConfirm(e){
			
 
				     e.stopPropagation();
			
 
				-    const {handleConfirm,ikey,type,tagType,order,mainSaveText,copyType} = this.props;
			
 
				-    const params = Object.assign({},this.state,{ikey,type,tagType,order,mainSaveText,copyType});
			
 
				+    const {handleConfirm,ikey,type,tagType,order,mainSaveText,copyType,value} = this.props;
			
 
				+    const params = Object.assign({},this.state,{ikey,type,tagType,order,mainSaveText,copyType,value});
			
 
				     handleConfirm&&handleConfirm(params);
			
 
				-	  this.btnClickFlag = true;
			
 
				+	this.btnClickFlag = true;
			
 
				     //点确定后隐藏弹窗
			
 
				     this.props.handleHide();
			
 
				   }
			
--- a/src/components/TemplateItems/TemplateItem/index.jsx
+++ b/src/components/TemplateItems/TemplateItem/index.jsx
@@ -74,7 +74,7 @@ class TemplateItem extends React.Component {
 
				                     isOpen: false
			
 
				                 });
			
 
				             });
			
 
				-            console.log($(this.content).parent().siblings().find('.content'))
			
 
				+            // console.log($(this.content).parent().siblings().find('.content'))
			
 
				             return;
			
 
				         }
			
 
				         $(this.content).slideDown(() => {
			
@@ -148,12 +148,9 @@ class TemplateItem extends React.Component {
 
				 
			
 
				     handleEditIconClick(e) {
			
 
				         e.stopPropagation();
			
 
				-        const text = $.trim($(`<div>${this.titleDOM.innerHTML}</div>`).text());
			
 
				-        this.props.handleTitleChange({
			
 
				-            id: this.props.id,
			
 
				-            text: text
			
 
				-        });
			
 
				-        return true;
			
 
				+        const text = this.titleDOM.innerHTML;
			
 
				+        let currId = this.props.id
			
 
				+        this.props.handleTitleChange(currId,text);
			
 
				     }
			
 
				 
			
 
				     recoverTitle() {
			
--- a/src/components/TreatDesc/index.jsx
+++ b/src/components/TreatDesc/index.jsx
@@ -37,7 +37,7 @@ class TreatDesc extends Component {
 
				                     
			
 
				                 </div> } */}
			
 
				                 { otherDrugIndex > -1 && <div  className={style['similar-drug']}>
			
 
				-                    <h3 className={style['drug-desc-title']}>同类药物  <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].drugsName})</span>  <img src={close} onClick={this.hideTreatDesc} className={style['close-drug-desc']} /></h3>
			
 
				                     {treatment[otherDrugIndex].medicitionsList.map((item, index) =>{
			
 
				                         return (<span   style={item.forbidden === '2' ? {opacity: '0.3', filter:'alpha(opacity=30)'} : ''}>
			
 
				                         {index === 0 ? '' : ', '}     
			
@@ -50,7 +50,7 @@ class TreatDesc extends Component {
 
				                             </span>
			
 
				                         </span>              
			
 
				                         
			
 
				-                        {/* {item.showInfo && item.showInfo==='1'&& <img className={style['info-img']} src={info} />} */}
			
 
				+                        {<img  onClick={() =>{setDrugInfo(item);showDrugInfo();}}  className={style['info-img']} src={info} />}
			
 
				                         {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={{border: '1px solid #000',marginLeft: '5px'}}>禁用</span> : ''}, 使用率{item.rate}
			
 
				                         
			
 
				                     </span>)
			
--- a/src/components/TreatDesc/index.less
+++ b/src/components/TreatDesc/index.less
@@ -68,3 +68,10 @@
 
				     border-radius: 4px;
			
 
				     text-align: center;
			
 
				 }
			
 
				+.drug-desc-class-title {
			
 
				+    display: inline-block;
			
 
				+    width: 210px;
			
 
				+    overflow: hidden;
			
 
				+    text-overflow: ellipsis;
			
 
				+    white-space: nowrap;
			
 
				+}
			
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -12,7 +12,7 @@ export default {
 
				       '1':'mainSuit',         //主诉
			
 
				       '2':'current',          //现病史
			
 
				       '3':'process',          //病程变化
			
 
				-      '4':'otherHis',         //其他史
			
 
				+      '4':'otherHisModel',         //其他史
			
 
				       // '5':'checkbody'        //查体
			
 
				       '5':'currentEmpty',        //现病史空模板
			
 
				       '6':'addSymptom'        //添加病情变化--主诉
			
--- a/src/containers/CurrentIll.js
+++ b/src/containers/CurrentIll.js
@@ -12,7 +12,7 @@ import {getModule} from '@store/async-actions/fetchModules.js';
 
				 import {didPushParamChange} from '@utils/tools.js';
			
 
				 
			
 
				 
			
 
				-function mapStateToProps(state) { 
			
 
				+function mapStateToProps(state) {//console.log(1,state);
			
 
				   const {homePage} = state;
			
 
				     return {
			
 
				         data:state.currentIll.data,//主诉模板
			
@@ -29,7 +29,6 @@ function mapStateToProps(state) {
 
				         moduleNum:state.mainSuit.moduleNum,//主诉使用的模板
			
 
				         type: state.typeConfig.typeConfig,
			
 
				         mainIds:state.mainSuit.mainIds,//主诉症状选中的id(去重用)
			
 
				-        mainSymptIds:state.mainSuit.mainSymptIds,//主诉症状选中的id(移植用)
			
 
				         fillInfo: state.fillInfo,
			
 
				         showArr:homePage.showDrop,
			
 
				         totalHide: homePage.totalHide,
			
--- a/src/containers/OtherHistory.js
+++ b/src/containers/OtherHistory.js
@@ -36,10 +36,11 @@ function mapDispatchToProps(dispatch,store){
 
				       //先获取最近记录，没有的话显示模板
			
 
				       dispatch((dispatch,getStore)=>{
			
 
				         const initData = getStore().homePage.initData;
			
 
				-        const arr = JSON.parse(JSON.stringify(initData.otherHis));
			
 
				+        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 isHis = initData.otherIsHis;
			
 
				-        const listObj = isHis?{newArr:arr,saveText:arrSave||[]}:fullfillText(arr);
			
 
				+        const listObj = isHis?{newArr:arr,saveText:arrSave||[]}:fullfillText(model);
			
 
				         dispatch({
			
 
				           type:SETDATA,
			
 
				           data:listObj.newArr,
			
--- a/src/containers/PushItemsContainer.js
+++ b/src/containers/PushItemsContainer.js
@@ -1,7 +1,7 @@
 
				 import React from 'react';
			
 
				 import {connect} from 'react-redux';
			
 
				 import PushItems from '../components/PushItems'
			
 
				-import {CHANGE_ASSAY, CHANGE_CHECK, ADD_BILLING} from '@store/types/pushMessage';
			
 
				+import {CHANGE_ASSAY, CHANGE_CHECK, ADD_BILLING, SHOW_TIPS_DETAILS, HIDE_TIPS_DETAILS} from '@store/types/pushMessage';
			
 
				 import { ADD_DIAGNOSTIC, GET_DIAGNOSTIC_STR } from '@store/types/diagnosticList';
			
 
				 import {billing, getTips, getTipsDetails} from '../store/async-actions/pushMessage';
			
 
				 import { isAddMainSuit } from '@store/async-actions/diagnosticList';
			
@@ -45,6 +45,16 @@ function mapDispatchToProps(dispatch) {
 
				         },
			
 
				         getTipsDetails: () => {
			
 
				             dispatch(getTipsDetails())
			
 
				+        },
			
 
				+        showTipsDetailsModal: () => {
			
 
				+            dispatch({
			
 
				+                type: SHOW_TIPS_DETAILS
			
 
				+            })
			
 
				+        },
			
 
				+        hideTipsDetailsModal: () => {
			
 
				+            dispatch({
			
 
				+                type: HIDE_TIPS_DETAILS
			
 
				+            })
			
 
				         }
			
 
				     }
			
 
				 }
			
--- a/src/containers/SpreadDrop.js
+++ b/src/containers/SpreadDrop.js
@@ -45,6 +45,10 @@ function mainSuitModule(dispatch,store,params){
 
				   let withsName = getNames(withs);
			
 
				   let banName = ban.name;
			
 
				   let text = filterArr(mainSaveText);
			
 
				+  if(text.length >= config.limited){
			
 
				+    Notify.info(config.limitText);
			
 
				+    return
			
 
				+  }
			
 
				   let names;
			
 
				   if(banName){
			
 
				     names = existsName + banName + withsName;
			
@@ -169,11 +173,11 @@ function handleModuleDiff(dispatch,store,params){
 
				   const {type,mainSaveText} = params;
			
 
				   switch (+type){
			
 
				     case 1:
			
 
				-      let text = filterArr(mainSaveText);
			
 
				+      /*let text = filterArr(mainSaveText);
			
 
				       if(text.length >= config.limited){
			
 
				         Notify.info(config.limitText);
			
 
				         return
			
 
				-      }
			
 
				+      }*/
			
 
				       mainSuitModule(dispatch,store,params);
			
 
				       break;
			
 
				     case 2:
			
@@ -194,10 +198,15 @@ function handleModuleDiff(dispatch,store,params){
 
				 
			
 
				 //主诉普通多选确定
			
 
				 function mainSuitCheck(dispatch,store,params){
			
 
				-  const {nones,exists,withs,order,mainSaveText} = params;
			
 
				+  const {nones,exists,withs,order,mainSaveText,value} = params;
			
 
				   let existsName = getNames(exists,order);
			
 
				   let text = filterArr(mainSaveText);
			
 
				-  let lengths = text.length + existsName.length;
			
 
				+  if(text.length >= config.limited){
			
 
				+    Notify.info(config.limitText);
			
 
				+    return
			
 
				+  }
			
 
				+  // let lengths = text.length + existsName.length;
			
 
				+  let lengths = value?(text.length - value.length + existsName.length):(text.length + existsName.length);
			
 
				   if(lengths > config.limited){
			
 
				     Notify.info(config.limitText);
			
 
				     return
			
@@ -253,11 +262,11 @@ function handleCheckBox(dispatch,store,params){
 
				   const {type,mainSaveText} = params;
			
 
				   switch (+type){
			
 
				     case 1:
			
 
				-      let text = filterArr(mainSaveText);
			
 
				+      /*let text = filterArr(mainSaveText);
			
 
				       if(text.length >= config.limited){
			
 
				         Notify.info(config.limitText);
			
 
				         return
			
 
				-      }
			
 
				+      }*/
			
 
				       mainSuitCheck(dispatch,store,params);
			
 
				       break;
			
 
				     case 2:
			
--- a/src/containers/TypeConfigContainer.js
+++ b/src/containers/TypeConfigContainer.js
@@ -8,6 +8,7 @@ import config from "@config/index";
 
				 import { initItemList } from '@store/async-actions/tabTemplate';
			
 
				 import { allCheckedShow } from '@store/actions/tabTemplate';
			
 
				 import {Notify} from '@commonComp';
			
 
				+import {SETOTHERHISTORY} from "../store/types/homePage";
			
 
				 
			
 
				 function mapStateToProps(state) {
			
 
				   return {
			
@@ -34,10 +35,17 @@ function mapDispatchToProps(dispatch) {
 
				       //保存模式切换结果
			
 
				       dispatch(saveMode(confirmType)).then((res)=>{
			
 
				         if(res.data.code=='0'&&res.data.data){
			
 
				+          //清空所有数据
			
 
				           pushAllDataList('','clear');
			
 
				           dispatch({type: CONFIRM_TYPE, confirmType});
			
 
				-          //清空所有数据
			
 
				-          dispatch(getOtherHisRecord());          //获取其他史最近记录
			
 
				+          //切换模式是要重新获取其他史数据
			
 
				+          dispatch({
			
 
				+            type:SETOTHERHISTORY,
			
 
				+            data:[],
			
 
				+            save:[],
			
 
				+            otherIsHis:false
			
 
				+          });
			
 
				+          dispatch(getOtherHisRecord());        //获取其他史最近记录
			
 
				           Notify.success("模式切换成功");
			
 
				           dispatch(initItemList(confirmType));
			
 
				           dispatch(allCheckedShow(false))    //全选反选显示重置
			
--- a/src/store/actions/checkBody.js
+++ b/src/store/actions/checkBody.js
@@ -240,7 +240,7 @@ export function setInputLabel(state,action){
 
				   if(+item.tagType===3){      //multSpred标签
			
 
				     item.questionMapping[subIndex].value = text;
			
 
				     let texts = item.questionMapping.map((it)=>{
			
 
				-      return it.value?(it.labelPrefix||'')+(it.value||'')+(it.labelSuffix||''):'';
			
 
				+      return (it.labelPrefix||'')+(it.value||'')+(it.labelSuffix||'');
			
 
				     });
			
 
				     res.saveText[i] = texts.join('');
			
 
				     res.update = Math.random();
			
--- a/src/store/actions/currentIll.js
+++ b/src/store/actions/currentIll.js
@@ -385,13 +385,17 @@ export function setRadioValue(state,action){
 
				 //双击标签输入改变值
			
 
				 export const changeLabelVal = (state,action)=>{
			
 
				   const res = Object.assign({},state);
			
 
				-  const index = action.data.ikey;
			
 
				-  const newVal = action.data.changeVal;
			
 
				+  const {changeVal,totalVal,ikey,prefix,suffix} = action.data;
			
 
				+  const index = ikey;
			
 
				+  const newVal = changeVal;
			
 
				+  let labText = totalVal?totalVal:newVal;
			
 
				   let item = res.data[index];
			
 
				-  if(newVal.trim()){
			
 
				+  if(labText.trim()){
			
 
				     if(item){
			
 
				       item.value = newVal;
			
 
				-      res.saveText[index] = newVal;
			
 
				+      item.labelPrefix = prefix||'';
			
 
				+      item.labelSuffix = suffix||'';
			
 
				+      res.saveText[index] = labText;
			
 
				     }
			
 
				   }else{//删除完标签内容则删除该标签
			
 
				     res.data.splice(index,1);
			
@@ -404,13 +408,22 @@ export const changeLabelVal = (state,action)=>{
 
				 // 数字键盘较特殊，有直接输入
			
 
				 export const changeNumLabelVal = (state,action)=>{
			
 
				   const res = Object.assign({},state);
			
 
				-  const index = action.data.ikey;
			
 
				-  const newVal = action.data.changeVal;
			
 
				+  const {changeVal,totalVal,ikey,prefix,suffix} = action.data;
			
 
				+  const index = ikey;
			
 
				+  const newVal = changeVal;
			
 
				   let item = res.data[index];
			
 
				-  if(item){
			
 
				-    item.value = newVal;
			
 
				+  let labText = totalVal?totalVal:newVal;   //如单选没有前后缀
			
 
				+  if(labText.trim()){
			
 
				+    if(item){
			
 
				+      item.value = newVal;
			
 
				+      item.labelPrefix = prefix||'';
			
 
				+      item.labelSuffix = suffix||'';
			
 
				+    }
			
 
				+    res.saveText[index] = labText;
			
 
				+  }else{//删除完标签内容则删除该标签
			
 
				+    res.data.splice(index,1);
			
 
				+    res.saveText = fullfillText(res.data).saveText;
			
 
				   }
			
 
				-  res.saveText[index] = newVal;
			
 
				   res.update = Math.random();
			
 
				   return res;
			
 
				 }
			
@@ -603,9 +616,14 @@ export function removeId(state,action){
 
				   if(ids.includes(id)){
			
 
				     ids.splice(ids.indexOf(id),1);
			
 
				   }
			
 
				-  data[index].id = "";
			
 
				-  data[index].name = text;
			
 
				-  data[index].value = text;
			
 
				+  if(!data[index].value && data[index-1].tagType==8){
			
 
				+    data.splice(index,1);
			
 
				+  }else{
			
 
				+    data[index].id = "";
			
 
				+    data[index].name = text;
			
 
				+    data[index].value = text;
			
 
				+  }
			
 
				+  
			
 
				   res.update = Math.random();
			
 
				   return res;
			
 
				 }
			
--- a/src/store/actions/diagnosticList.js
+++ b/src/store/actions/diagnosticList.js
@@ -7,7 +7,6 @@ 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.id);
			
 
				-    console.log('del',state,action.id)
			
 
				     return res;
			
 
				 }
			
 
				 
			
--- a/src/store/actions/mainSuit.js
+++ b/src/store/actions/mainSuit.js
@@ -110,7 +110,6 @@ export const insertMain = (state,action) => {
 
				   // res.saveText[inserIndx] = text.name;
			
 
				   res.saveText = fullfillText(res.data).saveText;
			
 
				   res.mainIds.push(id);
			
 
				-  res.mainSymptIds.push(id);
			
 
				   res.editClear = false;//主诉框编辑状态
			
 
				   res.update=Math.random();
			
 
				   return res;
			
@@ -136,7 +135,6 @@ export const confirm = (state,action) =>{
 
				     let existsId = getIds(exists);
			
 
				     let withsId = getIds(withs);
			
 
				     res.mainIds = res.mainIds?res.mainIds.concat(existsId,withsId):[];
			
 
				-    res.mainSymptIds = res.mainSymptIds.concat(existsId,withsId);
			
 
				   }
			
 
				 
			
 
				   // 第二病程-伴位置处理
			
@@ -298,7 +296,6 @@ export const insertSearch = (state,action)=>{
 
				     // res.saveText[inserIndx] = searchData;
			
 
				     res.saveText = fullfillText(res.data).saveText;
			
 
				     res.mainIds.push(id);
			
 
				-    res.mainSymptIds.push(id);
			
 
				     res.editClear = false;//主诉框编辑状态
			
 
				   }else{
			
 
				     // 替换
			
@@ -518,7 +515,6 @@ export const clearMainSuit = (state,action)=>{//回读和清除
 
				   // res.saveText = fullfillText(action.data).saveText;//解决删除data里的值保存，回读后页面上有内容saveText里没有的情况
			
 
				   res.selecteds = action.selecteds?action.selecteds:[];
			
 
				   res.mainIds = action.mainIds;
			
 
				-  res.mainSymptIds = action.mainSymptIds;
			
 
				   if(action.editClear){
			
 
				     res.editClear = action.editClear;
			
 
				   }
			
@@ -611,16 +607,16 @@ export function removeId(state,action){
 
				   const data = res.data;
			
 
				   const id = data[index].id;
			
 
				   let ids = res.mainIds;
			
 
				-  let mainIds = res.mainSymptIds;
			
 
				   if(ids.includes(id)){
			
 
				     ids.splice(ids.indexOf(id),1);
			
 
				   }
			
 
				-  if(mainIds.includes(id)){
			
 
				-    mainIds.splice(mainIds.indexOf(id),1);
			
 
				+  if(!data[index].value && data[index-1].tagType==8){
			
 
				+    data.splice(index,1);
			
 
				+  }else{
			
 
				+    data[index].id = "";
			
 
				+    data[index].name = text;
			
 
				+    data[index].value = text;
			
 
				   }
			
 
				-  data[index].id = "";
			
 
				-  data[index].name = text;
			
 
				-  data[index].value = text;
			
 
				   res.update = Math.random();
			
 
				   return res;
			
 
				 }
			
--- a/src/store/actions/print.js
+++ b/src/store/actions/print.js
@@ -30,7 +30,6 @@ export const saveMessage=(state,action)=>{
 
				 
			
 
				 export const diagShow=(state,action)=>{
			
 
				   const res=Object.assign({},state);
			
 
				-  console.log(action)
			
 
				   res.diagShow = action.data
			
 
				   return res;
			
 
				 };
			
--- a/src/store/actions/pushMessage.js
+++ b/src/store/actions/pushMessage.js
@@ -129,12 +129,20 @@ export const addScheme = (state, action) => {
 
				   return res;
			
 
				 }
			
 
				 
			
 
				+//设置提示信息
			
 
				 export const setTips = (state, action) => {
			
 
				   const res = Object.assign({}, state)
			
 
				   res.tips = action.tips;
			
 
				   return res;
			
 
				 }
			
 
				 
			
 
				+//设置提示信息详情页
			
 
				+export const setTipsDetails = (state, action) => {
			
 
				+  const res = Object.assign({}, state)
			
 
				+  res.tipsDetails = action.tipsDetails;
			
 
				+  return res;
			
 
				+}
			
 
				+
			
 
				 export const setChangeAdviceTreatment = (state, action) => {
			
 
				 	const res = JSON.parse(JSON.stringify(state))
			
 
				 	const index = action.index; //诊断的下标
			
@@ -198,8 +206,27 @@ export const addBilling = (state, action) => {
 
				 	return res;
			
 
				 }
			
 
				 export const clearAllPushMessage = (state, action) => {
			
 
				-    const res = JSON.parse(JSON.stringify(state));
			
 
				-	res.advice = action.data
			
 
				-	res.AdviceStr = action.saveText
			
 
				+	const res = JSON.parse(JSON.stringify(state));
			
 
				+	res.advice = action.data;
			
 
				+	res.AdviceStr = action.saveText;
			
 
				+	res.tips = {};
			
 
				+	res.vigilant = [];
			
 
				+	res.doubt = [];
			
 
				+	res.possible = [];
			
 
				+	res.determine = [];
			
 
				+	res.assay = [];
			
 
				+	res.check = [];
			
 
				+	return res;
			
 
				+}
			
 
				+
			
 
				+export const showTipsDetails = (state, action) => {
			
 
				+	const res = Object.assign({}, state);
			
 
				+	res.showTipsDetails = true;
			
 
				+	return res;
			
 
				+}
			
 
				+
			
 
				+export const hideTipsDetails = (state, action) => {
			
 
				+	const res = Object.assign({}, state);
			
 
				+	res.showTipsDetails = false;
			
 
				 	return res;
			
 
				 }
			
--- a/src/store/async-actions/homePage.js
+++ b/src/store/async-actions/homePage.js
@@ -56,7 +56,7 @@ export const getInitModules= (dispatch,getStore)=>{
 
				           emptyData:initData.currentEmpty,//现病史空模板
			
 
				           saveEmpty:initSaveText.currentEmpty,
			
 
				         });
			
 
				-        dispatch(getOtherHisRecord());          //获取其他史最近记录
			
 
				+        dispatch(getOtherHisRecord());        //获取其他史最近记录
			
 
				         initHis(dispatch)
			
 
				       }else{
			
 
				         initHis(dispatch)
			
--- a/src/store/async-actions/patInfo.js
+++ b/src/store/async-actions/patInfo.js
@@ -95,8 +95,8 @@ export const getPatientMessage = (dispatch, getState) => {
 
				         confirmType:data1.modeValue
			
 
				       });
			
 
				       dispatch(getInitModules);     //确保病人信息获取以后再获取模板等数据，否则参数为空
			
 
				-      if(state.tabTemplate.items.length == 0){
			
 
				-        dispatch(initItemList(data1.modeValue));        //模板列表没有就获取模板列表用于保存时做数据对比是否保存过
			
 
				-      }
			
 
				+      // if(state.tabTemplate.items.length == 0){
			
 
				+      //   dispatch(initItemList(data1.modeValue));        //模板列表没有就获取模板列表用于保存时做数据对比是否保存过
			
 
				+      // }
			
 
				     })
			
 
				 };
			
--- a/src/store/async-actions/pushMessage.js
+++ b/src/store/async-actions/pushMessage.js
@@ -1,5 +1,5 @@
 
				 import { get, post, json } from "@utils/ajax";
			
 
				-import { BILLING_ADVICE, SET_TIPS } from '../types/pushMessage';
			
 
				+import { BILLING_ADVICE, SET_TIPS, SET_TIPS_DETAILS } from '../types/pushMessage';
			
 
				 import { SET_CLICK_DIAG } from '../types/diagnosticList';
			
 
				 import {storageLocal,getEMRParams} from '@utils/tools';
			
 
				 
			
@@ -96,6 +96,26 @@ export const getTips = (diagItem) =>{
 
				 export const getTipsDetails = () => {
			
 
				     return(dispatch, getState) => {
			
 
				         const state = getState();
			
 
				-        window.open(`/static/pages/information.html?type=7&&questionId=${state.diagnosticList.clickDiag.id}`);
			
 
				+        // 诊断指南新窗口展示
			
 
				+        // window.open(`/static/pages/information.html?type=7&&questionId=${state.diagnosticList.clickDiag.id}`);
			
 
				+
			
 
				+        //弹窗显示
			
 
				+        const url ='/api/icss/introduceInfo/getByQuestionId'
			
 
				+        const imageUrlPrefix = 'http://192.168.2.241:82'
			
 
				+        
			
 
				+        const params = {
			
 
				+            type: 7,
			
 
				+            questionId: state.diagnosticList.clickDiag.id,
			
 
				+            position:2
			
 
				+        }
			
 
				+        json(url, params)
			
 
				+        .then((data)=>{
			
 
				+                dispatch({
			
 
				+                    type: SET_TIPS_DETAILS,
			
 
				+                    tipsDetails: data.data.data
			
 
				+                })
			
 
				+        }).catch((e) => {
			
 
				+            console.log(e)
			
 
				+        })
			
 
				     }
			
 
				 }
			
--- a/src/store/reducers/assistCheck.js
+++ b/src/store/reducers/assistCheck.js
@@ -39,7 +39,7 @@ export default (state = initSearchList, action) => {
 
				             }
			
 
				         }
			
 
				         for (let j = 0; j < tempArrs.length; j++) {
			
 
				-            tmpString += (tempArrs[j].name+(tempArrs[j].value?(':'+tempArrs[j].value):'')+(tempArrs[j].time?'，报告日期:'+tempArrs[j].time:'')+';')
			
 
				+            tmpString += (tempArrs[j].name+(tempArrs[j].value?(':'+tempArrs[j].value):'')+(tempArrs[j].time?', 报告日期:'+tempArrs[j].time:'')+';')
			
 
				         }
			
 
				         newState.dataString = tmpString
			
 
				         return newState;
			
@@ -54,7 +54,7 @@ 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:'')+';')
			
 
				+            tmpString += (tempArr[i].name+(tempArr[i].value?(':'+tempArr[i].value):'')+(tempArr[i].time?', 报告日期:'+tempArr[i].time:'')+';')
			
 
				         }
			
 
				         newState.assistLabel = [...tempArr]
			
 
				         newState.dataString = tmpString
			
@@ -69,7 +69,7 @@ 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:'')+';')
			
 
				+            tmpString += (tempArr[i].name+(tempArr[i].value?(':'+tempArr[i].value):'')+(tempArr[i].time?', 报告日期:'+tempArr[i].time:'')+';')
			
 
				         }
			
 
				         newState.dataString = tmpString
			
 
				         return newState;
			
@@ -83,7 +83,7 @@ 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:'')+';')
			
 
				+            tmpString += (tempArr[i].name+(tempArr[i].value?(':'+tempArr[i].value):'')+(tempArr[i].time?', 报告日期:'+tempArr[i].time:'')+';')
			
 
				         }
			
 
				         newState.dataString = tmpString
			
 
				         return newState;
			
--- a/src/store/reducers/homePage.js
+++ b/src/store/reducers/homePage.js
@@ -44,7 +44,7 @@ export default function (state=initState,action) {
 
				     case SETOTHERHISTORY:
			
 
				       res.initData.otherHis = action.data;
			
 
				       res.initData.otherHisSave = action.save;
			
 
				-      res.initData.otherIsHis = true;
			
 
				+      res.initData.otherIsHis = action.otherIsHis!=undefined?action.otherIsHis:true;
			
 
				       return res;
			
 
				     /*case SETTEXTFOCUS:
			
 
				       res.focusTextIndex = action.index;
			
--- a/src/store/reducers/mainSuit.js
+++ b/src/store/reducers/mainSuit.js
@@ -20,7 +20,6 @@ const initState = {
 
				   focusIndex:'',
			
 
				   mainIds:[], //选中的主症状和伴随的id(搜索去重)
			
 
				   editClear:true,
			
 
				-  mainSymptIds:[]//选中的主症状和伴随的id(移植到现病史)
			
 
				 }
			
 
				 
			
 
				 export default function(state=initState,action){
			
--- 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_CHANGE_ADVICE_TREATMENT, SET_CHANGE_ADVICE_ASSAY, SET_CHANGE_ADVICE_CHECK, ADD_BILLING,CLEAR_ALL_PUSH_MESSAGE } from '../types/pushMessage';
			
 
				-import {changeAssay, changeCheck, setAdvice, addScheme, setTips, setChangeAdviceTreatment, setChangeAdviceAssay, setChangeAdviceCheck, addBilling,clearAllPushMessage } 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 } from '../types/pushMessage';
			
 
				+import {changeAssay, changeCheck, setAdvice, addScheme, setTips, setTipsDetails, setChangeAdviceTreatment, setChangeAdviceAssay, setChangeAdviceCheck, addBilling, clearAllPushMessage, showTipsDetails, hideTipsDetails } from '../actions/pushMessage';
			
 
				 
			
 
				 const initState = {
			
 
				   vigilant: [],
			
@@ -32,6 +32,8 @@ export default function(state = initState, action) {
 
				       return addScheme(state, action);
			
 
				     case SET_TIPS: 
			
 
				       return setTips(state, action);
			
 
				+    case SET_TIPS_DETAILS:
			
 
				+      return setTipsDetails(state,action)
			
 
				     case SET_CHANGE_ADVICE_TREATMENT:
			
 
				       return setChangeAdviceTreatment(state, action);
			
 
				     case SET_CHANGE_ADVICE_ASSAY: 
			
@@ -42,6 +44,10 @@ export default function(state = initState, action) {
 
				       return addBilling(state, action);
			
 
				     case CLEAR_ALL_PUSH_MESSAGE: 
			
 
				       return clearAllPushMessage(state, action);
			
 
				+    case SHOW_TIPS_DETAILS: 
			
 
				+      return showTipsDetails(state, action);
			
 
				+    case HIDE_TIPS_DETAILS:
			
 
				+      return hideTipsDetails(state, action);
			
 
				     default:
			
 
				       return state;
			
 
				   }
			
--- a/src/store/types/pushMessage.js
+++ b/src/store/types/pushMessage.js
@@ -5,10 +5,13 @@ export const ADD_ASSAY = 'ADD_ASSAY'; //添加化验；
 
				 export const ADD_CHECK = 'ADD_CHECK'; //添加辅检；
			
 
				 export const ADD_SCHEME = 'ADD_SCHEME'; //添加治疗方案；
			
 
				 export const SET_TIPS = 'SET_TIPS'; //设置提示信息；
			
 
				+export const SET_TIPS_DETAILS = 'SET_TIPS_DETAILS'; //设置提示信息详情页内容；
			
 
				 export const SET_CHANGE_ADVICE_TREATMENT = 'SET_CHANGE_ADVICE_TREATMENT'//改变医嘱的文字内容；
			
 
				 export const ADD_BILLING = 'ADD_BILLIND'; //添加开单项
			
 
				 export const SET_CHANGE_ADVICE_ASSAY = 'SET_CHANGE_ADVICE_ASSAY';   //改变医嘱部分辅检的文字内容
			
 
				 export const SET_CHANGE_ADVICE_CHECK = 'SET_CHANGE_ADVICE_CHECK';   //改变医嘱部分化验的文字内容
			
 
				-export const CLEAR_ALL_PUSH_MESSAGE = 'CLEAR_ALL_PUSH_MESSAGE';   //改变医嘱部分化验的文字内容
			
 
				+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'; //显示提示详情页
			
 
				 
			
 
				 
			
--- a/src/utils/tools.js
+++ b/src/utils/tools.js
@@ -177,7 +177,6 @@ const getAllDataList =(baseList) =>{           //获取所有模块结构化的
 
				     jsonData.checkBodySelecteds = baseList.checkBody.selecteds;      //主诉选中状态保存
			
 
				     jsonData.addItems = baseList.homePage.addItems||{};
			
 
				     jsonData.mainsuitIds = baseList.mainSuit.mainIds;      //主诉去重
			
 
				-    jsonData.mainSymptIds = baseList.mainSuit.mainSymptIds;      //主诉去重
			
 
				     jsonData.currentIds = baseList.currentIll.symptomIds;      //现病史去重
			
 
				     // console.log(jsonData,'结构化数据获取')
			
 
				     return jsonData;
			
@@ -218,7 +217,7 @@ const getAllDataStringList =(baseList) =>{           //获取所有模块文本
 
				       'diag' : baseList.diagnosticList.diagnosticStr,
			
 
				       'advice' : baseList.pushMessage.AdviceStr
			
 
				     }
			
 
				-    // console.log(jsonDataString,'文本模式数据获取')
			
 
				+    //console.log(jsonDataString,'文本模式数据获取')
			
 
				     return jsonDataString;
			
 
				 }
			
 
				 /**
			
@@ -229,11 +228,8 @@ const getAllDataStringList =(baseList) =>{           //获取所有模块文本
 
				  * @param {引用的话是保存时候的文本类型，编辑的时候是当前页面设置的文本类型} whichSign 
			
 
				  */
			
 
				 const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清空所有的数据
			
 
				-      store.dispatch({
			
 
				-        type:ISREAD
			
 
				-      });
			
 
				     if(action == 'clear'){     //清空
			
 
				-        store.dispatch({type: CLEAR_MAIN_SUIT,data:[],saveText:[],selecteds:[],editClear:true,mainIds:[],mainSymptIds:[]});
			
 
				+        store.dispatch({type: CLEAR_MAIN_SUIT,data:[],saveText:[],selecteds:[],editClear:true,mainIds:[]});
			
 
				         store.dispatch({type: CLEAR_CURRENT_ILL,data:[],saveText:[],selecteds:[],editClear:true,symptomIds:[]});
			
 
				         store.dispatch({type: CLEAROTHERHISTORY,data:[],saveText:[],selecteds:[],editClear:true});
			
 
				         store.dispatch({type: CLEARCHECKBODY,data:[],isEmpty:true,saveText:[],selecteds:[]});
			
@@ -253,6 +249,7 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
 
				             type: CLEAR_ALL_PUSH_MESSAGE,
			
 
				             data:{}
			
 
				         });
			
 
				+        storageLocal.remove('emrParam');
			
 
				        // Notify.success('页面已清空')
			
 
				     }else{
			
 
				         if (whichSign == 0) {
			
@@ -266,7 +263,6 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
 
				                     selecteds:dataJson.mainSuitSelecteds?dataJson.mainSuitSelecteds:[],
			
 
				                     saveText:JSON.parse(dataJsonStr.chief),
			
 
				                     mainIds:dataJson.mainsuitIds?dataJson.mainsuitIds:[],
			
 
				-                    mainSymptIds:dataJson.mainSymptIds?dataJson.mainSymptIds:[],
			
 
				                 });
			
 
				                 store.dispatch({
			
 
				                     type: CLEAR_CURRENT_ILL,
			
@@ -320,7 +316,6 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
 
				                     selecteds:dataJson.mainSuitSelecteds?dataJson.mainSuitSelecteds:[],
			
 
				                     saveText:dataJsonStr[0].content ? JSON.parse(dataJsonStr[0].content) :[],
			
 
				                     mainIds:dataJson.mainsuitIds?dataJson.mainsuitIds:[],
			
 
				-                    mainSymptIds:dataJson.mainSymptIds?dataJson.mainSymptIds:[],
			
 
				                 });
			
 
				                 store.dispatch({
			
 
				                     type: CLEAR_CURRENT_ILL,
			
@@ -466,7 +461,10 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
 
				               });
			
 
				             }
			
 
				         }
			
 
				-    }  
			
 
				+    }
			
 
				+  store.dispatch({
			
 
				+    type:ISREAD
			
 
				+  });
			
 
				 }
			
 
				 
			
 
				 function filterArr(arr){
			
@@ -572,7 +570,48 @@ function didPushParamChange(){
 
				   }
			
 
				   return true;
			
 
				 }
			
 
				-
			
 
				+//判断页面所有数据是否为空
			
 
				+function isAllClear(jsonData,jsonStr){
			
 
				+  if (      //结构化和文本数据都为空
			
 
				+    JSON.stringify(jsonData.advice) == '{}' &&
			
 
				+    jsonData.chief.length < 1 &&
			
 
				+    jsonData.present.length < 1 &&
			
 
				+    jsonData.other.length < 1 &&
			
 
				+    jsonData.vital.length < 1 &&
			
 
				+    jsonData.diag.length < 1 &&
			
 
				+    jsonData.pacs.length < 1 &&
			
 
				+    jsonData.lis.labelList.length < 1 &&
			
 
				+    jsonData.lis.getExcelDataList.length < 1 &&
			
 
				+    JSON.stringify(jsonData.advice) == '{}' &&
			
 
				+    filterArr(JSON.parse(jsonStr.chief)) == '' &&
			
 
				+    filterArr(JSON.parse(jsonStr.present)) == '' &&
			
 
				+    filterArr(JSON.parse(jsonStr.other)) == '' &&
			
 
				+    filterArr(JSON.parse(jsonStr.vital)) == '' &&
			
 
				+    jsonData.diag.length < 1 &&
			
 
				+    jsonData.pacs.length < 1 &&
			
 
				+    jsonData.lis.labelList.length < 1 &&
			
 
				+    jsonData.lis.getExcelDataList.length < 1
			
 
				+  ) {
			
 
				+    return false;
			
 
				+  }else{
			
 
				+    return true;
			
 
				+  }
			
 
				+}
			
 
				+function normalVal(min,max){
			
 
				+  if((min-0) && (max-0)){
			
 
				+      return `正常值: (${min}~${max})`
			
 
				+  }else if((min-0) && !(max-0)){
			
 
				+      return `正常值: (>=${min})`
			
 
				+  }else if(!(min-0) && (max-0)){
			
 
				+      if(min == '' || min == null){
			
 
				+          return `正常值: (<=${max})`
			
 
				+      }else{
			
 
				+          return `正常值: (${min}~${max})`
			
 
				+      }
			
 
				+  }else{
			
 
				+      return null;
			
 
				+  }
			
 
				+}
			
 
				 module.exports = {
			
 
				     checkType: Type.checkType,
			
 
				     regexp,
			
@@ -594,5 +633,7 @@ module.exports = {
 
				     handleEnter,
			
 
				     didPushParamChange,
			
 
				     getEMRParams,
			
 
				-    windowEventHandler
			
 
				+    windowEventHandler,
			
 
				+    isAllClear,
			
 
				+    normalVal
			
 
				 };