Merge remote-tracking branch 'origin/dev5.4.3' into testedMerge

src/components/PreviewBody/index.jsx

@@ -111,7 +111,7 @@ class PreviewBody extends Component {
             <td className={`${style['patInfoSec']} ${style['pushMessage']} ${style['font14']}`}>
               {((adviceData&&adviceData.assay && adviceData.assay.length > 0) || ((adviceData&&adviceData.check)&& (adviceData&&adviceData.assay.check > 0))) && <p className={style.pushMessageTitle}><span>开单项目</span></p>}
               {
-                ((adviceData&&adviceData.assay && adviceData.assay.length > 0) || ((adviceData&&adviceData.check) && (adviceData&&adviceData.assay.check > 0))) && <div className={style.pushMessageDes}>{adviceData.check?adviceData.check+',':''} {adviceData.assay}</div>
+  ((adviceData&&adviceData.assay && adviceData.assay.length > 0) || ((adviceData&&adviceData.check) && (adviceData&&adviceData.assay.check > 0))) && <div className={style.pushMessageDes}>{adviceData.assay}{adviceData.check}</div>
               }
               {adviceData&&adviceData.commontreatment && adviceData.commontreatment.length > 0 && <p  className={style.pushMessageTitle}><span>一般治疗</span></p>}
               {

src/components/PushItems/DetailsModal/index.jsx

@@ -88,7 +88,7 @@ class DetailsModal extends Component {
                                             return (<div class={styles['details-menu-title-wrapper']}>
                                                 <div className={styles['details-menu-title-box']}>
                                                     {index === 0 ? '' : <div className={styles['details-content-menu-line']}></div>}
-                                                    <span onClick={this.handleClickMenu.bind(this, index, item, tipsDetails)} className={styles['details-content-menu-name']} style = {index === currentIndex ? {color:'#0089be'} : ''}>
+                                                    <span onClick={this.handleClickMenu.bind(this, index, item, tipsDetails)} className={styles['details-content-menu-name']} style = {index === currentIndex ? {color:'#3B9ED0'} : ''}>
                                                         <div className={styles['details-content-menu-circle-box']}>
                                                             {index !== currentIndex&&<span className={styles['details-content-menu-circle']} ></span>}
                                                             {index === currentIndex&&<img className={styles['details-content-menu-img']} src ={imgCurrent}/>}

src/components/PushItems/DetailsModal/index.less

@@ -6,7 +6,7 @@
     height: 100%;
     left: 0;
     top: 0;
-    line-height: 20px;
+    line-height: 21px;
     img {
         max-width: 100%;
     }
@@ -14,7 +14,7 @@
 
 .details-content-wrapper {
     position: fixed;
-    padding: 50px 0;
+    padding: 110px 0 50px 0;
     width: 80%;
     height: 80%;
     left: 10%;
@@ -33,33 +33,36 @@
 
 .details-content-name {
     position: absolute;
-    top: 0;
+    top: 43px;
     width: 100%;
-    padding: 0 40px;
-    height: 50px;
-    line-height: 50px;
-    font-size: 32px;
+    padding: 0  40px;
+    height: 37px;
+    line-height: 37px;
+    font-size: 28px;
     font-weight: bold;
+    color: #1E1E1E;
 }
 
 .details-content-title-box {
     position: relative;
-    height: 40px;
-    line-height: 40px;
+    line-height: 30px;
     font-size: 20px;
 }
 .details-menu-title-wrapper {
-    padding: 0 0 0 15px;
+    padding: 0 4px 0 20px;
     position: relative;
 }
 
 .details-content-title-name {
-    position: absolute;
+    position: relative;
     font-weight: bold;
     background: #fff;
     padding-right: 5px;
     font-size: 22px;
+    line-height: 30px;
+    display: inline-block;
     z-index: 10;
+    color: #1E1E1E;
 }
 
 
@@ -67,15 +70,14 @@
     position: absolute;
     right: 0;
     cursor: pointer;
+    top: -43px;
 }
 .details-content {
     position: relative;
     height: 100%;
-    padding: 0 180px 0 40px;
+    padding: 0 220px 0 40px;
     overflow-y: auto;
-    ul, ol {
-        padding: 0 0 0 15px;
-      }
+    
       ul li {
         list-style: disc;
         list-style-position: inside;
@@ -87,15 +89,15 @@
 }
 .content-menu-box {
     position: absolute;
-    top: 50px;
+    top: 110px;
     right: 20px;
-    width: 160px;
+    width: 200px;
     height: 80%;
     overflow: hidden;
     
 }
 .content-menu-wrapper {
-    width: 200px;
+    width: 240px;
     height: 100%;
     overflow-y: auto;
 }
@@ -103,11 +105,11 @@
     
     background: #F5F6F7;
     border: 1px solid #F5F6F7;
-    width: 160px;
-    padding: 15px 18px;
+    width: 200px;
+    padding: 15px 20px;
 }
 .details-content-menu-line {
-    height: 15px;
+    height: 20px;
     width: 0;
     background-color: #E0E2E3;
     margin-left: 0px
@@ -115,13 +117,14 @@
 .details-content-menu-name {
     position: relative;
     color: #777777;
-    font-size: 13px;
+    font-size: 14px;
     cursor: pointer;
+    line-height: 19px;
 }
 .details-content-menu-circle-box {
     display:inline-block;
     position: absolute;
-    left: -20px;
+    left: -25px;
     background: #F5F6F7;
 
 }
@@ -155,13 +158,13 @@
 }
 .details-content-box {
     border-left: 1px solid #969C9F;
-    padding: 0 0 0 20px;
+    padding: 0 0 0 33px;
 }
 .details-content-title-circle-box {
    position: absolute;
    z-index: 10;
    background: #fff;
-   left: -27px;
+   left: -40px;
    height: 32px;
    top: 0px;
 }
@@ -181,6 +184,7 @@ pre {
     white-space: pre-wrap;
     word-wrap: break-word;
     font-family: inherit;
-    color: #333;
+    color: #1E1E1E;
     margin: 10px 0;
+    line-height: 21px;
   }

src/components/TreatDesc/DrugInfo/index.jsx

@@ -77,7 +77,7 @@ class DrugInfo extends Component {
                                         return (<div class={style['details-menu-title-wrapper']}>
                                             <div className={style['details-menu-title-box']}>
                                                 {index === 0 ? '' : <div className={style['details-content-menu-line']}></div>}
-                                                <span onClick={this.handleClickMenu.bind(this, index, item, drugInfo.drugDesc)} className={style['details-content-menu-name']} style = {index === currentIndex ? {color:'#0089be'} : ''}>
+                                                <span onClick={this.handleClickMenu.bind(this, index, item, drugInfo.drugDesc)} className={style['details-content-menu-name']} style = {index === currentIndex ? {color:'#3B9ED0'} : ''}>
                                                     <div className={style['details-content-menu-circle-box']}>
                                                         {index !== currentIndex&&<span className={style['details-content-menu-circle']} ></span>}
                                                         {index === currentIndex&&<img className={style['details-content-menu-img']} src ={imgCurrent}/>}

src/components/TreatDesc/DrugInfo/index.less

@@ -9,14 +9,12 @@
     top: 10%;
     margin-left: -475px;
     background: #fff;
-    padding: 50px 0 60px;
+    padding: 110px 0 50px 0;
     box-shadow: 0px 0px 5px -2px #7d7c7c;
     word-break: break-all;
     max-width: 100%;
     line-height: 20px;
-    ul, ol {
-        padding: 0 0 0 15px;
-      }
+    
       ul li {
         list-style: disc;
         list-style-position: inside;
@@ -33,13 +31,14 @@
 }
 .drug-title {
     position: absolute;
-    top: 0;
+    top: 43px;
     width: 100%;
-    height: 50px;
-    line-height: 50px;
-    font-size: 32px;
+    height: 37px;
+    line-height: 37px;
+    font-size: 28px;
     font-weight: bold;
     padding: 0 40px;
+    color: #1E1E1E;
     cursor: move;
     moz-user-select: -moz-none;
     -moz-user-select: none;
@@ -61,7 +60,7 @@
 .drug-desc-item {
     zoom: 1;
     border-left: 1px solid #969C9F;
-    padding: 0 0 0 20px;
+    padding: 0 0 0 33px;
     &:after{
         content: "";
         display: block;
@@ -85,54 +84,55 @@
     height: 60px;
     line-height: 60px;
     font-size: 32px;
-    color: #000000;
+    color: #1E1E1E;
     text-align: center;
 }
 .drug-desc-content {
     /*width: 100%;*/
-    margin: 10px 160px 10px 10px;
+    margin: 10px 200px 10px 10px;
 }
 
 .content-menu-box {
     position: absolute;
-    top: 50px;
+    top: 110px;
     right: 20px;
-    width: 160px;
+    width: 200px;
     height: 80%;
     overflow: hidden;
     
 }
 .content-menu-wrapper {
-    width: 200px;
+    width: 240px;
     height: 100%;
     overflow-y: auto;
 }
 .content-menu-border{
     border-left: 2px solid #E0E2E3;
-    padding: 0 0 0 15px;
+    padding: 0 4px 0 20px;
 }
 .content-menu {
     
     background: #F5F6F7;
     border: 1px solid #F5F6F7;
-    width: 160px;
-    padding: 15px 18px;
+    width: 200px;
+    padding: 15px 20px;
 }
 .details-content-menu-line {
-    height: 15px;
+    height: 20px;
     width: 0;
     margin-left: 4px
 }
 .details-content-menu-name {
     position: relative;
     color: #777777;
-    font-size: 13px;
+    font-size: 14px;
     cursor: pointer;
+    line-height: 19px;
 }
 .details-content-menu-circle-box {
     display:inline-block;
     position: absolute;
-    left: -20px;
+    left: -25px;
     background: #F5F6F7;
 
 }
@@ -157,7 +157,7 @@
     position: absolute;
     z-index: 10;
     background: #fff;
-    left: -27px;
+    left: -40px;
     height: 32px;
     top: 0px;
  }
@@ -172,21 +172,25 @@
  }
  .details-content-title-box {
     position: relative;
-    height: 40px;
     line-height: 40px;
+    margin: 0 180px 0 0;
     font-size: 20px;
 }
 .details-content-title-name {
-    position: absolute;
+    position: relative;
     font-weight: bold;
     background: #fff;
     padding-right: 5px;
     font-size: 22px;
+    line-height: 30px;
+    display: inline-block;
     z-index: 10;
+    color: #1E1E1E;
 }
 pre {
     white-space: pre-wrap;
     word-wrap: break-word;
     font-family: inherit;
-    color: #333;
+    color: #1E1E1E;
+    line-height: 21px;
   }

src/store/actions/pushMessage.js

@@ -62,7 +62,7 @@ function getAdviceStr(advice) {
 					if(treatmentItem.treatmentStr === '') {
 						AdviceStr += treatmentItem.treatmentStr
 					}else {
-						AdviceStr += treatmentItem.treatmentStr + ', '
+						AdviceStr += treatmentItem.treatmentStr + '，'
 					}
 				}
 			}
@@ -85,8 +85,8 @@ function getAdviceStr(advice) {
 
 
 	}
-	if(AdviceStr.slice(AdviceStr.length-2) == ', ') {
-		AdviceStr = AdviceStr.slice(0, AdviceStr.length-2)
+	if(AdviceStr.slice(AdviceStr.length-1) == '，') {
+		AdviceStr = AdviceStr.slice(0, AdviceStr.length-1)
 	}
 	// if(commontreatment)  { 
 	// 	AdviceStr = commontreatment +'; ' + AdviceStr;
@@ -117,13 +117,13 @@ export const addScheme = (state, action) => {
 				for(let l = 0; l < treatment[i].meditionDetails[j].treatment[k].medicitionsList.length; l++) {
 					const drugItem = treatment[i].meditionDetails[j].treatment[k].medicitionsList[l]
 					if(drugItem.selected) {
-						treatmentStr = treatmentStr + drugItem.medicitionName + ', '
+						treatmentStr = treatmentStr + drugItem.medicitionName + '，'
 						drugList.push({conceptId: drugItem.conceptId, conceptName: drugItem.medicitionName })
 						SelectedDrugNum++
 					}
 					
 				}
-				treatment[i].meditionDetails[j].treatment[k].treatmentStr = treatmentStr.substring(0,treatmentStr.length-2)
+				treatment[i].meditionDetails[j].treatment[k].treatmentStr = treatmentStr.substring(0,treatmentStr.length-1)
 				treatment[i].meditionDetails[j].treatment[k].drugList = drugList
 			}
 		}
@@ -200,7 +200,7 @@ export const addScheme = (state, action) => {
 									const medicitionsItem = treatItem.medicitionsList[w]
 									if(medicitionsItem.selected) {
 										if(schemeItem.treatmentStr !== '') {
-											schemeItem.treatmentStr += ', ' +medicitionsItem.medicitionName
+											schemeItem.treatmentStr += '，' +medicitionsItem.medicitionName
 										} else {
 											schemeItem.treatmentStr += '' +medicitionsItem.medicitionName
 										}
@@ -329,7 +329,7 @@ export const addBilling = (state, action) => {
 			if( i === 0 && res.advice.check !== '') {
 				res.advice.assay = res.advice.assay  +  assay[i].name
 			} else {
-				res.advice.assay = res.advice.assay + ', ' + assay[i].name
+				res.advice.assay = res.advice.assay + '，' + assay[i].name
 			}
 		}
 		
@@ -338,12 +338,12 @@ export const addBilling = (state, action) => {
 		if ( res.advice.check === '') { //如果最后一个，则不需要逗号
 			res.advice.check = res.advice.check + check[i].name
 		} else {
-			res.advice.check = res.advice.check + ', '+ check[i].name 
+			res.advice.check = res.advice.check + '，'+ check[i].name 
 		}
 	}
 	if(res.advice.assay  && res.advice.check !== '') {
-			if(res.advice.assay.substring(res.advice.assay.length-2,res.advice.assay.length-1) !== ',') {
-				res.advice.assay = res.advice.assay + ', '
+			if(res.advice.assay.substring(res.advice.assay.length-1,res.advice.assay.length) !== '，') {
+				res.advice.assay = res.advice.assay + '，'
 			} 
 	}
 	res.AdviceStr = getAdviceStr(res.advice)