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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@@ -380,13 +380,13 @@ public class FamilyContractService extends BaseService {
        json.put("services", services);
        //是否签约上限
//        JSONObject signLimit = signWebService.getSickFamilyDoctorSignLimit(doctor);
//        json.put("signTotal", signLimit.getInt("signTotal"));//签约总数
//        json.put("limitTotal", signLimit.getInt("limitTotal"));//限制总数
        JSONObject signLimit = signWebService.getSickFamilyDoctorSignLimit(doctor);
        json.put("signTotal", signLimit.getInt("signTotal"));//签约总数
        json.put("limitTotal", signLimit.getInt("limitTotal"));//限制总数
        //上线记得切换正式
        json.put("signTotal", 20);//签约总数
        json.put("limitTotal", 1000);//限制总数
//        json.put("signTotal", 20);//签约总数
//        json.put("limitTotal", 1000);//限制总数
        return json;
    }

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

@@ -153,7 +153,8 @@ public class WeixinBaseController extends BaseController {
			Iterable<AccessToken> accessTokens = accessTokenService.findAccessToken();
			if (accessTokens != null) {
				for (AccessToken accessToken : accessTokens) {
					if ((System.currentTimeMillis() - accessToken.getAdd_timestamp()) < (accessToken.getExpires_in() * 1000)) {
					//过期时间调整为 1000/2 原来的1/2
					if ((System.currentTimeMillis() - accessToken.getAdd_timestamp()) < (accessToken.getExpires_in() * 500)) {
						return accessToken.getAccess_token();
					} else {
						accessTokenService.delAccessToken(accessToken);

patient-co/patient-co-wlyy/src/main/resources/application-prod.yml

@@ -98,42 +98,41 @@ wechat:
    template_healthbank_credit: A2L6WBm1p6bDPYGkGnUmoMvpWlRruP2lapYwHfLV7Rg
  imgUrl:
    #居民wifi图片地址
    patient_wifi_pic_url: group1/M00/0E/F7/rBFuWltgKzGAKylNAABYgyiykZs261.png
    patient_wifi_pic_url: group1/M00/00/B0/Cl8WjVtgHqaAcNKWAABYgyiykZs906.png
    #居民抽奖图片地址
    patient_draw_pic_url: group1/M00/0E/F7/rBFuWltgJpqAeo07AADhRnoXe38234.png
    patient_draw_pic_url: group1/M00/00/B0/Cl8WjVtgGbWAYqumAADhRnoXe38057.png
    #专科医生签约图片地址
    specialist_sign_url: group1/M00/0E/F7/rBFuWltgKvCAPxXcAAH7mgUpbH0884.png
    specialist_sign_url: group1/M00/00/AE/Cl8WjFtgHZqAHpknAAH7mgUpbH0162.png
    #健康金图片地址
    doctor_activity_url: group1/M00/0E/F7/rBFuWltgJpqAfaACAAAde0sVAJk366.png
    doctor_activity_url: group1/M00/00/B0/Cl8WjVtgGbWAUJixAAAde0sVAJk652.png
    #通用活动图片地址
    currency_url: group1/M00/0E/F7/rBFuWltgJpqAANMzAAD7PWeBzLo094.png
    currency_url: group1/M00/00/B0/Cl8WjVtgGbWAfZI4AAD7PWeBzLo954.png
    #就诊记录
    patient_visit_pic: group1/M00/0E/F7/rBFuWltgKw6AZJW1AAEML2dpBxA257.png
    patient_visit_pic: group1/M00/00/AE/Cl8WjFtgIK-AAhmHAAEML2dpBxA906.png
    #检查检验
    patient_inspect_pic: group1/M00/0E/F7/rBFuWltgKSWAa1a8AAAxJl28nU8869.png
    patient_inspect_pic: group1/M00/00/B0/Cl8WjVtgGy6AAs61AAAxJl28nU8047.png
    #社区体检
    patient_examination_pic: group1/M00/0E/F7/rBFuWltgJpuAK_SHAAAg8pVTY9s754.png
    patient_examination_pic: group1/M00/00/B0/Cl8WjVtgGbWAVj77AAAg8pVTY9s660.png
    #处方记录
    patient_prescription_pic: group1/M00/0E/F7/rBFuWltgKSWAOMYgAAAyHL8RzEU644.png
    patient_prescription_pic: group1/M00/00/AE/Cl8WjFtgHZqAXPgzAAAyHL8RzEU114.png
    #居民取药码
    patient_QRCode_pic: group1/M00/0E/F7/rBFuWltgKSWAJjy9AAAV7lNAUpY601.png
    patient_QRCode_pic: group1/M00/00/B0/Cl8WjVtgG4WAC7JDAAAV7lNAUpY772.png
    #居民产检计划
    patient_prenata_pic: group1/M00/0E/F7/rBFuWltgKSWAIWR8AACK6PRmuEE302.png
    patient_prenata_pic: group1/M00/00/AE/Cl8WjFtgHZqAVhwaAACK6PRmuEE754.png
    #居民免疫计划
    patient_immune_pic: group1/M00/0E/F7/rBFuWltgKSWATOx4AAAckaOvfLQ859.png
    patient_immune_pic: group1/M00/00/B0/Cl8WjVtgG4WANg5iAAAckaOvfLQ582.png
    #医生咨询操作指南
    patient_operatinginstrutions_pic_url: group1/M00/0E/F7/rBFuWltgKSWAJ54UAAFkoQR6sbI604.png
    patient_operatinginstrutions_pic_url: group1/M00/00/B0/Cl8WjVtgG4WALvB0AAFkoQR6sbI214.png
    #预约挂号
    patient_booking_pic_url: group1/M00/0E/F7/rBFuWltgJpqAK7-XAAAh07_OGxo319.png
    patient_booking_pic_url: group1/M00/00/AE/Cl8WjFtgG8qAc0LRAAAh07_OGxo533.png
    #设备绑定
    patient_device_pic_url: group1/M00/0E/F7/rBFuWltgJpqASrw0AAArKMof5DE070.png
    patient_device_pic_url: group1/M00/00/AE/Cl8WjFtgG8qANy56AAArKMof5DE911.png
    #我的家庭
    patient_family_pic_url: group1/M00/0E/F7/rBFuWltgKSWAW0VsAAA5I5LejjI640.png
    patient_family_pic_url: group1/M00/00/AE/Cl8WjFtgHZmAb043AAA5I5LejjI793.png
    #续签
    patient_sign_again_pic_url: group1/M00/0E/F7/rBFuWltgKSWAX54yAAAc2gFIWBc839.png
    patient_sign_again_pic_url: group1/M00/00/B0/Cl8WjVtgG4WAV-8SAAAc2gFIWBc275.png
    #家庭医生签约1+1+N
    doctor_qrcode_pic_url: group1/M00/0E/F7/rBFuWltgJpuALDe2AAD3GkV403w048.png
    doctor_qrcode_pic_url: group1/M00/00/AE/Cl8WjFtgJGaAZ1VyAAD3GkV403w850.png
yihu:
  yihu_OpenPlatform_url: http://api.yihu.com.cn/OpenPlatform/cgiBin/1.0/

patient-co/patient-co-wlyy/src/main/resources/application-test.yml

@@ -93,41 +93,41 @@ wechat:
   template_healthbank_credit: A2L6WBm1p6bDPYGkGnUmoMvpWlRruP2lapYwHfLV7Rg
  imgUrl:
    #居民wifi图片地址
    patient_wifi_pic_url: group1/M00/00/B0/Cl8WjVtgHraAdcSNAAEtENJp5q8010.png
    patient_wifi_pic_url: group1/M00/0E/F7/rBFuWltgKzGAKylNAABYgyiykZs261.png
    #居民抽奖图片地址
    patient_draw_pic_url: group1/M00/00/B0/Cl8WjVtgGbWAYqumAADhRnoXe38057.png
    patient_draw_pic_url: group1/M00/0E/F7/rBFuWltgJpqAeo07AADhRnoXe38234.png
    #专科医生签约图片地址
    specialist_sign_url: group1/M00/00/AE/Cl8WjFtgHZqAHpknAAH7mgUpbH0162.png
    specialist_sign_url: group1/M00/0E/F7/rBFuWltgKvCAPxXcAAH7mgUpbH0884.png
    #健康金图片地址
    doctor_activity_url: group1/M00/00/B0/Cl8WjVtgGbWAUJixAAAde0sVAJk652.png
    doctor_activity_url: group1/M00/0E/F7/rBFuWltgJpqAfaACAAAde0sVAJk366.png
    #通用活动图片地址
    currency_url: group1/M00/00/B0/Cl8WjVtgGbWAfZI4AAD7PWeBzLo954.png
    currency_url: group1/M00/0E/F7/rBFuWltgJpqAANMzAAD7PWeBzLo094.png
    #就诊记录
    patient_visit_pic: group1/M00/00/AE/Cl8WjFtgIK-AAhmHAAEML2dpBxA906.png
    patient_visit_pic: group1/M00/0E/F7/rBFuWltgKw6AZJW1AAEML2dpBxA257.png
    #检查检验
    patient_inspect_pic: group1/M00/00/B0/Cl8WjVtgGy6AAs61AAAxJl28nU8047.png
    patient_inspect_pic: group1/M00/0E/F7/rBFuWltgKSWAa1a8AAAxJl28nU8869.png
    #社区体检
    patient_examination_pic: group1/M00/00/B0/Cl8WjVtgGbWAVj77AAAg8pVTY9s660.png
    patient_examination_pic: group1/M00/0E/F7/rBFuWltgJpuAK_SHAAAg8pVTY9s754.png
    #处方记录
    patient_prescription_pic: group1/M00/00/AE/Cl8WjFtgHZqAXPgzAAAyHL8RzEU114.png
    patient_prescription_pic: group1/M00/0E/F7/rBFuWltgKSWAOMYgAAAyHL8RzEU644.png
    #居民取药码
    patient_QRCode_pic: group1/M00/00/B0/Cl8WjVtgG4WAC7JDAAAV7lNAUpY772.png
    patient_QRCode_pic: group1/M00/0E/F7/rBFuWltgKSWAJjy9AAAV7lNAUpY601.png
    #居民产检计划
    patient_prenata_pic: group1/M00/00/AE/Cl8WjFtgHZqAVhwaAACK6PRmuEE754.png
    patient_prenata_pic: group1/M00/0E/F7/rBFuWltgKSWAIWR8AACK6PRmuEE302.png
    #居民免疫计划
    patient_immune_pic: group1/M00/00/B0/Cl8WjVtgG4WANg5iAAAckaOvfLQ582.png
    patient_immune_pic: group1/M00/0E/F7/rBFuWltgKSWATOx4AAAckaOvfLQ859.png
    #医生咨询操作指南
    patient_operatinginstrutions_pic_url: group1/M00/00/B0/Cl8WjVtgG4WALvB0AAFkoQR6sbI214.png
    patient_operatinginstrutions_pic_url: group1/M00/0E/F7/rBFuWltgKSWAJ54UAAFkoQR6sbI604.png
    #预约挂号
    patient_booking_pic_url: group1/M00/00/AE/Cl8WjFtgG8qAc0LRAAAh07_OGxo533.png
    patient_booking_pic_url: group1/M00/0E/F7/rBFuWltgJpqAK7-XAAAh07_OGxo319.png
    #设备绑定
    patient_device_pic_url: group1/M00/00/AE/Cl8WjFtgG8qANy56AAArKMof5DE911.png
    patient_device_pic_url: group1/M00/0E/F7/rBFuWltgJpqASrw0AAArKMof5DE070.png
    #我的家庭
    patient_family_pic_url: group1/M00/00/AE/Cl8WjFtgHZmAb043AAA5I5LejjI793.png
    patient_family_pic_url: group1/M00/0E/F7/rBFuWltgKSWAW0VsAAA5I5LejjI640.png
    #续签
    patient_sign_again_pic_url: group1/M00/00/B0/Cl8WjVtgG4WAV-8SAAAc2gFIWBc275.png
    patient_sign_again_pic_url: group1/M00/0E/F7/rBFuWltgKSWAX54yAAAc2gFIWBc839.png
    #家庭医生签约1+1+N
    doctor_qrcode_pic_url: group1/M00/00/AE/Cl8WjFtgJGaAZ1VyAAD3GkV403w850.png
    doctor_qrcode_pic_url: group1/M00/0E/F7/rBFuWltgJpuALDe2AAD3GkV403w048.png
yihu:
  yihu_OpenPlatform_url: http://ssotest.yihu.cn/OpenPlatform/cgiBin/1.0/
  yihu_OpenPlatform_appId: 9000276