bug优化

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

@@ -166,4 +166,14 @@ public class Constants {
      * 静脉采血名称
      */
     public static final String JM_CAI_XUE_NAME="静脉采血";
+
+    /**
+     * 病人自助缴费编码
+     */
+    public static final String BRZZJF_CODE="99999";
+
+    /**
+     * 病人自助缴费编码
+     */
+    public static final String BRZZJF_NAME="自助缴费";
 }

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

@@ -308,6 +308,7 @@ public class MzChargeDetailController {
             log.error("缴费失败，系统异常，错误信息{}", e.getMessage());
             return resultMap;
         } catch (Exception e) {
+            e.printStackTrace();
             resultMap.put("code", -1);
             resultMap.put("message", "缴费失败，系统出错，请联系管理员");
             log.error("缴费失败，系统异常");

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

@@ -152,7 +152,6 @@ public class MzReceiptSerialController {
             List<Integer> timesList = new ArrayList<>();
             List<MzReceiptSerialVo> mzReceiptSerialVos = getMzReceiptSerialVos(mzReceiptSerials,timesList,receipt);
             resultMap.put("data",mzReceiptSerialVos);
-            resultMap.put("user",tokenUser);
             log.info("病人id="+patientId+"，times="+times+"的发票已经预打印了");
             return resultMap;
         } catch (Exception e) {
@@ -263,9 +262,13 @@ public class MzReceiptSerialController {
                 }
                 setChargeDate(mzReceiptSerial, mzReceiptSerialVo);
                 if(StringUtils.isNotBlank(mzReceiptSerial.getOperatorId())){
-                    User user=userService.queryUserByUserIdCode(mzReceiptSerial.getOperatorId());
-                    if(user!=null){
-                        mzReceiptSerial.setOperatorId(user.getUserName());
+                    if(Constants.BRZZJF_CODE.equals(mzReceiptSerial.getOperatorId())){
+                        mzReceiptSerial.setOperatorId(Constants.BRZZJF_NAME);
+                    }else {
+                        User user=userService.queryUserByUserIdCode(mzReceiptSerial.getOperatorId());
+                        if(user!=null){
+                            mzReceiptSerial.setOperatorId(user.getUserName());
+                        }
                     }
                 }
                 //退费重收的发票号码都是大于10的拼接字符串
@@ -378,7 +381,6 @@ public class MzReceiptSerialController {
                 resultMap.put("message", "缴费失败,用户Token不存在");
                 return resultMap;
             }
-            User tokenUser = TokenUtil.getUser(httpServletRequest);
             List<MzDepositFile> mzDepositFiles=mzDepositFileService.queryMzDepositFile(new MzDepositFile(patientId,times));
             if(mzDepositFiles!=null && mzDepositFiles.size()>0){
                 for (MzDepositFile mzDepositFile:mzDepositFiles){
@@ -395,13 +397,13 @@ public class MzReceiptSerialController {
             MzReceiptSerial mzReceiptSerial=mzReceiptSerialService.queryPrintedSerialForThisTime(patientId,times);
             String receipt =mzReceiptSerial.getReceiptBill();
             if(YesNoEnum.YES.code.toString().equals(obsolete)){
+                User tokenUser = TokenUtil.getUser(httpServletRequest);
                 receipt = mzReceiptSerialService.obsoleteAndRepPrint(mzReceiptSerial,tokenUser);
                 resultMap.put("message", "作废重新打印发票成功");
             }
             List<Integer> timesList = new ArrayList<>();
             List<MzReceiptSerialVo> mzReceiptSerialVos = getMzReceiptSerialVos(Arrays.asList(mzReceiptSerial),timesList,receipt);
             resultMap.put("data",mzReceiptSerialVos);
-            resultMap.put("user",tokenUser);
             log.info("病人id="+patientId+"，times="+times+"的发票已经重新打印了");
             return resultMap;
         } catch (Exception e) {

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

@@ -473,14 +473,12 @@ public class MzyReqrecController {
                 resultMap.put("message", "病人挂号次数不能为空");
                 return resultMap;
             }
-            String token = TokenUtil.getToken(httpServletRequest);
-            if (StringUtils.isBlank(token)) {
+            User tokenUser = TokenUtil.getUser(httpServletRequest);
+            if (tokenUser==null) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "查询窗口号失败,用户Token不存在");
                 return resultMap;
             }
-            DecodedJWT decodedJWT=TokenUtil.parseJWT(token);
-            User tokenUser=(User)JsonUtil.jsontoObject(decodedJWT.getSubject(),User.class);
             mzyReqrec.setOpId(tokenUser.getUserIdCode());
             int num=mzyReqrecService.modifyMzyReqrec(mzyReqrec);
             if(num==1){
@@ -507,7 +505,7 @@ public class MzyReqrecController {
      */
     @UserLoginToken
     @RequestMapping(value = "/printMzyReqrecRecept", method = {RequestMethod.GET})
-    public Map<String, Object> printMzyReqrecRecept(@RequestParam("patientId") String patientId,@RequestParam("times") Integer times) {
+    public Map<String, Object> printMzyReqrecRecept(@RequestParam("patientId") String patientId,@RequestParam("times") Integer times, HttpServletRequest httpServletRequest) {
         Map<String, Object> resultMap = new HashMap<>();
         try {
             if (StringUtils.isBlank(patientId)) {
@@ -520,6 +518,12 @@ public class MzyReqrecController {
                 resultMap.put("message", "病人就诊次数不能为空");
                 return resultMap;
             }
+            User tokenUser = TokenUtil.getUser(httpServletRequest);
+            if (tokenUser==null) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "打印当前挂号的发票信息失败,用户Token不存在");
+                return resultMap;
+            }
             MzyReqrec mzyReqrec;
             if(times==-1){
                 mzyReqrec=mzyReqrecService.queryLastMzyReqrecByPatientId(patientId);
@@ -585,10 +589,11 @@ public class MzyReqrecController {
             }else {
                 resultMap.put("day",day.toString());
             }
-            mzyReqrec.setPrinterId(mzyReqrec.getOpId());
+            mzyReqrec.setPrinterId(tokenUser.getUserIdCode());
             mzyReqrecService.printMzyReqrecRecept(mzyReqrec);
             resultMap.put("code", 0);
             resultMap.put("data",mzyReqrec);
+            resultMap.put("user",tokenUser);
             return resultMap;
         }catch (MzException e){
             resultMap.put("code", -1);

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

@@ -324,7 +324,7 @@ public interface ChargeFeeVoMapper {
             "         mz_receipt_serial.serial_no " +
             "    FROM mz_receipt_serial " +
             "   WHERE mz_receipt_serial.operator_id =#{userIdCode}  and mz_receipt_serial.dcount_no=1 " +
-            "         and mz_receipt_serial.pay_mark <>'1' and dcount_date=#{dcountDate,jdbcType=TIMESTAMP}  and cheque_type  <> 'Y' " +
+            "         and mz_receipt_serial.pay_mark <>'1' and dcount_date=#{dcountDate,jdbcType=TIMESTAMP}  and (cheque_type <> 'Y' or cheque_type is null) " +
             "  order by mz_receipt_serial.receipt_bill  ")
     List<ReceiptBillVo> selectSfReceiptBillVoReprint(@Param("userIdCode") String userIdCode, @Param("dcountDate") Date dcountDate);
 
@@ -498,7 +498,7 @@ public interface ChargeFeeVoMapper {
                     "       total_charge=sum(b.total_charge) " +
                     "from mz_patient_mi a," +
                     "     mz_receipt_serial b " +
-                    "where b.operator_id=#{userIdCode} and b.pay_mark='1' and total_charge >0   " +
+                    "where b.operator_id=#{userIdCode} and b.pay_mark='1' and total_charge <![CDATA[<]]> 0   " +
                     "<when test='dcountDate!=null'>",
             " and dcount_date=#{dcountDate,jdbcType=TIMESTAMP} ",
             "</when>",

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

@@ -558,7 +558,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         mzChargeDetailMapper.updatePayMakAndPrintFlag(updateMzChargeDetail);
         List<MzReceiptSerial> mzReceiptSerials = mzReceiptSerialMapper.selectSerialForThisTime(mzDepositFileVo.getPatientId(), mzDepositFileVo.getTimes());
         if (mzReceiptSerials != null && mzReceiptSerials.size() > 0) {
-            formatRefundReceiptSerial(mzReceiptSerials);
+            formatRefundReceiptSerial(mzReceiptSerials,opId);
             mzReceiptSerialMapper.batchInsertMzReceiptSerial(mzReceiptSerials);
         }
         MzReceiptSerial updateMzReceiptSerial = new MzReceiptSerial(mzDepositFileVo.getPatientId(), mzDepositFileVo.getTimes());
@@ -620,8 +620,9 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         }
     }
 
-    private void formatRefundReceiptSerial(List<MzReceiptSerial> mzReceiptSerials) {
+    private void formatRefundReceiptSerial(List<MzReceiptSerial> mzReceiptSerials,String opId) {
         for (MzReceiptSerial mz : mzReceiptSerials) {
+            mz.setOperatorId(opId);
             mz.setReceiptNo(-mz.getReceiptNo());
             mz.setSerialNo(-mz.getSerialNo());
             mz.setPayMark(PayMarkEnum.RETURN_PREMIUM.code);
@@ -715,6 +716,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                     temp.setDeptNo(null);
                     temp.setChargeDate(now);
                     temp.setPayMark(PayMarkEnum.RETURN_PREMIUM.code);
+                    temp.setOpId(opId);
                     newMzDepositFiles.add(temp);
                 }
             }
@@ -792,7 +794,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                             temp.setSupplyAmount(BigDecimal.valueOf(md.getQuantity()).divide(proportion).intValue());
                         }
                     }
-                }else {
+                }else if(Constants.CYF.equals(md.getBillItemCode())){
                     //中药和诊疗需要整退
                     tcNos.add(md.getTcNo());
                 }
@@ -1576,6 +1578,9 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                             String temp = newMzChargeDetail.getOrderNo().toString();
                             Integer itemNoTemp = itemNo - 100;
                             newMzChargeDetail.setTcNo(temp + itemNoTemp);
+                            if(zdChargeItem.getName().length()>14){
+                                zdChargeItem.setName(zdChargeItem.getName().substring(0,14));
+                            }
                             newMzChargeDetail.setTcName(zdChargeItem.getName());
                             newMzChargeDetail.setBillItemCode(Constants.ZLF);
                             newMzChargeDetail.setQuantity(Double.valueOf(newMzChargeDetail.getSupplyAmount()));
@@ -1634,7 +1639,12 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         newMzChargeDetail.setRealNo(0);
         newMzChargeDetail.setYbbxFlag(YesNoEnum.NO.code.toString());
         newMzChargeDetail.setTcNo(mzYjReq.getOrderCode());
-        newMzChargeDetail.setTcName(mzYjReq.getGroupName());
+        if(mzYjReq.getGroupName().length()>14){
+            newMzChargeDetail.setTcName(mzYjReq.getGroupName().substring(0,14));
+        }else {
+            newMzChargeDetail.setTcName(mzYjReq.getGroupName());
+        }
+
         newMzChargeDetail.setDetailFlag(YesNoEnum.NO.code.toString());
         newMzChargeDetail.setOrderType(YesNoEnum.YES.code.toString());
         newMzChargeDetail.setSupplyNo("Y");

src/main/resources/application.yml

@@ -13,18 +13,18 @@ spring:
       max-request-size: 100MB
   datasource:
     his:
-      jdbc-url: "jdbc:sqlserver://172.16.32.168:1433;databaseName=thxyhisdb"
-      #jdbc-url: "jdbc:sqlserver://172.16.32.160:1433;databaseName=thxyhisdb"
+      #jdbc-url: "jdbc:sqlserver://172.16.32.168:1433;databaseName=thxyhisdb"
+      jdbc-url: "jdbc:sqlserver://172.16.32.160:1433;databaseName=thxyhisdb"
       username: "sa"
       password:
       #password: "SAthyy123"
       driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
     thmz:
-      #jdbc-url: "jdbc:mariadb://localhost:3306/thyy_mz_system?useUnicode=true&characterEncoding=utf-8"
-      jdbc-url: "jdbc:mariadb://172.16.32.160:3306/thyy_mz_system?useUnicode=true&characterEncoding=utf-8"
+      jdbc-url: "jdbc:mariadb://localhost:3306/thyy_mz_system?useUnicode=true&characterEncoding=utf-8"
+      #jdbc-url: "jdbc:mariadb://172.16.32.160:3306/thyy_mz_system?useUnicode=true&characterEncoding=utf-8"
       username: "root"
-      #password: "hrg49086"
-      password: "thyy@2018"
+      password: "hrg49086"
+      #password: "thyy@2018"
       driver-class-name: "org.mariadb.jdbc.Driver"
   devtools:
     restart:
@@ -38,4 +38,4 @@ mybatis:
 #打印SQL信息
 logging:
   level:
-    cn.hnthyy.thmz.mapper: error
+    cn.hnthyy.thmz.mapper: debug

src/main/resources/static/js/daily_repeat_print.js

@@ -835,6 +835,7 @@ function daterangepicker(callback) {
 
     //$('#reportrange span').html(moment().subtract(29, 'days').format('YYYY-MM-DD') + ' - ' + moment().format('YYYY-MM-DD'));
     $('#reportrange span').html(moment().format('YYYY-MM-DD') + ' - ' + moment().format('YYYY-MM-DD'));
+    callback();
     $('#reportrange').daterangepicker(optionSet1, cb);
     $('#reportrange').on('show.daterangepicker', function () {
         console.log("show event fired");

src/main/resources/static/js/registration.js

@@ -46,9 +46,10 @@ var TableInit = function () {
                 }
             },
             columns: [
+                // {
+                //     checkbox: true
+                // },
                 {
-                    checkbox: true
-                }, {
                     field: 'name',
                     title: '名称',
                     align: "center",
@@ -643,15 +644,15 @@ function backNoModal(patientId, times) {
                     var index = 0;
                     var trHtml = '';
                     if (res.data.mzyReqrec.reqFee != null && res.data.mzyReqrec.reqFee != "" && res.data.mzyReqrec.reqFee > 0) {
-                        trHtml = '<tr data-index="' + index + '"><td class="bs-checkbox "><label><input data-index="' + index + '" name="btSelectItem" type="checkbox"><span></span></label></td><td style="text-align: center; vertical-align: middle; ">挂号费</td><td style="text-align: center; vertical-align: middle; ">' + res.data.mzyReqrec.reqFee + '</td><td style="text-align: center; vertical-align: middle; ">' + res.data.mzyReqrec.reqFee + '</td></tr>';
+                        trHtml = '<tr data-index="' + index + '"><td style="text-align: center; vertical-align: middle; ">挂号费</td><td style="text-align: center; vertical-align: middle; ">' + res.data.mzyReqrec.reqFee + '</td><td style="text-align: center; vertical-align: middle; ">' + res.data.mzyReqrec.reqFee + '</td></tr>';
                         index++;
                     }
                     if (res.data.mzyReqrec.clinicFee != null && res.data.mzyReqrec.clinicFee != "" && res.data.mzyReqrec.clinicFee > 0) {
-                        trHtml += '<tr data-index="' + index + '"><td class="bs-checkbox "><label><input data-index="' + index + '" name="btSelectItem" type="checkbox"><span></span></label></td><td style="text-align: center; vertical-align: middle; ">诊查费</td><td style="text-align: center; vertical-align: middle; ">' + res.data.mzyReqrec.clinicFee + '</td><td style="text-align: center; vertical-align: middle; ">' + res.data.mzyReqrec.clinicFee + '</td></tr>';
+                        trHtml += '<tr data-index="' + index + '"><td style="text-align: center; vertical-align: middle; ">诊查费</td><td style="text-align: center; vertical-align: middle; ">' + res.data.mzyReqrec.clinicFee + '</td><td style="text-align: center; vertical-align: middle; ">' + res.data.mzyReqrec.clinicFee + '</td></tr>';
                         index++;
                     }
                     if (res.data.mzyReqrec.othFee != null && res.data.mzyReqrec.othFee != "" && res.data.mzyReqrec.othFee > 0) {
-                        trHtml += '<tr data-index="' + index + '"><td class="bs-checkbox "><label><input data-index="' + index + '" name="btSelectItem" type="checkbox"><span></span></label></td><td style="text-align: center; vertical-align: middle; ">检查费</td><td style="text-align: center; vertical-align: middle; ">' + res.data.mzyReqrec.othFee + '</td><td style="text-align: center; vertical-align: middle; ">' + res.data.mzyReqrec.othFee + '</td></tr>';
+                        trHtml += '<tr data-index="' + index + '"><td style="text-align: center; vertical-align: middle; ">检查费</td><td style="text-align: center; vertical-align: middle; ">' + res.data.mzyReqrec.othFee + '</td><td style="text-align: center; vertical-align: middle; ">' + res.data.mzyReqrec.othFee + '</td></tr>';
                     }
                     $("#tb_fee_info").find("tbody").empty();
                     $("#tb_fee_info").find("tbody").append(trHtml);
@@ -2117,7 +2118,7 @@ function prn1Print(patientId,times) {
                 LODOP.SET_SHOW_MODE("BKIMG_HEIGHT", "92mm");
                 LODOP.SET_PRINT_PAGESIZE(0, "120mm", "92mm", "CreateCustomPage");
                 LODOP.SET_PRINT_MODE("CREATE_CUSTOM_PAGE_NAME","门诊发票");//对新建的纸张重命名
-                LODOP.SET_PRINT_STYLE("FontSize", 8); //字体大小
+                LODOP.SET_PRINT_STYLE("FontSize", 11); //字体大小
                 LODOP.ADD_PRINT_TEXT("5mm", "16mm", "45mm", "3mm", "湖南泰和医院管理有限公司");
                 LODOP.ADD_PRINT_TEXT("5mm", "78mm", "30mm", "3mm", "流水号:");
                 LODOP.ADD_PRINT_TEXT("5mm", "91mm", "20mm", "3mm", temp.serialNo);
@@ -2139,7 +2140,7 @@ function prn1Print(patientId,times) {
                 LODOP.ADD_PRINT_TEXT("77mm", "20mm", "15mm", "3mm", res.year);//年
                 LODOP.ADD_PRINT_TEXT("77mm", "32mm", "10mm", "3mm", res.month);//月
                 LODOP.ADD_PRINT_TEXT("77mm", "42mm", "10mm", "3mm", res.day);//日
-                LODOP.ADD_PRINT_TEXT("77mm", "72mm", "23mm", "3mm", temp.operatorId);//收费员
+                LODOP.ADD_PRINT_TEXT("77mm", "72mm", "23mm", "3mm", res.user.userName);//收费员
                 //LODOP.PREVIEW();
                 LODOP.PRINT();
                 if(times>0){

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

@@ -330,10 +330,10 @@ function initFeeTable() {
                     if (payMarkGroup == 1) {
                         str += '<button type="button" class="registration-no-color-foot-button" title="退费" onclick="refundFee(\'' + row.patientId + '\',' + row.times + ');"><i class="fa fa-reply"></i></button>';
                         if (row.printFlag == 0) {
-                            str += '<button type="button" class="registration-no-color-foot-button" title="发票打印" onclick="prn1Print(\'' + row.patientId + '\',' + row.times + ');" style="color: #35D082;"><i class="fa fa-print"></i></button>';
+                            str += '<button type="button" class="registration-no-color-foot-button" title="发票打印" onclick="prn1Print(\'' + row.patientId + '\',' + row.times + ',\''+row.name+'\');" style="color: #35D082;"><i class="fa fa-print"></i></button>';
                         }else if (row.printFlag == 1) {
-                            str += '<button type="button" class="registration-no-color-foot-button" title="发票重打" onclick="repPrint(\'' + row.patientId + '\',' + row.times + ');" style="color: #F4BD00;"><i class="fa fa-print"></i></button>';
-                            str += '<button type="button" class="registration-no-color-foot-button" title="发票作废重打" onclick="obsoleteAndRepPrint(\'' + row.patientId + '\',' + row.times + ');" style="color: #E73E48;"><i class="fa fa-print"></i></button>';
+                            str += '<button type="button" class="registration-no-color-foot-button" title="发票重打" onclick="repPrint(\'' + row.patientId + '\',' + row.times + ',\''+row.name+'\');" style="color: #F4BD00;"><i class="fa fa-print"></i></button>';
+                            str += '<button type="button" class="registration-no-color-foot-button" title="发票作废重打" onclick="obsoleteAndRepPrint(\'' + row.patientId + '\',' + row.times + ',\''+row.name+'\');" style="color: #E73E48;"><i class="fa fa-print"></i></button>';
                         }
                     }
                     return str;
@@ -629,6 +629,9 @@ function queryUserInfoByCardNo() {
                 }
             }
         });
+    }else if(cardNo.indexOf("-")>0){
+        $("#patientId").val(cardNo);
+        initFeeTable();
     }
 }
 
@@ -1024,7 +1027,7 @@ function saveConfirmFee() {
                 return;
             }
             if (res.code == 0) {
-                prn1Print(patientId, times);
+                prn1Print(patientId, times,null);
                 new PNotify({
                     title: '操作提示',
                     text: res.message,
@@ -1054,9 +1057,9 @@ function saveConfirmFee() {
  * @param patientId
  * @param times
  */
-function prn1Print(patientId, times) {
+function prn1Print(patientId, times,name) {
     var url='/thmz/getAllSerialForThisTime?patientId=' + patientId + "&times=" + times;
-    printCommon(url,patientId, times);
+    printCommon(url,patientId, times,name);
 }
 
 /**
@@ -1064,7 +1067,7 @@ function prn1Print(patientId, times) {
  * @param patientId
  * @param times
  */
-function repPrint(patientId, times) {
+function repPrint(patientId, times,name) {
     $.ajax({
         type: "GET",
         url: '/thmz/getReceiptForThisTime?patientId=' + patientId + "&times="+times,
@@ -1081,7 +1084,7 @@ function repPrint(patientId, times) {
                    return;
                 }
                 var url='/thmz/repPrintForThisTime?patientId=' + patientId + "&times=" + times + "&obsolete=0";
-                printCommon(url,patientId, times);
+                printCommon(url,patientId, times,name);
             }
         }
     });
@@ -1092,7 +1095,7 @@ function repPrint(patientId, times) {
  * @param patientId
  * @param times
  */
-function obsoleteAndRepPrint(patientId, times) {
+function obsoleteAndRepPrint(patientId, times,name) {
     $.ajax({
         type: "GET",
         url: '/thmz/getReceiptForThisTime?patientId=' + patientId + "&times="+times,
@@ -1109,7 +1112,7 @@ function obsoleteAndRepPrint(patientId, times) {
                     return;
                 }
                 var url='/thmz/repPrintForThisTime?patientId=' + patientId + "&times=" + times + "&obsolete=1";
-                printCommon(url,patientId, times);
+                printCommon(url,patientId, times,name);
             }
         }
     });
@@ -1122,7 +1125,7 @@ function obsoleteAndRepPrint(patientId, times) {
  * @param patientId
  * @param times
  */
-function printCommon(url,patientId, times) {
+function printCommon(url,patientId, times,name) {
     setPrint();
     $.ajax({
         type: "GET",
@@ -1149,12 +1152,15 @@ function printCommon(url,patientId, times) {
                     LODOP.SET_SHOW_MODE("BKIMG_HEIGHT", "92mm");
                     LODOP.SET_PRINT_PAGESIZE(0, "120mm", "92mm", "CreateCustomPage");
                     LODOP.SET_PRINT_MODE("CREATE_CUSTOM_PAGE_NAME", "门诊发票");//对新建的纸张重命名
-                    LODOP.SET_PRINT_STYLE("FontSize", 8); //字体大小
+                    LODOP.SET_PRINT_STYLE("FontSize", 11); //字体大小
                     LODOP.ADD_PRINT_TEXT("5mm", "16mm", "45mm", "3mm", "湖南泰和医院管理有限公司");
                     LODOP.ADD_PRINT_TEXT("5mm", "78mm", "30mm", "3mm", "机制号:");
                     LODOP.ADD_PRINT_TEXT("5mm", "91mm", "20mm", "3mm", temp.serialNo);
                     LODOP.ADD_PRINT_TEXT("8mm", "78mm", "35mm", "3mm", temp.receiptBill);
-                    LODOP.ADD_PRINT_TEXT("24mm", "26mm", "40mm", "3mm", res.user.userName);
+                    if(name==null){
+                        name = $("#nameHaveTally").val();
+                    }
+                    LODOP.ADD_PRINT_TEXT("24mm", "26mm", "40mm", "3mm", name);
                     LODOP.ADD_PRINT_TEXT("24mm", "80mm", "27mm", "3mm", patientId);
                     var feeList = res.data[i].feeList;
                     if (feeList != null && feeList.length > 0) {
@@ -1764,7 +1770,7 @@ function saveRefundFee() {
                 });
                 $("#refundFeeModal").modal("hide");
                 if(res.times>0){
-                    prn1Print(res.patientId,res.times);
+                    prn1Print(res.patientId,res.times,null);
                 }else {
                     initFeeTable();
                 }