|
|
|
@ -1072,24 +1072,23 @@ public class CommomService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//病案号转为数值型
|
|
|
|
//病案号转为数值型
|
|
|
|
//inpatientNo =String.valueOf(Long.parseLong(inpatientNo));
|
|
|
|
//inpatientNo =String.valueOf(Long.parseLong(inpatientNo));
|
|
|
|
|
|
|
|
String disDateStr = "";
|
|
|
|
|
|
|
|
CommomVo commomVo = null;
|
|
|
|
|
|
|
|
if (disDate.length() >= 8) {
|
|
|
|
//格式化日期
|
|
|
|
//格式化日期
|
|
|
|
String disDateStr = disDate.substring(0, 4) + "-" + disDate.substring(4, 6) + "-" + disDate.substring(6, 8);
|
|
|
|
disDateStr = disDate.substring(0, 4) + "-" + disDate.substring(4, 6) + "-" + disDate.substring(6, 8);
|
|
|
|
|
|
|
|
commomVo = commomMapper.getCommomTableList(inpatientNo, disDateStr);
|
|
|
|
CommomVo commomVo = commomMapper.getCommomTableList(inpatientNo, disDateStr);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (ObjectUtils.isEmpty(commomVo)) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//病案信息不存在或者pdf名称出院日期位数不对
|
|
|
|
|
|
|
|
if (ObjectUtils.isEmpty(commomVo) || disDate.length() < 8) {
|
|
|
|
exportInpVo = new ExportInpVo();
|
|
|
|
exportInpVo = new ExportInpVo();
|
|
|
|
exportInpVo.setInpatientNo(inpatientNo);
|
|
|
|
exportInpVo.setInpatientNo(inpatientNo);
|
|
|
|
exportInpVo.setDisDate(disDateStr);
|
|
|
|
exportInpVo.setDisDate(disDateStr);
|
|
|
|
exportInpVoList.add(exportInpVo);
|
|
|
|
exportInpVoList.add(exportInpVo);
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (commomVo != null && StringUtils.isNotBlank(commomVo.getFilePath())) {
|
|
|
|
if (commomVo != null && StringUtils.isNotBlank(commomVo.getFilePath())) {
|
|
|
|
/*File filePath = new File(commomVo.getFilePath());
|
|
|
|
/*File filePath = new File(commomVo.getFilePath());
|
|
|
|
if (!filePath.exists()) {
|
|
|
|
if (!filePath.exists()) {
|
|
|
|
|