Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

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

@@ -31,7 +31,6 @@ public class PrescriptionExecuteSickSettleJob implements Job {
        logger.info("START=====开始执行长处方支付成功，院内结算失败，重新执行院内结算的JOB");
        try {
            //获取支付完成，院内结算失败的 处方CODE 集合
            List<String> prescriptionCodeList = prescriptionService.findCodesByPayStautsAndExecuteSickStatus();
            if(!prescriptionCodeList.isEmpty()){

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

@@ -198,4 +198,12 @@ public class PrescriptionService extends BaseService {
    }
    /**
     *获取支付完成，院内结算失败的 处方CODE 集合
     *@author huangwenjie
     *@date 2017/8/19 10:00
     */
    public List<String> findCodesByPayStautsAndExecuteSickStatus() {
        return prescriptionDao.findCodesByPayStautsAndExecuteSickStatus();
    }
}