疾病接口修改

bsoft-api/src/main/java/com/bsoft/api/service/Impl/SerDiseaseServiceImpl.java

@@ -53,19 +53,19 @@ public class SerDiseaseServiceImpl implements SerDiseaseService {
         }
 
         boolean isParent = true;
-        DiseaseLevel diseaseLevelResult = new DiseaseLevel();
+        DiseaseLevel diseaseLevelResult = null;
         Integer diseaseId = disease.getId().intValue();
         //查询父级菜单对象(直到查询到顶级)
         while(isParent){
             DiseaseLevel diseaseLevel = serDiseaseMapper.selectParentById(date,diseaseId);
             if(diseaseLevel != null){
+                List<DiseaseLevel> sonList = new ArrayList<>();
                 if(diseaseLevelResult != null){
-                    List<DiseaseLevel> sonList = new ArrayList<>();
                     sonList.add(diseaseLevelResult);
-                    diseaseLevel.setDiseaseLevelList(sonList);
-                    diseaseId = diseaseLevel.getId().intValue();
-                    diseaseLevelResult = diseaseLevel;
                 }
+                diseaseLevel.setDiseaseLevelList(sonList);
+                diseaseId = diseaseLevel.getId().intValue();
+                diseaseLevelResult = diseaseLevel;
             }else{
                 isParent = false;
             }
@@ -107,13 +107,13 @@ public class SerDiseaseServiceImpl implements SerDiseaseService {
     private DiseaseLevel getSonDiseaseList(DiseaseLevel diseaseLevel,List<DiseaseLevel> diseaseLevelList,
                                            List<DiseaseLevel> diseaseLevelListSon) {
         if(diseaseLevel != null && diseaseLevel.getDiseaseLevelList() != null && diseaseLevel.getDiseaseLevelList().size() > 0){
-            getSonDiseaseList(null,diseaseLevelList,diseaseLevelListSon);
+            getSonDiseaseList(null,diseaseLevel.getDiseaseLevelList(),diseaseLevelListSon);
         }else if(diseaseLevelList != null && diseaseLevelList.size() > 0){
             for(DiseaseLevel info : diseaseLevelList){
                 getSonDiseaseList(info,null,diseaseLevelListSon);
             }
         }else{
-            if(diseaseLevelListSon != null && diseaseLevelListSon.size() > 0){
+            if(diseaseLevel != null && diseaseLevelListSon != null && diseaseLevelListSon.size() > 0){
                 diseaseLevel.setDiseaseLevelList(diseaseLevelListSon);
             }
         }