Merge branch 'ChronicMag' of http://192.168.2.236:10080/zhouna/newICSS into ChronicMag

src/components/Advice/index.jsx

@@ -83,11 +83,11 @@ class Advice extends Component{
 
     return  <div className={`${'mainsuit-box'} ${style['main-suit']}`}>
       <ItemBox title='医嘱' editable={false} border={true} marginTop="10px">
-        {/* <div className={style['billing']}>
+        <div className={style['billing']}>
           {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> */}
+        </div>
         {advice.commontreatment && advice.commontreatment.length > 0 &&<div className={style['billing']}  >
           {advice.commontreatment && advice.commontreatment.length > 0 && <h1>一般治疗</h1>}
             {/* {advice.commontreatment && <div className={style['treat-input']}  onInput={this.handleComTreatInput}  contentEditable={true} style = {{outline: 'none'}}></div>} */}

src/store/actions/pushMessage.js

@@ -201,33 +201,33 @@ export const addBilling = (state, action) => {
 		item.checked = false
 		return item
 	})
-	// res.advice.assay = res.advice.assay || '';
-	// res.advice.check = res.advice.check || '';
-	// for (let i = 0; i < assay.length; i++) {
-	// 	if ( res.advice.assay === '') { //如果最后一个，则不需要逗号
-	// 		res.advice.assay = res.advice.assay + assay[i].name
-	// 	} else {
-	// 		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 || '';
+	res.advice.check = res.advice.check || '';
+	for (let i = 0; i < assay.length; i++) {
+		if ( res.advice.assay === '') { //如果最后一个，则不需要逗号
+			res.advice.assay = res.advice.assay + assay[i].name
+		} else {
+			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
+			}
+		}
 		
-	// }
-	// for (let i = 0; i < check.length; i++) {
-	// 	if ( res.advice.check === '') { //如果最后一个，则不需要逗号
-	// 		res.advice.check = res.advice.check + check[i].name
-	// 	} else {
-	// 		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 + ', '
-	// 		} 
-	// }
-	// res.AdviceStr = getAdviceStr(res.advice)
+	}
+	for (let i = 0; i < check.length; i++) {
+		if ( res.advice.check === '') { //如果最后一个，则不需要逗号
+			res.advice.check = res.advice.check + check[i].name
+		} else {
+			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 + ', '
+			} 
+	}
+	res.AdviceStr = getAdviceStr(res.advice)
 	return res;
 }
 export const clearAllPushMessage = (state, action) => {

src/store/async-actions/pushMessage.js

@@ -115,7 +115,6 @@ export const getTipsDetails = () => {
 
         //弹窗显示
         const url ='/introduceInfo/getByQuestionId'
-        
         const params = {
             type: state.diagnosticList.clickDiag.type,
             questionId: state.diagnosticList.clickDiag.id,