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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/doctor/DoctoreSchemeBloodPressureDao.java

@@ -17,7 +17,7 @@ public interface DoctoreSchemeBloodPressureDao extends
        PagingAndSortingRepository<DoctorSchemeBloodPressure, Long>,
        JpaSpecificationExecutor<DoctorSchemeBloodPressure> {
    @Query(value =" select * from wlyy_doctor_scheme_blood_pressure where (doctorcode=?1 or code = 'default') and del != 1 ORDER BY doctorcode desc,code,dayofweek asc",nativeQuery = true)
    @Query(value =" select * from wlyy_doctor_scheme_blood_pressure where (doctorcode=?1 or code = 'default') and del != 1 ORDER BY create_time desc,code,dayofweek asc",nativeQuery = true)
    List<DoctorSchemeBloodPressure> getListByDoctorcode(String doctorCode);
    @Query(" from DoctorSchemeBloodPressure p where p.code=?1 and p.del != 1 order by p.doctorcode,p.code desc,p.dayofweek asc")

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/doctor/DoctrorSchemeBloodSuggerDao.java

@@ -22,7 +22,7 @@ public interface DoctrorSchemeBloodSuggerDao extends
        PagingAndSortingRepository<DoctorSchemeBloodSugger, Long>,
        JpaSpecificationExecutor<DoctorSchemeBloodSugger> {
    @Query(value =" select * from wlyy_doctor_scheme_blood_sugger where (doctorcode=?1 or code = 'default') and del != 1 ORDER BY doctorcode desc,code,dayofweek asc",nativeQuery = true)
    @Query(value =" select * from wlyy_doctor_scheme_blood_sugger where (doctorcode=?1 or code = 'default') and del != 1 ORDER BY create_time desc,code,dayofweek asc",nativeQuery = true)
    List<DoctorSchemeBloodSugger> getListByDoctorcode(String doctorCode);
    @Query(" from DoctorSchemeBloodSugger p where p.code=?1 and p.del != 1 order by p.doctorcode,p.code desc,p.dayofweek asc")

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

@@ -46,9 +46,9 @@
		},
         {
            "type":"view",
            "name":"疾病社区",
            "url":"https://open.weixin.qq.com/connect/oauth2/authorize?appid=appId&redirect_uri=server_url%2fwx%2fhtml%2fjbsq%2fhtml%2fdisease-community.html&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
        },
            "name":"慢病管理",
            "url":"https://open.weixin.qq.com/connect/oauth2/authorize?appid=appId&redirect_uri=server_url%2fwx%2fhtml%2fjbsq%2fhtml%2fslow-disease-manage.html&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
                  },
        {
            "type":"view",
            "name":"孕检计划",