资质分类字典管理

资质字典管理

src/main/java/com/kcim/controller/InterfaceController.java

@@ -16,16 +16,6 @@ import org.springframework.web.bind.annotation.*;
 public class InterfaceController {
 
     @Autowired
-    private HisItemDicService interfaceHisItemDicService;
+    private HisItemDicService hisItemDicService;
 
-    /**
-     * 查询HIS医嘱项目字典
-     */
-    @ApiOperation("医嘱项目字典-查询")
-    @GetMapping("getHisItemDicList")
-    public Result getHisItemDicList(@RequestParam(value = "queryCondition", required = false) String queryCondition,
-                                    @RequestParam(value = "current", required = false) Integer current,
-                                    @RequestParam(value = "pageSize", required = false) Integer pageSize){
-        return Result.ok(interfaceHisItemDicService.getHisItemDicList(queryCondition,current,pageSize));
-    }
 }

src/main/java/com/kcim/controller/QualificationController.java

@@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.*;
 
 /**
  * 资质字典
- *
  * @author jinhu
  */
 @RestController
@@ -66,8 +65,8 @@ public class QualificationController {
                                        @RequestParam(value = "techFlag", required = false) Integer techFlag,
                                        @RequestParam(value = "operationFlag", required = false) Integer operationFlag,
                                        @RequestParam(value = "enableFlag", required = false) Integer enableFlag,
-                                       @RequestParam(value = "current", required = false) Integer current,
-                                       @RequestParam(value = "pageSize", required = false) Integer pageSize) {
+                                       @RequestParam(value = "current", required = false, defaultValue = "1") Integer current,
+                                       @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
         return Result.ok(qualificationService.getQualificationList(name, qualificationTypeCode, operationLevelCode, techFlag, operationFlag, enableFlag, current, pageSize));
     }
 
@@ -95,8 +94,8 @@ public class QualificationController {
     @ApiOperation("资质关联医嘱项目-查询")
     @GetMapping("getQualificationHisItemMap")
     public Result getQualificationHisItemMap(@RequestParam(value = "qualificationId", required = false) Integer qualificationId,
-                                          @RequestParam(value = "current", required = false) Integer current,
-                                          @RequestParam(value = "pageSize", required = false) Integer pageSize){
+                                             @RequestParam(value = "current", required = false, defaultValue = "1") Integer current,
+                                             @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize){
         return Result.ok(qualificationHisItemService.getQualificationHisItemMap(qualificationId,current,pageSize));
     }
 
@@ -106,4 +105,15 @@ public class QualificationController {
         qualificationHisItemService.saveQualificationHisItemMap(request);
         return Result.ok();
     }
+
+    /**
+     * 查询HIS医嘱项目字典
+     */
+    @ApiOperation("医嘱项目字典-查询")
+    @GetMapping("getHisItemDicList")
+    public Result getHisItemDicList(@RequestParam(value = "queryCondition", required = false) String queryCondition,
+                                    @RequestParam(value = "current", required = false, defaultValue = "1") Integer current,
+                                    @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize){
+        return Result.ok(qualificationHisItemService.getHisItemDicList(queryCondition,current,pageSize));
+    }
 }

src/main/java/com/kcim/dao/repository/HisItemDicRepository.java

@@ -0,0 +1,31 @@
+package com.kcim.dao.repository;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kcim.constants.NumberConstant;
+import com.kcim.dao.mapper.HisItemDicMapper;
+import com.kcim.dao.model.HisItemDic;
+
+import com.kcim.util.BaseUtil;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class HisItemDicRepository extends ServiceImpl<HisItemDicMapper, HisItemDic> {
+
+    public Page<HisItemDic> getPage(String queryCondition,Integer current, Integer pageSize) {
+
+        LambdaQueryWrapper<HisItemDic> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(HisItemDic::getHospId, BaseUtil.getCurrentLoginHospId());
+        queryWrapper.eq(HisItemDic::getDelFlag, NumberConstant.ZERO);
+
+        queryWrapper.like(HisItemDic::getHisItemType, queryCondition)
+                    .or()
+                    .like(HisItemDic::getHisItemName, queryCondition)
+                    .or()
+                    .like(HisItemDic::getMemo, queryCondition);
+
+        Page<HisItemDic> page = new Page<>(current,pageSize);
+        return  this.page(page,queryWrapper);
+    }
+}

src/main/java/com/kcim/dao/repository/InterfaceHisItemDicRepository.java

@@ -1,18 +0,0 @@
-package com.kcim.dao.repository;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.kcim.dao.mapper.HisItemDicMapper;
-import com.kcim.dao.model.HisItemDic;
-
-import org.springframework.stereotype.Repository;
-
-@Repository
-public class InterfaceHisItemDicRepository extends ServiceImpl<HisItemDicMapper, HisItemDic>  {
-
-    public Page<HisItemDic> getPage(Integer current, Integer pageSize, LambdaQueryWrapper<HisItemDic> queryWrapper) {
-        Page<HisItemDic> page = new Page<>(current,pageSize);
-        return  this.page(page,queryWrapper);
-    }
-}

src/main/java/com/kcim/dao/repository/MedQualificationHisItemRepository.java → src/main/java/com/kcim/dao/repository/QualificationHisItemRepository.java

@@ -9,7 +9,7 @@ import com.kcim.dao.model.QualificationHisItem;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class MedQualificationHisItemRepository extends ServiceImpl<QualificationHisItemMapper, QualificationHisItem>  {
+public class QualificationHisItemRepository extends ServiceImpl<QualificationHisItemMapper, QualificationHisItem>  {
 
     public Page<QualificationHisItem> getPage(Integer current, Integer pageSize, LambdaQueryWrapper<QualificationHisItem> queryWrapper) {
         Page<QualificationHisItem> page = new Page<>(current,pageSize);

src/main/java/com/kcim/dao/repository/QualificationTypeRepository.java

@@ -8,5 +8,4 @@ import org.springframework.stereotype.Repository;
 @Repository
 public class QualificationTypeRepository extends ServiceImpl<QualificationTypeMapper, QualificationType> {
 
-}
-
+}

src/main/java/com/kcim/service/HisItemDicService.java

@@ -11,7 +11,7 @@ import com.kcim.dao.model.HisItemDic;
  **/
 public interface HisItemDicService extends IService<HisItemDic> {
 
-    Object getHisItemDicList(String queryCondition, Integer current, Integer pageSize);
+
 
 
 }

src/main/java/com/kcim/service/QualificationHisItemService.java

@@ -9,4 +9,6 @@ public interface QualificationHisItemService extends IService<QualificationHisIt
     Object getQualificationHisItemMap(Integer qualificationId, Integer current, Integer pageSize);
 
     void saveQualificationHisItemMap(QualificationHisItemMapRequest qualificationHisItemMapRequest);
+
+    Object getHisItemDicList(String queryCondition, Integer current, Integer pageSize);
 }

src/main/java/com/kcim/service/impl/HisItemDicServiceImpl.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kcim.constants.NumberConstant;
 import com.kcim.dao.mapper.HisItemDicMapper;
 import com.kcim.dao.model.HisItemDic;
-import com.kcim.dao.repository.InterfaceHisItemDicRepository;
+import com.kcim.dao.repository.HisItemDicRepository;
 import com.kcim.service.HisItemDicService;
 import com.kcim.util.BaseUtil;
 import com.kcim.util.PageUtils;
@@ -22,29 +22,7 @@ import java.util.ArrayList;
 @Slf4j
 public class HisItemDicServiceImpl extends ServiceImpl<HisItemDicMapper, HisItemDic> implements HisItemDicService {
 
-    InterfaceHisItemDicRepository interfaceHisItemDicRepository;
+    HisItemDicRepository hisItemDicRepository;
 
-    @Override
-    public Object getHisItemDicList(String queryCondition, Integer current, Integer pageSize) {
-        LambdaQueryWrapper<HisItemDic> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(HisItemDic::getHospId, BaseUtil.getCurrentLoginHospId());
-        queryWrapper.eq(HisItemDic::getDelFlag, NumberConstant.ZERO);
 
-        queryWrapper.like(HisItemDic::getHisItemType, queryCondition)
-                    .or()
-                    .like(HisItemDic::getHisItemName, queryCondition)
-                    .or()
-                    .like(HisItemDic::getMemo, queryCondition);
-
-        return this.getPage(queryWrapper, current, pageSize);
-    }
-
-    public Object getPage(LambdaQueryWrapper<HisItemDic> queryWrapper, Integer current, Integer pageSize)
-    {
-        Page<HisItemDic> page = interfaceHisItemDicRepository.getPage(current,pageSize,queryWrapper);
-        if(CollectionUtils.isEmpty(page.getRecords())){
-            return new PageUtils(new ArrayList<>(), NumberConstant.ZERO,pageSize,current);
-        }
-        return new PageUtils(page.getRecords(), Math.toIntExact(page.getTotal()),pageSize,current);
-    }
 }

src/main/java/com/kcim/service/impl/QualificationHisItemServiceImpl.java

@@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kcim.constants.NumberConstant;
 import com.kcim.controller.request.QualificationHisItemMapRequest;
 import com.kcim.dao.mapper.QualificationHisItemMapper;
+import com.kcim.dao.model.HisItemDic;
 import com.kcim.dao.model.QualificationHisItem;
-import com.kcim.dao.repository.MedQualificationHisItemRepository;
+import com.kcim.dao.repository.HisItemDicRepository;
+import com.kcim.dao.repository.QualificationHisItemRepository;
 import com.kcim.service.QualificationHisItemService;
 import com.kcim.util.BaseUtil;
 import com.kcim.util.PageUtils;
@@ -24,7 +26,8 @@ import java.util.stream.Collectors;
 @Slf4j
 public class QualificationHisItemServiceImpl extends ServiceImpl<QualificationHisItemMapper, QualificationHisItem> implements QualificationHisItemService {
 
-    MedQualificationHisItemRepository qualificationHisItemRepository;
+    QualificationHisItemRepository qualificationHisItemRepository;
+    HisItemDicRepository hisItemDicRepository;
 
     @Override
     public Object getQualificationHisItemMap(Integer qualificationId, Integer current, Integer pageSize) {
@@ -70,4 +73,13 @@ public class QualificationHisItemServiceImpl extends ServiceImpl<QualificationHi
         }
         this.saveBatch(request.getQualificationHisItemMap());
     }
+
+    @Override
+    public Object getHisItemDicList(String queryCondition, Integer current, Integer pageSize) {
+        Page<HisItemDic> page = hisItemDicRepository.getPage(queryCondition,current,pageSize);
+        if(CollectionUtils.isEmpty(page.getRecords())){
+            return new PageUtils(new ArrayList<>(), NumberConstant.ZERO,pageSize,current);
+        }
+        return new PageUtils(page.getRecords(), Math.toIntExact(page.getTotal()),pageSize,current);
+    }
 }

src/main/java/com/kcim/service/impl/QualificationServiceImpl.java

@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kcim.constants.NumberConstant;
 import com.kcim.controller.request.QualificationHisItemMapRequest;
-import com.kcim.dao.repository.InterfaceHisItemDicRepository;
+import com.kcim.dao.model.HisItemDic;
+import com.kcim.dao.repository.HisItemDicRepository;
 import com.kcim.dao.repository.QualificationRepository;
 import com.kcim.dao.repository.QualificationTypeRepository;
 import com.kcim.exception.MedicalException;
@@ -31,9 +32,7 @@ public class QualificationServiceImpl extends ServiceImpl<QualificationMapper, Q
 
     QualificationTypeRepository qualificationTypeRepository;
     QualificationRepository qualificationRepository;
-    InterfaceHisItemDicRepository interfaceHisItemDicRepository;
-
-
+    HisItemDicRepository hisItemDicRepository;
 
     /**
      * 查询资质分类列表
@@ -231,25 +230,4 @@ public class QualificationServiceImpl extends ServiceImpl<QualificationMapper, Q
         }
         return list;
     }
-
-    public Object getQualificationHisItemMap(Integer qualificationId, Integer current, Integer pageSize) {
-
-//        LambdaQueryWrapper<MedQualificationHisItem> queryWrapper = new LambdaQueryWrapper<>();
-//
-//        queryWrapper.eq(MedQualificationHisItem::getQualificationId, qualificationId);
-//        queryWrapper.eq(MedQualificationHisItem::getHospId, BaseUtil.getCurrentLoginHospId());
-//        queryWrapper.eq(MedQualificationHisItem::getDelFlag, NumberConstant.ZERO);
-//
-//        Page<MedQualificationHisItem> page = qualificationHisItemRepository.getPage(current,pageSize,queryWrapper);
-//        if(CollectionUtils.isEmpty(page.getRecords())){
-//            return new PageUtils(new ArrayList<>(), NumberConstant.ZERO,pageSize,current);
-//        }
-//        return new PageUtils(page.getRecords(), Math.toIntExact(page.getTotal()),pageSize,current);
-        return null;
-    }
-
-    public void saveQualificationHisItemMap(QualificationHisItemMapRequest request) {
-
-
-    }
 }