手机端人员信息增加字典label值

src/main/java/com/sooka/sponest/mobile/comprehensive/personBasicInfoController/AppPersonBasicInfoController.java

@@ -84,42 +84,52 @@ public class AppPersonBasicInfoController {
             otherInfo.forEach(bind ->{
                 switch(String.valueOf(bind.get("otherPersonType"))){
                     case "1":
+                        setRegisteredPopulation(bind);
                         RegisteredPopulationInfo registeredPopulationInfo = JSONObject.toJavaObject(new JSONObject(bind), RegisteredPopulationInfo.class);
                         result.put("registeredPopulation", registeredPopulationInfo);
                         break;
                     case "2":
+                        setFloatingPopulation(bind);
                         FloatingPopulationInfo floatingPopulationInfo = JSONObject.toJavaObject(new JSONObject(bind), FloatingPopulationInfo.class);
                         result.put("floatingPopulation", floatingPopulationInfo);
                         break;
                     case "3":
+                        setLeftBehindPerson(bind);
                         LeftBehindPersonInfo leftBehindPersonInfo = JSONObject.toJavaObject(new JSONObject(bind), LeftBehindPersonInfo.class);
                         result.put("leftBehindPerson", leftBehindPersonInfo);
                         break;
                     case "4":
+                        setCampusAroundPerson(bind);
                         CampusAroundPersonInfo campusAroundPersonInfo = JSONObject.toJavaObject(new JSONObject(bind), CampusAroundPersonInfo.class);
                         result.put("campusAroundPerson", campusAroundPersonInfo);
                         break;
                     case "5":
+                        setPrisonReleased(bind);
                         PrisonReleasedInfo prisonReleasedInfo = JSONObject.toJavaObject(new JSONObject(bind), PrisonReleasedInfo.class);
                         result.put("prisonReleased", prisonReleasedInfo);
                         break;
                     case "6":
+                        setCommunityCorrectionStaff(bind);
                         CommunityCorrectionStaffInfo communityCorrectionStaffInfo = JSONObject.toJavaObject(new JSONObject(bind), CommunityCorrectionStaffInfo.class);
                         result.put("communityCorrectionStaff", communityCorrectionStaffInfo);
                         break;
                     case "7":
+                        setPsychosisPopulation(bind);
                         PsychosisPopulationInfo psychosisPopulationInfo = JSONObject.toJavaObject(new JSONObject(bind), PsychosisPopulationInfo.class);
                         result.put("psychosisPopulation", psychosisPopulationInfo);
                         break;
                     case "8":
+                        setDrugAddict(bind);
                         DrugAddictInfo drugAddictInfo = JSONObject.toJavaObject(new JSONObject(bind), DrugAddictInfo.class);
                         result.put("drugAddict", drugAddictInfo);
                         break;
                     case "9":
+                        setAidsRisk(bind);
                         AidsRiskInfo aidsRiskInfo = JSONObject.toJavaObject(new JSONObject(bind), AidsRiskInfo.class);
                         result.put("aidsRisk", aidsRiskInfo);
                         break;
                     case "10":
+                        setKeyYouth(bind);
                         KeyYouthInfo keyYouthInfo = JSONObject.toJavaObject(new JSONObject(bind), KeyYouthInfo.class);
                         result.put("keyYouth", keyYouthInfo);
                         break;
@@ -308,7 +318,7 @@ public class AppPersonBasicInfoController {
      * 设置肇事肇祸及严重精神障碍患者字典值
      */
     private void setPsychosisPopulation(HashMap<String, Object> json) {//7
-        json.put("familyEconomicSituationLabel", null == json.get("familyEconomicSituationLabel") ? null : getDictData(DictKeys.COMPREHENSIVE_HOUSEHOLDS_FINANCIAL_SITUATION, String.valueOf(json.get("familyEconomicSituationLabel"))));//家庭经济状况
+        json.put("familyEconomicSituationLabel", null == json.get("familyEconomicSituation") ? null : getDictData(DictKeys.COMPREHENSIVE_HOUSEHOLDS_FINANCIAL_SITUATION, String.valueOf(json.get("familyEconomicSituation"))));//家庭经济状况
         json.put("subsistenceAllowanceLabel", "1".equals(json.get("subsistenceAllowance")) ? "是" : "否");//是否纳入低保
         json.put("diagnosisTypeLabel", getDictData(DictKeys.COMPREHENSIVE_CURRENT_DIAGNOSTIC, String.valueOf(json.get("diagnosisType"))));//目前诊断类型
         json.put("historyCausingAccidentsLabel", "1".equals(json.get("historyCausingAccidents")) ? "有" : "无");//有无肇事肇祸史