2c4ae3b3d5dd707e5525a6f2414489b9fa4303c3..76c366f6eb77c7d55f32113c0528f95d21f023bd
2024-04-11 fhx
Merge remote-tracking branch 'origin/master-test' into master-test
76c366 对比 | 目录
2024-04-11 fhx
Merge branch 'fhx-prod-智能导诊' into master-test
3026a9 对比 | 目录
2024-04-11 fhx
1.新增字段
8aabd6 对比 | 目录
2024-04-11 fwq
Merge branch 'master-fwq-颜值规划4.0' into master-test
b08337 对比 | 目录
2024-04-11 fwq
Merge remote-tracking branch 'origin/master-test' into master-test
dff9cf 对比 | 目录
2024-04-11 fwq
Merge branch 'master-prod-new' into master-fwq-颜值规划4.0
17457a 对比 | 目录
2024-04-11 fwq
增加接口
307e34 对比 | 目录
2024-04-11 fwq
增加查询dto
6edaa6 对比 | 目录
2024-04-11 fwq
Merge branch 'master-prod-new' into master-fwq-颜值规划4.0
e1972e 对比 | 目录
2024-04-11 fhx
Merge branch 'fhx-prod-智能导诊' into master-test
4f8fe6 对比 | 目录
2024-04-11 fhx
1.新增用户自助到访接口
5ed1df 对比 | 目录
2024-04-11 fwq
Merge remote-tracking branch 'origin/master-test' into master-test
2bbfc3 对比 | 目录
2024-04-11 fhx
Merge branch 'fhx-prod-智能导诊' into master-test
63f328 对比 | 目录
2024-04-11 fhx
1.新增用户到店编辑
fe6285 对比 | 目录
2024-04-11 fwq
Merge remote-tracking branch 'origin/master-test' into master-test
f31ae0 对比 | 目录
2024-04-11 fhx
Merge branch 'fhx-prod-智能导诊' into master-test
b2ad4b 对比 | 目录
2024-04-11 fhx
1.新增平台到访操作service
9af5cb 对比 | 目录
2024-04-11 fwq
Merge remote-tracking branch 'origin/master-test' into master-test
61acdf 对比 | 目录
2024-04-11 fwq
Merge remote-tracking branch 'origin/master-prod-new' into master-test
ced651 对比 | 目录
2个文件已修改
1个文件已删除
4个文件已添加
237 ■■■■■ 已修改文件
phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/dto/visitOrder/VisitOrderDto.java 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMicroRecordService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/platform/SVisitOrderService.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/platform/visit/SPhisMotVisitService.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/platform/visit/SPhisVisitOrderService.java 100 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java
New file
@@ -0,0 +1,26 @@
package com.hz.his.dto.report.user;
import com.hz.his.dto.report.UserDetailReportDto;
import lombok.Data;
import java.util.List;
/**
 * 用户报表查询客户信息
 * @author fwq
 * */
@Data
public class UserDetailSelectDto extends UserDetailReportDto {
    /**查询活跃老VIP情况 勾选人数:查老活跃,勾选流失:流失 勾选活跃/沉睡 查状态*/
    /**查询客户等级*/
    private List<String> userLevelList;
    /**三大项目未执行  集合 (每个都是单选)*/
    /**颜值规划(一级,二级,三级的集合)*/
    /**RFM 集合 R1..R2..等都是单选*/
    /**客群:等级单选,触达单选*/
}
phis-feign/src/main/java/com/hz/his/dto/visitOrder/VisitOrderDto.java
New file
@@ -0,0 +1,61 @@
package com.hz.his.dto.visitOrder;
import lombok.Data;
import java.util.Date;
/**
 * 到访操作dto
 * @USER: fhx
 * @DATE: 2024/4/11
 **/
@Data
public class VisitOrderDto {
    /** 操作人类型(OperatorConstants) */
    private Integer opType;
    /** 登录操作人角色id */
    private String opRoleId;
    /** 预约id */
    private String appointmentId;
    /** 用户id */
    private String userId;
    /** 门店id */
    private String shopId;
    /** 到访订单id */
    private String id;
    private String orderId;
    /** 分诊顾问id */
    private String adviserId;
    /** 分诊医生id */
    private String doctorId;
    /** 分诊护士id */
    private String nurseId;
    /** 到访类型(VisitRecord) */
    private Integer arrivalType;
    /** 到店时间 */
    private Date arrivalTime;
//    /**  */
//    private Integer type;
    /** 状态 */
    private Integer status;
    /** 等待时间 */
    private String waitingTime;
    /** 开始时间 */
    private String startTime;
    /** 结束时间 */
    private String endTime;
    /** 备注 */
    private String remarks;
    /** 取消凭证文件路径 */
    private String annexUrl;
    /** 是否记录删除 */
    private Integer isMarkDel;
    /** 项目json字符 */
    private String projectJson;
}
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMicroRecordService.java
@@ -46,6 +46,10 @@
    @PostMapping(value = "/micro/record/crm/see")
    Result crmSee(@RequestBody MicroRecordDto dto);
    /** crm查看记录详情 - 颜值规划4.0版本*/
    @PostMapping(value = "/micro/record/crm/see/V2")
    Result crmSeeV2(@RequestBody MicroRecordDto dto);
    /** 根据用户id查询是否有未查看过的微整记录 */
    @PostMapping(value = "/micro/record/check/view")
    Result checkView(@RequestBody MicroRecordDto dto);
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
@@ -140,4 +140,10 @@
     */
    @PostMapping(value = "/user/common/approve/create")
    Result commonApproveCreate(@RequestBody MarketingTotalDto marketingTotalDto);
    /**
     * 到访更新用户信息
     */
    @PostMapping(value = "/user/arrive/edit")
    Result arriveEdit(@RequestBody com.alibaba.fastjson.JSONObject data);
}
phis-feign/src/main/java/com/hz/his/feign/service/platform/SVisitOrderService.java
File was deleted
phis-feign/src/main/java/com/hz/his/feign/service/platform/visit/SPhisMotVisitService.java
New file
@@ -0,0 +1,20 @@
//package com.hz.his.feign.service.platform.visit;
//
//import com.hx.resultTool.Result;
//import com.hz.his.dto.appointment.AppointmentDto;
//import com.hz.his.dto.treat.TreatAfterVideoDto;
//import org.springframework.cloud.openfeign.FeignClient;
//import org.springframework.web.bind.annotation.RequestBody;
//import org.springframework.web.bind.annotation.RequestMapping;
//
///**
// * mot扫码到访
// */
//@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phis-mot-visit")
//public interface SPhisMotVisitService {
//    /**
//     * mot扫码到访
//     */
//    @RequestMapping("/mot/visit/scan/code/arrival")
//    Result scanCodeArrival(@RequestBody AppointmentDto appointmentDto);
//}
phis-feign/src/main/java/com/hz/his/feign/service/platform/visit/SPhisVisitOrderService.java
New file
@@ -0,0 +1,100 @@
package com.hz.his.feign.service.platform.visit;
import com.hx.resultTool.Result;
import com.hz.his.dto.visitOrder.VisitOrderDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
/**
 * mot扫码到访
 */
@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phis-visit-order")
public interface SPhisVisitOrderService {
    @RequestMapping("/visit/order/user/self/visit")
    Result userSelfVisit(@RequestBody VisitOrderDto dto);
    ///////////////////////////////////////////////////////////////////////
    /** 到店 */
    @RequestMapping("/visit/order/arrival")
    Result arrival(@RequestBody VisitOrderDto dto);
    /** 分诊 */
    @RequestMapping("/visit/order/triage")
    Result triage(@RequestBody VisitOrderDto dto);
    /** 客户离开 */
    @RequestMapping("/visit/order/leave")
    Result leave(@RequestBody VisitOrderDto dto);
    /** 开始接待 */
    @RequestMapping("/visit/order/reception")
    Result reception(@RequestBody VisitOrderDto dto);
    /** 接待结束 */
    @RequestMapping("/visit/order/reception/end")
    Result receptionEnd(@RequestBody VisitOrderDto dto);
    /** 开始面诊 */
    @RequestMapping("/visit/order/examine")
    Result examine(@RequestBody VisitOrderDto dto);
    /** 结束面诊 */
    @RequestMapping("/visit/order/examine/end")
    Result examineEnd(@RequestBody VisitOrderDto dto);
    /** 开始术前准备 */
    @RequestMapping("/visit/order/preoperative")
    Result preoperative(@RequestBody VisitOrderDto dto);
    /** 是否卸麻(护士发送) */
    @RequestMapping("/visit/order/discharge/noti")
    Result dischargeNotify(@RequestBody VisitOrderDto dto);
    /** 是否卸麻(MIC发送) */
    @RequestMapping("/visit/order/mic/discharge/noti")
    Result dischargeMicNotify(@RequestBody VisitOrderDto dto);
    /** 结束术前准备 */
    @RequestMapping("/visit/order/preoperative/end")
    Result preoperativeEnd(@RequestBody VisitOrderDto dto);
    /** 结束术前并开始治疗 */
    @RequestMapping("/visit/order/endPreAndStartTreat")
    Result endPreAndStartTreat(@RequestBody VisitOrderDto dto);
    /** 开始治疗 */
    @RequestMapping("/visit/order/treat")
    Result treat(@RequestBody VisitOrderDto dto);
    /** 结束治疗 */
    @RequestMapping("/visit/order/treat/end")
    Result treatEnd(@RequestBody VisitOrderDto dto);
    /** 结束治疗并开始术后 */
    @RequestMapping("/visit/order/endTreatAndStartPost")
    Result endTreatAndStartPost(@RequestBody VisitOrderDto dto);
    /** 开始术后 */
    @RequestMapping("/visit/order/after_operation")
    Result afterOperation(@RequestBody VisitOrderDto dto);
    /** 开始术后 */
    @RequestMapping("/visit/order/after_operation/end")
    Result afterOperationEnd(@RequestBody VisitOrderDto dto);
    /** 撤回上级状态 */
    @RequestMapping("/visit/order/to_withdraw/status")
    Result withdraw(@RequestBody VisitOrderDto dto);
    /** 通知MIC分配面诊 */
    @RequestMapping("/visit/order/mic/notice")
    Result noticeMIC(@RequestBody VisitOrderDto dto);
    /** 稍后几分钟卸麻 */
    @RequestMapping("/visit/order/waiting/hemp")
    Result waitingHemp(@RequestBody VisitOrderDto dto);
    /** MIC直接修改预约时间或者取消订单 */
    @RequestMapping("/visit/order/mic/preStartTime/edit")
    Result micPreStartTimeEdit(@RequestBody VisitOrderDto dto);
    /** 修改订单 */
    @RequestMapping("/visit/order/orderProject/edit")
    Result orderProjectEdit(@RequestBody VisitOrderDto dto);
    /** 根据预约id获取预约订单 */
    @RequestMapping("/visit/order/get/appointment")
    Result getAppointment(@RequestBody VisitOrderDto dto);
    /** 是否敷麻(MIC发送) */
    @RequestMapping("/visit/order/mic/shima/noti")
    Result Shimatify(@RequestBody VisitOrderDto dto);
    /** 是否敷麻(护士发送) */
    @RequestMapping("/visit/order/shima/noti")
    Result shimaNotify(@RequestBody VisitOrderDto dto);
    /** 稍后几分钟敷麻 */
    @RequestMapping("/visit/order/waiting/shima")
    Result waitingShima(@RequestBody VisitOrderDto dto);
}