Squashed commit of the following:

commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 29 15:22:37 2019 +0800

    修改第一次添加诊断为复诊，化验和辅检不为空时不往主诉加字符串

commit 799eef5c34a21f9d90bc82a40240838cf10ba601
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 29 14:41:20 2019 +0800

    ie8治疗方案遮罩

commit fee35d5473b69aafb5335759006a93fea8d14145
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 29 14:05:16 2019 +0800

    治疗方案遮罩IE8

commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 29 14:04:58 2019 +0800

    修改右侧推送字体大小

commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 29 13:26:56 2019 +0800

    修改化验项开单逗号问题

commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Fri Jan 25 13:50:07 2019 +0800

    修改版本信息和免责声明位置

# Conflicts:
#	src/components/PushItems/index.jsx

src/components/PushItems/index.jsx

@@ -95,7 +95,6 @@ class PushItems extends Component {
       showAdd,
       showTips
     } = this;
-    // console.log('tipsDiscalimer', tipsDiscalimer)
     let assayNum = 0;
     let assayHide = assay.map((item, index) => {
       assayNum = assayNum + item.name.length + 2;

src/components/PushItems/index.less

@@ -55,7 +55,7 @@
         }
       }
       div{
-        font-size: 12px;
+        font-size: 14px;
         padding:6px 15px;
         span{
           cursor: pointer;
@@ -66,7 +66,7 @@
   .show {
     float: right;
     color:  #58ACD7;;
-    font-size: 12px;
+    font-size: 14px;
     cursor: pointer;
     img {
       width: 12px;
@@ -77,7 +77,7 @@
     float: right;
     text-align: right;
     color: #58ACD7;
-    font-size: 12px;
+    font-size: 14px;
     cursor: pointer;
     clear: both;
     img {
@@ -120,7 +120,7 @@
       }
     }
     div{
-      font-size: 12px;
+      font-size: 14px;
       padding:6px 15px;
       ul{
         .firstLi{
@@ -142,14 +142,14 @@
             padding: 0px 0px 0px 0px;
             margin-top: -2px;
             span{
-              font-size: 12px;
-              line-height: 12px;
+              font-size: 14px;
+              line-height: 14px;
               display: inline-block;
               margin: 6px;
               input[type='checkbox']{
                 float: left;
-                width: 12px;
-                height: 12px;
+                width: 14px;
+                height: 14px;
                 margin-right: 2px;
                 background-color: #fff;
                 -webkit-appearance:none;
@@ -183,7 +183,7 @@
       }
     }
     .content{
-      font-size: 12px;
+      font-size: 14px;
       padding:6px 15px;
       .title {
         font-size: 14px;
@@ -191,7 +191,7 @@
         margin-bottom:10px;
         a{
           display: inline-block;
-          font-size: 12px;
+          font-size: 14px;
           color: #3B9ED0;
           width: 42px;
           /*height: 20px;
@@ -210,7 +210,7 @@
           border: 1px solid #3B9ED0;
           border-radius: 4px;
           text-align: center;
-          font-size: 12px;
+          font-size: 14px;
           color: #3B9ED0;
           line-height: 18px;
           margin: 0 10px -2px;

src/components/Treat/index.jsx

@@ -40,13 +40,16 @@ class Treat extends Component {
     render(){
         const { generalTreat, treatment, surgeryTreat, selectDrug, drugInfo, treatDesc, setOtherRecommend, setDrugInfo, showDrug, showDrugInfo,hideDrugInfo, title} = this.props;
         return(
-        <div className={style['treat-mask']}>
+        <div>
+            <div className={style['treat-mask']}>
+            </div>
+
             <div  id='treatWrapper' className={style['treat-wrapper']}>
                 
                 <div className={style['treat-box']}>
                     <p className={style['treat-title']}>治疗方案 <img onClick={this.hideTreat} src={close}/></p>
                     <div className={style['treat-inner-box']}>
-                        <GeneralTreat icon={generalIcon} title='一般治疗' titleBg='rgba(47,199,156,0.1)' filter='progid:DXImageTransform.Microsoft.gradient(startColorstr=#192FC79C,endColorstr=#192FC79C)' generalTreat={generalTreat}></GeneralTreat>
+                        <GeneralTreat icon={generalIcon} title='一般治疗'   generalTreat={generalTreat}></GeneralTreat>
                         <DrugTreat treatment={ treatment } 
                                 selectDrug={selectDrug} 
                                 setOtherRecommend={ setOtherRecommend } 
@@ -71,8 +74,10 @@ class Treat extends Component {
                 </TreatDesc>}
                 {showDrug && drugInfo && <DrugInfo drugInfo = {drugInfo} hideDrugInfo = {hideDrugInfo}></DrugInfo>}
             </div>
+                
             
         </div>
+        
         )
     }
 }

src/components/Treat/index.less

@@ -9,15 +9,19 @@
     height: 680px;
     margin-left: -340px;
     margin-top: -340px;
+    z-index: 301;
 }
 .treat-mask {
     position: fixed;
-    background: rgba(0, 0, 0, 0.5);
     width: 100%;
     height: 100%;
     top: 0;
     left: 0;
-    z-index: 9999;
+    z-index: 300;
+    background: #000;
+    opacity: 0.6;
+    filter:alpha(opacity=60);
+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=60);";
 }
 .treat-box {
     width: 680px;

src/store/actions/pushMessage.js

@@ -190,7 +190,7 @@ export const addBilling = (state, action) => {
 		}
 	}
 	if(res.advice.assay  && res.advice.check !== '') {
-			if(res.advice.assay.substring(res.advice.assay.length-2,res.advice.assay.length-1) !== ', ') {
+			if(res.advice.assay.substring(res.advice.assay.length-2,res.advice.assay.length-1) !== ',') {
 				res.advice.assay = res.advice.assay + ', '
 			} 
 	}

src/store/async-actions/diagnosticList.js

@@ -4,12 +4,17 @@ import {ISREAD} from "../types/homePage";
 export const isAddMainSuit = () =>{
     return (dispatch, getState) => {
         const state = getState();
+        console.log('state',state);
         if(state.diagnosticList.diagnosticList.length === 1 && state.diagnosticList.diagnosticList[0].type === 2) {
-            
-            if(state.mainSuit.data && state.mainSuit.data.length === 0 && state.mainSuit.saveText && (state.mainSuit.saveText.length === 0 || state.mainSuit.saveText.length === 1 &&  state.mainSuit.saveText[0] === '')) {
-              dispatch({
-                type:ISREAD
-              });
+            const isAddMainSuitFlag = state.mainSuit.data && state.mainSuit.data.length === 0 && state.mainSuit.saveText    //判断主诉和化验查体是否为空
+                                      && (state.mainSuit.saveText.length === 0 || state.mainSuit.saveText.length === 1 
+                                      &&  state.mainSuit.saveText[0] === '') && state.assistCheck && state.assistCheck.dataString.length === 0
+                                      && state.inspect.labelList && state.inspect.labelList.length === 0
+                                    
+            if(isAddMainSuitFlag) {
+                dispatch({
+                    type:ISREAD
+                });
                 dispatch({
                     type: SET_DIAG_TO_MAINSUIT,
                     data: state.diagnosticList.diagnosticStr