服务管理-新增

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

@@ -38,8 +38,8 @@ public class ChargeItemDefinition extends HisBaseEntity {
     /** 状态 */
     private PublicationStatus statusEnum;
 
-    /** 机构编码 */
-    private String orgCode;
+    /** 机构ID */
+    private Long orgId;
 
     /** 描述 */
     private String description;
@@ -60,7 +60,7 @@ public class ChargeItemDefinition extends HisBaseEntity {
     private String typeCode;
 
     /** 医保类别 */
-    private Integer ybType;
+    private String ybType;
 
     /** 是否使用详细价格规则 */
     private Integer conditionFlag;

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

@@ -3,6 +3,7 @@ package com.openhis.administration.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.administration.domain.ChargeItemDefinition;
+import com.openhis.administration.domain.HealthcareService;
 
 /**
  * 费用定价管理Service接口
@@ -14,17 +15,17 @@ public interface IChargeItemDefinitionService extends IService<ChargeItemDefinit
 
     /**
      * 获取定价分页列表
-     * 
+     *
      * @param chargeItemDefinition 定价查询条件
-     * @param pageNo 页码
-     * @param pageSize 页面大小
+     * @param pageNo               页码
+     * @param pageSize             页面大小
      * @return 定价分页列表
      */
     Page<ChargeItemDefinition> getPage(ChargeItemDefinition chargeItemDefinition, Integer pageNo, Integer pageSize);
 
     /**
      * 新增费用定价
-     * 
+     *
      * @param chargeItemDefinition 新增内容
      * @return 新增结果
      */
@@ -32,9 +33,20 @@ public interface IChargeItemDefinitionService extends IService<ChargeItemDefinit
 
     /**
      * 删除费用定价
-     * 
+     *
      * @param id 费用定价id
      * @return 新增结果
      */
     boolean deleteChargeItemDefinition(Long id);
+
+    /**
+     * 通过服务管理新增费用定价
+     *
+     * @param healthcareService    服务管理
+     * @param chargeItemDefinition 费用定价
+     * @return 新增结果
+     */
+    boolean addChargeItemDefinitionByHealthcareService(HealthcareService healthcareService, ChargeItemDefinition chargeItemDefinition);
+
+
 }

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

@@ -11,6 +11,11 @@ import com.openhis.administration.domain.HealthcareService;
  */
 public interface IHealthcareServiceService extends IService<HealthcareService> {
 
+    /**
+     * 服务管理 新增
+     * @param healthcareService 表单信息
+     * @return 入库后信息
+     */
     HealthcareService addHealthcareService(HealthcareService healthcareService);
 
 }

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

@@ -1,5 +1,7 @@
 package com.openhis.administration.service.impl;
 
+import com.openhis.administration.domain.HealthcareService;
+import com.openhis.common.constant.CommonConstants;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -9,6 +11,7 @@ import com.openhis.administration.domain.ChargeItemDefinition;
 import com.openhis.administration.mapper.ChargeItemDefinitionMapper;
 import com.openhis.administration.service.IChargeItemDefinitionService;
 import com.openhis.common.enums.DelFlag;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 费用定价管理Service业务层处理
@@ -18,19 +21,19 @@ import com.openhis.common.enums.DelFlag;
  */
 @Service
 public class ChargeItemDefinitionServiceImpl extends ServiceImpl<ChargeItemDefinitionMapper, ChargeItemDefinition>
-    implements IChargeItemDefinitionService {
+        implements IChargeItemDefinitionService {
 
     /**
      * 获取分页列表
      *
      * @param chargeItemDefinition 查询条件
-     * @param pageNo 页码
-     * @param pageSize 页面大小
+     * @param pageNo               页码
+     * @param pageSize             页面大小
      * @return 分页列表
      */
     @Override
     public Page<ChargeItemDefinition> getPage(ChargeItemDefinition chargeItemDefinition, Integer pageNo,
-        Integer pageSize) {
+                                              Integer pageSize) {
 
         LambdaQueryWrapper<ChargeItemDefinition> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ChargeItemDefinition::getDeleteFlag, DelFlag.NO.getValue());
@@ -73,4 +76,26 @@ public class ChargeItemDefinitionServiceImpl extends ServiceImpl<ChargeItemDefin
             return baseMapper.deleteById(id) > 0;
         }
     }
+
+
+    /**
+     * 通过服务管理新增费用定价
+     *
+     * @param healthcareService    服务管理
+     * @param chargeItemDefinition 费用定价
+     * @return 新增结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean addChargeItemDefinitionByHealthcareService(HealthcareService healthcareService, ChargeItemDefinition chargeItemDefinition) {
+        // 服务管理主键id
+        if (healthcareService.getId() != null) {
+            chargeItemDefinition.setInstanceTable(CommonConstants.TableName.ADM_HEALTHCARE_SERVICE);
+            chargeItemDefinition.setInstanceId(healthcareService.getId());
+            return baseMapper.insert(chargeItemDefinition) > 0;
+        } else {
+            return false;
+        }
+    }
+
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.openhis.administration.domain.HealthcareService;
 import com.openhis.administration.mapper.HealthcareServiceMapper;
 import com.openhis.administration.service.IHealthcareServiceService;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 服务项目管理Service业务层处理
@@ -16,7 +17,14 @@ import com.openhis.administration.service.IHealthcareServiceService;
 @Service
 public class HealthcareServiceServiceImpl extends ServiceImpl<HealthcareServiceMapper, HealthcareService> implements IHealthcareServiceService {
 
+
+    /**
+     * 服务管理 新增
+     * @param healthcareService 表单信息
+     * @return 入库后信息
+     */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public HealthcareService addHealthcareService(HealthcareService healthcareService){
         baseMapper.insert(healthcareService);
         return healthcareService;