From 67b48248349afb39a0763e38027fcd57572adc3f Mon Sep 17 00:00:00 2001
From: "java_cuibaocheng@163.com" <java_cuibaocheng@163.com>
Date: Thu, 2 Nov 2023 16:42:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=8F=A3=E6=96=B0=E5=A2=9E=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=20-=20cbc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../populationinfo/PopulationInfoBaseDTO.java | 36 +++++++++++++++++++
 .../mybatis/mapper/dispute/dispute-mapper.xml |  6 ++--
 .../populationinfo/population-info-mapper.xml |  2 ++
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoBaseDTO.java b/src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoBaseDTO.java
index b2aa119..5cd9a66 100644
--- a/src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoBaseDTO.java
+++ b/src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoBaseDTO.java
@@ -10,6 +10,10 @@ public class PopulationInfoBaseDTO {
 
     @ApiModelProperty(name = "isCult", value = "是否为涉邪人员(是或否)")
     private String isCult = "否";
+    @ApiModelProperty(name = "isMinority", value = "是否为未成年(是或否)")
+    private String isMinority = "否";
+    @ApiModelProperty(name = "isSeriousIllness", value = "是否为重病(是或否)")
+    private String isSeriousIllness = "否";
     @ApiModelProperty(name = "isDrug", value = "是否为吸毒人员(是或否)")
     private String isDrug = "否";
     @ApiModelProperty(name = "isDispute", value = "是否有矛盾纠纷(是或否)")
@@ -38,6 +42,8 @@ public class PopulationInfoBaseDTO {
     private String name;
     @ApiModelProperty(name = "idcard", value = "证件")
     private String idcard;
+    @ApiModelProperty(name = "healthStatus", value = "健康状况")
+    private String healthStatus;
     @ApiModelProperty(name = "idcardType", value = "证件类型")
     private String idcardType;
     @ApiModelProperty(name = "birthday", value = "生日")
@@ -53,6 +59,36 @@ public class PopulationInfoBaseDTO {
     @ApiModelProperty(name = "age", value = "年龄")
     private Integer age;
 
+    public String getHealthStatus() {
+        return healthStatus;
+    }
+
+    public void setHealthStatus(String healthStatus) {
+        this.healthStatus = healthStatus;
+    }
+
+    public String getIsMinority() {
+        if(getAge() < 18) {
+            return "是";
+        }
+        return "否";
+    }
+
+    public void setIsMinority(String isMinority) {
+        this.isMinority = isMinority;
+    }
+
+    public String getIsSeriousIllness() {
+        if(getHealthStatus().contains("重病")) {
+            return "是";
+        }
+        return "否";
+    }
+
+    public void setIsSeriousIllness(String isSeriousIllness) {
+        this.isSeriousIllness = isSeriousIllness;
+    }
+
     public Integer getAge() {
         return IdCardVerifyUtil.getIdCardAge(idcard);
     }
diff --git a/src/main/resources/mybatis/mapper/dispute/dispute-mapper.xml b/src/main/resources/mybatis/mapper/dispute/dispute-mapper.xml
index 137f4d5..e3bc744 100644
--- a/src/main/resources/mybatis/mapper/dispute/dispute-mapper.xml
+++ b/src/main/resources/mybatis/mapper/dispute/dispute-mapper.xml
@@ -596,7 +596,7 @@
         LEFT JOIN
             data_dictionary t5
         ON
-        t1.case_scale = t2.dictionary_id
+            t1.case_scale = t6.dictionary_id
         LEFT JOIN
             data_dictionary t6
         ON
@@ -832,7 +832,7 @@
             t1.partyb_name,
             t1.partyb_phone,
             t1.dispute_id
-       FROM
+        FROM
             population_dispute t1
         LEFT JOIN
             data_dictionary t2
@@ -849,7 +849,7 @@
         LEFT JOIN
             data_dictionary t5
         ON
-            t1.case_scale = t2.dictionary_id
+            t1.case_scale = t5.dictionary_id
         LEFT JOIN
             data_dictionary t6
         ON
diff --git a/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml b/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml
index 5945eb4..cbf0907 100644
--- a/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml
+++ b/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml
@@ -11,6 +11,7 @@
         <result column="sex" property="sex"/>
         <result column="nation" property="nation"/>
         <result column="education" property="education"/>
+        <result column="health_status" property="healthStatus"/>
         <result column="phone" property="phone"/>
         <result column="is_oldage" property="isOldage"/>
         <result column="is_disability" property="isDisability"/>
@@ -652,6 +653,7 @@
             t1.name,
             t1.idcard,
             t1.idcard_type,
+            t1.health_status,
             t1.birthday,
             t1.sex,
             t1.nation,