From d7e52672938681c928eb1aa6fc19bf9bc2e5a6b1 Mon Sep 17 00:00:00 2001
From: mengkuiliang <1464081137@qq.com>
Date: Tue, 10 Oct 2023 14:40:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../applet/pojo/vo/ScreeningProjectVo.java             |  4 ++--
 .../service/impl/ResidentPatientInfoServiceImpl.java   |  7 +++++++
 .../service/impl/ResidentServiceApplyServiceImpl.java  | 10 +++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/ScreeningProjectVo.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/ScreeningProjectVo.java
index ea584ee..58229e8 100644
--- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/ScreeningProjectVo.java
+++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/ScreeningProjectVo.java
@@ -51,13 +51,13 @@ public class ScreeningProjectVo {
      * 机构ID
      */
     @ApiModelProperty("机构ID")
-    private String deptId;
+    private String hospitalId;
 
     /**
      * 所属机构名称
      */
     @ApiModelProperty("机构名称")
-    private String deptName;
+    private String hospitalName;
 
     /**
      * 服务内容
diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentPatientInfoServiceImpl.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentPatientInfoServiceImpl.java
index 544e454..56642db 100644
--- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentPatientInfoServiceImpl.java
+++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentPatientInfoServiceImpl.java
@@ -1,5 +1,6 @@
 package com.xinelu.familydoctor.applet.service.impl;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -280,6 +281,9 @@ public class ResidentPatientInfoServiceImpl implements IResidentPatientInfoServi
         // 获取当前选中的
         List<PatientInfo> currentList = list.stream().filter(p -> p.getIsChecked().equals("1")).collect(Collectors.toList());
         if (currentList.size() > 0) {
+            if(!StringUtils.isBlank(currentList.get(0).getDisease())) {
+                currentList.get(0).setDiseaseList(Arrays.asList(currentList.get(0).getDisease().split(",")));
+            }
             return currentList.get(0);
         } else {
             // 没有已选择的，则取最新注册的一条数据
@@ -287,6 +291,9 @@ public class ResidentPatientInfoServiceImpl implements IResidentPatientInfoServi
             // 更新选择标识
             residentPatientInfoMapper.updateChecked(list.get(0).getPatientCode(), "1");
 
+            if(!StringUtils.isBlank(list.get(0).getDisease())) {
+                list.get(0).setDiseaseList(Arrays.asList(list.get(0).getDisease().split(",")));
+            }
             list.get(0).setIsChecked("1");
             return list.get(0);
         }
diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentServiceApplyServiceImpl.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentServiceApplyServiceImpl.java
index 812f4e5..3e76322 100644
--- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentServiceApplyServiceImpl.java
+++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentServiceApplyServiceImpl.java
@@ -287,8 +287,8 @@ public class ResidentServiceApplyServiceImpl implements IResidentServiceAppletSe
                 for (PerformanceDetailVo per : perList) {
                     sp = new ScreeningProjectVo();
                     sp.setSourceType("1");
-                    sp.setDeptId(per.getOrgNo());
-                    sp.setDeptName(per.getOrgName());
+                    sp.setHospitalId(per.getOrgNo());
+                    sp.setHospitalName(per.getOrgName());
                     sp.setPackageId(per.getPackageNo());
                     sp.setPackageName(per.getPackageName());
                     sp.setProjectId(per.getFormNo());
@@ -315,15 +315,15 @@ public class ResidentServiceApplyServiceImpl implements IResidentServiceAppletSe
                     if(Hospital != null) {
                         // 获取筛查项目
                         ScreeningProject query = new ScreeningProject();
-                        query.setHospitalId(String.valueOf(Hospital.getId()));
+                        query.setHospitalId(Hospital.getId());
                         List<ScreeningProject> screeningProjectList = screeningProjectService.findList(query);
                         if(screeningProjectList != null && screeningProjectList.size() > 0) {
                             ScreeningProjectVo sp;
                             for(ScreeningProject project: screeningProjectList) {
                                 sp = new ScreeningProjectVo();
                                 sp.setSourceType("2");
-                                sp.setDeptId(project.getHospitalId());
-                                sp.setDeptName(project.getHospitalName());
+                                sp.setHospitalId(String.valueOf(project.getHospitalId()));
+                                sp.setHospitalName(project.getHospitalName());
                                 sp.setProjectId(project.getProjectId());
                                 sp.setProjectName(project.getProjectName());
                                 sp.setPrice(project.getPrice());