From 8f710fb84ddfcdb3c27bcd26dd19e6884af28b9a Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Tue, 27 Oct 2020 19:06:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/ConsumptionRequest.java |    9 +++++++++
 1 files changed, 9 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 f5f534f..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;
@@ -22,14 +24,17 @@
     /**
      * 医院ID
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long hospitalId;
     /**
      * 科室ID
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long departmentId;
     /**
      * 医生ID
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long doctorId;
     /**
      * 调用方业务编号,光片编号
@@ -39,4 +44,8 @@
      * 实际变动数量
      */
     private int consumptionCount;
+    /**
+     * 诊断id
+     */
+    private String diaId;
 }

--
Gitblit v1.8.0