Merge branch 'master-prod-new' into master-fwq抽奖配置

fwq

2023-10-07 9f6e37f3d6320fa5b3f4f30bc9bd7c357eeb96e7

Merge branch 'master-prod-new' into master-fwq抽奖配置

 phis-download-feign/.gitignore

New file
@@ -0,0 +1,26 @@
# Compiled class file
*.class

# Log file
*.log

# BlueJ files
*.ctxt

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar
*.iml

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
/target/
/.idea/

 phis-download-feign/pom.xml

New file
@@ -0,0 +1,63 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>

    <groupId>com.hz</groupId>
    <artifactId>phis-download-feign</artifactId>
    <version>1.0-SNAPSHOT</version>
    <packaging>jar</packaging>

    <parent>
        <groupId>com.hz</groupId>
        <artifactId>phis-service-feign</artifactId>
        <version>1.0-SNAPSHOT</version>
    </parent>

    <dependencies>

        <dependency>
            <groupId>com.hx.gitee</groupId>
            <artifactId>hx-common</artifactId>
            <version>1.0-SNAPSHOT</version>
        </dependency>

        <dependency>
            <groupId>com.github.ulisesbocchio</groupId>
            <artifactId>jasypt-spring-boot-starter</artifactId>
        </dependency>

        <!--openfeign的支持-->
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-openfeign</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
        </dependency>

    </dependencies>

    <build>
       <!-- <finalName>cases_common</finalName>-->
        <resources>
            <resource>
                <directory>src/main/java</directory>
                <includes>
                    <include>**/*.xml</include>
                </includes>
                <filtering>false</filtering>
            </resource>
            <resource>
                <directory>src/main/resources</directory>
                <includes>
                    <include>**/*.xml</include>
                </includes>
            </resource>
        </resources>

    </build>

</project>

 phis-download-feign/src/main/java/com/hz/his/dto/DActivityDto.java

New file
@@ -0,0 +1,14 @@
package com.hz.his.dto;


import com.hz.his.dto.common.DCommonDto;
import lombok.Data;

/**
 * 活动
 **/
@Data
public class DActivityDto extends DCommonDto {


}

 phis-download-feign/src/main/java/com/hz/his/dto/DAppointDto.java

New file
@@ -0,0 +1,34 @@
package com.hz.his.dto;

import com.hz.his.dto.common.DCommonDto;
import lombok.Data;

/**
 * @author fwq
 * 导出预约Dto
 */
@Data
public class DAppointDto extends DCommonDto {

    private String startTime;
    private String endTime;
    private String shopId;
    private String doctorId;
    private String keyWord;
    private String corpUserName;
    private String doctorName;
    private String type;
    private Integer orderType;
    private Integer isMicApprove;
    private String projectName;
    private String userLevel;
    private String field;
    private String id;
    private String userId;
    private String roleId;
    private String corpUserId;
    private String createCuName;
    private String channelType;
    private String chatCorpName;
    private String appType;
}

 phis-download-feign/src/main/java/com/hz/his/dto/DCardDto.java

New file
@@ -0,0 +1,14 @@
package com.hz.his.dto;


import com.hz.his.dto.common.DCommonDto;
import lombok.Data;

/**
 * 卡项
 **/
@Data
public class DCardDto extends DCommonDto {


}

 phis-download-feign/src/main/java/com/hz/his/dto/DComplaintDto.java

New file
@@ -0,0 +1,14 @@
package com.hz.his.dto;


import com.hz.his.dto.common.DCommonDto;
import lombok.Data;

/**
 * 投诉记录
 **/
@Data
public class DComplaintDto extends DCommonDto {


}

 phis-download-feign/src/main/java/com/hz/his/dto/DConsultationDto.java

New file
@@ -0,0 +1,96 @@
package com.hz.his.dto;


import com.hz.his.dto.common.DCommonDto;
import lombok.Data;

/**
 * 咨询记录
 **/
@Data
public class DConsultationDto extends DCommonDto {
    // 记录id 继承dto已存在
    private String id;

    // 门店/诊所ID
    private String shopId;
    // 科室编码
    private String departmentCode;
    // 科室名称
    private String departmentName;

    /**咨询类型*/
    private Integer consultType;
    // 咨询方式代码 字典表
    private String methodCode;
    // 咨询方式名称
    private String methodCodeName;

    // 咨询项目 - ID列表
    private String neededProjectIds;
    // 推荐项目 - ID列表
    private String recommendedProjectIds;
    // 关注活动 - ID列表
    private String focusActivitiesIds;
    // 潜在项目 - ID列表
    private String potentialProjectIds;

    // 未成交原因
    private String description;
    // 咨询内容
    private String content;
    // 备注
    private String remark;
    // 是否愿意上门
    private Integer isCanCome = 0;
    // 是否到访
    private Integer isVisit = 0;
    // 是否付款
    private Integer isPay = 0;
    // 是否草稿
    private Integer isDraft = 0;

    // 页码
    private Integer pageNum;
    // 页数
    private Integer pageSize;
    // 用户名称
    private String userName;
    // 员工角色
    private String roleId;

    // 咨询师
    private String hisCorpUserId;
    // 电网咨询师
    private String internetCorpUserId;
    // 客服
    private String chatCorpUserId;
    // 创建人
    private String createEmployeeId;
    // 创建人部门
    private String createEmployeePartId;
    // 关注活动
    private String focusActivityId;
    // 咨询项目
    private String neededProjectTypeId;
    // 潜在项目
    private String potentialProjectTypeId;
    // 推荐项目
    private String recommendedProjectId;
    // 客户来源渠道分类
    private String channelsTypeId;
    // 客户来源一级渠道
    private String channelId;
    // 客户来源二级渠道
    private String channel2Id;
    // 到访类型
    private String recentVisitType;
    // 到访状态
    private Integer recentVisitStatus;
    // 是否成交
    private Integer isMakeADeal;
    // 客户成交标签
    private String isMakeADealLabel;


}

 phis-download-feign/src/main/java/com/hz/his/dto/DConsumablesDto.java

New file
@@ -0,0 +1,14 @@
package com.hz.his.dto;


import com.hz.his.dto.common.DCommonDto;
import lombok.Data;

/**
 * 商品-药品
 **/
@Data
public class DConsumablesDto extends DCommonDto {


}

 phis-download-feign/src/main/java/com/hz/his/dto/DCouponDto.java

New file
@@ -0,0 +1,22 @@
package com.hz.his.dto;


import com.hz.his.dto.common.DCommonDto;
import lombok.Data;

import java.util.Date;

/**
 * 优惠券码
 **/
@Data
public class DCouponDto extends DCommonDto {
    private String couponId;
    private Date startCollectionTime;
    private Date endCollectionTime;
    private Integer isUse;
    private String couponCostDepartment;
    private Integer isReceive;


}

 phis-download-feign/src/main/java/com/hz/his/dto/DDeductionDto.java

New file
@@ -0,0 +1,32 @@
package com.hz.his.dto;


import com.hz.his.dto.common.DCommonDto;
import lombok.Data;

import java.util.Date;

/**
 * 执行记录
 **/
@Data
public class DDeductionDto extends DCommonDto {
    private Integer status;
    private String shopId;
    private String departmentCode;
    private String projectName;
    private String hisProjectName;
    private Integer drugsType;
    private String userId;
    private String roleId;
    private String recordNo;
    private String treatSingleNo;
    private String belongDoctor;
    private String belongNurse;
    private String belongAdviser;
    private String userShopId;
    private String deShopId;
    private Date startRescindedTime;
    private Date endRescindedTime;

}

 phis-download-feign/src/main/java/com/hz/his/dto/DDeviceDto.java

New file
@@ -0,0 +1,13 @@
package com.hz.his.dto;


import com.hz.his.dto.common.DCommonDto;
import lombok.Data;

/**
 * 设备
 **/
@Data
public class DDeviceDto extends DCommonDto {

}

 phis-download-feign/src/main/java/com/hz/his/dto/DDoctorTimeDto.java

New file
@@ -0,0 +1,17 @@
package com.hz.his.dto;

import com.hz.his.dto.common.DCommonDto;
import lombok.Data;

/**
 * 医生排班
 * @USER: fhx
 * @DATE: 2023/9/19
 **/
@Data
public class DDoctorTimeDto extends DCommonDto {

    private String shopId;
    private String monthStr;
    private String doctorId;
}

 phis-download-feign/src/main/java/com/hz/his/dto/DEmployeeDto.java

New file
@@ -0,0 +1,16 @@
package com.hz.his.dto;

import com.hz.his.dto.common.DCommonDto;
import lombok.Data;

/**
 * @author fwq
 * 导出员工Dto
 */
@Data
public class DEmployeeDto extends DCommonDto {
    private Integer isJob;
    private Integer isPerformanceEmp;
    private String roleUniqueStr;

}

 phis-download-feign/src/main/java/com/hz/his/dto/DFirstTreatCardDto.java

New file
@@ -0,0 +1,13 @@
package com.hz.his.dto;


import com.hz.his.dto.common.DCommonDto;
import lombok.Data;

/**
 * 初诊卡
 **/
@Data
public class DFirstTreatCardDto extends DCommonDto {

}

 phis-download-feign/src/main/java/com/hz/his/dto/DMedicalRecordDto.java

New file
@@ -0,0 +1,14 @@
package com.hz.his.dto;


import com.hz.his.dto.common.DCommonDto;
import lombok.Data;

/**
 * 电子病历
 **/
@Data
public class DMedicalRecordDto extends DCommonDto {


}

 phis-download-feign/src/main/java/com/hz/his/dto/DMoneyLogDto.java

New file
@@ -0,0 +1,13 @@
package com.hz.his.dto;


import com.hz.his.dto.common.DCommonDto;
import lombok.Data;

/**
 * 金额变动
 **/
@Data
public class DMoneyLogDto extends DCommonDto {

}

 phis-download-feign/src/main/java/com/hz/his/dto/DOrderDto.java

New file
@@ -0,0 +1,47 @@
package com.hz.his.dto;


import com.hz.his.dto.common.DCommonDto;
import lombok.Data;

/**
 * 订单
 **/
@Data
public class DOrderDto extends DCommonDto {

    private Integer status;
    private String orderNo;
    private String type;
    private Integer owe;
    private String projectName;
    private String operationName;
    private String developerName;
    private String employeeName;
    private String phisOrderNo;
    private String prescriptionNo;
    private String appIdCode;
    private String sourceName;
    private String sourceOrderNo;
    private Integer applyStatus;
    private Integer payStatus;
    private Integer refundStatus;
    private Integer isCustomerConfirm;
    private Integer isOldBringNew;
    private Integer isBothTheOne;
    private String channelName;
    private String inviteeName;
    private String userInviteeName;
    private String userChannelName;
    private String shopName;
    private String departmentName;
    private String doctorName;
    private String hisCorpUserName;
    private String userName;
    private String shopIds;
    private String roleUniqueStr;
    private String userStatus;
    private String userLevel;
    private String internetCorpUserId;
    private String internetCorpUserName;
}

 phis-download-feign/src/main/java/com/hz/his/dto/DPayDetailDto.java

New file
@@ -0,0 +1,13 @@
package com.hz.his.dto;


import com.hz.his.dto.common.DCommonDto;
import lombok.Data;

/**
 * 收款明细
 **/
@Data
public class DPayDetailDto extends DCommonDto {

}

 phis-download-feign/src/main/java/com/hz/his/dto/DPrescriptionDto.java

New file
@@ -0,0 +1,13 @@
package com.hz.his.dto;

import com.hz.his.dto.common.DCommonDto;
import lombok.Data;

/**
 * 电子处方
 **/
@Data
public class DPrescriptionDto extends DCommonDto {


}

 phis-download-feign/src/main/java/com/hz/his/dto/DProjectSkuDto.java

New file
@@ -0,0 +1,17 @@
package com.hz.his.dto;


import com.hz.his.dto.common.DCommonDto;
import lombok.Data;

/**
 * 项目SKU
 **/
@Data
public class DProjectSkuDto extends DCommonDto {

    private String name;
    private Integer enable;


}

 phis-download-feign/src/main/java/com/hz/his/dto/DPromotionDto.java

New file
@@ -0,0 +1,14 @@
package com.hz.his.dto;


import com.hz.his.dto.common.DCommonDto;
import lombok.Data;

/**
 * 促销
 **/
@Data
public class DPromotionDto extends DCommonDto {


}

 phis-download-feign/src/main/java/com/hz/his/dto/DRefundDto.java

New file
@@ -0,0 +1,18 @@
package com.hz.his.dto;


import com.hz.his.dto.common.DCommonDto;
import lombok.Data;

/**
 * 退款单
 **/
@Data
public class DRefundDto extends DCommonDto {

    private String shopId;
    private String sourceType;
    private Integer status;
    private String roleId;

}

 phis-download-feign/src/main/java/com/hz/his/dto/DReturnVisitDto.java

New file
@@ -0,0 +1,40 @@
package com.hz.his.dto;


import com.hz.his.dto.common.DCommonDto;
import lombok.Data;

import java.util.Date;

/**
 * 到访记录
 **/
@Data
public class DReturnVisitDto extends DCommonDto {

    private String userId;
    private Date planStartTime;
    private Date planEndTime;
    private Date returnVisitStartTime;
    private Date returnVisitEndTime;
    private Date doneStartTime;
    private Date doneEndTime;
    private String returnVisitType;
    private String returnVisitPlan;
    private String returnVisitMethod;
    private Integer returnVisitStatus;
    private Integer doneStatus;
    private Integer timeoutStatus;
    private Integer visitResultStatus;
    private Integer satisfiedStatus;
    private String shopId;
    private String roleId;
    private String createPersonName;
    private String channelType;
    private String createPersonId;
    private String visitPersonId;
    private String corpId;
    private String corpName;
    private String shopIds;

}

 phis-download-feign/src/main/java/com/hz/his/dto/DTelLogDto.java

New file
@@ -0,0 +1,13 @@
package com.hz.his.dto;


import com.hz.his.dto.common.DCommonDto;
import lombok.Data;

/**
 * 通话记录变动
 **/
@Data
public class DTelLogDto extends DCommonDto {

}

 phis-download-feign/src/main/java/com/hz/his/dto/DTreatSingleDto.java

New file
@@ -0,0 +1,40 @@
package com.hz.his.dto;


import com.hz.his.dto.common.DCommonDto;
import lombok.Data;

import java.util.List;

/**
 * 治疗单
 **/
@Data
public class DTreatSingleDto extends DCommonDto {

    //用户id
    private String userId;
    //类型
    private Integer type;
    //治疗单号
    private String treatSingleNo;
    //操作人
    private String operatorName;
    //护士名称
    private String nurseName;
    //医生名称
    private String doctorName;
    //是否划扣
    private Integer isDeduct;
    //创建时间
    private String createTime;
    //门店id
    private String shopId;
    //是否分配治疗
    private Integer isPerTreat;
    //到访订单id
    private String visitOrderId;
    //门店id
    private List<String> shopIdList;

}

 phis-download-feign/src/main/java/com/hz/his/dto/DTurnDto.java

New file
@@ -0,0 +1,32 @@
package com.hz.his.dto;


import com.hz.his.dto.common.DCommonDto;
import lombok.Data;

/**
 * 转赠
 **/
@Data
public class DTurnDto extends DCommonDto {

    // 转增人门店id
    private String shopId;
    // 转增人id
    private String turnId;
    // 转增人
    private String giveAway;
    // 受赠人id
    private String doneeId;
    // 受赠人
    private String donated;
    // 角色id
    private String roleId;
    // 类型
    private String type;
    //受赠人门店ID
    private String doneeShopId;
    //订单号
    private String orderNo;

}

 phis-download-feign/src/main/java/com/hz/his/dto/DVisitOrderDto.java

New file
@@ -0,0 +1,21 @@
package com.hz.his.dto;


import com.hz.his.dto.common.DCommonDto;
import lombok.Data;

/**
 * 到访订单(导医)
 **/
@Data
public class DVisitOrderDto extends DCommonDto {

    private String doctorName;
    private String userName;
    private String adviserName;
    private String nurseName;
    private String shopId;
    private String status;


}

 phis-download-feign/src/main/java/com/hz/his/dto/DVisitRecordDto.java

New file
@@ -0,0 +1,21 @@
package com.hz.his.dto;


import com.hz.his.dto.common.DCommonDto;
import lombok.Data;

/**
 * 到访记录
 **/
@Data
public class DVisitRecordDto extends DCommonDto {

    private String shopId;
    private String preTypeName;
    private String doctorName;
    private String nurseName;
    private String adviserName;
    private Integer status;
    private String inShopSql;

}

 phis-download-feign/src/main/java/com/hz/his/dto/common/DCommonDto.java

New file
@@ -0,0 +1,51 @@
package com.hz.his.dto.common;

import lombok.Data;

import java.util.List;

/**
 * @author fwq
 */
@Data
public class DCommonDto {
    /**操作人标识*/
    private String operateId;
    /**操作人名称*/
    private String operateMan;
    /**操作人门店标识*/
    private String opShopId;
    /**操作人门店名称*/
    private String opShopName;
    /**操作人角色标识(EmployeeRole)*/
    private String opRoleId;
    /**操作人角色字符串*/
    private String opRoleStr;
    /**操作人角色名称*/
    private String opRoleName;
    /**备注*/
    private String opRemark;


    /**开始时间*/
    private String startTime;
    /**结束时间*/
    private String endTime;

    /**搜索关键字*/
    private String searchData;
    /**搜索关键字*/
    private String keyWord;

    /**用户标识*/
    private String userId;
    /**用户信息关键字*/
    private String userKeyWord;
    /**用户标识*/
    private List<String> userIdList;
    /**门店标识*/
    private List<String> shopIdList;
    /**员工标识*/
    private List<String> employeeIdList;

}

 phis-download-feign/src/main/java/com/hz/his/dto/common/PageDto.java

New file
@@ -0,0 +1,101 @@
package com.hz.his.dto.common;


import lombok.Data;

import java.util.List;

/**
 * @author ChenJiaHe
 * 分页扩展类*/
@Data
public class PageDto {
    /**标识*/
    private String id;
    /**当前页数*/
    private Integer pageNum;
    /**当前页显示条数*/
    private Integer pageSize;
    /**关键字*/
    private String keyWord;
    /**上级标识*/
    private String parentId;
    /**分类标识*/
    private String typeId;
    private List<String> typeIdList;
    //appid
    private String appId;


    public Integer getPageNum() {
        if(this.pageNum == null || this.pageNum < 0){
            this.pageNum = 1;
        }
        return this.pageNum;
    }

    public Integer getPageNum(Integer pageNum) {
        if(pageNum != null){
            this.pageNum = pageNum;
        }else{
            this.pageNum = getPageNum();
        }
        return this.pageNum;
    }

    public void setPageNum(Integer pageNum) {
        this.pageNum = pageNum;
    }

    public Integer getPageSize() {
        if(this.pageSize == null || this.pageSize < 0 || this.pageSize > 800){
            this.pageSize = 800;
        }
        return this.pageSize;
    }

    public Integer getPageSize(Integer pageSize) {
        if(pageSize != null){
            this.pageSize = pageSize;
        }else{
            this.pageSize = getPageSize();
        }
        return this.pageSize;
    }

    public void setPageSize(Integer pageSize) {
        this.pageSize = pageSize;
    }

    public String getKeyWord() {
        return keyWord;
    }

    public void setKeyWord(String keyWord) {
        this.keyWord = keyWord;
    }

    public String getParentId() {
        return parentId;
    }

    public void setParentId(String parentId) {
        this.parentId = parentId;
    }

    public String getTypeId() {
        return typeId;
    }

    public void setTypeId(String typeId) {
        this.typeId = typeId;
    }

    public String getAppId() {
        return appId;
    }

    public void setAppId(String appId) {
        this.appId = appId;
    }
}

 phis-download-feign/src/main/java/com/hz/his/dto/user/DUserChangeLogDto.java

New file
@@ -0,0 +1,13 @@
package com.hz.his.dto.user;


import com.hz.his.dto.common.DCommonDto;
import lombok.Data;

/**
 * 用户记录变动
 **/
@Data
public class DUserChangeLogDto extends DCommonDto {

}

 phis-download-feign/src/main/java/com/hz/his/dto/user/DUserDto.java

New file
@@ -0,0 +1,744 @@
package com.hz.his.dto.user;


import com.hz.his.dto.common.DCommonDto;

import java.util.List;

/**
 * 用户
 **/
public class DUserDto{
    /**操作人标识*/
    private String operateId;
    /**操作人名称*/
    private String operateMan;
    /**操作人门店标识*/
    private String opShopId;
    /**操作人门店名称*/
    private String opShopName;
    /**操作人角色标识(EmployeeRole)*/
    private String opRoleId;
    /**操作人角色字符串*/
    private String opRoleStr;
    /**操作人角色名称*/
    private String opRoleName;
    /**备注*/
    private String opRemark;


    /**开始时间*/
    private String startTime;
    /**结束时间*/
    private String endTime;

    /**搜索关键字*/
    private String searchData;
    /**搜索关键字*/
    private String keyWord;

    /**用户标识*/
    private String userId;
    /**用户信息关键字*/
    private String userKeyWord;
    /**用户标识*/
    private List<String> userIdList;
    /**门店标识*/
    private List<String> shopIdList;
    /**员工标识*/
    private List<String> employeeIdList;
    private List<DUserTagDto> userTagInfo;

    private Integer appType;

    private String userStatus;
    private String hisCorpUserId;
    private String hisCorpUserName;
    private String shopId;
    private String shopName;

    private String cIq;

    private String cStartTime;
    private String cEndTime;

    private String userLevel;

    private String startBirthDay;
    private String endBirthDay;

    private String creator;

    private String userType;



    private Integer gender;

    private Integer startAge;
    private Integer endAge;

    private String channelType;
    private String channelId;

    private String cuName;

    private String userRole;

    private String startReturnVisitTime;
    private String endReturnVisitTime;

    private String startFirstTime;
    private String endFirstTime;

    private String startlatelyTime;
    private String endlatelyTime;

    private String startFirstPayTime;
    private String endFirstPayTime;

    private String startLastPayTime;
    private String endLastPayTime;

    private Integer isComeShop;

    private Integer isConsume;

    private Integer isBindCRMTime;

    private Integer isBindSTTime;

    private Integer isBindGZHTime;

    private String country;
    private String province;
    private String city;
    private String area;

    private String inviteeId;
    private String inviteeName;

    private String tmkName;
    private String doctorNme;

    private String noBugProject;
    private String bugProject;
    private String executeProjectType;
    private String bugProjectType;

    private String consultationProject;
    private String consultationProjectType;

    private String notUseProject;

    private String userCardName;

    private Integer expectedLossDay;

    private Integer isPretriageCard;

    private String indication1;
    private String indication2;
    private Integer indicationLevel;


    public String getOperateId() {
        return operateId;
    }

    public void setOperateId(String operateId) {
        this.operateId = operateId;
    }

    public String getOperateMan() {
        return operateMan;
    }

    public void setOperateMan(String operateMan) {
        this.operateMan = operateMan;
    }

    public String getOpShopId() {
        return opShopId;
    }

    public void setOpShopId(String opShopId) {
        this.opShopId = opShopId;
    }

    public String getOpShopName() {
        return opShopName;
    }

    public void setOpShopName(String opShopName) {
        this.opShopName = opShopName;
    }

    public String getOpRoleId() {
        return opRoleId;
    }

    public void setOpRoleId(String opRoleId) {
        this.opRoleId = opRoleId;
    }

    public String getOpRoleStr() {
        return opRoleStr;
    }

    public void setOpRoleStr(String opRoleStr) {
        this.opRoleStr = opRoleStr;
    }

    public String getOpRoleName() {
        return opRoleName;
    }

    public void setOpRoleName(String opRoleName) {
        this.opRoleName = opRoleName;
    }

    public String getOpRemark() {
        return opRemark;
    }

    public void setOpRemark(String opRemark) {
        this.opRemark = opRemark;
    }

    public String getStartTime() {
        return startTime;
    }

    public void setStartTime(String startTime) {
        this.startTime = startTime;
    }

    public String getEndTime() {
        return endTime;
    }

    public void setEndTime(String endTime) {
        this.endTime = endTime;
    }

    public String getSearchData() {
        return searchData;
    }

    public void setSearchData(String searchData) {
        this.searchData = searchData;
    }

    public String getKeyWord() {
        return keyWord;
    }

    public void setKeyWord(String keyWord) {
        this.keyWord = keyWord;
    }

    public String getUserId() {
        return userId;
    }

    public void setUserId(String userId) {
        this.userId = userId;
    }

    public String getUserKeyWord() {
        return userKeyWord;
    }

    public void setUserKeyWord(String userKeyWord) {
        this.userKeyWord = userKeyWord;
    }

    public List<String> getUserIdList() {
        return userIdList;
    }

    public void setUserIdList(List<String> userIdList) {
        this.userIdList = userIdList;
    }

    public List<String> getShopIdList() {
        return shopIdList;
    }

    public void setShopIdList(List<String> shopIdList) {
        this.shopIdList = shopIdList;
    }

    public List<String> getEmployeeIdList() {
        return employeeIdList;
    }

    public void setEmployeeIdList(List<String> employeeIdList) {
        this.employeeIdList = employeeIdList;
    }

    public List<DUserTagDto> getUserTagInfo() {
        return userTagInfo;
    }

    public void setUserTagInfo(List<DUserTagDto> userTagInfo) {
        this.userTagInfo = userTagInfo;
    }

    public Integer getAppType() {
        return appType;
    }

    public void setAppType(Integer appType) {
        this.appType = appType;
    }

    public String getUserStatus() {
        return userStatus;
    }

    public void setUserStatus(String userStatus) {
        this.userStatus = userStatus;
    }

    public String getHisCorpUserId() {
        return hisCorpUserId;
    }

    public void setHisCorpUserId(String hisCorpUserId) {
        this.hisCorpUserId = hisCorpUserId;
    }

    public String getHisCorpUserName() {
        return hisCorpUserName;
    }

    public void setHisCorpUserName(String hisCorpUserName) {
        this.hisCorpUserName = hisCorpUserName;
    }

    public String getShopId() {
        return shopId;
    }

    public void setShopId(String shopId) {
        this.shopId = shopId;
    }

    public String getShopName() {
        return shopName;
    }

    public void setShopName(String shopName) {
        this.shopName = shopName;
    }

    public String getcIq() {
        return cIq;
    }

    public void setcIq(String cIq) {
        this.cIq = cIq;
    }

    public String getcStartTime() {
        return cStartTime;
    }

    public void setcStartTime(String cStartTime) {
        this.cStartTime = cStartTime;
    }

    public String getcEndTime() {
        return cEndTime;
    }

    public void setcEndTime(String cEndTime) {
        this.cEndTime = cEndTime;
    }

    public String getUserLevel() {
        return userLevel;
    }

    public void setUserLevel(String userLevel) {
        this.userLevel = userLevel;
    }

    public String getStartBirthDay() {
        return startBirthDay;
    }

    public void setStartBirthDay(String startBirthDay) {
        this.startBirthDay = startBirthDay;
    }

    public String getEndBirthDay() {
        return endBirthDay;
    }

    public void setEndBirthDay(String endBirthDay) {
        this.endBirthDay = endBirthDay;
    }

    public String getCreator() {
        return creator;
    }

    public void setCreator(String creator) {
        this.creator = creator;
    }

    public String getUserType() {
        return userType;
    }

    public void setUserType(String userType) {
        this.userType = userType;
    }

    public Integer getGender() {
        return gender;
    }

    public void setGender(Integer gender) {
        this.gender = gender;
    }

    public Integer getStartAge() {
        return startAge;
    }

    public void setStartAge(Integer startAge) {
        this.startAge = startAge;
    }

    public Integer getEndAge() {
        return endAge;
    }

    public void setEndAge(Integer endAge) {
        this.endAge = endAge;
    }

    public String getChannelType() {
        return channelType;
    }

    public void setChannelType(String channelType) {
        this.channelType = channelType;
    }

    public String getChannelId() {
        return channelId;
    }

    public void setChannelId(String channelId) {
        this.channelId = channelId;
    }

    public String getCuName() {
        return cuName;
    }

    public void setCuName(String cuName) {
        this.cuName = cuName;
    }

    public String getUserRole() {
        return userRole;
    }

    public void setUserRole(String userRole) {
        this.userRole = userRole;
    }

    public String getStartReturnVisitTime() {
        return startReturnVisitTime;
    }

    public void setStartReturnVisitTime(String startReturnVisitTime) {
        this.startReturnVisitTime = startReturnVisitTime;
    }

    public String getEndReturnVisitTime() {
        return endReturnVisitTime;
    }

    public void setEndReturnVisitTime(String endReturnVisitTime) {
        this.endReturnVisitTime = endReturnVisitTime;
    }

    public String getStartFirstTime() {
        return startFirstTime;
    }

    public void setStartFirstTime(String startFirstTime) {
        this.startFirstTime = startFirstTime;
    }

    public String getEndFirstTime() {
        return endFirstTime;
    }

    public void setEndFirstTime(String endFirstTime) {
        this.endFirstTime = endFirstTime;
    }

    public String getStartlatelyTime() {
        return startlatelyTime;
    }

    public void setStartlatelyTime(String startlatelyTime) {
        this.startlatelyTime = startlatelyTime;
    }

    public String getEndlatelyTime() {
        return endlatelyTime;
    }

    public void setEndlatelyTime(String endlatelyTime) {
        this.endlatelyTime = endlatelyTime;
    }

    public String getStartFirstPayTime() {
        return startFirstPayTime;
    }

    public void setStartFirstPayTime(String startFirstPayTime) {
        this.startFirstPayTime = startFirstPayTime;
    }

    public String getEndFirstPayTime() {
        return endFirstPayTime;
    }

    public void setEndFirstPayTime(String endFirstPayTime) {
        this.endFirstPayTime = endFirstPayTime;
    }

    public String getStartLastPayTime() {
        return startLastPayTime;
    }

    public void setStartLastPayTime(String startLastPayTime) {
        this.startLastPayTime = startLastPayTime;
    }

    public String getEndLastPayTime() {
        return endLastPayTime;
    }

    public void setEndLastPayTime(String endLastPayTime) {
        this.endLastPayTime = endLastPayTime;
    }

    public Integer getIsComeShop() {
        return isComeShop;
    }

    public void setIsComeShop(Integer isComeShop) {
        this.isComeShop = isComeShop;
    }

    public Integer getIsConsume() {
        return isConsume;
    }

    public void setIsConsume(Integer isConsume) {
        this.isConsume = isConsume;
    }

    public Integer getIsBindCRMTime() {
        return isBindCRMTime;
    }

    public void setIsBindCRMTime(Integer isBindCRMTime) {
        this.isBindCRMTime = isBindCRMTime;
    }

    public Integer getIsBindSTTime() {
        return isBindSTTime;
    }

    public void setIsBindSTTime(Integer isBindSTTime) {
        this.isBindSTTime = isBindSTTime;
    }

    public Integer getIsBindGZHTime() {
        return isBindGZHTime;
    }

    public void setIsBindGZHTime(Integer isBindGZHTime) {
        this.isBindGZHTime = isBindGZHTime;
    }

    public String getCountry() {
        return country;
    }

    public void setCountry(String country) {
        this.country = country;
    }

    public String getProvince() {
        return province;
    }

    public void setProvince(String province) {
        this.province = province;
    }

    public String getCity() {
        return city;
    }

    public void setCity(String city) {
        this.city = city;
    }

    public String getArea() {
        return area;
    }

    public void setArea(String area) {
        this.area = area;
    }

    public String getInviteeId() {
        return inviteeId;
    }

    public void setInviteeId(String inviteeId) {
        this.inviteeId = inviteeId;
    }

    public String getInviteeName() {
        return inviteeName;
    }

    public void setInviteeName(String inviteeName) {
        this.inviteeName = inviteeName;
    }

    public String getTmkName() {
        return tmkName;
    }

    public void setTmkName(String tmkName) {
        this.tmkName = tmkName;
    }

    public String getDoctorNme() {
        return doctorNme;
    }

    public void setDoctorNme(String doctorNme) {
        this.doctorNme = doctorNme;
    }

    public String getNoBugProject() {
        return noBugProject;
    }

    public void setNoBugProject(String noBugProject) {
        this.noBugProject = noBugProject;
    }

    public String getBugProject() {
        return bugProject;
    }

    public void setBugProject(String bugProject) {
        this.bugProject = bugProject;
    }

    public String getExecuteProjectType() {
        return executeProjectType;
    }

    public void setExecuteProjectType(String executeProjectType) {
        this.executeProjectType = executeProjectType;
    }

    public String getBugProjectType() {
        return bugProjectType;
    }

    public void setBugProjectType(String bugProjectType) {
        this.bugProjectType = bugProjectType;
    }

    public String getConsultationProject() {
        return consultationProject;
    }

    public void setConsultationProject(String consultationProject) {
        this.consultationProject = consultationProject;
    }

    public String getConsultationProjectType() {
        return consultationProjectType;
    }

    public void setConsultationProjectType(String consultationProjectType) {
        this.consultationProjectType = consultationProjectType;
    }

    public String getNotUseProject() {
        return notUseProject;
    }

    public void setNotUseProject(String notUseProject) {
        this.notUseProject = notUseProject;
    }

    public String getUserCardName() {
        return userCardName;
    }

    public void setUserCardName(String userCardName) {
        this.userCardName = userCardName;
    }

    public Integer getExpectedLossDay() {
        return expectedLossDay;
    }

    public void setExpectedLossDay(Integer expectedLossDay) {
        this.expectedLossDay = expectedLossDay;
    }

    public Integer getIsPretriageCard() {
        return isPretriageCard;
    }

    public void setIsPretriageCard(Integer isPretriageCard) {
        this.isPretriageCard = isPretriageCard;
    }

    public String getIndication1() {
        return indication1;
    }

    public void setIndication1(String indication1) {
        this.indication1 = indication1;
    }

    public String getIndication2() {
        return indication2;
    }

    public void setIndication2(String indication2) {
        this.indication2 = indication2;
    }

    public Integer getIndicationLevel() {
        return indicationLevel;
    }

    public void setIndicationLevel(Integer indicationLevel) {
        this.indicationLevel = indicationLevel;
    }
}

 phis-download-feign/src/main/java/com/hz/his/dto/user/DUserTagDto.java

New file
@@ -0,0 +1,17 @@
package com.hz.his.dto.user;


import com.alibaba.fastjson.JSONObject;
import lombok.Data;

import java.util.List;

/**
 * 用户
 **/
@Data
public class DUserTagDto {
    private String tagName;
    private String tagTypeId;

}

 phis-download-feign/src/main/java/com/hz/his/feign/download/DFileDownloadService.java

New file
@@ -0,0 +1,135 @@
package com.hz.his.feign.download;

import com.hx.resultTool.Result;
import com.hz.his.dto.*;
import com.hz.his.dto.user.DUserChangeLogDto;
import com.hz.his.dto.user.DUserDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * PHIS-下载中心
 */
@FeignClient(name="phi-download-service",path = "/phis-download",contextId = "d-phi-download")
public interface DFileDownloadService {

    /**导出类型-底表-预约数据*/

    /**导出类型-底表-医生排班*/

    /**导出类型-底表-优惠券*/
    @PostMapping(value = "/report/export/coupon/list")
    Result exportCoupon(@RequestBody DCouponDto dCouponDto);
    /**导出类型-底表-优惠券码*/
    @PostMapping(value = "/report/export/coupon/number/list")
    Result exportCouponNumber(@RequestBody DCouponDto dCouponDto);
    /**导出类型-底表-划扣记录*/
    @PostMapping(value = "/report/export/deduction/list")
    Result exportDeduction(@RequestBody DDeductionDto dDeductionDto);
    /**导出类型-底表-员工数据*/
    @PostMapping(value = "/report/export/employee/list")
    Result exportEmployee(@RequestBody DEmployeeDto dEmployeeDto);
    /**导出类型-底表-员工角色数据*/
    @PostMapping(value = "/report/export/employee/role/list")
    Result exportEmployeeRole(@RequestBody DEmployeeDto dEmployeeDto);
    /**导出类型-底表-概览订单数据*/
    @PostMapping(value = "/report/export/order/list")
    Result exportOrder(@RequestBody DOrderDto dOrderDto);
    /**导出类型-底表-明细订单数据*/
    @PostMapping(value = "/report/export/order/detail/list")
    Result exportOrderDetail(@RequestBody DOrderDto dOrderDto);
    /**导出类型-底表-药妆订单数据*/
    @PostMapping(value = "/report/export/order/drug/list")
    Result exportOrderDrug(@RequestBody DOrderDto dOrderDto);
    /**导出类型-底表-收款记录*/
    @PostMapping(value = "/report/export/pay/detail/list")
    Result exportPayDetail(@RequestBody DPayDetailDto dPayDetailDto);
    /**导出类型-底表-项目分类*/
    @PostMapping(value = "/report/export/project/type/list")
    Result exportProjectType(@RequestBody DProjectSkuDto dProjectSkuDto);
    /**导出类型-底表-项目SKU*/
    @PostMapping(value = "/report/export/project/sku/list")
    Result exportProjectSku(@RequestBody DProjectSkuDto dProjectSkuDto);
    /**导出类型-底表-项目SPU*/
    @PostMapping(value = "/report/export/project/spu/list")
    Result exportProjectSpu(@RequestBody DProjectSkuDto dProjectSkuDto);
    /**导出类型-底表-预约项目*/
    @PostMapping(value = "/report/export/project/sku/appoint/list")
    Result exportProjectSkuAppoint(@RequestBody DProjectSkuDto dProjectSkuDto);
    /**导出类型-底表-退款记录*/
    @PostMapping(value = "/report/export/refund/list")
    Result exportRefund(@RequestBody DRefundDto dRefundDto);
    /**导出类型-底表-治疗通知单*/
    @PostMapping(value = "/report/export/treat/list")
    Result exportTreat(@RequestBody DTreatSingleDto dTreatSingleDto);
    /**导出类型-底表-导医订单*/
    @PostMapping(value = "/report/export/guide/visit/order/list")
    Result exportGuideOrder(@RequestBody DVisitOrderDto dVisitOrderDto);
    /**导出类型-底表-到访记录*/
    @PostMapping(value = "/report/export/visit/record/list")
    Result exportVisitRecord(@RequestBody DVisitRecordDto dVisitRecordDto);
    /**导出类型-底表-回访记录*/
    @PostMapping(value = "/report/export/return/visit/list")
    Result exportReturnVisit(@RequestBody DReturnVisitDto dReturnVisitDto);
    /**导出类型-底表-初诊卡信息*/
    @PostMapping(value = "/report/export/user/first/treat/card/list")
    Result exportFirstTreatCard(@RequestBody DFirstTreatCardDto dFirstTreatCardDto);
    /**导出类型-底表-设备*/
    @PostMapping(value = "/report/export/device/list")
    Result exportDevice(@RequestBody DDeviceDto dDeviceDto);
    /**导出类型-底表-储值金变动记录*/
    @PostMapping(value = "/report/export/money/log/store/list")
    Result exportStore(@RequestBody DMoneyLogDto dMoneyLogDto);
    /**导出类型-底表-增值金变动记录*/
    @PostMapping(value = "/report/export/money/log/increment/list")
    Result exportIncrement(@RequestBody DMoneyLogDto dMoneyLogDto);
    /**导出类型-底表-积分变动记录*/
    @PostMapping(value = "/report/export/money/log/integral/list")
    Result exportIntegral(@RequestBody DMoneyLogDto dMoneyLogDto);
    /**导出类型-底表-通话记录*/
    @PostMapping(value = "/report/export/tel/log/list")
    Result exportTelLog(@RequestBody DTelLogDto dTelLogDto);
    /**导出类型-底表-等级变化*/
    @PostMapping(value = "/report/export/user/change/log/level/list")
    Result exportLevelChange(@RequestBody DUserChangeLogDto dUserChangeLogDto);
    /**导出类型-底表-顾问变化*/
    @PostMapping(value = "/report/export/user/change/log/adviser/list")
    Result exportAdviserChange(@RequestBody DUserChangeLogDto dUserChangeLogDto);
    /**导出类型-底表-状态变化*/
    @PostMapping(value = "/report/export/user/change/log/status/list")
    Result exportStatusChange(@RequestBody DUserChangeLogDto dUserChangeLogDto);
    /**导出类型-底表-投诉记录*/
    @PostMapping(value = "/report/export/complaint/list")
    Result exportComplaint(@RequestBody DComplaintDto dComplaintDto);
    /**导出类型-底表-咨询记录*/
    @PostMapping(value = "/report/export/consultation/list")
    Result exportConsultation(@RequestBody DConsultationDto dConsultationDto);
    /**导出类型-底表-促销*/
    @PostMapping(value = "/report/export/promotion/list")
    Result exportPromotion(@RequestBody DPromotionDto dPromotionDto);
    /**导出类型-底表-卡项*/
    @PostMapping(value = "/report/export/card/list")
    Result exportCard(@RequestBody DCardDto dCardDto);
    /**导出类型-底表-活动*/
    @PostMapping(value = "/report/export/activity/list")
    Result exportActivity(@RequestBody DActivityDto dActivityDto);
    /**导出类型-底表-用户数据*/
    @PostMapping(value = "/report/export/user/list")
    Result exportUser(@RequestBody DUserDto dUserDto);
    /**导出类型-底表-转赠数据*/
    @PostMapping(value = "/report/export/user/turn/list")
    Result exportTurn(@RequestBody DTurnDto dTurnDto);
    /**导出类型-底表-商品-药品数据*/
    @PostMapping(value = "/report/export/consumables/list")
    Result exportConsumables(@RequestBody DConsumablesDto dConsumablesDto);
    /**导出类型-底表-电子处方*/
    @PostMapping(value = "/report/export/treat/prescription/list")
    Result exportPrescription(@RequestBody DPrescriptionDto dPrescriptionDto);
    /**导出类型-底表-电子病历*/
    @PostMapping(value = "/report/export/treat/medical/list")
    Result exportMedical(@RequestBody DMedicalRecordDto dMedicalRecordDto);



}

 phis-feign/src/main/java/com/hz/his/constant/PayWay.java

New file
@@ -0,0 +1,14 @@
package com.hz.his.constant;

/**支付方式*/
public class PayWay {

    /**交易方式-微信*/
    public static final String PAY_WAY_WECHAT = "WECHAT";
    /**交易方式-支付宝*/
    public static final String PAY_WAY_ALIPAY = "ALIPAY";
    /**交易方式-银联*/
    public static final String PAY_WAY_UNIONPAY = "UNIONPAY";
    /**交易方式-数字人民币*/
    public static final String PAY_WAYE_EC = "EC";
}

 phis-feign/src/main/java/com/hz/his/dto/activity/ActivityLimitDto.java

@@ -1,8 +1,14 @@
package com.hz.his.dto.activity;


import com.fasterxml.jackson.annotation.JsonFormat;
import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import com.hz.his.dto.PageDto;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;

/**
 * 限制
@@ -13,4 +19,8 @@
    private String id;
    /**用户标识*/
    private String userId;

    private Date limitStartTime;

    private Date limitEndTime;
}

 phis-feign/src/main/java/com/hz/his/dto/activityData/ActivityReportDto.java

New file
@@ -0,0 +1,38 @@
package com.hz.his.dto.activityData;

import com.hz.his.dto.PageDto;
import lombok.Data;

/**
 * 升单报表dto
 * @USER: fhx
 * @DATE: 2023/9/25
 **/
@Data
public class ActivityReportDto extends PageDto {

    /** 报告id */
    private String reportId;
    /** 用户名 */
    private String name;
    /** 渠道 */
    private String channel;
    /** 渠道 */
    private String channelName;
    /** 渠道 */
    private String channelName2;
    /** 营销项目名称 */
    private String marketProjectName;
    /** 咨询师名称 */
    private String consultName;
    /** 医生名称 */
    private String doctorName;
    //开始时间
    private String startTime;
    //结束时间
    private String endTime;
    /** 操作人标识 */
    private String operatorId;
    /** 操作人 */
    private String operatorName;
}

 phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java

@@ -35,6 +35,16 @@
    /** 到访订单id(门店助手使用统计使用) */
    private String visitOrderId;

    /**数据类型(AppearanceConstants)*/
    private Integer dataType;

    /** 短期规划 */
    private String shortPlan;
    /** 中期规划 */
    private String middlePlan;
    /** 长期规划 */
    private String longPlan;

    public AppearanceDto() {
    }


 phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelDto.java

@@ -23,6 +23,8 @@
    private String labelInfoName;
    /**颜色*/
    private String color;
    /** 其他信息 */
    private AppearanceLabelInfoDto labelInfo;

    public AppearanceLabelDto() {
    }

 phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelInfoDto.java

New file
@@ -0,0 +1,26 @@
package com.hz.his.dto.appearance;

import lombok.Data;

/**
 * @USER: fhx
 * @DATE: 2023/8/29
 **/
@Data
public class AppearanceLabelInfoDto {

    /** 适应症程度(0无1轻2中3重) */
    private Integer indDegree;
    /** 剂量单位 */
    private String doseUnit;
    /** 建议治疗剂量 */
    private String treatDose;
    /** 项目诉求分类标识(AppealType) */
    private String appealTypeId;
    //格式：[{'appealTypeId':'123', 'name':'白', 'parentId':'123'},....]
    /** 项目诉求分类数组json */
    private String appealTypeJson;

    public AppearanceLabelInfoDto() {
    }
}

 phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java

New file
@@ -0,0 +1,576 @@
package com.hz.his.dto.consultation;

import com.fasterxml.jackson.annotation.JsonInclude;

import java.util.Date;
import java.util.List;
import java.util.Map;


/**
 * 咨询记录dto 新版
 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public class ConsultRecordDto{

    //用户id
    private String userId;
    //门店/诊所ID
    private String shopId;
    //咨询类型 0=标准（旧版） 1=初诊 2=复诊
    private Integer consultType;
    //满意度 0=不满意 1=一般 2=满意
    private Integer satisfie;
    //面诊医生id
    private String faceDoctorId;
    //治疗医生id
    private String treatDoctorId;
    //基本信息
    private String content;
    //主要诉求
    private String appealDetail;
    //治疗方案&报价
    private String treatPlanQuote;
    //剂量参数
    private String dosageParams;
    //既往病史
    private String anamnesis;
    //来院前治疗过的项目
    private String hasTreatProjects;
    //是否草稿 0=否 1=是
    private Integer isDraft;
    //创建人类型 0=员工 1=后台
    private Integer adminType;
    //创建人id
    private String adminId;
    //创建人名称
    private String adminName;
    //面诊方案
    private String facePlan;
    //创建时间
    private Date createTime;
    //本次治疗项目 多个逗号分割
    private String treatProjectIds;
    //推荐项目 多个逗号分割
    private String recommendProjectIds;
    //上次治疗医生ID
    private String lastTreatDoctorId;
    //上次治疗项目json字符串 ["项目ID","项目ID"]
    private String lastTreatProjects;
    //咨询方式代码
    private String methodCode;
    //咨询方式名称
    private String methodCodeName;

    //------------- 修改传值
    private String id;


    //------------- 详情返回
    //治疗医生名称
    private String faceDoctorName;
    //治疗医生名称
    private String treatDoctorName;
    //上次治疗医生名称
    private String lastTreatDoctorName;

    //------------ 详情返回值补充
    //治疗项目
    private List<Map<String,Object>> treatProjectList;
    //推荐项目
    private List<Map<String,Object>> recommendProjectList;
    //上次治疗项目
    private List<Map<String,Object>> lastTreatProjectList;


    //-------------- 搜索条件
    //小程序搜索时 有个页面是需要传时间的
    @JsonInclude(JsonInclude.Include.NON_NULL)
    private String startTime;
    @JsonInclude(JsonInclude.Include.NON_NULL)
    private String endTime;

    //搜索条件
    //用户名查找
    @JsonInclude(JsonInclude.Include.NON_NULL)
    private String userName;
    //客户来源渠道分类
    @JsonInclude(JsonInclude.Include.NON_NULL)
    private String channelsTypeId;
    //客户来源一级渠道
    @JsonInclude(JsonInclude.Include.NON_NULL)
    private String channelId;
    //客户来源二级渠道
    @JsonInclude(JsonInclude.Include.NON_NULL)
    private String channel2Id;
    //咨询师
    @JsonInclude(JsonInclude.Include.NON_NULL)
    private String hisCorpUserId;
    //用户顾问名称
    private String hisCorpUserName;
    //手机号
    private String tel;
    //电网咨询师
    @JsonInclude(JsonInclude.Include.NON_NULL)
    private String internetCorpUserId;
    //客服
    @JsonInclude(JsonInclude.Include.NON_NULL)
    private String chatCorpUserId;
    //创建人
    @JsonInclude(JsonInclude.Include.NON_NULL)
    private String createEmployeeId;
    //创建人部门
    @JsonInclude(JsonInclude.Include.NON_NULL)
    private String createEmployeePartId;
    //关注活动
    @JsonInclude(JsonInclude.Include.NON_NULL)
    private String focusActivityId;
    //到访类型
    @JsonInclude(JsonInclude.Include.NON_NULL)
    private String recentVisitType;
    //到访状态
    @JsonInclude(JsonInclude.Include.NON_NULL)
    private Integer recentVisitStatus;
    //是否成交
    @JsonInclude(JsonInclude.Include.NON_NULL)
    private Integer isMakeADeal;

    //列表接口 小程序也使用 区分是否是从用户详情进去的
    private Integer isDetail;

    /**当前页数*/
    private Integer pageNum = 1;
    /**当前页显示条数*/
    private Integer pageSize = 20;
    /**关键字*/
    private String keyWord;
    /**查询方式*/
    private String useType;
    public ConsultRecordDto() {
    }

    public String getUserId() {
        return userId;
    }

    public void setUserId(String userId) {
        this.userId = userId;
    }

    public String getShopId() {
        return shopId;
    }

    public void setShopId(String shopId) {
        this.shopId = shopId;
    }

    public Integer getConsultType() {
        return consultType;
    }

    public void setConsultType(Integer consultType) {
        this.consultType = consultType;
    }

    public String getContent() {
        return content;
    }

    public void setContent(String content) {
        this.content = content;
    }

    public String getFaceDoctorId() {
        return faceDoctorId;
    }

    public void setFaceDoctorId(String faceDoctorId) {
        this.faceDoctorId = faceDoctorId;
    }

    public String getTreatDoctorId() {
        return treatDoctorId;
    }

    public void setTreatDoctorId(String treatDoctorId) {
        this.treatDoctorId = treatDoctorId;
    }

    public String getAppealDetail() {
        return appealDetail;
    }

    public void setAppealDetail(String appealDetail) {
        this.appealDetail = appealDetail;
    }

    public String getTreatPlanQuote() {
        return treatPlanQuote;
    }

    public void setTreatPlanQuote(String treatPlanQuote) {
        this.treatPlanQuote = treatPlanQuote;
    }

    public String getDosageParams() {
        return dosageParams;
    }

    public void setDosageParams(String dosageParams) {
        this.dosageParams = dosageParams;
    }

    public String getAnamnesis() {
        return anamnesis;
    }

    public void setAnamnesis(String anamnesis) {
        this.anamnesis = anamnesis;
    }

    public String getHasTreatProjects() {
        return hasTreatProjects;
    }

    public void setHasTreatProjects(String hasTreatProjects) {
        this.hasTreatProjects = hasTreatProjects;
    }

    public Integer getIsDraft() {
        return isDraft;
    }

    public void setIsDraft(Integer isDraft) {
        this.isDraft = isDraft;
    }

    public Integer getAdminType() {
        return adminType;
    }

    public void setAdminType(Integer adminType) {
        this.adminType = adminType;
    }

    public String getAdminId() {
        return adminId;
    }

    public void setAdminId(String adminId) {
        this.adminId = adminId;
    }

    public String getAdminName() {
        return adminName;
    }

    public void setAdminName(String adminName) {
        this.adminName = adminName;
    }

    public String getTreatProjectIds() {
        return treatProjectIds;
    }

    public void setTreatProjectIds(String treatProjectIds) {
        this.treatProjectIds = treatProjectIds;
    }

    public String getRecommendProjectIds() {
        return recommendProjectIds;
    }

    public void setRecommendProjectIds(String recommendProjectIds) {
        this.recommendProjectIds = recommendProjectIds;
    }

    public List<Map<String, Object>> getTreatProjectList() {
        return treatProjectList;
    }

    public void setTreatProjectList(List<Map<String, Object>> treatProjectList) {
        this.treatProjectList = treatProjectList;
    }

    public List<Map<String, Object>> getRecommendProjectList() {
        return recommendProjectList;
    }

    public void setRecommendProjectList(List<Map<String, Object>> recommendProjectList) {
        this.recommendProjectList = recommendProjectList;
    }

    public String getFacePlan() {
        return facePlan;
    }

    public void setFacePlan(String facePlan) {
        this.facePlan = facePlan;
    }

    public Integer getSatisfie() {
        return satisfie;
    }

    public void setSatisfie(Integer satisfie) {
        this.satisfie = satisfie;
    }

    public String getFaceDoctorName() {
        return faceDoctorName;
    }

    public void setFaceDoctorName(String faceDoctorName) {
        this.faceDoctorName = faceDoctorName;
    }

    public String getTreatDoctorName() {
        return treatDoctorName;
    }

    public void setTreatDoctorName(String treatDoctorName) {
        this.treatDoctorName = treatDoctorName;
    }

    public String getStartTime() {
        return startTime;
    }

    public void setStartTime(String startTime) {
        this.startTime = startTime;
    }

    public String getEndTime() {
        return endTime;
    }

    public void setEndTime(String endTime) {
        this.endTime = endTime;
    }


    public Date getCreateTime() {
        return createTime;
    }

    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }

    public String getUserName() {
        return userName;
    }

    public void setUserName(String userName) {
        this.userName = userName;
    }

    public String getChannelsTypeId() {
        return channelsTypeId;
    }

    public void setChannelsTypeId(String channelsTypeId) {
        this.channelsTypeId = channelsTypeId;
    }

    public String getChannelId() {
        return channelId;
    }

    public void setChannelId(String channelId) {
        this.channelId = channelId;
    }

    public String getChannel2Id() {
        return channel2Id;
    }

    public void setChannel2Id(String channel2Id) {
        this.channel2Id = channel2Id;
    }

    public String getHisCorpUserId() {
        return hisCorpUserId;
    }

    public void setHisCorpUserId(String hisCorpUserId) {
        this.hisCorpUserId = hisCorpUserId;
    }

    public String getHisCorpUserName() {
        return hisCorpUserName;
    }

    public void setHisCorpUserName(String hisCorpUserName) {
        this.hisCorpUserName = hisCorpUserName;
    }

    public String getTel() {
        return tel;
    }

    public void setTel(String tel) {
        this.tel = tel;
    }

    public String getInternetCorpUserId() {
        return internetCorpUserId;
    }

    public void setInternetCorpUserId(String internetCorpUserId) {
        this.internetCorpUserId = internetCorpUserId;
    }

    public String getChatCorpUserId() {
        return chatCorpUserId;
    }

    public void setChatCorpUserId(String chatCorpUserId) {
        this.chatCorpUserId = chatCorpUserId;
    }

    public String getCreateEmployeeId() {
        return createEmployeeId;
    }

    public void setCreateEmployeeId(String createEmployeeId) {
        this.createEmployeeId = createEmployeeId;
    }

    public String getCreateEmployeePartId() {
        return createEmployeePartId;
    }

    public void setCreateEmployeePartId(String createEmployeePartId) {
        this.createEmployeePartId = createEmployeePartId;
    }

    public String getFocusActivityId() {
        return focusActivityId;
    }

    public void setFocusActivityId(String focusActivityId) {
        this.focusActivityId = focusActivityId;
    }

    public String getRecentVisitType() {
        return recentVisitType;
    }

    public void setRecentVisitType(String recentVisitType) {
        this.recentVisitType = recentVisitType;
    }

    public Integer getRecentVisitStatus() {
        return recentVisitStatus;
    }

    public void setRecentVisitStatus(Integer recentVisitStatus) {
        this.recentVisitStatus = recentVisitStatus;
    }

    public Integer getIsMakeADeal() {
        return isMakeADeal;
    }

    public void setIsMakeADeal(Integer isMakeADeal) {
        this.isMakeADeal = isMakeADeal;
    }

    public String getLastTreatDoctorId() {
        return lastTreatDoctorId;
    }

    public void setLastTreatDoctorId(String lastTreatDoctorId) {
        this.lastTreatDoctorId = lastTreatDoctorId;
    }

    public String getLastTreatProjects() {
        return lastTreatProjects;
    }

    public void setLastTreatProjects(String lastTreatProjects) {
        this.lastTreatProjects = lastTreatProjects;
    }

    public String getLastTreatDoctorName() {
        return lastTreatDoctorName;
    }

    public void setLastTreatDoctorName(String lastTreatDoctorName) {
        this.lastTreatDoctorName = lastTreatDoctorName;
    }

    public List<Map<String, Object>> getLastTreatProjectList() {
        return lastTreatProjectList;
    }

    public void setLastTreatProjectList(List<Map<String, Object>> lastTreatProjectList) {
        this.lastTreatProjectList = lastTreatProjectList;
    }

    public String getId() {
        return id;
    }

    public void setId(String id) {
        this.id = id;
    }

    public Integer getPageNum() {
        return pageNum;
    }

    public void setPageNum(Integer pageNum) {
        this.pageNum = pageNum;
    }

    public Integer getPageSize() {
        return pageSize;
    }

    public void setPageSize(Integer pageSize) {
        this.pageSize = pageSize;
    }

    public String getKeyWord() {
        return keyWord;
    }

    public void setKeyWord(String keyWord) {
        this.keyWord = keyWord;
    }

    public String getMethodCode() {
        return methodCode;
    }

    public void setMethodCode(String methodCode) {
        this.methodCode = methodCode;
    }

    public String getMethodCodeName() {
        return methodCodeName;
    }

    public void setMethodCodeName(String methodCodeName) {
        this.methodCodeName = methodCodeName;
    }

    public String getUseType() {
        return useType;
    }

    public void setUseType(String useType) {
        this.useType = useType;
    }

    public Integer getIsDetail() {
        return isDetail;
    }

    public void setIsDetail(Integer isDetail) {
        this.isDetail = isDetail;
    }
}

 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckDto.java

@@ -20,6 +20,8 @@
    /**支付方式编号集合*/
    private List<String> payMethodList;

    /** 检查优惠券码是否已被使用，默认ture检查，升单是false不检查 */
    private boolean checkCouponNumberIsUse = true;

    /**商品总金额(暂无用-不传)*/
    private BigDecimal total;

 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java

@@ -25,7 +25,7 @@
    private String userId;
    /**活动标识*/
    private String groupBuyId;
    private String id;
    private List<String> idList;
    /**发送记录*/
    private CouponRecordDto couponReleaseRecordItem;
    /**用户详情*/
@@ -51,4 +51,9 @@

    /** 是否是营销助手申请 0=否 1=是*/
    private Integer isMarketApply = 0;

    /** 优惠券分类ID*/
    private String couponTypeId;
    /** 基础分类-优惠券*/
    private String type;
}

 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java

@@ -28,4 +28,10 @@
    private List<String> payMethodList;
    /**优惠券平台*/
    private String platform;

    /** 订单标识List */
    private List<String> orderIdList;
    /** 订单标识 */
    private String orderId;

}

 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java

New file
@@ -0,0 +1,38 @@
package com.hz.his.dto.coupon;

import lombok.Data;

import java.util.List;

/**
 * 优惠券发送参数
 * @author fwq
 */
@Data
public class CouponSendDto{

    /**操作人类型*/
    private String operatorType;
    /**操作人标识-必填*/
    private String operatorId;
    /**操作人名称-必填*/
    private String operatorName;

    /**操作人角色标识-非必填*/
    private String roleId;
    /**操作人平台-非必填*/
    private String appIdCode;
    /**操作备注-非必填*/
    private String operatorRemark;

    /**来源标识*/
    private String commonId;
    /**来源类型 CouponReleaseRecordItem*/
    private String commonType;
    /**来源子标识*/
    private String commonItemId;

    /**发送的用户信息*/
    private List<CouponSendUserDto> sendUserList;

}

 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java

New file
@@ -0,0 +1,28 @@
package com.hz.his.dto.coupon;

import lombok.Data;

import java.util.List;

/**
 * 优惠券发送参数
 * @author fwq
 */
@Data
public class CouponSendItemDto {
    /**发放批次-必填*/
    private String recordName;
    /**优惠券标识-必填*/
    private String couponId;
    /**发放数量-必填*/
    private Integer num;

    /**生日券传:开始时间,年月日时分秒,不填默认一个月*/
    private String startTime;
    /**生日券传:结束时间,年月日时分秒,不填默认一个月*/
    private String endTime;
    /**成本部门名称 -非必填*/
    private String costDeptName;
    /**归属成本部门名称 -非必填 */
    private String ascrCostDeptName;
}

 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendUserDto.java

New file
@@ -0,0 +1,28 @@
package com.hz.his.dto.coupon;

import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
 * 优惠券发送参数
 * @author fwq
 */
@Data
public class CouponSendUserDto {
    /**phis用户标识-必填*/
    private String userId;
    /**是否发送短信0否1是-默认否*/
    private Integer isSendMsg = 0;

    /**消耗总储值金*/
    private BigDecimal storedValueFund;
    /**消耗总增值金*/
    private BigDecimal valueAddedFund;
    /**消耗总积分*/
    private BigDecimal integral;

    /**发送的券*/
    private List<CouponSendItemDto> couponList;
}

 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponTypeDto.java

New file
@@ -0,0 +1,14 @@
package com.hz.his.dto.coupon;

import com.hz.his.dto.PageDto;
import lombok.Data;

/**
 * 优惠券发送参数
 * @author fwq
 */
@Data
public class CouponTypeDto extends PageDto {
    /**是否营销助手可申请*/
    private Integer isMarketAssistantApply;
}

 phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java

@@ -96,6 +96,9 @@
    // 对比照片记录
    private String comparePhotoRecordJson;

    // 划扣照片json
    private String deductionPictureJson;

    // 批量添加项目id列表
    private String userProjectIds;


 phis-feign/src/main/java/com/hz/his/dto/employee/EmpAuthDto.java

New file
@@ -0,0 +1,14 @@
package com.hz.his.dto.employee;

import lombok.Data;

/**
 * @author fwq
 * */
@Data
public class EmpAuthDto{
    /**权限*/
    private String tagName;
    /**登录员工*/
    private String empRoleId;
}

 phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java

New file
@@ -0,0 +1,70 @@
package com.hz.his.dto.marketing;

import com.hz.his.dto.PageDto;
import lombok.Data;

/**
 * 营销活动
 * @USER: fhx
 * @DATE: 2023/7/3
 **/
@Data
public class MarketActivityDto extends PageDto {

    /** 分类id */
    private String classifyId;
    /** 状态:0未开始1进行中2已结束 */
    private Integer status;
    /** 开始时间 */
    private String startTime;
    /** 结束时间 */
    private String endTime;
    /** 是否关联优惠券 */
    private Integer isCoupon;
    /** 是否关联项目 */
    private Integer isProject;
    /** 是否同步艾芯会 */
    private Integer isSyncCrm;
    /** 是否上下架 */
    private Integer isUp;

    /** 会员等级 */
    private String userLevel;
    /** 门店id/所属门店id */
    private String shopId;
    /** 是否是领取优惠券 */
    private Integer isReceiveCoupon;
    /** 是否是使用优惠券 */
    private Integer isUseCoupon;
    /** 是否消费 */
    private Integer isConsume;

    /** 关联项目类型 */
    private String commonType;


    //-------------------
    /** 多门店id（逗号分割） */
    private String shopIds;
    /** 用户id */
    private String userId;
    /** 到访订单id */
    private String visitOrderId;
    /** 营销活动id */
    private String marketActivityId;
    /** 营销活动关联优惠券id */
    private String activityCouponId;

    /** 平台类型(PlatformConstants) */
    private String platformType;
    /** 操作人标识 */
    private String opId;
    /** 操作人名称 */
    private String opName;
    /** 操作人类型(OperatorConstants) */
    private Integer opType;
    /** 操作人角色id(EmployeeRole) */
    private String opRoleId;


}

 phis-feign/src/main/java/com/hz/his/dto/meiji/MjSkinReportItemDto.java

New file
@@ -0,0 +1,42 @@
package com.hz.his.dto.meiji;

import lombok.Data;

import java.math.BigDecimal;

/**
 * @ClassName MjSkinReportDto
 * @Description 美际档案子类数据Dto
 * @Author wrh
 * @Date 2023/8/25 15:43
 * @Version 1.0
 */
@Data
public class MjSkinReportItemDto {

    /**结果值*/
    private BigDecimal result;
    /**缺陷等级值*/
    private Integer level;
    /**名称*/
    private String name;
    /**程度*/
    private String degree;

    //皮肤分析类型
    public static final String TYPE_PORE = "毛孔";
    //黑头
    public static final String TYPE_BLACKHEAD = "黑头";
    //T区出油
    public static final String TYPE_T = "T区出油";
    //T区出油
    public static final String TYPE_U = "U区出油";
    //色斑 stain
    public static final String TYPE_STAIN = "色斑";
    //泛红 reddening
    public static final String TYPE_REDDENING = "泛红";
    //红血丝 Redness
    public static final String TYPE_REDNESS = "红血丝";
    //痤疮 acne
    public static final String TYPE_ACNE = "痤疮";
}

 phis-feign/src/main/java/com/hz/his/dto/order/CardItemInfoDto.java

@@ -12,7 +12,7 @@
@Data
public class CardItemInfoDto {
    /**
     * 使用次数
     * 购买商品数量，注意：不是抵扣次数
     */
    private Integer userNum;
    /**

 phis-feign/src/main/java/com/hz/his/dto/order/OrderConsumePayDto.java

New file
@@ -0,0 +1,44 @@
package com.hz.his.dto.order;

import lombok.Data;

import java.math.BigDecimal;

/**
 * 订单支付方式dto
 * @USER: fhx
 * @DATE: 2023/8/24
 **/
@Data
public class OrderConsumePayDto {

    /** 实际支付金额 */
    private BigDecimal amount;
    /** 支付编码 */
    private String method;
    /** 支付方式名称 */
    private String methodName;
    /** 支付的商品/项目/组合套餐/组合卡项的标识 */
    private String commonId;
    /** 卡项的权益类型标识 */
    private String cardEquityId;
    /** 用户卡包标识 */
    private String userCardId;
    /** 对应判断标识，如果时积分支付时对应：101=不需扣减积分，100=需要扣减积分 */
    private Integer isDel = 0;

    /**非必填 第三方订单编号*/
    private String otherOrderNo;
    /**非必填 次级订单号或兑换码*/
    private String assistOrderNo;
    /**非必填 OCR识别图片链接*/
    private String ocrImageUrl;

    public OrderConsumePayDto() {
    }

    public OrderConsumePayDto(BigDecimal amount, String method) {
        this.amount = amount;
        this.method = method;
    }
}

 phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java

@@ -47,4 +47,7 @@
    /**非必填 卡包标识 */
    private List<CardItemInfoDto> cardItemInfoIds;

    /** 诉求分类idList */
    private List<String> appealTypeIdList;

}

 phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java

@@ -1,5 +1,6 @@
package com.hz.his.dto.order;

import com.hz.his.vo.order.refund.RefundDeductionCancelVo;
import lombok.Data;

import java.math.BigDecimal;
@@ -27,11 +28,13 @@
    /** 退款原因（用户） */
    private String refundReason;

    /////用于系统返回参数计算
    /** 可退总金额*/
    private BigDecimal approveRefundTotal = BigDecimal.ZERO;

    /** 退款二级子订单信息集合 */
    private List<OrderItemSourceRefundDto> orderItemSourceRefundDtos;
    /** 需要作废的划扣记录*/
    private List<RefundDeductionCancelVo> refundDeductionCancelList;


    /** 可退总金额（用于系统返回参数计算）*/
    private BigDecimal approveRefundTotal = BigDecimal.ZERO;

}

 phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java

@@ -1,8 +1,10 @@
package com.hz.his.dto.order;

import com.hz.his.vo.order.refund.RefundDeductionCancelVo;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
 * @Author
@@ -26,8 +28,10 @@
    /** 退款原因（用户） */
    private String refundReason;

    /////用于系统返回参数计算
    /** 可退总金额*/
    /** 需要作废的划扣记录*/
    private List<RefundDeductionCancelVo> refundDeductionCancelList;

    /** 可退总金额（用于系统返回参数计算）*/
    private BigDecimal approveRefundTotal = BigDecimal.ZERO;

}

 phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java

@@ -30,4 +30,7 @@
    /**卡扣不判断过期时间：0否1是*/
    private Integer cardPass = 0;

    /** 订单升单关联列表 */
    private List<OrderRiseDto> orderRiseList;

}

 phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java

@@ -26,6 +26,8 @@
    private String remarks;
    /** 退款原因（用户） */
    private String refundReason;
    /** Y-自动作废划扣  0否1是（整单退的时候用到）*/
    private Integer deductionCancel = 0;

    /** 操作人员工标识*/
    private String operatorId;

 phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteDto.java

@@ -7,31 +7,23 @@
/**
 * @Author
 */

@Data
public class OrderRefundNoteDto {
    //必填
    private String id;
    //退款方式总表标识，必要
    private String refundRecordMethodId;

    //支付总金额  必填
    private BigDecimal paymentTotal;
    // 支付方式编号 必填
    private String paymentNumberNo;
    //支付方式名称 必填
    private String paymentName;

    //退款路径" 必填
    private Integer refundroute;
    //退款方式编号 必填
    private String refundNumberNo;
    //退款方式名称 必填
    private String refundName;
    //只有在转储值金的时候才有这玩意
    //退款储值金金额
    private BigDecimal refundStoredTotal;
    //退款状态
    private Integer refundStatus;
    //备注
    private String remarks;
    //线下退款凭证图片地址   格式“图片一，图片二”
    private String imageList;

}

 phis-feign/src/main/java/com/hz/his/dto/order/OrderRiseDto.java

New file
@@ -0,0 +1,16 @@
package com.hz.his.dto.order;

import lombok.Data;

/**
 * 订单升单关联dto
 * @USER: fhx
 * @DATE: 2023/8/23
 **/
@Data
public class OrderRiseDto {

    /** 关联订单标识(OrdersTotal) */
    private String assocOrderId;

}

 phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java

@@ -97,6 +97,8 @@
    /**非必填 活动规则标识集合*/
    private List<String> activityIds;

    /** 治疗单id */
    /** 治疗单id(目前没用) */
    private String treatSingleId;
    /** 创建方式（OrderTotalConstants） */
    private String addWay;
}

 phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java

@@ -30,4 +30,11 @@
     * isDel=101，则phis这边不需要扣减用户积分
     */
    private Integer isDel = 0;

    /**非必填 第三方订单编号*/
    private String otherOrderNo;
    /**非必填 次级订单号或兑换码*/
    private String assistOrderNo;
    /**非必填 OCR识别图片链接*/
    private String ocrImageUrl;
}

 phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java

@@ -24,6 +24,8 @@
    private List<PayAmountDto> amount;
    /**必填 操作人标识,crm填用户*/
    private String operatorId;
    /** 操作人角色(升单结账必填，退款使用) */
    private String opRoleId;

    /**支付用户*/
    private String payUserId;

 phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java

@@ -11,4 +11,9 @@
public class ProjectDto extends PageDto {
    /**更新时间*/
    private String editTime;

    /**价格查询 最小价格 最大价格*/
    private String minPrice;
    private String maxPrice;

}

 phis-feign/src/main/java/com/hz/his/dto/quotation/QuotationDto.java

New file
@@ -0,0 +1,61 @@
package com.hz.his.dto.quotation;

import com.hz.his.dto.PageDto;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;


/**
 * 报价单传值dto
 * @USER: fhx
 * @DATE: 2023/8/8
 **/
@Data
public class QuotationDto extends PageDto {

    //搜索参数
    /** 开始时间 */
    private String startTime;
    /** 结束时间 */
    private String endTime;
    /** 编号 */
    private String codeNo;

    //传值参数
    /** 到访订单标识 */
    private String visitOrderId;
    /** 用户标识 */
    private String userId;
    /** 平台类型 */
    private String platformType;
    /** 总价(逻辑累计后填充，非传参使用) */
    private BigDecimal totalPrice;

    /** 皮肤档案标识(MjSkinReport) */
    private String pfDaId;
    /** 微整注射标识(AppearanceTotal) */
    private String wzZsId;
    /** 微整注射-图片路径 */
    private String wzZsImgUrl;
    /** 体态塑形标识(AppearanceTotal) */
    private String ttSxId;
    /** 体态塑形-图片路径 */
    private String ttSxImgUrl;

    /** 操作人标识 */
    private String opId;
    /** 操作人名称 */
    private String opName;
    /** 操作人类型(OperatorConstants) */
    private Integer opType;
    /** 操作人角色id(EmployeeRole) */
    private String opRoleId;

    /** 子项列表信息 */
    private List<QuotationItemDto> itemList;

    public QuotationDto() {
    }
}

 phis-feign/src/main/java/com/hz/his/dto/quotation/QuotationItemAssocDto.java

New file
@@ -0,0 +1,20 @@
package com.hz.his.dto.quotation;

import lombok.Data;

/**
 * 报价单子项关联信息dto
 * @USER: fhx
 * @DATE: 2023/8/8
 **/
@Data
public class QuotationItemAssocDto {

    /** 关联标识(适应症/标签) */
    private String assocId;
    /** 关联名称(冗余) */
    private String assocName;

    public QuotationItemAssocDto() {
    }
}

 phis-feign/src/main/java/com/hz/his/dto/quotation/QuotationItemDto.java

New file
@@ -0,0 +1,55 @@
package com.hz.his.dto.quotation;

import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
 * 报价单子项dto
 * @USER: fhx
 * @DATE: 2023/8/8
 **/
@Data
public class QuotationItemDto {

    /** QuotationItem表id */
    private String id;

    /** 关联类型 */
    private String assocType;

    /** 商品类型(OrderItemConstants) */
    @Column(comment = "", length = 20, type = MySqlTypeConstant.VARCHAR,isNull = false)
    private String type;
    /** 项目id/商品id/套餐id/其他id  */
    private String goodsId;
    /** 项目编号/商品编码/套餐编码/其他编码 */
    private String goodsNo;
    /** 项目名称/商品名称 */
    private String goodsName;

    /** 身体部位名称 */
    private String bodyPartsName;
    /** 规格 */
    private String specs;
    /** 单位 */
    private String unit;
    /** 医生资质 */
    private String doctorQualification;

    /** 项目原价 */
    private BigDecimal oriPrice;
    /** 售价 */
    private BigDecimal price;
    /** 购买数量 */
    private Integer buyNum;

    /** 多关联信息 */
    private List<QuotationItemAssocDto> itemAssocList;

    public QuotationItemDto() {
    }
}

 phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java

@@ -4,6 +4,7 @@
import lombok.Data;

import java.util.Date;
import java.util.List;

/**
 * 划扣
@@ -34,7 +35,12 @@
    private String userShopId;
    /**销售平台*/
    private String sourceName;

    /**是否过滤测试账号*/
    private Integer isFilterTestAccount;
    /**是否过滤对冲数据*/
    private Integer isHedging;
    /**业绩类型*/
    private List<Integer> sourceTypeList;
    /*******保存参数********/
    /**操作人标识*/
    private String operatorId;

 phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java

@@ -3,6 +3,8 @@

import lombok.Data;

import java.util.List;

/**
 * 诊所现金业绩VO
 * @USER: fhx
@@ -29,4 +31,8 @@
    private String operatorId;
    /** 操作人 */
    private String operatorName;
    /**是否过滤测试账号*/
    private Integer isFilterTestAccount;
    /**业绩类型*/
    private List<Integer> sourceTypeList;
}

 phis-feign/src/main/java/com/hz/his/dto/report/CoreProjectReportDto.java

@@ -32,4 +32,6 @@
    private String loginCnName;
    /**登录员工唯一字符串*/
    private String loginEmpStr;
    /** 是否过滤测试用户账号 */
    private Integer isFilterTestAccount;
}

 phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java

@@ -14,6 +14,7 @@
    private String employeeId;
    /**门店标识*/
    private String shopId;
    /**门店标识集合*/
    private String shopIds;
    /**登录员工唯一字符串*/
    private String roleStr;
@@ -33,4 +34,11 @@
    private Integer isNewUser;
    /**是否首天*/
    private Integer isBothOne;
    /**工作日*/
    private Integer workDayNum;
    /**操作人*/
    private String operatorId;
    private String operatorName;
    /**是否过滤测试账号数据:0不过滤,1过滤*/
    private Integer isFilterTestAccount;
}

 phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java

@@ -16,10 +16,14 @@
    private String month;
    /**月份:yyyy-MM-dd*/
    private String day;

    /**用户增长渠道:1是,0否*/
    private Integer selectUser;
    /**门店标识*/
    private String shopId;
    /**门店标识集合*/
    private List<String> shopIdList;
    /**渠道大类渠道标识集合*/
    private List<String> channelList;
    /**开始时间*/
    private Date startTime;
    /**结束时间*/
@@ -30,6 +34,8 @@
    private String loginCnName;
    /**登录员工唯一字符串*/
    private String loginEmpStr;
    /** 是否过滤测试用户账号 */
    private Integer isFilterTestAccount;

    public List<String> getShopIdList() {
        if(shopIdList == null){

 phis-feign/src/main/java/com/hz/his/dto/report/ShopCashReportDto.java

@@ -19,6 +19,8 @@
    private String endTime;
    /**门店列表标识*/
    private List<String> shopIdList;
    /** 是否过滤测试用户账号 */
    private Integer isFilterTestAccount;

    /**业绩类型-门店日现金业绩*/
    public static final String  TYPE_DAY_CASH= "day_cash";

 phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java

@@ -24,4 +24,7 @@
    private String sleepTime;
    /**门店列表标识*/
    private List<String> shopIdList;

    /** 是否过滤测试用户账号 */
    private Integer isFilterTestAccount;
}

 phis-feign/src/main/java/com/hz/his/dto/report/UserReleaseDto.java

@@ -22,4 +22,7 @@
    private List<String> employeeIdList;
    /**等级列表*/
    private List<String> memberLevelList;
    /** 是否过滤测试用户账号 */
    private Integer isFilterTestAccount;

}

 phis-feign/src/main/java/com/hz/his/dto/user/UserBaseInfoDto.java

@@ -27,7 +27,7 @@
    /** 证件编号 */
    private String certificateNo;
    /** 性别 */
    private Integer gender = SEX_WUMAN;
    private Integer gender;
    /** 主电话号码 */
    private String tel;
    /** 电话区码 */

 phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java

@@ -33,6 +33,8 @@
    private Integer isSelectShop = 0;
    /**是否查询推荐人信息:0否1是*/
    private Integer isSelectInvitee = 0;
    /**是否查询资金信息:0否1是*/
    private Integer isSelectMoney = 0;
    /**是否有门店*/
    private Integer isHaveShop;
    /**是否有顾问*/

 phis-feign/src/main/java/com/hz/his/dto/user/UserPackListDto.java

@@ -8,5 +8,6 @@
/**人群包用户查询参数*/
@Data
public class UserPackListDto {
    private String fromCode;
    private List<UserPackDto> list;
}

 phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java

@@ -74,7 +74,7 @@
    /** 语言类型名称 */
    private String languageTypeName;
    /** 用户年龄 */
    private Integer year = 0;
    private Integer year;

    /** 星座类型名称 */
    private String constellationTypeName;
@@ -154,6 +154,17 @@
    private String opId;
    //修改操作的备注
    private String note;
    /** 性别0未知1男2女 */
    private Integer gender;

    /**是否转诊*/
    private Integer isTransfer;
    /**转诊信息*/
    private UserTransferDto transferRecord;

    /**主要诉求**/
    private String mainAppeal;
    private String minorAppeal;

    public UserParamDto() {
    }

 phis-feign/src/main/java/com/hz/his/dto/user/UserTransferDto.java

New file
@@ -0,0 +1,58 @@
package com.hz.his.dto.user;


import lombok.Data;

import java.util.Date;

/**
 * 转诊参数
 */
@Data
public class UserTransferDto{
    /**用户id*/
    private String userId;
    /**状态*/
    private Integer status;
    /**类型 0 转诊 1 转疗*/
    private Integer type;
    /**转出门店id*/
    private String transferOutShopId;
    /**转出门店名称*/
    private String transferOutShopName;
    /**转入门店id*/
    private String transferIntoShopId;
    /**转入门店名称*/
    private String transferIntoShopName;
    /**转入时间*/
    private Date transferTime;
    /**申请人类型*/
    private Integer applyAdminType;
    /**申请人id*/
    private String applyAdminId;
    /**申请人名称*/
    private String applyAdminName;
    /**审核人类型*/
    private Integer approvedAdminType;
    /**审核人id*/
    private String approvedAdminId;
    /**审核人名称*/
    private String approvedAdminName;
    /**审核时间*/
    private Date approvedTime;
    /**备注*/
    private String remark;
    /**是否短信提醒*/
    private Integer isNotice;
    /**操作人类型*/
    private Integer operatorType;
    /**操作人Id*/
    private String operatorId;
    /**操作人名称Name*/
    private String operatorName;





}

 phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java

@@ -99,4 +99,6 @@
    public static final String OPERATION_REASON_GIFT_0701 = "bringNewUserGift_0701";
    /**操作方式-活动参与*/
    public static final String OPERATION_REASON_ACTIVITY_JOIN = "activity_join";
    /**操作方式-营销助手积分兑换优惠券*/
    public static final String OPERATION_REASON_EXCHANGE_COUPON_USE_INTEGRAL = "exchange_coupon_use_integral";
}

 phis-feign/src/main/java/com/hz/his/dto/user/money/UserTurnDto.java

New file
@@ -0,0 +1,50 @@
package com.hz.his.dto.user.money;


import lombok.Data;
import lombok.ToString;

/**
 *
 * 用户转赠
 * @author fwq
 * @date 2022-3-3
 */
@Data
public class UserTurnDto {

    /**转赠人标识*/
    private String turnPeopleId;
    /**转赠人名称*/
    private String turnPeopleName;
    /**转赠门店标识(订单操作人的门店)*/
    private String turnShopId;
    /**转赠门店名称(订单操作人的门店)*/
    private String turnShopName;
    /**受赠人标识*/
    private String doneeId;
    /**受赠人名称*/
    private String doneeName;
    /**转赠门店标识(订单操作人的门店)*/
    private String doneeShopId;
    /**转赠门店标识(订单操作人的门店)*/
    private String doneeShopName;
    /**转赠增值金*/
    private String incrementMoney;
    /**转赠储值金*/
    private String storedMoney;
    /**转赠积分*/
    private String integral;
    /**创建人标识*/
    private String createId;
    /**创建人名称*/
    private String createName;
    /**备注*/
    private String remarks;
    /**主题*/
    private String originSubject;
    /**平台code*/
    private String appIdCode;
    /**关联标识*/
    private String commonId;
}

 phis-feign/src/main/java/com/hz/his/dto/user/usercompleteInfo/UserInfoCompleteDto.java

New file
@@ -0,0 +1,219 @@
package com.hz.his.dto.user.usercompleteInfo;


/***
 * 用户扫码完善资料 dto
 */
public class UserInfoCompleteDto {

    //用户ID
    private String userId;
    //用户名称
    private String name;
    //性别 0=未知 1=男 2=女
    private Integer gender;
    //手机号
    private String tel;
    //邮箱
    private String email;
    //证件类型
    private Integer certificateType;
    //证件号码
    private String certificateNo;
    //出生日期
    private String birthDay;
    //工作
    private String professionTypeName;
    //婚否
    private String marriageTypeName;
    //生育
    private String growthTypeName;

    //地址信息
    private String country;
    private String province;
    private String city;
    private String area;
    private String detail;

    //来源-渠道名称
    private String sourceName;

    //是否好友推荐 0=否 1=是
    private Integer isFriendReferrer;
    //好友名称
    private String friendName;
    //主要诉求
    private String mainAppeal;
    //次要诉求
    private String minorAppeal;


    public String getUserId() {
        return userId;
    }

    public void setUserId(String userId) {
        this.userId = userId;
    }

    public String getName() {
        return name;
    }

    public void setName(String name) {
        this.name = name;
    }

    public Integer getGender() {
        return gender;
    }

    public void setGender(Integer gender) {
        this.gender = gender;
    }

    public String getTel() {
        return tel;
    }

    public void setTel(String tel) {
        this.tel = tel;
    }

    public String getEmail() {
        return email;
    }

    public void setEmail(String email) {
        this.email = email;
    }

    public Integer getCertificateType() {
        return certificateType;
    }

    public void setCertificateType(Integer certificateType) {
        this.certificateType = certificateType;
    }

    public String getCertificateNo() {
        return certificateNo;
    }

    public void setCertificateNo(String certificateNo) {
        this.certificateNo = certificateNo;
    }

    public String getBirthDay() {
        return birthDay;
    }

    public void setBirthDay(String birthDay) {
        this.birthDay = birthDay;
    }

    public String getProfessionTypeName() {
        return professionTypeName;
    }

    public void setProfessionTypeName(String professionTypeName) {
        this.professionTypeName = professionTypeName;
    }

    public String getMarriageTypeName() {
        return marriageTypeName;
    }

    public void setMarriageTypeName(String marriageTypeName) {
        this.marriageTypeName = marriageTypeName;
    }

    public String getGrowthTypeName() {
        return growthTypeName;
    }

    public void setGrowthTypeName(String growthTypeName) {
        this.growthTypeName = growthTypeName;
    }

    public String getCountry() {
        return country;
    }

    public void setCountry(String country) {
        this.country = country;
    }

    public String getProvince() {
        return province;
    }

    public void setProvince(String province) {
        this.province = province;
    }

    public String getCity() {
        return city;
    }

    public void setCity(String city) {
        this.city = city;
    }

    public String getArea() {
        return area;
    }

    public void setArea(String area) {
        this.area = area;
    }

    public String getDetail() {
        return detail;
    }

    public void setDetail(String detail) {
        this.detail = detail;
    }

    public String getSourceName() {
        return sourceName;
    }

    public void setSourceName(String sourceName) {
        this.sourceName = sourceName;
    }

    public Integer getIsFriendReferrer() {
        return isFriendReferrer;
    }

    public void setIsFriendReferrer(Integer isFriendReferrer) {
        this.isFriendReferrer = isFriendReferrer;
    }

    public String getFriendName() {
        return friendName;
    }

    public void setFriendName(String friendName) {
        this.friendName = friendName;
    }

    public String getMainAppeal() {
        return mainAppeal;
    }

    public void setMainAppeal(String mainAppeal) {
        this.mainAppeal = mainAppeal;
    }

    public String getMinorAppeal() {
        return minorAppeal;
    }

    public void setMinorAppeal(String minorAppeal) {
        this.minorAppeal = minorAppeal;
    }
}

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java

@@ -116,6 +116,13 @@
    Result userCouponCheckList(@RequestBody(required = false) CouponListDto couponListDto);

    /**
     * 用户-升单订单的原使用优惠券列表
     * @return canUseCouponList可用券列表 canUseCount可用券数量
     * */
    @PostMapping(value = "/coupon/user/riseOrderOriCouponList")
    Result riseOrderOriCouponList(@RequestBody(required = false) CouponListDto couponListDto);

    /**
     * 根据skuid查询关联优惠券
     */
    @PostMapping(value = "/coupon/find/skuId")
@@ -130,4 +137,16 @@
     */
    @PostMapping(value = "/coupon/user/goods")
    Result findUserGoodsCoupon(@RequestBody(required = false) GoodsUsedCouponDto dto);

    /**
     * 查询基础分类
     */
    @PostMapping(value = "/coupon/type/list")
    Result getCouponTypeList(@RequestBody(required = false) CouponDto dto);

    /**
     * 查询优惠券分类
     */
    @PostMapping(value = "/couponType/list")
    Result couponTypeList(@RequestBody(required = false) CouponTypeDto couponTypeDto);
}

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java

@@ -2,6 +2,7 @@


import com.hx.resultTool.Result;
import com.hz.his.dto.employee.EmpAuthDto;
import com.hz.his.dto.employee.EmpDocDto;
import com.hz.his.dto.TimeDto;
import com.hz.his.dto.employee.EmployeeDto;
@@ -74,4 +75,10 @@
    @PostMapping(value = "/emp/detail/name")
    Result getDetailsByName(@RequestBody(required = false) EmpDocDto employeeDto);

    @PostMapping(value = "/emp/role/get/one")
    Result getEmployeeByRoleId(@RequestBody(required = false) EmpAuthDto empAuthDto);

    @PostMapping(value = "/emp/auth/check")
    Result empAuthCheck(@RequestBody(required = false) EmpAuthDto empAuthDto);

}

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SMeiJiService.java

@@ -15,8 +15,14 @@
public interface SMeiJiService {

    /**
     * 订单列表
     * 美际档案列表
     */
    @PostMapping(value = "/meiji/userSkinReportList")
    Result userSkinReportList(@RequestBody UserDto userDto);

    /**
     * 查询用户最新的美际档案
     */
    @PostMapping(value = "/meiji/one")
    Result userSkinReportOne(@RequestBody UserDto userDto);
}

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java

@@ -10,6 +10,7 @@
import org.springframework.web.bind.annotation.RequestParam;

import java.util.List;
import java.util.Map;

/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
@@ -99,4 +100,12 @@
    @PostMapping(value = "/project/check/medical")
    Result checkMedicalIitems(@RequestBody ProjectDto projectDto);

    /**
     * his助手，门店助手 开单时 使用查询项目列表
     * @param projectDto
     * @return
     */
    @PostMapping(value = "/project/list/by/type")
    Result  getProjectByTypeId(@RequestBody ProjectDto projectDto);

}

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SQuestionnaireService.java

New file
@@ -0,0 +1,33 @@
package com.hz.his.feign.service.phis;

import com.hx.resultTool.Result;
import com.hz.his.dto.PageDto;
import com.hz.his.dto.user.UserDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

import java.math.BigDecimal;

/**
 * @ClassName SActivityController
 * @Description 活动规则
 * @Author Wrh
 * @Date 2022/8/8 17:36
 * @Version 1.0
 */
@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "questionnaire")
public interface SQuestionnaireService {

    /**
     * 获取调查问卷推送记录详情
     * @param dto 用户标识
     * @return Result
     */
    @PostMapping(value = "/get/sending-records/detail")
    Result getSendingRecordsDetail(@RequestBody(required = false) UserDto dto);



}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipConsultationService.java

New file
@@ -0,0 +1,53 @@
package com.hz.his.feign.service.platform;

import com.hx.resultTool.Result;
import com.hz.his.dto.consultation.ConsultRecordDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-consult")
public interface SPhipConsultationService {

    /**
     * 开放平台-咨询记录新增/修改
     */
    @PostMapping(value = "/consultation/record/add/or/edit")
    Result addOrEditConsult(@RequestBody ConsultRecordDto consultRecordNewDto);


    /**
     * 开放平台-咨询记录删除
     */
    @PostMapping(value = "/consultation/record/del")
    Result delConsult(@RequestBody ConsultRecordDto consultRecordNewDto);

    /**
     * 开放平台-咨询记录列表
     */
    @PostMapping(value = "/consultation/record/user/list")
    Result listConsult(@RequestBody ConsultRecordDto consultRecordNewDto);

    /**
     * 开放平台- 获取上一次记录部分字段
     */
    @PostMapping(value = "/consultation/record/last/detail")
    Result lastDetailConsult(@RequestBody ConsultRecordDto consultRecordNewDto);


    /**
     * 开放平台- 详情
     */
    @PostMapping(value = "/consultation/record/detail")
    Result detailConsult(@RequestBody ConsultRecordDto consultRecordNewDto);

    /**
     * 开放平台-划扣项目列表
     */
    @PostMapping(value = "/consultation/record/deduction/project/list")
    Result deductionProList(@RequestBody ConsultRecordDto consultRecordNewDto);

}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java

@@ -2,6 +2,7 @@

import com.hx.resultTool.Result;
import com.hz.his.dto.coupon.CouponDto;
import com.hz.his.dto.coupon.CouponSendDto;
import com.hz.his.dto.coupon.OrderSendCouponDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -26,6 +27,12 @@
    Result sendUserCoupon(@RequestBody CouponDto couponDto);

    /**
     * 开放平台-派发优惠券给用户-金额版本
     */
    @PostMapping(value = "/coupon/send/coupon/by/money")
    Result sendUserCouponByMoney(@RequestBody CouponSendDto couponSendDto);

    /**
     * 开放平台-作废优惠券
     */
    @PostMapping(value = "/coupon/cancel/coupon")

 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java

@@ -65,4 +65,10 @@
     */
    @PostMapping(value = "/deduction/delete")
    Result deleteData(@RequestBody DeductionDto dto);

    /**
     * 划扣术后提示卡通知获取数据
     */
    @PostMapping(value = "/deduction/postoperative/card/info")
    Result postoperativeCardInfo(@RequestBody DeductionDto dto);
}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java

New file
@@ -0,0 +1,29 @@
package com.hz.his.feign.service.platform;

import com.hx.resultTool.Result;
import com.hz.his.dto.marketing.MarketActivityDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * 营销活动service
 * @USER: fhx
 * @DATE: 2023/8/2
 **/
@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-market-activity")
public interface SPhipMarketActivityService {

    /** 列表 */
    @PostMapping(value = "/market/activity/list")
    Result list(@RequestBody MarketActivityDto dto);

    /** 详情 */
    @PostMapping(value = "/market/activity/detail")
    Result detail(@RequestBody MarketActivityDto dto);

    /** 领取优惠券 */
    @PostMapping(value = "/market/activity/receiveCoupon")
    Result receiveCoupon(@RequestBody MarketActivityDto dto);

}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserInfoCompleteService.java

New file
@@ -0,0 +1,30 @@
package com.hz.his.feign.service.platform;

import com.hx.resultTool.Result;
import com.hz.his.dto.user.usercompleteInfo.UserInfoCompleteDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-user-complete")

public interface SPhipUserInfoCompleteService {


    /**
     * 开放平台-处理扫码用户完善资料页信息 (编辑)
     */
    @PostMapping(value = "/user/complete/edit")
    Result userCompleteEdit(@RequestBody UserInfoCompleteDto userInfoCompleteDto);


    /**
     * 开放平台-展示 完善资料页详情数据
     */
    @PostMapping(value = "/user/complete/detail")
    Result userCompleteDetail(@RequestBody UserInfoCompleteDto userInfoCompleteDto);

}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java

@@ -4,6 +4,7 @@
import com.hz.his.dto.user.money.PhisUserMoneyDto;
import com.hz.his.dto.user.money.UserMoneyDto;
import com.hz.his.dto.user.money.UserMoneyUpdateDto;
import com.hz.his.dto.user.money.UserTurnDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -43,4 +44,10 @@
     */
    @PostMapping(value = "/user/money/log/use/info")
    Result userMoneyLogUseInfo(@RequestBody UserMoneyDto userMoneyDto);

    /**
     * 开放平台-用户资金转赠
     */
    @PostMapping(value = "/user/money/turn")
    Result userMoneyTurn(@RequestBody UserTurnDto userTurnDto);
}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiActivityReportService.java

New file
@@ -0,0 +1,22 @@
package com.hz.his.feign.service.platform.bi;

import com.hx.resultTool.Result;
import com.hz.his.dto.activityData.ActivityReportDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;


/**
 * 升单报表
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-activity-report")
public interface BiActivityReportService {

    /**
     * 导出
     */
    @PostMapping("/activity/report/export")
    Result export(@RequestBody ActivityReportDto activityReportDto);
}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiArriveReportService.java

New file
@@ -0,0 +1,42 @@
package com.hz.his.feign.service.platform.bi;

import com.hx.resultTool.Result;
import com.hz.his.dto.report.EmployeeReportDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;


/**
 * 预约到访分析报表
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-arrive-report")
public interface BiArriveReportService {

    /**
     * 预约到访分析-门店数据
     */
    @PostMapping("/report/arrive/shop/list")
    Result shopDataList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 预约到访分析-咨询师
     */
    @PostMapping("/report/arrive/employee/list")
    Result empDataList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 预约到访分析-门店数据-导出
     */
    @PostMapping("/report/arrive/shop/list/export")
    Result shopDataListExport(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 预约到访分析-咨询师-导出
     */
    @PostMapping("/report/arrive/employee/list/export")
    Result empDataListExport(@RequestBody EmployeeReportDto employeeReportDto);


}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java

@@ -84,9 +84,20 @@

    /**
     * 咨询师-老带新业绩
     * 返回接口Result.success(data); data是个map,key为员工标识,value是金额
     */
    @PostMapping("/admin/export/employee/oldNew/report")
    Result oldNewReport(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 咨询师-预约周期报表
     */
    @PostMapping("/admin/export/employee/cycle/week/list")
    Result cycleWeekList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 咨询师-预约周期报表-导出
     */
    @PostMapping("/admin/export/employee/cycle/week/list/export")
    Result cycleWeekListExport(@RequestBody EmployeeReportDto employeeReportDto);

}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java

@@ -116,5 +116,9 @@
    @PostMapping("/admin/consultant/report/room/list")
    Result roomList(@RequestBody EmployeeReportDto employeeReportDto);

    /**咨询师-咨询师-初诊成交率 */
    @PostMapping("/admin/consultant/report/first/user/rate/export")
    Result firstRateListExport(@RequestBody EmployeeReportDto employeeReportDto);


}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSourceService.java

New file
@@ -0,0 +1,30 @@
package com.hz.his.feign.service.platform.bi;

import com.hx.resultTool.Result;
import com.hz.his.dto.report.EmployeeReportDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * 咨询师评分报表
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name="phiskin-bi-view-user",path = "/bi-view",contextId = "bi-consultant-source")
public interface BiConsultantSourceService {

    /*** 咨询师-评分列表 */
    @PostMapping("/admin/consultant/report/source/list")
    Result empSourceList(@RequestBody(required = false) EmployeeReportDto employeeReportDto);

    /*** 咨询师-评分列表-导出 */
    @PostMapping("/admin/consultant/report/source/emp/source/export")
    Result empSourceExport(@RequestBody(required = false) EmployeeReportDto employeeReportDto);


    /*** 咨询师-排名-导出 */
    @PostMapping("/admin/consultant/report/source/shop/emp/source/export")
    Result shopEmpSourceExport(@RequestBody(required = false) EmployeeReportDto employeeReportDto);


}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java

New file
@@ -0,0 +1,123 @@
package com.hz.his.feign.service.platform.bi;

import com.hx.resultTool.Result;
import com.hz.his.dto.report.EmployeeReportDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;


/**
 * 医生快报
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-doctor-perf-sale")
public interface BiDoctorSaleService {

    /**
     * 医生-业绩总列表
     */
    @PostMapping("/admin/doctor/sale/report/deduction/total/list")
    Result deductionList(@RequestBody EmployeeReportDto employeeReportDto);


    /**
     * 医生-执行业绩数据-分门店
     */
    @PostMapping("/admin/doctor/sale/report/deduction/shop/list")
    Result deductionDetailList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 医生-核心项目占比数据
     */
    @PostMapping("/admin/doctor/sale/report/core/project/list")
    Result coreProjectList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 医生-核心项目业绩追踪
     */
    @PostMapping("/admin/doctor/sale/report/core/project/list/shop")
    Result coreProjectShopList(@RequestBody EmployeeReportDto employeeReportDto);


    /**
     * 执行项目-分类
     */
    @PostMapping("/admin/doctor/sale/report/project/type/list")
    Result projectList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 执行项目-分类联合治疗
     */
    @PostMapping("/admin/doctor/sale/report/project/combination/therapy/list")
    Result combinationTherapy(@RequestBody EmployeeReportDto employeeReportDto);


    /**
     * 执行部位
     */
    @PostMapping("/admin/doctor/sale/report/project/body/list")
    Result bodyList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 流失数据
     */
    @PostMapping("/admin/doctor/sale/report/loss/user/list")
    Result lossUserList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 重点品项流失预警-项目
     */
    @PostMapping("/admin/doctor/sale/report/loss/project/list")
    Result lossProjectList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 重点品项流失预警-营销
     */
    @PostMapping("/admin/doctor/sale/report/loss/project/market/list")
    Result lossProjectMarketList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 治疗标签会员数量
     */
    @PostMapping("/admin/doctor/sale/report/treat/label/info/list")
    Result treatLabelInfoList(@RequestBody EmployeeReportDto employeeReportDto);







    /**
     * 执行项目-SPU占比
     */
    @PostMapping("/admin/doctor/sale/report/project/spu/list")
    Result projectGeneralList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 医生治疗会员情况
     */
    @PostMapping("/admin/doctor/sale/report/treat/user/list")
    Result treatUserList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 坐诊,接诊,预约数据
     */
    @PostMapping("/admin/doctor/sale/report/all/list")
    Result allList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 顾问关系执行占比
     */
    @PostMapping("/admin/doctor/sale/report/consultant/deduction/list")
    Result userDeductionList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 推荐顾客等级占比
     */
    @PostMapping("/admin/doctor/sale/report/user/list")
    Result inviteList(@RequestBody EmployeeReportDto employeeReportDto);


}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java

@@ -82,6 +82,12 @@
    @PostMapping("/admin/operational/channels/deal")
    Result channelsDeal(@RequestBody OperationalStatementsVo operationalStatementsVo);

    /**
     * 各渠道首天成交情况分析-渠道总信息-导出
     */
    @PostMapping("/admin/operational/channels/deal/export")
    Result channelsDealExport(@RequestBody OperationalStatementsVo operationalStatementsVo);


    /**
     * 各渠道首天成交情况分析-新媒体沉睡客渠道现金业绩
@@ -94,6 +100,12 @@
     */
    @PostMapping("/admin/operational/shop/channels")
    Result shopChannels(@RequestBody OperationalStatementsVo operationalStatementsVo);

    /**
     * 各渠道首天成交情况分析-门诊各渠道首天成交情况分析-导出
     */
    @PostMapping("/admin/operational/shop/channels/export")
    Result shopChannelsExport(@RequestBody OperationalStatementsVo operationalStatementsVo);

    /**
     * 门店&咨询师老带新首天成交金额分析
@@ -149,5 +161,10 @@
    @PostMapping("/admin/operational/month/deduction/list")
    Result monthDeductionList(@RequestBody OperationalStatementsVo operationalStatementsVo);

    /**
     * SPA代王业绩报表
     */
    @PostMapping("/admin/operational/channels/deal/dw/spa")
    Result channelsSpaDw(@RequestBody OperationalStatementsVo operationalStatementsVo);

}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSPAService.java

New file
@@ -0,0 +1,39 @@
package com.hz.his.feign.service.platform.bi;

import com.hx.resultTool.Result;
import com.hz.his.dto.report.EmployeeReportDto;
import com.hz.his.dto.report.ShopReportDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;


/**
 * 门店日报表
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name="phiskin-bi-view-user",path = "/bi-view",contextId = "bi-shop-spa")
public interface BiShopSPAService {

    /**
     * 日报表-当日各业绩指标
     * ShopAchievementVo
     */
    @PostMapping("/admin/export/shop/spa/day/indicators")
    Result dayIndicators(@RequestBody ShopReportDto shopReportDto);

    /**
     * SPA咨询师业绩日报表
     * EmployeeReportDto
     */
    @RequestMapping("/admin/export/shop/spa/employee/indicators/list")
    Result employeeIndicatorsList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * SPA项目指标数据
     * ShopImportantProjectVo
     */
    @PostMapping("/admin/export/shop/spa/project/indicators/list")
    Result projectIndicatorsList(@RequestBody ShopReportDto shopReportDto);
}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/compare/SComparePhoteService.java

New file
@@ -0,0 +1,74 @@
package com.hz.his.feign.service.platform.compare;

import com.hx.resultTool.Result;
import com.hz.his.vo.compare.CompareDeleteVo;
import com.hz.his.vo.compare.CompareListVo;
import com.hz.his.vo.compare.CompareVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**对比照feign
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 * @author CJH
 */
@FeignClient(name="phi-platform-service",path = "/phip",contextId = "compare-photo")
public interface SComparePhoteService {

    /**列表
     * @param compareListVo 传参结构
     * @return
     */
    @PostMapping(value = "/compare/photo/record/list")
    Result listData(@RequestBody CompareListVo compareListVo);


    /**新增对比照
     * @param compareVo 传参结构
     * @return
     */
    @PostMapping(value = "/compare/photo/record/add")
    Result add(@RequestBody CompareVo compareVo);

    /**查看对比照
     * @param compareListVo 传参结构
     * @return data转化为CompareDataVo
     */
    @PostMapping(value = "/compare/photo/record/see")
    Result see(@RequestBody CompareListVo compareListVo);

    /**更新对比照
     * @param compareVo 传参结构
     */
    @PostMapping(value = "/compare/photo/record/update")
    Result update(@RequestBody CompareVo compareVo);

    /**删除对比照总记录
     * @param compareDeleteVo 传参结构
     * @return
     */
    @PostMapping(value = "/compare/photo/record/delete")
    Result delete(@RequestBody CompareDeleteVo compareDeleteVo);

    /**删除对比照子单
     * @param compareDeleteVo 传参结构
     * @return
     */
    @PostMapping(value = "/compare/photo/record/delete/item")
    Result deleteItem(@RequestBody CompareDeleteVo compareDeleteVo);

    /**获取用户项目
     * @param compareListVo 传参结构
     * @return
     */
    @PostMapping(value = "/compare/photo/record/user/project")
    Result userProjectSearchList(@RequestBody CompareListVo compareListVo);

    /**获取用户划扣
     * @param compareListVo 传参结构
     * @return
     */
    @PostMapping(value = "/compare/photo/record/deduction/project")
    Result userDeductionSearchList(@RequestBody CompareListVo compareListVo);

}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SConsumeNotifyRefundService.java

New file
@@ -0,0 +1,23 @@
package com.hz.his.feign.service.platform.payment;

import com.hx.resultTool.Result;
import com.hz.his.vo.order.refund.qr.RefundQrVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name="phi-platform-service",path = "/phip",contextId = "c-notify-r")
public interface SConsumeNotifyRefundService {

    /**
     * 订单二维码调起退款
     * 针对未支付的订单，但是已经使用了订单二维码支付
     * data使用 RefundQrResponseVo 转化
     */
    @PostMapping(value = "/order/qr/refund")
    Result orderQrRefund(@RequestBody RefundQrVo refundQrVo);

}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPayNoService.java

@@ -1,7 +1,7 @@
package com.hz.his.feign.service.platform.payment;

import com.hx.resultTool.Result;
import com.hz.his.vo.payment.PayNoVo;
import com.hz.phis.vo.payment.PayNoVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -13,8 +13,8 @@
public interface SPayNoService {

    /**
     * 获取支付编号，只返回支付编号
     * data就是支付编号
     * 获取支付编号
     * data就是转 PayNoResVo
     */
    @PostMapping(value = "/pay/create")
    Result payCreate(@RequestBody PayNoVo payNoVo);

 phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPaymentService.java

New file
@@ -0,0 +1,22 @@
package com.hz.his.feign.service.platform.payment;

import com.hx.resultTool.Result;
import com.hz.phis.vo.payment.qr.OrderQrPayVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name="phi-platform-service",path = "/phip",contextId = "payment-qr")
public interface SPaymentService {

    /**
     * 请求订单二维码支付
     * data转化对象 OrderQrResponeVo
     */
    @PostMapping(value = "/payment/order/qr")
    Result orderQrPay(@RequestBody OrderQrPayVo orderQrPayVo);

}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/quotation/SPhipQuotationService.java

New file
@@ -0,0 +1,48 @@
package com.hz.his.feign.service.platform.quotation;

import com.hx.resultTool.Result;
import com.hz.his.dto.quotation.QuotationDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * 报价单service
 * @USER: fhx
 * @DATE: 2023/8/8
 **/
@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-quotation")
public interface SPhipQuotationService {

    /** 列表信息接口 */
    @PostMapping("/quotation/list")
    Result list(@RequestBody QuotationDto dto);

    /** 新增信息接口 */
    @PostMapping("/quotation/addInfo")
    Result addInfo(@RequestBody QuotationDto dto);

    /** 编辑信息接口 */
    @PostMapping("/quotation/editInfo")
    Result editInfo(@RequestBody QuotationDto dto);

    /** 新增报价单 */
    @PostMapping("/quotation/add")
    Result add(@RequestBody QuotationDto dto);

    /** 编辑报价单 */
    @PostMapping("/quotation/edit")
    Result edit(@RequestBody QuotationDto dto);

    /** 删除报价单 */
    @PostMapping("/quotation/del")
    Result del(@RequestBody QuotationDto dto);

    /** CRM报价单信息 */
    @PostMapping("/quotation/crmQuotationInfo")
    Result crmQuotationInfo(@RequestBody QuotationDto dto);

    /** 开单数据 */
    @PostMapping("/quotation/openOrderData")
    Result openOrderData(@RequestBody QuotationDto dto);
}

 phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java

@@ -1,14 +1,10 @@
package com.hz.his.vo.bi.revenue;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
import com.gitee.sunchenbin.mybatis.actable.annotation.Index;
import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

/**
 *收入确认表查询
@@ -16,7 +12,10 @@
 */
@Data
public class RevenueQuery{

    /**页数*/
    private Integer pageNum;
    /**条数*/
    private Integer pageSize;
    /**其他查询*/
    private String KeyWord;
    /**用户CIQ*/
@@ -39,520 +38,425 @@
    private Date startCreateTime;
    /**创建日期*/
    private Date endCreateTime;
    /**是否过滤测试账号*/
    private Integer isFilterTestAccount;
    /**是否过滤对冲数据*/
    private Integer isHedging;
    /**业绩类型*/
    private List<Integer> sourceTypeList;

    /**请求操作人*/
    private String operatorId;
    /**请求操作人*/
    private String operatorName;

    @Column(comment = "来源类型", length = 2, type = MySqlTypeConstant.INT, isNull = false)




    /**来源类型*/
    private Integer sourceType;
    @Column(comment = "来源类型名称", type = MySqlTypeConstant.VARCHAR, length = 10)
    /**来源类型名称*/
    private String sourceTypeName;
    @Index
    @Column(comment = "来源标识(根据来源类型存储标识)", type = MySqlTypeConstant.VARCHAR, length = 32, isNull = false)
    /**来源标识*/
    private String sourceId;
    @Column(comment = "来源编号(根据来源类型存储编号(例:单号、划扣号)", type = MySqlTypeConstant.VARCHAR, length = 64)
    /**来源编号(根据来源类型存储编号(例:单号、划扣号)*/
    private String sourceNo;
    @Index
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @Column(comment = "来源业绩时间", type = MySqlTypeConstant.DATETIME, isNull = false)
    /**来源业绩时间*/
    private Date sourceTime;
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @Column(comment = "来源创建时间", type = MySqlTypeConstant.DATETIME, isNull = false)
    /**来源创建时间*/
    private Date sourceCreateTime;

    @Column(comment = "来源总标识(根据来源类型存储标识)", type = MySqlTypeConstant.VARCHAR, length = 32)
    /**来源总标识*/
    private String sourceGeneralId;
    @Column(comment = "来源总编号(根据来源类型存储编号(例:单号、划扣号)", type = MySqlTypeConstant.VARCHAR, length = 64)
    /**来源总编号(根据来源类型存储编号(例:单号、划扣号)*/
    private String sourceGeneralNo;

    @Column(comment = "营销分类(OrderItemConstants)", length = 64, type = MySqlTypeConstant.VARCHAR, isNull = false)
    /**营销分类*/
    private String marketingType;
    @Column(comment = "营销分类名称", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**营销分类名称*/
    private String marketingTypeName;

    @Column(comment = "营销名称", type = MySqlTypeConstant.VARCHAR,length = 128)
    /**营销名称*/
    private String marketingName;

    @Column(comment = "基础分类(OrderItemConstants)", length = 64, type = MySqlTypeConstant.VARCHAR, isNull = false)
    /**基础分类*/
    private String basicType;
    @Column(comment = "基础分类名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**基础分类名称*/
    private String basicTypeName;

    @Column(comment = "一级分类(OrderItemConstants)", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**一级分类*/
    private String firstLevelType;
    @Column(comment = "一级分类名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**一级分类名称*/
    private String firstLevelTypeName;
    @Column(comment = "二级分类(OrderItemConstants)", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**二级分类*/
    private String secondLevelType;
    @Column(comment = "二级分类名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**二级分类名称*/
    private String secondLevelTypeName;
    @Column(comment = "分类父类包括自己JSON，格式:[{\"id\":\"渠道标识\",\"name\":\"渠道名称\",\"parentId\":\"父类标识\"}]",  type = MySqlTypeConstant.TEXT,isNull = false)
    /**分类父类包括自己JSON*/
    private String classifyJson = "[]";

    @Index
    @Column(comment = "项目id/商品id（公用标识）", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**项目id*/
    private String commonId;
    @Column(comment = "项目编号/商品编码", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**项目编号/商品编码*/
    private String commonNo;
    @Column(comment = "项目名称/商品名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**项目名称/商品名称*/
    private String commonName;

    @Column(comment = "规格",  length = 128, type = MySqlTypeConstant.VARCHAR)
    /**规格*/
    private String specification;
    @Column(comment = "资质", length = 128,  type = MySqlTypeConstant.VARCHAR)
    /**资质*/
    private String qualification;
    @Column(comment = "项目单位", length = 128, type = MySqlTypeConstant.VARCHAR)
    /**项目单位*/
    private String unit;

    @Column(comment = "科室编号", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**科室编号*/
    private String departmentCode;
    @Column(comment = "科室名称",  length = 64, type = MySqlTypeConstant.VARCHAR)
    /**科室名称*/
    private String departmentName;

    @Column(comment = "价格标签", length = 128, type = MySqlTypeConstant.VARCHAR)
    /**价格标签*/
    private String priceTag;

    @Index
    @Column(comment = "收费订单id", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**收费订单id*/
    private String payOrderId;
    @Column(comment = "收费单号", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**收费单号*/
    private String payOrderNo;

    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
    @Column(comment="结算时间(收费日期)",type = MySqlTypeConstant.DATETIME)
    /**结算时间(收费日期)*/
    private Date orderTime;
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
    @Column(comment="执行日期",type = MySqlTypeConstant.DATETIME)
    /**执行日期*/
    private Date deductionTime;

    @Column(comment = "业务类型(PerformanceInfoEnum)",  type = MySqlTypeConstant.VARCHAR, length = 64)
    /**业务类型*/
    private String businessType;
    @Column(comment = "业务类型名称", type = MySqlTypeConstant.VARCHAR, length = 64)
    /**业务类型名称*/
    private String businessTypeName;

    @Index
    @Column(comment = "用户id", length = 64, type = MySqlTypeConstant.VARCHAR, isNull = false)
    /**用户id*/
    private String userId;
    @Column(comment = "会员号(用户编号)", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**会员号(用户编号)*/
    private String memberNO;
    @Column(comment = "CIQ", length = 64, type = MySqlTypeConstant.VARCHAR)
    private String memberCIQ;
    @Column(comment = "病例号", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**病例号*/
    private String memberCaseNo;
    @Column(comment = "客户类别", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**客户类别*/
    private String userClass;
    @Column(comment="是否首次执行", length = 1, type = MySqlTypeConstant.INT)
    /**是否首次执行*/
    private Integer isFirstDeduction;
    @Column(comment="会员等级", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**会员等级*/
    private String userLevel;
    @Column(comment="用户名称", type = MySqlTypeConstant.VARCHAR)
    /**用户名称*/
    private String userName;
    @Column(comment="共享客户", length = 1, type = MySqlTypeConstant.TINYINT)
    /**共享客户*/
    private Integer shareCustomer;
    @Column(comment = "客户类型", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**客户类型*/
    private String userType;

    @Column(comment = "登记人类型", length = 1, type = MySqlTypeConstant.TINYINT)
    /**登记人类型*/
    private Integer registrantType;
    @Index
    @Column(comment = "登记人Id", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**登记人Id*/
    private String registrantId;
    @Column(comment = "登记人名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**登记人名称*/
    private String registrantName;

    @Index
    @Column(comment = "执行医生Id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**执行医生Id*/
    private String deductionDoctorId;
    @Column(comment = "执行医生名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**执行医生名称*/
    private String deductionDoctorName;

    @Index
    @Column(comment = "助理医生Id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**助理医生Id*/
    private String assistantDoctorId;
    @Column(comment = "助理医生名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**助理医生名称*/
    private String assistantDoctorName;

    @Index
    @Column(comment = "美容师Id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**美容师Id*/
    private String beauticianId;
    @Column(comment = "美容师名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**美容师名称*/
    private String beauticianName;

    @Index
    @Column(comment = "订单id", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**订单id*/
    private String orderId;
    @Column(comment = "订单编号", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**订单编号*/
    private String orderNo;

    @Index
    @Column(comment = "订单条码id", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**订单条码id*/
    private String orderItemId;
    @Column(comment = "订单条码编号", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**订单条码编号*/
    private String orderItemNo;

    @Column(comment = "开单人类型", length = 1, type = MySqlTypeConstant.TINYINT)
    /**开单人类型*/
    private Integer orderOpType;
    @Index
    @Column(comment = "开单人Id", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**开单人Id*/
    private String orderOpId;
    @Column(comment = "开单人名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**开单人名称*/
    private String orderOpName;


    @Column(comment = "开发人类型", length = 1, type = MySqlTypeConstant.TINYINT)
    /**开发人类型*/
    private Integer developOpType;
    @Column(comment = "开发人Id", type = MySqlTypeConstant.VARCHAR)
    /**开发人Id*/
    private String developOpId;
    @Column(comment = "开发人名称", type = MySqlTypeConstant.VARCHAR)
    /**开发人名称*/
    private String developOpName;

    @Column(comment = "开发人门店标识", type = MySqlTypeConstant.VARCHAR,length = 64)
    /**开发人门店标识*/
    private String developShopId;
    @Column(comment = "开发人门店名称", type = MySqlTypeConstant.VARCHAR,length = 64)
    /**开发人门店名称*/
    private String developShopName;

    @Column(comment = "所属咨询师类型", length = 1, type = MySqlTypeConstant.TINYINT)
    /**所属咨询师类型*/
    private Integer belongConsultantType;
    @Index
    @Column(comment = "用户所属咨询师id(Employee id) 用户划扣时的所属咨询师", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**用户所属咨询师id(Employee id) 用户划扣时的所属咨询师*/
    private String belongConsultantId;
    @Column(comment = "用户所属咨询师名称", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**用户所属咨询师名称*/
    private String belongConsultantName;

    @Column(comment = "用户所属咨询师所属门店信息", type = MySqlTypeConstant.LONGTEXT)
    /**用户所属咨询师所属门店信息*/
    private String belongConsultantShopInfo;

    @Column(comment = "开单咨询师类型", length = 1, type = MySqlTypeConstant.TINYINT)
    /**开单咨询师类型*/
    private Integer orderConsultantType;
    @Index
    @Column(comment = "开单咨询师id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**开单咨询师id*/
    private String orderConsultantId;
    @Column(comment = "开单咨询师名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**开单咨询师名称*/
    private String orderConsultantName;

    @Column(comment = "收银咨询师类型", length = 1, type = MySqlTypeConstant.TINYINT)
    /**收银咨询师类型*/
    private Integer cashierConsultantType;
    @Index
    @Column(comment = "收银咨询师id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**收银咨询师id*/
    private String cashierConsultantId;
    @Column(comment = "收银咨询师名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**收银咨询师名称*/
    private String cashierConsultantName;

    @Column(comment = "接诊咨询师名称类型", length = 1, type = MySqlTypeConstant.TINYINT)
    /**接诊咨询师名称类型*/
    private Integer receptionConsultantType;
    @Index
    @Column(comment = "接诊咨询师id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**接诊咨询师id*/
    private String receptionConsultantId;
    @Column(comment = "接诊咨询师名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**接诊咨询师名称*/
    private String receptionConsultantName;

    @Column(comment = "执行咨询师类型", length = 1, type = MySqlTypeConstant.TINYINT)
    /**执行咨询师类型*/
    private Integer deductionConsultantType;
    @Index
    @Column(comment = "执行咨询师id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**执行咨询师id*/
    private String deductionConsultantId;
    @Column(comment = "执行咨询师名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**执行咨询师名称*/
    private String deductionConsultantName;

    @Column(comment = "收入计入", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**收入计入*/
    private String revenueRecordedType;
    @Column(comment = "收入计入名称", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**收入计入名称*/
    private String revenueRecordedName;

    @Column(comment = "收入主体", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**收入主体*/
    private String revenueSubjectType;
    @Column(comment = "收入主体名称", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**收入主体名称*/
    private String revenueSubjectName;

    @Column(comment = "原单价", length = 28, type = MySqlTypeConstant.DECIMAL)
    /**原单价*/
    private BigDecimal originalPrice = BigDecimal.ZERO;
    @Column(comment = "数量", type = MySqlTypeConstant.INT,length = 11)
    /**数量*/
    private Integer quantity;
    @Column(comment = "未执行次数", type = MySqlTypeConstant.INT)
    /**未执行次数*/
    private Integer notUsedNum;

    @Column(comment = "折扣", length = 28, type = MySqlTypeConstant.DECIMAL)
    /**折扣*/
    private BigDecimal discount = BigDecimal.ZERO;
    @Column(comment = "折后金额", length = 28, type = MySqlTypeConstant.DECIMAL)
    /**折后金额*/
    private BigDecimal discountAmount = BigDecimal.ZERO;
    @Column(comment = "收银金额", length = 28, type = MySqlTypeConstant.DECIMAL)
    /**收银金额*/
    private BigDecimal cashierAmount = BigDecimal.ZERO;

    @Column(comment="是否欠费", length = 1, type = MySqlTypeConstant.INT)
    /**是否欠费*/
    private Integer isArrears;
    @Column(comment = "预定金", length = 28, type = MySqlTypeConstant.DECIMAL)
    /**预定金*/
    private BigDecimal deposit = BigDecimal.ZERO;
    @Column(comment = "储值金", length = 28, type = MySqlTypeConstant.DECIMAL)
    /**储值金*/
    private BigDecimal storedValueFund = BigDecimal.ZERO;
    @Column(comment = "增值金", length = 28, type = MySqlTypeConstant.DECIMAL)
    /**增值金*/
    private BigDecimal valueAddedFund = BigDecimal.ZERO;
    @Column(comment = "积分", length = 28, type = MySqlTypeConstant.DECIMAL)
    /**积分*/
    private BigDecimal integral = BigDecimal.ZERO;
    @Column(comment = "积分金额", length = 28, type = MySqlTypeConstant.DECIMAL)
    /**积分金额*/
    private BigDecimal integralAmount = BigDecimal.ZERO;
    @Column(comment = "虚拟金额", length = 28, type = MySqlTypeConstant.DECIMAL)
    /**虚拟金额*/
    private BigDecimal virtualAmount = BigDecimal.ZERO;

    @Column(comment = "业绩总额", length = 28, type = MySqlTypeConstant.DECIMAL)
    /**业绩总额*/
    private BigDecimal performanceTotal = BigDecimal.ZERO;
    @Column(comment = "业绩不含税", length = 28, type = MySqlTypeConstant.DECIMAL)
    /**业绩不含税*/
    private BigDecimal performanceNotHasTax;
    @Column(comment = "税额", length = 28, type = MySqlTypeConstant.DECIMAL)
    /**税额*/
    private BigDecimal taxAmount;

    @Column(comment = "标准耗材成本", length = 28, type = MySqlTypeConstant.DECIMAL)
    /**标准耗材成本*/
    private BigDecimal standardConsumablesCost = BigDecimal.ZERO;
    @Column(comment = "实际耗材成本", length = 28, type = MySqlTypeConstant.DECIMAL)
    /**实际耗材成本*/
    private BigDecimal actualConsumablesCost = BigDecimal.ZERO;

    @Column(comment = "渠道分类标识(ChannelsType)(必填，代码判断)", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**渠道分类标识*/
    private String channelsTypeId;
    @Column(comment = "渠道分类名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**渠道分类名称*/
    private String channelsTypeName;
    @Column(comment = "渠道标识", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**渠道标识*/
    private String channelId;
    @Column(comment = "渠道名称",  length = 64, type = MySqlTypeConstant.VARCHAR)
    /**渠道名称*/
    private String channelName;

    @Column(comment = "渠道联系人类型", length = 4, type = MySqlTypeConstant.TINYINT)
    /**渠道联系人类型*/
    private Integer channelContactType;
    @Index
    @Column(comment = "渠道联系人Id", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**渠道联系人Id*/
    private String channelContactId;
    @Column(comment = "渠道联系人名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**渠道联系人名称*/
    private String channelContactName;

    @Column(comment = "渠道合作人类型", length = 1, type = MySqlTypeConstant.TINYINT)
    /**渠道合作人类型*/
    private Integer channelPartnerType;
    @Index
    @Column(comment = "渠道合作人Id", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**渠道合作人Id*/
    private String channelPartnerId;
    @Column(comment = "渠道合作人名称", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**渠道合作人名称*/
    private String channelPartnerName;

    @Column(comment = "诊所内部联络人类型", length = 1, type = MySqlTypeConstant.TINYINT)
    /**诊所内部联络人类型*/
    private Integer internalContactType;
    @Index
    @Column(comment = "诊所内部联络人Id", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**诊所内部联络人Id*/
    private String internalContactId;
    @Column(comment = "诊所内部联络人名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**诊所内部联络人名称*/
    private String internalContactName;

    @Column(comment = "电网咨询师id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**电网咨询师id*/
    private String tmkServiceId;
    @Column(comment = "电网咨询师名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**电网咨询师名称*/
    private String tmkServiceName;

    @Column(comment = "客服id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**客服id*/
    private String chatCorpUserId;
    @Column(comment = "客服名称", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**客服名称*/
    private String chatCorpUserName;

    @Column(comment = "护士id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**护士id*/
    private String nurseCorpUserId;
    @Column(comment = "护士名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**护士名称*/
    private String nurseCorpUserName;

    @Column(comment = "洗手护士id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**洗手护士id*/
    private String handWashNurseId;
    @Column(comment = "洗手护士名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**洗手护士名称*/
    private String handWashNurseName;

    @Column(comment = "巡回护士id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**巡回护士id*/
    private String circuitingNurseId;
    @Column(comment = "巡回护士名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**巡回护士名称*/
    private String circuitingNurseName;

    @Column(comment = "配台护士id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**配台护士id*/
    private String tableNurseId;
    @Column(comment = "配台护士名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**配台护士名称*/
    private String tableNurseName;

    @Column(comment = "麻醉师id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**麻醉师id*/
    private String anesthesiologistId;
    @Column(comment = "麻醉师名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**麻醉师名称*/
    private String anesthesiologistName;

    @Column(comment = "疗程总额", length = 28, type = MySqlTypeConstant.DECIMAL)
    /**疗程总额*/
    private BigDecimal treatmentTotal;

    @Column(comment = "TMK登记人id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**TMK登记人id*/
    private String tmkRegistrantId;
    @Column(comment = "TMK登记人名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**TMK登记人名称*/
    private String tmkRegistrantName;

    @Column(comment = "收费员id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**收费员id*/
    private String chargeId;
    @Column(comment = "收费员名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**收费员名称*/
    private String chargeName;

    @Column(comment = "服务门店id", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**服务门店id*/
    private String serviceShopId;
    @Column(comment = "服务门店名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**服务门店名称*/
    private String serviceShopName;

    @Column(comment = "用户所属门店id", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**用户所属门店id*/
    private String belongShopId;
    @Column(comment = "用户所属门店名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**用户所属门店名称*/
    private String belongShopName;

    @Column(comment = "下单门店id", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**下单门店id*/
    private String orderShopId;
    @Column(comment = "下单门店名称", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**下单门店名称*/
    private String orderShopName;

    @Column(comment = "收银门店id", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**收银门店id*/
    private String cashierShopId;
    @Column(comment = "收银门店名称", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**收银门店名称*/
    private String cashierShopName;

    @Column(comment = "收费备注", type = MySqlTypeConstant.TEXT)
    /**收费备注*/
    private String chargeRemark;

    @Column(comment = "营销标签", type = MySqlTypeConstant.TEXT)
    /**营销标签*/
    private String marketingTag;

    @Column(comment="是否转诊转疗", length = 1, type = MySqlTypeConstant.INT)
    /**是否转诊转疗*/
    private Integer isTurn;
    @Column(comment="是否可执行项目", length = 1, type = MySqlTypeConstant.INT)
    /**是否可执行项目*/
    private Integer isDeductionProject;
    @Column(comment="是否疗程项目", length = 1, type = MySqlTypeConstant.INT)
    /**是否疗程项目*/
    private Integer isTreatmentProject;

    @Column(comment = "购买数量", type = MySqlTypeConstant.INT,length = 11)
    /**购买数量*/
    private Integer buyNum;
    @Column(comment = "疗程次数", type = MySqlTypeConstant.INT,length = 11)
    /**疗程次数*/
    private Integer treatmentNum;
    @Column(comment = "疗程总数", type = MySqlTypeConstant.INT,length = 11)
    /**疗程总数*/
    private Integer treatmentTotality;
    @Column(comment = "疗程序号", type = MySqlTypeConstant.INT,length = 11)
    /**疗程序号*/
    private Integer treatmentNo;

    @Column(comment = "划扣备注", type = MySqlTypeConstant.TEXT)
    /**划扣备注*/
    private String deductionRemark;
    @Column(comment = "免单原因", type = MySqlTypeConstant.TEXT)
    /**免单原因*/
    private String freeReason;

    @Column(comment = "业绩类别(PerformanceInfoEnum)", type = MySqlTypeConstant.VARCHAR, isNull = false)
    /**业绩类别*/
    private String performanceCategory;
    @Column(comment = "业绩类别名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**业绩类别名称*/
    private String performanceCategoryName;

    @Column(comment = "订单类型(OrderItemConstants)", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**订单类型*/
    private String orderType;
    @Column(comment = "订单类型名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**订单类型名称*/
    private String orderTypeName;

    @Column(comment = "订单分类(OrderItemConstants)", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**订单分类*/
    private int orderClassify;
    @Column(comment = "订单类型名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**订单类型名称*/
    private String orderClassifyName;

    @Column(comment = "客户成交标签", type = MySqlTypeConstant.TEXT)
    /**客户成交标签*/
    private String customerTransactionTag;

    @Column(comment = "订单渠道分类名称", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**订单渠道分类名称*/
    private String orderChannelsTypeName;

    @Column(comment = "订单一级分类(OrderItemConstants) 渠道为一级渠道id 会员填写空", type = MySqlTypeConstant.VARCHAR, length = 64)
    /**订单一级分类*/
    private String orderFirstLevelType;
    @Column(comment = "订单一级分类名称",  type = MySqlTypeConstant.VARCHAR, length = 64)
    /**订单一级分类名称*/
    private String orderFirstLevelTypeName;
    @Column(comment = "订单渠道的json，所有父类包括自己:[{\"id\":\"渠道标识\",\"parentId\":\"父类渠道标识\",\"name\":\"渠道名称\"}]", type = MySqlTypeConstant.TEXT)
    /**订单渠道的json*/
    private String orderChannelJson = "[]";
    @Column(comment = "订单渠道一级编号", type = MySqlTypeConstant.VARCHAR, length = 32)
    /**订单渠道一级编号*/
    private String orderChannel1No;
    @Column(comment = "订单渠道一级的分类标识", type = MySqlTypeConstant.VARCHAR, length = 32)
    /**订单渠道一级的分类标识*/
    private String orderChannel1TypeId;
    @Column(comment = "订单渠道一级的分类编号", type = MySqlTypeConstant.VARCHAR, length = 32)
    /**订单渠道一级的分类编号*/
    private String orderChannel1TypeNo;
    @Column(comment = "订单渠道一级的分类名称", type = MySqlTypeConstant.VARCHAR, length = 50)
    /**订单渠道一级的分类名称*/
    private String orderChannel1TypeName;

    @Column(comment = "订单二级分类(OrderItemConstants) 渠道为二级渠道id", type = MySqlTypeConstant.VARCHAR, length = 64)
    /**订单二级分类*/
    private String orderSecondLevelType;
    @Column(comment = "订单二级分类名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**订单二级分类名称*/
    private String orderSecondLevelTypeName;
    @Column(comment = "订单渠道二级编号", type = MySqlTypeConstant.VARCHAR, length = 32)
    /**订单渠道二级编号*/
    private String orderChannel2No;
    @Column(comment = "订单渠道二级的联系人名称", length = 50, type = MySqlTypeConstant.VARCHAR)
    /**订单渠道二级的联系人名称*/
    private String orderChannel2Contacts;
    @Column(comment = "订单渠道二级的部门标识", type = MySqlTypeConstant.VARCHAR, length = 32)
    /**订单渠道二级的部门标识*/
    private String orderChannel2Depart;
    @Column(comment = "订单渠道二级的部门名称", type = MySqlTypeConstant.VARCHAR, length = 32)
    /**订单渠道二级的部门名称*/
    private String orderChannel2DepartName;
    @Column(comment = "订单渠道二级的分类标识", type = MySqlTypeConstant.VARCHAR, length = 32)
    /**订单渠道二级的分类标识*/
    private String orderChannel2TypeId;
    @Column(comment = "订单渠道二级的分类编号", type = MySqlTypeConstant.VARCHAR, length = 32)
    /**订单渠道二级的分类编号*/
    private String orderChannel2TypeNo;
    @Column(comment = "订单渠道二级的分类名称", type = MySqlTypeConstant.VARCHAR, length = 50)
    /**订单渠道二级的分类名称*/
    private String orderChannel2TypeName;
    @Column(comment = "订单渠道合作人Id", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**订单渠道合作人Id*/
    private String orderChannelPartnerId;
    @Column(comment = "订单渠道合作人名称", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**订单渠道合作人名称*/
    private String orderChannelPartnerName;

    @Column(comment = "客户推荐人分类标识",length = 32, type = MySqlTypeConstant.VARCHAR)
    /**客户推荐人分类标识*/
    private String inviteeTypeId;
    @Column(comment = "客户推荐人分类名称",length = 64, type = MySqlTypeConstant.VARCHAR)
    /**客户推荐人分类名称*/
    private String inviteeTypeName;
    @Column(comment = "客户推荐人标识",length = 32, type = MySqlTypeConstant.VARCHAR)
    /**客户推荐人标识*/
    private String inviteeId;
    @Column(comment = "客户推荐人编号",length = 64, type = MySqlTypeConstant.VARCHAR)
    /**客户推荐人编号*/
    private String inviteeNo;
    @Column(comment = "邀请人编号", type = MySqlTypeConstant.VARCHAR, length = 32)
    /**邀请人编号*/
    private String inviteeCIQ;
    @Column(comment = "客户推荐人名称",length = 64, type = MySqlTypeConstant.VARCHAR)
    /**客户推荐人名称*/
    private String inviteeName;

    @Column(comment = "订单推荐人类型", length = 32, type = MySqlTypeConstant.VARCHAR)
    /**订单推荐人类型*/
    private String orderInviteeType;
    @Column(comment = "订单推荐人名称",length = 32, type = MySqlTypeConstant.VARCHAR)
    /**订单推荐人名称*/
    private String orderInviteeTypeName;
    @Column(comment = "订单推荐人标识",length = 32, type = MySqlTypeConstant.VARCHAR)
    /**订单推荐人标识*/
    private String orderInviteeId;
    @Column(comment = "客户推荐人编号",length = 64, type = MySqlTypeConstant.VARCHAR)
    /**客户推荐人编号*/
    private String orderInviteeNo;
    @Column(comment = "邀请人编号", type = MySqlTypeConstant.VARCHAR, length = 32)
    /**邀请人编号*/
    private String orderInviteeCIQ;
    @Column(comment = "订单推荐人名称",length = 64, type = MySqlTypeConstant.VARCHAR)
    /**订单推荐人名称*/
    private String orderInviteeName;
    @Column(comment = "订单推荐人角色信息",length = 128, type = MySqlTypeConstant.VARCHAR)
    /**订单推荐人角色信息*/
    private String orderInviteeRoleInfo;

    @Index
    @Column(comment = "会员主诊医生Id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
    /**会员主诊医生Id*/
    private String attendingDoctorId;
    @Column(comment = "会员主诊医生名称", length = 64,  type = MySqlTypeConstant.VARCHAR)
    /**会员主诊医生名称*/
    private String attendingDoctorName;

    @Column(comment = "治疗单类型（OrderTotalConstants）", length = 2, type = MySqlTypeConstant.INT, isNull = false, defaultValue = "0")
    /**治疗单类型*/
    private Integer treatOrderClassify;
    @Column(comment = "治疗单类型（OrderTotalConstants）", length = 32, type = MySqlTypeConstant.VARCHAR)
    /**治疗单类型*/
    private String treatOrderClassifyName;

    @Column(comment = "优惠券发放人" ,type = MySqlTypeConstant.LONGTEXT)
    /**优惠券发放人*/
    private String couponIssuer;
    @Column(comment = "优惠券发放人角色" ,type = MySqlTypeConstant.LONGTEXT)
    /**优惠券发放人角色*/
    private String couponIssuerRole;
    @Column(comment = "优惠券名称" ,type = MySqlTypeConstant.LONGTEXT)
    /**优惠券名称*/
    private String couponName;

    @Column(comment = "主渠道" ,type = MySqlTypeConstant.LONGTEXT)
    /**主渠道*/
    private String mainChannelName;
    @Column(comment = "执行部位" ,type = MySqlTypeConstant.LONGTEXT)
    /**执行部位*/
    private String deductionBodyPartInfo;

    /**页数*/
    private Integer pageNum;
    /**条数*/
    private Integer pageSize;


    public Integer getPageNum() {
        if(pageNum == null){

 phis-feign/src/main/java/com/hz/his/vo/compare/CompareDataItemVo.java

New file
@@ -0,0 +1,25 @@
package com.hz.his.vo.compare;

import lombok.Data;

/**
 * 新增或者更新实体类
 * @author CJH
 */
@Data
public class CompareDataItemVo {

    /**对比照子单标识*/
    private String id;
    /**角度类型*/
    private Integer angleType;
    /**类型 0术前 1术后 2参考*/
    private Integer type;
    /**文件类型*/
    private Integer fileType;
    /**图片/视频地址*/
    private String imgUrl;
    /**是否对客户可见 0 否 1 是*/
    private Integer isShow;

}

 phis-feign/src/main/java/com/hz/his/vo/compare/CompareDataVo.java

New file
@@ -0,0 +1,81 @@
package com.hz.his.vo.compare;

import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

/**
 * 新增或者更新实体类
 * @author CJH
 */
@Data
public class CompareDataVo {

    /**对比照标识*/
    private String id;
    /**项目第几次上传对比照*/
    private Integer projectFrequency;
    /**用户项目标识*/
    private String userProjectItemId;
    /**划扣项目标识*/
    private String deductionProjectId;
    /**划扣总表标识*/
    private String deductionSingleId;
    /**备注*/
    private String remark;

    /**划扣项目名称*/
    private String deductionProjectName;
    /**用户项目名称*/
    private String userProjectItemName;

    //----项目信息
    /**项目标识*/
    private String projectId;
    /**项目价格*/
    private BigDecimal curPrice;
    /**项目名称*/
    private String projectName;
    /**项目规格*/
    private String specification;

    //----项目信息
    /**用户标识*/
    private String userId;
    /**用户名称*/
    private String userName;
    /**用户CIQ*/
    private String CIQ;
    /**用户会员编号*/
    private String memberNO;
    /**用户病例编号*/
    private String caseNO;

    /**划扣时间*/
    private Date deductionTime;

    /**操作员工标识*/
    private String staffId;
    /**操作员工角色标识*/
    private String staffRoleId;

    /**新增操作人类型*/
    private Integer operatorType;
    /**新增操作人标识*/
    private String operatorId;
    /**新增操作人名称*/
    private String operatorName;

    /**最后变更操作人类型*/
    private Integer updateOpType;
    /**最后变更操作人标识*/
    private String updateOpId;
    /**最后变更操作人名称*/
    private String updateOpName;

    /**子数据*/
    private List<CompareDataItemVo> compareItemList;

}

 phis-feign/src/main/java/com/hz/his/vo/compare/CompareDeleteVo.java

New file
@@ -0,0 +1,25 @@
package com.hz.his.vo.compare;

import lombok.Data;

import java.util.List;

/**
 * 删除实体类
 * @author CJH
 */
@Data
public class CompareDeleteVo {

    /**对比照标识*/
    private String id;

    /**操作员工标识*/
    private String staffId;
    /**操作员工角色标识*/
    private String staffRoleId;

    /**删除的子类标识*/
    private List<String> compareItemList;

}

 phis-feign/src/main/java/com/hz/his/vo/compare/CompareItemVo.java

New file
@@ -0,0 +1,23 @@
package com.hz.his.vo.compare;

import lombok.Data;

/**
 * 新增或者更新实体类-图片
 * @author CJH
 */
@Data
public class CompareItemVo {

    /**对比照-子记录标识*/
    private String id;
    /**类型 0术前 1术后 2参考*/
    private Integer type;
    /**角度类型*/
    private Integer angleType;
    /**文件类型（图片/视频）*/
    private Integer fileType;
    /**图片/视频链接*/
    private String url;

}

 phis-feign/src/main/java/com/hz/his/vo/compare/CompareListVo.java

New file
@@ -0,0 +1,51 @@
package com.hz.his.vo.compare;

import lombok.Data;

/**
 * 对比照列表实体
 */
@Data
public class CompareListVo {

    /**当前页数*/
    private Integer pageNum;
    /**当前页显示条数*/
    private Integer pageSize;

    /**对比照标识*/
    private String id;
    /**用户标识*/
    private String userId;
    /**項目标识*/
    private String projectId;
    /**項目名称*/
    private String projectName;

    /**用户項目标识*/
    private String userProjectItemId;



    public Integer getPageNum() {
        if(pageNum == null){
            pageNum = 1;
        }
        return pageNum;
    }

    public void setPageNum(Integer pageNum) {
        this.pageNum = pageNum;
    }

    public Integer getPageSize() {
        if(pageSize == null || pageSize > 500){
            pageSize = 20;
        }
        return pageSize;
    }

    public void setPageSize(Integer pageSize) {
        this.pageSize = pageSize;
    }
}

 phis-feign/src/main/java/com/hz/his/vo/compare/CompareVo.java

New file
@@ -0,0 +1,37 @@
package com.hz.his.vo.compare;

import lombok.Data;

import java.util.List;

/**
 * 新增或者更新实体类
 * @author CJH
 */
@Data
public class CompareVo {

    /**对比照标识*/
    private String id;
    /**用户标识*/
    private String userId;
    /**项目标识*/
    private String projectId;
    /**用户项目标识*/
    private String userProjectItemId;
    /**划扣项目标识*/
    private String deductionProjectId;
    /**划扣总表标识*/
    private String deductionSingleId;
    /**备注*/
    private String remark;

    /**操作员工标识*/
    private String staffId;
    /**操作员工角色标识*/
    private String staffRoleId;

    /**子数据*/
    private List<CompareItemVo> compareItemList;

}

 phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundDeductionCancelVo.java

New file
@@ -0,0 +1,28 @@
package com.hz.his.vo.order.refund;

import lombok.Data;

import java.math.BigDecimal;

/**
 * 退款-作废划扣
 * @author CJH
 */
@Data
public class RefundDeductionCancelVo {

    /**Y-划扣记录编号*/
    private String deductionNo;
    /**Y-划扣项目记录标识*/
    private String deductionProjectId;
    /**Y-划扣总记录标识*/
    private String deductionSingleId;
    /**所属用户项目*/
    private String userProjectItemId;

    /**划扣金额（系统传值使用）*/
    private BigDecimal deductionAmount;
    /**划扣数量（系统传值使用）*/
    private Integer num;

}

 phis-feign/src/main/java/com/hz/his/vo/order/refund/qr/RefundQrResponseVo.java

New file
@@ -0,0 +1,18 @@
package com.hz.his.vo.order.refund.qr;

import lombok.Data;

import java.math.BigDecimal;

/**订单二维码退款返回实体
 * @author CJH
 */
@Data
public class RefundQrResponseVo {
    /**Y-退款编号*/
    private String refudnNo;
    /**Y-订单标识*/
    private  String orderId;
    /**Y-退款金額，必须和支付金额一样*/
    private BigDecimal refundTotal;
}

 phis-feign/src/main/java/com/hz/his/vo/order/refund/qr/RefundQrVo.java

New file
@@ -0,0 +1,22 @@
package com.hz.his.vo.order.refund.qr;

import lombok.Data;

import java.math.BigDecimal;

/**订单二维码退款实体
 * @author CJH
 */
@Data
public class RefundQrVo {
    /**Y-订单标识*/
    private  String orderId;
    /**Y-支付订单编号*/
    private String payNo;
    /**Y-退款金額，必须和支付金额一样*/
    private BigDecimal refundTotal;
    /**Y-操作员工*/
    private String employeeId;
    /**N-退款备注*/
    private String remark;
}

 phis-feign/src/main/java/com/hz/his/vo/payment/PayNoVo.java

File was deleted

 phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoResVo.java

New file
@@ -0,0 +1,16 @@
package com.hz.phis.vo.payment;

import lombok.Data;

/**获取支付编号返回
 * @author CJH
 */
@Data
public class PayNoResVo {

    /**Y-支付编号*/
    private String payNo;
    /**N-回调地址，平台的统一处理
     * 如果有特别的处理，可以不使用该回调接口*/
    private String notifyUrl;
}

 phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoVo.java

New file
@@ -0,0 +1,44 @@
package com.hz.phis.vo.payment;

import lombok.Data;

/**
 * @author CJH
 */
@Data
public class PayNoVo {

    /**N-3-前缀*/
    private String prefix;
    /**Y-20-订单号*/
    private String orderNo;
    /**Y-9-叠加长度，在orderNo后面添加长度，默认6，
     * 没有特殊要求都是默认6，最大12*/
    private Integer lengrhCount = 6;
    /**N-交易方式，PayWay获取*/
    private String payWay;
    /**Y-调起支付用户*/
    private String userId;
    /**N-调起支付员工*/
    private String employeeId;
    /**Y-关联类型*/
    private Integer type;
    /**Y-关联类型标识*/
    private String typeId;

    /**N-支付方式编号（PaymentMethod里面的编号），关联订单的支付方式记录*/
    private String paymentNo;

    /**Y-1-返回回调通知类型*/
    private Integer notifyType = NOTIFY_TYPE_PAY;

    /**关联类型-总订单*/
    public static final int TYPE_ORDER = 1;

    /**返回回调通知URL类型-支付回调*/
    public static final int NOTIFY_TYPE_PAY = 1;
    /**返回回调通知URL类型-POS机退款回调*/
    public static final int NOTIFY_TYPE_POS_REFUND = 2;
    /**返回回调通知URL类型-POS机退款回调，未结账的退款*/
    public static final int NOTIFY_TYPE_POS_REFUND_ALL = 3;
}

 phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayResponeVo.java

New file
@@ -0,0 +1,21 @@
package com.hz.phis.vo.payment.qr;

import lombok.Data;

/**
 * 订单二维码申请返回
 * @author CJH
 */
@Data
public class OrderQrPayResponeVo {

    /**商户号-Y-32（商户在招行完成商户进件后分配的招行商户号）*/
    private String merId;
    /**商户订单号-Y-32（商户端生成，要求此订单号在整个商户下唯一）*/
    private String outOrderNo;
    /**平台交易流水号-Y-32-河马返回*/
    private String platTrxNo;
    /**二维码内容，需要将改内容生成二维码*/
    private String qrCode;

}

 phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayVo.java

New file
@@ -0,0 +1,36 @@
package com.hz.phis.vo.payment.qr;

import lombok.Data;

import java.math.BigDecimal;

/**订单二维码支付
 * @author CJH
 */
@Data
public class OrderQrPayVo {

    /**N-32-第三方商户号，没有指定可不传*/
    private String merId;
    /**商户订单号-Y-32（商户端生成，要求此订单号在整个商户下唯一）*/
    private String outOrderNo;
    /**N-交易方式，PayWay获取，不填默认*/
    private String payWay;
    /**Y-交易金额*/
    private BigDecimal payTotal;
    /**N-256-交易通知地址，不填默认地址*/
    private String notifyUrl;
    /**终端IP-Y-64（必须传正确的用户端IP）*/
    private String spbillCreateIp;
    /**N-商户自定义字段*/
    private String reqReserved;
    /**商品描述-Y-128（商品描述交易字段格式根据不同的应用场景按照以下格式：
     APP支付：需传入应用市场上的APP名字-实际商品名称，天天爱消除-游戏充值；
     公众号支付：传入公众号名称-实际商品名称，例如：腾讯形象店- image-QQ公仔；
     小程序支付：传入商家名称-销售商品类目，如：腾讯-游戏；。）*/
    private String body;

    /**N-支付方式编号（PaymentMethod里面的编号），暂时用不上，关联订单的支付方式记录*/
    private String paymentNo;

}

 pom.xml

@@ -11,6 +11,7 @@

    <modules>
        <module>phis-feign</module>
        <module>phis-download-feign</module>
        <!--不需要则注释再打包-->
        <!--<module>../p-his-parent</module>-->
    </modules>
@@ -33,7 +34,6 @@
        <sfjson.version>2.4</sfjson.version>
        <orgApache.commons>3.9</orgApache.commons>
        <commons-io>2.6</commons-io>
        <orgApache.poi>3.9</orgApache.poi>
        <net.sourceforge>2.6.12</net.sourceforge>
        <pinyin4j>2.5.1</pinyin4j>
        <commons.lang.version>2.5</commons.lang.version>
@@ -283,13 +283,6 @@
                <groupId>org.bouncycastle</groupId>
                <artifactId>bcprov-jdk15on</artifactId>
                <version>${jdk15on.version}</version>
            </dependency>

            <!-- excel2003使用的jar -->
            <dependency>
                <groupId>org.apache.poi</groupId>
                <artifactId>poi</artifactId>
                <version>${orgApache.poi}</version>
            </dependency>

            <dependency>