Revert "```"

This reverts commit abc0674531.

openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChargeBillService.java

@@ -2,7 +2,6 @@ package com.openhis.web.paymentmanage.appservice;
 
 import java.util.Map;
 
-import com.core.common.core.domain.R;
 import com.openhis.web.paymentmanage.dto.ChargeSummaryDto;
 
 public interface IChargeBillService {
@@ -52,26 +51,4 @@ public interface IChargeBillService {
      * @return 结果
      */
     Map getReceiptDetailsND(Long paymentId);
-
-    /**
-     * 医保 encounterType
-     * @param encounterId 就诊id
-     * @return 结果
-     */
-    Map getYbEncounterType(Long encounterId);
-
-    /**
-     * 更新收费项目总价（同一改单个收费项chargeItem的折扣价）
-     * @return
-     */
-    Map updateChargeItemTotalPrice();
-
-    /**
-     * 通过1312接口查询库里yb码有没有过期的
-     * @return
-     */
-    R<?> checkYbNo();
-
-
-
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ChargeBillController.java

@@ -91,30 +91,4 @@ public class ChargeBillController {
         // return null;
     }
 
-    /**
-     * 获取省市医保字符串
-     */
-    @GetMapping("/get-encounter-type")
-    public R<?> getYbEncounterType(@RequestParam(name = "encounterId") Long encounterId) {
-        return R.ok(iChargeBillService.getYbEncounterType(encounterId));
-    }
-
-    /**
-     * 获取省市医保字符串
-     */
-    @GetMapping("/update-chargeItem-totalPrice")
-    @Anonymous
-    public R<?> updateChargeItemTotalPrice() {
-        return R.ok(iChargeBillService.updateChargeItemTotalPrice());
-    }
-
-    /**
-     * 红旗校验诊疗项目的医保码是否过期
-     */
-    @GetMapping("/checkYbNo")
-    @Anonymous
-    public R<?> checkYbNo() {
-        return iChargeBillService.checkYbNo();
-    }
-
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemDetailVO.java

@@ -11,13 +11,11 @@ import java.math.BigDecimal;
 @Accessors(chain = true)
 public class ChargeItemDetailVO {
 
+    @Dict(dictCode = "chrgitm_lv")
     private String dirClass;//医保等级
 
     private String chargeItemName;//医保等级
 
-    /** 规格 */
-    private String totalVolume;
-
     /** 数量 */
     private BigDecimal quantityValue;
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoicePatientInfoDto.java

@@ -28,7 +28,6 @@ public class EleInvoicePatientInfoDto {
 
     // 性别
     private Integer genderEnum;
-    private String genderEnumEnumText;
     private String genderEnum_enumText;
 
     // 生日

openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartCallBackVo.java

@@ -1,24 +0,0 @@
-package com.openhis.web.paymentmanage.dto;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.financial.domain.ThreePartPayCallBack;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-public class ThreePartCallBackVo extends ThreePartPayCallBack {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    private String idStr;
-    /*
-    * 患者名称
-     */
-    private String patientName;
-    /*
-    * 支付单号
-     */
-    private String paymentNo;
-
-}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/PaymentMapper.java

@@ -5,7 +5,6 @@ package com.openhis.web.paymentmanage.mapper;
 
 import java.util.List;
 
-import com.openhis.web.paymentmanage.dto.ThreePartCallBackVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -74,14 +73,4 @@ public interface PaymentMapper {
      * @return 发放数量
      */
     DispenseQuantityDto selectDispenseQuantity(@Param("chargeItemIds") List<Long> chargeItemIds);
-
-    /**
-     * 查询网银支付列表
-     *
-     * @param objectPage 分页信息
-     * @param queryWrapper 查询条件
-     * @return 结果
-     */
-    IPage<ThreePartCallBackVo> getThreePartCallBackVoPage(@Param("page")Page<Object> objectPage, @Param(Constants.WRAPPER)QueryWrapper<ThreePartCallBackVo> queryWrapper);
-
 }