Merge branch 'master' into his/csxy3

# Conflicts:
#	src/utils/config.js

src/common/components/Add/index.jsx

@@ -23,7 +23,7 @@ class Add extends Component {
   render(){
     const {showText,handleClick,id,height} = this.props;
     return <div className={style['tag-container']} onClick={(e)=>{this.handleClick(e)}} id={id}>
-        <img src={more} style={{verticalAlign:'text-bottom'}}/>
+        <img src={more} style={{verticalAlign:'top'}}/>
         <span className={`inline-box ${style['gray']}`} style={{height:height?height:'',lineHeight:height?height:''}}>{showText}</span>
       </div>
   }

src/common/components/Add/index.less

@@ -5,7 +5,7 @@
   padding: 0 3px 3px;
 }
 .tag-container{
-  margin:5px 70px 5px 2px;
+  margin:18px 70px 17px 2px;
   display: inline-block;
   position: relative;
   cursor: pointer;

src/common/components/ConfirmModal/index.jsx

@@ -1,9 +1,9 @@
 import React, { Component } from 'react';
 import styles from './index.less';
-import OldPortal from './OldPortal';
 import NewPortal from './NewPortal'
 import PropTypes from 'prop-types';
-import close from "./img/close.png";
+import close from "../../images/close1.png";
+import icon1 from '../../images/icon.png'
 
 /***
  * 弹窗组件
@@ -41,16 +41,8 @@ const propTypes = {
     titleBg: PropTypes.string,
     noFooter: PropTypes.bool,
     okText: PropTypes.string,
-    okColor: PropTypes.string,
-    okBorderColor: PropTypes.string,
-    oKBg: PropTypes.string,
+    okType:PropTypes.string,
     cancelText: PropTypes.string,
-    cancelColor: PropTypes.string,
-    cancelBorderColor: PropTypes.string,
-    cancelBg: PropTypes.string,
-
-
-
 }
 
 const defaultProps = {
@@ -60,16 +52,10 @@ const defaultProps = {
     maskClosable: true,
     closable: true,
     okText: '确认',
-    okColor: 'red',
-    okBorderColor: 'red',
-    oKBg:'#fff',
+    okType:'normal',    //normal蓝色，danger红色
     cancelText: '取消',
-    cancelColor: '#414141',
-    cancelBorderColor: '#414141',
-    cancelBg: '#fff',
-    width: '300px',
-    height: '200px',
-    borderBtm:'0'
+    width: '400px',
+    height: '204px',
 };
 
 class ConfirmModal extends Component {
@@ -113,19 +99,13 @@ class ConfirmModal extends Component {
             mask, 
             maskClosable,
             okText, 
-            okColor,
-            okBorderColor,
-            oKBg,
-            cancelText, 
-            cancelColor,
-            cancelBorderColor,
-            cancelBg,
+            okType,
+            cancelText,
             width, 
             height, 
             closable, 
             noFooter,
             icon,
-            borderBtm
         } = this.props;
         const marginLeft = -parseInt(width)/2
         const marginTop = -parseInt(height)/2
@@ -133,28 +113,26 @@ class ConfirmModal extends Component {
             <NewPortal visible={visible}>
                 <div className={styles['modal-wrapper']} id='confirm'>
                     <div className={styles[['modal']]} style = {{width: width, marginLeft:marginLeft, minHeight:height, marginTop:marginTop}}>
-                        <div className={styles['modal-title']} style={{background: titleBg,borderBottom:borderBtm}}>
+                        <div className={styles['modal-title']} style={{background: titleBg}}>
                             {icon?<img src={icon} className={styles['icon']}/>:''}
                             {title ? title : ''} 
                             {closable ? <img onClick={this.closeModal} className={styles['modal-close']} src = {close}/> : false}
                         </div>
-                        <div className={styles['modal-content']}>{children}</div>
+                        <div className={styles['modal-content']}><img src={icon1}/>{children}</div>
                         {noFooter ? '' : <div className={styles['modal-operator']+' clearfix'}>
                             <div className={styles['modal-btn-box']}>
                                 <div 
                                     onClick={this.confirm} 
-                                    className={styles['modal-operator-confirm']}
-                                    style={{borderColor: okBorderColor, background: oKBg, color: okColor}}>
+                                    className={styles['modal-operator-confirm']+" "+styles[okType]}>
                                     { okText}
                                 </div>
                             </div>
                             <div className={styles['modal-btn-box']}>
-                                <div 
-                                onClick={this.cancel} 
-                                className={styles['modal-operator-close']}
-                                style={{borderColor: cancelBorderColor, background: cancelBg, color: cancelColor}}>
-                                { cancelText}
-                            </div>
+                                <div
+                                    onClick={this.cancel}
+                                    className={styles['modal-operator-close']}>
+                                    { cancelText}
+                                </div>
                             </div>
                         </div>}
                     </div>

src/common/components/ConfirmModal/index.less

@@ -6,18 +6,17 @@
     top: 50%;
     left: 50%;
     margin: auto;
-    border-radius: 5px;
     background: #fff;
     // overflow: hidden;
 }
 
 .modal-title {
     width: 100%;
-    height: 46px;
-    line-height: 46px;
+    height: 40px;
+    line-height: 40px;
     padding: 0 10px;
     background: #e5e5e5;
-    border-radius: 5px 5px 0 0;
+    border-bottom: 1px #EDEDED solid;
 }
 
 .icon{
@@ -27,47 +26,58 @@
 
 .modal-close {
     position: absolute;
-    right: 0px;
-    top: 2px;
-    width: 40px;
-    height: 40px;
+    right: 7px;
+    top: 7px;
+    width: 24px;
+    height: 24px;
     cursor: pointer;
 }
 
 .modal-content {
     width: 100%;
     padding: 0 10px;
+    position: relative;
+    height: 100px;
+    img{
+        position: absolute;
+        top:30px;
+        left: 20px;
+    }
 }
 
 .modal-operator {
     width: 100%;
-    height: 70px;
+    margin-bottom: 30px;
 }
 
 .modal-btn-box {
-    width: 50%;
-    float: left;
+    width: 100px;
+    float: right;
     text-align: center;
 }
 
 .modal-operator-close, .modal-operator-confirm {
     .btnCom;
-    width: 100px;
-    margin: auto;
+    width: 80px;
     height: 34px;
     line-height: 32px;
     opacity: 1;
     color: #fff;
-    margin-top: 6px;
-    border: 1px solid #78bddd;
+    margin: 0 auto;
+    border: 1px solid @modalCancel;
 }
 .modal-operator-confirm {
-    background: #78bddd;
+    background: @bannerBg;
+    border-color: @bannerBg;
+    &.danger{
+        background: @dangerColor;
+        border-color: @dangerColor;
+    }
 }
 
 .modal-operator-close{
     background: #fff;
-    color: #78bddd;
+    color: @text-color;
 }
 
 .modal-operator-close:active, .modal-operator-confirm:active {

src/common/components/DelToast/index.less

@@ -40,8 +40,11 @@
     }
     .del-del{
       color: #fff;
-      background: #EC3E3E;
+      background: @dangerColor;
       margin: 0 20px 0 10px;
+      &:hover{
+        background: #FF9494;
+      }
     }
     .del-cancel{
       color:#000;

src/common/components/SearchOption/index.jsx

@@ -111,7 +111,7 @@ class SearchOption extends React.Component {
       this.setState({border:false,val:''})
     }
     render() {
-        const { children,visible,searchType,showSym } = this.props;
+        const { children,visible,searchType,showSym,searchTop } = this.props;
         const { show,showInsp,txt } = this.state;
         return (
             searchType == 1||searchType == 2?
@@ -153,10 +153,10 @@ class SearchOption extends React.Component {
                 <div className={styles.autoList}>
                     {children}
                 </div>
-            </div>:<div id="searchOption" className={visible?`${styles.search} ${styles.show} ${showSym?styles.isSym:''} searchOption`:`${styles.search} ${styles.hide} searchOption`}>
+            </div>:<div id="searchOption"  style={{top:searchTop||'20px'}} className={visible?`${styles.search} ${styles.show} ${showSym?styles.isSym:''} searchOption`:`${styles.search} ${styles.hide} searchOption`}>
                 <img className={styles.searchVal} src={search} alt="搜索" />
                 <img style={{display:show?'block':'none'}} className={styles.clearVal} src={clear} onClick={this.handleClearVal} alt="清空" />
-                <input
+                    <span>{searchType}</span><input
                     className={this.state.border ?`${styles.border}`:`${styles.borderNone}`}
                     type="text"
                     maxLength="30"

src/common/components/SearchOption/index.less

@@ -7,7 +7,7 @@
     padding: 8px;
     box-sizing: border-box;
     position: absolute;
-    top: 30px;
+    top: 40px;
     background-color: #fff;
     // margin-bottom: 80px;
     &.isSym{
@@ -52,6 +52,7 @@
     min-height: 160px;
     .seleImg {
         left: 86px;
+        top:21px;
         cursor: pointer;
     }
     .searchInsp {
@@ -64,16 +65,16 @@
         line-height: 34px;
         width: 100px;
         float: left;
-        background-color: #E2F1F8;
+        background-color: @hoverBg;
         cursor: pointer;
         padding :0 15px 0 10px;
         border-radius: 4px;
         span {
-            color: #3B9ED0;
+            color: @bannerBg;
         }
     }
     .lisul {
-        border: 1px solid #B1D8EC;
+        border: 1px solid @bannerBg;
         border-radius: 4px;
         background-color: #fff;
         width: 100px;
@@ -87,7 +88,7 @@
             color: #1E1E1E;
         }
         li:hover {
-            background-color: #E2F1F8;
+            background-color: @hoverBg;
         }
     }
 }

src/common/less/mixin.less

@@ -1,5 +1,6 @@
 @import "./variables.less";
 
+@text-color: #333;
 @focus-border-color:#0088be;
 @focus-border-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
 @focus-font-color:#66afe9;

src/common/less/variables.less

@@ -2,10 +2,12 @@
 @orange: #f6b37f;
 @green: #4caf50;
 @cyan: #00bcd4;
-@blue: #3B9ED0;
 @red:#ff0000;
-@extBlue:#5968DD;
+@extBlue:#4F9FF3;
 @tab-color:#3B9ED0;
+@dangerColor:#FF7874;   /*删除按钮红色*/
+@modalCancel:#9C9C9C;     /*弹窗气消按钮边框色*/
+@text-color: #333;
 
 @ipt-color:#E9F5FA;
 @ipt-bg-color:#F0F0F0;
@@ -17,7 +19,6 @@
 @body-bg: @base-color;
 
 @btn-text-color: #fff;
-@text-color: #333;
 
 @placeholder-color: #bfbfbf;
 
@@ -54,6 +55,11 @@
 @closeIcon:url(../images/del_nor.png) no-repeat;
 @closeHor:url(../images/del_hor.png) no-repeat;
 
+/********6.5在用*******/
+@blue: #1677FF;       /*字体蓝色*/
+@bannerBg:#4F9FF3; /*banner背景色*/
+@hoverBg:#E3F0FF;   /****下拉hover背景色****/
+
 /*********推送内容容器宽度*************/
 @push-width: 450px;
 /****电子病历容器宽度*****/
@@ -189,9 +195,9 @@
   white-space: nowrap;
 }
 .llStyle{
-  box-shadow: 0 10px 20px 0 #989DA3;
+
+  box-shadow: 0px 2px 16px 0px #CECECE;
   // filter:progid:DXImageTransform.Microsoft.Shadow(color='#989DA3',Direction=125,Strength=6);
-  border: 1px solid #dedede;
 }
 
 .borderd{
@@ -298,4 +304,27 @@
 }
 .contentZIndex3 {
   z-index: 30;
+}
+::-webkit-scrollbar{
+   /*滚动条整体样式*/
+   width: 8px;
+   /*高宽分别对应横竖滚动条的尺寸*/
+   height: 8px;
+   background: #fff;
+   -webkit-box-shadow: inset 1px 0 1px rgba(0, 0, 0, 0.2);
+ }
+
+::-webkit-scrollbar-thumb{
+  /*滚动条里面小方块*/
+  width: 8px;
+  height: 8px;
+  border-radius: 5px;
+  background: @extBlue;
+}
+
+::-webkit-scrollbar-track{
+  /*滚动条里面轨道*/
+  border-radius: 5px;
+  background: #fff;
+  opacity: .2;
 }

src/components/AddAssistCheck/index.jsx

@@ -311,7 +311,7 @@ class AddAssistCheck extends React.Component {
         {this.getAssistLabel()}
         <div id="searchWrapAssist" style={{ position: "relative", clear: 'both' }}>
           <Add showText="添加检查项" handleClick={(e) => this.handleSearchShow(e)} id="assistCheck" />
-          {this.state.show ? <SearchOption windowHeight={windowHeight} refreshScroller={refreshScroller }  pageTop={pageTop} height={280} handleChangeValue={handleChangeValue} visible={true}>
+          {this.state.show ? <SearchOption windowHeight={windowHeight} refreshScroller={refreshScroller } searchTop={40}  pageTop={pageTop} height={280} handleChangeValue={handleChangeValue} visible={true}>
             {list && list.length>0?this.getSearchList(list):(assistVal == ''?'':<p style={{padding:'42px 30px',color:'#bfbfbf'}}>暂无筛选项</p>)}
             {/* {
               (list && list.length>0) || (assistVal != '') || (assistList&&assistList.length==0)?'':<div>

src/components/AddAssistCheck/index.less

@@ -41,8 +41,8 @@
   width: 356px;
 }
 .searchLi:hover {
-  border: 1px solid @blue;
-  box-sizing: border-box;
+  background: @hoverBg;
+  color: @bannerBg;
 }
 
 .labelWrapSpec {

src/components/AddInspect/InspectName/index.jsx

@@ -1,7 +1,5 @@
 import React, { Component } from "react";
 import styles from "./index.less";
-import edit1 from "@common/images/edit1.png";
-import edit2 from "@common/images/edit2.png";
 import { normalVal, timestampToTime, getStatusImg,setFontColorSize } from '@utils/tools';
 class InspectName extends Component {
   constructor(props) {

src/components/AddInspect/SlideSelect/index.jsx

@@ -116,9 +116,10 @@ class SlideSelect extends Component {
       right:'0',
       top:'6px',
       zIndex:'15',
-      width:'14px',
+      borderRadius:'4px',
+      width:'7px',
       background:'#f1f1f1'};
-    const barStyle={background:'#777',width:'100%'};
+    const barStyle={background:'#C9C9C9',width:'100%'};
     const listLen = currentData.details&&currentData.details.length;
     const stopScroll =(windowWidth<1300&&listLen>12)||(windowWidth>1299&&listLen>24);
     return (

src/components/AddInspect/index.less

@@ -112,11 +112,12 @@
     white-space: nowrap;
     border: 1px solid transparent;
     cursor: pointer;
-    background-color: #f5f5f5;
+    // background-color: #f5f5f5;
 }
 
 .searchLi:hover {
-    border: 1px solid @blue;
+    background: @hoverBg;
+    color: @bannerBg;
 }
 
 .searchResult {

src/components/AddInspectCopy/InspectName/index.jsx

@@ -1,7 +1,5 @@
 import React, { Component } from "react";
 import styles from "./index.less";
-import edit1 from "@common/images/edit1.png";
-import edit2 from "@common/images/edit2.png";
 import { normalVal, timestampToTime, getStatusImg,setFontColorSize } from '@utils/tools';
 class InspectName extends Component {
   constructor(props) {

src/components/AddNewInspect/InspectName/index.jsx

@@ -1,7 +1,5 @@
 import React, { Component } from "react";
 import styles from "./index.less";
-import edit1 from "@common/images/edit1.png";
-import edit2 from "@common/images/edit2.png";
 import { normalVal, timestampToTime, getStatusImg,setFontColorSize } from '@utils/tools';
 class InspectName extends Component {
   constructor(props) {

src/components/AddNewInspect/index.less

@@ -113,11 +113,12 @@
     white-space: nowrap;
     border: 1px solid transparent;
     cursor: pointer;
-    background-color: #f5f5f5;
+    // background-color: #f5f5f5;
 }
 
 .searchLi:hover {
-    border: 1px solid @blue;
+    background: @hoverBg;
+    color: @bannerBg;
 }
 
 .searchResult {

src/components/Banner/index.jsx

@@ -3,25 +3,22 @@ import { connect } from "react-redux";
 import style from "./index.less";
 import ReactDom from "react-dom";
 import logo from "../../common/images/logoa.png";
-import bannerDown from "../../common/images/bannerDown.png";
-import setup from "../../common/images/setup.png";
+import bannerDown from "../../common/images/banner-down.png";
 import emergIcon from '../../common/images/emergency.png'
 import left3 from '../../common/images/left3.png'
 import {Notify} from '@commonComp';
 import Emergency from '@containers/Emergency';
 import PreInIcss from '@containers/PreInIcss';
 import {getAllHis} from '@store/async-actions/fetchModules.js';
-import {timestampToTime,getCurrentDate} from '@utils/tools.js';
+import {timestampToTime,getCurrentDate,getUrlArgObject} from '@utils/tools.js';
 import {dragBox} from '@utils/drag';
 import {CLEAR_COMSYMPTOMS} from '@store/types/mainSuit';
 import { GET_PREC_LIST,SET_PREC_SHOW } from "@store/types/preIcss";
 import { CHANGEHOSPITAL } from "@store/types/homePage";
 import {getPreMsg} from '@store/async-actions/preIcss';
-import ModeChange from './ModeChange'
 import {ConfirmModal} from '@commonComp';
 import { embedPush} from '../../store/async-actions/pushMessage'
 import { clearMessages } from "../../store/async-actions/print";
-import {debounce} from '../../utils/tools'
 import $ from 'jquery';
 import store from '@store';
 class Banner extends Component {
@@ -88,13 +85,9 @@ class Banner extends Component {
   }
 
   confirmType(){
-    const {typeConfig,confirmType,clearCommS,closeConfigModal,readMode} = this.props;
+    const {confirmType,clearCommS,closeConfigModal} = this.props;
     // 清空主诉常见症状
     clearCommS();
-    /*if(mode==typeConfig&&typeConfig==readMode){
-      closeConfigModal();
-      return;
-    }*/
     const configs= this.parseConf();
     confirmType&&confirmType(configs);
     closeConfigModal();
@@ -195,28 +188,24 @@ class Banner extends Component {
     e.stopPropagation()
   }
   render() {
-    const {visible,pre,ifShow,deptName, closeConfigModal,hasMain,hasCurrent,hasOther,preShow,show,hospitalMsg,curHos} = this.props;
-    const {emergencyBox,showHos,showM,hosName,hosNameTmp} = this.state;
-    const {showConfigModal, changeType, showHospitalLis,showCheckModal,showConnect} = this;
+    const hideLg  = getUrlArgObject("hideLg");
+    const {ifShow,deptName,show,hospitalMsg,curHos} = this.props;
+    const {emergencyBox,showHos,showM,hosNameTmp} = this.state;
+    const { showHospitalLis,showCheckModal,showConnect} = this;
     const domNode = document.getElementById('root');
-    const disabled = !(hasMain||hasCurrent||hasOther);
     return (
       <div className={style["logo"]}>
-        <img src={logo} onClick={this.handleEmbedPush}/>
-        <span className={style["logo-name"]} onClick={this.handleEmbedPush}>|&nbsp;&nbsp;智能辅助临床决策系统</span>
+          {hideLg?'':<img src={logo} onClick={this.handleEmbedPush}/>}
+        <span className={style["logo-name"]} onClick={this.handleEmbedPush}>{hideLg?'':`|`}&nbsp;&nbsp;智能辅助临床决策系统</span>
         <div className={style["buon"]}>
           {ifShow==1&&deptName=='急诊科'?<div className={`${style["buon1"]} ${style["buon2"]}`} onClick={this.showHisModal}>
                       <img className={`${style["st"]} ${style["his"]}`} src={emergIcon} />
                       <i>本科室近期全部病历</i>
                     </div>:''}
-          {/* {pre == 1?<div className={style.prec} onClick={()=>preShow(show)}>
-            <img className={style["st"]} src={prec} alt="预问诊"/>
-            <i> 预问诊信息</i>
-          </div>:null} */}
           <div className={style["showHospitalLis"]} onClick={showHospitalLis} id="showHospitalLis">
             <p className={`${style["selectedHos"]}`}>
               <span className={style["ellipsis"]} title={curHos.hosName||hospitalMsg[0].name}>{curHos.hosName||hospitalMsg[0].name}</span>
-              <i style={{color:curHos.connect==1?'#3B9ED0':'#FF545B'}} onClick={(e)=>{showConnect(e)}}><img src={left3}/>{curHos.connect==1?'术语已关联':'术语未关联'}</i>
+              <i style={{color:curHos.connect==1?'#1E1E1E':'#FF3E3E'}} onClick={(e)=>{showConnect(e)}}><img src={left3}/>{curHos.connect==1?'术语已关联':'术语未关联'}</i>
               <img className={style['bannerDown']} src={bannerDown} />
             </p>
             <ul className={`${style["hospitalLis"]}`} style={{"display":showHos?"block":"none"}}>
@@ -254,9 +243,6 @@ class Banner extends Component {
             confirm={this.deleteItem}  
             cancel={this.cancel}
             close={this.close}
-            okBorderColor={'#3B9ED0'}
-            okColor={'#fff'}
-            oKBg={'#3B9ED0'}
             >
             <div className={style['changeHos']}>确定要切换至{hosNameTmp}吗？医院切换后将清空当前页面。</div> 
         </ConfirmModal>

src/components/Banner/index.less

@@ -2,28 +2,29 @@
 
 .logo{
     .contentZIndex3;
-    background: linear-gradient(-90deg, #93CEE3 7%,#3B9ED0 98%);
-    background-image: url("../../common/images/bar.png");
+    background: @bannerBg;
     height: 50px;
-    border-bottom: 10px solid #e4e6e7;
+    border-bottom: 10px solid #fff;
     position: fixed;          //页面布局调整
     width: 1200px;
     top: 0;
     img{
       vertical-align: middle;
       margin: 0 10px 2px 18px;
+      cursor: pointer;
     }
     .logo-name{
         display: inline-block;
         line-height: 40px;
-        color: #FFFFFF;
+        color: #fff;
         font-size: 14px;
+        cursor: pointer;
     }
     .buon{
         float: right;
         display: inline-block;
         margin: 0px 15px 4px 10px;
-        color: #FFFFFF;
+        color: #1E1E1E;
         font-size: 16px;
         // cursor: pointer;
         .buon1{
@@ -63,9 +64,10 @@
       margin-top: 6px;
       cursor: pointer;
       .selectedHos {
-        box-shadow: 0px 1px 3px 3px #45A3D2 inset;
-        background-color: #65B5D9;
+        box-shadow: 0px 2px 4px 0px #1C6EC3;
+        background-color: #fff;
         padding-left: 10px;
+        border-radius: 2px;
         i {
           position: absolute;
           right: 20px;
@@ -89,30 +91,30 @@
           position: relative;
           box-sizing: border-box;
           display: inline-block;
-          font-size: 12px;
+          font-size: 14px;
         }
         img.bannerDown {
           position: absolute;
-          right: 124px;
-          top: 11px;
+          right: 127px;
+          top: 17px;
         }
       }
       .hospitalLis {
         background-color: #fff;
         color: #1E1E1E;
-        border-radius: 5px;
-        box-shadow: 0px 6px 16px 0px #ccc;
+        box-shadow: 0px 2px 10px 0px #CECECE;
         max-height: 150px;
         overflow: auto;
+        margin-top: 6px;
         li {
           cursor: pointer;
           height: 30px;
           line-height: 30px;
           padding: 0 10px;
-          font-size: 12px;
+          font-size: 14px;
           &:hover {
-            background-color: #8DCBE2;
-            color: #fff;
+            background-color: @hoverBg;
+            color: @bannerBg;
           }
         }
       }
@@ -144,7 +146,6 @@
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=60);";
 }
 .changeHos {
-  height: 84px;
-  line-height: 20px;
-  padding: 10px 18px;
+  padding: 29px 0 0 33px;
+  line-height: 22px;
 }

src/components/DiagResultSearch/index.less

@@ -54,7 +54,8 @@
 }
 
 .search-result-item:hover {
-    border: 1px solid @blue;
+  background: @hoverBg;
+  color: @bannerBg;
 }
 
 .search-result-noItem{

src/components/Diagnosis/index.jsx

@@ -103,14 +103,13 @@ class Diagnosis extends Component {
             const showNext = tcmList.length===0||!notAll;
             return (<div id="diagnosisTcmResult">
                 <ItemBox id="tcmDiagnosis" title="中医诊断" boxHeight='auto' hideAllDrop={this.props.hideAllDrop}
-                         titleTop='22px' marginTop='9px' backgroundColor='#EAF7FD'>
+                         titleTop='22px' marginTop='9px' backgroundColor='#E3F0FF'>
                     <DiagnosticList isTcm={isTcm}
                                     refreshScroller={this.refreshScroller}
                                     setHighter={this.props.setHighter}
                                     hideChronic={this.props.hideChronic}></DiagnosticList>
                     {showNext?<div style={{marginLeft: '10px', position: 'relative', color: '#000'}}>
-                        <Add showText="添加中医诊断结果" handleClick={this.handleTcmShowSearch} id="addTcmDiag"
-                             height="50px"/>
+                        <Add showText="添加中医诊断结果" handleClick={this.handleTcmShowSearch} id="addTcmDiag"/>
                         <DiagResultSearch
                             refreshScroller={this.refreshScroller}
                             setHighter={this.props.setHighter}
@@ -126,10 +125,10 @@ class Diagnosis extends Component {
         }
         return (<div id="diagnosisResult">
             <ItemBox id="diagnosis" title='西医诊断' boxHeight='auto' hideAllDrop={this.props.hideAllDrop} titleTop='22px'
-                     marginTop='9px' backgroundColor='#EAF7FD'>
+                     marginTop='9px' backgroundColor='#E3F0FF'>
                 <DiagnosticList refreshScroller={this.refreshScroller} hideChronic={this.props.hideChronic}></DiagnosticList>
                 <div style={{marginLeft: '10px', position: 'relative', color: '#000'}}>
-                    <Add showText="添加西医诊断结果" handleClick={this.handleshowSearch} id="addDiag" height="50px"/>
+                    <Add showText="添加西医诊断结果" handleClick={this.handleshowSearch} id="addDiag"/>
                     <DiagResultSearch
                         refreshScroller={this.refreshScroller}
                         setHighter={this.props.setHighter}

src/components/DiagnosticList/index.jsx

@@ -366,7 +366,7 @@ class DiagnosticList extends Component {
                                         <input type="text" value={tcmSyndrome} disabled={true}/>
                                       </span>
 
-                                    </span>:(tcmDiag?<Add showText="添加中医证候" isTcm={isTcm} handleClick={this.handleSymShowSearch} id="addSymDiag" height="50px" />:'')}
+                                    </span>:(tcmDiag?<Add showText="添加中医证候" isTcm={isTcm} handleClick={this.handleSymShowSearch} id="addSymDiag" height="15px" />:'')}
                                 {tcmDiag&&tcmSyndrome?'':<DiagResultSearch
                                         refreshScroller={refreshScroller}
                                         setHighter={setHighter}
@@ -405,7 +405,7 @@ class DiagnosticList extends Component {
         }
         return(
                 <div className={style['diaglist-wrap']}>
-                    {diagList && (diagList.length > 0) && diagList.map((item, index) => {console.log(diagList,item)
+                    {diagList && (diagList.length > 0) && diagList.map((item, index) => {
 
                         return (<div draggable={false} className={`${style['diag-box']} ${setFontColorSize(2,3)} clearfix`} id="diagListBox" key={item.conceptId} >
                                     {index === 0 ? '' : <span className={style['diag-up']} onClick={() => {this.upDiagnostic(index)}}><img className={style["diag-up"]} src={diagUp}/></span>}

src/components/DiagnosticList/index.less

@@ -8,7 +8,6 @@
     line-height: 50px;
     border-bottom: 1px dotted #989DA3;
     position: relative;
-    background: #EAF7FD;
     span {
         font-size: unset;
     }
@@ -27,7 +26,7 @@
 
 .diag-box:nth-child(1) {
     .diag-number{
-        color: #3B9ED0;
+        color: @bannerBg;
     }
 }
 
@@ -44,7 +43,6 @@
     margin-left: 5px;
 }
 .diag-first {
-    background: #EAF7FD;;
     color: #3B9ED0;
     border: 1px solid #3B9ED0;
     border-radius: 4px;
@@ -140,25 +138,21 @@
     top: 15px;
 }
 .del-msg {
-    height: 72px;
-    width: 100%;
-    text-align: center;
-    font-size: 16px;
-    color: #000000;
-    line-height: 18px;
-    margin-bottom: 10px;
-
-    text-overflow: ellipsis;
-    display:-webkit-box; //作为弹性伸缩盒子模型显示。
-    -webkit-box-orient:vertical; //设置伸缩盒子的子元素排列方式--从上到下垂直排列
-    -webkit-line-clamp:4; //显示的行
-    overflow: hidden;
+    font-size: 14px;
+    color: @text-color;
+    padding: 33px 0 0 33px;
+    word-break: break-all;
+    height: 100px;
+    overflow-y: auto;
 }
-.diag-up, .diag-down, .diag-del {
-    width: 20px;
-    margin-bottom: 4px;
+.diag-up, .diag-down {
+    width: 14px;
+    margin-bottom: 8px;
     cursor: pointer;
 }
+ .diag-del{
+     width: 20px;
+ }
 .confirm-info {
     height: 70px;
     font-size: 16px;

src/components/EMRContainer/index.jsx

@@ -46,13 +46,13 @@ class EMRContainer extends Component {
     }
     render() {
         const contStyle={
-                          opacity:'0.4',
+                          opacity:'1',
                           top:'1px',
                           right:'458px',
                           zIndex:'15',
-                          width:'14px',
+                          width:'7px',
                           background:'#f1f1f1'};
-        const barStyle={background:'#777',width:'100%',marginLeft:'0'};
+        const barStyle={borderRadius:'4px',background: '#C9C9C9',width:'100%',marginLeft:'0'};
         return <div className={style['EMR-container']}
                     ref={this.$cont} id="addScrollEvent">
             <InfoTitle></InfoTitle>

src/components/HistoryCaseContainer/HistoryList/index.jsx

@@ -11,18 +11,16 @@ import Empty from '@components/Empty'
 import { pushAllDataList,didPushParamChange } from '@utils/tools';
 // import { dragBox } from '@utils/drag';
 import { initItemList, setInitHistory } from '@store/async-actions/historyTemplates';
-import HistoryCases from '@containers/HistoryCases';
 import $ from 'jquery';
 import { ConfirmModal } from '@commonComp';
 import {showHistory} from "@store/actions/historyTemplates";
 import { SET_READ_MODE } from "@store/types/typeConfig";
 import {billing} from '@store/async-actions/pushMessage';
 import { getHistempDetail, asyncUpdateByIdUsNames, asyncCancelTemplateInfos} from '@store/async-actions/historyTemplates';
-import { embedPush } from '../../../store/async-actions/pushMessage'
-import edit from '../../../common/images/icon_edit_default@2x.png';
-import editHover from '../../../common/images/icon_edit_hover@2x.png';
-import del from '../../../common/images/icon_del_default@2x.png';
-import delHover from '../../../common/images/icon_del_hover@2x.png';
+import edit from '../../../common/images/icon_edit_default.png';
+import editHover from '../../../common/images/icon_edit_hover.png';
+import del from '../../../common/images/icon_del_default.png';
+import delHover from '../../../common/images/icon_del_hover.png';
 import Notify from '@commonComp/Notify';
 import ScrollArea from 'react-scrollbar';
 class HistoryCaseContainer extends React.Component {
@@ -95,7 +93,7 @@ class HistoryCaseContainer extends React.Component {
       $("#hislistLeft li").eq(idx).css({
         background: '#fff'
       }).siblings().css({
-        background: '#d2d1d1'
+        background: '#eee'
       })
       if (items.length == 0) {
         return
@@ -332,14 +330,14 @@ class HistoryCaseContainer extends React.Component {
             return jsonDataString;
         }
       const contStyle = {
-        opacity: '0.4',
+        opacity: '1',
         right: '0',
         top: '1px',
         zIndex: '15',
-        width: '14px',
+        width: '7px',
         background: '#f1f1f1'
       };
-      const barStyle = { background: '#777', width: '100%' };
+      const barStyle = { borderRadius:'4px',background: '#C9C9C9', width: '100%' };
         return (
             <div className={styles.mainHistory} id="hisWrapMove">
                 <div className={styles.mainTop}>
@@ -425,9 +423,9 @@ class HistoryCaseContainer extends React.Component {
                     close={this.close}
                     cancel={this.close}
                     okText={"引用"}
-                    okBorderColor={'#3B9ED0'}
+                    okBorderColor={'#4F9FF3'}
                     okColor={'#fff'}
-                    oKBg={'#3B9ED0'}
+                    oKBg={'#4F9FF3'}
                 >
                     <p className={styles['center']}>确定引用该病历？</p>
                 </ConfirmModal>
@@ -437,11 +435,8 @@ class HistoryCaseContainer extends React.Component {
                   confirm={this.makeSureDel}
                   close={this.closeDel}
                   cancel={this.closeDel}
-                  okText={"删除"}
-                  okBorderColor={'#3B9ED0'}
-                  okColor={'#fff'}
-                  oKBg={'#3B9ED0'}
-                    
+                  okText="删除"
+                  okType='danger'
                 >
                     <p className={styles['center']}>确定删除病历？</p>
                 </ConfirmModal>
@@ -452,9 +447,6 @@ class HistoryCaseContainer extends React.Component {
                   close={this.closeEdit}
                   cancel={this.closeEdit}
                   okText={"保存"}
-                  okBorderColor={'#3B9ED0'}
-                  okColor={'#fff'}
-                  oKBg={'#3B9ED0'}
                   title={'编辑病历名称'}
                   height={200}
                 >                  

src/components/HistoryCaseContainer/HistoryList/index.less

@@ -21,7 +21,7 @@
     .mainHistoryLeft {
         width: 300px;
         height: 100%;
-        background: #d2d1d1;
+        background: #EEE;
         position: relative;
         float: left;
         padding-top: 80px;
@@ -33,7 +33,7 @@
             top: 0px;
             left: 0;
             width: 100%;
-            background: #d2d1d1;
+            background: #EEE;
         }
         .his {
             font-size: 18px;
@@ -63,7 +63,7 @@
                 display: flex;
                 align-items: center;
                 .activeColor {
-                      color: '#3B9ED0';
+                      color: @bannerBg;
                     }
                 .itemLeft{
                     flex: 1;
@@ -89,7 +89,7 @@
                             white-space: nowrap;    
                             font-size: 14px;  
                             line-height: 34px;   
-                            color: #3B9ED0;                      
+                            color: @bannerBg;
                         }                   
                         .edit{
                             width: 30px;
@@ -114,7 +114,7 @@
                         font-size: 10px;
                         height:20px;
                         line-height: 20px;
-                        color: #3B9ED0;
+                        color: @bannerBg;
                         margin-top: -8px;
                     }                
                 }
@@ -126,8 +126,8 @@
                         width: 30px;
                         height:30px;
                         img{
-                            width: 20px;
-                            height: 20px;
+                            width: 16px;
+                            height: 18px;
                             position: relative;
                             top: -7px;
                             left: 13px;
@@ -149,7 +149,7 @@
                 border-radius: 15px;
                 border: 0 none;
                 color: #fff;
-                background-color: @template-color;
+                background-color: @bannerBg;
                 float: right;
                 font-size: 12px;
                 outline: none;
@@ -182,18 +182,12 @@
     }
 }
 .center {
-  text-align: center;
-  font-size: 16px;
-  padding-top: 10px;
-  padding-bottom: 50px;
+    font-size: 14px;
+    padding: 33px 0 0 33px;
 }
 
 .outBox{
-    padding-left: 18px;
-    height: 100px;
-    width: 100%;
-    display: flex;
-    align-items: center;
+    padding: 22px 0 0 35px;
 }
 .innerInput{
     outline-style: none ;

src/components/InfoTitle/index.jsx

@@ -67,7 +67,7 @@ class InfoTitle extends Component {
     render() {
         const {loading,loadingText,loadingType} = this.props;
         const {le} = this.state;
-        return <div className={style['title-wrapper']}  style={{paddingRight:'122px'}}>
+        return <div className={style['title-wrapper']}  style={{paddingRight:'198px'}}>
             <PatInfoContainer />
              {
                 <div className={style['activeWrap']}>

src/components/InfoTitle/index.less

@@ -1,39 +1,36 @@
 @import "~@less/variables.less";
 .title-wrapper{
   .contentZIndex2;
-  // overflow: hidden;
-  /*padding: 12px 20px 8px 20px;*/
-  // margin-bottom: 40px;
   background-color: #fff;
-  border-bottom: 1px solid #BBBFC1;
+  /*border-top: 1px solid #BBBFC1;
+  border-bottom: 1px solid #BBBFC1;*/
+  padding-left: 15px;
   position: fixed;
   left: 50%;
   top: 50px;
   margin-left: -600px;
   max-width: 1200px;
-  /*padding-right: 122px;*/
   .activeWrap {
     position: absolute;
     right: 0;
     top: 0;
-    width: 122px;
+    width: 198px;
     line-height: 28px;
+    border: 1px solid #BBBFC1;
+    border-left: none;
+    margin-right: 15px;
   }
 }
 .operations, .health{
   float: left;
-//   border: 1px @border-color solid; 
-  // height: 61px;
-  width: 122px;
-  border-left: 0px solid #fff;
+  width: 198px;
   text-align: center;
-  // line-height: 61px;
   color: @blue;
   span{
     cursor: pointer;
     display: inline-block;
-    height: 60px;
-    line-height: 60px;
+    height: 66px;
+    line-height: 66px;
   }
   img {
     width: 20px;

src/components/Information/index.less

@@ -1,15 +1,15 @@
 .title {
   clear: both;
-  font-size: 22px !important;
-  margin-bottom: 15px;
+  font-size: 24px !important;
+  margin-bottom: 27px;
   text-align:center;
   padding-top: 15px;
 }
 .patInfo {
   margin: 0px 0px 15px 0px;
   td {
-    border: 1px solid #aaa;
-    padding: 14px 8px;
+    border: 1px solid #CCD2D9;
+    padding: 6px 14px 7px;
     font-size: 14px;
   }
   tr td{

src/components/Operation/index.jsx

@@ -1,10 +1,6 @@
 import React, { Component } from "react";
 import style from "./index.less";
-import printImg from '@common/images/icon_print_blue.png';
 import slideDown from '@common/images/slideDown.png';
-import preview from '@common/images/preview.png';
-import saveHistory from '@common/images/saveHistory.png';
-import cancelTag from '@common/images/icon_back.png';
 import PrintPreviewContainer from '@containers/PrintPreviewContainer';
 import PreviewContainer from '@containers/PreviewContainer';
 import { ConfirmModal, Notify } from '@commonComp';
@@ -587,10 +583,8 @@ class Operation extends Component {
         confirm={this.makeSureClear}
         close={this.closeClear}
         cancel={this.closeClear}
-        okText={"清除"}
-        okBorderColor={'red'}
-        okColor={'red'}
-        oKBg={'#fff'}
+        okText="清除"
+        okType='danger'
       >
         <div className={style.outBox}>
           <span>是否清空所有内容</span>
@@ -604,9 +598,9 @@ class Operation extends Component {
         close={this.closeSave}
         cancel={this.closeSave}
         okText={"保存"}
-        okBorderColor={'#3B9ED0'}
+        okBorderColor={'#4F9FF3'}
         okColor={'#fff'}
-        oKBg={'#3B9ED0'}
+        oKBg={'#4F9FF3'}
         title={'保存病历'}
         height={200}
       >
@@ -630,7 +624,6 @@ class Operation extends Component {
         okBorderColor={this.state.borderColor}
         okColor={this.state.okColor}
         oKBg={this.state.oKBg}
-        borderBtm={type==3?'1px solid #ccc':null}
         title={type==3?'保存病历模板':type==4?"新建文件夹":type==1?"保存病历":null}
       >
         {this.state.msg}

src/components/Operation/index.less

@@ -54,10 +54,10 @@
         outline: none;
         border-radius: 4px;
         cursor: pointer;
-        border: 1px solid #3B9ED0;
+        border: 1px solid @bannerBg;
         box-sizing: border-box;
         margin-left:20px;
-        background: #3B9ED0;
+        background: @bannerBg;
         color: #fff;
         float: none;
         display: inline-block;
@@ -69,12 +69,12 @@
         font-size: 13px;
     }
     .clearButton {
-      border: 1px solid #414141;
+      border: 1px solid #9C9C9C;
       border-radius: 4px;
       background-color: #fff;
       margin-left: 0;
       margin-right: 15px;
-      color: #000;
+      color: #333;
     }
     .modal{
         position: fixed;
@@ -328,7 +328,6 @@
           background: #3B9ED0;
         }
         .delCancel{
-          color:#000;
           background: #fff;
           border: 1px solid #1E1E1E;
           color: #1E1E1E;
@@ -341,23 +340,16 @@
   }
 
 .outBox{
-    padding-left: 18px;
-    height: 60px;
-    width: 100%;
-    position: relative;
-    top: 41px;
-    // display: flex;
-    // flex-direction: column;
-    // justify-content: center;
-    margin-bottom: 40px;
+    padding: 33px 0 0 33px;
     .innerInp{
+        margin-top: -11px;
         .innerInput{
             outline-style: none ;
             border: 1px solid #ccc; 
             border-radius: 3px;
             padding: 7px 4px;
             font-size: 14px;
-            font-family: "Microsoft soft";
+            font-family: "Microsoft YaHei";
         }
         .innerInput:focus{
             border-color: #66afe9;

src/components/PatInfo/index.less

@@ -1,11 +1,11 @@
 @import "~@less/variables.less";
 .infoContainer{
   width: 100%;
-  // min-width: 930px;
-  height: 60px;
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
+  border: 1px solid #BBBFC1;
+  border-right: none;
   .infoItem{
     width: 25%;
     min-width: 25%;
@@ -13,8 +13,8 @@
     // min-width: 230px;
     float: left;
     flex: 1;
-    height: 30px;
-    border-right: 1px solid @person-table-color;   
+    height: 33px;
+    border-right: 1px solid @person-table-color;
     display: flex;
     justify-content: center;
     align-items: center;
@@ -109,7 +109,6 @@
       width:100%;
       box-sizing: border-box;
       margin: 0;
-      padding: 0;
       list-style: none;
       display: inline-block;
       height: 32px;
@@ -117,7 +116,6 @@
       color: rgba(0, 0, 0, 0.65);
       font-size: 14px;
       line-height: 1.5;
-      background-color: #fff;
       background-image: none;
       border-radius: 4px;
       transition: all 0.3s;
@@ -185,19 +183,17 @@
       color: rgba(0, 0, 0, 0.65);
       font-size: 14px;
       background-color: #fff;
-      background-image: none;
-      border: 1px solid #d9d9d9;
-      border-radius: 4px;
+      box-shadow: 0px 2px 10px 0px #cecece;
       cursor: pointer;
       transition: 0.35s;
       opacity: 1;
-      box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.3);
       .item {
         position: relative;
         line-height: 20px;
         padding: 8px;
         &:hover {
-          background: rgba(226,241,248,1);
+          background: @hoverBg;
+          color: @bannerBg;
         }
       }
     }

src/components/PreviewBody/Inspect/index.jsx

@@ -7,9 +7,9 @@ const PreviewInspect = (props) => {
     return <tr className={style['patInfoFst']}>
       <td className={style['patInfoSec']}>检验：</td>
       <td className={style['patInfoSec']}>
-        <table style={style.assistTable}>
+        <table className={style.assistTable}>
         {
-          (dataJson.labelListSmall.length !== 0 || dataJson.labelListBig.length !== 0) && ( <tr style={{ lineHeight: '36px' }}>检验结果数据</tr>)
+          (dataJson.labelListSmall.length !== 0 || dataJson.labelListBig.length !== 0) && ( <span style={{ lineHeight: '36px' }}>检验结果数据</span>)
         }
         {
           dataJson && dataJson.labelListSmall && dataJson.labelListSmall.map((item) => {

src/components/PreviewBody/MedicalAdvice/index.jsx

@@ -14,7 +14,7 @@ class MedicalAdvice extends Component {
         <tr className={style['patInfoFst']}>
           <td className={style['patInfoSec']}>医嘱：</td>
           <td className={style['patInfoSec']}>
-            <table style={style.assistTable}>
+            <table className={style.assistTable}>
               {
               labelListBig && labelListBig.map((item,index)=>{
                 return (

src/components/PreviewBody/index.jsx

@@ -82,18 +82,18 @@ class PreviewBody extends Component {
     }
   }
   render() {
-    const { show, preInfo, dataJson, dataStr, baseObj, flg ,come,showAssessBtn,showHistoryCases} = this.props;console.log(3,dataStr)
+    const { show, preInfo, dataJson, dataStr, baseObj, flg ,come,showAssessBtn,showHistoryCases} = this.props;//console.log(3,dataStr)
     let other_data={},lis_data={},pas_data={},other_yjs='',access='',adviceData={};
     let isShowSex = baseObj.sex !== 2 ? false : true
     const contStyle = {
-      opacity: '0.4',
+      opacity: '1',
       right: '0',
       top: '1px',
       zIndex: '15',
-      width: '14px',
+      width:'7px',
       background: '#f1f1f1'
     };
-    const barStyle = { background: '#777', width: '100%' };
+    const barStyle = { borderRadius:'4px',background: '#C9C9C9', width: '100%' };
     // if(!come){
     //   other_data = JSON.parse(baseObj.detailList[2].contentJson)
     //   lis_data = JSON.parse(baseObj.detailList[4].contentJson)
@@ -117,7 +117,7 @@ class PreviewBody extends Component {
         verticalContainerStyle={contStyle}
         verticalScrollbarStyle={barStyle}
         contentClassName="content">
-      <div className={style['contents']} id="content" style={{ margin: "0 auto", maxWidth: "620px" }}>
+      <div className={style['contents']} id="content">
         {/* <div style={{height:'40px', backgroundColor: 'red', width:'100%'}}></div> */}
         <Information baseObj={baseObj} preInfo={preInfo}></Information>
         <table className={style['infos']}>

src/components/PreviewBody/index.less

@@ -10,6 +10,7 @@
   .contents {
     position: relative;
     padding-bottom: 26px;
+    margin: 0 15px 0 18px;
     // padding-top: 40px;
   }
 }
@@ -70,8 +71,11 @@ table{
   margin-bottom: 10px;
   width: 100%;
   font-size: 12px;
+  tr:nth-child(odd){
+    background: #F2F2F2;
+  }
   .assistTableTrSec {
-    line-height: 1.5;
+    line-height: 22px;
     max-width: 650px;
     td {
       font-size: 12px;
@@ -106,7 +110,7 @@ table{
   width: 32%;
 }
 .adviceTableTdFst {
-  width: 45%;
+  width: 28%;
 }
 .assistTableTdSec {
   width: 12%;
@@ -122,7 +126,7 @@ table{
   width:18%;
 }
 .assistTableTdFor {
-  width: 18%;
+  width: 22%;
 }
 .assistTableTrSecExcel {
   line-height: 1.5;

src/components/PushContainer/index.jsx

@@ -649,7 +649,6 @@ class PushContainer extends Component {
         okBorderColor={okBorderColor}
         okColor={okColor}
         oKBg={oKBg}
-        borderBtm={type==5||type==3?'1px solid #ccc':null}
       >
         {message}
         {

src/components/PushData/index.jsx

@@ -3,6 +3,7 @@ import style from './index.less';
 import arrowIcon from '@images/arrowIcon.png';
 import pushEmpty from '@images/pushEmpty.png';
 import {pushPage2} from '@utils/config';
+import {getUrlArgObject} from '@utils/tools';
 import {dragBox} from '@utils/drag';
 import hideConfirm from '@images/hideConfirm.png';
 
@@ -36,19 +37,19 @@ class PushData extends Component{
       }
 
     render(){
-        const {hashNum } = this.state
-        const {mrId,isTcm,planCode,showPushData,togglePushData ,windowWidth,windowHeight,hospitalId} = this.props
+        const hideLg  = getUrlArgObject("hideLg");
+        const {mrId,isTcm,planCode,showPushData ,windowWidth,hospitalId} = this.props
         const pushBoxPos = windowWidth>1200?(windowWidth-1200)/2:0;
-        const url =`${pushPage2}?mrId=${mrId.indexOf("reStart") > - 1?"":mrId}&isTcm=${isTcm}&planCode=${planCode}&hospitalId=${hospitalId}${mrId.indexOf("reStart") > - 1 ? '&reStart='+Math.random():""}`;
+        const url =`${pushPage2}?mrId=${mrId.indexOf("reStart") > - 1?"":mrId}&isTcm=${isTcm}&planCode=${planCode}&hospitalId=${hospitalId}${mrId.indexOf("reStart") > - 1 ? '&reStart='+Math.random():""}`+(hideLg?`&hideLg=1`:``);
         return <div >
             {!showPushData&&<div className={style['slideButton']} style={{right:pushBoxPos+'px'}} onClick={this.showPushData}>
-                朗通智能提醒 
+                {hideLg?'智能提醒':'朗通智能提醒'}
                 <img class={style['arrowIcon']} src={arrowIcon} alt=""/>
             </div>}
             {showPushData&&<div id="dragModalWrap" className={style['pushWrapper']} style={{right:pushBoxPos+'px'}} onWheel={this.handleScroll.bind(this)}>
                 {/* <div id="dragModalTitle"  className={style['pushDataTitle']}>朗通智能提醒 <span className={style['pushDataHide']} onClick={this.hidePushData}>收起</span></div> */}
-                <div className={style['pushDataTitle']}>朗通智能提醒 <span className={style['pushDataHide']} onClick={this.hidePushData}>    <img class={style['hideConfirm']} src={hideConfirm} alt=""/></span></div>
-                {hospitalId&&<iframe id='embedPage'  src={url} frameborder="0" width="348" height="507" onWheel={this.handleScroll.bind(this)}></iframe>}
+                <div className={style['pushDataTitle']}>{hideLg?'智能提醒':'朗通智能提醒'} <span className={style['pushDataHide']} onClick={this.hidePushData}>    <img class={style['hideConfirm']} src={hideConfirm} alt=""/></span></div>
+                {hospitalId&&<iframe id='embedPage'  src={url} frameborder="0" width="400" height="557" onWheel={this.handleScroll.bind(this)}></iframe>}
                 {!hospitalId&&<div className={style['pushEmpty']}>
                         <div className={style['pushEmptyBox']}>
                             <img className={style['pushEmptyImg']} src={pushEmpty} alt=""/>

src/components/PushData/index.less

@@ -1,3 +1,4 @@
+@import "~@less/variables.less";
 .slideButton{
     position: fixed;
     width:158px;
@@ -7,17 +8,17 @@
     bottom: 150px;
     right: 0px;
     font-size:16px;
-    background: #7AC1DE;
+    background: @bannerBg;
     color: #fff;
     border-radius:100px 0px 0px 100px;
     cursor: pointer;
     z-index: 31;
 }
 .arrowIcon{
-    width: 22px;
+    width: 15px;
     position: absolute;
-    right: 15px;
-    top: 8px;
+    right: 22px;
+    top: 13px;
 }
 .pushEmptyBox{
     position: relative;
@@ -36,22 +37,22 @@
     margin: 15px 0 0 0;
 }
 .pushWrapper{
-    width:350px;
+    width:400px;
     // height:600px;
-    border-radius:4px;
     border: 1px solid #E6E6E6;
     border-bottom:0px;
     position: fixed;
     bottom: 20px;
     right: 10px;
     background: #fff;
+    border-radius: 4px 4px 0px 0px;
     z-index: 31;
     box-sizing: border-box;
 }
 .pushDataTitle{
     height: 40px;
     line-height: 40px;
-    background: #7AC1DE;
+    background: @bannerBg;
     color: #fff;
     font-size:16px;
     text-align: center;
@@ -62,7 +63,7 @@
     display: inline-block;
     position: absolute;
     height: 40px;
-    padding: 0 10px;
+    padding: 0 18px 0 10px;
     font-size:16px;
     right: 0px;
     cursor: pointer;

src/store/async-actions/assistCheck.js

@@ -1,39 +1,39 @@
 import axios from '@utils/ajax';
 import store from '@store';
 import { searchList } from '../actions/assistCheck';
-import {  Notify } from '@commonComp';
+import { Notify } from '@commonComp';
 import { formatFormParmas } from '@utils/tools';
 
 export const getSearchList = (val) => {
-    if(val.trim() == ''){
+    if (val.trim() == '') {
         const data = [];
-        return (dispatch) => dispatch(searchList(data,''));
+        return (dispatch) => dispatch(searchList(data, ''));
     }
     let baseList = store.getState();
     let sex = baseList.patInfo.message.patientSex;
     return (dispatch) => {
-        axios.json('/demo/retrieval/index',{
-            "age": formatFormParmas('patientAge',baseList.patInfo.patInfoData),
+        axios.json('/demo/retrieval/index', {
+            "age": formatFormParmas('patientAge', baseList.patInfo.patInfoData),
             "inputStr": val.trim(),
-            "sex": formatFormParmas('patientSex',baseList.patInfo.patInfoData),
+            "sex": formatFormParmas('patientSex', baseList.patInfo.patInfoData),
             "type": '3',
-            "hospitalId":baseList.homePage.curHos.hosId
+            "hospitalId": baseList.homePage.curHos.hosId
         })
-        .then((res)=>{
-            if(res.data.code==0){
-                const data = res.data.data;let curDate=[];
-                let arr = data.pacsNames||[];
+            .then((res) => {
+                if (res.data.code == 0) {
+                    const data = res.data.data; let curDate = [];
+                    let arr = data.nameList || [];
                     for (var key in arr) {
                         let obj = {}
-                        obj['uniqueName'] = arr[key];
-                        obj['detailName'] = arr[key];
-                        obj['name'] = arr[key];
+                        obj['uniqueName'] = arr[key].name;
+                        obj['detailName'] = arr[key].name;
+                        obj['name'] = arr[key].name;
                         curDate.push(obj)
                     }
-                dispatch(searchList(curDate,val.trim()));
-            }else{
-                Notify.error(res.data.msg)
-            }
-        })
+                    dispatch(searchList(curDate, val.trim()));
+                } else {
+                    Notify.error(res.data.msg)
+                }
+            })
     }
 };

src/store/async-actions/diagnosticSearch.js

@@ -45,7 +45,7 @@ export const getSearchList = (val,flag) => {
             if(res.data.code==0){
                 const data = res.data.data;let curDate=[];
 
-                let arr = data[showTcm?'tcmdiseaseNames':(showSym?'tcmsyndromeNames':'diseaseNames')]||[];
+                let arr = data[showTcm ? 'nameList' : (showSym ? 'nameList' :'nameList')]||[];
                 for(let i = 0;i < arr.length;i++){
                     let tmp = arr[i]
                     let obj = {}

src/store/async-actions/homePage.js

@@ -180,9 +180,13 @@ export const getCommonData = (dispatch) => {
 
 // 医院列表
 export const getHosData = (dispatch) => {
+  const hideLg = getUrlArgObject("hideLg");  //隐藏logo时朗通显示为默认
   return (dispatch) => {
       json(api.getAllEnableHospitalInfo,{}).then((res)=>{
           const data = res.data;
+          if(hideLg&&data.data){
+              data.data[0].name = "默认";
+          }
           if(data.code == '0'){
             dispatch({
               type:HOSPITALMSG,

src/store/async-actions/inspect.js

@@ -30,14 +30,16 @@ export const getSearchList = (val) => {
                         curDate[i]['flg'] = 0;
                     }
                 }else{
-                    let arr = data.lisNames||[],tmp=[];
+                    console.log(data)
+                    let arr = data.nameList||[],tmp=[];
                     for (var key in arr) {
                         let obj = {}
-                        obj['uniqueName'] = arr[key];
-                        obj['detailName'] = arr[key];
+                        console.log(arr[key])
+                        obj['uniqueName'] = arr[key].name;
+                        obj['detailName'] = arr[key].name;
                         obj['value'] = '';
                         obj['otherValue']='';
-                        obj['name'] = arr[key];
+                        obj['name'] = arr[key].name;
                         obj['flg'] = 1;
                         tmp.push(obj)
                     }

src/store/async-actions/newAdvice.js

@@ -24,13 +24,13 @@ export const getSearchList = (val) => {
             if(res.data.code==0){
                 const data = res.data.data;let curDate=[];
                 //药：阿替乐尔；手术：髂动脉造影
-                let arr = type==5?(data.drugNames||[]):type==6?(data.operationNames||[]):(data.transfusionNames||[]),tmp=[];
+                let arr = data.nameList || [],tmp=[];
                 for(let i = 0;i < arr.length;i++){
                     let obj = {}
                     if(type==8){
-                        obj['uniqueName'] = arr[i];
-                        obj['name'] = arr[i];
-                        obj['detailName'] = arr[i];
+                        obj['uniqueName'] = arr[i].name;
+                        obj['name'] = arr[i].name;
+                        obj['detailName'] = arr[i].name;
                         obj['flg'] = type;
                     }else{
                         obj['uniqueName'] = arr[i].name;

src/store/reducers/assistCheck.js

@@ -171,9 +171,13 @@ export default (state = initSearchList, action) => {
   }
   if (action.type == REASSISTCHECKDATA) {
     const newState = Object.assign({}, state);
-    newState.assistLabel = action.params[9].contentValue;
-    newState.totalOrder = action.params[9].contentValue;
-    newState.dataArr = action.params[9].contentValue;
+    const data = action.params[9].contentValue;
+    const arr = data.filter((it)=>{
+      return it.check;
+    });
+    newState.assistLabel = data;
+    newState.totalOrder = arr;
+    newState.dataArr = data;
     newState.dataString = action.params[9].content;
     return newState;
   }

src/store/reducers/inspect.js

@@ -293,9 +293,13 @@ export default (state = initSearchList, action) => {
     }
     if (action.type == REINSPECTDATA) {
       const newState = Object.assign({}, state);
-        newState.labelListBig = action.params[8].content.labelListBig
+      const data = action.params[8].content.labelListBig;
+        const arr = data.filter((it)=>{
+            return it.check;
+        });
+        newState.labelListBig = data
         newState.labelListSmall = action.params[8].content.labelListSmall;       
-        newState.totalOrder = action.params[8].content.labelListBig;       
+        newState.totalOrder = arr;
       return newState;
 
     }

src/store/reducers/newAdvice.js

@@ -1,28 +1,28 @@
 import {
-  SEARCH_LIST,
-  SET_LABEL,
-  FILL_ACTIVE,
-  GET_EXCEL,
-  CHECK_VALUE_IS_CHANGE,
-  CLEAR_LABEL,
-  RESET_LABEL_NEW,
-  CLEAR_ALL_LABEL,
-  DEL_PART_ITEM_NEW,
-  DEL_EXCEL_LIST,
-  ADD_LABEL,
-  SET_CONTEXT,
-  SET_TIP_ADVICE,
-  DEL_ONE_PIC_NEW,
-  SEARCH_TYPE_NEW,
-  CHECK_OFF_ON_NEW,
-  RENEWADVICEDATA,
-  CLEARNEWADVICEDATA,
-  SELECTJITYPE,
-  HANDLESELECTSHOW,
-  HANDLESUI,
+    SEARCH_LIST,
+    SET_LABEL,
+    FILL_ACTIVE,
+    GET_EXCEL,
+    CHECK_VALUE_IS_CHANGE,
+    CLEAR_LABEL,
+    RESET_LABEL_NEW,
+    CLEAR_ALL_LABEL,
+    DEL_PART_ITEM_NEW,
+    DEL_EXCEL_LIST,
+    ADD_LABEL,
+    SET_CONTEXT,
+    SET_TIP_ADVICE,
+    DEL_ONE_PIC_NEW,
+    SEARCH_TYPE_NEW,
+    CHECK_OFF_ON_NEW,
+    RENEWADVICEDATA,
+    CLEARNEWADVICEDATA,
+    SELECTJITYPE,
+    HANDLESELECTSHOW,
+    HANDLESUI,
 } from '../types/newAdvice';
 import store from '@store';
-import {getStringPlus,getPushLists,getPushList,getCurrentDate} from '@utils/tools.js';
+import { getStringPlus, getPushLists, getPushList, getCurrentDate } from '@utils/tools.js';
 
 const initSearchList = {
     list: [], //搜索的结果
@@ -31,22 +31,22 @@ const initSearchList = {
     fillActive: {}, //选中的标签的填写单
 
     getExcelData: {}, //导入的数据
-    inspectStrPlus:'',
+    inspectStrPlus: '',
 
     getExcelDataList: [], //导入的数据
-    pushItem:[],    //推送的数据
-    pushItems:[],    //右侧模板预览的数据
-    inspectVal:'',
-    context:{},
-    shType:5,
-    labelListBig:[],//大项
-    labelListSmall:[],//小项
-    labelListBlood:[],//输血
-    drugOrder:[],//开单项
-    operationOrder:[],//开单项
-    transfusionOrder:[],
-    activeIdx:'',
-    operationName:{}
+    pushItem: [],    //推送的数据
+    pushItems: [],    //右侧模板预览的数据
+    inspectVal: '',
+    context: {},
+    shType: 5,
+    labelListBig: [],//大项
+    labelListSmall: [],//小项
+    labelListBlood: [],//输血
+    drugOrder: [],//开单项
+    operationOrder: [],//开单项
+    transfusionOrder: [],
+    activeIdx: '',
+    operationName: {}
 }
 
 export default (state = initSearchList, action) => {
@@ -54,10 +54,10 @@ export default (state = initSearchList, action) => {
         const newState = Object.assign({}, state);
         let tempArr = newState.labelListSmall;
         let tmpLis = action.item
-        for(let i = 0;i < tempArr.length;i++){
-            if(action.idx == i){
+        for (let i = 0; i < tempArr.length; i++) {
+            if (action.idx == i) {
                 tempArr[i].hasTreat = 1
-            }else{
+            } else {
                 tempArr[i].hasTreat = 0
             }
         }
@@ -73,11 +73,11 @@ export default (state = initSearchList, action) => {
     if (action.type == HANDLESELECTSHOW) {
         const newState = Object.assign({}, state);
         let tempArr = newState.labelListBig;
-        for(let i = 0;i < tempArr.length;i++){
-            if(action.idx == i){
+        for (let i = 0; i < tempArr.length; i++) {
+            if (action.idx == i) {
                 let flg = tempArr[i].selectShow;
-                tempArr[i].selectShow = action.sign==1?true:action.sign==0?false:!flg
-                newState.activeIdx = action.idx 
+                tempArr[i].selectShow = action.sign == 1 ? true : action.sign == 0 ? false : !flg
+                newState.activeIdx = action.idx
             }
         }
         newState.labelListBig = [...tempArr]
@@ -86,8 +86,8 @@ export default (state = initSearchList, action) => {
     if (action.type == SELECTJITYPE) {
         const newState = Object.assign({}, state);
         let tempArr = newState.labelListBig;
-        for(let i = 0;i < tempArr.length;i++){
-            if(action.idx == i){
+        for (let i = 0; i < tempArr.length; i++) {
+            if (action.idx == i) {
                 tempArr[i].selectShow = false
                 tempArr[i].form = action.part.name
                 tempArr[i].selectVal = action.part.val
@@ -101,38 +101,38 @@ export default (state = initSearchList, action) => {
         let tempArr = newState.labelListBig;
         let tempArrs = newState.labelListSmall;
         let tmpArr = newState.labelListBlood;
-        let tmpLis = action.item,tempBigOrder=[],tempSmallOrder=[],tempBloodOrder=[],tempTotalOrder=[];
-        if(tmpLis&&tmpLis.flg == 5){//药品
-            for(let i = 0;i < tempArr.length;i++){
-                if(action.tip == i){
+        let tmpLis = action.item, tempBigOrder = [], tempSmallOrder = [], tempBloodOrder = [], tempTotalOrder = [];
+        if (tmpLis && tmpLis.flg == 5) {//药品
+            for (let i = 0; i < tempArr.length; i++) {
+                if (action.tip == i) {
                     let flg = tempArr[i].check;
                     tempArr[i].check = !flg
                 }
             }
             newState.labelListBig = [...tempArr]
-        }else if(tmpLis&&tmpLis.flg == 6){//手术、操作
-            for(let i = 0;i < tempArrs.length;i++){
-                if(action.tip == i){
+        } else if (tmpLis && tmpLis.flg == 6) {//手术、操作
+            for (let i = 0; i < tempArrs.length; i++) {
+                if (action.tip == i) {
                     let flg = tempArrs[i].check;
                     tempArrs[i].check = !flg
                 }
             }
             newState.labelListSmall = [...tempArrs]
-        }else if(tmpLis&&tmpLis.flg == 8){//输血
-            for(let i = 0;i < tmpArr.length;i++){
-                if(action.tip == i){
+        } else if (tmpLis && tmpLis.flg == 8) {//输血
+            for (let i = 0; i < tmpArr.length; i++) {
+                if (action.tip == i) {
                     let flg = tmpArr[i].check;
                     tmpArr[i].check = !flg
                 }
             }
             newState.labelListBlood = [...tmpArr]
         }
-        tempBigOrder = tempArr.filter((item)=>item.check)
-        tempSmallOrder = tempArrs.filter((item)=>item.check)
-        tempBloodOrder = tmpArr.filter((item)=>item.check)
-        newState.drugOrder=[...tempBigOrder]
-        newState.operationOrder=[...tempSmallOrder]
-        newState.transfusionOrder=[...tempBloodOrder]
+        tempBigOrder = tempArr.filter((item) => item.check)
+        tempSmallOrder = tempArrs.filter((item) => item.check)
+        tempBloodOrder = tmpArr.filter((item) => item.check)
+        newState.drugOrder = [...tempBigOrder]
+        newState.operationOrder = [...tempSmallOrder]
+        newState.transfusionOrder = [...tempBloodOrder]
         return newState;
     }
     if (action.type == DEL_ONE_PIC_NEW) {
@@ -140,29 +140,29 @@ export default (state = initSearchList, action) => {
         let tempArr = newState.labelListBig;
         let tempArrs = newState.labelListSmall;
         let tmpArr = newState.labelListBlood;
-        let tmpLis = action.item,tempBigOrder=[],tempSmallOrder=[],tempBloodOrder=[],tempTotalOrder=[],num=0;
-        if(tmpLis&&tmpLis.flg == 5){
-            tempArr = tempArr.filter((item,idx)=>{
-                if(action.tip != idx){
+        let tmpLis = action.item, tempBigOrder = [], tempSmallOrder = [], tempBloodOrder = [], tempTotalOrder = [], num = 0;
+        if (tmpLis && tmpLis.flg == 5) {
+            tempArr = tempArr.filter((item, idx) => {
+                if (action.tip != idx) {
                     return item
                 }
             })
             newState.labelListBig = [...tempArr]
-        }else if(tmpLis&&tmpLis.flg == 6){
-            tempArrs = tempArrs.filter((item,idx)=> {
-                if(action.tip != idx){
+        } else if (tmpLis && tmpLis.flg == 6) {
+            tempArrs = tempArrs.filter((item, idx) => {
+                if (action.tip != idx) {
                     return item
                 }
             })
-            if(tempArrs.length == 0){
+            if (tempArrs.length == 0) {
                 newState.operationName = {}
-            }else{
-                for(let i = 0;i < tempArrs.length;i++){
-                    if(tempArrs[i].hasTreat != 1){
+            } else {
+                for (let i = 0; i < tempArrs.length; i++) {
+                    if (tempArrs[i].hasTreat != 1) {
                         ++num
                     }
                 }
-                if(tempArrs.length>0&&num == tempArrs.length){
+                if (tempArrs.length > 0 && num == tempArrs.length) {
                     tempArrs[0]['hasTreat'] = 1
                     let obj = {
                         "dateValue": tempArrs[0].dateValue,
@@ -173,48 +173,48 @@ export default (state = initSearchList, action) => {
                 }
             }
             newState.labelListSmall = [...tempArrs]
-        }else if(tmpLis&&tmpLis.flg == 8){
-            tmpArr = tmpArr.filter((item,idx)=> {
-                if(action.tip != idx){
+        } else if (tmpLis && tmpLis.flg == 8) {
+            tmpArr = tmpArr.filter((item, idx) => {
+                if (action.tip != idx) {
                     return item
                 }
             })
             newState.labelListBlood = [...tmpArr]
         }
-        tempBigOrder = tempArr.filter((item)=>item.check)
-        tempSmallOrder = tempArrs.filter((item)=>item.check)
-        tempBloodOrder = tmpArr.filter((item)=>item.check)
-        tempTotalOrder=tempBigOrder.concat(tempSmallOrder)
-        newState.drugOrder=[...tempBigOrder]
-        newState.operationOrder=[...tempSmallOrder]
-        newState.transfusionOrder=[...tempBloodOrder]
+        tempBigOrder = tempArr.filter((item) => item.check)
+        tempSmallOrder = tempArrs.filter((item) => item.check)
+        tempBloodOrder = tmpArr.filter((item) => item.check)
+        tempTotalOrder = tempBigOrder.concat(tempSmallOrder)
+        newState.drugOrder = [...tempBigOrder]
+        newState.operationOrder = [...tempSmallOrder]
+        newState.transfusionOrder = [...tempBloodOrder]
         return newState;
     }
 
-    if (action.type == SET_TIP_ADVICE) {   
+    if (action.type == SET_TIP_ADVICE) {
         const newState = Object.assign({}, state);
         let tempArr = newState.labelListBig;
         let tempArrs = newState.labelListSmall;
         let tmpArr = newState.labelListBlood;
         let tmpLis = action.item
-        if(tmpLis.flg == 5){//药品
-            for(let i= 0;i < tempArr.length;i++){
-                if(action.tip == i){
-                    if(action.sign == 1){//时间
+        if (tmpLis.flg == 5) {//药品
+            for (let i = 0; i < tempArr.length; i++) {
+                if (action.tip == i) {
+                    if (action.sign == 1) {//时间
                         tempArr[i].time = action.value
                         tempArr[i].dateValue = action.value
-                    }else{
+                    } else {
                         tempArr[i].value = action.value
                     }
                 }
             }
             newState.labelListBig = tempArr
-        }else if(tmpLis.flg == 6){//手术
-            for(let i= 0;i < tempArrs.length;i++){
-                if(action.tip == i){
+        } else if (tmpLis.flg == 6) {//手术
+            for (let i = 0; i < tempArrs.length; i++) {
+                if (action.tip == i) {
                     tempArrs[i].time = action.value
                     tempArrs[i].dateValue = action.value
-                    if(tmpLis.hasTreat){
+                    if (tmpLis.hasTreat) {
                         let obj = {
                             "dateValue": action.value,
                             "name": tmpLis.name,
@@ -225,13 +225,13 @@ export default (state = initSearchList, action) => {
                 }
             }
             newState.labelListSmall = tempArrs
-        }if(tmpLis.flg == 8){//输血
-            for(let i= 0;i < tmpArr.length;i++){
-                if(action.tip == i){
-                    if(action.sign == 1){
+        } if (tmpLis.flg == 8) {//输血
+            for (let i = 0; i < tmpArr.length; i++) {
+                if (action.tip == i) {
+                    if (action.sign == 1) {
                         tmpArr[i].time = action.value
                         tmpArr[i].dateValue = action.value
-                    }else{
+                    } else {
                         tmpArr[i].value = action.value
                     }
                 }
@@ -250,20 +250,20 @@ export default (state = initSearchList, action) => {
         const tempArr = newState.labelListBig;
         const tempArrs = newState.labelListSmall;
         const tmpArr = newState.labelListBlood;
-        let tmpLis = action.list,num=0
+        let tmpLis = action.list, num = 0
         tmpLis['time'] = getCurrentDate(1)
         tmpLis['dateValue'] = getCurrentDate(1)
-        if(tmpLis.flg == 5){
+        if (tmpLis.flg == 5) {
             tempArr.push(tmpLis)
             newState.labelListBig = [...tempArr]
-        }else if(tmpLis.flg == 6){
+        } else if (tmpLis.flg == 6) {
             tempArrs.push(tmpLis)
-            for(let i = 0;i < tempArrs.length;i++){
-                if(!tempArrs[i].hasTreat){
+            for (let i = 0; i < tempArrs.length; i++) {
+                if (!tempArrs[i].hasTreat) {
                     ++num
                 }
             }
-            if(num == tempArrs.length){
+            if (num == tempArrs.length) {
                 tempArrs[0]['hasTreat'] = 1
                 let obj = {
                     "dateValue": tmpLis.dateValue,
@@ -273,7 +273,7 @@ export default (state = initSearchList, action) => {
                 newState.operationName = obj
             }
             newState.labelListSmall = [...tempArrs]
-        }else{
+        } else {
             tmpArr.push(tmpLis)
             newState.labelListBlood = [...tmpArr]
         }
@@ -288,11 +288,11 @@ export default (state = initSearchList, action) => {
     if (action.type == SET_LABEL) {             //选中的结果    
         const newState = Object.assign({}, state);
         let tempArr = [];
-        if(action.sign == 'common'){
-          let tmpInspectList = store.getState().homePage.inspectList
-          tempArr = tmpInspectList;
-        }else{
-          tempArr = newState.list
+        if (action.sign == 'common') {
+            let tmpInspectList = store.getState().homePage.inspectList
+            tempArr = tmpInspectList;
+        } else {
+            tempArr = newState.list
         }
         const tempArrs = newState.labelList;
         for (let i = 0; i < tempArr.length; i++) {
@@ -301,24 +301,24 @@ export default (state = initSearchList, action) => {
                 newState.labelList = [...tempArrs]
             }
         }
-        
+
         let tmpArr = newState.getExcelDataList;
         let tmpArr2 = newState.labelList;
-        newState.pushItems = getPushLists(tmpArr,tmpArr2);
+        newState.pushItems = getPushLists(tmpArr, tmpArr2);
         newState.inspectStrPlus = getStringPlus(newState.pushItems)
         return newState;
     }
     if (action.type == ADD_LABEL) {             //右侧推送的检验检查项，点击开单放到左侧检验检查的位置上
         const newState = Object.assign({}, state);
         const tempArr = newState.labelList;
-        for(let i = 0;i <action.lis.length;i++){
-          tempArr.push(action.lis[i]);
+        for (let i = 0; i < action.lis.length; i++) {
+            tempArr.push(action.lis[i]);
         }
         newState.labelList = [...tempArr]
-        
+
         let tmpArr = newState.getExcelDataList;
         let tmpArr2 = newState.labelList;
-        newState.pushItems = getPushLists(tmpArr,tmpArr2);
+        newState.pushItems = getPushLists(tmpArr, tmpArr2);
         newState.inspectStrPlus = getStringPlus(newState.pushItems);
         return newState;
     }
@@ -339,11 +339,11 @@ export default (state = initSearchList, action) => {
         let tmpArr = newState.getExcelDataList;
         let tmpArr2 = newState.labelList;
         for (let i = 0; i < tempArr.length; i++) {
-          // tempArr[i].value = ''
+            // tempArr[i].value = ''
         }
         tempArrs.show = false;
-        newState.pushItem = getPushList(tmpArr,tmpArr2);
-        newState.pushItems = getPushLists(tmpArr,tmpArr2);
+        newState.pushItem = getPushList(tmpArr, tmpArr2);
+        newState.pushItems = getPushLists(tmpArr, tmpArr2);
         newState.inspectStrPlus = getStringPlus(newState.pushItems)
         return newState;
     }
@@ -355,21 +355,21 @@ export default (state = initSearchList, action) => {
 
         tmpArr.push(action.data)
         newState.getExcelDataList = [...tmpArr]
-        newState.pushItem = getPushList(tmpArr,tmpArr2);
-        newState.pushItems = getPushLists(tmpArr,tmpArr2);
+        newState.pushItem = getPushList(tmpArr, tmpArr2);
+        newState.pushItems = getPushLists(tmpArr, tmpArr2);
         newState.inspectStrPlus = getStringPlus(newState.pushItems)
         // getExcelString(action,newState,tmpArr,tmpArr2)
         return newState;
     }
-    if(action.type == DEL_EXCEL_LIST){       //删除excel列表的某个数据
+    if (action.type == DEL_EXCEL_LIST) {       //删除excel列表的某个数据
         const newState = Object.assign({}, state);
         const tempArr2 = newState.labelList;
         let tmpArr = newState.getExcelDataList;
-        tmpArr.splice(action.idx,1);
+        tmpArr.splice(action.idx, 1);
         newState.getExcelDataList = [...tmpArr];
         let tempArr1 = newState.getExcelDataList;
-        newState.pushItem = getPushList(tempArr1,tempArr2);
-        newState.pushItems = getPushLists(tempArr1,tempArr2);
+        newState.pushItem = getPushList(tempArr1, tempArr2);
+        newState.pushItems = getPushLists(tempArr1, tempArr2);
         newState.inspectStrPlus = getStringPlus(newState.pushItems)
         return newState;
     }
@@ -385,58 +385,70 @@ export default (state = initSearchList, action) => {
         newState.fillActive = tempArr;
         newState.labelList = tempArrs;
         // tempArrAct.show = true;
-        newState.pushItem = getPushList(tmpArr,tempArrs);
-        newState.pushItems = getPushLists(tmpArr,tempArrs);
+        newState.pushItem = getPushList(tmpArr, tempArrs);
+        newState.pushItems = getPushLists(tmpArr, tempArrs);
         newState.inspectStrPlus = getStringPlus(newState.pushItems)
         return newState;
     }
     if (action.type == CLEAR_ALL_LABEL) {     //清空所有数据
         const newState = Object.assign({}, state);
-        newState.labelList =action.data;
+        newState.labelList = action.data;
         newState.getExcelDataList = action.dataExcel;
         let tmpArr = action.dataExcel;
         const tempArrs = action.data;
-        newState.pushItem = getPushList(tmpArr,tempArrs);
+        newState.pushItem = getPushList(tmpArr, tempArrs);
         newState.inspectStrPlus = action.saveTextData;
         return newState;
     }
     if (action.type == DEL_PART_ITEM_NEW) {     //清空填寫数据
         const newState = Object.assign({}, state);
         const tempArr = newState.labelList;
-        tempArr.splice(action.idx,1);
+        tempArr.splice(action.idx, 1);
         newState.labelList = [...tempArr];
         let tmpArr = newState.getExcelDataList;
-        newState.pushItem = getPushList(tmpArr,tempArr);
-        newState.pushItems = getPushLists(tmpArr,tempArr);
+        newState.pushItem = getPushList(tmpArr, tempArr);
+        newState.pushItems = getPushLists(tmpArr, tempArr);
         newState.inspectStrPlus = getStringPlus(newState.pushItems)
         return newState;
     }
-    if (action.type == SET_CONTEXT) {    
+    if (action.type == SET_CONTEXT) {
         const newState = Object.assign({}, state);
         newState.context = action.obj
         return newState;
     }
     if (action.type == RENEWADVICEDATA) {
-      const newState = Object.assign({}, state);
-      newState.labelListBig = action.params[11].content.labelListBig;
-      newState.labelListSmall = action.params[11].content.labelListSmall;
-      newState.drugOrder = action.params[11].content.labelListBig;
-      newState.operationOrder = action.params[11].content.labelListSmall;
-      newState.labelListBlood = action.params[11].content.labelListBlood;
-      newState.transfusionOrder = action.params[11].content.transfusionOrder;
-      newState.operationName = action.params[11].content.operationName;
-      return newState;
+        const newState = Object.assign({}, state);
+        const data = action.params[11].content.labelListBig;
+        const drugArr = data.filter((it) => {
+            return it.check;
+        });
+        const data1 = action.params[11].content.labelListSmall;
+        const operationArr = data1.filter((it) => {
+            return it.check;
+        });
+        const data2 = action.params[11].content.labelListBlood;
+        const transfusionOrder = data2.filter((it) => {
+            return it.check;
+        });
+        newState.labelListBig = data;
+        newState.labelListSmall = data1;
+        newState.drugOrder = drugArr;
+        newState.operationOrder = operationArr;
+        newState.labelListBlood = action.params[11].content.labelListBlood;
+        newState.transfusionOrder = transfusionOrder;
+        newState.operationName = action.params[11].content.operationName;
+        return newState;
     }
     if (action.type == CLEARNEWADVICEDATA) {
-    const newState = Object.assign({}, state);
-    newState.labelListBig = [];
-    newState.labelListSmall = [];
-    newState.drugOrder = [];
-    newState.operationOrder = [];
-    newState.labelListBlood = [];
-    newState.transfusionOrder = [];
-    newState.operationName = {};
-    return newState;
+        const newState = Object.assign({}, state);
+        newState.labelListBig = [];
+        newState.labelListSmall = [];
+        newState.drugOrder = [];
+        newState.operationOrder = [];
+        newState.labelListBlood = [];
+        newState.transfusionOrder = [];
+        newState.operationName = {};
+        return newState;
     }
     return state;
 }

src/utils/config.js

@@ -44,8 +44,8 @@ function geturl(){
     }else{
         return {
             // gourl:'http://192.168.2.122:5654/cdss.html',
-            gourl:'http://132.147.253.31:5654/cdss.html',
-            imgurl:'http://132.147.253.31:12282'
+            gourl:'http://223.93.170.82:22654/cdss.html',
+            imgurl:'http://223.93.170.82:12282'
         }
     }
 }