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

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/job/PatientConfirmReceiptJob.java

@@ -70,7 +70,7 @@ public class PatientConfirmReceiptJob implements Job {
                        Date confirm = DateUtil.getPreDays(payTime, ((extendCount + 1) * 7));
                        //4.计算现在到预计自动确认收货时间差值
                        long days = DateUtil.getDays(today,payTime);
                        if(days == 3){
                        if(days == 3 && extendCount ==0){
                            //支付后第三天发送自动确认预提醒
                            sendWechatTemplate(1,patient,prescription.getCode());
                        }

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

@@ -389,7 +389,7 @@ public class ConsultController extends WeixinBaseController {
            synchronized (getRepUID().intern()){//新增同步方法。设备保存写在service层但是不生效，写在controller层才生效
                JSONObject re = consultTeamService.addTeamConsult(consult, getRepUID(),getUID());
                res = re.getInt("status");
                dts = re.getJSONArray("doctor");
                dts = re.has("doctor")?re.getJSONArray("doctor"):null;
            }
            if (res == -1) {
                return error(-1, "家庭签约信息不存在或已过期，无法进行家庭医生咨询！");

patient-co/patient-co-wlyy/src/main/resources/wechat/weixin_menu.txt

@@ -60,6 +60,11 @@
	  "name":"我的",
	  "sub_button":[
		{
           "type":"view",
           "name":"电子健康卡",
           "url":"https://open.weixin.qq.com/connect/oauth2/authorize?appid=appId&redirect_uri=server_url%2fwx%2fhtml%2fgrzx%2fhtml%2fmy-health-card.html&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
        },
		{
		   "type":"view",
		   "name":"我的资料",
		   "url":"https://open.weixin.qq.com/connect/oauth2/authorize?appid=appId&redirect_uri=server_url%2fwx%2fhtml%2fgrzx%2fhtml%2fmy-detail.html&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
@@ -78,11 +83,6 @@
         	"type":"click",
         	"name":"操作说明",
         	"key":"caozuoshuoming"
        },
        {
        	 "type":"view",
        	 "name":"电子健康卡",
        	 "url":"https://open.weixin.qq.com/connect/oauth2/authorize?appid=appId&redirect_uri=server_url%2fwx%2fhtml%2fgrzx%2fhtml%2fmy-health-card.html&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
        }
	 ]
  }

patient-co/patient-co-wlyy/src/main/resources/wechat/weixin_menu_jimei.txt

@@ -65,6 +65,11 @@
		   "url":"https://open.weixin.qq.com/connect/oauth2/authorize?appid=appId&redirect_uri=server_url%2fwx%2fhtml%2fdist%2fhtml%2fexclusive-service.html&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
		},
		{
           "type":"view",
           "name":"电子健康卡",
           "url":"https://open.weixin.qq.com/connect/oauth2/authorize?appid=appId&redirect_uri=server_url%2fwx%2fhtml%2fgrzx%2fhtml%2fmy-health-card.html&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
        },
		{
		   "type":"view",
		   "name":"我的资料",
		   "url":"https://open.weixin.qq.com/connect/oauth2/authorize?appid=appId&redirect_uri=server_url%2fwx%2fhtml%2fgrzx%2fhtml%2fmy-detail.html&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
@@ -78,12 +83,7 @@
		   "type":"view",
		   "name":"我的设备",
		   "url":"https://open.weixin.qq.com/connect/oauth2/authorize?appid=appId&redirect_uri=server_url%2fwx%2fhtml%2fwdsb%2fhtml%2fmy-equipments.html&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
		},
        {
        	 "type":"view",
        	 "name":"意见反馈",
        	 "url":"https://open.weixin.qq.com/connect/oauth2/authorize?appid=appId&redirect_uri=server_url%2fwx%2fhtml%2fyjfk%2fhtml%2ffeedback.html&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
        }
		}
	 ]
  }],
    "matchrule":{