Merge remote-tracking branch 'origin/demo/edit' into demo/edit

src/main/java/com/diagbot/facade/data/AHomeDiagnoseInfoFacade.java

@@ -106,10 +106,24 @@ public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
             });
         }
         if(addE.size()>0){
-            homeDiagnoseInfoService.saveBatch(addE);
+//            homeDiagnoseInfoService.saveBatch(addE);
+            for (HomeDiagnoseInfo homeDiagnoseInfo : addE) {
+                QueryWrapper<HomeDiagnoseInfo> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("home_page_id", homeDiagnoseInfo.getHomePageId())
+                        .eq("hospital_id", homeDiagnoseInfo.getHospitalId())
+                        .eq("diagnose_order_no", homeDiagnoseInfo.getDiagnoseOrderNo());
+                homeDiagnoseInfoService.saveOrUpdate(homeDiagnoseInfo, queryWrapper);
+            }
         }
         if(updateE.size()>0){
-            homeDiagnoseInfoService.updateBatchByKey(updateE);
+//            homeDiagnoseInfoService.updateBatchByKey(updateE);
+            for (HomeDiagnoseInfo homeDiagnoseInfo : updateE) {
+                QueryWrapper<HomeDiagnoseInfo> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("home_page_id", homeDiagnoseInfo.getHomePageId())
+                        .eq("hospital_id", homeDiagnoseInfo.getHospitalId())
+                        .eq("diagnose_order_no", homeDiagnoseInfo.getDiagnoseOrderNo());
+                homeDiagnoseInfoService.saveOrUpdate(homeDiagnoseInfo, queryWrapper);
+            }
         }
     }
 

src/main/java/com/diagbot/facade/data/AHomeOperationInfoFacade.java

@@ -112,10 +112,24 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
             });
         }
         if(addE.size()>0){
-            homeOperationInfoService.saveBatch(addE);
+//            homeOperationInfoService.saveBatch(addE);
+            for (HomeOperationInfo homeOperationInfo : addE) {
+                QueryWrapper<HomeOperationInfo> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("home_page_id", homeOperationInfo.getHomePageId())
+                        .eq("hospital_id", homeOperationInfo.getHospitalId())
+                        .eq("operation_order_no", homeOperationInfo.getOperationOrderNo());
+                homeOperationInfoService.saveOrUpdate(homeOperationInfo, queryWrapper);
+            }
         }
         if(updateE.size()>0){
-            homeOperationInfoService.updateBatchByKey(updateE);
+//            homeOperationInfoService.updateBatchByKey(updateE);
+            for (HomeOperationInfo homeOperationInfo : updateE) {
+                QueryWrapper<HomeOperationInfo> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("home_page_id", homeOperationInfo.getHomePageId())
+                        .eq("hospital_id", homeOperationInfo.getHospitalId())
+                        .eq("operation_order_no", homeOperationInfo.getOperationOrderNo());
+                homeOperationInfoService.saveOrUpdate(homeOperationInfo, queryWrapper);
+            }
         }
     }
 

src/main/java/com/diagbot/facade/data/AHomePageFacade.java

@@ -530,10 +530,24 @@ public class AHomePageFacade extends HomePageServiceImpl{
                 });
             }
             if(addE.size()>0){
-                homePageService.saveBatch(addE);
+//                homePageService.saveBatch(addE);
+                for (HomePage homePage : addE) {
+                    QueryWrapper<HomePage> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.eq("home_page_id", homePage.getHomePageId())
+                            .eq("hospital_id", homePage.getHospitalId())
+                            .eq("behospital_code", homePage.getBehospitalCode());
+                    homePageService.saveOrUpdate(homePage, queryWrapper);
+                }
             }
-            if(updateE.size()>0){
-                homePageService.updateBatchByKey(updateE);
+            if(updateE.size()>0) {
+//                homePageService.updateBatchByKey(updateE);
+                for (HomePage homePage : updateE) {
+                    QueryWrapper<HomePage> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.eq("home_page_id", homePage.getHomePageId())
+                            .eq("hospital_id", homePage.getHospitalId())
+                            .eq("behospital_code", homePage.getBehospitalCode());
+                    homePageService.saveOrUpdate(homePage, queryWrapper);
+                }
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);