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

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

@@ -182,7 +182,7 @@ public class ApplicationEvent implements ApplicationListener<ContextRefreshedEve
            //老年人体检消息发送记录，每天凌晨1点执行一次
            if (!quartzHelper.isExistJob("patient_physical_examination_job")) {
                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("patient_physical_examination_job");
                quartzHelper.addJob(OldPeoplePhysicalExaminationSynJob.class, trigger, "patient_physical_examination_job", new HashMap<String, Object>());
                quartzHelper.addJob(PatientPhysicalExaminationJob.class, trigger, "patient_physical_examination_job", new HashMap<String, Object>());
                logger.info("patient_physical_examination_job  job success");
            } else {
                logger.info("patient_physical_examination_job  job exist");

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/service/app/physicalExamination/PatientPhysicalExaminationService.java

@@ -19,6 +19,7 @@ import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.Calendar;
@@ -31,6 +32,7 @@ import java.util.List;
 * 居民近365天无体检记录时，系统自动发送一条体检提醒信息。使用“代办事项通知”模板
 * 代理机制还存在
 */
@Service
public class PatientPhysicalExaminationService extends BaseService {
    @Autowired
    private PushMsgTask pushMsgTask;
@@ -70,9 +72,11 @@ public class PatientPhysicalExaminationService extends BaseService {
            for (SignFamily signFamilie : signFamilies) {
                String patientCode = signFamilie.getPatient();
                Patient patient = patientDao.findByCode(patientCode);
                if (patient == null) {
                    continue;
                }
                String url = "huanzhe/html/jiankangtijian.html?openid=" + patient.getOpenid() + "&toUser=" + patient.getCode() + "&toName=" + patient.getName();
                json.put("url", url);
                String mobile = patient.getMobile();
                if (StringUtils.isNotBlank(patient.getOpenid())) {
                    json.put("first", first);
@@ -102,7 +106,7 @@ public class PatientPhysicalExaminationService extends BaseService {
                        }
                    }
                }
                if (flag){
                if (flag) {
                    //发送成功保存发送记录
                    PhysicalExaminationRecords records = new PhysicalExaminationRecords();
                    records.setCode(getCode());

patient-co/patient-co-wlyy-job/src/main/resources/system.properties

@@ -117,8 +117,7 @@ old_people_tijian_syb_job=0 0 1 * * ?
patient_followup_syb_job=0 0 3 * * ?
# 老年人体检系统发送提醒记录，每天8点执行一次
#patient_physical_examination_job=0 0 8 * * ?
patient_physical_examination_job=0 0/10 * * * ?
patient_physical_examination_job=0 0 8 * * ?
#统一支付平台支付成功后页面跳转地址
return_url={server}/wx/html/qygl/html/pay_result.html