模板医嘱中添加回访时间和开单项

src/store/actions/pushMessage.js

@@ -38,24 +38,39 @@ function getAdviceStr(advice) {
 	const commontreatment = advice.commontreatment
 	const scheme = advice.scheme || '';
 	const adviceInput = advice.adviceInput || '';
-	// const assay = advice.assay || '';
-	// const check = advice.check || '';
+	const assay = advice.assay || '';
+	const check = advice.check || '';
+	const followUp = advice.followUp || '';
 	let AdviceStr = advice.AdviceStr || '';
+
+	if(assay || check) {
+		AdviceStr = assay + check  +'; ' + AdviceStr;
+	}
+	if(commontreatment)  { 
+		AdviceStr = AdviceStr + commontreatment + ';';
+	}	
+	if(followUp) {
+		AdviceStr = AdviceStr + '回访时间：'+followUp + '后回访，不适随诊' + ';';
+	}
 	for (let i = 0; i < scheme.length; i++) {
 		for (let j = 0; j < scheme[i].treatment.length; j++) {
 			if(scheme[i].treatment[j].treatmentStr === '') {
 				AdviceStr = AdviceStr + scheme[i].treatment[j].treatmentStr
 			} else {
-				AdviceStr = AdviceStr.substring(1, AdviceStr.length) + ', ' + scheme[i].treatment[j].treatmentStr
+				AdviceStr = AdviceStr  + scheme[i].treatment[j].treatmentStr + ', '
 			}
 		}
 	}
-	if(commontreatment)  { 
-		AdviceStr = commontreatment +'; ' + AdviceStr;
-	}	
+	if(AdviceStr.slice(AdviceStr.length-2) == ', ') {
+		AdviceStr = AdviceStr.slice(0, AdviceStr.length-2)
+	}
+	// if(commontreatment)  { 
+	// 	AdviceStr = commontreatment +'; ' + AdviceStr;
+	// }	
 	if(adviceInput)  { 
 		AdviceStr = AdviceStr +'; ' + adviceInput;
 	}	
+	
 	return AdviceStr;
 }