|
|
@@ -20,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
import java.util.*;
|
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
/**
|
|
|
@@ -55,7 +54,7 @@ public class MedCheckWorkFacade {
|
|
|
//获取核查任务类型(0-科室任务 1-院级 2-质控科)
|
|
|
Integer workType = medCheckWorkVO.getWorkType();
|
|
|
//获取操作类型（0-取消，1-添加）
|
|
|
- Integer checkType = medCheckWorkVO.getCheckType();
|
|
|
+ Integer checkStatus = medCheckWorkVO.getCheckStatus();
|
|
|
Long hospitalId = Long.parseLong(SysUserUtils.getCurrentHospitalID());
|
|
|
Long principleId = Long.valueOf(SysUserUtils.getCurrentPrincipleID());
|
|
|
SysUser user = sysUserFacade.getOne(new QueryWrapper<SysUser>()
|
|
|
@@ -64,7 +63,7 @@ public class MedCheckWorkFacade {
|
|
|
.eq("status", 1));
|
|
|
String principleName = user.getLinkman();
|
|
|
//取消核查任务【操作类型（0-取消，1-添加）】
|
|
|
- if (checkType != null && checkType == 0) {
|
|
|
+ if (checkStatus != null && checkStatus == 0) {
|
|
|
//判断核查任务是否生成
|
|
|
QueryWrapper<MedCheckInfo> medicalRecordQe = new QueryWrapper<>();
|
|
|
medicalRecordQe.eq("hospital_id", hospitalId);
|
|
|
@@ -78,7 +77,7 @@ public class MedCheckWorkFacade {
|
|
|
}
|
|
|
|
|
|
int i = medCheckInfoFacade.getBaseMapper().deleteBatchCodes(medCheckWorkVO.getBehospitalCodeList());
|
|
|
- } else if (checkType != null && checkType == 1) {
|
|
|
+ } else if (checkStatus != null && checkStatus == 1) {
|
|
|
//生成核查任务
|
|
|
MedCheckInfo data = medCheckInfoFacade.getOne(new QueryWrapper<MedCheckInfo>()
|
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
wangsy