Merge branch 'master' into smartor_ls_261103

陈昶聿

7 天以前 2867cf7076a584a34e63174cec0a8b89cdd03e4c

 smartor/src/main/java/com/smartor/service/impl/PatSpecificArchiveGenerateServiceImpl.java

@@ -2,17 +2,17 @@

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.ruoyi.common.core.domain.entity.PatArchive;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.outpatientvisit.domain.PatMedOuthosp;
import com.ruoyi.patarchive.domain.PatSpecificArchiveGenerateConfig;
import com.ruoyi.patarchive.mapper.PatArchiveMapper;
import com.ruoyi.patarchive.service.IPatSpecificArchiveGenerateConfigService;
import com.smartor.common.SpecificArchiveConstants;
import com.smartor.domain.PatArchive;
import com.smartor.domain.PatChildArchiveDetail;
import com.smartor.domain.PatMaternityArchiveDetail;
import com.smartor.domain.PatMedOuthosp;
import com.smartor.domain.PatSpecificArchiveGenerateConfig;
import com.smartor.mapper.PatArchiveMapper;
import com.smartor.service.IPatChildArchiveService;
import com.smartor.service.IPatMaternityArchiveService;
import com.smartor.service.IPatSpecificArchiveGenerateConfigService;
import com.smartor.service.IPatSpecificArchiveGenerateService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;