Merge remote-tracking branch 'origin/master' into smartor_ls_261012

liusheng

2026-11-03 7191c6d38f03f2e1baf39f959227ce9c038e4e96

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java

@@ -13,7 +13,7 @@
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.*;
import com.smartor.service.IPatArchiveService;
import com.ruoyi.patarchive.service.IPatArchiveService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -31,6 +31,11 @@
import java.util.Map;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import com.ruoyi.common.core.domain.entity.PatArchive;
import com.ruoyi.patarchive.domain.PatArchiveOthreInfo;
import com.ruoyi.patarchive.domain.PatArchiveReq;
import com.ruoyi.patarchive.domain.PatArchiveVO;
import com.ruoyi.patarchive.domain.PatUpInfoVO;

/**
 * 患者档案Controller