From c99a392189fb21f3a77e771a567ec9fe88117a2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=81=92?= <3226558941@qq.com>
Date: Fri, 13 Oct 2023 17:21:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nurseapplogin/impl/NurseAppLoginServiceImpl.java        | 3 +++
 .../xinelu/applet/vo/nurseapplogin/PatientAndDiseaseVO.java | 6 ++++++
 .../mapper/applet/nurseapplogin/NurseAppLoginMapper.xml     | 2 ++
 .../com/xinelu/manage/domain/patientinfo/PatientInfo.java   | 5 +++++
 4 files changed, 16 insertions(+)

diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java
index 55276f9..ba9bce0 100644
--- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java
+++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java
@@ -176,6 +176,9 @@ public class NurseAppLoginServiceImpl implements NurseAppLoginService {
         if (Objects.nonNull(patientDisease) && Objects.nonNull(patientDisease.getBirthDate())) {
             patientDisease.setAge(AgeUtil.getAgeMonth(String.valueOf(patientDisease.getBirthDate())));
         }
+        if (Objects.nonNull(patientDisease) && StringUtils.isNotBlank(patientDisease.getDisease())) {
+            patientDisease.setDiseaseList(patientDisease.getDisease().split(""));
+        }
         if (Objects.nonNull(patientDisease) && StringUtils.isNotBlank(patientDisease.getAreaCode())) {
             SysAreaVO codeName = sysAreaMapper.getSubordinateRegionsFindSuperiorRegions(patientDisease.getAreaCode());
             String provinceName = StringUtils.isBlank(codeName.getProvinceName()) ? "" : codeName.getProvinceName();
diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nurseapplogin/PatientAndDiseaseVO.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nurseapplogin/PatientAndDiseaseVO.java
index d7f757e..97ee956 100644
--- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nurseapplogin/PatientAndDiseaseVO.java
+++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nurseapplogin/PatientAndDiseaseVO.java
@@ -158,4 +158,10 @@ public class PatientAndDiseaseVO implements Serializable {
      */
     private String patientCode;
 
+
+    private String disease;
+    /**
+     * 基础疾病信息
+     */
+    private String[] diseaseList;
 }
diff --git a/xinelu-nurse-applet/src/main/resources/mapper/applet/nurseapplogin/NurseAppLoginMapper.xml b/xinelu-nurse-applet/src/main/resources/mapper/applet/nurseapplogin/NurseAppLoginMapper.xml
index c4d7e1e..ea7b893 100644
--- a/xinelu-nurse-applet/src/main/resources/mapper/applet/nurseapplogin/NurseAppLoginMapper.xml
+++ b/xinelu-nurse-applet/src/main/resources/mapper/applet/nurseapplogin/NurseAppLoginMapper.xml
@@ -24,6 +24,7 @@
         <result property="disablingCondition" column="disabling_condition"/>
         <result property="disablingReason" column="disabling_reason"/>
         <result property="patientCode" column="patient_code"/>
+        <result property="disease" column="disease"/>
         <collection property="patientDiseaseInfoList" javaType="java.util.List" resultMap="PatientDiseaseInfoResult"/>
     </resultMap>
 
@@ -81,6 +82,7 @@
         pi.disabling_condition,
         pi.disabling_reason,
         pi.patient_code,
+        pi.disease,
         pdi.id patientDiseaseId,
         pdi.disease_id,
         pdi.disease_name,
diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java
index cdd787c..860ef8c 100644
--- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java
+++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java
@@ -242,6 +242,11 @@ public class PatientInfo extends BaseDomain implements Serializable {
      */
     private String disablingReason;
 
+    /**
+     * 基础疾病
+     */
+    private String disease;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)