Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis

openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java

@@ -1,15 +1,12 @@
 package com.openhis.administration.domain;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.core.common.core.domain.HisBaseEntity;
 import com.openhis.common.enums.OrganizationClass;
 import com.openhis.common.enums.OrganizationType;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -31,7 +28,7 @@ public class Organization extends HisBaseEntity {
     private Long id;
 
     /** 编码 */
-    private String bus_no;
+    private String busNo;
 
     /** 名称 */
     private String name;
@@ -60,5 +57,4 @@ public class Organization extends HisBaseEntity {
     /** 显示顺序 */
     private Integer displayOrder;
 
-
 }

openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationService.java

@@ -5,14 +5,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.administration.domain.Organization;
 
 /**
- * 机构管理(科室)Service接口
+ * 机构管理Service接口
  *
  * @author system
  * @date 2025-02-21
  */
 public interface IOrganizationService extends IService<Organization> {
-    Page<Organization> getOrganizationPage(Integer classEnum,Integer activeFlag, Integer pageNo, Integer pageSize);
-
+    Page<Organization> getOrganizationPage(Integer classEnum, Integer activeFlag, Integer pageNo, Integer pageSize);
 
     /**
      * 通过机构ID查询机构名称

openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/ISupplierService.java

@@ -1,14 +1,31 @@
 package com.openhis.administration.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.core.common.core.domain.R;
 import com.openhis.administration.domain.Supplier;
+import com.openhis.workflow.domain.SupplyRequest;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * 供应商管理Service接口
  *
- * @author system
+ * @author dh
  * @date 2025-02-20
  */
 public interface ISupplierService extends IService<Supplier> {
+    /**
+     * 查询厂商/供应商分页列表
+     *
+     * @param supplier 查询条件
+     * @param pageNo 查询条件
+     * @param pageSize 查询条件
+     * @return 供应申请列表
+     */
+    Page<Supplier> getPage(Supplier supplier, Integer pageNo, Integer pageSize);
+
+
 
 }

openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java

@@ -1,19 +1,18 @@
 package com.openhis.administration.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.openhis.administration.domain.Organization;
 import com.openhis.administration.mapper.OrganizationMapper;
 import com.openhis.administration.service.IOrganizationService;
-import com.openhis.common.enums.DelFlag;
 
 /**
- * 机构管理(科室)Service业务层处理
+ * 机构管理Service业务层处理
  *
  * @author system
  * @date 2025-02-21
@@ -26,14 +25,15 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
     private OrganizationMapper organizationMapper;
 
     /**
-     * 查询科室列表
+     * 查询机构列表
      *
      * @param classEnum 机构分类枚举
      * @param activeFlag 活动标识
-     * @return 科室列表
+     * @return 机构列表
      */
     @Override
-    public Page<Organization> getOrganizationPage(Integer classEnum,Integer activeFlag, Integer pageNo, Integer pageSize) {
+    public Page<Organization> getOrganizationPage(Integer classEnum, Integer activeFlag, Integer pageNo,
+        Integer pageSize) {
 
         LambdaQueryWrapper<Organization> queryWrapper = new LambdaQueryWrapper<>();
 
@@ -42,12 +42,12 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
         }
 
         if (activeFlag != null) {
-            queryWrapper.eq(Organization::getTypeEnum, activeFlag);
+            queryWrapper.eq(Organization::getActiveFlag, activeFlag);
         }
 
         Page<Organization> organizationPage = organizationMapper.selectPage(new Page<>(pageNo, pageSize), queryWrapper);
 
-        // 返回科室信息列表
+        // 返回机构信息列表
         return organizationPage;
     }
 
@@ -60,7 +60,7 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
     @Override
     public Organization getByCode(String code) {
         QueryWrapper<Organization> queryWrapper = new QueryWrapper<>();
-        //设置查询条件为机构Id code
+        // 设置查询条件为机构Id code
         queryWrapper.eq("code", code);
         return organizationMapper.selectOne(queryWrapper);
     }

openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/SupplierServiceImpl.java

@@ -1,5 +1,13 @@
 package com.openhis.administration.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.utils.StringUtils;
+import com.core.common.utils.bean.BeanUtils;
+import com.openhis.common.enums.DelFlag;
+import com.openhis.workflow.domain.SupplyRequest;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -13,7 +21,47 @@ import com.openhis.administration.service.ISupplierService;
  * @author system
  * @date 2025-02-20
  */
+@Slf4j
 @Service
+@AllArgsConstructor
 public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> implements ISupplierService {
 
+    private final SupplierMapper supplierMapper;
+    /**
+     * 查询厂商/产地列表
+     *
+     * @param supplier 查询条件
+     * @param pageNo 查询条件
+     * @param pageSize 查询条件
+     * @return 厂商/产地列表
+     */
+    @Override
+    public Page<Supplier> getPage(Supplier supplier, Integer pageNo, Integer pageSize) {
+        Page<Supplier> supplierList = new Page<>();
+//        // 判断入库数量
+//        if (supplyRequest.getItemQuantity() != 0) {
+//            // 查询供应申请信息列表
+//            supplyRequestList = supplyRequestMapper.selectPage(new Page<>(pageNo, pageSize),
+//                    new LambdaQueryWrapper<SupplyRequest>().eq(SupplyRequest::getDeleteFlag, DelFlag.NO.getValue()));
+//        } else {
+//            return null;
+//        }
+
+        // 设置查询条件
+        LambdaQueryWrapper<Supplier> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        if (StringUtils.isNotEmpty(supplier.getBusNo())) {
+            lambdaQueryWrapper.eq(Supplier::getBusNo, supplier.getBusNo());
+        }
+        if (StringUtils.isNotEmpty(supplier.getName())) {
+            lambdaQueryWrapper.eq(Supplier::getName, supplier.getName());
+        }
+        if (StringUtils.isNotNull(supplier.getTypeEnum())) {
+            lambdaQueryWrapper.eq(Supplier::getTypeEnum, supplier.getTypeEnum());
+        }
+        lambdaQueryWrapper.eq(Supplier::getDeleteFlag, DelFlag.NO.getValue());
+
+        supplierList = supplierMapper.selectPage(new Page<>(pageNo, pageSize), lambdaQueryWrapper);
+        // 返回入库信息列表
+        return supplierList;
+    }
 }

openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequest.java

@@ -1,13 +1,12 @@
 package com.openhis.workflow.domain;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.core.common.core.domain.HisBaseEntity;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -28,6 +27,9 @@ public class SupplyRequest extends HisBaseEntity {
     @TableId(type = IdType.ASSIGN_ID)
     private Long id;
 
+    /** 单据号 */
+    private String busNo;
+
     /** 类型 */
     private Integer typeEnum;
 
@@ -118,5 +120,4 @@ public class SupplyRequest extends HisBaseEntity {
     /** 申请时间 */
     private Date applyTime;
 
-
 }