Merge branch 'master-prod-new' into master-stander

cmg

2024-07-09 7d25ae13f255bb8b8c1580479551ac722fe0273f

Merge branch 'master-prod-new' into master-stander

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

@@ -148,6 +148,9 @@
    //作废划扣原因
    private String invalidReason;

    //适应症
    private List<DeductionIndicationDto> indicationList;

    public DeductionDto() {

    }

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

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

import lombok.Data;

/**
 *  划扣项目适应症
 */
@Data
public class DeductionIndicationDto {
    /**划扣项目清单标识*/
    private String deductionSingleId;
    /**划扣项目标识*/
    private String deductionProjectId;
    /**适应症标识*/
    private String indicationId;
    /**适应症名称*/
    private String indication;
    /**适应症关联分类JSON字符*/
    private String typeJson;
}