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

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

@@ -1,5 +1,6 @@
package com.yihu.wlyy.event;
import com.yihu.wlyy.job.PrescriptionPayOverdueJob;
import com.yihu.wlyy.job.QuartzHelper;
import com.yihu.wlyy.job.SignAgainJob;
import com.yihu.wlyy.job.SignEndJob;
@@ -50,7 +51,14 @@ public class ApplicationEvent implements ApplicationListener<ContextRefreshedEve
            } else {
                logger.info("sign_again_job exist");
            }
            //续方支付到期,每天0点触发
            if (!quartzHelper.isExistJob("prescription_pay_overdue_job")) {
                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("prescription_pay_overdue_job");
                quartzHelper.addJob(PrescriptionPayOverdueJob.class, trigger, "prescription_pay_overdue_job", new HashMap<String, Object>());
                logger.info("prescription pay overdue job success");
            } else {
                logger.info("prescription pay overdue job exist");
            }
            //启动发送产检提醒模板消息
//            if (!quartzHelper.isExistJob("prenatal_inspector_job")) {
//                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("prenatal_inspector_job_trigger");

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

@@ -0,0 +1,34 @@
package com.yihu.wlyy.job;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;
/**
 * Created by Trick on 2017/8/2.
 */
@Component
public class PrescriptionPayOverdueJob implements Job {
    @Autowired
    private JdbcTemplate jdbcTemplate;
    private final Logger logger = LoggerFactory.getLogger(this.getClass());
    @Override
    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
        try {
            logger.info("Prescription_Pay_Overdue_Job_start");
            StringBuffer sql = new StringBuffer("UPDATE wlyy_prescription SET status = -3 WHERE TIMESTAMPDIFF(second,create_time,NOW())>=172800");
            jdbcTemplate.execute(sql.toString());
            logger.info("Prescription_Pay_Overdue_Job_end");
        }catch (Exception e){
            e.printStackTrace();
            logger.info("Prescription_Pay_Overdue_Job_error");
        }
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionInfoService.java

@@ -282,10 +282,12 @@ public class PrescriptionInfoService extends BaseService {
            if("1".equals(state)){
                //审核通过
                p.setStatus(10);
                p.setReviewedTime(new Date());
            }else{
                //审核不通过
                p.setStatus(-1);
                p.setReviewedReason(reason);
                p.setReviewedTime(new Date());
            }
            prescriptionDao.save(p);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/util/ManagerUtilController.java

@@ -296,6 +296,17 @@ public class ManagerUtilController extends BaseController {
        }
    }
    @RequestMapping(value = "/prescription_pay_overdue_job_now")
    @ResponseBody
    public String startPrescriptionPayOverdueJobNow() {
        try {
            quartzHelper.startNow(EvaluateScoreJob.class, "prescription_pay_overdue_job"+UUID.randomUUID(), new HashMap<String, Object>());
            return write(200, "启动成功");
        } catch (Exception e) {
            return error(-1, "启动失败");
        }
    }
    @RequestMapping(value = "/start_renew_to_sign_job")
    @ResponseBody
    public String startRenewToSignJob() {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prescription/PrescriptionInfoController.java

@@ -92,7 +92,7 @@ public class PrescriptionInfoController extends BaseController{
    @RequestMapping(value = "/reviewPrescription", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation(value = "续方详情")
    @ApiOperation(value = "续方审核")
    public String reviewPrescription(@RequestParam(required = true)@ApiParam(value = "续方CODE", name = "code") String code,
                                     @RequestParam(required = false)@ApiParam(value = "不同意原因", name = "reason") String reason,
                                     @RequestParam(required = false)@ApiParam(value = "1同意,2不同意", name = "state") String state){
@@ -119,5 +119,29 @@ public class PrescriptionInfoController extends BaseController{
        }
    }
    @RequestMapping(value = "/getInfoTitle", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation(value = "调整处方-药品分类及种类数目")
    public String getInfoTitle(){
        try {
            return write(200, "操作成功！", "data","");
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败！");
        }
    }
    @RequestMapping(value = "/getInfoListByParentCode", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation(value = "药品类别获取药品")
    private String getInfoListByParentCode(@RequestParam(required = true)@ApiParam(value = "药品类别Code", name = "code") String code){
        try {
            return write(200, "操作成功！", "data","");
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败！");
        }
    }
}

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

@@ -78,6 +78,8 @@ sign_again_job_end=2017-10-1 00:00:00
prenatal_inspector_job_trigger=0 0 6 * * ?
evaluate_score_job = 0 0 */2 * * ?
#续方支付到期,每天0点触发
prescription_pay_overdue_job = 0 0 0 * * ?
#统一支付平台支付成功后页面跳转地址
return_url={server}/wx/html/qygl/html/pay_result.html