From 7f86dec3d68f12d4741610c38c08ed0792af6909 Mon Sep 17 00:00:00 2001
From: Administrator <184677810@qq.com>
Date: Tue, 8 Oct 2019 14:38:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B9=90=E9=99=B5=E5=B8=82=E5=A6=87=E5=B9=BC?=
 =?UTF-8?q?=E2=80=9C=E5=BB=BA=E6=A1=A3=E2=80=9D=E6=9C=BA=E6=9E=84=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/facade/PatientFacade.java    |  2 ++
 .../operate/web/result/PatientManagerQueryModel.java       | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index 972e95f..a8ce258 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -1438,6 +1438,7 @@ public class PatientFacade {
                 patientManagerQueryModel.setAddressRegister(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService));
                 patientManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService));
                 patientManagerQueryModel.setId(patients.getId());
+                patientManagerQueryModel.setLowerHairOgrId(StringUtils.isNotEmpty(patients.getLowerHairOgrId()) ? organizationService.getOrganizationName(patients.getLowerHairOgrId()) : "");
                 if (patients.getSendCareMan() != null) {
                     if ("0".equals(patients.getSendCareMan())) {
                         patientManagerQueryModel.setSendCareMan("未发放");
@@ -1447,6 +1448,7 @@ public class PatientFacade {
                         patientManagerQueryModel.setSendCareMan("补发");
                     }
                 }
+
                 patientManagerQueryModelList.add(patientManagerQueryModel);
             }
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java
index 845c05e..81da8ae 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java
@@ -49,6 +49,11 @@ public class PatientManagerQueryModel {
     private String sendCareMan;
 
     /**
+     * 母子保健手册下发机构id
+     */
+    private String lowerHairOgrId;
+
+    /**
      * @auther HuJiaqi
      * @createTime 2016年12月20日 14时42分
      * @discription 居住地
@@ -82,6 +87,15 @@ public class PatientManagerQueryModel {
 
     private String id;
 
+
+    public String getLowerHairOgrId() {
+        return lowerHairOgrId;
+    }
+
+    public void setLowerHairOgrId(String lowerHairOgrId) {
+        this.lowerHairOgrId = lowerHairOgrId;
+    }
+
     public String getSendCareMan() {
         return sendCareMan;
     }
-- 
1.8.3.1