修改sql

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml

@@ -430,7 +430,7 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
         max(case field_code when 'nation' then field_value end)                     nation,
         max( CASE field_code WHEN 'birthdayTime' THEN DATE_FORMAT(field_value, '%Y-%m-%d') END ) birthdayTime,
         max(case field_code when 'maritalStatus' then field_value end)                     maritalStatus,
-        max(case field_code when 'nativePlaceCode' then field_value end)                     nativePlace,
+        max(case field_code when 'nativePlaceCode' then field_value_label end)                     nativePlace,
         max(case field_code when 'nativePlaceVal' then field_value end)                     nativePlaceVal,
         max(case field_code when 'politicalOutlook' then field_value end)                     politicalOutlook,
         max(case field_code when 'residenceDetailsCode' then field_value_label end)                     residenceDetails,
@@ -438,7 +438,7 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
 
         max(case field_code when 'holdingTime' then field_value end)                     holdingTime,
         max(case field_code when 'peopleType' then field_value_label end)                     peopleTypecode,
-        max(case field_code when 'nativePlace' then field_value_label end)                     nativePlace,
+
 
         max(case field_code when 'airportAccommodation' then field_value end)                     airportAccommodation
         FROM cb_dynamic_form_instance GROUP BY instance_id) b