6 年前 · 282206dc7e
--- a/src/common/less/variables.less
+++ b/src/common/less/variables.less
@@ -44,6 +44,7 @@
 
				 @dropdwon-long-width:600px;
			
 
				 @dropdwon-height:200px;
			
 
				 @selected-bg:#fff;
			
 
				+@import-color:#ffad5f;
			
 
				 
			
 
				 /*********推送内容容器宽度*************/
			
 
				 @push-width: 450px;
			
@@ -177,4 +178,9 @@
 
				   border:2px @blue solid;
			
 
				   border-radius: 2px;
			
 
				   /*box-shadow: 0px 0px 2px @blue;*/
			
 
				+}
			
 
				+
			
 
				+.orange-border{
			
 
				+  border:1px solid @import-color;
			
 
				+  //color: @import-color!important;
			
 
				 }
			
--- a/src/components/AddInspect/SlideExcel/index.jsx
+++ b/src/components/AddInspect/SlideExcel/index.jsx
@@ -38,17 +38,16 @@ class SlideExcel extends Component {
 
				           <span className={styles.excelDataTitle}>
			
 
				               <span className={styles.tagSpan}>
			
 
				                 {item.menus}
			
 
				-                <span className={styles.imgInfo} onClick={()=>getInfomation('',item.lisExcelItem[0].uniquemealName)}></span>
			
 
				+                <span className={styles.imgInfo} onClick={()=>getInfomation('',item.lisExcelItem[0].uniquemealName || '','excel')}></span>
			
 
				               </span>
			
 
				           </span>
			
 
				           <table className={styles.table}>
			
 
				              {  show ? (item.lisExcelItem && item.lisExcelItem.map((value,idx)=>{
			
 
				-                console.log(value,788778)
			
 
				                   return <tr>
			
 
				                       <td style={{width:'30%'}}>
			
 
				                         <span className={styles.tagSpan}>
			
 
				                           {value.itemName}
			
 
				-                          <span className={styles.imgInfo} onClick={()=>getInfomation('',value.uniqueName || '')}></span>
			
 
				+                          <span className={styles.imgInfo} onClick={()=>getInfomation('',value.uniqueName || '','excel')}></span>
			
 
				                         </span>
			
 
				                       </td>
			
 
				                       <td style={{width:'20%'}}><span className={value.type == 1?'red':null}>{value.value}</span> {value.unit}</td>
			
@@ -63,7 +62,7 @@ class SlideExcel extends Component {
 
				                         <td style={{width:'30%'}}>
			
 
				                           <span className={styles.tagSpan}>
			
 
				                             {value.itemName}
			
 
				-                            <span className={styles.imgInfo} onClick={()=>getInfomation('',value.uniqueName || '')}></span>
			
 
				+                            <span className={styles.imgInfo} onClick={()=>getInfomation('',value.uniqueName || '','excel')}></span>
			
 
				                           </span>
			
 
				                         </td>
			
 
				                         <td style={{width:'20%'}}><span className={value.type == 1?'red':null}>{value.value}</span> {value.unit}</td>
			
--- a/src/components/CheckBody/index.jsx
+++ b/src/components/CheckBody/index.jsx
@@ -30,7 +30,7 @@ class CheckBody extends Component{
 
				     this.setState({boxLeft:nextProps.boxLeft})
			
 
				   }
			
 
				   getLabels(){
			
 
				-    const {data,showArr,saveText,selecteds} = this.props;
			
 
				+    const {data,showArr,saveText,selecteds,importLabel} = this.props;
			
 
				     let arr = [],list=[];//console.log(data,saveText)
			
 
				     const {boxMark,showAll} = this.state;
			
 
				     let showArray = data.filter((it)=>{
			
@@ -41,7 +41,7 @@ class CheckBody extends Component{
 
				     if(showData){
			
 
				       list = showData;
			
 
				       arr = list.map((it,i)=>{
			
 
				-        return chooseType({item:it,boxMark,i,showArr,saveText,selecteds});
			
 
				+        return chooseType({item:it,boxMark,i,showArr,saveText,selecteds,importLabel});
			
 
				       });
			
 
				     }
			
 
				     return arr;
			
--- a/src/components/DiagnosticList/index.jsx
+++ b/src/components/DiagnosticList/index.jsx
@@ -7,6 +7,7 @@ import {ConfirmModal, Message} from '@commonComp';
 
				 import Notify from '@commonComp/Notify';
			
 
				 import Treat from '@containers/Treat'
			
 
				 import store from '@store';
			
 
				+import { initItemList } from '@store/async-actions/historyTemplates';
			
 
				 import { pushAllDataList } from '@utils/tools';
			
 
				 import iconRadioDefault from '@common/images/icon-radio-default.png'
			
 
				 import iconRadioActive from '@common/images/icon-radio-active.png'
			
@@ -89,6 +90,7 @@ class DiagnosticList extends Component {
 
				         const { hideReferRecord, showHistoryCaseModal } = this.props
			
 
				         hideReferRecord && hideReferRecord()
			
 
				         showHistoryCaseModal && showHistoryCaseModal()
			
 
				+        store.dispatch(initItemList());
			
 
				 
			
 
				     }
			
 
				     noReferRecord() {
			
--- a/src/components/MultSpread/index.jsx
+++ b/src/components/MultSpread/index.jsx
@@ -33,12 +33,13 @@ class MultSpread extends Component{
 
				     this.handleEdit = this.handleEdit.bind(this);
			
 
				   }
			
 
				   getClass(){
			
 
				-    const {saveText,ikey,showAdd} = this.props;
			
 
				+    const {saveText,ikey,showAdd,isImports} = this.props;
			
 
				     const labelInx = ikey.substr(1);
			
 
				     const text = saveText&&saveText[+labelInx];
			
 
				+    const orgBorder = isImports&&!text?style['orange-border']:'';
			
 
				     const isSelected = text?style['selected']:style['container'];
			
 
				     const hasAdd = showAdd?style['add']:'';
			
 
				-    return classNames(isSelected,hasAdd);
			
 
				+    return classNames(isSelected,hasAdd,orgBorder);
			
 
				   }
			
 
				   getLabels(){
			
 
				     const {data,ikey,showArr,copyId,selecteds,boxMark} = this.props;
			
--- a/src/components/NumberDrop/index.jsx
+++ b/src/components/NumberDrop/index.jsx
@@ -180,13 +180,14 @@ class NumberDrop extends Component{
 
				     }
			
 
				   }
			
 
				   getClasses(){         //整个标签是否有值的状态
			
 
				-    const {hideTag,placeholder,value} = this.props;
			
 
				+    const {hideTag,placeholder,value,isImports} = this.props;
			
 
				     const $span = this.$span.current;
			
 
				     const val = value;//$span&&$span.innerText.trim()||value;
			
 
				     const blueBorder = this.state.editable?style['blue-border']:'';
			
 
				     const isSelected = val&&val!=placeholder?style['selected']:style['container'];
			
 
				+    const orgBorder = isImports&&!(val&&val!=placeholder)?style['orange-border']:'';
			
 
				     const noTag = hideTag?style['no-tag']:'';
			
 
				-    return className(isSelected,noTag,blueBorder);
			
 
				+    return className(isSelected,noTag,blueBorder,orgBorder);
			
 
				   }
			
 
				   changeToEdit(e){        //整个标签双击编辑状态
			
 
				     const {value,id,handleDbclick,patId,handleHide,show} = this.props;
			
--- a/src/components/PreviewBody/index.jsx
+++ b/src/components/PreviewBody/index.jsx
@@ -3,7 +3,7 @@ import style from "./index.less";
 
				 import { normalVal, filterDataArr, filterOtherDataArr,timestampToTime } from '@utils/tools';
			
 
				 import Notify from '@commonComp/Notify';
			
 
				 import $ from "jquery";
			
 
				-import { relative } from "path";
			
 
				+import arrow from '@common/images/icon_tri_blue.png';
			
 
				 
			
 
				 (function ($) {
			
 
				   var opt;
			
@@ -145,43 +145,44 @@ class PreviewBody extends Component {
 
				   render() {
			
 
				     const { show, preInfo, dataJson, dataStr, baseObj, flg } = this.props;
			
 
				     const other_yjs = filterOtherDataArr(JSON.parse(dataStr.other),dataJson.other);
			
 
				+    const noData = JSON.stringify(preInfo) == '{}';
			
 
				     return <div className={style['content']} style={{ width: flg ? '700' : '820' }}>
			
 
				       <div className={style['contents']} id="content" style={{ margin: "0 auto", maxWidth: "600px" }}>
			
 
				         <div ref={this.$content} style={{ clear: 'both', fontSize: '24px', margin: '0px 0px 30px 0px', textAlign: 'center' }}>{preInfo.hospitalName}</div>
			
 
				-        <table className={style['patInfo']} style={{ margin: '0px 0px 30px 0px', borderCollapse: 'collapse', width: "100%" }}>
			
 
				+        <table className={style['patInfo']}>
			
 
				           <tr>
			
 
				-            <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '31%', fontSize: "14px" }}>卡号：{baseObj ? baseObj.patientIdNo : JSON.stringify(preInfo) == '{}' ? '' : preInfo.patientIdNo}</td>
			
 
				-            <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '23%', fontSize: "14px" }}>姓名：{baseObj ? baseObj.patientName : JSON.stringify(preInfo) == '{}' ? '' : preInfo.patientName}</td>
			
 
				-            <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '23%', fontSize: "14px" }}>年龄：{baseObj ? baseObj.patientAge : JSON.stringify(preInfo) == '{}' ? '' : preInfo.patientAge}</td>
			
 
				-            <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '23%', fontSize: "14px" }}>性别：{baseObj ? baseObj.patientSex : JSON.stringify(preInfo) == '{}' ? '' : preInfo.patientSex}</td>
			
 
				+            <td>卡号：{baseObj ? baseObj.patientIdNo : noData ? '' : preInfo.patientIdNo}</td>
			
 
				+            <td>姓名：{baseObj ? baseObj.patientName : noData ? '' : preInfo.patientName}</td>
			
 
				+            <td>年龄：{baseObj ? baseObj.patientAge : noData ? '' : preInfo.patientAge}</td>
			
 
				+            <td>性别：{baseObj ? baseObj.patientSex : noData ? '' : preInfo.patientSex}</td>
			
 
				           </tr>
			
 
				           <tr>
			
 
				-            <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '31%', fontSize: "14px" }}>就诊时间：{baseObj ? baseObj.inquiryDate : (JSON.stringify(preInfo) == '{}' ? '' : preInfo.systemTime.split(' ')[0])}</td>
			
 
				-            <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '23%', fontSize: "14px" }}>科室：{baseObj ? baseObj.hospitalDeptName : (JSON.stringify(preInfo) == '{}' ? '' : preInfo.hospitalDeptName)}</td>
			
 
				-            <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '23%', fontSize: "14px" }}>医生：{baseObj ? baseObj.doctorName : (JSON.stringify(preInfo) == '{}' ? '' : preInfo.doctorName)}</td>
			
 
				-            <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '23%', fontSize: "14px" }}>门诊号：{baseObj ? baseObj.inquiryCode : (JSON.stringify(preInfo) == '{}' ? '' : preInfo.recordId)}</td>
			
 
				+            <td>就诊时间：{baseObj ? baseObj.inquiryDate : (noData ? '' : preInfo.systemTime.split(' ')[0])}</td>
			
 
				+            <td>科室：{baseObj ? baseObj.hospitalDeptName : (noData ? '' : preInfo.hospitalDeptName)}</td>
			
 
				+            <td>医生：{baseObj ? baseObj.doctorName : (noData ? '' : preInfo.doctorName)}</td>
			
 
				+            <td>门诊号：{baseObj ? baseObj.inquiryCode : (noData ? '' : preInfo.recordId)}</td>
			
 
				           </tr>
			
 
				         </table>
			
 
				-        <table style={{ width: "100%", borderCollapse: 'collapse' }}>
			
 
				-          <tr style={{ verticalAlign: 'top', borderBottom: "1px solid #e2e4e6" }}>
			
 
				-            <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px',width:'70px' }}>主诉：</td>
			
 
				-            <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px', lineHeight: '20px',wordBreak:"break-all" }}>
			
 
				+        <table className={style['infos']}>
			
 
				+          <tr>
			
 
				+            <td>主诉：</td>
			
 
				+            <td>
			
 
				               {
			
 
				                 filterDataArr(JSON.parse(dataStr.chief))
			
 
				               }
			
 
				             </td>
			
 
				           </tr>
			
 
				-          <tr style={{ verticalAlign: 'top', borderBottom: "1px solid #e2e4e6" }}>
			
 
				-            <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px',width:'70px' }}>现病史：</td>
			
 
				-            <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px', lineHeight: '20px',wordBreak:"break-all" }}>
			
 
				+          <tr>
			
 
				+            <td>现病史：</td>
			
 
				+            <td>
			
 
				               {
			
 
				                 filterDataArr(JSON.parse(dataStr.present))
			
 
				               }
			
 
				             </td>
			
 
				           </tr>
			
 
				-          <tr style={{ verticalAlign: 'top', borderBottom: "1px solid #e2e4e6" }}>
			
 
				-            <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px',width:'70px' }}>其他史：</td>
			
 
				-            <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px', lineHeight: '20px',wordBreak:"break-all" }}>
			
 
				+          <tr>
			
 
				+            <td>其他史：</td>
			
 
				+            <td>
			
 
				               {
			
 
				                 other_yjs.str1
			
 
				               }
			
@@ -201,17 +202,17 @@ class PreviewBody extends Component {
 
				               }
			
 
				             </td>
			
 
				           </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-all" }}>
			
 
				+          <tr>
			
 
				+            <td>查体：</td>
			
 
				+            <td>
			
 
				               {
			
 
				                 filterDataArr(JSON.parse(dataStr.vital))
			
 
				               }
			
 
				             </td>
			
 
				           </tr>
			
 
				-          <tr style={{ verticalAlign: 'top', borderBottom: "1px solid #e2e4e6" }}>
			
 
				-            <td style={{ width: 70, textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px',width:'70px' }}>化验：</td>
			
 
				-            <td style={{ fontSize: '14px', padding: '4px 0px 8px 0px', lineHeight: '20px', maxWidth: '650px',wordBreak:"break-all" }}>
			
 
				+          <tr>
			
 
				+            <td>化验：</td>
			
 
				+            <td>
			
 
				               {
			
 
				                 dataJson.lis.getExcelDataList && dataJson.lis.getExcelDataList.map((items) => {
			
 
				                   return items.lisExcelRes && items.lisExcelRes.map((item) => {
			
@@ -262,9 +263,9 @@ class PreviewBody extends Component {
 
				               }
			
 
				             </td>
			
 
				           </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' }}>
			
 
				+          <tr>
			
 
				+            <td>辅检：</td>
			
 
				+            <td>
			
 
				               {
			
 
				                 dataStr.pacs && dataStr.pacs != '' && dataStr.pacs.split(';').map((item) => {
			
 
				                   return <div style={{ fontSize: '14px',wordBreak:"break-all" }}>{item}</div>
			
@@ -272,9 +273,9 @@ class PreviewBody extends Component {
 
				               }
			
 
				             </td>
			
 
				           </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' }}>
			
 
				+          <tr>
			
 
				+            <td>诊断：</td>
			
 
				+            <td>
			
 
				               {
			
 
				                 dataStr.diag && dataStr.diag != '' && dataStr.diag.split(';').map((item) => {
			
 
				                   return <div style={{ fontSize: '14px' }}>{item}</div>
			
@@ -282,8 +283,8 @@ class PreviewBody extends Component {
 
				               }
			
 
				             </td>
			
 
				           </tr>
			
 
				-          <tr style={{ verticalAlign: 'top', borderBottom: "1px solid #e2e4e6" }}>
			
 
				-            <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px',width:'70px' }}>医嘱：</td>
			
 
				+          <tr>
			
 
				+            <td>医嘱：</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>}
			
 
				               {
			
@@ -304,7 +305,10 @@ class PreviewBody extends Component {
 
				             </td>
			
 
				           </tr>
			
 
				         </table>
			
 
				-        <p style={{textAlign:'right',marginTop:'15px'}}>医生签名：<span style={{minWidth: '60px',padding: '0 5px 2px 5px',borderBottom: '1px solid #333',}}>{baseObj ? baseObj.doctorName : (JSON.stringify(preInfo) == '{}' ? '' : preInfo.doctorName)}</span></p>
			
 
				+        <p style={{textAlign:'right',marginTop:'15px'}}>医生签名：<span style={{minWidth: '60px',padding: '0 5px 2px 5px',borderBottom: '1px solid #333',}}>{baseObj ? baseObj.doctorName : (noData ? '' : preInfo.doctorName)}</span></p>
			
 
				+        <div className={style['assess-result']}>
			
 
				+          <p className={style['enter']}>管理和评估结果：<a>查看结果<img src={arrow} /></a></p>
			
 
				+        </div>
			
 
				       </div>
			
 
				 
			
 
				       <div onClick={() => { this.surePrint(dataStr) }} style={{
			
--- a/src/components/PreviewBody/index.less
+++ b/src/components/PreviewBody/index.less
@@ -1,18 +1,57 @@
 
				-
			
 
				-    .content {
			
 
				-      position: fixed;
			
 
				-      bottom: 70px;
			
 
				-      overflow: auto;
			
 
				-      top:120px;
			
 
				-      width: 820px;
			
 
				-      padding: 0 0px 60px 0px;
			
 
				-      .contents {
			
 
				-        position: relative;
			
 
				-        padding-bottom: 26px;
			
 
				-      }
			
 
				+@import "~@less/variables.less";
			
 
				+.content {
			
 
				+  position: fixed;
			
 
				+  bottom: 70px;
			
 
				+  overflow: auto;
			
 
				+  top:120px;
			
 
				+  width: 820px;
			
 
				+  padding: 0 0px 60px 0px;
			
 
				+  .contents {
			
 
				+    position: relative;
			
 
				+    padding-bottom: 26px;
			
 
				+  }
			
 
				+}
			
 
				+table{
			
 
				+  border-collapse: collapse;
			
 
				+  width: 100%;
			
 
				+}
			
 
				+.infos{
			
 
				+  &>tr{
			
 
				+    vertical-align: top;
			
 
				+    border-bottom: 1px solid #e2e4e6;
			
 
				+  }
			
 
				+  &>tr>td{
			
 
				+    padding: 9px 5px 8px 0px;
			
 
				+    line-height: 20px;
			
 
				+  }
			
 
				+  &>tr>td:first-child {
			
 
				+    text-align: right;
			
 
				+    width: 70px;
			
 
				+    font-size: 14px;
			
 
				+  }
			
 
				+}
			
 
				+.patInfo {
			
 
				+  margin: 0px 0px 30px 0px;
			
 
				+  td {
			
 
				+    border: 1px solid #aaa;
			
 
				+    padding: 8px 10px;
			
 
				+    font-size: 14px;
			
 
				+  }
			
 
				+  tr td:first-child{
			
 
				+    width: 31%;
			
 
				+  }
			
 
				+}
			
 
				+.assess-result{
			
 
				+  border-top: 1px #e2e4e6 solid;
			
 
				+  margin-top:50px;
			
 
				+  .enter{
			
 
				+    margin-top: 15px;
			
 
				+  }
			
 
				+  a{
			
 
				+    color: @blue;
			
 
				+    cursor: pointer;
			
 
				+    img{
			
 
				+      margin-left: 4px;
			
 
				     }
			
 
				-    .patInfo {
			
 
				-      td {
			
 
				-        border: 1px solid #aaa;
			
 
				-      }
			
 
				-    }
			
 
				+  }
			
 
				+}
			
--- a/src/components/RadioDrop/index.jsx
+++ b/src/components/RadioDrop/index.jsx
@@ -1,6 +1,7 @@
 
				 import React,{Component} from 'react';
			
 
				 import {handleEnter,getPageCoordinate,windowEventHandler} from '@utils/tools.js';
			
 
				 import {DropList} from '@commonComp';
			
 
				+import classNames from 'classnames';
			
 
				 import style from "./index.less";
			
 
				 import $ from "jquery";
			
 
				 
			
@@ -36,8 +37,9 @@ class RadioDrop extends Component{
 
				     this.handleEditLabel = this.handleEditLabel.bind(this);
			
 
				   }
			
 
				   getClass(){
			
 
				-    const {value,hideTag,placeholder,show} = this.props;
			
 
				+    const {value,hideTag,placeholder,show,isImports} = this.props;
			
 
				     const blueBorder = this.state.editable?style['blue-border']:'';
			
 
				+    const orgBorder = isImports?style['orange-border']:'';
			
 
				     if(show){
			
 
				       $(this.$cont.current).addClass(style['borderd']);
			
 
				     }else{
			
@@ -47,9 +49,9 @@ class RadioDrop extends Component{
 
				       return style['no-tag'];
			
 
				     }
			
 
				     if(value){
			
 
				-      return blueBorder?style['selected-tag']+' '+blueBorder:style['selected-tag'];
			
 
				+      return blueBorder?classNames(style['selected-tag'],blueBorder):style['selected-tag'];
			
 
				     }
			
 
				-    return style['tag'];
			
 
				+    return classNames(style['tag'],orgBorder);
			
 
				   }
			
 
				   handleSelect(item){
			
 
				     const {handleSelect,ikey,mainSaveText,value} = this.props;
			
--- a/src/components/RadioInpDrop/index.jsx
+++ b/src/components/RadioInpDrop/index.jsx
@@ -3,6 +3,7 @@ import {handleEnter,getPageCoordinate,windowEventHandler} from '@utils/tools.js'
 
				 import {DropList} from '@commonComp';
			
 
				 import config from '@config/index';
			
 
				 import style from "./index.less";
			
 
				+import classNames from 'classnames';
			
 
				 import $ from "jquery";
			
 
				 
			
 
				 /****
			
@@ -39,8 +40,9 @@ class RadioInpDrop extends Component{
 
				     this.handleInnerInp = this.handleInnerInp.bind(this);
			
 
				   }
			
 
				   getClass(){
			
 
				-    const {value,hideTag,placeholder,show} = this.props;
			
 
				+    const {value,hideTag,placeholder,show,isImports} = this.props;
			
 
				     const blueBorder = this.state.editable?style['blue-border']:'';
			
 
				+    const orgBorder = isImports&&!value?style['orange-border']:'';
			
 
				     if(show){
			
 
				       $(this.$cont.current).addClass(style['borderd']);
			
 
				     }else{
			
@@ -50,9 +52,9 @@ class RadioInpDrop extends Component{
 
				       return style['no-tag'];
			
 
				     }
			
 
				     if(value){
			
 
				-      return blueBorder?style['selected-tag']+' '+blueBorder:style['selected-tag'];
			
 
				+      return blueBorder?classNames(style['selected-tag'],blueBorder):style['selected-tag'];
			
 
				     }
			
 
				-    return style['tag'];
			
 
				+    return classNames(style['tag'],orgBorder);
			
 
				   }
			
 
				   handleSelect(item){
			
 
				     const {handleSelect,ikey,value,placeholder} = this.props;
			
--- a/src/components/SpreadDrop/index.jsx
+++ b/src/components/SpreadDrop/index.jsx
@@ -310,16 +310,18 @@ class SpreadDrop extends Component{
 
				     });
			
 
				   }
			
 
				   getClass(){
			
 
				+    const {isImports,show,value} = this.props;
			
 
				     const blueBorder = this.state.editable?style['blue-border']:'';
			
 
				-    if(this.props.show){
			
 
				+    const orgBorder = isImports&&!value?style['orange-border']:'';
			
 
				+    if(show){
			
 
				       $(this.$div.current).addClass(style['borderd']);
			
 
				     }else{
			
 
				       $(this.$div.current).removeClass(style['borderd']);
			
 
				     }
			
 
				-    if(this.props.value){
			
 
				+    if(value){
			
 
				       return classNames(style['selected-tag'],blueBorder);
			
 
				     }
			
 
				-    return style['tag'];
			
 
				+    return classNames(style['tag'],orgBorder);
			
 
				   }
			
 
				 
			
 
				   componentDidMount(){
			
--- a/src/containers/CheckBody.js
+++ b/src/containers/CheckBody.js
@@ -25,6 +25,7 @@ function mapStateToProps(state){
 
				     selecteds:checkBody.selecteds,       //普通多选选中状态
			
 
				     boxTop:state.homePage.boxTop,
			
 
				     boxLeft:state.homePage.boxLeft,
			
 
				+    importLabel:checkBody.importLabel,    //需高亮的标签id
			
 
				   }
			
 
				 }
			
 
				 
			
--- a/src/containers/Inspect.js
+++ b/src/containers/Inspect.js
@@ -20,9 +20,8 @@ function mapDispatchToProps(dispatch, store) {
 
				         handleChangeValue(val){
			
 
				             dispatch(getSearchList(val))
			
 
				         },
			
 
				-        getInfomation(id,name){
			
 
				-            console.log(id,name)
			
 
				-            dispatch(getInstroduce(id,name))
			
 
				+        getInfomation(id,name,type){
			
 
				+            dispatch(getInstroduce(id,name,type))
			
 
				         },
			
 
				         handleSign(id,idx,type){
			
 
				             dispatch(setLabel(idx,type))
			
--- a/src/containers/eleType.js
+++ b/src/containers/eleType.js
@@ -20,7 +20,8 @@ import Multiple from '@containers/Multiple';
 
				 //单选类型
			
 
				 export function singleRadio(params){
			
 
				   const data = params.item;//console.log(111,data);
			
 
				-  const {i,hideTag,boxMark,showArr,selecteds,boxTop,boxLeft} = params;
			
 
				+  const {i,hideTag,boxMark,showArr,selecteds,boxTop,boxLeft,importLabel} = params;
			
 
				+  let isHigh=importLabel&&importLabel.includes(data.id);
			
 
				   const showInx = boxMark+i+'0';    //单括号多标签的情况下需要识别同一个标签内多个下拉组件的显示状态
			
 
				   switch (+data.controlType){
			
 
				     case 0:
			
@@ -34,6 +35,7 @@ export function singleRadio(params){
 
				                         value = {data.value}
			
 
				                         boxMark={boxMark}
			
 
				                         id={data.id}
			
 
				+                        isImports={isHigh}
			
 
				                         ikey={showInx}
			
 
				                         hideTag={hideTag}></RadioDrop>;
			
 
				     case 2:
			
@@ -47,6 +49,7 @@ export function singleRadio(params){
 
				                      show={showArr&&showArr[showInx]}
			
 
				                      order={data.textGenerate}
			
 
				                      type={boxMark}
			
 
				+                     isImports={isHigh}
			
 
				                      textPrefix={data.labelPrefix}
			
 
				                      textSuffix={data.labelSuffix}
			
 
				                      id={data.id}></Multiple>
			
@@ -59,6 +62,7 @@ export function singleRadio(params){
 
				                          formulaCode={data.formulaCode}
			
 
				                          boxMark={boxMark}
			
 
				                          id={data.id}
			
 
				+                         isImports={isHigh}
			
 
				                          show={showArr&&showArr[showInx]}
			
 
				                          ikey={showInx}
			
 
				                          value={data.value}
			
@@ -68,6 +72,7 @@ export function singleRadio(params){
 
				                         suffix={data.labelSuffix}
			
 
				                         placeholder={data.name}
			
 
				                         value={data.value}
			
 
				+                        isImports={isHigh}
			
 
				                         id={data.id}
			
 
				                         ikey={showInx}></InlineTag>;
			
 
				     case 7:
			
@@ -75,6 +80,7 @@ export function singleRadio(params){
 
				                          suffix={data.labelSuffix}
			
 
				                          min={data.minValue}
			
 
				                          max={data.maxValue}
			
 
				+                         isImports={isHigh}
			
 
				                          placeholder={data.name}
			
 
				                          boxMark={boxMark}
			
 
				                          id={data.id}
			
@@ -90,6 +96,7 @@ export function singleRadio(params){
 
				                         show={showArr&&showArr[showInx]}
			
 
				                         value = {data.value}
			
 
				                         boxMark={boxMark}
			
 
				+                        isImports={isHigh}
			
 
				                         id={data.id}
			
 
				                         ikey={showInx}></RadioInpDrop>;
			
 
				     default:
			
@@ -100,7 +107,8 @@ export function singleRadio(params){
 
				 //多标签组合型
			
 
				 function multLabels(params){
			
 
				   const data = params.item;
			
 
				-  const {i,boxMark,showArr,saveText,selecteds} = params;
			
 
				+  const {i,boxMark,showArr,saveText,selecteds,importLabel} = params;
			
 
				+  let isHigh=importLabel&&importLabel.includes(data.id);
			
 
				   return <MultSpread data={data.questionMapping}
			
 
				                      showAdd = {+data.showAdd===1}
			
 
				                      copyId={data.id}
			
@@ -108,6 +116,7 @@ function multLabels(params){
 
				                      showArr={showArr||{}}
			
 
				                      update={Math.random()}
			
 
				                      boxMark={boxMark}
			
 
				+                     isImports={isHigh}
			
 
				                      ikey={boxMark+i}
			
 
				                      selecteds={selecteds&&selecteds[i]}
			
 
				                      saveText={saveText}
			
@@ -119,7 +128,8 @@ function multLabels(params){
 
				 //多选标签展开型
			
 
				 function multCheckLabels(params,tagType){
			
 
				   const data = params.item;
			
 
				-  const {i,boxMark,showArr,selecteds} = params;
			
 
				+  const {i,boxMark,showArr,selecteds,importLabel} = params;
			
 
				+  let isHigh=importLabel&&importLabel.includes(data.id);
			
 
				   const showInx = boxMark+i+'0';
			
 
				   return <SpreadDrop data={data.questionMapping}
			
 
				                      ikey={showInx}
			
@@ -129,6 +139,7 @@ function multCheckLabels(params,tagType){
 
				                      selecteds={selecteds ?selecteds[i]:[]}
			
 
				                      show={showArr&&showArr[showInx]}
			
 
				                      order={data.textGenerate}
			
 
				+                     isImports={isHigh}
			
 
				                      type={boxMark}
			
 
				                      tagType={tagType}
			
 
				                      textPrefix={data.prefix}
			
--- a/src/store/actions/checkBody.js
+++ b/src/store/actions/checkBody.js
@@ -454,4 +454,11 @@ export function delSingleLable(state,action){
 
				   }
			
 
				   res.update = Math.random();
			
 
				   return res;
			
 
				+}
			
 
				+//查体推送高亮标签
			
 
				+export function setImportCheckbodyLabel(state,action) {console.log(action)
			
 
				+  let res = Object.assign({},state);
			
 
				+  res.importLabel = action.labels;
			
 
				+  res.update = Math.random();
			
 
				+  return res;
			
 
				 }
			
--- a/src/store/actions/diagnosticList.js
+++ b/src/store/actions/diagnosticList.js
@@ -74,6 +74,7 @@ export const clearAllDiag = (state, action) => {
 
				     res.diagnosticStr = action.saveText
			
 
				     res.mainSuitStr = action.mainSuitStr
			
 
				     res.diagnosticStrNoType = action.saveText
			
 
				+    res.chronicMagItem = {}
			
 
				     return res;
			
 
				 }
			
 
				 
			
--- a/src/store/async-actions/inspect.js
+++ b/src/store/async-actions/inspect.js
@@ -50,21 +50,32 @@ export const getSublableList = (id,idx) => {
 
				     }
			
 
				 };
			
 
				 
			
 
				-export const getInstroduce = (id,name)=>{    //获取化验的提示信息
			
 
				-  console.log(id,name,78878788787)
			
 
				+export const getInstroduce = (id,name,type)=>{    //获取化验的提示信息
			
 
				+  let url = '',param={};
			
 
				+  if(type == 'excel'){
			
 
				+    url = '/api/icss/introduceInfo/getByQuestionName'
			
 
				+    param = {
			
 
				+      type: 5,
			
 
				+      tagName:name?name:'',
			
 
				+      position: 1
			
 
				+    }
			
 
				+  }else{
			
 
				+    url = '/api/icss/introduceInfo/getByQuestionId'
			
 
				+    param = {
			
 
				+      questionId: id?id:'',
			
 
				+      type: 5,
			
 
				+      tagName:name?name:'',
			
 
				+      position: 1
			
 
				+    }
			
 
				+  }
			
 
				   return (dispatch, getState) =>{
			
 
				-      axios.json('/api/icss/introduceInfo/getByQuestionId', {
			
 
				-        questionId: id?id:'',
			
 
				-        type: 5,
			
 
				-        tagName:name?name:'',
			
 
				-        position: 1
			
 
				-    })
			
 
				+    axios.json(url, param)
			
 
				     .then((data)=>{
			
 
				         dispatch({
			
 
				           type: SET_TIPS,
			
 
				           tips: data.data.data,
			
 
				           tmpFlg:'midPart'
			
 
				-      })          
			
 
				+        })          
			
 
				     }).catch((e) => {
			
 
				         console.log(e)
			
 
				     })
			
--- a/src/store/async-actions/pushMessage.js
+++ b/src/store/async-actions/pushMessage.js
@@ -2,6 +2,7 @@ import { get, post, json } from "@utils/ajax";
 
				 import { BILLING_ADVICE, SET_TIPS, SET_TIPS_DETAILS ,SET_CHRONIC_TABLELIST} from '../types/pushMessage';
			
 
				 import { SET_CLICK_DIAG } from '../types/diagnosticList';
			
 
				 import {storageLocal,getEMRParams} from '@utils/tools';
			
 
				+import {SET_IMPORT_CHECKBODY_LABEL} from "../types/checkBody";
			
 
				 
			
 
				 const api={
			
 
				   push:'/api/icss/push/pushInner',
			
@@ -20,7 +21,7 @@ export const billing = (mdata) => {
 
				   const emrData = getEMRParams();
			
 
				   const params = {
			
 
				     age: emrData.age,
			
 
				-    featureType: "5,6,7",
			
 
				+    featureType: "4,5,6,7",
			
 
				     diag: emrData.dis,
			
 
				     lis: emrData.lis,
			
 
				     other: emrData.other,
			
@@ -31,7 +32,7 @@ export const billing = (mdata) => {
 
				   };
			
 
				   storageLocal.set('emrParam',params);      //推送数据存储，用作推送前对比是否有变，有变才推送
			
 
				     json(url, params).then((data) => {
			
 
				-        let {dis, lab, pacs} = data.data.data||{};
			
 
				+        let {dis, lab, pacs,markedVitalIds} = data.data.data||{};console.log(markedVitalIds)
			
 
				         lab = lab||[];
			
 
				         pacs = pacs||[];
			
 
				         // console.log('推送数据', data.data.data);
			
@@ -62,6 +63,11 @@ export const billing = (mdata) => {
 
				             lab: lab||[],
			
 
				             pacs: pacs||[],
			
 
				         });
			
 
				+        //查体高亮标签
			
 
				+        dispatch({
			
 
				+          type:SET_IMPORT_CHECKBODY_LABEL,
			
 
				+          labels:markedVitalIds
			
 
				+        })
			
 
				   }).catch((e) =>{
			
 
				       console.log(e)
			
 
				   }) 
			
--- a/src/store/reducers/checkBody.js
+++ b/src/store/reducers/checkBody.js
@@ -1,10 +1,10 @@
 
				 import {SET,SETNUMBER4,SETSELECTED4,SETCHECKBOX,ADDLABELITEM,SETCHECKTEXT,SETSEARCHDATA,
			
 
				   SELECTSEARCHDATA,CHANGECHECKTEXTLABEL,CLEARCHECKBODY,CHECK_FOCUS_INDEX,CHECKBODY_CLEAR,
			
 
				   SETCHECKINPUT,DEL_CHECKBODY,CHANGECHECKTEXTLABEL_NUMBER,CHECKCONFIRMSELECTED,
			
 
				-  CHECKBODY_MUL,DEL_CHECKBODY_LABLE,SET_CK_RADIO_INPUT_VAL} from '../types/checkBody.js';
			
 
				+  CHECKBODY_MUL,DEL_CHECKBODY_LABLE,SET_CK_RADIO_INPUT_VAL,SET_IMPORT_CHECKBODY_LABEL} from '../types/checkBody.js';
			
 
				 import {set,setNumberValue,setRadioValue,setCheckBoxValue,addLabelItem,setCheckText,
			
 
				   setSearchData,insertLabelData,changeLabelVal,clearCheckBody,setInputLabel,backspaceText,
			
 
				-  changeNumLabelVal,confirm,multipleComfirn,delSingleLable,setRadioInputValue} from '../actions/checkBody.js';
			
 
				+  changeNumLabelVal,confirm,multipleComfirn,delSingleLable,setRadioInputValue,setImportCheckbodyLabel} from '../actions/checkBody.js';
			
 
				 import config from '@config/index.js';
			
 
				 
			
 
				 const block = Object.assign(JSON.parse(config.textLabel),{full:true});//空白时保留一个自由文本标签
			
@@ -15,7 +15,8 @@ const initState = {
 
				                 selecteds:[],
			
 
				                 focusIndex:'',
			
 
				                 isEmpty:true,      //是否为空白，需要请求数据
			
 
				-                showSearchBox:false
			
 
				+                showSearchBox:false,
			
 
				+                importLabel:[]//[430,436,40,278,435,279,28,442,447,448,449,450,453,454,457,456,282]
			
 
				           };
			
 
				 export default function(state=initState,action){
			
 
				   let res = Object.assign({},state);
			
@@ -60,6 +61,8 @@ export default function(state=initState,action){
 
				       return delSingleLable(state,action);
			
 
				     case SET_CK_RADIO_INPUT_VAL:
			
 
				       return setRadioInputValue(state,action);
			
 
				+    case SET_IMPORT_CHECKBODY_LABEL:
			
 
				+      return setImportCheckbodyLabel(state,action);
			
 
				     default:
			
 
				       return res;
			
 
				   }
			
--- a/src/store/types/checkBody.js
+++ b/src/store/types/checkBody.js
@@ -17,4 +17,5 @@ export const CHANGECHECKTEXTLABEL_NUMBER = 'CHANGECHECKTEXTLABEL_NUMBER';//数
 
				 export const CHECKCONFIRMSELECTED = 'spread_check_body_labels';
			
 
				 export const CHECKBODY_MUL = 'CHECKBODY_MUL';//单列多选
			
 
				 export const DEL_CHECKBODY_LABLE = 'DEL_CHECKBODY_LABLE';
			
 
				-export const SET_CK_RADIO_INPUT_VAL = 'SET_CK_RADIO_INPUT_VAL';
			
 
				+export const SET_CK_RADIO_INPUT_VAL = 'SET_CK_RADIO_INPUT_VAL';
			
 
				+export const SET_IMPORT_CHECKBODY_LABEL='SET_IMPORT_CHECKBODY_LABEL';
			
--- a/src/utils/tools.js
+++ b/src/utils/tools.js
@@ -629,7 +629,7 @@ function didPushParamChange(){
 
				   const oldParams = storageLocal.get('emrParam');
			
 
				   const newParams = JSON.stringify({
			
 
				     age: emrData.age,
			
 
				-    featureType: "5,6,7",
			
 
				+    featureType: "4,5,6,7",
			
 
				     diag: emrData.dis,
			
 
				     lis: emrData.lis,
			
 
				     other: emrData.other,