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

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/WeixinBaseController.java

@@ -352,7 +352,7 @@ public class WeixinBaseController extends BaseController {
			// 生成缩略图
			//ImageCompress.compress(uploadFile.getAbsolutePath(), uploadFile.getAbsolutePath() + "_small", 300, 300);
			// 返回保存路径
			return SystemConf.getInstance().getImageServer()+datePath + newFileName;
			return datePath + newFileName;
		} catch (IOException e) {
			e.printStackTrace();
		} finally {