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

patient-co-service/wlyy_sign/src/main/java/com/yihu/wlyy/sign/service/SignRenewZYService.java

@@ -310,8 +310,8 @@ public class SignRenewZYService {
                                //密码迁移
                                if(patientHad!=null&&!StringUtil.isEmpty(patientHad.getPassword())&&!StringUtil.isEmpty(patientHad.getSalt()))
                                {
                                    patient.setOpenid(patientHad.getPassword());
                                    patient.setOpenid(patientHad.getSalt());
                                    patient.setPassword(patientHad.getPassword());
                                    patient.setSalt(patientHad.getSalt());
                                }
                                else{
                                    //修改旧的默认密码
@@ -925,8 +925,8 @@ public class SignRenewZYService {
                                //密码迁移
                                if(patientHad!=null&&!StringUtil.isEmpty(patientHad.getPassword())&&!StringUtil.isEmpty(patientHad.getSalt()))
                                {
                                    patient.setOpenid(patientHad.getPassword());
                                    patient.setOpenid(patientHad.getSalt());
                                    patient.setPassword(patientHad.getPassword());
                                    patient.setSalt(patientHad.getSalt());
                                }
                                else{
                                    //修改旧的默认密码
@@ -1116,11 +1116,11 @@ public class SignRenewZYService {
                        needSave = true;
                    }
                    //手机号覆盖
                    /*if(!StringUtil.isEmpty(phoneNumber) && !phoneNumber.equals(patient.getMobile()))
                    if(!StringUtil.isEmpty(phoneNumber) && !phoneNumber.equals(patient.getMobile()))
                    {
                        patient.setMobile(phoneNumber);
                        needSave = true;
                    }*/
                    }
                    if(needSave)
                    {

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

@@ -28,26 +28,26 @@ public class FollowUpSynJob implements Job {
	
	@Override
	public void execute(JobExecutionContext context) throws JobExecutionException {
//		logger.info("START=====居民随访记录同步JOB");
//		try {
//
//			Date end = new Date();
//			do{
//				String startTime =  systemDictService.getFollowupSynTime();   //上次执行时间
//				logger.info("采集时间：start="+startTime);
//				end = DateUtil.getNextMin(DateUtil.strToDate(startTime), 20);
//				String endTime = DateUtil.dateToStrLong(end);//采集20分钟后的数据
//				logger.info("采集时间：end="+endTime);
//				//根据起止时间查询家签居民随访记录,并同步到本地数据库
//				jwPrescriptionService.getFollowUpByTime(startTime,endTime);
//				//更新下次采集签约时间
//				systemDictService.saveFollowupSynTime(endTime);
//
//			}while (end.before(new Date()));
//			logger.info("END========居民随访记录同步JOB");
//		}catch (Exception e){
//			e.printStackTrace();
//			logger.info("END===ERROE===居民随访记录同步JOB,message:"+e.getMessage());
//		}
		logger.info("START=====居民随访记录同步JOB");
		try {
			Date end = new Date();
			do{
				String startTime =  systemDictService.getFollowupSynTime();   //上次执行时间
				logger.info("采集时间：start="+startTime);
				end = DateUtil.getNextMin(DateUtil.strToDate(startTime), 5);
				String endTime = DateUtil.dateToStrLong(end);//采集20分钟后的数据
				logger.info("采集时间：end="+endTime);
				//根据起止时间查询家签居民随访记录,并同步到本地数据库
				jwPrescriptionService.getFollowUpByTime(startTime,endTime);
				//更新下次采集签约时间
				systemDictService.saveFollowupSynTime(endTime);
			}while (end.before(new Date()));
			logger.info("END========居民随访记录同步JOB");
		}catch (Exception e){
			e.printStackTrace();
			logger.info("END===ERROE===居民随访记录同步JOB,message:"+e.getMessage());
		}
	}
}

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

@@ -39,6 +39,10 @@ specialist:
iot:
  url: http://192.168.131.24:8088/svr-iot/
#健康银行配置
healthBank:
  url: http://192.168.120.167:8661/svr-wlyy-health-bank/svr-health-bank/
#康复计划配置
rehabilitation:
  url: http://localhost:10055/svr-rehabilitation/
@@ -91,10 +95,7 @@ wechat:
   template_patient_bind_device: 1GWPw6LFcSuz2LFTo6LhE-YY8abtmcKRvor1fUzfxBE
   #积分到账通知
   template_healthbank_credit: A2L6WBm1p6bDPYGkGnUmoMvpWlRruP2lapYwHfLV7Rg
   #支付提醒
   template_to_be_pay: Y5d-V3qW78ThFEi_DuepFdZ3dn1FpHeL2NzH0ilw-qM
   #支付成功通知
   template_pay_success: wetf1x_yZ7iKu6wRIld6KMXCO3NVase4VvhQrQxNWEo
yihu:
  yihu_OpenPlatform_url: http://api.yihu.com.cn/OpenPlatform/cgiBin/1.0/
@@ -173,4 +174,10 @@ ylz:
  redirectUrl:  aaa
  termId: aaa
  gateway:
    url: http://120.42.37.94:1301/ehc-empi-web/gateway
    url: http://120.42.37.94:1301/ehc-empi-web/gateway
# 药盒请求巨烨的域名以及巨烨给予的公司编号
juye:
  url: http://api.zayata.com/index.php?s=/Company/Device/
  companyCode: 86350206000000001
  companySecret: ODZhZjg1OWM4YTQyMDNkMWU5MDkxNjE0YmRhODI5YmU=