Merge remote-tracking branch 'origin/dev5.3.4' into dev5.3.4

src/common/components/EditableSpan/index.jsx

@@ -1,7 +1,7 @@
 import React,{Component} from 'react';
 import style from './index.less';
 import config from "@config/index";
-import {filterArr,isIE,getPageCoordinate,filterDataArr,preventDefault} from '@utils/tools.js';
+import {filterArr,isIE,getPageCoordinate,filterDataArr,preventDefault,setFontColorSize} from '@utils/tools.js';
 import Notify from '../Notify/index.js';
 import classNames from 'classnames';
 
@@ -372,7 +372,7 @@ class EditableSpan extends Component{
     if(br&&$span&&!$span.innerText){
       this.$span.current.innerHTML=' ';
     }
-    return classNames(style['editable-span'],isFull,unselect,hasBr);
+    return classNames(style['editable-span'],isFull,unselect,hasBr,setFontColorSize(2));
   }
 
   render() {

src/common/components/InlineTag/index.jsx

@@ -3,6 +3,7 @@ import style from "./index.less";
 import classNames from 'classnames';
 import Notify from '@commonComp/Notify';
 import config from '@config/index';
+import {setFontColorSize} from '@utils/tools';
 /***
  * 标签组件
  * author:zn@2018-11-08
@@ -78,17 +79,17 @@ class InlineTag extends Component {
   getStyle(){
     const {hideTag,placeholder,isExtBlue} = this.props;
     const value = this.state.value;
-    const ext = isExtBlue?style['ext']:'';
-    if(hideTag){
+    const ext = isExtBlue?style['ext']:'';//是否为体征
+    if(hideTag){//是否是多标签组合
       if(value){
-        return classNames(style['selected-no-tag']);
+        return classNames(style['selected-no-tag'], setFontColorSize());
       }
-      return classNames(style['no-tag'],ext);
+      return classNames(style['no-tag'],ext, setFontColorSize(2),'prefixUnsetColor');
     }
-    if(!value||value.trim()==placeholder){
-      return classNames(style['gray'],ext);
+    if(!value||value.trim()==placeholder){//灰色标签
+      return classNames(style['gray'],ext, setFontColorSize(1));
     }
-    return style['selected-tag'];
+    return classNames(style['selected-tag'], setFontColorSize());
   }
   moveEnd(obj) {
     if(window.getSelection){//ie11 10 9 ff safari
@@ -114,18 +115,18 @@ class InlineTag extends Component {
     this.$span.current.style.minWidth=spanWidth;
   }
   render(){
-    const {prefix,suffix} = this.props;
+    const {prefix,suffix,isExtBlue} = this.props;
     return <div className={this.getStyle()}
                 onClick={this.handleFixClick}>
-                <span>{prefix}</span>
-                <span className={style['free-in']}
+                <span className="prefixUnset">{prefix}</span>
+                <span className={`${style['free-in']}`}
                       contentEditable={true}
                       onBlur={this.handleBlur}
                       onInput={this.handleInput}
                       onFocus={this.handleFocus}
                       onClick={(e)=>{e.stopPropagation();}}
                       ref={this.$span}></span>
-                <span>{suffix}</span>
+                <span className="prefixUnset">{suffix}</span>
             </div>;
     }
 }

src/common/components/InlineTag/index.less

@@ -14,6 +14,10 @@
 }
 .gray{
    .tag;
+   span {
+    color: unset;
+    font-size: unset;
+   }
   &.ext{
     color: @extBlue;
   }
@@ -23,7 +27,8 @@
   min-width: 30px;
   vertical-align: top;
   text-align: center;
-  /*border-bottom: 1px @placeholder-color solid;*/
+  color: unset;
+  font-size: unset;
   outline: none;
   word-break: break-all;
 }

src/common/components/ItemBox/index.jsx

@@ -1,6 +1,6 @@
 import React,{Component} from 'react';
 import style from './index.less';
-import {isIE,handleEnter} from '@utils/tools.js';
+import {isIE,handleEnter,setFontColorSize} from '@utils/tools.js';
 import $ from 'jquery';
 /***
  * author:zn@2018-11-13
@@ -60,9 +60,9 @@ componentWillReceiveProps(nextP){
 }
   render(){
     const {title,children,editable,className,handleFocus,fuzhen,border,handleBlur,titleTop,backgroundColor,boxId} = this.props;
-    return <div className={style["box"]+" "+"clearfix"} >
-      <div className={style["title"] + ' '+(className||'')} style={{marginTop:titleTop?'22px':''}}>{title}</div>
-      <div ref={this.$div} className={`${style["content"]} ${border?style["border"]:''} ${backgroundColor?style["noBorder"]:''}`} contentEditable={editable} style={this.getBoxStyle()} onFocus={editable?handleFocus:null} onInput={this.handleInput} onClick={(e)=>{this.handleClick(e);}} onBlur={handleBlur} id={boxId} onkeydown={handleEnter}>
+    return <div className={style["box"]+" "+"clearfix"}>
+      <div className={`${style["title"]} ${setFontColorSize(2,4)}` + ' '+(className||'')} style={{marginTop:titleTop?'22px':''}}>{title}</div>
+      <div ref={this.$div} className={`${style["content"]} ${border?style["border"]:''} ${backgroundColor?style["noBorder"]:'' } ${setFontColorSize(2,5)}`} contentEditable={editable} style={this.getBoxStyle()} onFocus={editable?handleFocus:null} onInput={this.handleInput} onClick={(e)=>{this.handleClick(e);}} onBlur={handleBlur} id={boxId} onkeydown={handleEnter}>
         {fuzhen?children||fuzhen:children}
       </div>
     </div>

src/common/components/ItemBox/index.less

@@ -23,6 +23,7 @@
     padding:5px;
     outline: none;
     border-bottom:1px @part-border-color dashed;
+    color: #333;
     /*border-radius: 4px;*/
   }
   .border {

src/common/less/base.less

@@ -70,3 +70,60 @@ html,body {
 :global(.ql-align-right) {
     text-align: right;
 }
+
+//标准颜色（主诉、现病史、其他史、查体）
+//字体修改
+:global(.inheritStyle){//继承样式
+    color: inherit;
+    font-size: inherit;
+}
+:global(.largeFontSize){//超大字号
+    font-size: 18px !important;
+}
+:global(.middleFontSize){//大字号
+    font-size: 16px !important;
+}
+:global(.simpleFontSize){//默认字号
+    font-size: 14px !important;
+}
+:global(.simpleLightColor){//标签未选中颜色
+    color: #bfbfbf !important;
+}
+:global(.simpleColor){
+    color: #333 !important;
+}
+:global(.selectColor){//选中颜色
+    color: #000 !important;
+}
+:global(.prefixUnset){//选中颜色
+    color: unset !important;
+    font-size: unset !important;
+}
+:global(.prefixUnsetColor){//继承颜色
+    color: unset !important;
+}
+
+:global(.widthChangeed){
+    width: 318px !important;
+}
+:global(.pdright){
+    padding-right: 308px !important;
+}
+:global(.middleImg){
+    img {
+        margin-bottom: 7px !important;
+    }
+}
+:global(.titleWidth){
+    width: 78px !important;
+    #mainSuit {
+        margin-left: 78px;
+    }
+}
+:global(.specialSize){
+    margin-left: 74px !important;
+}
+:global(.specialpaceSize){
+    margin-left: 74px !important;
+}
+

src/common/less/variables.less

@@ -4,7 +4,7 @@
 @cyan: #00bcd4;
 @blue: #3B9ED0;
 @red:#ff0000;
-@extBlue:#71A9FE;
+@extBlue:#5968DD;
 @tab-color:#3B9ED0;
 
 @ipt-color:#E9F5FA;
@@ -18,7 +18,8 @@
 
 @btn-text-color: #fff;
 @text-color: #333;
-@placeholder-color: #716e6e;
+
+@placeholder-color: #bfbfbf;
 
 @link-hover-decoration: underline;
 
@@ -156,7 +157,7 @@
   position: relative;
   /*margin-right: 5px;
   padding: 0 3px 0;*/
-  color: unset;
+  // color: unset;
   border:none!important;
   &:before,&:after{
   content: ''!important;

src/components/AddAssistCheck/AssistName/index.jsx

@@ -1,7 +1,7 @@
 import React, { Component } from "react";
 import styles from "../index.less";
 import $ from 'jquery';
-import { windowEventHandler } from '@utils/tools';
+import { windowEventHandler,setFontColorSize } from '@utils/tools';
 
 class AssistName extends Component {
 	constructor(props) {
@@ -24,7 +24,7 @@ class AssistName extends Component {
 	render() {
 		const { winWidth, name, getInfomation } = this.props;
 		return (
-				<span className={styles.assistName} style={{ width: winWidth < 1150 ? '120px' : 'auto' }} ref={this.$assistName}>
+				<span className={`${styles.assistName} ${setFontColorSize(2)}`} style={{ width: winWidth < 1150 ? '120px' : 'auto' }} ref={this.$assistName}>
 					<span className={styles.tagSpan} title={name}>
 						{name&&this.splitName(name)}：
             <span className={styles.imgInfo} title='点击i图标可查看详细说明' onClick={() => getInfomation({ name: name, position: 1, type: 6 })}></span>

src/components/AddAssistCheck/Textarea/index.jsx

@@ -2,6 +2,7 @@ import React, { Component } from "react";
 import style from "./index.less";
 import config from '@config/index';
 import $ from 'jquery';
+import { setFontColorSize} from '@utils/tools';
 
 class Textarea extends Component {
   constructor(props) {
@@ -73,13 +74,13 @@ class Textarea extends Component {
     const {idx,disabled} = this.props;
     return (
       <div className={style.textWap}>
-        <div className={style.divTextarea}
+        <div className={`${style.divTextarea} ${setFontColorSize(2,1)}`}
             contenteditable={disabled?false:true}
             ref={this.$dom}
             onInput={this.handleInput}
             onKeyUp={this.handleInput}
         ></div>
-        <p ref={this.textInput} onClick={this.handleFocus} className={style.textareaWarring}></p>
+        <p ref={this.textInput} onClick={this.handleFocus} className={`${style.textareaWarring} ${setFontColorSize(2)}`}></p>
       </div>
     );
   }

src/components/AddAssistCheck/index.jsx

@@ -4,7 +4,7 @@ import styles from './index.less';
 import $ from 'jquery';
 import Textarea from './Textarea';
 import AssistName from './AssistName';
-import { getPageCoordinate,getCurrentDate,setPosition } from '@utils/tools';
+import { getPageCoordinate,getCurrentDate,setPosition, setFontColorSize } from '@utils/tools';
 import ScrollArea from 'react-scrollbar';
 
 class AddAssistCheck extends React.Component {
@@ -222,7 +222,7 @@ class AddAssistCheck extends React.Component {
                       <Textarea value={item.value} disabled={item.disabled} handlePush={handlePush} isRead={isRead} handleChangeAssistValue={handleChangeAssistValue} idx={idx}></Textarea>
                     </ScrollArea>
                   </div>
-                  <div className={styles.pointerFinger}>
+                  <div className={`${styles.pointerFinger} ${setFontColorSize(2)}`}>
                     <p>报告日期：<span>{item.time || this.state.dateTime}</span></p>
                   </div>
                 </li>)
@@ -276,7 +276,7 @@ class AddAssistCheck extends React.Component {
                 <Textarea value={item.value} disabled={item.disabled} handlePush={handlePush} isRead={isRead} handleChangeAssistValue={handleChangeAssistValue} idx={idx}></Textarea>
                 </ScrollArea>
               </div>
-              <div className={styles.pointerFinger}>
+              <div className={`${styles.pointerFinger} ${setFontColorSize(2,2)}`}>
                 <p onClick={() => this.handleShowDate(idx)}>报告日期：<span>{item.time || this.state.dateTime}</span></p>
                 <i onClick={() => this.handleShowDate(idx)}></i>
                 {/*<a href="javascript:void(0);" onClick={() => { this.handleDelClick(idx,item) }}><img src={close} alt="" /></a>*/}

src/components/AddAssistCheck/index.less

@@ -50,13 +50,18 @@
     position: relative;
     clear: both;
     border-radius: 4px;
-
+    color: #000;
     .pointerFinger {
       width: 260px;
       position: absolute;
       right: 0;
       top: 10px;
-
+      p {
+        font-size: unset;
+        span {
+          font-size: unset;
+        }
+      }
       i {
         display: inline-block;
         position: absolute;
@@ -91,7 +96,7 @@
           box-sizing: border-box;
           margin-right: 0;
           display: inline-block;
-          width: 140px;
+          // width: 140px;
         }
       }
     }
@@ -102,6 +107,9 @@
       box-sizing: border-box;
       float: left;
       position: relative;
+      span {
+        font-size: unset;
+      }
     }
 
     .textareaWrap {

src/components/AddInspect/SlideExcel/index.jsx

@@ -1,6 +1,6 @@
 import React, { Component } from "react";
 import styles from "./index.less";
-import { normalVal, timestampToTime, getStatusImg } from '@utils/tools';
+import { normalVal, timestampToTime, getStatusImg,setFontColorSize } from '@utils/tools';
 import slideUp from "@common/images/slide-up.png";
 import slideDown from "@common/images/slide-down.png";
 class SlideExcel extends Component {
@@ -36,12 +36,12 @@ class SlideExcel extends Component {
     return (
       <li className={`${styles.excelDataLis} clearfix`} style={{ border: items.lisExcelRes.length - 1 == idx ? 0 : '' }}>
         <span className={styles.excelDataTitle}>
-          <span className={styles.tagSpan}>
-            {item.menus}
+          <span className={`${styles.tagSpan} ${styles.selectTagSpan}`}>
+            <span className={`${styles.menus} ${setFontColorSize(2)}`}>{item.menus}</span>
             <span className={styles.imgInfo} title='点击i图标可查看详细说明' onClick={() => getInfomation({ name: item.lisExcelItem[0].uniquemealName || '', type: 12, position: 1 })}></span>
           </span>
         </span>
-        <table className={styles.table}>
+        <table className={`${styles.table} ${setFontColorSize(2)}`}>
           {show ? (item.lisExcelItem && item.lisExcelItem.map((value, idx) => {
             return <tr>
               <td style={{ width: '30%' }}>
@@ -85,7 +85,7 @@ class SlideExcel extends Component {
         </table>
         {
           item.lisExcelItem && item.lisExcelItem.length > 5 ?
-            <div className={styles.slides} onClick={this.handleSlide}>
+            <div className={`${styles.slides} ${setFontColorSize(2)}`} onClick={this.handleSlide}>
               {
                 show ? <span>收起</span> : <span>剩余<span className={styles.num}>{item.lisExcelItem.length - 4}</span>项</span>
               }

src/components/AddInspect/SlideExcel/index.less

@@ -44,12 +44,17 @@
   width: 80%;
   // display: inline-block;
   tr {
-      line-height: 18px;
-      height: 18px;
-      width: 100%;
-      td {
-          padding-top: 3px;
+    line-height: 18px;
+    height: 18px;
+    width: 100%;
+    font-size: unset;
+    td {
+      padding-top: 3px;
+      font-size: unset;
+      span {
+        font-size: unset;
       }
+    }
   }
 }
 
@@ -137,6 +142,7 @@
   cursor: pointer;
   span {
     color:#7d7d7d;
+    font-size: unset;
   }
   img{
     vertical-align: middle;
@@ -178,6 +184,13 @@
   display: inline-block;
   position: relative;
 }
+.selectTagSpan {
+  // color: #000;
+  // font-weight: bold;
+  // .menus {
+  //   border-bottom: 1px solid #666666;
+  // }
+}
 .tagSpan:hover {
   .imgInfo, .imgInfo1 {
     display: block;

src/components/AddInspect/SlideSelect/index.jsx

@@ -1,6 +1,6 @@
 import React, { Component } from "react";
 import styles from "./index.less";
-import { normalVal,timestampToTime,getPageCoordinate,setPosition } from '@utils/tools';
+import { normalVal,timestampToTime,getPageCoordinate,setPosition,setFontColorSize } from '@utils/tools';
 import { InspectCommon, Calendar,DelToast} from '@commonComp';
 import slideUp from "@common/images/slide-up.png";
 import slideDown from "@common/images/slide-down.png";
@@ -126,7 +126,7 @@ class SlideSelect extends Component {
             // 标签，血常规。。
             item.show ?
             <p className={styles.staticTagActive}>
-                <span className={styles.tagSpan} data-flg="current" style={{color:"#000"}} onClick={(e)=>this.handleLabelSub(e,item.questionId,idx)}>
+                <span className={`${styles.tagSpan} ${styles.selectTagSpan} ${setFontColorSize(2)}`} data-flg="current" onClick={(e)=>this.handleLabelSub(e,item.questionId,idx)}>
                   {item.name}
                   <span className={styles.imgInfo1} title='点击i图标可查看详细说明' onClick={()=>getInfomation({name:item.uniqueName || '', position: 1, type: 12})}></span>
                 </span>
@@ -148,7 +148,7 @@ class SlideSelect extends Component {
         }
         {
             item.show ?
-                <table className={styles.table}>
+                <table className={`${styles.table} ${setFontColorSize(2)}`}>
                     {
                         show?(item.details.map((val)=>{
                             if(val.value && val.value != ''){

src/components/AddInspect/SlideSelect/index.less

@@ -84,9 +84,14 @@
         line-height: 18px;
         height: 18px;
         width: 100%;
+        font-size: unset;
         td {
           cursor: default;
           padding-top: 3px;
+          font-size: unset;
+          span {
+              font-size: unset;
+          }
         }
     }
 }
@@ -192,6 +197,10 @@
   display: inline-block;
   position: relative;
 }
+.selectTagSpan {
+  color: #000;
+  font-weight: bold;
+}
 .tagSpan:hover {
     .imgInfo, .imgInfo1 {
         display: block;

src/components/Advice/Textarea/index.jsx

@@ -1,6 +1,7 @@
 import React, { Component } from "react";
 import style from "./index.less";
 import config from '@config/index';
+import {setFontColorSize} from '@utils/tools';
 import $ from 'jquery';
 
 class Textarea extends Component {
@@ -58,6 +59,7 @@ class Textarea extends Component {
       <div>
         <div 
             style={{outline: 'none',minHeight:'20px'}}
+            className={`${style['text']} ${setFontColorSize(2)}`}
             contenteditable={true}
             ref={this.$dom}
             onInput={this.handleInput}

src/components/Advice/Textarea/index.less

@@ -0,0 +1,5 @@
+.text {
+  div {
+    font-size: unset;
+  }
+}

src/components/Advice/index.jsx

@@ -1,6 +1,7 @@
 import React,{Component} from 'react';
 import style from './index.less';
 import {ItemBox} from '@commonComp';
+import {setFontColorSize} from '@utils/tools';
 import Textarea from './Textarea';
 import FollowUp from '@components/Treat/FollowUp'
 
@@ -83,22 +84,22 @@ class Advice extends Component{
 
     return  <div id="adviceBox" className={`${'mainsuit-box'} ${style['main-suit']}`}>
       <ItemBox title='医嘱' editable={false} border={true} marginTop="10px">
-        <div className={style['billing']}>
+        <div className={`${style['billing']} ${setFontColorSize(2)}`}>
           {advice.assay && advice.assay.length > 0 || advice.check && advice.check.length > 0 ? <h1>开单项目</h1> : ''}
             {advice.assay && <span className={style['treat-input']}> {advice.assay}</span>}
             {advice.check && <span className={style['treat-input']}> {advice.check}</span>}
         </div>
-        {advice.commontreatment && advice.commontreatment.length > 0 &&<div className={style['billing']}  >
+        {advice.commontreatment && advice.commontreatment.length > 0 &&<div className={`${style['billing']} ${setFontColorSize(2)}`}  >
           {advice.commontreatment && advice.commontreatment.length > 0 && <h1>一般治疗</h1>}
             {/* {advice.commontreatment && <div className={style['treat-input']}  onInput={this.handleComTreatInput}  contentEditable={true} style = {{outline: 'none'}}></div>} */}
             {<Textarea value={advice.commontreatment} isRead={isRead} handleChangeAssistValue={this.handleComTreatInput} ></Textarea>}
         </div>}
         {!isFirstMainDiag && hasFollowUp &&<div><FollowUp  noHeader="true" textStyle={{padding: '0 10px'}}  setFollowUp={saveFollowUp} followUp = {followUp} isRead={isRead}></FollowUp></div>}
-        {advice.scheme && advice.scheme.length > 0 &&<div contentEditable='false' className={style['scheme']}>
+        {advice.scheme && advice.scheme.length > 0 &&<div contentEditable='false' className={`${style['scheme']} ${setFontColorSize(2)}`}>
           {advice.scheme && advice.scheme.length > 0  && <h1>治疗方案</h1>}
           {scheme}
         </div>}
-        <div className={style['billing']} > 
+        <div className={`${style['billing']} ${setFontColorSize(2)}`} > 
             {/* {!advice.adviceInput && <Textarea value='' isRead={isRead} handleChangeAssistValue={this.handleAdviceInput} ></Textarea>}
             {advice.adviceInput && <Textarea value={advice.adviceInput} isRead={isRead} handleChangeAssistValue={this.handleAdviceInput} ></Textarea>} */}
             <Textarea value={advice.adviceInput} isRead={isRead} handleChangeAssistValue={this.handleAdviceInput}  typeConfig={typeConfig}></Textarea>

src/components/Advice/index.less

@@ -23,4 +23,4 @@
 }
 .treat-input {
   // display: inline-block;
-}
+}

src/components/AssistCheck/index.jsx

@@ -4,7 +4,7 @@ import { ItemBox, ConfirmModal, WrapModalContainer } from '@commonComp';
 import styles from './index.less';
 import Notify from '@commonComp/Notify';
 import $ from 'jquery';
-import { isIE, getUrlArgObject } from '@utils/tools.js';
+import { isIE, getUrlArgObject,setFontColorSize } from '@utils/tools.js';
 import { dragBox } from '@utils/drag';
 import WrapModalBodyPac from '@containers/WrapModalBodyPac';
 import { getExcelList } from '@store/actions/inspect';
@@ -74,7 +74,7 @@ class AssistCheck extends React.Component {
         return (
             <div className={styles.wrapper}>
                 <div className={styles.top}>
-                    <span id="assistResultData">辅检结果数据</span>
+                    <span id="assistResultData" className={`${setFontColorSize(2,5)}`}>辅检结果数据</span>
                     {/* <div className={styles.pushButton} disabled={ieVersion && ieVersion > 9 ? true : false} onClick={checkSystemIpt}>
                         <p id="importPacBtn" className={styles.importInspectBtn}>导入辅检结果</p>
                     </div> */}
@@ -113,7 +113,7 @@ class AssistCheck extends React.Component {
                     border={true}
                     marginTop={'20px'}
                 >
-                    <div style={{padding:'10px',boxSizing:'border-box'}} >
+                    <div style={{padding:'10px',boxSizing:'border-box',color:'#000'}} >
                         <AddAssistCheck
                             handleChangeValue={handleChangeValue}
                             refreshScroller={this.refreshScroller}

src/components/Diagnosis/index.jsx

@@ -55,7 +55,7 @@ class Diagnosis extends Component {
     return (<div id="diagnosisResult">
       <ItemBox id="diagnosis" title='诊断' boxHeight='auto' titleTop='22px' marginTop='9px' backgroundColor='#EAF7FD'>
         <DiagnosticList refreshScroller={this.refreshScroller}></DiagnosticList>
-        <div style={{ marginLeft: '10px', position: 'relative' }}>
+        <div style={{ marginLeft: '10px', position: 'relative',color:'#000' }}>
           <Add showText="添加诊断结果" handleClick={this.handleshowSearch} id="addDiag" height="50px" />
           <DiagResultSearch
             refreshScroller={this.refreshScroller} setHighter={this.props.setHighter} windowHeight={this.props.windowHeight} pageTop={this.state.pageTop} height={150}></DiagResultSearch>

src/components/DiagnosticList/index.jsx

@@ -12,7 +12,7 @@ import Notify from '@commonComp/Notify';
 import Treat from '@containers/Treat'
 import store from '@store';
 import { initItemList ,setInitHistory,getHistempDetail} from '@store/async-actions/historyTemplates';
-import { pushAllDataList,inspectAndAssist ,deepClone} from '@utils/tools';
+import { pushAllDataList,inspectAndAssist ,deepClone,setFontColorSize} from '@utils/tools';
 import { dragBox } from '@utils/drag';
 import iconRadioDefault from '@common/images/icon-radio-default.png'
 import iconRadioActive from '@common/images/icon-radio-active.png'
@@ -289,7 +289,7 @@ class DiagnosticList extends Component {
                         const hasTreat = item.treat && ((item.treat.commonTreatment&&item.treat.commonTreatment.content) || (item.treat.surgeryTreatment&&item.treat.surgeryTreatment.content) || item.treat.treatment.length>0 ||(item.adverseReactions&&item.adverseReactions.length > 0)
                            || (item.drugHistory && item.drugHistory['慢病用药内容'] &&  item.drugHistory['慢病用药内容'].length > 0) || (item.drugHistory &&item.drugHistory['普通病用药内容'] &&  item.drugHistory['普通病用药内容'].length > 0) ||item.follow)
                         isChronic = chronicMagItem&&item.type==2&&chronicList.findIndex((it)=>it.conceptId==item.conceptId)!=-1;
-                        return (<div draggable={true} className={style['diag-box'] + ' clearfix'} id="diagListBox" key={item.conceptId} >
+                        return (<div draggable={true} 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>}
                                     {list.length === 1 ? '' : index !== 0 ? '' : <span onClick={() => {this.downDiagnostic(index)}} className={style['diag-down']}><img className={style["diag-down"]} src={diagDown}/></span>}
                                     <span className={style['diag-number']} style={{fontWeight:index === 0 ?'bold':'normal'}}>{index === 0 ? '1' : index+1}</span>
@@ -300,7 +300,7 @@ class DiagnosticList extends Component {
                                       <span   className={style['diag-name-box']} style={{maxWidth: windowWidth > 1024 ?windowWidth-900 +'px':'130px'}} onClick={this.handleClickDiag.bind(this,item,false,true,false)}>
                                         {item.name}
                                       </span>
-                                      <img className={style['info-img']}  
+                                      <img className={`${style['info-img']}`}  
                                           title='点击i图标可查看详细说明'
                                           style ={hasEnterItem===index  ? {display: "inline-block"} : {display: "none"}}
                                           src={hasEnterImg ? infoMove : infoShow} 

src/components/DiagnosticList/index.less

@@ -9,6 +9,9 @@
     border-bottom: 1px dotted #989DA3;
     position: relative;
     background: #EAF7FD;
+    span {
+        font-size: unset;
+    }
 }
 .diag-number {
     display: inline-block;

src/components/Information/index.less

@@ -1,6 +1,6 @@
 .title {
   clear: both;
-  font-size: 22px;
+  font-size: 22px !important;
   margin-bottom: 15px;
   text-align:center;
   padding-top: 15px;

src/components/Inspect/index.jsx

@@ -7,7 +7,7 @@ import Notify from '@commonComp/Notify';
 import store from '@store';
 import $ from 'jquery';
 import { host, prefix } from '@utils/config.js';
-import { isIE, getUrlArgObject,getCurrentDate } from '@utils/tools.js';
+import { isIE, getUrlArgObject,getCurrentDate,setFontColorSize } from '@utils/tools.js';
 import { dragBox } from '@utils/drag';
 import WrapModalBody from '@containers/WrapModalBody';
 
@@ -219,7 +219,7 @@ class Inspect extends React.Component {
       <div className={styles.wrapper}>
         {/* 导入功能插件，ie8/9权限问题暂未解决，先隐藏 */}
         <div className={styles.top}>
-          <span id="inspectResultData">化验结果数据</span>
+          <span id="inspectResultData" className={`${setFontColorSize(2,5)}`}>化验结果数据</span>
           {/* <div className={this.getStyle()} onClick={ieVersion&&ieVersion<=9?null:this.handleImportExcel}> */}
           <div className={this.getStyle()} style={{ display: hospitalMsg.import_way_lis == 0 ? 'none' : 'block' }}>
             {/* <button disabled={ieVersion&&ieVersion>9?true:false}onClick={ieVersion && ieVersion <= 9 ? null : this.handleImportExcel}>导入化验结果</button>
@@ -263,7 +263,7 @@ class Inspect extends React.Component {
           style={{marginRight:'0'}}
           marginTop={'20px'}
         >
-          <div style={{ padding: '10px', boxSizing: 'border-box' }} >
+          <div style={{ padding: '10px', boxSizing: 'border-box',color:'#000' }} >
             <AddInspect
               handleSign={handleSign}
               setHighter={setHighter}

src/components/MultSpread/index.jsx

@@ -9,8 +9,10 @@ import addIcon from '@images/addItem.png';
 import addIcon1 from '@images/addItem2.png';
 import style from "./index.less";
 import tools from '@utils/tools';
+import {setFontColorSize} from '@utils/tools';
 import NumberUnitDrop from '@containers/NumberUnitDrop';
 
+
 /****
  * 多标签组合
  * author:zn@2018-11.26
@@ -45,13 +47,13 @@ class MultSpread extends Component{
     this.setBMIstate = this.setBMIstate.bind(this);
   }
   getClass(){
-    const {saveText,ikey,showAdd} = this.props;
+    const {saveText,ikey,showAdd,isExtBlue} = this.props;
     const labelInx = tools.getLabelIndex(ikey);
     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,setFontColorSize(isExtBlue?2:1));
   }
   saveDoms(it){
     const doms = this.state.numDoms;
@@ -249,20 +251,20 @@ class MultSpread extends Component{
     const text = saveText&&saveText[+labelInx];
     const ext = !text&&isExtBlue?style['ext']:'';
     const orgBorder = isImports&&!text?style['orange-border']:'';
-    return classNames(orgBorder,ext);
+    return classNames(orgBorder,ext,setFontColorSize(isExtBlue?2:1));
   }
   render(){
     const {showAdd,addLabelItem,ikey,copyId,textPrefix,textSuffix,isExtBlue} = this.props;
     return (<div className={this.getContClass()}
                  style={{display:'inline-block'}}>
-      {textPrefix?<span>{textPrefix}</span>:''}
-      <div className={this.getClass()}>
-      {this.getLabels()}
-      {textSuffix?<span>{textSuffix}</span>:''}
-      {showAdd?<img src={isExtBlue?addIcon1:addIcon} alt="复制该项"
-                    className={style['add-icon']}
-                    onClick={()=>addLabelItem({ikey,copyId})}/>:''}
-    </div>
+        {textPrefix?<span className={`${setFontColorSize(isExtBlue?2:'')}`}>{textPrefix}ss</span>:''}
+        <div className={this.getClass()}>
+          {this.getLabels()}
+          {textSuffix?<span className={`${setFontColorSize(isExtBlue?2:'')}`}>{textSuffix}</span>:''}
+          {showAdd?<img src={isExtBlue?addIcon1:addIcon} alt="复制该项"
+                        className={style['add-icon']}
+                        onClick={()=>addLabelItem({ikey,copyId})}/>:''}
+        </div>
     </div>)
   }
 }

src/components/Multiple/index.jsx

@@ -2,7 +2,7 @@ import react from "react";
 import style from "./index.less";
 import $ from 'jquery';
 import classNames from 'classnames';
-import {handleEnter,isIE,filterArr,deepClone,filterDataArr} from '@utils/tools.js';
+import {handleEnter,isIE,filterArr,deepClone,filterDataArr,setFontColorSize} from '@utils/tools.js';
 import {Notify} from '@commonComp';
 import SlideItem from "./SlideItem";
 import config from '@config/index.js';
@@ -47,9 +47,20 @@ class Multiple extends react.Component{
       $(this.$div.current).removeClass(style['borderd']);
     }
     if(value){
-      return hideTag?classNames(style['hide-tag'],orgBorder):classNames(style['selected-tag'],orgBorder,editBorder);
+      if(hideTag){
+          return classNames(style['hide-tag'],orgBorder,setFontColorSize(isExtBlue?2:''))
+        }
+      return classNames(style['selected-tag'],orgBorder,editBorder,setFontColorSize());
+    }else{
+      if(hideTag){
+        return isExtBlue?classNames(setFontColorSize(2)):classNames(setFontColorSize(2),'prefixUnsetColor')
+      }
+      return classNames(style['tag'],orgBorder,ext,setFontColorSize(1));
     }
-    return hideTag?'':classNames(style['tag'],orgBorder,ext);
+    // if(value){
+      //   return hideTag?classNames(style['hide-tag'],orgBorder,setFontColorSize(isExtBlue?2:'')):classNames(style['selected-tag'],orgBorder,editBorder,setFontColorSize());
+      // }
+      // return hideTag?classNames(setFontColorSize()):classNames(style['tag'],orgBorder,ext,setFontColorSize());
   }
 
   getListClass(){

src/components/Multiple/index.less

@@ -7,21 +7,21 @@
   cursor: pointer;
   line-height: 20px;
   &.ext{
-    color: @extBlue!important;
+    // color: @extBlue!important;
   }
 }
 
 .selected-tag{
   padding: 0;
-  color: @text-color;
+  // color: @text-color;
   border-bottom: 1px @border-color solid;
   line-height: 22px;
 }
 .hide-tag{
   padding: 0;
-  color: @text-color;
+  // color: @text-color;
   line-height: 22px;
   &.ext{
-    color: @extBlue;
+    // color: @extBlue;
   }
 }

src/components/NumberDrop/index.jsx

@@ -2,6 +2,7 @@ import React,{Component} from 'react';
 import className from 'classnames';
 import {NumberPan,Notify} from '@commonComp';
 import style from './index.less';
+import {setFontColorSize} from '@utils/tools'
 /***
  * author:zn@2018-11-19
  * 接收参数：
@@ -196,18 +197,19 @@ class NumberDrop extends Component{
     const {handleHide} = this.props;
     handleHide&&handleHide();
   }
-  getClasses(){         //整个标签是否有值的状态
+  getClasses(nospecial){         //整个标签是否有值的状态
     const {hideTag,placeholder,isImports,isExtBlue} = this.props;
     const val = this.state.value;
     const isSelected = val&&val!=placeholder?style['selected']:style['container'];
     const orgBorder = isImports&&!(val&&val!=placeholder)?style['orange-border']:'';
     const ext = isExtBlue?style['ext']:'';
     const noTag = hideTag?style['no-tag']:'';
-    return className(isSelected,noTag,orgBorder,ext);
+    
+    return className(isSelected,noTag,orgBorder,ext,setFontColorSize(isExtBlue?2:1));
   }
-  getSpanClass(){       //将被替换的文字选中状态显示
+  getSpanClass(nospecial){       //将被替换的文字选中状态显示
     const cls = this.props.show?style['blued']:style['nol'];
-    return cls;
+    return cls+' '+setFontColorSize(nospecial?'':2);
   }
   stopBubble(e){
     e.stopPropagation();
@@ -243,13 +245,13 @@ class NumberDrop extends Component{
     });
   }
   render(){
-    const {prefix,suffix,show,value,handleHide,allClick,bmi,formulaCode} = this.props;
+    const {prefix,suffix,show,value,handleHide,allClick,bmi,formulaCode,nospecial} = this.props;
     const val = formulaCode==="BMI_RES"?(+bmi===Infinity||isNaN(bmi)?'':bmi):value;
     const {placeholder,hasSelect} = this.state;
-    return <div className={this.getClasses()}
+    return <div className={this.getClasses(nospecial)}
                 style={{position:'relative'}}
                 onClick={allClick?this.handleNumClick:null}>
-      <span>{prefix}</span>
+      <span className={`${setFontColorSize(nospecial?'':2)}`}>{prefix}</span>
       <span onFocus={this.handleNumFocus}
             onClick={allClick?null:this.handleNumClick}
             contentEditable={true}
@@ -258,9 +260,9 @@ class NumberDrop extends Component{
             onkeyup={this.handleKeyDowm}
             onBlur={this.numInpBlur}
             onInput={this.handleSpanInp}
-            className={this.getSpanClass()}
+            className={this.getSpanClass(nospecial)}
             >&nbsp;{val||placeholder}</span>
-      <span>{suffix}</span>
+      <span className={`${setFontColorSize(nospecial?'':2)}`}>{suffix}</span>
       <NumberPan handleSelect={this.select.bind(this)}
                  noString={formulaCode?true:false}
                  onClose={handleHide}

src/components/NumberUnitDrop/index.jsx

@@ -3,7 +3,7 @@ import className from 'classnames';
 import {NumberUnitPan} from '@commonComp';
 import style from './index.less';
 import config from '@config/index.js';
-import {filterArr,handleEnter,isIE,filterDataArr} from '@utils/tools.js';
+import {filterArr,handleEnter,isIE,filterDataArr,setFontColorSize} from '@utils/tools.js';
 import {Notify} from '@commonComp';
 import $ from 'jquery';
 /***
@@ -69,7 +69,7 @@ class NumberUnitDrop extends Component{
   }
 
   getClasses(){         //整个标签是否有值的状态
-    const {value,hideTag,show,isImports} = this.props;
+    const {value,hideTag,show,isImports,isExtBlue} = this.props;
     const inpValue = this.state.value;
     const blueBorder = this.state.editable?style['blue-border']:'';
     const isSelected = value||inpValue?style['selected']:style['container'];
@@ -80,20 +80,29 @@ class NumberUnitDrop extends Component{
     }else{
       $(this.$cont.current).removeClass(style['borderd']);
     }
-    return className(isSelected,noTag,blueBorder,orgBorder);
+    if(value){
+      return className(isSelected,noTag,blueBorder,orgBorder,setFontColorSize(isExtBlue?2:''));
+    }else{
+      if(isExtBlue){
+        return classNames(isSelected,noTag,blueBorder,orgBorder, setFontColorSize(2),'prefixUnsetColor');
+      }else{
+        return className(isSelected,noTag,blueBorder,orgBorder,setFontColorSize(1));
+      }
+    }
   }
 
   render(){
-    const {placeholder,prefix,suffix,show,value,handleHide,hideTag} = this.props;
+    const {placeholder,prefix,suffix,show,value,handleHide,hideTag,isExtBlue} = this.props;
     const {editable,hasSelect} = this.state;
     return <div className={this.getClasses()}
                 ref={this.$cont}
                 onClick={this.handleNumClick}>
-      <span ref = {this.$pre}>{prefix?prefix+' ':prefix}</span>
+      <span ref = {this.$pre} className="prefixUnset">{prefix?prefix+' ':prefix}</span>
       <span ref = {this.$span}
             onKeyDown={handleEnter}
+            className="prefixUnset"
             style={{cursor:editable?'text':'pointer',wordBreak:'break-all'}}>{value||placeholder}</span>
-      <span ref = {this.$suf}>{suffix?' '+suffix:suffix}</span>
+      <span ref = {this.$suf} className="prefixUnset">{suffix?' '+suffix:suffix}</span>
       <NumberUnitPan handleSelect={(obj)=>this.select(obj)}
                  onClose={handleHide}
                  show={show} toClear={!hasSelect} value={value}/>

src/components/Operation/index.less

@@ -167,4 +167,5 @@
     height: 1px;
     margin: 8px auto 0 auto;
     background: #D8D8D8;
-}
+}
+

src/components/PreviewBody/index.less

@@ -163,11 +163,17 @@ table{
   .printBtn {
     display: none !important;
   }
+  p,span,td,div {
+    font-size: 12px !important;
+  }
   .infos {
     td {
       font-size: 12px !important;
       padding: 4px 5px 4px 0px !important;
       line-height: 18px !important;
+      span {
+        font-size: 12px !important;
+      }
     }
   }
 }

src/components/RadioDrop/index.jsx

@@ -1,5 +1,5 @@
 import React,{Component} from 'react';
-import {handleEnter,windowEventHandler} from '@utils/tools.js';
+import {handleEnter,windowEventHandler,setFontColorSize} from '@utils/tools.js';
 import {DropList} from '@commonComp';
 import classNames from 'classnames';
 import style from "./index.less";
@@ -43,13 +43,20 @@ class RadioDrop extends Component{
     }else{
       $(this.$cont.current).removeClass(style['borderd']);
     }
-    if(hideTag){
-      return classNames(style['no-tag'],ext);
-    }
+    // if(hideTag){
+    //   return classNames(style['no-tag'],ext,setFontColorSize(isExtBlue?2:''));
+    // }
     if(value){
-      return classNames(style['selected-tag'],editBorder);
+      if(hideTag){
+        return classNames(style['no-tag'],ext,setFontColorSize(isExtBlue?2:''));
+      }
+      return classNames(style['selected-tag'],editBorder,setFontColorSize());
+    }else{
+      if(hideTag){
+        return isExtBlue?classNames(setFontColorSize(2)):classNames(setFontColorSize(2),'prefixUnsetColor')
+      }
+      return classNames(style['tag'],orgBorder,ext,setFontColorSize(1));
     }
-    return classNames(style['tag'],orgBorder,ext);
   }
   handleSelect(item){
     const {handleSelect,ikey,mainSaveText,value} = this.props;

src/components/RadioInpDrop/index.jsx

@@ -1,5 +1,5 @@
 import React,{Component} from 'react';
-import {handleEnter,windowEventHandler,filterDataArr,getLabelIndex} from '@utils/tools.js';
+import {handleEnter,windowEventHandler,filterDataArr,getLabelIndex,setFontColorSize} from '@utils/tools.js';
 import {DropList,Notify} from '@commonComp';
 import config from '@config/index';
 import style from "./index.less";
@@ -42,9 +42,9 @@ class RadioInpDrop extends Component{
       return classNames(style['no-tag'],ext);
     }
     if(value){
-      return style['selected-tag'];
+      return classNames(style['selected-tag'],setFontColorSize());
     }
-    return classNames(style['tag'],orgBorder,ext);
+    return classNames(style['tag'],orgBorder,ext,setFontColorSize(1));
   }
   handleSelect(item){
     const {handleSelect,ikey,value,placeholder,mainSaveText} = this.props;
@@ -108,7 +108,7 @@ class RadioInpDrop extends Component{
                              value={temp.value}
                              ></InputComp>);
       }else{
-        list.push(<span>&nbsp;{temp}</span>);
+        list.push(<span className="inheritStyle">&nbsp;{temp}</span>);
       }
     }
     return list;
@@ -119,7 +119,7 @@ class RadioInpDrop extends Component{
       <div className={this.getClass()}
            onClick={(e)=>this.handleShow(e)}
            onKeyDown={handleEnter}>
-        {vals?this.parseInputDom():<span>{placeholder}</span>}
+        {vals?this.parseInputDom():<span className='inheritStyle'>{placeholder}</span>}
       </div>
       <DropList onSelect={this.handleSelect} data={data} show={show}/>
     </div>
@@ -193,7 +193,7 @@ class InputComp extends Component{
     const {value} = this.props;
     return <span contentEditable={true}
                  ref={this.$inp}
-                 className={style['inner-inp']}
+                 className={`${style['inner-inp']}`}
                  onClick={(e)=>{e.stopPropagation()}}
                  onFocus={(e)=>{e.stopPropagation()}}
                  onInput={this.handleInp}

src/components/SpreadDrop/index.jsx

@@ -2,7 +2,7 @@ import React,{Component} from 'react';
 import classNames from 'classnames';
 import config from '@config/index.js';
 import style from './index.less';
-import {setPosition,deepClone,handleEnter,isIE,windowEventHandler,filterDataArr,getIds,getPageCoordinate} from '@utils/tools.js';
+import {setPosition,deepClone,handleEnter,isIE,windowEventHandler,filterDataArr,getIds,getPageCoordinate,setFontColorSize} from '@utils/tools.js';
 import {Notify} from '@commonComp';
 import ListItems from '@components/ListItems';
 import $ from 'jquery';
@@ -171,8 +171,7 @@ class SpreadDrop extends Component{
   getInitExclu(){
     const {defaulted,data,value} = this.props;
     let excluId = '',excName='';
-    let showDefaulted = this.ifDefault();
-    if(showDefaulted&&defaulted&&value===undefined){
+    if(defaulted&&value===undefined){
       const it = data[0];
       excluId = it.exclusionType===1?it.questionDetailList[0].id:'';
       excName = it.exclusionType===1?it.questionDetailList[0].name:'';
@@ -202,6 +201,8 @@ class SpreadDrop extends Component{
     this.setState({
       nones:'',
       exists:[],
+      //existsName:{},
+      //withsName:{},
       withs:[],
       noneIds:[],
       noneOn:false,
@@ -281,8 +282,11 @@ class SpreadDrop extends Component{
     if(+item.code===1){     //操作“伴”类型
       this.setState({
         withOn:!withOn,
+        // withs:withOn?[]:[...withs,id],     //取消“伴”选中，伴随症状全部取消选中    
+        // withs:withOn?[]:[...withs,{id:item.id,name:name}],
         withs:withOn?[]:withs,
         ban:withOn?{}:{id:id,name:name,value:name},
+        //withsName:withOn?"":withsName+name,     //取消“伴”选中，伴随症状全部取消选中
         nowOn:withOn?(noneOn?'none':''):'with'
       });
       return;
@@ -325,8 +329,10 @@ class SpreadDrop extends Component{
         nones += name+'、';
         noneIds.push(id);
       }else if(nowOn=='with'){
+        // withs.push({id:id,name:name,questionId:item.questionId});
         withs.push({id:id,name:name,questionId:item.questionId,conceptId:item.conceptId});
       }else{
+        // exists.push({id:id,name:name,listIndex,questionId:item.questionId});
         exists.push({id:id,name:name,listIndex,questionId:item.questionId,conceptId:item.conceptId});
       }
     }
@@ -341,26 +347,23 @@ class SpreadDrop extends Component{
     });
   }
   getClass(){
-    const {isImports,show,value,isExtBlue,defaulted} = this.props;
+    const {isImports,show,value,isExtBlue} = this.props;
     const blueBorder = this.state.editable?style['blue-border']:'';
     const orgBorder = isImports&&!value?style['orange-border']:'';
     const ext = isExtBlue?style['ext']:'';
-    let showDefaulted = this.ifDefault();
     if(show){
       $(this.$div.current).addClass(style['borderd']);
     }else{
       $(this.$div.current).removeClass(style['borderd']);
     }
-    if(value||(showDefaulted&&value===undefined&&defaulted)){
-      return classNames(style['selected-tag'],blueBorder);
+    if(value){
+      return classNames(style['selected-tag'],blueBorder,setFontColorSize());
+    }else{
+
     }
-    return classNames(style['tag'],orgBorder,ext);
-  }
-  ifDefault(){
-    const {type,otherDefault,curDefault} = this.props;
-    const showDefaulted = (type=='2'&&curDefault)||(type=='3'&&otherDefault);
-    return showDefaulted;
+    return classNames(style['tag'],orgBorder,ext,setFontColorSize(1));
   }
+
   componentDidMount(){
     if(isIE()){
       $(this.$div.current).onIe8Input(function(e){
@@ -368,11 +371,16 @@ class SpreadDrop extends Component{
       },this);
     }
   }
+  /*componentWillReceiveProps(nextProps){
+    const {setHighter} = this.props;
+    if(!nextProps.show){console.log(22)
+      setHighter&&setHighter(48);
+    }
+  }*/
   render(){
-    const {placeholder,value,show,data,order,type,tagType,pos,defaulted,showVal} = this.props;
+    const {placeholder,value,show,data,order,type,tagType,ikey,pos,defaulted} = this.props;
     const {tmpDom,left} = this.state;
-    let showDefaulted = this.ifDefault();
-    let showV = showDefaulted&&value===undefined?showVal:value;       //未选中过值时展示默认选中
+    const clickIndx = ikey.split('-')[1];//展开下拉的index
     if(!show&&tmpDom){
       $(tmpDom).parent().prev().attr({"contentEditable":true})
     }
@@ -390,8 +398,8 @@ class SpreadDrop extends Component{
         onBlur={this.handleBlur}
         onInput={this.onChange}
         onkeydown={handleEnter}
-        >{showV||placeholder}</div>
-          <ListItems parDiv={this.$list} defaulted={showDefaulted&&defaulted} pos={pos} data={data} order={order} left={left} boxMark={type} tagType={tagType}
+        >{value||placeholder}</div>
+          <ListItems parDiv={this.$list} defaulted={defaulted} pos={pos} data={data} order={order} left={left} boxMark={type} tagType={tagType}
              show={show} handleSelect={this.handleSelect} handleConfirm={this.handleConfirm} handleClear={this.handleClear} {...this.state}></ListItems>
       </div>
   }

src/store/async-actions/print.js

@@ -2,6 +2,7 @@ import {
     json
 } from "../../utils/ajax";
 import store from '@store';
+import {MODI_LOADING} from '@store/types/homePage.js';
 import Notify from '@commonComp/Notify';
 import {
     getAllDataList,
@@ -10,8 +11,37 @@ import {
     filterDataArr,
     filterOtherDataArr
 } from '@utils/tools';
-
-export const saveMessage = (bool) => {
+export const getConceptDetails = (bool) => {
+    let baseList = store.getState();
+    let disLis = baseList.diagnosticList.diagnosticList||[];
+    let tmpLis  = [];
+    for(let i = 0;i < disLis.length;i++){
+        let obj = {}
+        obj.name = disLis[i].name
+        obj.type = 7
+        obj.position = 3
+        tmpLis.push(obj)
+    }
+    json('/conceptDetail/getConceptDetails', {
+        "conceptIntorduces": tmpLis
+    }).then((res)=>{//conceptIntroduceDTO
+        let data = res.data;
+        if (data.code == 0) {
+            realSaveData(bool,data.data)
+        } else {
+            console.log(res)
+            realSaveData(bool)
+        }
+    }).catch((err)=>{
+        realSaveData(bool)
+        console.log(err)
+    })
+}
+export const saveMessage=(bool)=>{
+    store.dispatch({type:MODI_LOADING,flag:true});
+    getConceptDetails(bool)
+}
+export const realSaveData = (bool,list) => {
     let baseList = store.getState();
     const dConfig = baseList.typeConfig;
     const readMode = dConfig.readMode;          //回读模式
@@ -42,6 +72,7 @@ export const saveMessage = (bool) => {
     pacsData.checkedListImport = jsonData.checkedListImport;
     json('/inquiryInfo/saveInquiry', {
         "doctorId": state.doctorId,
+        "conceptIntroduceDTO":list||[],
         "hospitalDeptId": state.hospitalDeptId,
         "hospitalId": state.hospitalId,
         "patientId": state.patientId,         //患者id              
@@ -104,7 +135,9 @@ export const saveMessage = (bool) => {
         } else {
           Notify.info(data.msg);
         }
+        store.dispatch({type:MODI_LOADING,flag:false});
     }).catch(function(){
+        store.dispatch({type:MODI_LOADING,flag:false});
         Notify.info('保存失败，请稍后再试！');
     });
     if(bool){

src/store/reducers/homePage.js

@@ -11,6 +11,7 @@ const initState = {
   addItems:{},
   commSymHide:false,
   loadingFlag:true,
+  loadingShow:false,
   boxTop:0,
   boxLeft:0,
   allModules:[],

src/utils/config.js

@@ -1,8 +1,8 @@
 // const host='http://192.168.3.1:5050';//赵
 // const host='http://192.168.3.100:5050';//王峰
 // const host='http://192.168.2.121:5050';//后端接口访问地址
-// const host='http://192.168.2.236:5050';//后端接口访问地址
 const host='http://192.168.2.236:5050';//后端接口访问地址
+// const host='http://192.168.2.241:5050';//后端接口访问地址
 // const host='http://192.168.3.11:5050';//王宇
 //const host='http://192.168.2.164:8080';
 // const host='http://192.168.3.117:5050'; //周铁刚

src/utils/tools.js

@@ -1330,6 +1330,77 @@ function setPosition (e,dom,setHighter){
     // $(e.target)[0].scrollIntoView(true);
   },10);
 }
+/**
+ * 获取样式类名
+ * largeFontSize 18px      middleFontSize 16px（暂无）       simpleFontSize 14px
+ * flg  1标准字体时颜色加深，可以让选中的字体加粗
+ *      2体征颜色单独处理不需要设置
+ */
+const setFontColorSize = (flg,pacs) => {
+  const classNameSelect = ['largeFontSize','middleFontSize','simpleFontSize','simpleLightColor','simpleColor','selectColor']
+  const state = store.getState();
+  let readConfig = state.typeConfig.readConfig
+  let mainType = readConfig==-1?state.typeConfig.typeConfig:readConfig;
+  let font = mainType[3],colour = mainType[4],classStr = '';
+  if(font == 1&&colour == 1){//字体加大颜色加深
+    if(flg == 2){
+      if(pacs == 1){
+        classStr = `largeFontSize pdright`
+      }else if(pacs == 2){
+        classStr = `largeFontSize widthChangeed`
+      }else if(pacs == 3){
+        classStr = `largeFontSize middleImg`
+      }else if(pacs == 4){
+        classStr = `largeFontSize titleWidth`
+      }else if(pacs == 5){
+        classStr = `largeFontSize specialSize`
+      }else{
+        classStr = `largeFontSize`
+      }
+    }else if(flg == 1){
+      classStr = `selectColor largeFontSize`
+    }else{
+      classStr = `selectColor largeFontSize`
+    }
+  }else if(font == 0&&colour == 1){//标准字体颜色加黑
+    if(flg == 2){
+      classStr = `simpleFontSize`
+    }else if(flg == 1){
+      classStr = `selectColor simpleFontSize`
+    }else{
+      classStr = `selectColor simpleFontSize`
+    }
+  }else if(font == 1&&colour == 0){//大字体标准颜色
+    if(flg == 2){
+      if(pacs == 1){
+        classStr = `largeFontSize pdright`
+      }else if(pacs == 2){
+        classStr = `largeFontSize widthChangeed`
+      }else if(pacs == 3){
+        classStr = `largeFontSize middleImg`
+      }else if(pacs == 4){
+        classStr = `largeFontSize titleWidth`
+      }else if(pacs == 5){
+        classStr = `largeFontSize specialSize`
+      }else{
+        classStr = `largeFontSize`
+      }
+    }else if(flg == 1){
+      classStr = `simpleLightColor largeFontSize`
+    }else{
+      classStr = `simpleColor largeFontSize`
+    }
+  }else{//都是标准的
+    if(flg == 2){
+      classStr = `simpleFontSize`
+    }else if(flg == 1){
+      classStr = `simpleLightColor simpleFontSize`
+    }else{
+      classStr = `simpleColor simpleFontSize`
+    }
+  }
+  return classStr;
+}
 module.exports = {
     getIds,
     getWindowInnerWidth,
@@ -1379,5 +1450,6 @@ module.exports = {
     shiftLocalDelTag,
     setPosition,
     isAllPartClear,
-    getDomUpDown
+    getDomUpDown,
+    setFontColorSize
 };