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

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/service/app/prenatalInspector/PrenatalInspectorPreCardService.java

@@ -252,7 +252,7 @@ public class PrenatalInspectorPreCardService extends BaseService {
                com.alibaba.fastjson.JSONObject examRecord = JSON.parseObject(natal.toString());
                String exam_time = examRecord.getString("EXAM_TIME");
                Date examTime = format.parse(exam_time);
                if ((examTime.getTime()<= end.getTime()) && (examTime.getTime() >= begin.getTime())){
                if ((examTime.getTime() >= begin.getTime())){
                    respose.put("status","1");
                    respose.put("examTime",exam_time);
                    return respose;

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

@@ -20,7 +20,7 @@
		  },
		  {
            "type":"view",
            "name":"健康文章",
            "name":"健教文库",
            "url":"https://open.weixin.qq.com/connect/oauth2/authorize?appid=appId&redirect_uri=server_url%2fwx%2fhtml%2fjkjy%2fhtml%2farticle_list.html&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
          }
	  ]