|
@ -11691,6 +11691,23 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
List<WlyyInspectionVO> inspectionVOs = new ArrayList<>();
|
|
|
vo.setInspectionVOs(convertToModels(wlyyInspectionDao.findByPrescriptionId(vo.getId(), 1), inspectionVOs, WlyyInspectionVO.class));
|
|
|
|
|
|
//物流信息
|
|
|
List<WlyyPrescriptionExpressageDO> expressageDOs = prescriptionExpressageDao.findByOutpatientId(vo.getOutpatientId());
|
|
|
if (expressageDOs != null && expressageDOs.size() > 0) {
|
|
|
vo.setExpressage(convertToModel(expressageDOs.get(0), WlyyPrescriptionExpressageVO.class));
|
|
|
vo.setOneselfPickupFlg(expressageDOs.get(0).getOneselfPickupFlg());
|
|
|
} else {
|
|
|
vo.setExpressage(null);
|
|
|
vo.setOneselfPickupFlg(null);
|
|
|
}
|
|
|
|
|
|
List<WlyyPrescriptionExpressageLogDO> expressageLogDOs = prescriptionExpressageLogDao.queryByOutpatientIdOrderByCreateTimeDesc(vo.getOutpatientId());
|
|
|
List<WlyyPrescriptionExpressageLogVO> expressageLogVOs = new ArrayList<>();
|
|
|
if (expressageLogDOs != null && expressageLogDOs.size() > 0) {
|
|
|
convertToModels(expressageLogDOs, expressageLogVOs, WlyyPrescriptionExpressageLogVO.class);
|
|
|
}
|
|
|
vo.setExpressageLogs(expressageLogVOs);
|
|
|
|
|
|
//支付信息
|
|
|
BusinessOrderDO businessOrderDO = businessOrderDao.selectByRelationCode(vo.getId());
|
|
|
if (null!=businessOrderDO){
|