فهرست منبع

Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

wangjun 4 سال پیش
والد
کامیت
1230aa6a85

+ 46 - 4
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@ -84,7 +84,6 @@ import com.yihu.jw.wechat.dao.BasePatientWechatDao;
import com.yihu.jw.wechat.dao.WechatDao;
import com.yihu.jw.wechat.dao.WxPushLogDao;
import com.yihu.jw.wechat.dao.WxTemplateConfigDao;
import com.yihu.jw.wechat.enterprise.EnterpriseService;
import com.yihu.jw.wechat.service.BaseSensitiveFilterWordsService;
import com.yihu.jw.wechat.service.WxAccessTokenService;
import com.yihu.mysql.query.BaseJpaService;
@ -256,15 +255,12 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
    @Autowired
    private PrescriptionSignDao prescriptionSignDao;
    @Autowired
    private EnterpriseService enterpriseService;
    @Autowired
    private PrescriptionDiagnosisDao  prescriptionDiagnosisDao;
    @Autowired
    private XzyyPrescriptionService xzyyPrescriptionService;
    @Value("${demo.flag}")
    private boolean demoFlag;
    @Value("${wechat.id}")
@ -7524,9 +7520,55 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    //同步电子病历
                    WlyyPrescriptionEmrDO prescriptionEmrDO = prescriptionEmrDao.findEmrByPrescriptionId(prescriptionId);
                    if (prescriptionEmrDO != null) {
                        logger.info("电子病历同步");
                        xzzxEntranceService.saveEmrToEntrance(prescriptionId);
                        logger.info("电子病历同步");
                        logger.info("电子病历签名");
                        xzyyPrescriptionService.SOF_SignDataWithExtraInfoEmr(wlyyPrescriptionDO);
                    }
                    if (object!=null){
                        if (object.getString("code").equalsIgnoreCase("0")){
                            //  * @param applyDepaName @param applyDoctorName
                            WlyyPrescriptionDO prescriptionDO = prescriptionDao.findOne(prescriptionId);
                            String patientCode = outpatientDO.getConsumer();
                            String realerOrder = prescriptionDO.getRealOrder();
                            String recipeTime = DateUtil.dateToStr(prescriptionDO.getCreateTime(), "yyyyMMddHHmmss");
                            List<BaseDoctorHospitalDO> doctorHospitalDOS = baseDoctorHospitalDao.findByDoctorCode(prescriptionDO.getDoctor());
                            String applyDepaName = null;
                            if (doctorHospitalDOS != null && doctorHospitalDOS.size() != 0) {
                                applyDepaName = doctorHospitalDOS.get(0).getDeptName();
                            }
                            String voucherNo = outpatientDO.getRegisterNo();
                            String applyDoctorName = prescriptionDO.getDoctorName();
                            BasePatientDO patientDO = basePatientDao.findById(patientCode);
                            String userName = null;
                            String idcard = null;
                            if (patientDO != null) {
                                userName = patientDO.getName();
                                idcard = patientDO.getIdcard();
                            }
                            PatientMappingDO patientMappingDO = patientMappingDao.findByPatient(patientCode);
                            String userNo = null;
                            if (patientMappingDO != null) {
                                userNo = patientMappingDO.getMappingCode();
                            }
                            String cardNo = null;
                            if (StringUtils.isNoneBlank(outpatientDO.getCardNo())) {
                                cardNo = outpatientDO.getCardNo();
                            }
                            logger.info("cardNo:" + cardNo);
                            JSONObject jsonObject =entranceService.BS15054(patientMappingDO.getMappingCode(),prescriptionDO.getRealOrder(),demoFlag);
                            net.sf.json.JSONObject res = jsonObject.getJSONObject("resquest");
                            logger.info("获取待结算数据 res: " + res.toString());
                            String rsCode = res.getString("@RESULT");
                            String free= 0+"";
                            if ("0".equals(rsCode)) {
                                free = res.getString("@total_charge");
                            }
                            ylzPayService.msgPush("01", cardNo, "01", patientDO.getMobile(), "00", userNo, userName, idcard, voucherNo, applyDepaName, applyDoctorName, recipeTime, free, "1");
                        }
                    }
                } catch (Exception e) {
                    e.printStackTrace();