|
@ -286,7 +286,7 @@ public class PrescriptionExpressagePCService extends BaseService {
|
|
|
switch (prescriptionDispensaryCode.getType()) {
|
|
|
case 1: {
|
|
|
//判断是1 居民取药码
|
|
|
dispensaryCode_1(userCode, prescriptionDispensaryCode);
|
|
|
dispensaryCode_1(prescription,userCode, prescriptionDispensaryCode);
|
|
|
break;
|
|
|
}
|
|
|
case 2: {
|
|
@ -317,10 +317,13 @@ public class PrescriptionExpressagePCService extends BaseService {
|
|
|
* @param prescriptionDispensaryCode
|
|
|
* @return
|
|
|
*/
|
|
|
public void dispensaryCode_1(String userCode, PrescriptionDispensaryCode prescriptionDispensaryCode) {
|
|
|
public void dispensaryCode_1(Prescription prescription ,String userCode, PrescriptionDispensaryCode prescriptionDispensaryCode) {
|
|
|
|
|
|
//修改处方状态为完成
|
|
|
prescriptionDao.updateStatus(prescriptionDispensaryCode.getPrescriptionCode(), PrescriptionLog.PrescriptionLogStatus.finish.getValue());
|
|
|
//prescriptionDao.updateStatus(prescriptionDispensaryCode.getPrescriptionCode(), PrescriptionLog.PrescriptionLogStatus.finish.getValue());
|
|
|
prescription.setFinishTime(new Date());
|
|
|
prescription.setStatus(PrescriptionLog.PrescriptionLogStatus.finish.getValue());
|
|
|
prescriptionDao.save(prescription);
|
|
|
|
|
|
//保存配送成功的日志
|
|
|
PrescriptionLog prescriptionLog = new PrescriptionLog();
|