From e0395c5454534e7cf657b10045d00e4042dc7e71 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Mon, 28 Sep 2020 15:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pay_master' into pay_master
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/ConsumptionRequest.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/ConsumptionRequest.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/ConsumptionRequest.java
index 3e26271..17b47f9 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/ConsumptionRequest.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/ConsumptionRequest.java
@@ -1,6 +1,8 @@
package com.kidgrow.oprationcenter.vo;
import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -18,6 +20,22 @@
@AllArgsConstructor
public class ConsumptionRequest extends Model<ConsumptionRequest> {
private static final long serialVersionUID = 1L;
+
+ /**
+ * 医院ID
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long hospitalId;
+ /**
+ * 科室ID
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long departmentId;
+ /**
+ * 医生ID
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long doctorId;
/**
* 调用方业务编号,光片编号
*/
@@ -26,4 +44,8 @@
* 实际变动数量
*/
private int consumptionCount;
+ /**
+ * 诊断id
+ */
+ private String diaId;
}
--
Gitblit v1.8.0