Merge branch 'dev/20220228_v3.0.1通用版_渠道管理第一期' into debug

daqe-center/src/main/java/com/lantone/daqe/facade/BlockLossManagementFacade.java

@@ -26,6 +26,7 @@ import com.lantone.daqe.entity.BlocklossResult;
 import com.lantone.daqe.entity.HomePage;
 import com.lantone.daqe.entity.MedicalRecord;
 import com.lantone.daqe.enums.DataSaveUrlEnum;
+import com.lantone.daqe.enums.LossIsAuditedEnum;
 import com.lantone.daqe.enums.LossStatusEnum;
 import com.lantone.daqe.enums.LossTypeEnum;
 import com.lantone.daqe.enums.LossWayEnum;
@@ -120,19 +121,45 @@ public class BlockLossManagementFacade {
                 .eq(hospitalId != null, "hospital_id", hospitalId)
                 .eq("status", LossStatusEnum.IS_LOSS.getKey())
                 .eq("is_deleted", IsDeleteEnum.N.getKey()));
-//        Map<String, List<BlocklossResult>> lossResultMap = null;
         if (ListUtil.isNotEmpty(lossResults)) {
             Map<String, List<BlocklossResult>> lossResultMap = EntityUtil.makeEntityListMap(lossResults, "lossType");
             //更新以缺失数据的状态
             flag = upBlockLossStatus(lossResultMap, hospitalId, principleId);
             //删除当前时间段的对比记录
             flag = blocklossResultFacade.remove(new UpdateWrapper<BlocklossResult>()
-                    .ge(dataCompareVO.getStartDate() != null && StringUtil.isBlank(dataCompareVO.getBehospitalCode()), "gmt_create", dataCompareVO.getStartDate())
-                    .le(dataCompareVO.getEndDate() != null && StringUtil.isBlank(dataCompareVO.getBehospitalCode()), "gmt_create", dataCompareVO.getEndDate())
+                    .ge(dataCompareVO.getStartDate() != null && StringUtil.isBlank(dataCompareVO.getBehospitalCode()), "behospital_date", dataCompareVO.getStartDate())
+                    .le(dataCompareVO.getEndDate() != null && StringUtil.isBlank(dataCompareVO.getBehospitalCode()), "behospital_date", dataCompareVO.getEndDate())
                     .eq(StringUtil.isNotBlank(dataCompareVO.getBehospitalCode()), "behospital_code", dataCompareVO.getBehospitalCode())
                     .eq(hospitalId != null, "hospital_id", hospitalId)
+                    .eq("is_audited", LossIsAuditedEnum.NOT_AUDITED.getKey())
                     .eq("is_deleted", IsDeleteEnum.N.getKey()));
         }
+        //已核查的数据（筛选区间）
+        List<BlocklossResult> auditedResults = blocklossResultFacade.list(new QueryWrapper<BlocklossResult>()
+                .ge(dataCompareVO.getStartDate() != null && StringUtil.isBlank(dataCompareVO.getBehospitalCode()), "behospital_date", dataCompareVO.getStartDate())
+                .le(dataCompareVO.getEndDate() != null && StringUtil.isBlank(dataCompareVO.getBehospitalCode()), "behospital_date", dataCompareVO.getEndDate())
+                .eq(StringUtil.isNotBlank(dataCompareVO.getBehospitalCode()), "behospital_code", dataCompareVO.getBehospitalCode())
+                .eq(hospitalId != null, "hospital_id", hospitalId)
+                .notIn("is_audited", LossIsAuditedEnum.NOT_AUDITED.getKey())
+                .eq("is_deleted", IsDeleteEnum.N.getKey()));
+        List<String> auditedResultCodes = null;
+        List<String> auditedResultHomePages = null;
+        List<String> auditedResultRecIds = null;
+        if (ListUtil.isNotEmpty(auditedResults)) {
+            Map<String, List<BlocklossResult>> auditedResultMap = EntityUtil.makeEntityListMap(auditedResults, "lossType");
+            if (ListUtil.isNotEmpty(auditedResultMap.get(LossTypeEnum.CODE_LOSS.getKey()))) {
+                auditedResultCodes = auditedResultMap.get(LossTypeEnum.CODE_LOSS.getKey()).stream().map(BlocklossResult::getBehospitalCode).collect(Collectors.toList());
+            }
+            if (ListUtil.isNotEmpty(auditedResultMap.get(LossTypeEnum.HOMEPAGE_LOSS.getKey()))) {
+                auditedResultHomePages = auditedResultMap.get(LossTypeEnum.HOMEPAGE_LOSS.getKey()).stream().map(BlocklossResult::getRecId).collect(Collectors.toList());
+            }
+            if (ListUtil.isNotEmpty(auditedResultMap.get(LossTypeEnum.REC_LOSS.getKey()))) {
+                auditedResultRecIds = auditedResultMap.get(LossTypeEnum.REC_LOSS.getKey()).stream().map(BlocklossResult::getRecId).collect(Collectors.toList());
+            }
+        }
+        //定义对应要更新的已核查集合
+        List<GetOperationLogDTO> dataUps = new ArrayList<>();
+
 
         //====2.某时间的数据对比
         //=====2.1获取数据
@@ -169,8 +196,8 @@ public class BlockLossManagementFacade {
         //病历数据
         List<String> dataBaseBehospitalCodes = behospitalInfoFacade.list(new QueryWrapper<BehospitalInfo>()
                 .select("behospital_code")
-                .ge(dataCompareVO.getStartDate() != null && StringUtil.isBlank(dataCompareVO.getBehospitalCode()), "gmt_create", dataCompareVO.getStartDate())
-                .le(dataCompareVO.getEndDate() != null && StringUtil.isBlank(dataCompareVO.getBehospitalCode()), "gmt_create", dataCompareVO.getEndDate())
+                .ge(dataCompareVO.getStartDate() != null && StringUtil.isBlank(dataCompareVO.getBehospitalCode()), "behospital_date", dataCompareVO.getStartDate())
+                .le(dataCompareVO.getEndDate() != null && StringUtil.isBlank(dataCompareVO.getBehospitalCode()), "behospital_date", dataCompareVO.getEndDate())
                 .eq(StringUtil.isNotBlank(dataCompareVO.getBehospitalCode()), "behospital_code", dataCompareVO.getBehospitalCode())
                 .eq(hospitalId != null, "hospital_id", hospitalId)
                 .eq("is_deleted", IsDeleteEnum.N.getKey()))
@@ -216,11 +243,11 @@ public class BlockLossManagementFacade {
             //外部丢失数据集合
             List<BlocklossResult> outInserts = new ArrayList<>();
             //文书数据对比
-            compareHisWithLog(recs, recLogs, LossTypeEnum.REC_LOSS.getKey(), outInserts,  hisMedicalRecordMap, hospitalId, principleId);
+            compareHisWithLog(recs, recLogs, LossTypeEnum.REC_LOSS.getKey(), auditedResultRecIds, outInserts, hisMedicalRecordMap, hospitalId, principleId, dataUps);
             //病案首页数据对比
-            compareHisWithLog(medicalRecords, homePageLogs, LossTypeEnum.HOMEPAGE_LOSS.getKey(), outInserts, hisMedicalRecordMap, hospitalId, principleId);
+            compareHisWithLog(medicalRecords, homePageLogs, LossTypeEnum.HOMEPAGE_LOSS.getKey(), auditedResultHomePages, outInserts, hisMedicalRecordMap, hospitalId, principleId, dataUps);
             //病历数据对比
-            compareHisWithLog(medicalRecords, behospitalCodeLogs, LossTypeEnum.CODE_LOSS.getKey(), outInserts, hisMedicalRecordMap, hospitalId, principleId);
+            compareHisWithLog(medicalRecords, behospitalCodeLogs, LossTypeEnum.CODE_LOSS.getKey(), auditedResultCodes, outInserts, hisMedicalRecordMap, hospitalId, principleId, dataUps);
 
             flag = blocklossResultServiceImpl.saveBatch(outInserts);
         }
@@ -229,17 +256,37 @@ public class BlockLossManagementFacade {
         //内部丢失数据集合
         List<BlocklossResult> inInserts = new ArrayList<>();
         if (ListUtil.isNotEmpty(recLogs)) {
-            compareLogWithLocal(recLogs, dataBaseRecIds, LossTypeEnum.REC_LOSS.getKey(), inInserts,  hisMedicalRecordMap, hospitalId, principleId);
+            compareLogWithLocal(recLogs, dataBaseRecIds, LossTypeEnum.REC_LOSS.getKey(), auditedResultRecIds, inInserts, hisMedicalRecordMap, hospitalId, principleId, dataUps);
         }
         if (ListUtil.isNotEmpty(homePageLogs)) {
-            compareLogWithLocal(homePageLogs, dataBaseHomePageIds, LossTypeEnum.HOMEPAGE_LOSS.getKey(), inInserts, hisMedicalRecordMap, hospitalId, principleId);
+            compareLogWithLocal(homePageLogs, dataBaseHomePageIds, LossTypeEnum.HOMEPAGE_LOSS.getKey(), auditedResultHomePages, inInserts, hisMedicalRecordMap, hospitalId, principleId, dataUps);
         }
         if (ListUtil.isNotEmpty(behospitalCodeLogs)) {
-            compareLogWithLocal(behospitalCodeLogs, dataBaseBehospitalCodes, LossTypeEnum.CODE_LOSS.getKey(), inInserts, hisMedicalRecordMap, hospitalId, principleId);
+            compareLogWithLocal(behospitalCodeLogs, dataBaseBehospitalCodes, LossTypeEnum.CODE_LOSS.getKey(), auditedResultCodes, inInserts, hisMedicalRecordMap, hospitalId, principleId, dataUps);
+        }
+        //更新核查数据的时间
+        if (ListUtil.isNotEmpty(dataUps)) {
+            Long finalPrincipleId = principleId;
+            Long finalHospitalId = hospitalId;
+            dataUps.stream().forEach(data->{
+                blocklossResultFacade.update(new UpdateWrapper<BlocklossResult>()
+                        .set("gmt_modified", DateUtil.now())
+                        .set("modifier", finalPrincipleId != null ? finalPrincipleId + "" : "0")
+                        .eq(StringUtil.isNotBlank(data.getRecId()),"rec_id", data.getRecId())
+                        .notIn("is_audited", LossIsAuditedEnum.NOT_AUDITED.getKey())
+                        .eq("behospital_code",data.getBehospitalCode())
+                        .eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .ge(dataCompareVO.getStartDate() != null , "behospital_date", dataCompareVO.getStartDate())
+                        .le(dataCompareVO.getEndDate() != null , "behospital_date", dataCompareVO.getEndDate())
+                        .eq(finalHospitalId != null, "hospital_id", finalHospitalId)
+                        .eq("hospital_id", finalHospitalId != null ? finalHospitalId : 0));
+            });
         }
+
         if (ListUtil.isNotEmpty(inInserts)) {
             flag = blocklossResultServiceImpl.saveBatch(inInserts);
         }
+
         return flag;
     }
 
@@ -265,82 +312,102 @@ public class BlockLossManagementFacade {
      * @param logs                日志记录
      * @param dataBases           入库数据
      * @param type                对比类型：0:文书丢失 1:病案首页丢失 2:患者信息丢失
+     * @param auditedResultDatas  已核查数据
      * @param inInserts           内部丢失插入集合
      * @param hisMedicalRecordMap his病历数据map（key-住院序号：value-人的his数据）
      * @param hospitalId          医院id
      * @param principleId         操作人id
+     * @param dataUps             要更新的已核查的集合
      * @Return void
      */
     private void compareLogWithLocal(List<GetOperationLogDTO> logs, List<String> dataBases, String type,
-                                     List<BlocklossResult> inInserts,
-                                     Map<String, HisMedicalRecordDTO> hisMedicalRecordMap, Long hospitalId, Long principleId) {
+                                     List<String> auditedResultDatas, List<BlocklossResult> inInserts,
+                                     Map<String, HisMedicalRecordDTO> hisMedicalRecordMap, Long hospitalId, Long principleId, List<GetOperationLogDTO> dataUps) {
         switch (type) {
             case "0":
                 //文书丢失
                 logs.stream().forEach(rec -> {
                     //存在记录但是没有入库
                     if (!dataBases.contains(rec.getRecId())) {
-                        BlocklossResult blocklossResult = new BlocklossResult();
-                        blocklossResult.setBehospitalCode(rec.getBehospitalCode());
-                        blocklossResult.setRecId(rec.getRecId());
-                        blocklossResult.setRecTitle(rec.getRecTitle());
-                        blocklossResult.setLossWay(LossWayEnum.IN_LOSS.getKey());
-                        blocklossResult.setLossType(LossTypeEnum.REC_LOSS.getKey());
-                        if (hisMedicalRecordMap.get(rec.getBehospitalCode()) != null) {
-                            blocklossResult.setBehospitalDate(hisMedicalRecordMap.get(rec.getBehospitalCode()).getBehospitalDate());
+                        if (auditedResultDatas == null || !auditedResultDatas.contains(rec.getRecId())) {
+                            BlocklossResult blocklossResult = new BlocklossResult();
+                            blocklossResult.setBehospitalCode(rec.getBehospitalCode());
+                            blocklossResult.setRecId(rec.getRecId());
+                            blocklossResult.setRecTitle(rec.getRecTitle());
+                            blocklossResult.setLossWay(LossWayEnum.IN_LOSS.getKey());
+                            blocklossResult.setLossType(LossTypeEnum.REC_LOSS.getKey());
+                            if (hisMedicalRecordMap.get(rec.getBehospitalCode()) != null) {
+                                blocklossResult.setBehospitalDate(hisMedicalRecordMap.get(rec.getBehospitalCode()).getBehospitalDate());
+                            }
+                            //拼装病历数据块丢失明细其他信息
+                            assembleOtherBlocklossResult(blocklossResult, hospitalId, principleId);
+                            inInserts.add(blocklossResult);
+                        } else {
+                            //更新人工操作记录（核查的）的时间
+                            GetOperationLogDTO temp = new GetOperationLogDTO();
+                            temp.setBehospitalCode(rec.getBehospitalCode());
+                            temp.setRecId(rec.getRecId());
+                            dataUps.add(temp);
                         }
-                        //拼装病历数据块丢失明细其他信息
-                        assembleOtherBlocklossResult(blocklossResult, hospitalId, principleId);
-                        inInserts.add(blocklossResult);
+
                     }
                 });
                 //判断只插入文书id的情况
                 //获取插入的文书
-//                if (ListUtil.isNotEmpty(dataBases)) {
-//                    List<String> havingRecIds = medicalRecordContentFacade.list(new QueryWrapper<MedicalRecordContent>()
-//                            .select("rec_id")
-//                            .in("rec_id", dataBases)).stream().map(MedicalRecordContent::getRecId).collect(Collectors.toList());
-//                    List<String> tempList = new ArrayList<>(dataBases);
-//                    //移除查出来有内容的文书
-//                    tempList.removeAll(havingRecIds);
-//                    Map<String, GetOperationLogDTO> recMap = EntityUtil.makeEntityMap(logs, "recId");
-//                    //有文书id无内容文书
-//                    tempList.stream().forEach(recId -> {
-//                        //没有被记录过
-//                        BlocklossResult blocklossResult = new BlocklossResult();
-//                        blocklossResult.setBehospitalCode(recMap.get(recId).getBehospitalCode());
-//                        blocklossResult.setRecId(recId);
-//                        blocklossResult.setRecTitle(recMap.get(recId).getRecTitle());
-//                        blocklossResult.setLossWay(LossWayEnum.IN_LOSS.getKey());
-//                        blocklossResult.setLossType(LossTypeEnum.REC_LOSS.getKey());
-//                        blocklossResult.setLossCause("文书id插入成功，文书内容没有插入");
-//                        if (hisMedicalRecordMap.get(recMap.get(recId)) != null) {
-//                            blocklossResult.setBehospitalDate(hisMedicalRecordMap.get(recMap.get(recId).getBehospitalCode()).getBehospitalDate());
-//                        }
-//                        //拼装病历数据块丢失明细其他信息
-//                        assembleOtherBlocklossResult(blocklossResult, hospitalId, principleId);
-//                        inInserts.add(blocklossResult);
-//                    });
-//                }
+                //                if (ListUtil.isNotEmpty(dataBases)) {
+                //                    List<String> havingRecIds = medicalRecordContentFacade.list(new QueryWrapper<MedicalRecordContent>()
+                //                            .select("rec_id")
+                //                            .in("rec_id", dataBases)).stream().map(MedicalRecordContent::getRecId).collect(Collectors.toList());
+                //                    List<String> tempList = new ArrayList<>(dataBases);
+                //                    //移除查出来有内容的文书
+                //                    tempList.removeAll(havingRecIds);
+                //                    Map<String, GetOperationLogDTO> recMap = EntityUtil.makeEntityMap(logs, "recId");
+                //                    //有文书id无内容文书
+                //                    tempList.stream().forEach(recId -> {
+                //                        //没有被记录过
+                //                        BlocklossResult blocklossResult = new BlocklossResult();
+                //                        blocklossResult.setBehospitalCode(recMap.get(recId).getBehospitalCode());
+                //                        blocklossResult.setRecId(recId);
+                //                        blocklossResult.setRecTitle(recMap.get(recId).getRecTitle());
+                //                        blocklossResult.setLossWay(LossWayEnum.IN_LOSS.getKey());
+                //                        blocklossResult.setLossType(LossTypeEnum.REC_LOSS.getKey());
+                //                        blocklossResult.setLossCause("文书id插入成功，文书内容没有插入");
+                //                        if (hisMedicalRecordMap.get(recMap.get(recId)) != null) {
+                //                            blocklossResult.setBehospitalDate(hisMedicalRecordMap.get(recMap.get(recId).getBehospitalCode()).getBehospitalDate());
+                //                        }
+                //                        //拼装病历数据块丢失明细其他信息
+                //                        assembleOtherBlocklossResult(blocklossResult, hospitalId, principleId);
+                //                        inInserts.add(blocklossResult);
+                //                    });
+                //                }
 
                 break;
             case "1":
                 //病案首页丢失
                 logs.stream().forEach(homePages -> {
                     //存在记录但是没有入库
-                    if (!dataBases.contains(homePages.getRecId())) {
-                        BlocklossResult blocklossResult = new BlocklossResult();
-                        blocklossResult.setBehospitalCode(homePages.getBehospitalCode());
-                        blocklossResult.setRecId(homePages.getHomePageId());
-                        blocklossResult.setRecTitle("病案首页丢失");
-                        blocklossResult.setLossWay(LossWayEnum.IN_LOSS.getKey());
-                        blocklossResult.setLossType(LossTypeEnum.HOMEPAGE_LOSS.getKey());
-                        if (hisMedicalRecordMap.get(homePages.getBehospitalCode()) != null) {
-                            blocklossResult.setBehospitalDate(hisMedicalRecordMap.get(homePages.getBehospitalCode()).getBehospitalDate());
+                    if (!dataBases.contains(homePages.getHomePageId())) {
+                        if (auditedResultDatas == null || !auditedResultDatas.contains(homePages.getHomePageId())) {
+                            BlocklossResult blocklossResult = new BlocklossResult();
+                            blocklossResult.setBehospitalCode(homePages.getBehospitalCode());
+                            blocklossResult.setRecId(homePages.getHomePageId());
+                            blocklossResult.setRecTitle("病案首页丢失");
+                            blocklossResult.setLossWay(LossWayEnum.IN_LOSS.getKey());
+                            blocklossResult.setLossType(LossTypeEnum.HOMEPAGE_LOSS.getKey());
+                            if (hisMedicalRecordMap.get(homePages.getBehospitalCode()) != null) {
+                                blocklossResult.setBehospitalDate(hisMedicalRecordMap.get(homePages.getBehospitalCode()).getBehospitalDate());
+                            }
+                            //拼装病历数据块丢失明细其他信息
+                            assembleOtherBlocklossResult(blocklossResult, hospitalId, principleId);
+                            inInserts.add(blocklossResult);
+                        } else {
+                            //更新人工操作记录（核查的）的时间
+                            GetOperationLogDTO temp = new GetOperationLogDTO();
+                            temp.setBehospitalCode(homePages.getBehospitalCode());
+                            temp.setHomePageId(homePages.getHomePageId());
+                            dataUps.add(temp);
                         }
-                        //拼装病历数据块丢失明细其他信息
-                        assembleOtherBlocklossResult(blocklossResult, hospitalId, principleId);
-                        inInserts.add(blocklossResult);
+
                     }
                 });
                 break;
@@ -349,16 +416,24 @@ public class BlockLossManagementFacade {
                 logs.stream().forEach(beHehospitalInfo -> {
                     //存在记录但是没有入库
                     if (!dataBases.contains(beHehospitalInfo.getBehospitalCode())) {
-                        BlocklossResult blocklossResult = new BlocklossResult();
-                        blocklossResult.setBehospitalCode(beHehospitalInfo.getBehospitalCode());
-                        blocklossResult.setLossWay(LossWayEnum.IN_LOSS.getKey());
-                        blocklossResult.setLossType(LossTypeEnum.CODE_LOSS.getKey());
-                        if (hisMedicalRecordMap.get(beHehospitalInfo.getBehospitalCode()) != null) {
-                            blocklossResult.setBehospitalDate(hisMedicalRecordMap.get(beHehospitalInfo.getBehospitalCode()).getBehospitalDate());
+                        if (auditedResultDatas == null || !auditedResultDatas.contains(beHehospitalInfo.getBehospitalCode())) {
+                            BlocklossResult blocklossResult = new BlocklossResult();
+                            blocklossResult.setBehospitalCode(beHehospitalInfo.getBehospitalCode());
+                            blocklossResult.setLossWay(LossWayEnum.IN_LOSS.getKey());
+                            blocklossResult.setLossType(LossTypeEnum.CODE_LOSS.getKey());
+                            if (hisMedicalRecordMap.get(beHehospitalInfo.getBehospitalCode()) != null) {
+                                blocklossResult.setBehospitalDate(hisMedicalRecordMap.get(beHehospitalInfo.getBehospitalCode()).getBehospitalDate());
+                            }
+                            //拼装病历数据块丢失明细其他信息
+                            assembleOtherBlocklossResult(blocklossResult, hospitalId, principleId);
+                            inInserts.add(blocklossResult);
+                        } else {
+                            //更新人工操作记录（核查的）的时间
+                            GetOperationLogDTO temp = new GetOperationLogDTO();
+                            temp.setBehospitalCode(beHehospitalInfo.getBehospitalCode());
+                            dataUps.add(temp);
                         }
-                        //拼装病历数据块丢失明细其他信息
-                        assembleOtherBlocklossResult(blocklossResult, hospitalId, principleId);
-                        inInserts.add(blocklossResult);
+
                     }
                 });
                 break;
@@ -456,15 +531,18 @@ public class BlockLossManagementFacade {
      * @param medicalRecords      his数据
      * @param logs                日志数据
      * @param type                对比类型：0:文书丢失 1:病案首页丢失 2:患者信息丢失
+     * @param auditedResultDatas  已核查数据
      * @param outInserts          外部丢失插入集合
      * @param hisMedicalRecordMap his病历数据map（key-住院序号：value-人的his数据）
      * @param hospitalId          医院id
      * @param principleId         操作人id
+     * @param dataUps             要更新的已核查的集合
      * @Return void
      */
     private void compareHisWithLog(List<GetOperationLogDTO> medicalRecords, List<GetOperationLogDTO> logs,
-                                   String type, List<BlocklossResult> outInserts,
-                                   Map<String, HisMedicalRecordDTO> hisMedicalRecordMap, Long hospitalId, Long principleId) {
+                                   String type, List<String> auditedResultDatas, List<BlocklossResult> outInserts,
+                                   Map<String, HisMedicalRecordDTO> hisMedicalRecordMap,
+                                   Long hospitalId, Long principleId, List<GetOperationLogDTO> dataUps) {
         //his数据为空直接返回
         if (ListUtil.isEmpty(medicalRecords)) {
             return;
@@ -476,17 +554,28 @@ public class BlockLossManagementFacade {
                     //文书不存在操作记录
                     if (StringUtil.isNotEmpty(medicalRecord.getRecId())) {
                         if (!recLogs.contains(medicalRecord.getRecId())) {
-                            //该记录没有插入
-                            BlocklossResult blocklossResult = new BlocklossResult();
-                            blocklossResult.setBehospitalCode(medicalRecord.getBehospitalCode());
-                            blocklossResult.setRecId(medicalRecord.getRecId());
-                            blocklossResult.setRecTitle(medicalRecord.getRecTitle());
-                            blocklossResult.setLossWay(LossWayEnum.OUT_LOSS.getKey());
-                            blocklossResult.setLossType(LossTypeEnum.REC_LOSS.getKey());
-                            blocklossResult.setBehospitalDate(hisMedicalRecordMap.get(medicalRecord.getBehospitalCode()).getBehospitalDate());
-                            //拼装病历数据块丢失明细其他信息
-                            assembleOtherBlocklossResult(blocklossResult, hospitalId, principleId);
-                            outInserts.add(blocklossResult);
+                            if (auditedResultDatas == null || !auditedResultDatas.contains(medicalRecord.getRecId())) {
+                                //该记录没有插入
+                                BlocklossResult blocklossResult = new BlocklossResult();
+                                blocklossResult.setBehospitalCode(medicalRecord.getBehospitalCode());
+                                blocklossResult.setRecId(medicalRecord.getRecId());
+                                blocklossResult.setRecTitle(medicalRecord.getRecTitle());
+                                blocklossResult.setLossWay(LossWayEnum.OUT_LOSS.getKey());
+                                blocklossResult.setLossType(LossTypeEnum.REC_LOSS.getKey());
+                                if (hisMedicalRecordMap.get(medicalRecord.getBehospitalCode()).getBehospitalDate() != null) {
+                                    blocklossResult.setBehospitalDate(hisMedicalRecordMap.get(medicalRecord.getBehospitalCode()).getBehospitalDate());
+                                }
+                                //拼装病历数据块丢失明细其他信息
+                                assembleOtherBlocklossResult(blocklossResult, hospitalId, principleId);
+                                outInserts.add(blocklossResult);
+                            } else {
+                                //更新人工操作记录（核查的）的时间
+                                GetOperationLogDTO temp = new GetOperationLogDTO();
+                                temp.setBehospitalCode(medicalRecord.getBehospitalCode());
+                                temp.setRecId(medicalRecord.getRecId());
+                                dataUps.add(temp);
+                            }
+
                         }
                     }
                 });
@@ -496,16 +585,26 @@ public class BlockLossManagementFacade {
                 medicalRecords.stream().forEach(medicalRecord -> {
                     //病案首页不存在操作记录
                     if (StringUtil.isNotEmpty(medicalRecord.getHomePageId()) && !homepageLogs.contains(medicalRecord.getHomePageId())) {
-                        BlocklossResult blocklossResult = new BlocklossResult();
-                        blocklossResult.setBehospitalCode(medicalRecord.getBehospitalCode());
-                        blocklossResult.setRecId(medicalRecord.getHomePageId());
-                        blocklossResult.setRecTitle("病案首页丢失");
-                        blocklossResult.setLossWay(LossWayEnum.OUT_LOSS.getKey());
-                        blocklossResult.setLossType(LossTypeEnum.HOMEPAGE_LOSS.getKey());
-                        blocklossResult.setBehospitalDate(hisMedicalRecordMap.get(medicalRecord.getBehospitalCode()).getBehospitalDate());
-                        //拼装病历数据块丢失明细其他信息
-                        assembleOtherBlocklossResult(blocklossResult, hospitalId, principleId);
-                        outInserts.add(blocklossResult);
+                        if (auditedResultDatas == null || !auditedResultDatas.contains(medicalRecord.getRecId())) {
+                            BlocklossResult blocklossResult = new BlocklossResult();
+                            blocklossResult.setBehospitalCode(medicalRecord.getBehospitalCode());
+                            blocklossResult.setRecId(medicalRecord.getHomePageId());
+                            blocklossResult.setRecTitle("病案首页丢失");
+                            blocklossResult.setLossWay(LossWayEnum.OUT_LOSS.getKey());
+                            blocklossResult.setLossType(LossTypeEnum.HOMEPAGE_LOSS.getKey());
+                            if (hisMedicalRecordMap.get(medicalRecord.getBehospitalCode()).getBehospitalDate() != null) {
+                                blocklossResult.setBehospitalDate(hisMedicalRecordMap.get(medicalRecord.getBehospitalCode()).getBehospitalDate());
+                            }
+                            //拼装病历数据块丢失明细其他信息
+                            assembleOtherBlocklossResult(blocklossResult, hospitalId, principleId);
+                            outInserts.add(blocklossResult);
+                        } else {
+                            //更新人工操作记录（核查的）的时间
+                            GetOperationLogDTO temp = new GetOperationLogDTO();
+                            temp.setBehospitalCode(medicalRecord.getBehospitalCode());
+                            temp.setHomePageId(medicalRecord.getHomePageId());
+                            dataUps.add(temp);
+                        }
                     }
                 });
                 break;
@@ -514,14 +613,23 @@ public class BlockLossManagementFacade {
                 medicalRecords.stream().forEach(medicalRecord -> {
                     //病历数据不存在操作记录
                     if (!behospitalCodeLogs.contains(medicalRecord.getBehospitalCode())) {
-                        BlocklossResult blocklossResult = new BlocklossResult();
-                        blocklossResult.setBehospitalCode(medicalRecord.getBehospitalCode());
-                        blocklossResult.setLossWay(LossWayEnum.OUT_LOSS.getKey());
-                        blocklossResult.setLossType(LossTypeEnum.CODE_LOSS.getKey());
-                        blocklossResult.setBehospitalDate(hisMedicalRecordMap.get(medicalRecord.getBehospitalCode()).getBehospitalDate());
-                        //拼装病历数据块丢失明细其他信息
-                        assembleOtherBlocklossResult(blocklossResult, hospitalId, principleId);
-                        outInserts.add(blocklossResult);
+                        if (auditedResultDatas == null || !auditedResultDatas.contains(medicalRecord.getRecId())) {
+                            BlocklossResult blocklossResult = new BlocklossResult();
+                            blocklossResult.setBehospitalCode(medicalRecord.getBehospitalCode());
+                            blocklossResult.setLossWay(LossWayEnum.OUT_LOSS.getKey());
+                            blocklossResult.setLossType(LossTypeEnum.CODE_LOSS.getKey());
+                            if (hisMedicalRecordMap.get(medicalRecord.getBehospitalCode()).getBehospitalDate() != null) {
+                                blocklossResult.setBehospitalDate(hisMedicalRecordMap.get(medicalRecord.getBehospitalCode()).getBehospitalDate());
+                            }
+                            //拼装病历数据块丢失明细其他信息
+                            assembleOtherBlocklossResult(blocklossResult, hospitalId, principleId);
+                            outInserts.add(blocklossResult);
+                        } else {
+                            //更新人工操作记录（核查的）的时间
+                            GetOperationLogDTO temp = new GetOperationLogDTO();
+                            temp.setBehospitalCode(medicalRecord.getBehospitalCode());
+                            dataUps.add(temp);
+                        }
                     }
                 });
                 break;

daqe-center/src/main/java/com/lantone/daqe/facade/ColumnResultManagementFacade.java

@@ -108,7 +108,7 @@ public class ColumnResultManagementFacade {
         columnResultQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         columnResultQueryWrapper.eq(StringUtil.isNotBlank(getColumnResultPageVO.getType()), "type", getColumnResultPageVO.getType());
         columnResultQueryWrapper.eq(StringUtil.isNotBlank(getColumnResultPageVO.getIsSolved()), "is_solved", getColumnResultPageVO.getIsSolved());
-        columnResultQueryWrapper.eq(StringUtil.isNotBlank(getColumnResultPageVO.getModeName()),"mode_name", getColumnResultPageVO.getModeName());
+        columnResultQueryWrapper.eq(StringUtil.isNotBlank(getColumnResultPageVO.getModeName()), "mode_name", getColumnResultPageVO.getModeName());
         columnResultQueryWrapper.ge(StringUtil.isNotBlank(startDate), "behospital_date", getColumnResultPageVO.getBehospitalStartDate());
         columnResultQueryWrapper.le(StringUtil.isNotBlank(endDate), "behospital_date", getColumnResultPageVO.getBehospitalEndDate());
         columnResultQueryWrapper.like(StringUtil.isNotBlank(getColumnResultPageVO.getBehospitalCode()), "behospital_code", getColumnResultPageVO.getBehospitalCode());
@@ -235,12 +235,12 @@ public class ColumnResultManagementFacade {
     }
 
     /**
-     *获取枚举所有Name 也就是质控模块名称
+     * 获取枚举所有Name 也就是质控模块名称
      *
      * @param
      * @return:
      */
-    public List<String> getModeName(){
+    public List<String> getModeName() {
         List<String> modeNameList = new ArrayList<>();
         for (ModeEnum value : ModeEnum.values()) {
             modeNameList.add(value.getName());
@@ -258,9 +258,9 @@ public class ColumnResultManagementFacade {
         List<String> behospitalCodeList = new ArrayList<>();
         Long hospitalId = null;
         Long principleId = null;
-        if(dataCheckVO.getHospitalId()==null){
-            hospitalId=SysUserUtils.getCurrentHospitalId();
-            principleId=SysUserUtils.getCurrentPrincipleId();
+        if (dataCheckVO.getHospitalId() == null) {
+            hospitalId = SysUserUtils.getCurrentHospitalId();
+            principleId = SysUserUtils.getCurrentPrincipleId();
         }
         //获取所有包含rec_id的表名
         List<String> recColumnTable = getRecColumnTable();
@@ -271,14 +271,14 @@ public class ColumnResultManagementFacade {
             List<BehospitalInfo> behospitalInfos = behospitalInfoFacade.getBaseMapper().selectList(new QueryWrapper<BehospitalInfo>()
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
                     .eq("behospital_code", dataCheckVO.getBehospitalCode())
-                    .eq(hospitalId!=null,"hospital_id", hospitalId)
+                    .eq(hospitalId != null, "hospital_id", hospitalId)
             );
             if (ListUtil.isEmpty(behospitalInfos)) {
                 Asserts.fail("该患者信息未查询到！");
             }
             behospitalCodeList.add(behospitalCode);
             //对于集合病历所有校验规则校验其表信息字段
-            checkTableColumnVal(behospitalCodeList,hospitalId,principleId,recColumnTable);
+            checkTableColumnVal(behospitalCodeList, hospitalId, principleId, recColumnTable);
         }
         //对于只传时间不传病历的情况
         //创建一个病历集合
@@ -292,7 +292,7 @@ public class ColumnResultManagementFacade {
                 behospitalCodeList.add(behospitalInfo.getBehospitalCode());
             }
             //对于集合病历所有校验规则校验其表信息字段
-            checkTableColumnVal(behospitalCodeList,hospitalId,principleId,recColumnTable);
+            checkTableColumnVal(behospitalCodeList, hospitalId, principleId, recColumnTable);
         }
         return true;
     }
@@ -304,23 +304,23 @@ public class ColumnResultManagementFacade {
      * @param behospitalCodeList
      * @return: 具体数据
      */
-    public void checkTableColumnVal(List<String> behospitalCodeList,Long hospitalId,Long principleId,List<String> recColumnTable) {
+    public void checkTableColumnVal(List<String> behospitalCodeList, Long hospitalId, Long principleId, List<String> recColumnTable) {
         //先获取非空的所有字段校验规则
         List<NonnullInfo> nonnullInfos = getNonnullInfo();
         if (ListUtil.isNotEmpty(nonnullInfos)) {
             //调用校验非空规则方法
-            checkNonnull(nonnullInfos, behospitalCodeList, hospitalId,principleId,recColumnTable);
+            checkNonnull(nonnullInfos, behospitalCodeList, hospitalId, principleId, recColumnTable);
         }
         //获取正则所有字段校验规则
         List<GetRegular> regularMappings = getRegularMapping();
         if (ListUtil.isNotEmpty(regularMappings)) {
             //调用校验正则规则
-            checkRegular(regularMappings, behospitalCodeList, hospitalId,principleId,recColumnTable);
+            checkRegular(regularMappings, behospitalCodeList, hospitalId, principleId, recColumnTable);
         }
         //获取字段校验的标准值规则
         List<GetStandardvalueInfoDTO> standardvalueInfo = getStandardvalueInfo();
         if (ListUtil.isNotEmpty(standardvalueInfo)) {
-            checkStandardvalue(standardvalueInfo, behospitalCodeList, hospitalId,principleId,recColumnTable);
+            checkStandardvalue(standardvalueInfo, behospitalCodeList, hospitalId, principleId, recColumnTable);
         }
     }
 
@@ -385,7 +385,7 @@ public class ColumnResultManagementFacade {
         if (ListUtil.isNotEmpty(nonnullInfoList) || ListUtil.isNotEmpty(standardvalueList) || ListUtil.isNotEmpty(regularList)) {
             //获取30天内所有病历
             List<BehospitalInfo> behospitalInfos = getBehospitalInfos(DateUtil.addDate(DateUtil.now(), -30), DateUtil.now(), hospitalId);
-            if(ListUtil.isNotEmpty(behospitalInfos)) {
+            if (ListUtil.isNotEmpty(behospitalInfos)) {
                 for (BehospitalInfo behospitalInfo : behospitalInfos) {
                     behospitalCodeList.add(behospitalInfo.getBehospitalCode());
                 }
@@ -396,33 +396,34 @@ public class ColumnResultManagementFacade {
         //非空校验规则今天有修改
         if (ListUtil.isNotEmpty(nonnullInfoList) && ListUtil.isNotEmpty(behospitalCodeList)) {
             //调用校验非空规则方法
-            checkNonnull(nonnullInfos, behospitalCodeList, hospitalId,principleId,recColumnTable);
+            checkNonnull(nonnullInfos, behospitalCodeList, hospitalId, principleId, recColumnTable);
         }
         //正则校验规则今天有修改
         if (ListUtil.isNotEmpty(regularList) && ListUtil.isNotEmpty(behospitalCodeList)) {
             //调用校验正则规则
-            checkRegular(regularMappings, behospitalCodeList, hospitalId,principleId,recColumnTable);
+            checkRegular(regularMappings, behospitalCodeList, hospitalId, principleId, recColumnTable);
         }
         //标准值校验规则今天有修改
         if (ListUtil.isNotEmpty(standardvalueList) && ListUtil.isNotEmpty(behospitalCodeList)) {
             //调用校验正则规则
-            checkStandardvalue(standardvalueInfo, behospitalCodeList, hospitalId,principleId,recColumnTable);
+            checkStandardvalue(standardvalueInfo, behospitalCodeList, hospitalId, principleId, recColumnTable);
         }
     }
+
     /**
+     * 获取所有包含rec_id的表名
      *
-     *获取所有包含rec_id的表名
      * @param
      * @return:
      */
-    public List<String> getRecColumnTable(){
+    public List<String> getRecColumnTable() {
         //获取所有包含rec_id的表名
         List<ColumnInfo> columnInfoList = columnInfoFacade.getBaseMapper().selectList(new QueryWrapper<ColumnInfo>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("column_ename", "rec_id")
         );
         List<String> recColumnTable = new ArrayList<>();
-        if(ListUtil.isNotEmpty(columnInfoList)) {
+        if (ListUtil.isNotEmpty(columnInfoList)) {
             for (ColumnInfo columnInfo : columnInfoList) {
                 recColumnTable.add(columnInfo.getTableEname());
             }
@@ -488,7 +489,7 @@ public class ColumnResultManagementFacade {
      * @param hospitalId
      * @return:
      */
-    public void checkNonnull(List<NonnullInfo> nonnullInfos, List<String> behospitalCodeList, Long hospitalId,Long principleId,List<String> recColumnTable) {
+    public void checkNonnull(List<NonnullInfo> nonnullInfos, List<String> behospitalCodeList, Long hospitalId, Long principleId, List<String> recColumnTable) {
         for (NonnullInfo nonnullInfo : nonnullInfos) {
             Long columnId = nonnullInfo.getColumnId();
             ColumnInfo columnInfo = columnInfoFacade.getBaseMapper().selectById(columnId);
@@ -502,13 +503,13 @@ public class ColumnResultManagementFacade {
             getTableColumnInfoVO.setHospitalId(hospitalId);
             String columnNumber = getColumnNumber(columnInfo.getTableCname());
             getTableColumnInfoVO.setNumberColumnCname(columnNumber);
-            List<GetTableColumnInfoDTO> tableColumnVal = getTableColumnVal(getTableColumnInfoVO,recColumnTable);
+            List<GetTableColumnInfoDTO> tableColumnVal = getTableColumnVal(getTableColumnInfoVO, recColumnTable);
             //枚举获取模块信息
             String modeId = ModeEnum.valueOf(columnInfo.getTableEname()).getKey();
             String modeName = ModeEnum.valueOf(columnInfo.getTableEname()).getName();
             //删除结果表所有的信息
-            removeNonnullResultSolved(behospitalCodeList, hospitalId,columnId);
-            removeColumnResultSolved(behospitalCodeList,hospitalId, columnId, ColumnResultTypeEnum.NONNULL_TYPE.getKey());
+            removeNonnullResultSolved(behospitalCodeList, hospitalId, columnId);
+            removeColumnResultSolved(behospitalCodeList, hospitalId, columnId, ColumnResultTypeEnum.NONNULL_TYPE.getKey());
             for (GetTableColumnInfoDTO getTableColumnInfoDTO : tableColumnVal) {
                 getTableColumnInfoDTO.setModeId(Long.valueOf(modeId));
                 getTableColumnInfoDTO.setModeName(modeName);
@@ -528,10 +529,10 @@ public class ColumnResultManagementFacade {
                     nonnullResult.setBehospitalCode(getTableColumnInfoDTO.getBehospitalCode());
                     nonnullResult.setModeId(getTableColumnInfoDTO.getModeId());
                     nonnullResult.setModeName(getTableColumnInfoDTO.getModeName());
-                    if(StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecId())) {
+                    if (StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecId())) {
                         nonnullResult.setHosptialDatatmpCode(getTableColumnInfoDTO.getRecId());
                     }
-                    if(StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecTitle())) {
+                    if (StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecTitle())) {
                         nonnullResult.setHosptialDatatmpName(getTableColumnInfoDTO.getRecTitle());
                     }
                     nonnullResult.setColumnId(nonnullInfo.getColumnId());
@@ -542,7 +543,7 @@ public class ColumnResultManagementFacade {
                     nonnullResult.setTableEname(columnInfo.getTableEname());
                     nonnullResult.setColumnCname(columnInfo.getColumnCname());
                     nonnullResult.setColumnEname(columnInfo.getColumnEname());
-                    if(principleId!=null) {
+                    if (principleId != null) {
                         nonnullResult.setCreator(principleId.toString());
                     }
                     nonnullResult.setTableId(getTableColumnInfoDTO.getTableId());
@@ -554,7 +555,7 @@ public class ColumnResultManagementFacade {
                     nonnullResultFacade.getBaseMapper().insert(nonnullResult);
                     Long id = nonnullResult.getId();
                     //加入总结果表
-                    addColumnResult(getTableColumnInfoDTO, columnInfo, columnId, id, ColumnResultTypeEnum.NONNULL_TYPE.getKey(),principleId);
+                    addColumnResult(getTableColumnInfoDTO, columnInfo, columnId, id, ColumnResultTypeEnum.NONNULL_TYPE.getKey(), principleId);
                 }
             }
         }
@@ -568,7 +569,7 @@ public class ColumnResultManagementFacade {
      * @param hospitalId
      * @return:
      */
-    public void checkRegular(List<GetRegular> regularMappings, List<String> behospitalCodeList, Long hospitalId,Long principleId,List<String> recColumnTable) {
+    public void checkRegular(List<GetRegular> regularMappings, List<String> behospitalCodeList, Long hospitalId, Long principleId, List<String> recColumnTable) {
         for (GetRegular getRegular : regularMappings) {
             Long columnId = getRegular.getColumnId();
             ColumnInfo columnInfo = columnInfoFacade.getBaseMapper().selectById(columnId);
@@ -581,13 +582,13 @@ public class ColumnResultManagementFacade {
             getTableColumnInfoVO.setHospitalId(hospitalId);
             String columnNumber = getColumnNumber(columnInfo.getTableCname());
             getTableColumnInfoVO.setNumberColumnCname(columnNumber);
-            List<GetTableColumnInfoDTO> tableColumnVal = getTableColumnVal(getTableColumnInfoVO,recColumnTable);
+            List<GetTableColumnInfoDTO> tableColumnVal = getTableColumnVal(getTableColumnInfoVO, recColumnTable);
             String modeId = ModeEnum.valueOf(columnInfo.getTableEname()).getKey();
             String modeName = ModeEnum.valueOf(columnInfo.getTableEname()).getName();
             String regular = getRegular.getVal();
             //删除病历集合对应字段结果表所有的信息
-            removeRegularResultSolved(behospitalCodeList,hospitalId, columnId);
-            removeColumnResultSolved(behospitalCodeList,hospitalId, columnId, ColumnResultTypeEnum.REGULAR_TYPE.getKey());
+            removeRegularResultSolved(behospitalCodeList, hospitalId, columnId);
+            removeColumnResultSolved(behospitalCodeList, hospitalId, columnId, ColumnResultTypeEnum.REGULAR_TYPE.getKey());
             for (GetTableColumnInfoDTO getTableColumnInfoDTO : tableColumnVal) {
                 getTableColumnInfoDTO.setModeId(Long.valueOf(modeId));
                 getTableColumnInfoDTO.setModeName(modeName);
@@ -610,16 +611,16 @@ public class ColumnResultManagementFacade {
                     regularResult.setTableEname(columnInfo.getTableEname());
                     regularResult.setColumnCname(columnInfo.getColumnCname());
                     regularResult.setColumnEname(columnInfo.getColumnEname());
-                    if(StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecId())) {
+                    if (StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecId())) {
                         regularResult.setHosptialDatatmpCode(getTableColumnInfoDTO.getRecId());
                     }
-                    if(StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecTitle())) {
+                    if (StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecTitle())) {
                         regularResult.setHosptialDatatmpName(getTableColumnInfoDTO.getRecTitle());
                     }
                     regularResult.setBehospitalDate(getTableColumnInfoDTO.getBehospitalDate());
                     regularResult.setHospitalDataCode(getTableColumnInfoDTO.getNumberId());
                     regularResult.setRegularId(getRegular.getId());
-                    if(principleId!=null) {
+                    if (principleId != null) {
                         regularResult.setCreator(principleId.toString());
                     }
                     regularResult.setRegularName(getRegular.getName());
@@ -635,7 +636,7 @@ public class ColumnResultManagementFacade {
                     regularResultFacade.getBaseMapper().insert(regularResult);
                     Long id = regularResult.getId();
                     //加入总结果表
-                    addColumnResult(getTableColumnInfoDTO, columnInfo, columnId, id, ColumnResultTypeEnum.REGULAR_TYPE.getKey(),principleId);
+                    addColumnResult(getTableColumnInfoDTO, columnInfo, columnId, id, ColumnResultTypeEnum.REGULAR_TYPE.getKey(), principleId);
                 }
             }
         }
@@ -649,7 +650,7 @@ public class ColumnResultManagementFacade {
      * @param hospitalId
      * @return:
      */
-    public void checkStandardvalue(List<GetStandardvalueInfoDTO> standardvalueInfos, List<String> behospitalCodeList, Long hospitalId,Long principleId,List<String> recColumnTable) {
+    public void checkStandardvalue(List<GetStandardvalueInfoDTO> standardvalueInfos, List<String> behospitalCodeList, Long hospitalId, Long principleId, List<String> recColumnTable) {
         for (GetStandardvalueInfoDTO standardvalueInfo : standardvalueInfos) {
             Long columnId = standardvalueInfo.getColumnId();
             ColumnInfo columnInfo = columnInfoFacade.getBaseMapper().selectById(columnId);
@@ -662,13 +663,13 @@ public class ColumnResultManagementFacade {
             getTableColumnInfoVO.setHospitalId(hospitalId);
             String columnNumber = getColumnNumber(columnInfo.getTableCname());
             getTableColumnInfoVO.setNumberColumnCname(columnNumber);
-            List<GetTableColumnInfoDTO> tableColumnVal = getTableColumnVal(getTableColumnInfoVO,recColumnTable);
+            List<GetTableColumnInfoDTO> tableColumnVal = getTableColumnVal(getTableColumnInfoVO, recColumnTable);
             String standardvalue = standardvalueInfo.getStandardvalue();
             String modeId = ModeEnum.valueOf(columnInfo.getTableEname()).getKey();
             String modeName = ModeEnum.valueOf(columnInfo.getTableEname()).getName();
             //删除结果表所有的信息
-            removeStandardvalueResultSolved(behospitalCodeList,hospitalId, columnId);
-            removeColumnResultSolved(behospitalCodeList,hospitalId, columnId, ColumnResultTypeEnum.STANDARD_TYPE.getKey());
+            removeStandardvalueResultSolved(behospitalCodeList, hospitalId, columnId);
+            removeColumnResultSolved(behospitalCodeList, hospitalId, columnId, ColumnResultTypeEnum.STANDARD_TYPE.getKey());
             for (GetTableColumnInfoDTO getTableColumnInfoDTO : tableColumnVal) {
                 getTableColumnInfoDTO.setModeId(Long.valueOf(modeId));
                 getTableColumnInfoDTO.setModeName(modeName);
@@ -691,10 +692,10 @@ public class ColumnResultManagementFacade {
                     standardvalueResult.setColumnId(columnId);
                     standardvalueResult.setMappings(standardvalueMapping);
                     standardvalueResult.setBehospitalDate(getTableColumnInfoDTO.getBehospitalDate());
-                    if(StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecId())) {
+                    if (StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecId())) {
                         standardvalueResult.setHosptialDatatmpCode(getTableColumnInfoDTO.getRecId());
                     }
-                    if(StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecTitle())) {
+                    if (StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecTitle())) {
                         standardvalueResult.setHosptialDatatmpName(getTableColumnInfoDTO.getRecTitle());
                     }
                     standardvalueResult.setTableCname(columnInfo.getTableCname());
@@ -703,7 +704,7 @@ public class ColumnResultManagementFacade {
                     standardvalueResult.setColumnCname(columnInfo.getColumnCname());
                     standardvalueResult.setColumnEname(columnInfo.getColumnEname());
                     standardvalueResult.setHospitalDataCode(getTableColumnInfoDTO.getNumberId());
-                    if(principleId!=null) {
+                    if (principleId != null) {
                         standardvalueResult.setCreator(principleId.toString());
                     }
                     standardvalueResult.setTableId(getTableColumnInfoDTO.getTableId());
@@ -715,7 +716,7 @@ public class ColumnResultManagementFacade {
                     standardvalueResultFacade.getBaseMapper().insert(standardvalueResult);
                     Long id = standardvalueResult.getId();
                     //加入总结果表
-                    addColumnResult(getTableColumnInfoDTO, columnInfo, columnId, id, ColumnResultTypeEnum.STANDARD_TYPE.getKey(),principleId);
+                    addColumnResult(getTableColumnInfoDTO, columnInfo, columnId, id, ColumnResultTypeEnum.STANDARD_TYPE.getKey(), principleId);
                 }
             }
         }
@@ -727,9 +728,9 @@ public class ColumnResultManagementFacade {
      * @param getTableColumnInfoVO
      * @return: 具体数据
      */
-    public List<GetTableColumnInfoDTO> getTableColumnVal(GetTableColumnInfoVO getTableColumnInfoVO,List<String> recColumnTable) {
+    public List<GetTableColumnInfoDTO> getTableColumnVal(GetTableColumnInfoVO getTableColumnInfoVO, List<String> recColumnTable) {
         //判断此规则是否包含rec_id
-        if(ListUtil.isNotEmpty(recColumnTable) && recColumnTable.contains(getTableColumnInfoVO.getColumnEname())){
+        if (ListUtil.isNotEmpty(recColumnTable) && recColumnTable.contains(getTableColumnInfoVO.getTableEname())) {
             List<GetTableColumnInfoDTO> tableColumnVal = columnResultFacade.getBaseMapper().getRecSpecialTableColumnVal(getTableColumnInfoVO);
             return tableColumnVal;
         }
@@ -781,7 +782,7 @@ public class ColumnResultManagementFacade {
      * @param columnId
      * @return:
      */
-    public void removeNonnullResultSolved(List<String> behospitalCodeList,Long hospitalId, Long columnId) {
+    public void removeNonnullResultSolved(List<String> behospitalCodeList, Long hospitalId, Long columnId) {
         nonnullResultFacade.remove(new UpdateWrapper<NonnullResult>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
@@ -791,14 +792,14 @@ public class ColumnResultManagementFacade {
     }
 
     /**
-     *删除正则校验结果表信息
+     * 删除正则校验结果表信息
      *
      * @param behospitalCodeList
      * @param hospitalId
      * @param columnId
      * @return:
      */
-    public void removeRegularResultSolved(List<String> behospitalCodeList,Long hospitalId, Long columnId) {
+    public void removeRegularResultSolved(List<String> behospitalCodeList, Long hospitalId, Long columnId) {
         regularResultFacade.remove(new UpdateWrapper<RegularResult>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
@@ -815,7 +816,7 @@ public class ColumnResultManagementFacade {
      * @param columnId
      * @return:
      */
-    public void removeStandardvalueResultSolved(List<String> behospitalCodeList,Long hospitalId, Long columnId) {
+    public void removeStandardvalueResultSolved(List<String> behospitalCodeList, Long hospitalId, Long columnId) {
         standardvalueResultFacade.remove(new UpdateWrapper<StandardvalueResult>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
@@ -832,7 +833,7 @@ public class ColumnResultManagementFacade {
      * @param columnId
      * @return:
      */
-    public void removeColumnResultSolved(List<String> behospitalCodeList,Long hospitalId, Long columnId, String type) {
+    public void removeColumnResultSolved(List<String> behospitalCodeList, Long hospitalId, Long columnId, String type) {
         //未解决修改
         columnResultFacade.remove(new UpdateWrapper<ColumnResult>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -853,21 +854,21 @@ public class ColumnResultManagementFacade {
      * @param type
      * @return:
      */
-    public void addColumnResult(GetTableColumnInfoDTO getTableColumnInfoDTO, ColumnInfo columnInfo, Long columnId, Long id, String type,Long principleId) {
+    public void addColumnResult(GetTableColumnInfoDTO getTableColumnInfoDTO, ColumnInfo columnInfo, Long columnId, Long id, String type, Long principleId) {
         ColumnResult columnResult = new ColumnResult();
         columnResult.setHospitalId(getTableColumnInfoDTO.getHospitalId());
         columnResult.setBehospitalCode(getTableColumnInfoDTO.getBehospitalCode());
         columnResult.setModeId(getTableColumnInfoDTO.getModeId());
         columnResult.setModeName(getTableColumnInfoDTO.getModeName());
-        if(StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecId())) {
+        if (StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecId())) {
             columnResult.setHosptialDatatmpCode(getTableColumnInfoDTO.getRecId());
         }
-        if(StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecTitle())) {
+        if (StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecTitle())) {
             columnResult.setHosptialDatatmpName(getTableColumnInfoDTO.getRecTitle());
         }
         columnResult.setHospitalDataCode(getTableColumnInfoDTO.getNumberId());
         columnResult.setColumnId(columnId);
-        if(principleId!=null) {
+        if (principleId != null) {
             columnResult.setCreator(principleId.toString());
         }
         columnResult.setBehospitalDate(getTableColumnInfoDTO.getBehospitalDate());