发票打印问题

src/main/resources/otherSource/thyy_mz_system.sql

@@ -128,14 +128,15 @@ CREATE TABLE `t_mzmxsr`  (
   `exec_dept` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '执行科室',
   `xmm` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '项目名',
   `hsm` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '核算码',
-  `je` decimal(10, 0) DEFAULT NULL COMMENT '金额',
+  `je` decimal(10, 2) DEFAULT NULL COMMENT '金额',
   `charge_date` datetime(0) DEFAULT NULL COMMENT '缴费时间',
   `dcount_date` datetime(0) DEFAULT NULL COMMENT '日结时间',
   `quty` double(255, 0) DEFAULT NULL COMMENT '数量',
   `price` decimal(10, 2) DEFAULT NULL COMMENT '单价',
   `parent_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '父类码',
   `input_date` datetime(0) DEFAULT NULL COMMENT '同步入库时间',
-  PRIMARY KEY (`id`) USING BTREE
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX `t_mzmxsr_index`(`dcount_date`, `charge_date`, `jz_sq_dept`, `exec_dept`, `jz_sq_doctor`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;

src/main/resources/static/js/registration_list.js

@@ -1568,7 +1568,7 @@ function loadCardList() {
                     html += mzyReqrecVo.mzPatientMi.responseType + '</div></div><div class="patient-card-main-right"><div></div> <div class="el-row"><label>';
                     html += text;
                     html += '</div><div class="el-row" title="' + mzyReqrecVo.mzPatientMi.phoneNo + '">' + sex + ' / ' + mzyReqrecVo.mzPatientMi.age + '岁 / ' + mzyReqrecVo.mzPatientMi.phoneNo + '</div><div class="el-row" title="' + mzyReqrecVo.mzyReqrec.ampm + '">' + mzyReqrecVo.mzyReqrec.ampm + ' / ' + mzyReqrecVo.mzyReqrec.chargeType + '</div><div class="el-row" title="' + mzyReqrecVo.mzyReqrec.chargeType + '">' + mzyReqrecVo.mzyReqrec.unitCode + ' / ' + mzyReqrecVo.mzyReqrec.doctorCode + '</div><div class="el-row">' + format(mzyReqrecVo.mzyReqrec.requestDay, "yyyy-MM-dd HH:mm:ss") + '</div></div></div>';
-                    if (mzyReqrecVo.mzyReqrec.cancelMark == 1 || mzyReqrecVo.mzyReqrec.visitedMark == 1) {
+                    if (mzyReqrecVo.mzyReqrec.cancelMark == 1 ) {
                         html += '<div class="patient-card-foot">' +
                             '                        <div class="col-md-3 col-sm-3 col-xs-12">' +
                             '                            <button type="button" class="can-not-used"' +
@@ -1595,6 +1595,33 @@ function loadCardList() {
                             '                            </button>' +
                             '                        </div>' +
                             '                    </div>';
+                    } if (mzyReqrecVo.mzyReqrec.visitedMark == 1) {
+                        html += '<div class="patient-card-foot">' +
+                            '                        <div class="col-md-3 col-sm-3 col-xs-12">' +
+                            '                            <button type="button" class="can-not-used"' +
+                            '                                    title="修改挂号">' +
+                            '                                <i class="fa fa-edit"></i>' +
+                            '                            </button>' +
+                            '                        </div>' +
+                            '                        <div class="col-md-3 col-sm-3 col-xs-12">' +
+                            '                            <button type="button" class="registration-no-color-foot-button"' +
+                            '                                    title="修改患者" onclick="editUserModal(\'' + mzyReqrecVo.mzyReqrec.patientId + '\')">' +
+                            '                                <i class="fa fa-user"></i>' +
+                            '                            </button>' +
+                            '                        </div>' +
+                            '                        <div class="col-md-3 col-sm-3 col-xs-12">' +
+                            '                            <button type="button" class="can-not-used"' +
+                            '                                    title="退号">' +
+                            '                                <i class="fa fa-minus-square-o"></i>' +
+                            '                            </button>' +
+                            '                        </div>' +
+                            '                        <div class="col-md-3 col-sm-3 col-xs-12">' +
+                            '                            <button type="button" class="registration-no-color-foot-button"' +
+                            '                                    title="打印">' +
+                            '                                <i class="fa fa-print"></i>' +
+                            '                            </button>' +
+                            '                        </div>' +
+                            '                    </div>';
                     } else {
                         html += '<div class="patient-card-foot">' +
                             '                        <div class="col-md-3 col-sm-3 col-xs-12">' +
@@ -1771,8 +1798,10 @@ function loadTableList() {
                     valign: 'middle',
                     // sortable: true,
                     formatter: function (value, row, index) {
-                        if (row.mzyReqrec.cancelMark == 1 || row.mzyReqrec.visitedMark == 1) {
+                        if (row.mzyReqrec.cancelMark == 1) {
                             return '<button type="button" class="can-not-used" title="修改挂号"><i class="fa fa-edit"></i></button><button type="button" class="registration-no-color-foot-button"title="修改患者" onclick="editUserModal(\'' + row.mzyReqrec.patientId + '\')"><i class="fa fa-user"></i></button><button type="button" class="can-not-used" title="退号"><i class="fa fa-minus-square-o"></i></button><button type="button" class="can-not-used" title="打印" ><i class="fa fa-print"></i></button>';
+                        } if (row.mzyReqrec.visitedMark == 1) {
+                            return '<button type="button" class="can-not-used" title="修改挂号"><i class="fa fa-edit"></i></button><button type="button" class="registration-no-color-foot-button"title="修改患者" onclick="editUserModal(\'' + row.mzyReqrec.patientId + '\')"><i class="fa fa-user"></i></button><button type="button" class="can-not-used" title="退号"><i class="fa fa-minus-square-o"></i></button><button type="button" class="registration-no-color-foot-button" title="打印" ><i class="fa fa-print"></i></button>';
                         } else {
                             var html = '<button type="button" class="can-not-used" title="修改挂号"><i class="fa fa-edit"></i></button><button type="button" class="registration-no-color-foot-button"title="修改患者" onclick="editUserModal(\'' + row.mzyReqrec.patientId + '\')"><i class="fa fa-user"></i></button><button type="button" class="registration-no-color-foot-button" title="退号" onclick="backNoModal(\'' + row.mzyReqrec.patientId + '\',' + row.mzyReqrec.times + ')"><i class="fa fa-minus-square-o"></i></button>';
                             var printFlag = isEmpty(row.mzyReqrec.printerId);