Merge branch 'dev/newDiagMode20220316' into debug

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

@@ -22,7 +22,6 @@ import com.diagbot.vo.HospitalSetVO;
 import com.diagbot.vo.PlanDetailCancelVO;
 import com.diagbot.vo.PlanDetailRevStopVO;
 import com.diagbot.vo.PlanDetailSaveVO;
-import com.diagbot.vo.PlanDetailSubSaveVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -151,8 +150,8 @@ public class PlanDetailFacade extends PlanDetailServiceImpl {
                                     planDetailVO3.setGmtModified(now);
                                     planDetailList.add(planDetailVO3);
                                 }
-                                res = planDetailService.saveBatch(planDetailList);
                             }
+                            res = planDetailService.saveBatch(planDetailList);
                         }
                     }
                 }

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

@@ -153,7 +153,7 @@ public class PlanFacade extends PlanServiceImpl {
                         if (ListUtil.isNotEmpty(planDetailSub3)) {
                             for (HospitalPlanDetailSaveVO dataSub3 : planDetailSub3) {
                                 HospitalPlanDetailSaveVO dataSubNew3 = new HospitalPlanDetailSaveVO();
-                                BeanUtil.copyProperties(dataSub, dataSubNew3);
+                                BeanUtil.copyProperties(dataSub3, dataSubNew3);
                                 dataSubNew3.setPlanId(planId);
                                 planDetailSubNew3.add(dataSubNew3);
                             }