|
|
@ -11844,7 +11844,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
format2 = new SimpleDateFormat("yyyy-MM-dd").parse(natTime);
|
|
|
String shortDate = new SimpleDateFormat("yyyyMMdd").format(format2);
|
|
|
System.out.println("yyyy-MM-dd转yyyyMMdd:"+shortDate);
|
|
|
/* String regRes=tasyNatService.saveRegOrder(regDept,shortDate,pm,preNo,cardNo,mobile,name,"3");
|
|
|
String regRes=tasyNatService.saveRegOrder(regDept,shortDate,pm,"",cardNo,mobile,name,"3");
|
|
|
com.alibaba.fastjson.JSONObject regObj = com.alibaba.fastjson.JSONObject.parseObject(regRes);
|
|
|
String HisSeqNo="";
|
|
|
String orderNum="";
|
|
|
@ -11858,7 +11858,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
returnMap.put("status","-1");
|
|
|
return returnMap;
|
|
|
}
|
|
|
}*/
|
|
|
}
|
|
|
//先进行核算检测预约
|
|
|
String realOrder="";
|
|
|
String addressNow=provinceName+cityName+townName+streetName+address;
|
|
|
@ -12392,9 +12392,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
if (StringUtils.isNoneBlank(baseNatAppointmentDO.getRealOrder())){
|
|
|
logger.info("同步his订单状态"+baseNatAppointmentDO.getRealOrder());
|
|
|
//取消号源
|
|
|
//String registerCancel =tasyNatService.cancleOrder(baseNatAppointmentDO.getCardNo(),baseNatAppointmentDO.getRegisterNo(),baseNatAppointmentDO.getOderNum());
|
|
|
/*com.alibaba.fastjson.JSONObject jsonObject = JSON.parseObject(registerCancel);
|
|
|
String isSuccess=jsonObject.getString("success");*/
|
|
|
String registerCancel =tasyNatService.cancleOrder(baseNatAppointmentDO.getCardNo(),baseNatAppointmentDO.getRegisterNo(),baseNatAppointmentDO.getOderNum());
|
|
|
com.alibaba.fastjson.JSONObject jsonObject = JSON.parseObject(registerCancel);
|
|
|
String isSuccess=jsonObject.getString("success");
|
|
|
String natCancel=tasyNatService.cancelNat(baseNatAppointmentDO.getRealOrder(),baseNatAppointmentDO.getMedicare().trim(),baseNatAppointmentDO.getName());
|
|
|
com.alibaba.fastjson.JSONObject jsonObject1 = JSON.parseObject(natCancel);
|
|
|
String returnCode=jsonObject1.getString("ReturnCode");
|
|
|
@ -13141,18 +13141,18 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
}
|
|
|
logger.info("获取患者待结算信息结束!");
|
|
|
logger.info("医保挂号开始!");
|
|
|
String register = healthCareService.register(registerNo);
|
|
|
String register = healthCareService.registerToEntrance(registerNo);
|
|
|
logger.info("医保挂号结束!");
|
|
|
logger.info("医保费用明细上传开始!");
|
|
|
String feeDetailUpload= healthCareService.feeDetailUpload(registerNo);
|
|
|
String feeDetailUpload= healthCareService.feeDetailUploadToEntrance(registerNo);
|
|
|
logger.info("医保费用明细上传结束!");
|
|
|
|
|
|
logger.info("医保预结算信息开始!");
|
|
|
YlzMedicalRelationDO ylzMedicalRelationDO = healthCareService.preSettlement(registerNo);
|
|
|
YlzMedicalRelationDO ylzMedicalRelationDO = healthCareService.preSettlementToEntrance(registerNo);
|
|
|
logger.info("医保预结算信息结束!");
|
|
|
|
|
|
logger.info("获取医保结算页面地址开始!");
|
|
|
String getSettlementResultUrl = healthCareService.getSettlementResultUrl(registerNo);
|
|
|
String getSettlementResultUrl = healthCareService.getSettlementResultUrlToEntrance(registerNo);
|
|
|
logger.info("获取医保结算页面地址结束!");
|
|
|
JSONObject object = new JSONObject();
|
|
|
object.put("register",register);
|
wangzhinan