|
@@ -477,6 +477,10 @@ public class SetlListUpldService {
|
|
|
if("4".equals(defaultValue)){
|
|
|
return defaultValue;
|
|
|
}
|
|
|
+ // 长沙 4301 株洲4302 湘潭 4303 衡阳4304 郴州4310 省本级 439900
|
|
|
+ if("439900".equals(insuplcAdmdvs)){
|
|
|
+ return "4";
|
|
|
+ }
|
|
|
String[] drgCityCode = {"4301","4302","4303","4304","4310"};
|
|
|
for(String code:drgCityCode){
|
|
|
if(insuplcAdmdvs.startsWith(code)){
|
|
@@ -821,6 +825,9 @@ public class SetlListUpldService {
|
|
|
item.setMedTypeName(medType.getName());
|
|
|
}
|
|
|
item.setUploadStatus(StringUtil.isBlank(item.getSetlListId()) ? "未上传" : "已上传");
|
|
|
+ //质控提醒
|
|
|
+ boolean qualityPassFlag = isQualityPass(item.getPatNo(),item.getTimes());
|
|
|
+ item.setQualityReminder(getQualityReminder(item.getSetlTime(),qualityPassFlag));
|
|
|
item.setUploadCutoffDate(getUploadCutoffDate(dictValue, item.getSetlTime(), item.getSetlListId()));
|
|
|
item.setInsuplcAdmdvsName(redisLikeService.getRegionName(item.getInsuplcAdmdvs()));
|
|
|
}
|
|
@@ -870,6 +877,15 @@ public class SetlListUpldService {
|
|
|
return ResultVoUtil.success(page);
|
|
|
}
|
|
|
|
|
|
+ private String getQualityReminder(Date setlTime,boolean qualityPassFlag) {
|
|
|
+ Date now = new Date();
|
|
|
+ int diffDay = DateUtil.daysBetween(now, setlTime);
|
|
|
+ if(diffDay >= 3 && !qualityPassFlag){
|
|
|
+ return "超过【"+diffDay+"】天未质控通过,请尽快审核通过并上传";
|
|
|
+ }
|
|
|
+ return "";
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* @description:获取上传截止时间
|
|
|
* @author: lihong
|
|
@@ -885,9 +901,9 @@ public class SetlListUpldService {
|
|
|
if (StringUtil.isBlank(setlListId)) {
|
|
|
//未上传
|
|
|
if (diffDay < days) {
|
|
|
- result = "距离上传截止时间还剩" + (days - diffDay) + "天";
|
|
|
+ result = "距离上传截止时间还剩【" + (days - diffDay) + "】天";
|
|
|
} else {
|
|
|
- result = "上传截止时间超期" + (diffDay - days) + "天";
|
|
|
+ result = "上传截止时间超期【" + (diffDay - days) + "】天";
|
|
|
}
|
|
|
}
|
|
|
return result;
|
|
@@ -1869,14 +1885,18 @@ public class SetlListUpldService {
|
|
|
* @return: thyyxxk.webserver.entity.ResultVo<java.util.Map < java.lang.String, java.lang.Object>>
|
|
|
**/
|
|
|
public ResultVo<Map<String, Object>> qualityPass(String patNo, Integer times) {
|
|
|
+ Map<String, Object> map = new HashMap<>();
|
|
|
+ map.put("qualityPassFlag", isQualityPass(patNo, times));
|
|
|
+ return ResultVoUtil.success(map);
|
|
|
+ }
|
|
|
+
|
|
|
+ private boolean isQualityPass(String patNo, Integer times){
|
|
|
Integer auditFlag = dao.qualityPass(patNo, times);
|
|
|
boolean flag = false;
|
|
|
- Map<String, Object> map = new HashMap<>();
|
|
|
if (auditFlag != null && auditFlag == 1) {
|
|
|
flag = true;
|
|
|
}
|
|
|
- map.put("qualityPassFlag", flag);
|
|
|
- return ResultVoUtil.success(map);
|
|
|
+ return flag;
|
|
|
}
|
|
|
|
|
|
/**
|