Revert "```"

This reverts commit abc0674531.

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/IAdvancePaymentManageAppService.java

@@ -25,7 +25,7 @@ public interface IAdvancePaymentManageAppService {
      * @param request 请求
      * @return 患者预交金基本信息
      */
-    IPage<AdvancePaymentInfoDto> getAdvancePaymentInfo(AdvancePaymentInfoDto advancePaymentInfoDto, String searchKey,Long wardLocationId,
+    IPage<AdvancePaymentInfoDto> getAdvancePaymentInfo(AdvancePaymentInfoDto advancePaymentInfoDto, String searchKey,
         Integer pageNo, Integer pageSize, HttpServletRequest request);
 
     /**

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/IInHospitalRegisterAppService.java

@@ -1,13 +1,11 @@
 package com.openhis.web.inhospitalcharge.appservice;
 
 import java.util.HashMap;
-import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.web.common.dto.LocationDto;
 import com.openhis.web.inhospitalcharge.dto.*;
 
 /**
@@ -85,19 +83,4 @@ public interface IInHospitalRegisterAppService {
      */
     R<?> noFilesRegister(NoFilesRegisterDto noFilesRegisterDto);
 
-    /**
-     * 是否登记
-     *
-     * @param encounterId 病历ID
-     * @return true/false
-     */
-    R<Boolean> isRegister(Long encounterId);
-
-    /**
-     * 获取病区列表
-     *
-     * @param orgId 科室id
-     * @return 病区列表
-     */
-    List<LocationDto> getWardList(Long orgId);
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/impl/AdvancePaymentManageAppServiceImpl.java

@@ -70,7 +70,7 @@ public class AdvancePaymentManageAppServiceImpl implements IAdvancePaymentManage
      */
     @Override
     public IPage<AdvancePaymentInfoDto> getAdvancePaymentInfo(AdvancePaymentInfoDto advancePaymentInfoDto,
-        String searchKey, Long wardLocationId, Integer pageNo, Integer pageSize, HttpServletRequest request) {
+        String searchKey, Integer pageNo, Integer pageSize, HttpServletRequest request) {
         // 构建查询条件
         QueryWrapper<AdvancePaymentInfoDto> queryWrapper = HisQueryUtils.buildQueryWrapper(advancePaymentInfoDto,
             searchKey, new HashSet<>(Arrays.asList("bus_no", "patient_name", "inHospital_org_name")), request);
@@ -80,8 +80,7 @@ public class AdvancePaymentManageAppServiceImpl implements IAdvancePaymentManage
             LocationForm.HOUSE.getValue(), LocationForm.BED.getValue(), EncounterActivityStatus.ACTIVE.getValue(),
             ChargeItemStatus.BILLABLE.getValue(), ChargeItemStatus.BILLED.getValue(),
             ChargeItemStatus.REFUNDED.getValue(), EncounterClass.IMP.getValue(),
-            AccountType.PERSONAL_CASH_ACCOUNT.getCode(), wardLocationId, EncounterZyStatus.TO_BE_REGISTERED.getValue(),
-            queryWrapper);
+            AccountType.PERSONAL_CASH_ACCOUNT.getCode(), queryWrapper);
         advancePaymentInfo.getRecords().forEach(e -> {
             // 性别
             e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
@@ -179,14 +178,8 @@ public class AdvancePaymentManageAppServiceImpl implements IAdvancePaymentManage
         // 支付管理子表
         PaymentRecDetail paymentDetail = new PaymentRecDetail();
         paymentDetail.setAccountId(advancePaymentInAndOutDto.getAccountId()); // 账户
-        Integer payEnum = advancePaymentInAndOutDto.getPayEnum();
-        if (payEnum != null && payEnum != 0) {
-            paymentDetail.setPayEnum(payEnum); // 支付类型
-            paymentDetail.setPayLevelEnum(YbPayment.getByValue(payEnum).getLevel());// 支付类型等级
-        } else {
-            paymentDetail.setPayEnum(YbPayment.SELF_CASH_PAY.getValue()); // 支付类型
-            paymentDetail.setPayLevelEnum(YbPayment.SELF_CASH_PAY.getLevel()); // 支付类型等级
-        }
+        paymentDetail.setPayEnum(YbPayment.SELF_CASH_PAY.getValue()); // 支付类型
+        paymentDetail.setPayLevelEnum(YbPayment.SELF_CASH_PAY.getLevel()); // 支付类型等级
         paymentDetail.setAmount(ammount); // 金额
         paymentDetail.setPayTransNo(CommonConstants.BusinessName.DEFAULT_CONTRACT_NO);
         paymentDetail.setReconciliationId(payment.getId()); // 付款id

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/controller/AdvancePaymentManageController.java

@@ -39,10 +39,9 @@ public class AdvancePaymentManageController {
     @GetMapping(value = "/advance-payment-info")
     public R<?> getAdvancePaymentInfo(AdvancePaymentInfoDto advancePaymentInfoDto,
         @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
-        @RequestParam(value = "wardLocationId", defaultValue = "") Long wardLocationId,
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
-        return R.ok(iAdvancePaymentManageAppService.getAdvancePaymentInfo(advancePaymentInfoDto, searchKey,wardLocationId, pageNo,
+        return R.ok(iAdvancePaymentManageAppService.getAdvancePaymentInfo(advancePaymentInfoDto, searchKey, pageNo,
             pageSize, request));
     }
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/controller/InHospitalRegisterController.java

@@ -5,11 +5,11 @@ package com.openhis.web.inhospitalcharge.controller;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.openhis.web.inhospitalcharge.dto.*;
 import org.springframework.web.bind.annotation.*;
 
 import com.core.common.core.domain.R;
 import com.openhis.web.inhospitalcharge.appservice.IInHospitalRegisterAppService;
-import com.openhis.web.inhospitalcharge.dto.*;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -36,17 +36,6 @@ public class InHospitalRegisterController {
         return iInHospitalRegisterAppService.registerByDoctor(inHospitalRegisterDto);
     }
 
-    /**
-     * 是否登记
-     *
-     * @param encounterId 病历ID
-     * @return true/false
-     */
-    @GetMapping(value = "/isRegister")
-    public R<?> isRegister(@RequestParam(value = "encounterId") Long encounterId) {
-        return iInHospitalRegisterAppService.isRegister(encounterId);
-    }
-
     /**
      * 查询住院登记信息
      * 
@@ -134,14 +123,4 @@ public class InHospitalRegisterController {
         return iInHospitalRegisterAppService.noFilesRegister(noFilesRegisterDto);
     }
 
-    /**
-     * 病区列表
-     *
-     * @return 病区列表
-     */
-    @GetMapping(value = "/ward-list")
-    public R<?> getWardList(@RequestParam(value = "orgId", required = false) Long orgId) {
-        return R.ok(iInHospitalRegisterAppService.getWardList(orgId));
-    }
-
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentInAndOutDto.java

@@ -38,7 +38,4 @@ public class AdvancePaymentInAndOutDto {
      */
     private BigDecimal amount;
 
-    /** 支付类型 */
-    private Integer payEnum;
-
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalInfoDto.java

@@ -140,9 +140,6 @@ public class InHospitalInfoDto {
     /** 账户余额 */
     private BigDecimal balanceAmount;
 
-    /** 支付类型 */
-    private Integer payEnum;
-
     /**
      * 诊断定义id
      */
@@ -162,9 +159,4 @@ public class InHospitalInfoDto {
      */
     private String diagnosisDesc;
 
-    /**
-     * 备注信息（预交金发票使用）
-     */
-    private String remark;
-
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalRegisterQueryDto.java

@@ -2,7 +2,6 @@ package com.openhis.web.inhospitalcharge.dto;
 
 import java.util.Date;
 
-import com.openhis.common.annotation.Dict;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -80,21 +79,4 @@ public class InHospitalRegisterQueryDto {
      */
     private String wardName;
 
-    /**
-     * 住院号
-     */
-    private String busNo;
-
-    /**
-     * 费用性质(合同编码)
-     */
-    private String contractNo;
-
-    /**
-     * 入院类型
-     */
-    @Dict(dictCode = "admit_source_code")
-    private String admitSourceCode;
-    private String admitSourceCode_dictText;
-
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/NoFilesRegisterDto.java

@@ -1,6 +1,6 @@
 package com.openhis.web.inhospitalcharge.dto;
 
-import com.openhis.web.patientmanage.dto.PatientBaseInfoDto;
+import com.openhis.web.patientmanage.dto.PatientInformationDto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -15,7 +15,7 @@ public class NoFilesRegisterDto {
     /**
      * 患者信息
      */
-    private PatientBaseInfoDto patientInformation;
+    private PatientInformationDto patientInformation;
 
     /**
      * 住院信息

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/mapper/AdvancePaymentManageAppMapper.java

@@ -31,7 +31,6 @@ public interface AdvancePaymentManageAppMapper {
      * @param status3 已退费
      * @param classEnum 住院
      * @param accountTypeCode 个人现金账号
-     * @param registeredFlag 登记标识
      * @return 预交金基本信息
      */
     IPage<AdvancePaymentInfoDto> getAdvancePaymentInfo(@Param("page") Page<AdvancePaymentInfoDto> page,
@@ -39,7 +38,6 @@ public interface AdvancePaymentManageAppMapper {
         @Param("bedEnum") Integer bedEnum, @Param("encounterActivityStatus") Integer encounterActivityStatus,
         @Param("status1") Integer status1, @Param("status2") Integer status2, @Param("status3") Integer status3,
         @Param("classEnum") Integer classEnum, @Param("accountTypeCode") String accountTypeCode,
-        @Param("wardLocationId") Long wardLocationId, @Param("registeredFlag") Integer registeredFlag,
         @Param(Constants.WRAPPER) QueryWrapper<AdvancePaymentInfoDto> queryWrapper);
 
     /**

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/mapper/InHospitalRegisterAppMapper.java

@@ -1,7 +1,5 @@
 package com.openhis.web.inhospitalcharge.mapper;
 
-import java.util.List;
-
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -9,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.openhis.administration.domain.Location;
 import com.openhis.web.inhospitalcharge.dto.InHospitalInfoDto;
 import com.openhis.web.inhospitalcharge.dto.InHospitalPatientInfoDto;
 import com.openhis.web.inhospitalcharge.dto.InHospitalRegisterQueryDto;
@@ -51,13 +48,12 @@ public interface InHospitalRegisterAppMapper {
      * @param formEnum 物理位置
      * @param maindiseFlag 主诊断标识
      * @param participantType 参与者类型
-     * @param status 状态
      * @param accountType 账号类型
      * @return 住院就诊信息
      */
     InHospitalInfoDto getInHospitalInfo(@Param("encounterId") Long encounterId, @Param("formEnum") Integer formEnum,
         @Param("maindiseFlag") Integer maindiseFlag, @Param("participantType") String participantType,
-        @Param("status") Integer status, @Param("accountType") String accountType);
+        @Param("accountType") String accountType);
 
     /**
      * 根据病区号获取总床位数
@@ -81,13 +77,4 @@ public interface InHospitalRegisterAppMapper {
     Integer getIdleBedsNum(@Param("formEnum") Integer formEnum, @Param("status") Integer status,
         @Param("wardBusNo") String wardBusNo);
 
-    /**
-     * 获取病区列表
-     *
-     * @param orgId 科室id
-     * @return 病区列表
-     */
-    List<Location> selectWardList(@Param("orgId") Long orgId, @Param("formEnum") Integer formEnum,
-        @Param("status") Integer status);
-
 }