From 6f5323053bff714cce187d38cb41b64ee356d613 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 15 Feb 2019 11:18:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/PatientServiceFacade.java   |  8 +++++
 .../operate/web/result/PatientSerResult.java       | 39 ++++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
index 8ff4f01..2bb17ed 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
@@ -703,6 +703,14 @@ public class PatientServiceFacade {
         result.setSerCode(ps.getSerCode());
         result.setCreateUser(ps.getCreateUser());
         result.setUpdateDate(DateUtil.getyyyy_MM_dd(ps.getUpdateDate()));
+
+
+        result.setDevice(ps.getDevice());
+        result.setDeviceCon(ps.getDeviceCon());
+        result.setServiceWeek(ps.getServiceWeek());
+        result.setDoctorWeek(ps.getDoctorWeek());
+
+
         if (StringUtils.isNotEmpty(ps.getSerDoct())) {
             try {
                 Users users = usersService.getUsers(Integer.parseInt(ps.getSerDoct()));
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientSerResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientSerResult.java
index d094955..ad593ef 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientSerResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientSerResult.java
@@ -118,6 +118,45 @@ public class PatientSerResult {
      */
     private String backUser;
 
+    private Integer device;
+    private Integer deviceCon;//'设备条件';
+
+    private Integer doctorWeek;//'医生购买周数';
+
+    private Integer serviceWeek;//'服务购买周数';
+
+    public Integer getDevice() {
+        return device;
+    }
+
+    public void setDevice(Integer device) {
+        this.device = device;
+    }
+
+    public Integer getDeviceCon() {
+        return deviceCon;
+    }
+
+    public void setDeviceCon(Integer deviceCon) {
+        this.deviceCon = deviceCon;
+    }
+
+    public Integer getDoctorWeek() {
+        return doctorWeek;
+    }
+
+    public void setDoctorWeek(Integer doctorWeek) {
+        this.doctorWeek = doctorWeek;
+    }
+
+    public Integer getServiceWeek() {
+        return serviceWeek;
+    }
+
+    public void setServiceWeek(Integer serviceWeek) {
+        this.serviceWeek = serviceWeek;
+    }
+
     public String getSex() {
         return sex;
     }
-- 
1.8.3.1