Merge branch 'dev/20220228_v3.0.1通用版_渠道管理第一期' into debug

daqe-center/src/main/java/com/lantone/daqe/facade/HisDataManagementFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.lantone.common.enums.IsDeleteEnum;
 import com.lantone.common.exception.Asserts;
 import com.lantone.common.util.BeanUtil;
+import com.lantone.common.util.DateUtil;
 import com.lantone.common.util.EntityUtil;
 import com.lantone.common.util.ListUtil;
 import com.lantone.common.util.StringUtil;
@@ -124,12 +125,36 @@ public class HisDataManagementFacade {
 
         //插入新查出的his数据
         try {
-            behospitalInfoServiceImpl.saveBatch(BeanUtil.listCopyTo(hisBehospitalInfos, BehospitalInfo.class));
-            homePageServiceImpl.saveBatch(BeanUtil.listCopyTo(hisHomePages, HomePage.class));
-            medicalRecordServiceImpl.saveBatch(BeanUtil.listCopyTo(hisMedicalRecords, MedicalRecord.class));
-            if (ListUtil.isNotEmpty(hisMedicalRecordContents)) {
-                medicalRecordContentServiceImpl.saveBatch(BeanUtil.listCopyTo(hisMedicalRecordContents, MedicalRecordContent.class));
+            List<BehospitalInfo> saveCodes = BeanUtil.listCopyTo(hisBehospitalInfos, BehospitalInfo.class);
+            List<HomePage> saveHomepages = BeanUtil.listCopyTo(hisHomePages, HomePage.class);
+            List<MedicalRecord> saveMedicalRecords = BeanUtil.listCopyTo(hisMedicalRecords, MedicalRecord.class);
+            if (ListUtil.isNotEmpty(saveCodes)) {
+                saveCodes.stream().forEach(behospitalInfo -> {
+                    behospitalInfo.setGmtModified(DateUtil.now());
+                    behospitalInfo.setGmtCreate(DateUtil.now());
+                });
+                behospitalInfoServiceImpl.saveBatch(saveCodes);
             }
+
+            if (ListUtil.isNotEmpty(saveHomepages)) {
+                saveHomepages.stream().forEach(homePage -> {
+                    homePage.setGmtModified(DateUtil.now());
+                    homePage.setGmtCreate(DateUtil.now());
+                });
+                homePageServiceImpl.saveBatch(saveHomepages);
+            }
+
+            if (ListUtil.isNotEmpty(saveMedicalRecords)) {
+                saveMedicalRecords.stream().forEach(medicalRecord -> {
+                    medicalRecord.setGmtModified(DateUtil.now());
+                    medicalRecord.setGmtCreate(DateUtil.now());
+                });
+                medicalRecordServiceImpl.saveBatch(saveMedicalRecords);
+                if (ListUtil.isNotEmpty(hisMedicalRecordContents)) {
+                    medicalRecordContentServiceImpl.saveBatch(BeanUtil.listCopyTo(hisMedicalRecordContents, MedicalRecordContent.class));
+                }
+            }
+
         } catch (Exception e) {
             Asserts.fail("文书批量插入过程出错");
         }
@@ -164,7 +189,7 @@ public class HisDataManagementFacade {
         //文书
         List<HisMedicalRecord> hisMedicalRecords = hisMedicalRecordFacade.list(new QueryWrapper<HisMedicalRecord>().select("rec_id,rec_title,behospital_code")
                 .eq(dataCompareVO.getHospitalId() != null, "hospital_id", dataCompareVO.getHospitalId())
-                .in("behospital_code", codes) );
+                .in("behospital_code", codes));
         Map<String, List<HisMedicalRecord>> medicalRecordMap = EntityUtil.makeEntityListMap(hisMedicalRecords, "behospitalCode");
 
         //拼装

daqe-center/src/main/java/com/lantone/daqe/facade/RegularManagementFacade.java

@@ -14,7 +14,6 @@ import com.lantone.daqe.dto.GetRegularPageDTO;
 import com.lantone.daqe.entity.ColumnVerify;
 import com.lantone.daqe.entity.RegularInfo;
 import com.lantone.daqe.entity.RegularMapping;
-import com.lantone.daqe.entity.RegularResult;
 import com.lantone.daqe.enums.ColumnVerifyTypeEnum;
 import com.lantone.daqe.facade.base.ColumnVerifyFacade;
 import com.lantone.daqe.facade.base.RegularInfoFacade;
@@ -140,12 +139,7 @@ public class RegularManagementFacade {
         if (regularInfoFacade.getById(id) == null) {
             Asserts.fail("该正则式不存在！");
         }
-        RegularInfo regularInfo = new RegularInfo();
-        regularInfo.setId(id);
-        regularInfo.setModifier(SysUserUtils.getCurrentPrinciple() == null ? "0" : SysUserUtils.getCurrentPrinciple());
-        regularInfo.setGmtModified(DateUtil.now());
-        regularInfo.setIsDeleted(IsDeleteEnum.Y.getKey());
-        if (regularInfoFacade.updateById(regularInfo)) {
+        if (regularInfoFacade.removeById(id)) {
             //先获取正则维护关联表id
             List<Long> regularMappingIdList = getRegularMappingId(id);
             //删除表字段的实际值与正则式关联关系

daqe-center/src/main/java/com/lantone/daqe/facade/base/RegularInfoFacade.java

@@ -1,6 +1,7 @@
 package com.lantone.daqe.facade.base;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.lantone.common.enums.IsDeleteEnum;
 import com.lantone.daqe.entity.RegularInfo;
 import com.lantone.daqe.service.impl.RegularInfoServiceImpl;
 import org.springframework.stereotype.Component;
@@ -15,6 +16,7 @@ public class RegularInfoFacade extends RegularInfoServiceImpl {
     public boolean isExist(RegularInfo regularInfo) {
         boolean flag = false;
         RegularInfo regular = this.getOne(new QueryWrapper<RegularInfo>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("name", regularInfo.getName()));
         if (regular != null) {
             flag = true;