|
@ -8445,7 +8445,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
if (wlyyPrescriptionDOS.getStatus()<31){
|
|
if (wlyyPrescriptionDOS.getStatus()<31){
|
|
if (!map.get("outpatientId").toString().equalsIgnoreCase(wlyyPrescriptionDOS.getOutpatientId())){
|
|
if (!map.get("outpatientId").toString().equalsIgnoreCase(wlyyPrescriptionDOS.getOutpatientId())){
|
|
String mailNo= map.get("mailno").toString();
|
|
String mailNo= map.get("mailno").toString();
|
|
sfexpress_obj.setMailno(mailNo);
|
|
|
|
|
|
/* sfexpress_obj.setMailno(mailNo);*/
|
|
sfexpressService.updatePrescriptionExpressage(sfexpress_obj);
|
|
sfexpressService.updatePrescriptionExpressage(sfexpress_obj);
|
|
List<WlyyPrescriptionDO> wlyyPrescriptionDOS2 = prescriptionDao.findByOutpatientId(map.get("outpatientId").toString());
|
|
List<WlyyPrescriptionDO> wlyyPrescriptionDOS2 = prescriptionDao.findByOutpatientId(map.get("outpatientId").toString());
|
|
String orderNo = "";
|
|
String orderNo = "";
|
|
@ -15489,7 +15489,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
logger.info("处方结算成功"+pushPayLog+"====="+realOrder);
|
|
logger.info("处方结算成功"+pushPayLog+"====="+realOrder);
|
|
//2.6.1 电子处方订单接收
|
|
//2.6.1 电子处方订单接收
|
|
logger.info("医保电子处方订单");
|
|
logger.info("医保电子处方订单");
|
|
if (ylzMedicalRelationDO.getMedicalState()!=null&&ylzMedicalRelationDO.getMedicalState()==0){
|
|
|
|
|
|
/* if (ylzMedicalRelationDO.getMedicalState()!=null&&ylzMedicalRelationDO.getMedicalState()==0){
|
|
List<WlyyPrescriptionExpressageDO> expressageDOList = prescriptionExpressageDao.findByOutpatientId(ylzMedicalRelationDO.getRelationCode());
|
|
List<WlyyPrescriptionExpressageDO> expressageDOList = prescriptionExpressageDao.findByOutpatientId(ylzMedicalRelationDO.getRelationCode());
|
|
if (expressageDOList!=null&&expressageDOList.size()!=0){
|
|
if (expressageDOList!=null&&expressageDOList.size()!=0){
|
|
WlyyPrescriptionExpressageDO expressageDO = expressageDOList.get(0);
|
|
WlyyPrescriptionExpressageDO expressageDO = expressageDOList.get(0);
|
|
@ -15497,7 +15497,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
healthCareService.electronicPrescriptionReceiving(ylzMedicalRelationDO.getRelationCode());
|
|
healthCareService.electronicPrescriptionReceiving(ylzMedicalRelationDO.getRelationCode());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
}*/
|
|
}
|
|
}
|
|
logger.info("电子发票开具开始");
|
|
logger.info("电子发票开具开始");
|
|
try {
|
|
try {
|