Merge branch 'develop' into dev/mapping20210603

src/main/java/com/diagbot/facade/PlanFacade.java

@@ -69,7 +69,7 @@ public class PlanFacade extends PlanServiceImpl {
                 planId.add(data.getId());
             }
         }
-        if(ListUtil.isEmpty(planId)){
+        if (ListUtil.isEmpty(planId)) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该医院没有配置方案，请先配置方案！");
         }
         HospitalSetVO hospitalSetVO = new HospitalSetVO();
@@ -155,8 +155,8 @@ public class PlanFacade extends PlanServiceImpl {
                         planDetailSubNew.add(dataSubNew);
                     }
                     dataNew.setPlanDetailSub(planDetailSubNew);
-                    planDetailParentNew.add(dataNew);
                 }
+                planDetailParentNew.add(dataNew);
             }
         }
 
@@ -302,7 +302,7 @@ public class PlanFacade extends PlanServiceImpl {
                 planId.add(data.getId());
             }
         }
-        if(ListUtil.isEmpty(planId)){
+        if (ListUtil.isEmpty(planId)) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在！");
         }
         HospitalSetVO hospitalSetVO = new HospitalSetVO();