删除无效合并

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

@@ -179,15 +179,9 @@ public class PaymentReconciliationController {
      * @return 操做结果
      */
     @PostMapping("/reg-pay")
-<<<<<<< HEAD
-    public R<?> regPay(@Valid @RequestBody OutpatientRegistrationSettleParam outpatientRegistrationSettleParam) {
-        R<?> result = paymentReconciliationService.regPay(outpatientRegistrationSettleParam,
-                outpatientRegistrationSettleParam.getChrgBchno(), outpatientRegistrationSettleParam.getPaymentDetails());
-=======
     public R<?> regPay(@Valid @RequestBody OutpatientRegistrationSettleParam outpatientRegistrationAddParam) {
         R<?> result = paymentReconciliationService.regPay(outpatientRegistrationAddParam,
             outpatientRegistrationAddParam.getChrgBchno(), outpatientRegistrationAddParam.getPaymentDetails());
->>>>>>> upstream/develop
         // 付款成功后，开具发票
         if (result.getCode() == 200) {
             PaymentReconciliation paymentRecon = null;