Merge branch 'dev' of huangzhanpeng/wlyy_management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/util/DateUtil.java

@@ -26,6 +26,16 @@ public class DateUtil {
	public static final String YYYY_M_D_HH_MM_SS = "yyyy/M/d HH:mm:ss";
	/**
	 * 时间格式转中文格式
	 */
	public static String dateToChinese(Date date) {
		SimpleDateFormat formatter =   new SimpleDateFormat( "yyyy年MM月dd日EEEEaaaahh:mm" );
		return formatter.format(date);
	}
	/**
	 * 字符串转时间格式
	 */

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

@@ -13,6 +13,7 @@ import com.yihu.wlyy.service.third.guahao.GuahaoXMService;
import com.yihu.wlyy.service.third.guahao.GuahaoYihuService;
import com.yihu.wlyy.service.third.guahao.IGuahaoService;
import com.yihu.wlyy.task.PushMsgTask;
import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.util.HttpClientUtil;
import com.yihu.wlyy.util.NetworkUtil;
import com.yihu.wlyy.util.SystemConf;
@@ -400,6 +401,7 @@ public class BookingController extends WeixinBaseController {
        }
    }*/
    @RequestMapping(value = "CreateOrderByDoctor", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("(内网)转诊预约挂号")
@@ -438,7 +440,7 @@ public class BookingController extends WeixinBaseController {
            if (obj != null) {
                String des = "";
                try {
                    String msg = obj.getDname() + "医生已成功为您预约：" + obj.getStartTime() + "，" + obj.getOrgName() +
                    String msg = obj.getDname() + "医生已成功为您预约：" + DateUtil.dateToChinese(obj.getStartTime()) + "，" + obj.getOrgName() +
                            obj.getDeptName() + obj.getDeptName() + "医生的号源。您可直接前往医院就诊。";
                    //发送短信消息，调用总部发送信息的接口