Merge branch 'develop' of https://gitea.gentronhealth.com/py/his into develop

openhis-server-new/openhis-application/src/main/java/com/openhis/OpenHisApplication.java

@@ -1,9 +1,6 @@
 package com.openhis;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-import com.alibaba.fastjson2.JSONObject;
+import com.openhis.web.ybmanage.config.YbServiceConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -12,8 +9,8 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.EnableAsync;
 
-import com.openhis.web.ybmanage.config.YbServiceConfig;
-import com.openhis.administration.domain.Instrument;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 
 /**
  * 启动程序

openhis-server-new/openhis-application/src/main/java/com/openhis/config/HttpConfig.java

@@ -1,8 +1,6 @@
 package com.openhis.config;
 
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.stereotype.Component;

openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/controller/SysJobController.java

@@ -1,14 +1,5 @@
 package com.openhis.quartz.controller;
 
-import java.util.List;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.quartz.SchedulerException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
 import com.core.common.annotation.Log;
 import com.core.common.constant.Constants;
 import com.core.common.core.controller.BaseController;
@@ -22,6 +13,13 @@ import com.core.quartz.domain.SysJob;
 import com.core.quartz.util.CronUtils;
 import com.openhis.quartz.service.ISysJobService;
 import com.openhis.quartz.util.ScheduleUtils;
+import org.quartz.SchedulerException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 调度任务信息操作处理

openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/controller/SysJobLogController.java

@@ -1,13 +1,5 @@
 package com.openhis.quartz.controller;
 
-import java.util.List;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
 import com.core.common.annotation.Log;
 import com.core.common.core.controller.BaseController;
 import com.core.common.core.domain.AjaxResult;
@@ -16,6 +8,12 @@ import com.core.common.enums.BusinessType;
 import com.core.common.utils.poi.ExcelUtil;
 import com.core.quartz.domain.SysJobLog;
 import com.openhis.quartz.service.ISysJobLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 调度日志操作处理

openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/ISysJobLogService.java

@@ -1,9 +1,9 @@
 package com.openhis.quartz.service;
 
-import java.util.List;
-
 import com.core.quartz.domain.SysJobLog;
 
+import java.util.List;
+
 /**
  * 定时任务调度日志信息信息 服务层
  * 

openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/ISysJobService.java

@@ -1,11 +1,10 @@
 package com.openhis.quartz.service;
 
-import java.util.List;
-
-import org.quartz.SchedulerException;
-
 import com.core.common.exception.job.TaskException;
 import com.core.quartz.domain.SysJob;
+import org.quartz.SchedulerException;
+
+import java.util.List;
 
 /**
  * 定时任务调度信息信息 服务层

openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/impl/SysJobLogServiceImpl.java

@@ -1,13 +1,12 @@
 package com.openhis.quartz.service.impl;
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.core.quartz.domain.SysJobLog;
 import com.core.quartz.mapper.SysJobLogMapper;
 import com.openhis.quartz.service.ISysJobLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 定时任务调度日志信息 服务层

openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/impl/SysJobServiceImpl.java

@@ -1,17 +1,5 @@
 package com.openhis.quartz.service.impl;
 
-import java.util.List;
-
-import javax.annotation.PostConstruct;
-
-import org.quartz.JobDataMap;
-import org.quartz.JobKey;
-import org.quartz.Scheduler;
-import org.quartz.SchedulerException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.core.common.constant.ScheduleConstants;
 import com.core.common.exception.job.TaskException;
 import com.core.quartz.domain.SysJob;
@@ -19,6 +7,16 @@ import com.core.quartz.mapper.SysJobMapper;
 import com.core.quartz.util.CronUtils;
 import com.openhis.quartz.service.ISysJobService;
 import com.openhis.quartz.util.ScheduleUtils;
+import org.quartz.JobDataMap;
+import org.quartz.JobKey;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.PostConstruct;
+import java.util.List;
 
 /**
  * 定时任务调度信息 服务层

openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/AutoRollTask.java

@@ -3,14 +3,12 @@
  */
 package com.openhis.quartz.task;
 
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Component;
-
 import com.core.framework.config.TenantContext;
 import com.openhis.web.inhospitalnursestation.appservice.IEncounterAutoRollAppService;
-
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
 
 /**
  * 自动滚方定时任务（每日执行）

openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/ExampleTask.java

@@ -1,13 +1,11 @@
 package com.openhis.quartz.task;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.core.common.core.domain.R;
 import com.core.common.utils.DateUtils;
 import com.openhis.web.basedatamanage.appservice.IOrganizationAppService;
-
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 /**
  * 定时任务例子

openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/InventoryBackupTask.java

@@ -3,16 +3,6 @@
  */
 package com.openhis.quartz.task;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import javax.annotation.Resource;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.enums.DelFlag;
@@ -25,8 +15,15 @@ import com.openhis.document.service.IDocInventoryItemStaticService;
 import com.openhis.web.inventorymanage.appservice.IProductDetailAppService;
 import com.openhis.web.inventorymanage.dto.ProductDetailPageDto;
 import com.openhis.web.inventorymanage.dto.ProductDetailSearchParam;
-
 import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * 库存备份定时任务（每日执行）

openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/RyTask.java

@@ -1,15 +1,13 @@
 package com.openhis.quartz.task;
 
-import java.util.List;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Component;
-
 import com.core.common.utils.StringUtils;
 import com.core.framework.config.TenantContext;
 import com.openhis.administration.domain.Location;
 import com.openhis.administration.service.ILocationService;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 定时任务调度测试

openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/AbstractQuartzJob.java

@@ -1,13 +1,5 @@
 package com.openhis.quartz.util;
 
-import java.util.Date;
-
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.core.common.constant.Constants;
 import com.core.common.constant.ScheduleConstants;
 import com.core.common.utils.ExceptionUtil;
@@ -17,6 +9,13 @@ import com.core.common.utils.spring.SpringUtils;
 import com.core.quartz.domain.SysJob;
 import com.core.quartz.domain.SysJobLog;
 import com.openhis.quartz.service.ISysJobLogService;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Date;
 
 /**
  * 抽象quartz调用

openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/QuartzDisallowConcurrentExecution.java

@@ -1,10 +1,9 @@
 package com.openhis.quartz.util;
 
-import org.quartz.DisallowConcurrentExecution;
-import org.quartz.JobExecutionContext;
-
 import com.core.quartz.domain.SysJob;
 import com.core.quartz.util.JobInvokeUtil;
+import org.quartz.DisallowConcurrentExecution;
+import org.quartz.JobExecutionContext;
 
 /**
  * 定时任务处理（禁止并发执行）

openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/QuartzJobExecution.java

@@ -1,9 +1,8 @@
 package com.openhis.quartz.util;
 
-import org.quartz.JobExecutionContext;
-
 import com.core.quartz.domain.SysJob;
 import com.core.quartz.util.JobInvokeUtil;
+import org.quartz.JobExecutionContext;
 
 /**
  * 定时任务处理（允许并发执行）

openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/ScheduleUtils.java

@@ -1,7 +1,5 @@
 package com.openhis.quartz.util;
 
-import org.quartz.*;
-
 import com.core.common.constant.Constants;
 import com.core.common.constant.ScheduleConstants;
 import com.core.common.exception.job.TaskException;
@@ -10,6 +8,7 @@ import com.core.common.utils.StringUtils;
 import com.core.common.utils.spring.SpringUtils;
 import com.core.quartz.domain.SysJob;
 import com.core.quartz.util.CronUtils;
+import org.quartz.*;
 
 /**
  * 定时任务工具类

openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/ACmp.java

@@ -1,8 +1,7 @@
 package com.openhis.rule.component;
 
-import org.springframework.stereotype.Component;
-
 import com.yomahub.liteflow.core.NodeComponent;
+import org.springframework.stereotype.Component;
 
 @Component("a")
 public class ACmp extends NodeComponent {

openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/BCmp.java

@@ -1,8 +1,7 @@
 package com.openhis.rule.component;
 
-import org.springframework.stereotype.Component;
-
 import com.yomahub.liteflow.core.NodeComponent;
+import org.springframework.stereotype.Component;
 
 @Component("b")
 public class BCmp extends NodeComponent {

openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/CCmp.java

@@ -1,8 +1,7 @@
 package com.openhis.rule.component;
 
-import org.springframework.stereotype.Component;
-
 import com.yomahub.liteflow.core.NodeComponent;
+import org.springframework.stereotype.Component;
 
 @Component("c")
 public class CCmp extends NodeComponent {

openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/IInstrumentManageAppService.java

@@ -1,7 +1,6 @@
 package com.openhis.web.Inspection.appservice;
 
 import com.core.common.core.domain.R;
-import com.openhis.administration.domain.Device;
 import com.openhis.administration.domain.Instrument;
 import com.openhis.web.Inspection.dto.InstrumentSelParam;
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ILaboratoryManageAppService.java

@@ -2,8 +2,6 @@ package com.openhis.web.Inspection.appservice;
 
 import com.core.common.core.domain.R;
 import com.openhis.web.Inspection.dto.ReportResultManageDto;
-import com.openhis.web.Inspection.dto.SampleCollectManageDto;
-import com.openhis.web.Inspection.dto.SampleCollectStatusRequest;
 
 import javax.servlet.http.HttpServletRequest;
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/LisConfigManageAppServiceImpl.java

@@ -28,13 +28,11 @@ import com.openhis.web.datadictionary.dto.DiagnosisTreatmentDto;
 import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam;
 import com.openhis.web.datadictionary.mapper.ActivityDefinitionManageMapper;
 import lombok.RequiredArgsConstructor;
-import lombok.val;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/ObservationManageAppServiceImpl.java

@@ -4,7 +4,7 @@ package com.openhis.web.Inspection.appservice.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
-
+import com.core.common.enums.DelFlag;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.bean.BeanUtils;
 import com.openhis.administration.domain.ObservationDefinition;
@@ -12,7 +12,6 @@ import com.openhis.administration.mapper.ObservationDefinitionMapper;
 import com.openhis.administration.service.IInstrumentService;
 import com.openhis.administration.service.IObservationDefinitionService;
 import com.openhis.common.constant.PromptMsgConstant;
-import com.core.common.enums.DelFlag;
 import com.openhis.common.enums.ObservationType;
 import com.openhis.common.enums.PublicationStatus;
 import com.openhis.common.utils.EnumUtils;
@@ -22,8 +21,6 @@ import com.openhis.web.Inspection.appservice.IObservationManageAppService;
 import com.openhis.web.Inspection.dto.ObservationDefManageDto;
 import com.openhis.web.Inspection.dto.ObservationDefManageInitDto;
 import com.openhis.web.Inspection.dto.ObservationDefSelParam;
-
-
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/InstrumentController.java

@@ -1,8 +1,8 @@
 package com.openhis.web.Inspection.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.administration.domain.Instrument;
 import com.core.common.enums.DelFlag;
+import com.openhis.administration.domain.Instrument;
 import com.openhis.common.enums.PublicationStatus;
 import com.openhis.web.Inspection.appservice.IInstrumentManageAppService;
 import com.openhis.web.Inspection.dto.InstrumentSelParam;

openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/LaboratoryController.java

@@ -3,7 +3,6 @@ package com.openhis.web.Inspection.controller;
 import com.core.common.core.domain.R;
 import com.openhis.web.Inspection.appservice.ILaboratoryManageAppService;
 import com.openhis.web.Inspection.dto.ReportResultManageDto;
-import com.openhis.web.Inspection.dto.SampleCollectManageDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;

openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/ObservationDefController.java

@@ -1,8 +1,8 @@
 package com.openhis.web.Inspection.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.administration.domain.ObservationDefinition;
 import com.core.common.enums.DelFlag;
+import com.openhis.administration.domain.ObservationDefinition;
 import com.openhis.common.enums.PublicationStatus;
 import com.openhis.web.Inspection.appservice.IObservationManageAppService;
 import com.openhis.web.Inspection.dto.ObservationDefSelParam;
@@ -11,6 +11,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
 import javax.servlet.http.HttpServletRequest;
 
 /**

openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/SampleCollectController.java

@@ -1,7 +1,6 @@
 package com.openhis.web.Inspection.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.common.enums.PublicationStatus;
 import com.openhis.web.Inspection.appservice.ISampleCollectAppManageAppService;
 import com.openhis.web.Inspection.dto.SampleCollectManageDto;
 import com.openhis.web.Inspection.dto.SampleCollectStatusRequest;

openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/SpecimenDefController.java

@@ -1,8 +1,8 @@
 package com.openhis.web.Inspection.controller;
 
 import com.core.common.core.domain.R;
-import com.openhis.administration.domain.SpecimenDefinition;
 import com.core.common.enums.DelFlag;
+import com.openhis.administration.domain.SpecimenDefinition;
 import com.openhis.common.enums.PublicationStatus;
 import com.openhis.web.Inspection.appservice.ISpecimenManageAppService;
 import com.openhis.web.Inspection.dto.SpecimenDefSelParam;

openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentManageDto.java

@@ -1,16 +1,15 @@
 package com.openhis.web.Inspection.dto;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.openhis.common.annotation.Dict;
-
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * @Description 分页返回
  * @Author

openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentManageInitDto.java

@@ -3,7 +3,6 @@ package com.openhis.web.Inspection.dto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**

openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/LisConfigManageInitDto.java

@@ -1,11 +1,8 @@
 package com.openhis.web.Inspection.dto;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.openhis.administration.domain.DeviceDefinition;
 import com.openhis.administration.domain.ObservationDefinition;
 import com.openhis.administration.domain.SpecimenDefinition;
-import com.openhis.web.datadictionary.dto.DeviceManageDto;
-import com.openhis.web.datadictionary.dto.DiagnosisTreatmentDto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ReportResultManageDto.java

@@ -5,8 +5,6 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * @Description TODO
  * @Author

openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SampleCollectManageDto.java

@@ -1,14 +1,11 @@
 package com.openhis.web.Inspection.dto;
 
-import com.core.common.core.domain.entity.SysMenu;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 
 /**
  * @Description TODO

openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/appservice/IAdjustPriceService.java

@@ -1,13 +1,12 @@
 package com.openhis.web.adjustprice.appservice;
 
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
 import com.core.common.core.domain.R;
 import com.openhis.web.adjustprice.dto.AdjustPriceDataVo;
 import com.openhis.web.adjustprice.dto.AdjustPriceManagerSearchParam;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * Desc: 调价业务接口
  * 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/appservice/impl/AdjustPriceServiceImpl.java

@@ -1,16 +1,5 @@
 package com.openhis.web.adjustprice.appservice.impl;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
@@ -44,6 +33,15 @@ import com.openhis.workflow.dto.ActivityDto;
 import com.openhis.workflow.dto.AdjustPriceDto;
 import com.openhis.workflow.service.IActivityDefinitionService;
 import com.openhis.workflow.service.IInventoryItemService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * @ClassName AdjustPriceServiceImpl

openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/controller/ChangePriceDataListPageController.java

@@ -1,17 +1,15 @@
 package com.openhis.web.adjustprice.controller;
 
-import java.util.List;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.web.bind.annotation.*;
-
 import com.core.common.core.domain.R;
 import com.core.common.utils.StringUtils;
 import com.openhis.web.adjustprice.appservice.IAdjustPriceService;
 import com.openhis.web.adjustprice.dto.AdjustPriceDataVo;
 import com.openhis.web.adjustprice.dto.AdjustPriceManagerSearchParam;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * @ClassName ChangePriceListPageController

openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/AdjustPriceDataVo.java

@@ -1,9 +1,9 @@
 package com.openhis.web.adjustprice.dto;
 
-import java.math.BigDecimal;
-
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @ClassName AdjustPriceDataVo
  * @Description TODO

openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/AdjustPriceManagerSearchParam.java

@@ -1,12 +1,12 @@
 package com.openhis.web.adjustprice.dto;
 
-import java.util.Date;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.util.Date;
+
 /**
  * @ClassName AdjustPriceManagerSearchParam
  * @Description 改价管理 查询条件

openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/ChangePriceDataDto.java

@@ -1,13 +1,12 @@
 package com.openhis.web.adjustprice.dto;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * @ClassName ChangePricePageDto
  * @Description TODO

openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/ChangePricePageDto.java

@@ -1,14 +1,12 @@
 package com.openhis.web.adjustprice.dto;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.openhis.common.annotation.Dict;
-
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @ClassName ChangePricePageDto

openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/mapper/AdjustPriceMapper.java

@@ -1,15 +1,14 @@
 package com.openhis.web.adjustprice.mapper;
 
-import com.openhis.web.adjustprice.dto.ChangePriceDataDto;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Component;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.web.adjustprice.dto.ChangePriceDataDto;
 import com.openhis.web.adjustprice.dto.ChangePricePageDto;
 import com.openhis.web.inventorymanage.dto.InventorySearchParam;
 import com.openhis.web.inventorymanage.dto.ReceiptPageDto;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/SchedulePoolController.java

@@ -2,7 +2,6 @@ package com.openhis.web.appointmentmanage.controller;
 
 
 import com.core.common.core.domain.R;
-import com.openhis.appointmentmanage.domain.SchedulePool;
 import com.openhis.web.appointmentmanage.appservice.ISchedulePoolAppService;
 import com.openhis.web.appointmentmanage.dto.SchedulePoolDto;
 import org.springframework.web.bind.annotation.RequestBody;

openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/dto/SchedulePoolDto.java

@@ -1,8 +1,6 @@
 package com.openhis.web.appointmentmanage.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import lombok.experimental.Accessors;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IBodyStructureAppService.java

@@ -1,11 +1,10 @@
 package com.openhis.web.basedatamanage.appservice;
 
-import javax.servlet.http.HttpServletRequest;
-
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.openhis.web.basedatamanage.dto.BodyStructureDto;
-import com.openhis.web.basedatamanage.dto.OrganizationDto;
+
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * BodyStructure 应该服务类

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/ILocationAppService.java

@@ -1,12 +1,10 @@
 package com.openhis.web.basedatamanage.appservice;
 
-import javax.servlet.http.HttpServletRequest;
-
 import com.core.common.core.domain.R;
 import com.openhis.web.basedatamanage.dto.LocationAddOrEditDto;
 import com.openhis.web.basedatamanage.dto.LocationPageParam;
-import com.openhis.web.common.dto.LocationDto;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOrganizationAppService.java

@@ -1,11 +1,11 @@
 package com.openhis.web.basedatamanage.appservice;
 
-import javax.servlet.http.HttpServletRequest;
-
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.openhis.web.basedatamanage.dto.OrganizationDto;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * Organization 应该服务类
  */
@@ -15,11 +15,16 @@ public interface IOrganizationAppService {
      *
      * @param pageNo 当前页码
      * @param pageSize 查询条数
+     * @param name 科室名称
+     * @param typeEnum 科室类型
+     * @param classEnum 科室分类
+     * @param sortField 排序字段
+     * @param sortOrder 排序方向
      * @param request 请求数据
      * @return 机构树分页列表
      */
-    Page<OrganizationDto> getOrganizationTree(Integer pageNo, Integer pageSize, String sortField, String sortOrder,
-        HttpServletRequest request);
+    Page<OrganizationDto> getOrganizationTree(Integer pageNo, Integer pageSize, String name, Integer typeEnum, Integer classEnum,
+        String sortField, String sortOrder, HttpServletRequest request);
 
     /**
      * 机构信息详情

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOrganizationLocationAppService.java

@@ -1,11 +1,11 @@
 package com.openhis.web.basedatamanage.appservice;
 
-import javax.servlet.http.HttpServletRequest;
-
 import com.core.common.core.domain.R;
 import com.openhis.web.basedatamanage.dto.OrgLocQueryDto;
 import com.openhis.web.basedatamanage.dto.OrgLocQueryParam;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * Organization 应该服务类
  */

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IPractitionerRoleAppService.java

@@ -1,11 +1,11 @@
 package com.openhis.web.basedatamanage.appservice;
 
-import javax.servlet.http.HttpServletRequest;
-
 import com.core.common.core.domain.R;
 import com.openhis.web.basedatamanage.dto.PractRoleSearchParam;
 import com.openhis.web.basedatamanage.dto.PractitionerRoleDto;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * PractitionerRole 应该服务类
  */

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/BodyStructureAppServiceImpl.java

@@ -1,14 +1,5 @@
 package com.openhis.web.basedatamanage.appservice.impl;
 
-import java.util.*;
-import java.util.stream.Collectors;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
@@ -24,6 +15,13 @@ import com.openhis.common.enums.PublicationStatus;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.web.basedatamanage.appservice.IBodyStructureAppService;
 import com.openhis.web.basedatamanage.dto.BodyStructureDto;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class BodyStructureAppServiceImpl implements IBodyStructureAppService {

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/LocationAppServiceImpl.java

@@ -1,14 +1,5 @@
 package com.openhis.web.basedatamanage.appservice.impl;
 
-import java.util.*;
-import java.util.stream.Collectors;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -30,6 +21,13 @@ import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.web.basedatamanage.appservice.ILocationAppService;
 import com.openhis.web.basedatamanage.dto.*;
 import com.openhis.web.common.appservice.ICommonService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class LocationAppServiceImpl implements ILocationAppService {

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationAppServiceImpl.java

@@ -1,15 +1,6 @@
 package com.openhis.web.basedatamanage.appservice.impl;
 
-import java.lang.reflect.Field;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
@@ -27,6 +18,14 @@ import com.openhis.common.enums.OrganizationType;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.web.basedatamanage.appservice.IOrganizationAppService;
 import com.openhis.web.basedatamanage.dto.OrganizationDto;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Field;
+import java.util.*;
+import java.util.stream.Collectors;
 
 import static com.baomidou.mybatisplus.core.toolkit.StringUtils.camelToUnderline;
 
@@ -40,24 +39,27 @@ public class OrganizationAppServiceImpl implements IOrganizationAppService {
     private AssignSeqUtil assignSeqUtil;
 
     @Override
-    public Page<OrganizationDto> getOrganizationTree(Integer pageNo, Integer pageSize, String sortField,
-        String sortOrder, HttpServletRequest request) {
-        // 查询机构列表
+    public Page<OrganizationDto> getOrganizationTree(Integer pageNo, Integer pageSize, String name, Integer typeEnum, Integer classEnum,
+        String sortField, String sortOrder, HttpServletRequest request) {
+        // 创建查询条件
+        LambdaQueryWrapper<Organization> queryWrapper = new LambdaQueryWrapper<>();
+
+        // 添加查询条件
+        if (StringUtils.isNotEmpty(name)) {
+            queryWrapper.like(Organization::getName, name);
+        }
+        if (typeEnum != null) {
+            queryWrapper.eq(Organization::getTypeEnum, typeEnum);
+        }
+        if (classEnum != null) {
+            queryWrapper.eq(Organization::getClassEnum, classEnum);
+        }
+
         // 创建Page对象
         Page<Organization> page = new Page<>(pageNo, pageSize);
-        // 处理动态排序（仅当排序字段有效时才添加排序条件）
-        if (sortField != null && !sortField.isEmpty()) {
-            // 校验排序字段是否为Organization实体中的有效字段（防止非法字段）
-            if (isValidField(Organization.class, sortField)) {
-                // 驼峰转下划线处理
-                String underlineField = camelToUnderline(sortField);
-                // 默认为升序，若指定desc则按降序
-                boolean isAsc = sortOrder == null || "asc".equalsIgnoreCase(sortOrder);
-                page.addOrder(isAsc ? OrderItem.asc(underlineField) : OrderItem.desc(underlineField));
-            }
-        }
-        // 执行分页查询（此时排序条件会被应用）
-        page = organizationService.page(page);
+
+        // 执行分页查询
+        page = organizationService.page(page, queryWrapper);
 
         List<Organization> organizationList = page.getRecords();
         // 将机构列表转为树结构

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java

@@ -1,18 +1,5 @@
 package com.openhis.web.basedatamanage.appservice.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletRequest;
-
-import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.utils.DateTimeUtils;
-import com.openhis.workflow.mapper.ActivityDefinitionMapper;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
@@ -24,15 +11,26 @@ import com.openhis.administration.mapper.OrganizationLocationMapper;
 import com.openhis.administration.service.ILocationService;
 import com.openhis.administration.service.IOrganizationLocationService;
 import com.openhis.administration.service.IOrganizationService;
+import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.PromptMsgConstant;
 import com.openhis.common.enums.LocationForm;
 import com.openhis.common.enums.OrganizationType;
+import com.openhis.common.utils.DateTimeUtils;
 import com.openhis.common.utils.HisPageUtils;
 import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.web.basedatamanage.appservice.IOrganizationLocationAppService;
 import com.openhis.web.basedatamanage.dto.OrgLocInitDto;
 import com.openhis.web.basedatamanage.dto.OrgLocQueryDto;
 import com.openhis.web.basedatamanage.dto.OrgLocQueryParam;
+import com.openhis.workflow.mapper.ActivityDefinitionMapper;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class OrganizationLocationAppServiceImpl implements IOrganizationLocationAppService {

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerAppServiceImpl.java

@@ -1,14 +1,5 @@
 package com.openhis.web.basedatamanage.appservice.impl;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Service;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -39,6 +30,13 @@ import com.openhis.web.basedatamanage.dto.PractitionerRolesDto;
 import com.openhis.web.basedatamanage.dto.SelectableOrgDto;
 import com.openhis.web.basedatamanage.dto.UserAndPractitionerDto;
 import com.openhis.web.basedatamanage.mapper.PractitionerAppAppMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class PractitionerAppServiceImpl implements IPractitionerAppService {

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerRoleAppServiceImpl.java

@@ -1,14 +1,5 @@
 package com.openhis.web.basedatamanage.appservice.impl;
 
-import java.util.Arrays;
-import java.util.HashSet;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
@@ -22,6 +13,13 @@ import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.web.basedatamanage.appservice.IPractitionerRoleAppService;
 import com.openhis.web.basedatamanage.dto.PractRoleSearchParam;
 import com.openhis.web.basedatamanage.dto.PractitionerRoleDto;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.HashSet;
 
 @Service
 public class PractitionerRoleAppServiceImpl implements IPractitionerRoleAppService {

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/BodyStructureController.java

@@ -3,20 +3,18 @@
  */
 package com.openhis.web.basedatamanage.controller;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.MessageUtils;
 import com.openhis.common.constant.PromptMsgConstant;
 import com.openhis.web.basedatamanage.appservice.IBodyStructureAppService;
 import com.openhis.web.basedatamanage.dto.BodyStructureDto;
-
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * 身体部位管理controller

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/FrequencyController.java

@@ -10,11 +10,7 @@ import com.core.common.utils.MessageUtils;
 import com.openhis.administration.domain.Frequency;
 import com.openhis.administration.service.IFrequencyService;
 import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.web.basedatamanage.appservice.IOrganizationAppService;
 import com.openhis.web.basedatamanage.dto.FrequencyDto;
-import com.openhis.web.basedatamanage.dto.OrgLocQueryDto;
-import com.openhis.web.basedatamanage.dto.OrganizationDto;
-import com.openhis.web.basedatamanage.dto.OrganizationInitDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/LocationController.java

@@ -3,22 +3,18 @@
  */
 package com.openhis.web.basedatamanage.controller;
 
-import java.util.List;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-import com.openhis.web.common.dto.LocationDto;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
 import com.core.common.core.domain.R;
 import com.openhis.web.basedatamanage.appservice.ILocationAppService;
 import com.openhis.web.basedatamanage.dto.LocationAddOrEditDto;
 import com.openhis.web.basedatamanage.dto.LocationPageParam;
-
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * 位置管理Controller业务层处理

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java

@@ -3,11 +3,6 @@
  */
 package com.openhis.web.basedatamanage.controller;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.utils.MessageUtils;
@@ -15,9 +10,12 @@ import com.openhis.common.constant.PromptMsgConstant;
 import com.openhis.web.basedatamanage.appservice.IOrganizationAppService;
 import com.openhis.web.basedatamanage.dto.OrganizationDto;
 import com.openhis.web.basedatamanage.dto.OrganizationInitDto;
-
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * 机构管理controller
@@ -43,15 +41,24 @@ public class OrganizationController {
      *
      * @param pageNo 当前页码
      * @param pageSize 查询条数
+     * @param name 科室名称
+     * @param typeEnum 科室类型
+     * @param classEnum 科室分类
+     * @param sortField 排序字段
+     * @param sortOrder 排序方向
+     * @param request 请求对象
      * @return 机构分页列表
      */
     @GetMapping(value = "/organization")
     public R<?> getOrganizationPage(@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
         @RequestParam(value = "pageSize", defaultValue = "100") Integer pageSize,
+        @RequestParam(value = "name", required = false) String name,
+        @RequestParam(value = "typeEnum", required = false) Integer typeEnum,
+        @RequestParam(value = "classEnum", required = false) Integer classEnum,
         @RequestParam(value = "sortField", required = false) String sortField,
         @RequestParam(value = "sortOrder", required = false) String sortOrder, HttpServletRequest request) {
         Page<OrganizationDto> organizationTree =
-            iOrganizationAppService.getOrganizationTree(pageNo, pageSize, sortField, sortOrder, request);
+            iOrganizationAppService.getOrganizationTree(pageNo, pageSize, name, typeEnum, classEnum, sortField, sortOrder, request);
         return R.ok(organizationTree,
             MessageUtils.createMessage(PromptMsgConstant.Common.M00009, new Object[] {"机构信息"}));
     }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationLocationController.java

@@ -3,19 +3,17 @@
  */
 package com.openhis.web.basedatamanage.controller;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
 import com.core.common.core.domain.R;
 import com.openhis.web.basedatamanage.appservice.IOrganizationLocationAppService;
 import com.openhis.web.basedatamanage.dto.OrgLocQueryDto;
 import com.openhis.web.basedatamanage.dto.OrgLocQueryParam;
-
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * 机构位置关系controller

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerController.java

@@ -3,15 +3,13 @@
  */
 package com.openhis.web.basedatamanage.controller;
 
-import org.springframework.web.bind.annotation.*;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
 import com.openhis.web.basedatamanage.appservice.IPractitionerAppService;
 import com.openhis.web.basedatamanage.dto.UserAndPractitionerDto;
-
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 参与者 Controller业务层处理

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerRoleController.java

@@ -3,19 +3,17 @@
  */
 package com.openhis.web.basedatamanage.controller;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
 import com.core.common.core.domain.R;
 import com.openhis.web.basedatamanage.appservice.IPractitionerRoleAppService;
 import com.openhis.web.basedatamanage.dto.PractRoleSearchParam;
 import com.openhis.web.basedatamanage.dto.PractitionerRoleDto;
-
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * 岗位管理Controller业务层处理

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/BodyStructureDto.java

@@ -3,15 +3,14 @@
  */
 package com.openhis.web.basedatamanage.dto;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author liuhr
  * @date 2025-07-23

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationAddOrEditDto.java

@@ -5,11 +5,9 @@ package com.openhis.web.basedatamanage.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationDto.java

@@ -3,17 +3,15 @@
  */
 package com.openhis.web.basedatamanage.dto;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationInfoDto.java

@@ -6,7 +6,6 @@ package com.openhis.web.basedatamanage.dto;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.openhis.common.annotation.Dict;
-
 import lombok.Data;
 import lombok.experimental.Accessors;
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationInitDto.java

@@ -3,11 +3,11 @@
  */
 package com.openhis.web.basedatamanage.dto;
 
-import java.util.List;
-
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * 位置信息初始化dto
  *

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationPageParam.java

@@ -3,13 +3,12 @@
  */
 package com.openhis.web.basedatamanage.dto;
 
-import java.util.List;
-
-import javax.validation.constraints.NotEmpty;
-
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
 /**
  * 位置信息分页查询条件
  *

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocInitDto.java

@@ -3,14 +3,13 @@
  */
 package com.openhis.web.basedatamanage.dto;
 
-import java.util.List;
-
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * 科室位置关系初始化 dto
  *

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryDto.java

@@ -3,15 +3,14 @@
  */
 package com.openhis.web.basedatamanage.dto;
 
-import java.sql.Time;
-
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.openhis.common.annotation.Dict;
-
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.sql.Time;
+
 /**
  * @author
  * @date 2025-02-21

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryParam.java

@@ -3,11 +3,11 @@
  */
 package com.openhis.web.basedatamanage.dto;
 
-import java.io.Serializable;
-
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * 科室分页查询条件
  *

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationDto.java

@@ -3,15 +3,14 @@
  */
 package com.openhis.web.basedatamanage.dto;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.common.enums.OrganizationClass;
-
 import lombok.Data;
 import lombok.experimental.Accessors;
+import lombok.ToString;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author
@@ -59,6 +58,7 @@ public class OrganizationDto {
     private Integer displayOrder;
 
     /** 子集合 */
+    @ToString.Exclude
     private List<OrganizationDto> children = new ArrayList<>();
     
     /** 挂号科室标记 */

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationInitDto.java

@@ -3,14 +3,13 @@
  */
 package com.openhis.web.basedatamanage.dto;
 
-import java.util.List;
-
 import com.openhis.common.enums.OrganizationClass;
 import com.openhis.common.enums.OrganizationType;
-
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * 科室初始化 dto
  *

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractRoleSearchParam.java

@@ -3,11 +3,11 @@
  */
 package com.openhis.web.basedatamanage.dto;
 
-import java.io.Serializable;
-
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * 岗位分页查询条件
  *

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractSearchParam.java

@@ -3,11 +3,11 @@
  */
 package com.openhis.web.basedatamanage.dto;
 
-import java.io.Serializable;
-
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * 员工分页查询条件
  *

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerDto.java

@@ -3,16 +3,14 @@
  */
 package com.openhis.web.basedatamanage.dto;
 
-import java.util.Date;
-
-import javax.validation.constraints.NotBlank;
-
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
 /**
  * @author
  * @date 2025-02-21

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerOrgAndLocationDto.java

@@ -3,7 +3,6 @@ package com.openhis.web.basedatamanage.dto;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.openhis.common.annotation.Dict;
-
 import lombok.Data;
 import lombok.experimental.Accessors;
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRoleDto.java

@@ -3,15 +3,14 @@
  */
 package com.openhis.web.basedatamanage.dto;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 /**
  * @author
  * @date 2025-02-21

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRolesDto.java

@@ -2,7 +2,6 @@ package com.openhis.web.basedatamanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-
 import lombok.Data;
 import lombok.experimental.Accessors;
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/SelectableOrgDto.java

@@ -5,7 +5,6 @@ package com.openhis.web.basedatamanage.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-
 import lombok.Data;
 import lombok.experimental.Accessors;
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/UserAndPractitionerDto.java

@@ -1,15 +1,14 @@
 package com.openhis.web.basedatamanage.dto;
 
-import java.util.Date;
-import java.util.List;
-
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.openhis.common.annotation.Dict;
-
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 用户 及 参与者 dto
  */

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/mapper/PractitionerAppAppMapper.java

@@ -1,18 +1,17 @@
 package com.openhis.web.basedatamanage.mapper;
 
-import java.util.List;
-
-import com.openhis.web.basedatamanage.dto.SelectableOrgDto;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.openhis.web.basedatamanage.dto.PractitionerOrgAndLocationDto;
 import com.openhis.web.basedatamanage.dto.PractitionerRolesDto;
+import com.openhis.web.basedatamanage.dto.SelectableOrgDto;
 import com.openhis.web.basedatamanage.dto.UserAndPractitionerDto;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
 
 /**
  * 参与者 应用Mapper

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/controller/OutpatientNoSegmentController.java

@@ -11,8 +11,6 @@ import com.openhis.administration.service.IOutpatientNoSegmentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-
 /**
  * 门诊号码段管理控制器
  *

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java

@@ -3,18 +3,6 @@
  */
 package com.openhis.web.basicservice.controller;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -32,7 +20,6 @@ import com.openhis.administration.service.IHealthcareServiceService;
 import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.PromptMsgConstant;
 import com.openhis.common.enums.AccountStatus;
-import com.openhis.common.enums.AssignSeqEnum;
 import com.openhis.common.enums.PublicationStatus;
 import com.openhis.common.enums.Whether;
 import com.openhis.common.utils.EnumUtils;
@@ -40,9 +27,18 @@ import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.web.basicservice.dto.*;
 import com.openhis.web.basicservice.mapper.HealthcareServiceBizMapper;
 import com.openhis.yb.service.YbManager;
-
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 服务管理 controller

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/ChargeItemDefinitionFormData.java

@@ -1,6 +1,5 @@
 package com.openhis.web.basicservice.dto;
 
-import com.openhis.common.enums.PublicationStatus;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceDto.java

@@ -1,14 +1,13 @@
 package com.openhis.web.basicservice.dto;
 
-import java.math.BigDecimal;
-
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.openhis.common.annotation.Dict;
-
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
+
 /**
  * 服务管理 Dto
  */

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceFormData.java

@@ -1,9 +1,9 @@
 package com.openhis.web.basicservice.dto;
 
-import javax.validation.constraints.NotBlank;
-
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * 服务项目管理表单数据
  *

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/mapper/HealthcareServiceBizMapper.java

@@ -1,13 +1,12 @@
 package com.openhis.web.basicservice.mapper;
 
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.openhis.web.basicservice.dto.HealthcareServiceDto;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 /**
  * 服务管理 自定义Mapper

openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/appservice/ICatalogService.java

@@ -3,11 +3,7 @@
  */
 package com.openhis.web.catalogmanage.appservice;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
-import com.openhis.ybcatalog.domain.CatalogZySyndrome;
 
 import javax.servlet.http.HttpServletRequest;
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/controller/CatalogController.java

@@ -3,21 +3,19 @@
  */
 package com.openhis.web.catalogmanage.controller;
 
-import javax.servlet.http.HttpServletRequest;
-
+import com.core.common.annotation.Anonymous;
+import com.core.common.core.domain.R;
+import com.openhis.web.catalogmanage.appservice.ICatalogService;
+import com.openhis.web.ybmanage.config.YbServiceConfig;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.core.common.annotation.Anonymous;
-import com.core.common.core.domain.R;
-import com.openhis.web.catalogmanage.appservice.ICatalogService;
-import com.openhis.web.ybmanage.config.YbServiceConfig;
-
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * 医保目录

openhis-server-new/openhis-application/src/main/java/com/openhis/web/charge/patientcardrenewal/PatientCardRenewalController.java

@@ -1,14 +1,13 @@
 package com.openhis.web.charge.patientcardrenewal;
 
+import com.core.common.core.domain.R;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.core.common.core.domain.R;
-import lombok.extern.slf4j.Slf4j;
-
 /**
  * 患者换卡控制器
  * 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/charge/patientcardrenewal/PatientCardRenewalServiceImpl.java

@@ -1,17 +1,14 @@
 package com.openhis.web.charge.patientcardrenewal;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.openhis.administration.domain.PatientIdentifier;
+import com.openhis.administration.service.IPatientIdentifierService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
-import com.openhis.administration.domain.PatientIdentifier;
-import com.openhis.administration.service.IPatientIdentifierService;
-import com.openhis.common.enums.IdentifierStatusEnum;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-
-import lombok.extern.slf4j.Slf4j;
-
 import java.util.List;
 
 /**

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IInpatientChargeAppService.java

@@ -3,14 +3,13 @@
  */
 package com.openhis.web.chargemanage.appservice;
 
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
 import com.core.common.core.domain.R;
 import com.openhis.web.chargemanage.dto.EncounterPatientPageParam;
 import com.openhis.web.chargemanage.dto.EncounterPatientPrescriptionDto;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * 门诊收费 service
  *

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientChargeAppService.java

@@ -3,14 +3,13 @@
  */
 package com.openhis.web.chargemanage.appservice;
 
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
 import com.core.common.core.domain.R;
 import com.openhis.web.chargemanage.dto.EncounterPatientPageParam;
 import com.openhis.web.chargemanage.dto.EncounterPatientPrescriptionDto;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * 门诊收费 service
  *

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientPricingAppService.java

@@ -3,12 +3,12 @@
  */
 package com.openhis.web.chargemanage.appservice;
 
-import javax.servlet.http.HttpServletRequest;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.openhis.web.doctorstation.dto.AdviceBaseDto;
 import com.openhis.web.doctorstation.dto.PatientInfoDto;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * 门诊划价 service
  *

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRefundAppService.java

@@ -3,14 +3,13 @@
  */
 package com.openhis.web.chargemanage.appservice;
 
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
 import com.core.common.core.domain.R;
 import com.openhis.web.chargemanage.dto.EncounterPatientPageParam;
 import com.openhis.web.chargemanage.dto.RefundItemParam;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * 门诊退费 service
  *

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java

@@ -1,15 +1,17 @@
 package com.openhis.web.chargemanage.appservice;
 
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.openhis.web.basicservice.dto.HealthcareServiceDto;
-import com.openhis.web.chargemanage.dto.*;
+import com.openhis.web.chargemanage.dto.CurrentDayEncounterDto;
+import com.openhis.web.chargemanage.dto.OrgMetadata;
+import com.openhis.web.chargemanage.dto.PatientMetadata;
+import com.openhis.web.chargemanage.dto.PractitionerMetadata;
 import com.openhis.web.paymentmanage.dto.CancelRegPaymentDto;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * 门诊挂号 应用Service

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/InpatientChargeAppServiceImpl.java

@@ -3,16 +3,6 @@
  */
 package com.openhis.web.chargemanage.appservice.impl;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
@@ -31,6 +21,14 @@ import com.openhis.web.chargemanage.dto.EncounterPatientPageParam;
 import com.openhis.web.chargemanage.dto.EncounterPatientPrescriptionDto;
 import com.openhis.web.chargemanage.dto.OutpatientInitDto;
 import com.openhis.web.chargemanage.mapper.InpatientChargeAppMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
 
 /**
  * 门诊收费 impl

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientChargeAppServiceImpl.java

@@ -3,19 +3,6 @@
  */
 package com.openhis.web.chargemanage.appservice.impl;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
@@ -38,6 +25,17 @@ import com.openhis.web.chargemanage.dto.EncounterPatientPageParam;
 import com.openhis.web.chargemanage.dto.EncounterPatientPrescriptionDto;
 import com.openhis.web.chargemanage.dto.OutpatientInitDto;
 import com.openhis.web.chargemanage.mapper.OutpatientChargeAppMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
 
 /**
  * 门诊收费 impl

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java

@@ -3,11 +3,6 @@
  */
 package com.openhis.web.chargemanage.appservice.impl;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.stereotype.Service;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.openhis.common.enums.Whether;
 import com.openhis.web.chargemanage.appservice.IOutpatientPricingAppService;
@@ -16,7 +11,10 @@ import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService;
 import com.openhis.web.doctorstation.appservice.IDoctorStationMainAppService;
 import com.openhis.web.doctorstation.dto.AdviceBaseDto;
 import com.openhis.web.doctorstation.dto.PatientInfoDto;
+import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRefundAppServiceImpl.java

@@ -3,15 +3,6 @@
  */
 package com.openhis.web.chargemanage.appservice.impl;
 
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.stereotype.Service;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -43,6 +34,13 @@ import com.openhis.workflow.domain.ServiceRequest;
 import com.openhis.workflow.service.IDeviceDispenseService;
 import com.openhis.workflow.service.IDeviceRequestService;
 import com.openhis.workflow.service.IServiceRequestService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 门诊退费 impl