|
@ -11740,7 +11740,6 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
String result = "作废成功";
|
|
|
|
if("xm_zsyy_wx".equalsIgnoreCase(wechatId)){
|
|
if("xm_zsyy_wx".equalsIgnoreCase(wechatId)){
|
|
/*prescriptionDao.updateCheckStatus(prescriptionId,2,reason,20);*/
|
|
/*prescriptionDao.updateCheckStatus(prescriptionId,2,reason,20);*/
|
|
logger.info("作废处方开始" + prescriptionDO.getCheckStatus());
|
|
logger.info("作废处方开始" + prescriptionDO.getCheckStatus());
|
|
@ -11775,13 +11774,15 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
try {
|
|
try {
|
|
net.sf.json.JSONObject jsonObject = entranceService.BS10112(jsonData.toJSONString(), demoFlag);
|
|
net.sf.json.JSONObject jsonObject = entranceService.BS10112(jsonData.toJSONString(), demoFlag);
|
|
wlyyHttpLogDO.setResponse(jsonObject.toString());
|
|
wlyyHttpLogDO.setResponse(jsonObject.toString());
|
|
result = jsonObject.getString("@MSG");
|
|
|
|
|
|
if(jsonObject.getString("@RESULT").equalsIgnoreCase("-1")){
|
|
|
|
throw new Exception(jsonObject.getString("@MSG"));
|
|
|
|
}
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
|
|
throw new Exception("作废失败");
|
|
}
|
|
}
|
|
wlyyHttpLogDO.setRequest(jsonData.toJSONString());
|
|
wlyyHttpLogDO.setRequest(jsonData.toJSONString());
|
|
wlyyHttpLogDO.setName("作废处方");
|
|
wlyyHttpLogDO.setName("作废处方");
|
|
@ -11801,7 +11802,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
prescriptionDO.setCheckStatus(5);
|
|
prescriptionDO.setCheckStatus(5);
|
|
prescriptionDO.setCheckReason("已作废");
|
|
prescriptionDO.setCheckReason("已作废");
|
|
prescriptionDao.save(prescriptionDO);
|
|
prescriptionDao.save(prescriptionDO);
|
|
return result;
|
|
|
|
|
|
return "已作废";
|
|
}else {
|
|
}else {
|
|
return "作废失败";
|
|
return "作废失败";
|
|
}
|
|
}
|