浏览代码

住院预交金bug修复

hurugang 2 年之前
父节点
当前提交
e2812f23f9

+ 5 - 0
src/main/java/cn/hnthyy/thmz/common/Constants.java

@@ -144,6 +144,11 @@ public class Constants {
      */
     public static final String CASH = "1";
 
+    /**
+     * 住院默认付款方式 现金
+     */
+    public static final String ZY_CASH = "A";
+
     /**
      * 本院记账付款方式
      */

+ 1 - 1
src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzyRequestMapper.java

@@ -298,6 +298,6 @@ public interface MzyRequestMapper {
 
     @Delete("delete from mzy_request_new where id=#{id,jdbcType=BIGINT}")
     int deleteMzyRequestById(@Param("id") Long id);
-    
+
 
 }

+ 3 - 1
src/main/java/cn/hnthyy/thmz/service/impl/his/zy/ZyDepositFileServiceImpl.java

@@ -107,8 +107,10 @@ public class ZyDepositFileServiceImpl implements ZyDepositFileService {
             zyDepositFile.setLedgerSn(dbZyDepositFile.getLedgerSn());
             zyDepositFile.setPrinted(dbZyDepositFile.getPrinted());
             zyDepositFile.setReportFlag(YesNoEnum.YES.code.toString());
+            zyDepositFile.setReportFlag(YesNoEnum.YES.code.toString());
+            zyDepositFile.setDepoType(dbZyDepositFile.getDepoType());
             if (!(Arrays.asList(Constants.BRZZJF_CODE, Constants.HLWYY_CODE).contains(zyDepositFile.getOpIdCode()) || (YesNoEnum.YES.code.equals(zyDepositFile.getRefundType()) && Arrays.asList(Constants.BYJZ, Constants.YLK, Constants.JHZF).contains(zyDepositFile.getDepoType())))) {
-                zyDepositFile.setDepoType(Constants.CASH);
+                zyDepositFile.setDepoType(Constants.ZY_CASH);
             }
             zyDepositFileMapper.updateReportFlag(zyDepositFile.getReceiptNo());
         }

+ 7 - 0
src/main/resources/static/js/zy/accepting.js

@@ -161,6 +161,13 @@ function titleButtonChange(object) {
         if ($(element).hasClass("btn-primary")) {
             $(element).removeClass("btn-primary").addClass("btn-default");
         }
+        if(element==object){
+            if(index==0){
+                $("#chargeFee").removeClass("hide").addClass("in");
+            }else {
+                $("#chargeFee").removeClass("in").addClass("hide");
+            }
+        }
     });
     $(object).removeClass("btn-default").addClass("btn-primary");
     getZyActpatientByInpatientNoOrMzNO(null);