解决合并冲突

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChangePriceDataDto.java

@@ -0,0 +1,96 @@
+package com.openhis.administration.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+
+/**
+ * @ClassName ChangePricePageDto
+ * @Description TODO
+ * @Author raymond
+ * @Date 2025/10/31 17:35
+ * @Version 1.0
+ **/
+@Data
+public class ChangePriceDataDto {
+
+    /** 批次号 */
+    private String originLotNumber;
+
+    /** 改价申请人id */
+    private Long applicantId;
+
+    /** 目标枚举 药品、耗材、诊疗、挂号 */
+    private Integer itemCategoryEnum;
+    private String itemCategoryEnum_Text;
+
+    /** 药品ID、耗材ID、诊疗ID、挂号ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long itemId;
+    /**
+     * 获取名称
+     */
+    private String itemName;
+    /** 原进货价 */
+    private BigDecimal originBuyingPrice;
+
+    /** 原零售价价格 */
+    private BigDecimal originRetailPrice;
+
+    /** 当前品库存量 */
+    private BigDecimal itemQuantity;
+
+    /** 当前业务批次号 */
+    private String busNo;
+
+    /** 改价申请时间 */
+    private Date applicantTime;
+
+    /** 新进货价 */
+    private BigDecimal newBuyingPrice;
+
+    /** 新零售价 */
+    private BigDecimal newRetailPrice;
+
+    /** 物品计量单位 */
+    private String unitCode;
+
+    /** 审批状态 */
+    private Integer statusEnum;
+    private Integer statusEnum_Text;
+
+    /** 批次号 */
+    private String lotNumber;
+
+    /** 条件理由 */
+    private String reason;
+
+    /** 零售价盈负差*/
+    private BigDecimal differenceRetailPrice;
+    /**进货价盈负差*/
+    private BigDecimal differenceBuyingPrice;
+    /**
+     * 科室名称
+     */
+    private String orgName;
+    /**
+     * 价格主表ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long chargeId;
+    /**
+     * 调价表ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long changePriceRecordId;
+
+    private String label;
+    /**
+     * 规格
+     */
+    private String totalVolume;
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemDefDetailPriceDto.java

@@ -0,0 +1,24 @@
+package com.openhis.administration.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName ChargeItemDefDetailPriceDto
+ * @Description 获取 药品或耗材 进货价和零售价的DTO
+ * @Author raymond
+ * @Date 2025/11/1 21:40
+ * @Version 1.0
+ **/
+@Data
+public class ChargeItemDefDetailPriceDto {
+    /**
+     * 进货价或者零售价
+     */
+    private BigDecimal price;
+    /**
+     * 拆零比
+     */
+    private BigDecimal partPercent;
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterDataDto.java

@@ -0,0 +1,27 @@
+package com.openhis.administration.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+
+/**
+ * @ClassName EncounterDataDto
+ * @Description
+ * @Author raymond
+ * @Date 2025/10/27 16:01
+ * @Version 1.0
+ **/
+@Data
+public class EncounterDataDto {
+    /**
+     * 换着ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+    /**
+     * 就诊表ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterLocationDataDto.java

@@ -0,0 +1,27 @@
+package com.openhis.administration.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+
+/**
+ * @ClassName EncounterLocationDataDto
+ * @Description
+ * @Author raymond
+ * @Date 2025/10/27 16:01
+ * @Version 1.0
+ **/
+@Data
+public class EncounterLocationDataDto {
+    /**
+     * 区域ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+    /**
+     * 就诊表ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/HealthcareDto.java

@@ -0,0 +1,39 @@
+package com.openhis.administration.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+
+/**
+ * @ClassName HealcareDto
+ * @Description TODO
+ * @Author raymond
+ * @Date 2025/10/18 14:59
+ * @Version 1.0
+ **/
+@Data
+public class HealthcareDto {
+
+    private Long itemId;
+    /**
+     * 科室id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orgId;
+    /**
+     * 科室名称
+     */
+    private String orgName;
+    /**
+     * 项目名称
+     */
+    private String name;
+    /**
+     * 分类
+     */
+    private String categoryCode;
+    /**
+     * 服务类型
+     */
+    private String typeCode;
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/LocationDataDto.java

@@ -0,0 +1,49 @@
+package com.openhis.administration.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @ClassName roleDataList
+ * @Description 权限集合
+ * @Author raymond
+ * @Date 2025/10/27 16:01
+ * @Version 1.0
+ **/
+@Data
+public class LocationDataDto {
+    /**
+     * 区域ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+    /**
+     * 状态
+     */
+    private Integer statusEnum;
+    /**
+     * 模式编码
+     */
+    private Integer modeEnum;
+    /**
+     * 操作状态
+     */
+    private Integer operationalEnum;
+    /**
+     * 岗位类型
+     */
+    private String busNo;
+    /**
+     * 区域名称
+     */
+    private String areaName;
+    /**
+     * 患者详细信息
+     */
+    private List<PatientBedInfoDto> patientBedInfoDtoList;
+
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/OrgDataDto.java

@@ -0,0 +1,32 @@
+package com.openhis.administration.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.medication.dto.AdjustPriceMedListDto;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @ClassName OrgDataDto
+ * @Description TODO
+ * @Author raymond
+ * @Date 2025/10/22 09:44
+ * @Version 1.0
+ **/
+@Data
+public class OrgDataDto {
+    /**
+     * id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orgId;
+    /**
+     * 科室名称
+     */
+    private String orgName;
+    /**
+     * 挂号集合
+     */
+    private List<AdjustPriceMedListDto> healthDataList;
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/PatientBedInfoDto.java

@@ -0,0 +1,58 @@
+package com.openhis.administration.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @ClassName PatientBedInfoDto
+ * @Description 患者详细信息
+ * @Author raymond
+ * @Date 2025/10/30 08:10
+ * @Version 1.0
+ **/
+@Data
+public class PatientBedInfoDto {
+
+    /**
+     * 床位
+     */
+    private String bedName;
+    /**
+     * 患者姓名
+     */
+    private String patientName;
+    /**
+     * 患者编号ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+    /**
+     * 患者性别
+     */
+    private String patientGenderText;
+    /**
+     * 患者编号
+     */
+    private String patientNumber;
+    /**
+     * 就诊号ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+    /**
+     * 床位ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long bedLocationId;
+    /** 生日 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date birthDate;
+    private String patientAgeText;
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/PatientDataDto.java

@@ -0,0 +1,26 @@
+package com.openhis.administration.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+
+/**
+ * @ClassName EncounterDataDto
+ * @Description
+ * @Author raymond
+ * @Date 2025/10/27 16:01
+ * @Version 1.0
+ **/
+@Data
+public class PatientDataDto {
+    /**
+     * 换着ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+    private String patientName;
+    private Integer gender;
+    private String idCard;
+
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/RoleDataDto.java

@@ -0,0 +1,39 @@
+package com.openhis.administration.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+
+/**
+ * @ClassName roleDataList
+ * @Description 权限集合
+ * @Author raymond
+ * @Date 2025/10/27 16:01
+ * @Version 1.0
+ **/
+@Data
+public class RoleDataDto {
+    /**
+     * 权限表ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long roleId;
+    /**
+     * 科室ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orgId;
+    /**
+     * 区域ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+    /**
+     * 专业编码枚举
+     */
+    private Integer specialtyEnum;
+    /**
+     * 岗位类型
+     */
+    private String typeCode;
+}