From 81d76e8fa24eb5b869194b9a0b3d17a3f0038064 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 15 Sep 2022 08:51:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=82=8C=E8=90=8E=E7=BC=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/SmnFacade.java     | 25 ++++++++++++++++++++--
 .../platform/operate/web/result/SmnResult.java     | 19 ++++++++++++++++
 2 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmnResult.java

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java
index faf15ff..d9f337c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java
@@ -1,5 +1,6 @@
 package com.lyms.platform.operate.web.facade;
 
+import com.lyms.platform.biz.service.BasicConfigService;
 import com.lyms.platform.biz.service.PatientsService;
 import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.result.BaseListResponse;
@@ -10,9 +11,12 @@ import com.lyms.platform.common.utils.ReflectionUtils;
 import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.operate.web.request.SmnQueryRequest;
 import com.lyms.platform.operate.web.request.SmnRequest;
+import com.lyms.platform.operate.web.result.SmnResult;
+import com.lyms.platform.operate.web.utils.CommonsHelper;
 import com.lyms.platform.pojo.Patients;
 import com.lyms.platform.pojo.SmnModel;
 import com.lyms.platform.query.PatientsQuery;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
@@ -22,6 +26,7 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -33,7 +38,8 @@ public class SmnFacade {
 
     @Autowired
     private MongoTemplate mongoTemplate;
-
+    @Autowired
+    private BasicConfigService basicConfigService;
     @Autowired
     private PatientsService patientsService;
 
@@ -190,8 +196,23 @@ public class SmnFacade {
         param.mysqlBuild((int) count);
         query.skip(param.getOffset()).limit(param.getLimit());
         List<SmnModel> smnModels = mongoTemplate.find(query, SmnModel.class);
+        List<SmnResult> results = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(smnModels))
+        {
+            for (SmnModel model : smnModels)
+            {
+                SmnResult re = new SmnResult();
+                BeanUtils.copyProperties(model, re);
+                re.setAddressRegisterStr(CommonsHelper.getResidence(model.getProvinceRegisterId(),
+                        model.getCityRegisterId(),
+                        model.getAreaRegisterId(),
+                        model.getStreetRegisterId(),
+                        model.getAddressRegister(), basicConfigService));
+                results.add(re);
+            }
+        }
         BaseListResponse baseListResponse = new BaseListResponse();
-        baseListResponse.setData(smnModels);
+        baseListResponse.setData(results);
         baseListResponse.setPageInfo(param.getPageInfo());
         return baseListResponse;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmnResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmnResult.java
new file mode 100644
index 0000000..d6dd1be
--- /dev/null
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmnResult.java
@@ -0,0 +1,19 @@
+package com.lyms.platform.operate.web.result;
+
+import com.lyms.platform.pojo.SmnModel;
+
+
+
+public class SmnResult extends SmnModel {
+
+
+    private String addressRegisterStr;
+
+    public String getAddressRegisterStr() {
+        return addressRegisterStr;
+    }
+
+    public void setAddressRegisterStr(String addressRegisterStr) {
+        this.addressRegisterStr = addressRegisterStr;
+    }
+}
-- 
1.8.3.1