修改预览医嘱种，为中文（2889）

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/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
 										}
@@ -310,6 +310,7 @@ export const setChangeAdviceCheck = (state, action) => {
 }
 
 export const addBilling = (state, action) => {
+	console.log('aaa', state)
 	const res = JSON.parse(JSON.stringify(state));
 	const {assay,check} = action;
 	res.assay = res.assay.map((item,index)=>{
@@ -329,7 +330,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 +339,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)