Merge branch 'dev' of linzhuo/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/health/DoctorHealthGuidanceController.java

@@ -129,7 +129,7 @@ public class DoctorHealthGuidanceController extends WeixinBaseController {
					  @RequestParam(required = false) String images,
					  @RequestParam(required = false) String voice) {
		if(modelCode==null) {
		if(StringUtils.isBlank(modelCode)) {
//			不使用模板指导，旧版手工指导
			try {
				PatientHealthGuidance guidance = new PatientHealthGuidance();