wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

style(flowable): 优化流程相关代码的import顺序和代码结构

Browse Source
This commit is contained in:
chenqi
2025-12-30 15:11:32 +08:00
parent 54cde91aac
commit d1670b79a0
2528 changed files with 7710 additions and 10794 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicSettleService.java
View File

@@ -1,7 +1,6 @@
package com.openhis.yb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.yb.domain.ClinicReg;
import com.openhis.yb.domain.ClinicSettle;
import java.util.List;

4
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicUnSettleService.java
View File

@@ -1,10 +1,10 @@
package com.openhis.yb.service;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.yb.domain.ClinicUnSettle;
import java.util.List;
/**
* 【请填写功能名称】Service接口
*

1
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientDischargeService.java
View File

@@ -5,7 +5,6 @@ package com.openhis.yb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.yb.domain.InpatientDischarge;
import com.openhis.yb.domain.InpatientReg;
/**
* 出院办理服务接口

1
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientFeeDetailService.java
View File

@@ -1,7 +1,6 @@
package com.openhis.yb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.yb.domain.InfoPerson;
import com.openhis.yb.domain.InpatientFeeDetail;
import java.util.List;

3
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientPreSettleService.java
View File

@@ -2,9 +2,6 @@ package com.openhis.yb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.yb.domain.InpatientPreSettle;
import com.openhis.yb.domain.InpatientSettle;
import java.util.List;
public interface IInpatientPreSettleService extends IService<InpatientPreSettle> {

1
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientRegInfoUpdateRecordeService.java
View File

@@ -4,7 +4,6 @@
package com.openhis.yb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.yb.domain.InpatientReg;
import com.openhis.yb.domain.InpatientRegInfoUpdateRecorde;
/**

1
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientRegService.java
View File

@@ -5,7 +5,6 @@ package com.openhis.yb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.yb.domain.InpatientReg;
import com.openhis.yb.domain.InventorySaleReturnRecord;
/**
* TODO:请概括描述当前接口的主要用途和注意事项

4
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientSettleService.java
View File

@@ -1,10 +1,10 @@
package com.openhis.yb.service;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.yb.domain.InpatientSettle;
import java.util.List;
public interface IInpatientSettleService extends IService<InpatientSettle> {
/**
* 根据医保结算id找到住院结算id

3
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IRegService.java
View File

@@ -1,11 +1,8 @@
package com.openhis.yb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.workflow.domain.SupplyRequest;
import com.openhis.yb.domain.ClinicReg;
import java.util.List;
/**
* 挂号管理-服务接口
*/

34
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbDao.java
View File

@@ -3,29 +3,12 @@
*/
package com.openhis.yb.service;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import javax.validation.constraints.NotNull;
import com.core.common.enums.DelFlag;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.enums.DelFlag;
import com.core.common.exception.ServiceException;
import com.core.common.utils.AssignSeqUtil;
import com.core.common.utils.DateUtils;
@@ -64,6 +47,21 @@ import com.openhis.yb.model.Clinic2207OrderModel;
import com.openhis.yb.model.Clinic2207OrderParam;
import com.openhis.yb.service.impl.DirectoryCheckRecordServiceImpl;
import com.openhis.yb.util.YbParamBuilderUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
* 医保表的增删改查接口

55
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbHttpUtils.java
View File

@@ -3,14 +3,26 @@
*/
package com.openhis.yb.service;
import static com.alibaba.fastjson2.JSON.parseObject;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.core.common.exception.ServiceException;
import com.core.common.utils.SecurityUtils;
import com.core.common.utils.StringUtils;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
import com.openhis.financial.domain.Contract;
import com.openhis.financial.service.IContractService;
import com.openhis.financial.service.impl.ContractServiceImpl;
import com.openhis.yb.domain.ClinicReg;
import com.openhis.yb.domain.InpatientReg;
import com.openhis.yb.dto.*;
import com.openhis.yb.model.Clinic2207OrderModel;
import com.openhis.yb.model.Clinic2207OrderParam;
import com.openhis.yb.util.YbParamBuilderUtil;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpPost;
@@ -33,26 +45,13 @@ import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.multipart.MultipartFile;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.core.common.exception.ServiceException;
import com.core.common.utils.SecurityUtils;
import com.core.common.utils.StringUtils;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
import com.openhis.financial.domain.Contract;
import com.openhis.financial.service.IContractService;
import com.openhis.financial.service.impl.ContractServiceImpl;
import com.openhis.yb.domain.ClinicReg;
import com.openhis.yb.domain.InpatientReg;
import com.openhis.yb.dto.*;
import com.openhis.yb.model.Clinic2207OrderModel;
import com.openhis.yb.model.Clinic2207OrderParam;
import com.openhis.yb.util.YbParamBuilderUtil;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import static com.alibaba.fastjson2.JSON.parseObject;
/**
* http请求接口

27
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbManager.java
View File

@@ -3,20 +3,6 @@
*/
package com.openhis.yb.service;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -63,6 +49,19 @@ import com.openhis.yb.model.OutpatientRegistrationModel;
import com.openhis.yb.service.impl.DirectoryCheckRecordServiceImpl;
import com.openhis.yb.util.CommonConstant;
import com.openhis.yb.util.YbParamBuilderUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
* 医保服务（与ybController方法一致，原定是ui触发医保controller，2025/05/05由于缺少ui资源，欲使用对应的业务controller直接触发医保服务，故将其下沉到Service层）

3
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicPreSettleServiceImpl.java
View File

@@ -1,12 +1,11 @@
package com.openhis.yb.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.yb.domain.ClinicPreSettle;
import com.openhis.yb.mapper.ClinicPreSettleMapper;
import com.openhis.yb.service.IClinicPreSettleService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* 【请填写功能名称】Service业务层处理
*

4
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicSettleServiceImpl.java
View File

@@ -1,14 +1,12 @@
package com.openhis.yb.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.openhis.yb.domain.ClinicReg;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.yb.domain.ClinicSettle;
import com.openhis.yb.mapper.ClinicSettleMapper;
import com.openhis.yb.service.IClinicSettleService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.List;
/**

5
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicUnRegServiceImpl.java
View File

@@ -1,12 +1,11 @@
package com.openhis.yb.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.yb.domain.ClinicUnReg;
import com.openhis.yb.mapper.ClinicUnRegMapper;
import com.openhis.yb.service.IClinicUnRegService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.yb.mapper.ClinicUnRegMapper;
/**
* 撤销挂号记录Service业务层处理

7
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicUnSettleServiceImpl.java
View File

@@ -1,15 +1,14 @@
package com.openhis.yb.service.impl;
import java.util.List;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.core.common.enums.DelFlag;
import com.openhis.yb.domain.ClinicUnSettle;
import com.openhis.yb.mapper.ClinicUnSettleMapper;
import com.openhis.yb.service.IClinicUnSettleService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 【请填写功能名称】Service业务层处理

3
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/DirectoryCheckRecordServiceImpl.java
View File

@@ -1,11 +1,10 @@
package com.openhis.yb.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.yb.domain.DirectoryCheckRecord;
import com.openhis.yb.mapper.DirectoryCheckRecordMapper;
import com.openhis.yb.service.IDirectoryCheckRecordService;
import org.springframework.stereotype.Service;
/**
* 医保Service业务层处理

3
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/FinancialApplyRecordServiceImpl.java
View File

@@ -1,11 +1,10 @@
package com.openhis.yb.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.yb.domain.FinancialApplyRecord;
import com.openhis.yb.mapper.FinancialApplyRecordMapper;
import com.openhis.yb.service.IFinancialApplyRecordService;
import org.springframework.stereotype.Service;
/**
* 医保财务申请记录Service业务层处理

3
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/FinancialReconcileRecordServiceImpl.java
View File

@@ -1,12 +1,11 @@
package com.openhis.yb.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.yb.domain.FinancialReconcileRecord;
import com.openhis.yb.mapper.FinancialReconcileRecordMapper;
import com.openhis.yb.service.IFinancialReconcileRecordService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* ybService业务层处理

8
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientPreSettleServiceImpl.java
View File

@@ -1,19 +1,11 @@
package com.openhis.yb.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.core.common.enums.DelFlag;
import com.openhis.common.constant.YbCommonConstants;
import com.openhis.yb.domain.InpatientPreSettle;
import com.openhis.yb.domain.InpatientSettle;
import com.openhis.yb.mapper.InpatientPreSettleMapper;
import com.openhis.yb.mapper.InpatientSettleMapper;
import com.openhis.yb.service.IInpatientPreSettleService;
import com.openhis.yb.service.IInpatientSettleService;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class InpatientPreSettleServiceImpl extends ServiceImpl<InpatientPreSettleMapper, InpatientPreSettle>
implements IInpatientPreSettleService {

3
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientRegInfoUpdateRecordeServiceImpl.java
View File

@@ -4,11 +4,8 @@
package com.openhis.yb.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.yb.domain.InpatientDischarge;
import com.openhis.yb.domain.InpatientRegInfoUpdateRecorde;
import com.openhis.yb.mapper.InpatientDischargeMapper;
import com.openhis.yb.mapper.InpatientRegInfoUpdateRecordeMapper;
import com.openhis.yb.service.IInpatientDischargeService;
import com.openhis.yb.service.IInpatientRegInfoUpdateRecordeService;
import org.springframework.stereotype.Service;

9
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientSettleServiceImpl.java
View File

@@ -1,16 +1,15 @@
package com.openhis.yb.service.impl;
import java.util.List;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.common.constant.YbCommonConstants;
import com.core.common.enums.DelFlag;
import com.openhis.common.constant.YbCommonConstants;
import com.openhis.yb.domain.InpatientSettle;
import com.openhis.yb.mapper.InpatientSettleMapper;
import com.openhis.yb.service.IInpatientSettleService;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class InpatientSettleServiceImpl extends ServiceImpl<InpatientSettleMapper, InpatientSettle>

3
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryChangeRecordServiceImpl.java
View File

@@ -1,11 +1,10 @@
package com.openhis.yb.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.yb.domain.InventoryChangeRecord;
import com.openhis.yb.mapper.InventoryChangeRecordMapper;
import com.openhis.yb.service.IInventoryChangeRecordService;
import org.springframework.stereotype.Service;
/**
* 库存信息变更记录Service业务层处理

3
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryCheckRecordServiceImpl.java
View File

@@ -1,11 +1,10 @@
package com.openhis.yb.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.yb.domain.InventoryCheckRecord;
import com.openhis.yb.mapper.InventoryCheckRecordMapper;
import com.openhis.yb.service.IInventoryCheckRecordService;
import org.springframework.stereotype.Service;
/**
* 库存盘点记录Service业务层处理

3
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryDelRecordServiceImpl.java
View File

@@ -1,11 +1,10 @@
package com.openhis.yb.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.yb.domain.InventoryDelRecord;
import com.openhis.yb.mapper.InventoryDelRecordMapper;
import com.openhis.yb.service.IInventoryDelRecordService;
import org.springframework.stereotype.Service;
/**
* 库存删除记录Service业务层处理

3
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryPurchaseRecordServiceImpl.java
View File

@@ -1,11 +1,10 @@
package com.openhis.yb.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.yb.domain.InventoryPurchaseRecord;
import com.openhis.yb.mapper.InventoryPurchaseRecordMapper;
import com.openhis.yb.service.IInventoryPurchaseRecordService;
import org.springframework.stereotype.Service;
/**
* 库存采购/退货记录Service业务层处理

3
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryPurchaseReturnRecordServiceImpl.java
View File

@@ -1,11 +1,10 @@
package com.openhis.yb.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.yb.domain.InventoryPurchaseReturnRecord;
import com.openhis.yb.mapper.InventoryPurchaseReturnRecordMapper;
import com.openhis.yb.service.IInventoryPurchaseReturnRecordService;
import org.springframework.stereotype.Service;
/**
* 采购/退货记录Service业务层处理

3
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventorySaleRecordServiceImpl.java
View File

@@ -1,11 +1,10 @@
package com.openhis.yb.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.yb.domain.InventorySaleRecord;
import com.openhis.yb.mapper.InventorySaleRecordMapper;
import com.openhis.yb.service.IInventorySaleRecordService;
import org.springframework.stereotype.Service;
/**
* 销售/退货记录Service业务层处理

3
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventorySaleReturnRecordServiceImpl.java
View File

@@ -1,11 +1,10 @@
package com.openhis.yb.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.yb.domain.InventorySaleReturnRecord;
import com.openhis.yb.mapper.InventorySaleReturnRecordMapper;
import com.openhis.yb.service.IInventorySaleReturnRecordService;
import org.springframework.stereotype.Service;
/**
* 销售/退货记录Service业务层处理

4
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/PerinfoServiceImpl.java
View File

@@ -5,11 +5,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.core.common.exception.ServiceException;
import com.core.common.utils.StringUtils;
import com.openhis.common.constant.YbCommonConstants;
import com.openhis.financial.domain.Contract;
import com.openhis.yb.domain.InfoPerson;
import com.openhis.yb.service.IPerinfoService;
import com.openhis.yb.mapper.PerinfoMapper;
import com.openhis.yb.service.IPerinfoService;
import org.springframework.stereotype.Service;
/**

6
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/RegServiceImpl.java
View File

@@ -2,15 +2,11 @@ package com.openhis.yb.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.workflow.domain.SupplyRequest;
import com.openhis.yb.service.IRegService;
import com.openhis.yb.domain.ClinicReg;
import com.openhis.yb.mapper.RegMapper;
import com.openhis.yb.service.IRegService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 挂号管理-服务
*/

3
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/SignServiceImpl.java
View File

@@ -1,10 +1,9 @@
package com.openhis.yb.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.yb.service.ISignService;
import com.openhis.yb.domain.Sign;
import com.openhis.yb.mapper.SignMapper;
import com.openhis.yb.service.ISignService;
import org.springframework.stereotype.Service;
/**