修复住院费用查询的bug

src/main/java/thyyxxk/webserver/dao/his/yibao/XiangMuLuRuDao.java

@@ -31,7 +31,7 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "       dept_code = (select name from zd_unit_code where code = a.ward_code) ,  " +
             "       self_flag=isnull(a.self_flag,0), suppress_flag=a.suppress_flag, group_no='00',  " +
             "       separate_flag=a.separate_flag, ope_flag=a.ope_flag, drugname=c.name, isnull(a.ori_detail_sn,0) ori_detail_sn  " +
-            "    FROM  (select top ${pageSize} * from (select ROW_NUMBER() OVER (order by charge_date ) as RowNumber,* from zy_detail_charge a " +
+            "    FROM  (select top ${pageSize} * from (select ROW_NUMBER() OVER (order by charge_date ${riQiPaiXu} ) as RowNumber,* from zy_detail_charge a " +
             "where  a.charge_code  " +
             "like 'BILL%' and a.ledger_sn = #{ledgerSn}  and trans_flag_yb &lt;&gt; 2 and a.order_no &lt;&gt; 6 and inpatient_no = #{inpatientNo}  " +
             "and admiss_times = #{admissTimes} and a.infant_flag = #{infantFlag} " +
@@ -59,7 +59,7 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "<if test=\"tuiFeiFlag != null and tuiFeiFlag == 2  \">" +
             "and (ori_detail_sn = -1 )" +
             "</if>" +
-            ") temp where RowNumber > ${pageSize} * (${currentPage} - 1 ) order by charge_date ${riQiPaiXu} ) a  " +
+            ") temp where RowNumber > ${pageSize} * (${currentPage} - 1 )) a  " +
             "        left join zd_charge_item b on (a.charge_code = b.code)  " +
             "        left join  yp_zd_dict c on (a.serial = c.serial and c.code= a.charge_code_mx)  " +
             "        left join a_employee_mi d on (d.code = a.op_id_code)  " +
@@ -151,7 +151,7 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "                   ope_flag=a.ope_flag,    " +
             "                   drugname=b.name,    " +
             "                   isnull(a.ori_detail_sn,0) ori_detail_sn    " +
-            "                   FROM  (select top ${pageSize} * from (select ROW_NUMBER() OVER (order by charge_date ) as RowNumber,*  from zy_detail_charge where inpatient_no= #{inpatientNo} and " +
+            "                   FROM  (select top ${pageSize} * from (select ROW_NUMBER() OVER (order by charge_date ${riQiPaiXu} ) as RowNumber,*  from zy_detail_charge where inpatient_no= #{inpatientNo} and " +
             "admiss_times= #{admissTimes}  and ledger_sn = #{ledgerSn} and infant_flag = #{infantFlag} and   trans_flag_yb &lt;&gt; 2 AND charge_code not like 'BILL%' and  order_no &lt;&gt; 6" +
             "<if test=\"chargeCode != null and chargeCode != '' \">" +
             "and charge_code_mx = #{chargeCode} " +
@@ -177,7 +177,7 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "<if test=\"tuiFeiFlag != null and tuiFeiFlag == 2  \">" +
             "and (ori_detail_sn = -1 )" +
             "</if>" +
-            ") temp where RowNumber > ${pageSize} * (${currentPage}-1) order by charge_date ${riQiPaiXu})  a " +
+            ") temp where RowNumber > ${pageSize} * (${currentPage}-1) )  a " +
             "  left join  zd_charge_item b on (a.charge_code=b.code) " +
             "  left join a_employee_mi c on (c.code = a.op_id_code)" +
             "</script>")

src/main/java/thyyxxk/webserver/entity/datamodify/MzChargeDetail.java

@@ -544,15 +544,16 @@ public class MzChargeDetail implements Serializable {
     private BigDecimal je;
     private String execDeptName;
     private String confirmIdName;
+
     private Integer xiangMuZhuangTai;
 
 
     private List<MzChargeDetail> list;
 
     private List<Integer> reqNos;
-    
+
     /**
-     * 来源
+     * 来源 对外接口时 使用
      */
     private String source;
 }

src/main/resources/application.yml

@@ -8,7 +8,7 @@ spring:
     cache: false
   datasource:
     dynamic:
-      primary: dev
+      primary: his
       strict: false
       datasource:
         his: