门诊挂号

openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/appservice/impl/IOutpatientRegistrationAppServiceImpl.java

@@ -17,14 +17,9 @@ import com.core.common.core.domain.R;
 import com.core.common.utils.AgeCalculatorUtil;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.administration.domain.Encounter;
-import com.openhis.administration.domain.EncounterLocation;
-import com.openhis.administration.domain.EncounterParticipant;
-import com.openhis.administration.domain.Patient;
+import com.openhis.administration.domain.*;
 import com.openhis.administration.mapper.PatientMapper;
-import com.openhis.administration.service.IEncounterLocationService;
-import com.openhis.administration.service.IEncounterParticipantService;
-import com.openhis.administration.service.IEncounterService;
+import com.openhis.administration.service.*;
 import com.openhis.clinical.domain.ConditionDefinition;
 import com.openhis.clinical.mapper.ConditionDefinitionMapper;
 import com.openhis.common.constant.CommonConstants;
@@ -74,6 +69,12 @@ public class IOutpatientRegistrationAppServiceImpl implements IOutpatientRegistr
     @Resource
     IEncounterParticipantService iEncounterParticipantService;
 
+    @Resource
+    IAccountService iAccountService;
+
+    @Resource
+    IChargeItemService iChargeItemService;
+
     /**
      * 门诊挂号 - 查询患者信息
      *
@@ -217,6 +218,10 @@ public class IOutpatientRegistrationAppServiceImpl implements IOutpatientRegistr
         // 就诊参数者管理-表单数据
         EncounterParticipantFormData encounterParticipantFormData =
             outpatientRegistrationAddParam.getEncounterParticipantFormData();
+        // 就诊账户管理-表单数据
+        AccountFormData accountFormData = outpatientRegistrationAddParam.getAccountFormData();
+        // 费用项管理-表单数据
+        ChargeItemFormData chargeItemFormData = outpatientRegistrationAddParam.getChargeItemFormData();
 
         // 患者ID
         Long patientId = encounterFormData.getPatientId();
@@ -227,22 +232,33 @@ public class IOutpatientRegistrationAppServiceImpl implements IOutpatientRegistr
         if (num > 0) {
             return R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00008, null));
         }
-
         // 保存就诊信息
         Encounter encounter = new Encounter();
         BeanUtils.copyProperties(encounterFormData, encounter);
         // 就诊ID
-        Long encounterId = iEncounterService.saveEncounter(encounter);
+        Long encounterId = iEncounterService.saveEncounterByRegister(encounter);
         // 保存就诊位置信息
         encounterLocationFormData.setEncounterId(encounterId);
         EncounterLocation encounterLocation = new EncounterLocation();
         BeanUtils.copyProperties(encounterLocationFormData, encounterLocation);
-        iEncounterLocationService.saveEncounterLocation(encounterLocation);
+        iEncounterLocationService.saveEncounterLocationByRegister(encounterLocation);
         // 保存就诊参数者信息
         encounterParticipantFormData.setEncounterId(encounterId);
         EncounterParticipant encounterParticipant = new EncounterParticipant();
         BeanUtils.copyProperties(encounterParticipantFormData, encounterParticipant);
-        iEncounterParticipantService.saveEncounterParticipant(encounterParticipant);
+        iEncounterParticipantService.saveEncounterParticipantByRegister(encounterParticipant);
+        // 保存就诊账户信息
+        accountFormData.setEncounterId(encounterId);
+        Account account = new Account();
+        BeanUtils.copyProperties(accountFormData, account);
+        // 账户ID
+        Long accountId = iAccountService.saveAccountByRegister(account);
+        // 保存就诊费用项
+        chargeItemFormData.setEncounterId(encounterId);
+        chargeItemFormData.setAccountId(accountId);
+        ChargeItem chargeItem = new ChargeItem();
+        BeanUtils.copyProperties(chargeItemFormData, chargeItem);
+        iChargeItemService.saveChargeItemByRegister(chargeItem);
 
         return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"挂号"}));
     }

openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/AccountFormData.java

@@ -0,0 +1,62 @@
+package com.openhis.web.outpatientservice.dto;
+
+import java.math.BigDecimal;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.enums.AccountBillingStatus;
+import com.openhis.common.enums.AccountStatus;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 就诊账号 表单数据
+ */
+@Data
+@Accessors(chain = true)
+public class AccountFormData {
+
+    /**
+     * 就诊ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+    /** 患者id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+
+    /** 状态枚举 */
+    private Integer statusEnum;
+
+    /** 结账状态枚举 */
+    private Integer billingStatusEnum;
+
+    /** 账户类型编码 */
+    private String typeCode; // 1:个人现金账户, 2:医保账户
+
+    /** 名称 */
+    private String name; // 刷医保卡时应该会带出该信息
+
+    /** 账户余额 */
+    private BigDecimal balanceAmount; // 刷医保卡时应该会带出该信息
+
+    /** 医保区域编码 */
+    private String ybAreaNo; // 刷医保卡时应该会带出该信息
+
+    /** 合同编码 */
+    private String contractNo; // 从选择的费用性质里选择合同编码
+
+    /** 欠费限制额度 */
+    private BigDecimal limitAccount; // 刷医保卡时应该会带出该信息
+
+    /**
+     * 设置默认值
+     */
+    public AccountFormData() {
+        this.statusEnum = AccountStatus.ACTIVE.getValue();
+        this.billingStatusEnum = AccountBillingStatus.OPEN.getValue();
+    }
+
+}

openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/ChargeItemFormData.java

@@ -0,0 +1,87 @@
+package com.openhis.web.outpatientservice.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.core.common.utils.SecurityUtils;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.enums.ChargeItemStatus;
+import com.openhis.common.enums.EncounterClass;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 费用项管理 表单数据
+ */
+@Data
+@Accessors(chain = true)
+public class ChargeItemFormData {
+
+    /**
+     * 就诊ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+    /** 患者id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+
+    /** 层级 */
+    private String busNo;
+
+    /** 状态 */
+    private Integer statusEnum;
+
+    /** 类别 */
+    private Integer contextEnum;
+
+    /** 发生时间 */
+    private Date occurrenceTime;
+
+    /** 执行人Id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long performerId;
+
+    /** 费用定价ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long definitionId;
+
+    /** 开立人ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long entererId;
+
+    /** 开立时间 */
+    private Date enteredDate;
+
+    /** 医疗服务类型 */
+    private String serviceTable;
+
+    /** 医疗服务ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long serviceId;
+
+    /** 总价 */
+    private BigDecimal totalPrice;
+
+    /** 关联账户ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long accountId;
+
+    /**
+     * 设置默认值
+     */
+    public ChargeItemFormData() {
+        this.statusEnum = ChargeItemStatus.BILLED.getValue();
+        this.contextEnum = EncounterClass.AMB.getValue();
+        this.occurrenceTime = new Date();
+        this.performerId = SecurityUtils.getLoginUser().getUserId();
+        this.entererId = SecurityUtils.getLoginUser().getUserId();
+        this.enteredDate = new Date();
+        this.serviceTable = CommonConstants.TableName.ADM_HEALTHCARE_SERVICE;
+    }
+
+}

openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientservice/dto/OutpatientRegistrationAddParam.java

@@ -33,9 +33,10 @@ public class OutpatientRegistrationAddParam {
     /**
      * 就诊账户管理-表单数据
      */
-
+    private AccountFormData accountFormData;
     /**
      * 费用项管理-表单数据
      */
+    private ChargeItemFormData chargeItemFormData;
 
 }