|
|
@ -2609,9 +2609,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
outpatientDao.save(outpatientDO);
|
|
|
//先下单
|
|
|
businessOrderService.savePrescriptionOrder(prescription.getId());
|
|
|
if(!demoFlag){
|
|
|
if(!demoFlag) {
|
|
|
//同步his
|
|
|
ykyyEntranceService.findByRealOrder(prescription.getId(),demoFlag);
|
|
|
ykyyEntranceService.findByRealOrder(prescription.getId(), demoFlag);
|
|
|
List<WlyyPrescriptionDO> prescriptionDOList = prescriptionDao.findById(prescription.getId());
|
|
|
if (prescriptionDOList != null && prescriptionDOList.size() != 0) {
|
|
|
WlyyPrescriptionDO wlyyPrescriptionDO = prescriptionDOList.get(0);
|
|
|
@ -2623,8 +2623,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
} else {
|
|
|
ykyyService.updateDrugorderInfo(businessOrderDO.getOrderNo(), wlyyPrescriptionDO.getOrderId(), wlyyPrescriptionDO.getRealOrder());
|
|
|
}
|
|
|
ykyySMSService.sendSmsByTempcode("prescription_remind",outpatientDO,wlyyPrescriptionDO,"");
|
|
|
ykyySMSService.sendSmsByTempcode("prescription_remind", outpatientDO, wlyyPrescriptionDO, "");
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
|
|
result.put("code", 1);
|
|
|
@ -2634,6 +2635,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
}else if (wechatId.equalsIgnoreCase("sd_tnzyy_wx")) {
|
|
|
outpatientDO.setStatus("2");
|
|
|
outpatientDao.save(outpatientDO);
|
|
|
logger.info("开始同步");
|
|
|
//先下单
|
|
|
businessOrderService.savePrescriptionOrder(prescription.getId());
|
|
|
if(!demoFlag){
|
|
|
@ -2646,9 +2648,6 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
logger.info("cfsb", wlyyPrescriptionDO.getRealOrder());
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
|
|
}
|
|
|
result.put("code", 1);
|
|
|
result.put("mes", "诊断完成");
|
|
|
result.put("prescriptionId",prescription.getId());
|
|
|
@ -2680,13 +2679,6 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
result1.put("mes", "开方提交成功");
|
|
|
result1.put("prescriptionId",prescription.getId());
|
|
|
return result1;
|
|
|
}else if (wechatId.equalsIgnoreCase("sd_tnzyy_wx")) {
|
|
|
Double price = prescription.getDrugFee();
|
|
|
businessOrderService.recharge(prescription.getId(), "处方收费", "4", "处方收费", prescription.getPatientCode(), prescription.getPatientName(), prescription.getDoctor(), price);
|
|
|
result.put("code", 1);
|
|
|
result.put("mes", "诊断完成");
|
|
|
result.put("prescriptionId",prescription.getId());
|
|
|
return result;
|
|
|
}else {
|
|
|
result.put("code", 1);
|
|
|
result.put("mes", "诊断完成");
|
wangzhinan