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

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

@@ -523,11 +523,8 @@ public class ColumnVerifyManagementFacade {
                 Asserts.fail("标准值不允许重复!");
             }
         }
-        AddColumnVerifyVO addColumnVerifyVO = new AddColumnVerifyVO();
-        List<ColumnInfoVO> columnInfoAdd = new ArrayList<>();
         List<ColumnInfoVO> columnInfoUpdate = new ArrayList<>();
         //查出表列信息ID
-        List<Long> columnInfoIdAdd = new ArrayList<>();
         List<Long> columnInfoIdUpdate = new ArrayList<>();
         for (ColumnInfoVO columnInfoVO : columnList) {
             Long columnId = columnInfoVO.getId();
@@ -541,21 +538,9 @@ public class ColumnVerifyManagementFacade {
                 columnInfoUpdate.add(columnInfoVO);
             } else {
                 //库中暂无维护
-                columnInfoIdAdd.add(columnId);
-                columnInfoAdd.add(columnInfoVO);
+                Asserts.fail("该规则已被删除!");
             }
         }
-        if (ListUtil.isNotEmpty(columnInfoAdd)) {
-            addColumnVerifyVO.setHospitalId(updateColumnVerifyVO.getHospitalId());
-            addColumnVerifyVO.setColumnList(columnInfoAdd);
-            addColumnVerifyVO.setIsRequired(updateColumnVerifyVO.getIsRequired());
-            addColumnVerifyVO.setRegularId(updateColumnVerifyVO.getRegularId());
-            addColumnVerifyVO.setRegularName(updateColumnVerifyVO.getRegularName());
-            addColumnVerifyVO.setStandardValueList(updateColumnVerifyVO.getStandardValueList());
-            addColumnVerifyVO.setDescription(updateColumnVerifyVO.getDescription());
-            //库中暂无走新增流程
-            addColumnVerify(addColumnVerifyVO);
-        }
         //库中已有走修改流程
         if (ListUtil.isNotEmpty(columnInfoIdUpdate)) {
             for (Long columnId : columnInfoIdUpdate) {

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

@@ -61,6 +61,7 @@ public class OfficialCapacityManagementFacade {
         officialCapacityQueryWrapper.like(StringUtil.isNotBlank(getOfficialCapacityPageVO.getDoctorName()), "doctor_name", getOfficialCapacityPageVO.getDoctorName());
         officialCapacityQueryWrapper.like(StringUtil.isNotBlank(getOfficialCapacityPageVO.getDoctorCode()), "doctor_code", getOfficialCapacityPageVO.getDoctorCode());
         officialCapacityQueryWrapper.like(StringUtil.isNotBlank(getOfficialCapacityPageVO.getDeptName()), "dept_name", getOfficialCapacityPageVO.getDeptName());
+        officialCapacityQueryWrapper.orderByDesc("change_time");
         Page<OfficialCapacity> officialCapacityPage = new Page<>(getOfficialCapacityPageVO.getCurrent(), getOfficialCapacityPageVO.getSize());
         officialCapacityFacade.page(officialCapacityPage, officialCapacityQueryWrapper);
         BeanUtil.copyProperties(officialCapacityPage, getOfficialCapacityPageDTOPage);