|
|
@@ -843,6 +843,7 @@ public class SetlListUpldService {
|
|
|
if (null != medType) {
|
|
|
item.setMedTypeName(medType.getName());
|
|
|
}
|
|
|
+ item.setUploadUpdateReminder(getUploadUpdateReminder(item.getPatNo(),item.getTimes(),item.getLedgerSn(),item.getSetlListId()));
|
|
|
item.setUploadStatus(StringUtil.isBlank(item.getSetlListId()) ? "未上传" : "已上传");
|
|
|
//质控提醒
|
|
|
boolean qualityPassFlag = isQualityPass(item.getPatNo(),item.getTimes());
|
|
|
@@ -896,6 +897,21 @@ public class SetlListUpldService {
|
|
|
return ResultVoUtil.success(page);
|
|
|
}
|
|
|
|
|
|
+ private String getUploadUpdateReminder(String patNo, Integer times,Integer ledgerSn,String setlListId) {
|
|
|
+ if(StringUtil.notBlank(setlListId)){
|
|
|
+ Date lastUpdateTimeime = autoUploadBillService.getLastUpdateTime(patNo,times,ledgerSn);
|
|
|
+ if(lastUpdateTimeime !=null){
|
|
|
+ int diff = DateUtil.daysBetween(new Date(), lastUpdateTimeime);
|
|
|
+ if(diff > 5 ){
|
|
|
+ return "已上传超过【5】天后,医保不能重新上传数据";
|
|
|
+ }else {
|
|
|
+ return "上传后还剩【"+(diff)+"】天,医保将不能重新上传数据,要修改请尽快";
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return "";
|
|
|
+ }
|
|
|
+
|
|
|
private String getQualityReminder(Date setlTime,boolean qualityPassFlag) {
|
|
|
Date now = new Date();
|
|
|
int diffDay = DateUtil.daysBetween(now, setlTime);
|
|
|
@@ -1213,11 +1229,6 @@ public class SetlListUpldService {
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public ResultVo<String> setlModifyReq(ZyInactpatient param) {
|
|
|
- param.setLedgerSn(param.getLedgerSn());
|
|
|
- boolean shiFouQianShouBingAn = dao.shiFouQianShou(param.getInpatientNo(), param.getAdmissTimes()) > 0;
|
|
|
- if(!shiFouQianShouBingAn){
|
|
|
- return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "该病案没有签收,请病案室签收后再保存");
|
|
|
- }
|
|
|
Set<String> zhenDuanBianMa = new HashSet<>();
|
|
|
for (YbZyDisDiag item : param.getYbZyDisDiag()) {
|
|
|
if (item.getDisDiagNo() == null || item.getDisDiagNo() <= 0) {
|
|
|
@@ -1823,7 +1834,11 @@ public class SetlListUpldService {
|
|
|
if (jsonArray.isEmpty()) {
|
|
|
return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "没有质控问题数据");
|
|
|
}
|
|
|
- qualityInfoVOS = JSON.parseArray(JSON.toJSONString(jsonArray), QualityInfoVO.class);
|
|
|
+ List<QualityInfoVO> temp = JSON.parseArray(JSON.toJSONString(jsonArray), QualityInfoVO.class);
|
|
|
+ qualityInfoVOS = temp.stream().filter(obj -> !"disease_name".equals(obj.getField_id())).collect(Collectors.toList());
|
|
|
+ if(ListUtil.isBlank(qualityInfoVOS)){
|
|
|
+ return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "没有质控问题数据");
|
|
|
+ }
|
|
|
} else {
|
|
|
throw new BizException(ExceptionEnum.LOGICAL_ERROR, "创智质控测算接口调用失败");
|
|
|
}
|
|
|
@@ -1845,10 +1860,10 @@ public class SetlListUpldService {
|
|
|
setlBaseInfoVO.setDcla_time(DateUtil.formatDatetime(setlinfoUpldInfo.getDscgTime(), timepatten));
|
|
|
setlBaseInfoVO.setDscg_time(DateUtil.formatDatetime(setlinfoUpldInfo.getDscgTime(), timepatten));
|
|
|
setlBaseInfoVO.setAdm_time(DateUtil.formatDatetime(setlinfoUpldInfo.getAdmTime(), timepatten));
|
|
|
- setlBaseInfoVO.setTrt_type(ConvertUtil.TYT_TYPE_MAP.get(setlinfoUpldInfo.getTrtType()));
|
|
|
setlBaseInfoVO.setOpsp_mdtrt_date(DateUtil.formatDatetime(setlinfoUpldInfo.getOpspMdtrtDate(), timepatten));
|
|
|
setlBaseInfoVO.setSetl_begn_date(DateUtil.formatDatetime(setlinfoUpldInfo.getSetlBegnDate(), timepatten));
|
|
|
setlBaseInfoVO.setSetl_end_date(DateUtil.formatDatetime(setlinfoUpldInfo.getSetlEndDate(), timepatten));
|
|
|
+ setlBaseInfoVO.setResp_nurs(setlinfoUpldInfo.getRespNursName());
|
|
|
}
|
|
|
|
|
|
|