报表修复

src/main/java/cn/hnthyy/thmz/common/Constants.java

@@ -158,7 +158,7 @@ public class Constants {
     /**
      * 自助支付宝缴费
      */
-    public static final String ZZZFB="Z";
+    public static final String ZZZFB="M";
 
     /**
      * 微信缴费

src/main/java/cn/hnthyy/thmz/controller/MzReceiptSerialController.java

@@ -272,7 +272,7 @@ public class MzReceiptSerialController {
         }
         setChargeDate(mzReceiptSerial, mzReceiptSerialVo);
         if (StringUtils.isNotBlank(mzReceiptSerial.getOperatorId())) {
-            if (Constants.BRZZJF_CODE.equals(mzReceiptSerial.getOperatorId())) {
+            if (Constants.BRZZJF_CODE.equals(mzReceiptSerial.getPayId())) {
                 mzReceiptSerial.setOperatorId(Constants.BRZZJF_NAME);
             } else {
                 User user = userService.queryUserByUserIdCode(mzReceiptSerial.getOperatorId());

src/main/java/cn/hnthyy/thmz/entity/his/MzReceiptSerial.java

@@ -93,6 +93,8 @@ public class MzReceiptSerial implements Serializable {
     private String deptNo;
     //新付款方式
     private String newChequeType;
+    //付款人
+    private String payId;
 
     private Integer totalCount;
     public MzReceiptSerial() {

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

@@ -448,7 +448,7 @@ public interface ChargeFeeVoMapper {
                     "isnull ( sum ( total_charge ) , 0 ) total_charge," +
                     "isnull (sum ( case mz_receipt_serial.pay_mark when '0' then 1 when '2' then 1 else 0 end ) ,0)total_count " +
                     "FROM mz_receipt_serial " +
-                    " where 1=1 and pay_mark <![CDATA[<>]]> 2 and cheque_type not in ('W','Z') " +
+                    " where 1=1 and pay_mark <![CDATA[<>]]> 2 and (cheque_type not in ('W','M') or cheque_type is null) " +
                     "<when test='userIdCode!=null'>",
             " and operator_id=#{userIdCode} ",
             "</when>",

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

@@ -19,7 +19,7 @@ public interface MzReceiptSerialMapper {
     @Select(" select rtrim(patient_id) patient_id,times,receipt_no,serial_no,rtrim(operator_id) operator_id,charge1,charge2,charge3,charge4,charge5,charge6,charge7,charge8,charge9," +
             "charge10,charge11,charge12,charge13,charge14,charge15,charge16,charge17,charge18,charge19,charge20,rtrim(pay_mark) pay_mark,total_charge,charge_date,rtrim(receipt_bill) receipt_bill," +
             "receipt_sn,dcount_date,rtrim(windows_no) windows_no,dcount_no,serial_yb,rtrim(fp_flag) fp_flag,rtrim(responce_type) responce_type,rtrim(cheque_type) cheque_type," +
-            "cheque_no,rtrim(tf_flag) tf_flag,dept_no from mz_receipt_serial where patient_id =#{patientId,jdbcType=CHAR} and cheque_type ='Y' and operator_id <> '99999' " +
+            "cheque_no,rtrim(tf_flag) tf_flag,dept_no,rtrim(pay_id) pay_id from mz_receipt_serial where patient_id =#{patientId,jdbcType=CHAR} and cheque_type ='Y' and operator_id <> '99999' " +
             "and receipt_sn not in ( select 0 - receipt_sn from mz_receipt_serial where cheque_type ='Y' and patient_id =#{patientId,jdbcType=CHAR} and tf_flag =1 and operator_id <> '99999' ) " +
             "and receipt_sn not in ( select receipt_sn from mz_receipt_serial where cheque_type ='Y' and patient_id =#{patientId,jdbcType=CHAR} and tf_flag =1 and operator_id <> '99999' ) ")
     List<MzReceiptSerial> selectTallyReceiptSerial(@Param("patientId") String patientId);
@@ -34,7 +34,7 @@ public interface MzReceiptSerialMapper {
     @Select(" select rtrim(patient_id) patient_id,times,receipt_no,serial_no,rtrim(operator_id) operator_id,charge1,charge2,charge3,charge4,charge5,charge6,charge7,charge8,charge9," +
             "charge10,charge11,charge12,charge13,charge14,charge15,charge16,charge17,charge18,charge19,charge20,rtrim(pay_mark) pay_mark,total_charge,charge_date,rtrim(receipt_bill) receipt_bill," +
             "receipt_sn,dcount_date,rtrim(windows_no) windows_no,dcount_no,serial_yb,rtrim(fp_flag) fp_flag,rtrim(responce_type) responce_type,rtrim(cheque_type) cheque_type," +
-            "cheque_no,rtrim(tf_flag) tf_flag,dept_no from mz_receipt_serial where patient_id =#{patientId,jdbcType=CHAR} and times = #{times} and cheque_type ='Y' and operator_id <> '99999' " +
+            "cheque_no,rtrim(tf_flag) tf_flag,dept_no,rtrim(pay_id) pay_id from mz_receipt_serial where patient_id =#{patientId,jdbcType=CHAR} and times = #{times} and cheque_type ='Y' and operator_id <> '99999' " +
             "and receipt_sn not in ( select 0 - receipt_sn from mz_receipt_serial where cheque_type ='Y' and patient_id =#{patientId,jdbcType=CHAR} and times = #{times} and tf_flag =1 and operator_id <> '99999' ) " +
             "and receipt_sn not in ( select receipt_sn from mz_receipt_serial where cheque_type ='Y' and patient_id =#{patientId,jdbcType=CHAR} and times = #{times} and tf_flag =1 and operator_id <> '99999' ) ")
     List<MzReceiptSerial> selectTallyReceiptSerialByIdAndTimes(@Param("patientId") String patientId, @Param("times") Integer times);
@@ -107,7 +107,7 @@ public interface MzReceiptSerialMapper {
     @Select({"<script>",
             "select rtrim(patient_id) patient_id,times,receipt_no,serial_no,rtrim(operator_id) operator_id,charge1,charge2,charge3,charge4,charge5,charge6,charge7,charge8,charge9,",
             "charge10,charge11,charge12,charge13,charge14,charge15,charge16,charge17,charge18,charge19,charge20,rtrim(pay_mark) pay_mark,total_charge,charge_date,rtrim(receipt_bill) receipt_bill,",
-            "receipt_sn,dcount_date,rtrim(windows_no) windows_no,dcount_no,serial_yb,rtrim(fp_flag) fp_flag,rtrim(responce_type) responce_type,rtrim(cheque_type) cheque_type,cheque_no,rtrim(tf_flag) tf_flag,dept_no",
+            "receipt_sn,dcount_date,rtrim(windows_no) windows_no,dcount_no,serial_yb,rtrim(fp_flag) fp_flag,rtrim(responce_type) responce_type,rtrim(cheque_type) cheque_type,cheque_no,rtrim(tf_flag) tf_flag,dept_no,rtrim(pay_id) pay_id",
             "from mz_receipt_serial where patient_id =#{patientId,jdbcType=CHAR} and pay_mark=0  and times =#{times}  ",
             "<when test='receiptNo!=null'>",
             " and receipt_no=#{receiptNo}",
@@ -125,7 +125,7 @@ public interface MzReceiptSerialMapper {
     @Select({"<script>",
             "select top 1 rtrim(patient_id) patient_id,times,receipt_no,serial_no,rtrim(operator_id) operator_id,charge1,charge2,charge3,charge4,charge5,charge6,charge7,charge8,charge9,",
             "charge10,charge11,charge12,charge13,charge14,charge15,charge16,charge17,charge18,charge19,charge20,rtrim(pay_mark) pay_mark,total_charge,charge_date,rtrim(receipt_bill) receipt_bill,",
-            "receipt_sn,dcount_date,rtrim(windows_no) windows_no,dcount_no,serial_yb,rtrim(fp_flag) fp_flag,rtrim(responce_type) responce_type,rtrim(cheque_type) cheque_type,cheque_no,rtrim(tf_flag) tf_flag,dept_no",
+            "receipt_sn,dcount_date,rtrim(windows_no) windows_no,dcount_no,serial_yb,rtrim(fp_flag) fp_flag,rtrim(responce_type) responce_type,rtrim(cheque_type) cheque_type,cheque_no,rtrim(tf_flag) tf_flag,dept_no,rtrim(pay_id) pay_id",
             "from mz_receipt_serial where patient_id=#{patientId,jdbcType=CHAR} and times = #{times,jdbcType=INTEGER} and (cheque_type  <![CDATA[<>]]> 'Y' or cheque_type is null or operator_id =99999) order by receipt_no desc",
             "</script>"})
     MzReceiptSerial selectAllSerialForThisTime(@Param(value = "patientId") String patientId, @Param("times") Integer times);
@@ -141,7 +141,7 @@ public interface MzReceiptSerialMapper {
     @Select({"<script>",
             "select rtrim(patient_id) patient_id,times,receipt_no,serial_no,rtrim(operator_id) operator_id,charge1,charge2,charge3,charge4,charge5,charge6,charge7,charge8,charge9,",
             "charge10,charge11,charge12,charge13,charge14,charge15,charge16,charge17,charge18,charge19,charge20,rtrim(pay_mark) pay_mark,total_charge,charge_date,rtrim(receipt_bill) receipt_bill,",
-            "receipt_sn,dcount_date,rtrim(windows_no) windows_no,dcount_no,serial_yb,rtrim(fp_flag) fp_flag,rtrim(responce_type) responce_type,rtrim(cheque_type) cheque_type,cheque_no,rtrim(tf_flag) tf_flag,dept_no",
+            "receipt_sn,dcount_date,rtrim(windows_no) windows_no,dcount_no,serial_yb,rtrim(fp_flag) fp_flag,rtrim(responce_type) responce_type,rtrim(cheque_type) cheque_type,cheque_no,rtrim(tf_flag) tf_flag,dept_no,rtrim(pay_id) pay_id",
             "from mz_receipt_serial where patient_id=#{patientId,jdbcType=CHAR} and times = #{times,jdbcType=INTEGER} and (cheque_type <![CDATA[<>]]>  'Y' or cheque_type is null or operator_id ='99999' ) ",
             "<when test='receiptBill!=null'>",
             " and receipt_bill =#{receiptBill}",
@@ -161,7 +161,7 @@ public interface MzReceiptSerialMapper {
     @Select({"<script>",
             "select rtrim(patient_id) patient_id,times,receipt_no,serial_no,rtrim(operator_id) operator_id,charge1,charge2,charge3,charge4,charge5,charge6,charge7,charge8,charge9,",
             "charge10,charge11,charge12,charge13,charge14,charge15,charge16,charge17,charge18,charge19,charge20,rtrim(pay_mark) pay_mark,total_charge,charge_date,rtrim(receipt_bill) receipt_bill,",
-            "receipt_sn,dcount_date,rtrim(windows_no) windows_no,dcount_no,serial_yb,rtrim(fp_flag) fp_flag,rtrim(responce_type) responce_type,rtrim(cheque_type) cheque_type,cheque_no,rtrim(tf_flag) tf_flag,dept_no",
+            "receipt_sn,dcount_date,rtrim(windows_no) windows_no,dcount_no,serial_yb,rtrim(fp_flag) fp_flag,rtrim(responce_type) responce_type,rtrim(cheque_type) cheque_type,cheque_no,rtrim(tf_flag) tf_flag,dept_no,rtrim(pay_id) pay_id",
             "from mz_receipt_serial where  patient_id=#{patientId,jdbcType=CHAR} and times = #{times,jdbcType=INTEGER}",
             "</script>"})
     List<MzReceiptSerial> selectSerialForThisTime(@Param(value = "patientId") String patientId, @Param("times") Integer times);
@@ -176,7 +176,7 @@ public interface MzReceiptSerialMapper {
     @Select({"<script>",
             "select rtrim(patient_id) patient_id,times,receipt_no,serial_no,rtrim(operator_id) operator_id,charge1,charge2,charge3,charge4,charge5,charge6,charge7,charge8,charge9,",
             "charge10,charge11,charge12,charge13,charge14,charge15,charge16,charge17,charge18,charge19,charge20,rtrim(pay_mark) pay_mark,total_charge,charge_date,rtrim(receipt_bill) receipt_bill,",
-            "receipt_sn,dcount_date,rtrim(windows_no) windows_no,dcount_no,serial_yb,rtrim(fp_flag) fp_flag,rtrim(responce_type) responce_type,rtrim(cheque_type) cheque_type,cheque_no,rtrim(tf_flag) tf_flag,dept_no",
+            "receipt_sn,dcount_date,rtrim(windows_no) windows_no,dcount_no,serial_yb,rtrim(fp_flag) fp_flag,rtrim(responce_type) responce_type,rtrim(cheque_type) cheque_type,cheque_no,rtrim(tf_flag) tf_flag,dept_no,rtrim(pay_id) pay_id",
             "from mz_receipt_serial where serial_no =#{serialNo}  ",
             "</script>"})
     MzReceiptSerial selectReceiptDetailsBySerialNo(@Param(value = "serialNo") Integer serialNo);
@@ -242,7 +242,7 @@ public interface MzReceiptSerialMapper {
     @Select({"<script>",
             "select rtrim(patient_id) patient_id,times,receipt_no,serial_no,rtrim(operator_id) operator_id,charge1,charge2,charge3,charge4,charge5,charge6,charge7,charge8,charge9,",
             "charge10,charge11,charge12,charge13,charge14,charge15,charge16,charge17,charge18,charge19,charge20,rtrim(pay_mark) pay_mark,total_charge,charge_date,rtrim(receipt_bill) receipt_bill,",
-            "receipt_sn,dcount_date,rtrim(windows_no) windows_no,dcount_no,serial_yb,rtrim(fp_flag) fp_flag,rtrim(responce_type) responce_type,rtrim(cheque_type) cheque_type,cheque_no,rtrim(tf_flag) tf_flag,dept_no",
+            "receipt_sn,dcount_date,rtrim(windows_no) windows_no,dcount_no,serial_yb,rtrim(fp_flag) fp_flag,rtrim(responce_type) responce_type,rtrim(cheque_type) cheque_type,cheque_no,rtrim(tf_flag) tf_flag,dept_no,rtrim(pay_id) pay_id",
             "from mz_receipt_serial where receipt_sn =#{receiptSn}  ",
             "</script>"})
     MzReceiptSerial selectReceiptDetailsByReceiptSn(@Param(value = "receiptSn") Integer receiptSn);

src/main/resources/static/js/daily_collect.js

@@ -832,7 +832,7 @@ function daterangepicker(callback) {
         minDate: '2012-01-01',
         maxDate: nowString(),
         dateLimit: {
-            days: 60
+            days: 1200
         },
         showDropdowns: true,
         showWeekNumbers: true,

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

@@ -1223,11 +1223,11 @@ function printCommon(url,patientId, times,name) {
                             var tempTop = top + row * 5;
                             var tempLeft = left;
                             if (j % 3 == 1) {
-                                tempLeft = left + 25;
+                                tempLeft = left + 30;
                             } else if (j % 3 == 2) {
-                                tempLeft = left + 50;
+                                tempLeft = left + 60;
                             }
-                            LODOP.ADD_PRINT_TEXT(tempTop + "mm", tempLeft + "mm", "25mm", "3mm", feeList[j]);
+                            LODOP.ADD_PRINT_TEXT(tempTop + "mm", tempLeft + "mm", "30mm", "3mm", feeList[j]);
                         }
                     }
                     // LODOP.ADD_PRINT_TEXT("32mm","25mm","25mm","3mm","诊查费  10.00");
@@ -1256,6 +1256,7 @@ function printCommon(url,patientId, times,name) {
                     LODOP.ADD_PRINT_TEXT("79mm", "25mm", "10mm", "3mm", res.data[i].day);//日
                     LODOP.ADD_PRINT_TEXT("79mm", "53mm", "23mm", "3mm", temp.operatorId);//收费员
                     LODOP.PRINT();
+                    //LODOP.PREVIEW();
                     initFeeTable();
                 }