发票流水号优化

src/main/java/cn/hnthyy/thmz/mapper/his/MzChargeDetailMapper.java

@@ -76,7 +76,7 @@ public interface MzChargeDetailMapper {
             "<when test='mzChargeDetail.payMark eq 5'>",
             " price_time,",
             "</when>",
-            "serial_no)As mz_charge_detail_page",
+            "real_no)As mz_charge_detail_page",
             "</script>"})
     int countMzChargeDetail(MzChargeDetailPageDto mzChargeDetailPageDto);
 
@@ -145,7 +145,7 @@ public interface MzChargeDetailMapper {
             "<when test='mzChargeDetail.payMark eq 5'>",
             " price_time,",
             "</when>",
-                    "serial_no,sum(unit_price*quantity*drug_win) amount from mz_charge_detail  where bill_item_code <![CDATA[<>]]> 'TC' ",
+                    "real_no,sum(unit_price*quantity*drug_win) amount from mz_charge_detail  where bill_item_code <![CDATA[<>]]> 'TC' ",
             "<when test='mzChargeDetail.payMark!=null'>",
             " and pay_mark =#{mzChargeDetail.payMark,jdbcType=CHAR}",
             "</when>",
@@ -198,7 +198,7 @@ public interface MzChargeDetailMapper {
             "<when test='mzChargeDetail.payMark eq 5'>",
             " price_time,",
             "</when>",
-            "serial_no) As mz_charge_detail_page",
+            "real_no) As mz_charge_detail_page",
             ") as A WHERE RowNumber >#{pageSize}*#{pageIndex} order by RowNumber asc",
             "</script>"})
     List<MzChargeDetail> selectMzChargeDetailWithPage(MzChargeDetailPageDto mzChargeDetailPageDto);
@@ -212,7 +212,7 @@ public interface MzChargeDetailMapper {
      */
     @Select({"<script>",
             "select  rtrim(patient_id) patient_id,times,receipt_no,rtrim(name) name,price_time," +
-                    "serial_no,sum(unit_price*quantity) amount from mz_charge_detail  where 1=1 ",
+                    "receipt_sn,sum(unit_price*quantity) amount from mz_charge_detail  where 1=1 ",
             "<when test='mzChargeDetail.payMark!=null'>",
             " and pay_mark =#{mzChargeDetail.payMark,jdbcType=CHAR}",
             "</when>",
@@ -234,7 +234,7 @@ public interface MzChargeDetailMapper {
             "<when test='endTime!=null'>",
             " and price_time &lt;=#{endTime,jdbcType=TIMESTAMP}",
             "</when>",
-            " group by  patient_id,times,receipt_no,name,price_time,serial_no",
+            " group by  patient_id,times,receipt_no,name,price_time,receipt_sn",
             "</script>"})
     List<MzChargeDetail> selectMzChargeDetail(MzChargeDetailPageDto mzChargeDetailPageDto);
 
@@ -690,7 +690,7 @@ public interface MzChargeDetailMapper {
      * @param times
      * @return
      */
-    @Select("select top 1 rtrim(warn_dept) warn_dept,rtrim(doctor_code) doctor_code,rtrim(print_flag) print_flag from mz_charge_detail where  patient_id = #{patientId} and times = #{times} and warn_dept is not null and doctor_code is not null")
+    @Select("select top 1 rtrim(warn_dept) warn_dept,rtrim(doctor_code) doctor_code,rtrim(print_flag) print_flag from mz_charge_detail where  patient_id = #{patientId} and times = #{times} and warn_dept is not null and doctor_code is not null and warn_dept<> '' and doctor_code<> '' ")
     MzChargeDetail selectWarnDeptAndDoctor(@Param("patientId") String patientId,@Param("times") Integer times);
 
 }

src/main/java/cn/hnthyy/thmz/service/impl/his/MzChargeDetailServiceImpl.java

@@ -94,7 +94,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         if(mzChargeDetailList==null || mzChargeDetailList.size()==0){
             return mzChargeDetailList;
         }
-        for (MzChargeDetail mzChargeDetail:mzChargeDetailList){
+         for (MzChargeDetail mzChargeDetail:mzChargeDetailList){
             MzChargeDetail temp= mzChargeDetailMapper.selectWarnDeptAndDoctor(mzChargeDetail.getPatientId(),mzChargeDetail.getTimes());
             mzChargeDetail.setWarnDept(temp.getWarnDept());
             mzChargeDetail.setDoctorCode(temp.getDoctorCode());

src/main/resources/static/js/toll_administration.js

@@ -257,7 +257,7 @@ function initFeeTable() {
             //     checkbox: true
             // },
             {
-                field: 'serialNo',
+                field: 'realNo',
                 title: '缴费流水号',
                 align: "center",
                 valign: 'middle',