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

fhx

2024-03-19 4cb5552bc0d20f496fff8526b7eee5b3606f063c

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

 phis-feign/src/main/java/com/hz/his/dto/micro/MicroDataDto.java

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

import lombok.Data;

/**
 * 颜值规划数据
 **/
@Data
public class MicroDataDto {
    /**分类名:白光/美/紧/塑*/
    private String typeName;
    /**适应症一级分类*/
    private String firstTypeId;
    /**适应症一级分类名*/
    private String firstTypeName;
    /**适应症二级分类*/
    private String secondTypeId;
    /**适应症二级分类名*/
    private String secondTypeName;
    /**适应症三级分类*/
    private String thirdTypeId;
    /**适应症三级分类名*/
    private String thirdTypeName;
    /**适应症*/
    private String indicationId;
    /**适应症名*/
    private String indicationName;
    /**程度类型标识*/
    private String degreeTypeId;
    /**程度名*/
    private String degreeTypeName;
    /**身体部位标识*/
    private String bodyPartId;
    /**身体部位名*/
    private String bodyPartName;
    /**身体部位子项标识*/
    private String bodyPartItemId;
    /**身体部位子项名*/
    private String bodyPartItemName;
    /**最后一级数据名称*/
    private String dataName;
    /**最后一级数据标识*/
    private String dataId;
    /**微整记录标识*/
    private String microRecordId;
}

 phis-feign/src/main/java/com/hz/his/dto/micro/MicroPlanDto.java

@@ -18,7 +18,8 @@
    private String recommend;
    /** 排序号(前端排序) */
    private Integer sortNum;

    /**推荐项目*/
    private List<MicroPlanItemDto> itemList;
    /**适应症*/
    private List<MicroPlanIndicationDto> indicationList;
}

 phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java

@@ -34,6 +34,12 @@
    private String visitOrderId;
    /** 是否草稿*/
    private Integer isDraft;

    /**建议信息*/
    private List<MicroPlanDto> planList;
    /**颜值规划信息*/
    private List<MicroDataDto> dataList;
    /**查询标识类型:TreatPlan.typeStr*/
    private String typeStr;
    private String firstId;
    private String secondId;
}

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

@@ -50,4 +50,33 @@
    @PostMapping(value = "/micro/record/check/view")
    Result checkView(@RequestBody MicroRecordDto dto);

    //--------------------颜值规划4.0------------------------------
    /** 微整记录列表 */
    @PostMapping(value = "/micro/record/list/V2")
    Result listV2(@RequestBody MicroRecordDto dto);

    /** 记录详情 */
    @PostMapping(value = "/micro/record/details/V2")
    Result detailsV2(@RequestBody MicroRecordDto dto);

    /** 适应症数据 */
    @PostMapping(value = "/micro/record/indication/data/V2")
    Result indicationDataV2(@RequestBody MicroRecordDto dto);

    /** 适应症治疗建议 */
    @PostMapping(value = "/micro/record/treatPlan/V2")
    Result treatPlanV2(@RequestBody MicroRecordDto dto);

    /** 新增微整记录 */
    @PostMapping(value = "/micro/record/add/V2")
    Result addV2(@RequestBody MicroRecordDto dto);

    /** 修改微整记录 */
    @PostMapping(value = "/micro/record/edit/V2")
    Result editV2(@RequestBody MicroRecordDto dto);

    /** 删除微整记录 */
    @PostMapping(value = "/micro/record/del/V2")
    Result delV2(@RequestBody MicroRecordDto dto);

}