|
|
@ -1251,12 +1251,14 @@ public class PrescriptionService extends ZysoftBaseService{
|
|
|
|
|
|
Prescription prescription = prescriptionDao.findByVisitNoAndRecipeNo(orderNo,recipeNo);
|
|
|
if(prescription.getStatus().equals(PrescriptionLog.PrescriptionLogStatus.wait_pay.getValue())){
|
|
|
if(2 == prescription.getDispensaryType()){//如果是快递配送,则直接修改成配送中
|
|
|
/*if(2 == prescription.getDispensaryType()){//如果是快递配送,则直接修改成配送中
|
|
|
prescription.setStatus(PrescriptionLog.PrescriptionLogStatus.expressageing.getValue());
|
|
|
} else{
|
|
|
prescription.setStatus(PrescriptionLog.PrescriptionLogStatus.wait_expressage.getValue());
|
|
|
}
|
|
|
|
|
|
}*/
|
|
|
|
|
|
prescription.setDispensaryType(1);
|
|
|
prescription.setStatus(PrescriptionLog.PrescriptionLogStatus.pay_success.getValue());
|
|
|
prescription.setJwPayStatus(1);//0为未结算，1为结算成功，默认为0
|
|
|
prescription.setDrugDeliveryTime(new Date());
|
|
|
prescriptionDao.save(prescription);
|
|
|
@ -1329,7 +1331,11 @@ public class PrescriptionService extends ZysoftBaseService{
|
|
|
log.setUserName(prescription.getDoctorName());
|
|
|
log.setFlag(1);
|
|
|
log.setUserCode(prescription.getDoctor());
|
|
|
if(2 == prescription.getDispensaryType()){//如果是快递配送,则直接修改成配送中
|
|
|
log.setStatus(PrescriptionLog.PrescriptionLogStatus.pay_success.getValue());
|
|
|
log.setRemark("待配药");
|
|
|
prescriptionLogDao.save(log);
|
|
|
|
|
|
/* if(2 == prescription.getDispensaryType()){//如果是快递配送,则直接修改成配送中
|
|
|
log.setStatus(PrescriptionLog.PrescriptionLogStatus.expressageing.getValue());
|
|
|
log.setRemark("快递配送:配药成功,配送中");
|
|
|
prescriptionLogDao.save(log);
|
|
|
@ -1373,7 +1379,7 @@ public class PrescriptionService extends ZysoftBaseService{
|
|
|
redisTemplate.opsForList().leftPush(channelTopic,message.toString());
|
|
|
// redisTemplate.unwatch();
|
|
|
}
|
|
|
}
|
|
|
}*/
|
|
|
|
|
|
}else {
|
|
|
error = "code:"+prescription.getCode()+",status:"+prescription.getStatus();
|
wujunjie