|
|
|
|
@ -10,7 +10,10 @@ import digital.laboratory.platform.common.core.exception.CheckedException; |
|
|
|
|
import digital.laboratory.platform.common.core.util.R; |
|
|
|
|
import digital.laboratory.platform.common.mybatis.security.service.DLPUser; |
|
|
|
|
import digital.laboratory.platform.common.security.util.SecurityUtils; |
|
|
|
|
import digital.laboratory.platform.entrustment.entity.*; |
|
|
|
|
import digital.laboratory.platform.entrustment.entity.CaseEvent; |
|
|
|
|
import digital.laboratory.platform.entrustment.entity.Entrustment; |
|
|
|
|
import digital.laboratory.platform.entrustment.entity.EntrustmentIdentificationMaterial; |
|
|
|
|
import digital.laboratory.platform.entrustment.entity.Suspect; |
|
|
|
|
import digital.laboratory.platform.entrustment.enums.AnalysisOptionEnums; |
|
|
|
|
import digital.laboratory.platform.entrustment.enums.EntrustExportHeaderEnum; |
|
|
|
|
import digital.laboratory.platform.entrustment.enums.EntrustIdentificationSituationType; |
|
|
|
|
@ -451,7 +454,7 @@ public class ExcelOperationServiceImpl implements ExcelOperationService { |
|
|
|
|
|
|
|
|
|
// 3. 身份证号业务校验
|
|
|
|
|
// 条件:生物样本(Type=1) 且 属于指定的鉴定结果类别
|
|
|
|
|
// 3. 身份证号业务校验及一致性比对
|
|
|
|
|
// 3. 身份证号业务校验及一致性比对
|
|
|
|
|
if (entrustment.getEntrustmentType() == 1 && idCardRequiredResults.contains(entrustment.getOldIdentificationResult())) { |
|
|
|
|
String idCard = datum.get("身份证号"); |
|
|
|
|
if (StrUtil.isBlank(idCard)) { |
|
|
|
|
|