|
@@ -8,6 +8,7 @@ import com.diagbot.dto.PushPlansDTO;
|
|
import com.diagbot.entity.FollowupPlanDetail;
|
|
import com.diagbot.entity.FollowupPlanDetail;
|
|
import com.diagbot.entity.FollowupPlanDetailHospital;
|
|
import com.diagbot.entity.FollowupPlanDetailHospital;
|
|
import com.diagbot.entity.FollowupPlanInfo;
|
|
import com.diagbot.entity.FollowupPlanInfo;
|
|
|
|
+import com.diagbot.entity.FollowupPlanMapping;
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
import com.diagbot.exception.CommonException;
|
|
import com.diagbot.exception.CommonException;
|
|
@@ -40,6 +41,8 @@ public class FollowupPlanInfoFacade extends FollowupPlanInfoServiceImpl {
|
|
FollowupPlanDetailFacade followupPlanDetailFacade;
|
|
FollowupPlanDetailFacade followupPlanDetailFacade;
|
|
@Autowired
|
|
@Autowired
|
|
FollowupPlanDetailHospitalFacade followupPlanDetailHospitalFacade;
|
|
FollowupPlanDetailHospitalFacade followupPlanDetailHospitalFacade;
|
|
|
|
+ @Autowired
|
|
|
|
+ FollowupPlanMappingFacade followupPlanMappingFacade;
|
|
|
|
|
|
/**
|
|
/**
|
|
* @param operationName
|
|
* @param operationName
|
|
@@ -67,9 +70,17 @@ public class FollowupPlanInfoFacade extends FollowupPlanInfoServiceImpl {
|
|
pushPlansDTO.setItem(operationName);
|
|
pushPlansDTO.setItem(operationName);
|
|
List<PushPlanDetailDTO> pushPlanDetails = Lists.newLinkedList();
|
|
List<PushPlanDetailDTO> pushPlanDetails = Lists.newLinkedList();
|
|
|
|
|
|
|
|
+ QueryWrapper<FollowupPlanMapping> followupPlanMappingQueryWrapper = new QueryWrapper<>();
|
|
|
|
+ followupPlanMappingQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
|
+ .eq("standard_name", operationName.getUniqueName());
|
|
|
|
+ FollowupPlanMapping followupPlanMapping = followupPlanMappingFacade.getOne(followupPlanMappingQueryWrapper, false);
|
|
|
|
+ if (followupPlanMapping == null) {
|
|
|
|
+ return pushPlanDTO;
|
|
|
|
+ }
|
|
|
|
+
|
|
QueryWrapper<FollowupPlanInfo> followupPlanInfoQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<FollowupPlanInfo> followupPlanInfoQueryWrapper = new QueryWrapper<>();
|
|
followupPlanInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
followupPlanInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
- .eq("operation_name", operationName.getUniqueName());
|
|
|
|
|
|
+ .eq("operation_name", followupPlanMapping.getOperationName());
|
|
FollowupPlanInfo followupPlanInfo = this.getOne(followupPlanInfoQueryWrapper, false);
|
|
FollowupPlanInfo followupPlanInfo = this.getOne(followupPlanInfoQueryWrapper, false);
|
|
if (followupPlanInfo != null) {
|
|
if (followupPlanInfo != null) {
|
|
List<FollowupPlanDetailHospital> followupPlanDetailHospitalList = Lists.newLinkedList();
|
|
List<FollowupPlanDetailHospital> followupPlanDetailHospitalList = Lists.newLinkedList();
|