Browse Source

门诊转入 bug。

xiaochan 3 years ago
parent
commit
92be89dcb2

+ 4 - 3
src/main/java/thyyxxk/webserver/dao/his/yibao/TransferInOfExpensesDao.java

@@ -67,7 +67,7 @@ public interface TransferInOfExpensesDao {
             "       doctor_code = a.doctor_code, " +
             "       bill_item_code = rtrim(a.bill_item_code), " +
             "       exec_dept = a.exec_dept " +
-            "from ${tableName} a,mz_receipt_serial b,zd_charge_item c " +
+            "from ${mzTableName} a,${tableName} b,zd_charge_item c " +
             "where a.patient_id = b.patient_id and " +
             "        a.times = b.times and " +
             "        a.receipt_no = b.receipt_no and " +
@@ -93,7 +93,7 @@ public interface TransferInOfExpensesDao {
             "       doctor_code = a.doctor_code, " +
             "       bill_item_code = rtrim(a.bill_item_code), " +
             "       exec_dept = a.exec_dept " +
-            "from ${tableName} a,mz_receipt_serial b,yp_base_yf c  " +
+            "from ${mzTableName} a,${tableName} b,yp_base_yf c  " +
             "where a.patient_id = b.patient_id and " +
             "        a.times = b.times and " +
             "        a.receipt_no = b.receipt_no and " +
@@ -103,7 +103,8 @@ public interface TransferInOfExpensesDao {
             "        a.serial = c.serial and " +
             "        a.group_no = c.group_no and " +
             "        isnull(a.group_no,'00')<>'00'")
-    List<MzChargeDetail> getSerialNo(@Param("tableName") String tableName,
+    List<MzChargeDetail> getSerialNo(@Param("mzTableName") String mzTableName,
+                                     @Param("tableName") String tableName,
                                      @Param("serialNo") Integer serialNo);
 
     /**

+ 2 - 2
src/main/java/thyyxxk/webserver/service/yibao/TransferInOfExpensesService.java

@@ -72,9 +72,9 @@ public class TransferInOfExpensesService {
     public ResultVo<List<MzChargeDetail>> getSerialNo(Integer serialNo, Integer liShiFlag) {
         List<MzChargeDetail> list;
         if (liShiFlag == 0) {
-            list = dao.getSerialNo("mz_charge_detail", serialNo);
+            list = dao.getSerialNo("mz_charge_detail", "mz_receipt_serial", serialNo);
         } else {
-            list = dao.getSerialNo("mz_charge_detail_b", serialNo);
+            list = dao.getSerialNo("mz_charge_detail_b", "mz_receipt_serial_b", serialNo);
         }
         if (list.size() > 0) {
             return ResultVoUtil.success(list);