|
@ -11995,6 +11995,15 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
wlyyPrescriptionDO.setCheckReason("已作废");
|
|
|
prescriptionDao.save(wlyyPrescriptionDO);
|
|
|
}
|
|
|
}else if("xm_dsyy_wx".equalsIgnoreCase(wechatId)){
|
|
|
logger.info("第三医院删除处方");
|
|
|
WlyyOutpatientDO outpatientDO = outpatientDao.findById(prescriptionDO.getOutpatientId()).get();
|
|
|
DoctorMappingDO doctorMappingDO = doctorMappingDao.findById(outpatientDO.getDoctor()).get();
|
|
|
if (StringUtils.isNotBlank(prescriptionDO.getRealOrder())){
|
|
|
String applyDoctor = doctorMappingDO.getDoctorName()+"/"+doctorMappingDO.getMappingCode();
|
|
|
dsyyPrescriptionService.delHisPrescriptionByHisNo("0",outpatientDO.getCardNo(),outpatientDO.getRegisterNo(),outpatientDO.getDept(),applyDoctor,"50105",prescriptionDO.getRealOrder());
|
|
|
}
|
|
|
return "已作废";
|
|
|
}
|
|
|
prescriptionDO.setStatus(-4);
|
|
|
prescriptionDO.setDisableTime(new Date());
|
|
@ -12002,19 +12011,6 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
prescriptionDO.setCheckReason("已作废");
|
|
|
prescriptionDao.save(prescriptionDO);
|
|
|
return "已作废";
|
|
|
}else if("xm_dsyy_wx".equalsIgnoreCase(wechatId)){
|
|
|
WlyyOutpatientDO outpatientDO = outpatientDao.findById(prescriptionDO.getOutpatientId()).get();
|
|
|
DoctorMappingDO doctorMappingDO = doctorMappingDao.findById(outpatientDO.getDoctor()).get();
|
|
|
if (StringUtils.isNotBlank(prescriptionDO.getRealOrder())){
|
|
|
String applyDoctor = doctorMappingDO.getDoctorName()+"/"+doctorMappingDO.getMappingCode();
|
|
|
dsyyPrescriptionService.delHisPrescriptionByHisNo("0",outpatientDO.getCardNo(),outpatientDO.getRegisterNo(),outpatientDO.getDept(),applyDoctor,"50105",prescriptionDO.getRealOrder());
|
|
|
prescriptionDO.setStatus(-4);
|
|
|
prescriptionDO.setDisableTime(new Date());
|
|
|
prescriptionDO.setCheckStatus(5);
|
|
|
prescriptionDO.setCheckReason("已作废");
|
|
|
prescriptionDao.save(prescriptionDO);
|
|
|
}
|
|
|
return "已作废";
|
|
|
}else {
|
|
|
return "作废失败";
|
|
|
}
|