解决两张发票最后退费导致报表不一致的问题

src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzDepositFileMapper.java

@@ -77,7 +77,7 @@ public interface MzDepositFileMapper {
             " and receipt_no=#{receiptNo}",
             "</when>",
             "</script>"})
-    List<MzDepositFile> selectMzDepositFileByTimes(@Param(value = "patientId") String patientId, @Param("times") Integer times, @Param("receiptNo") Integer receiptNo,@Param(value = "tableName") String tableName);
+    List<MzDepositFile> selectMzDepositFileByTimes(@Param(value = "patientId") String patientId, @Param("times") Integer times, @Param("receiptNo") Integer receiptNo, @Param(value = "tableName") String tableName);
 
 
     /**
@@ -105,13 +105,13 @@ public interface MzDepositFileMapper {
      */
     @Select({"<script>",
             "select rtrim(patient_id) patient_id,times,receipt_no,rtrim(pay_mark) pay_mark,rtrim(cheque_type) cheque_type,rtrim(cheque_no) cheque_no,amount,charge_date,dcount_date," +
-            "rtrim(dcount_no) dcount_no,rtrim(op_id) op_id,receipt_sn,serial_no,rtrim(responce_type) responce_type,yb_jlh,yb_ywh,dept_no,psordnum,agtordnum,hisrefundnum " +
-            " from mz_deposit_file where serial_no = #{serialNo}",
+                    "rtrim(dcount_no) dcount_no,rtrim(op_id) op_id,receipt_sn,serial_no,rtrim(responce_type) responce_type,yb_jlh,yb_ywh,dept_no,psordnum,agtordnum,hisrefundnum " +
+                    " from mz_deposit_file where serial_no = #{serialNo}",
             "<when test='chequeType!=null'>",
             " and cheque_type = #{chequeType}",
             "</when>",
             "</script>"})
-    List<MzDepositFile> selectMzDepositFileBySerialNo(@Param("serialNo") Integer serialNo,@Param("chequeType") String chequeType);
+    List<MzDepositFile> selectMzDepositFileBySerialNo(@Param("serialNo") Integer serialNo, @Param("chequeType") String chequeType);
 
     /**
      * 更新收费表的退款标志等信息，发票作废重打时调用
@@ -120,9 +120,10 @@ public interface MzDepositFileMapper {
      * @param oriSerialNo
      * @return
      */
-    @Update("update mz_deposit_file set pay_mark=#{payMark} where serial_no=#{oriSerialNo} and cheque_type=#{chequeType}")
-    int updatePayMark(@Param("payMark") String payMark, @Param("oriSerialNo") Integer oriSerialNo,@Param("chequeType") String chequeType);
-
+//    @Update("update mz_deposit_file set pay_mark=#{payMark} where serial_no=#{oriSerialNo} and cheque_type=#{chequeType}")
+//    int updatePayMark(@Param("payMark") String payMark, @Param("oriSerialNo") Integer oriSerialNo,@Param("chequeType") String chequeType);
+    @Update("update mz_deposit_file set pay_mark=#{payMark} where serial_no=#{oriSerialNo}")
+    int updatePayMark(@Param("payMark") String payMark, @Param("oriSerialNo") Integer oriSerialNo);
 
     /**
      * 更新收费表的收款方式，手机缴费打发票时修改
@@ -137,11 +138,12 @@ public interface MzDepositFileMapper {
             "<when test='oldChequeType!=null'>",
             " and cheque_type = #{oldChequeType}",
             "</when>"
-            ,"</script>"})
-    int updateChequeType(@Param("chequeType") String chequeType,@Param("receiptSn") Integer receiptSn,@Param("oldChequeType") String oldChequeType);
+            , "</script>"})
+    int updateChequeType(@Param("chequeType") String chequeType, @Param("receiptSn") Integer receiptSn, @Param("oldChequeType") String oldChequeType);
 
     /**
      * 判断是否已经入库，防止重复缴费
+     *
      * @param mzDepositFile
      * @return
      */
@@ -150,31 +152,34 @@ public interface MzDepositFileMapper {
 
     /**
      * 判断手机自助缴费平台对应的流水号有无成功缴费
+     *
      * @param psordnum
      * @param agtordnum
      * @return
      */
     @Select({"<script>",
             "select rtrim(patient_id) patient_id,times,receipt_no,rtrim(pay_mark) pay_mark,rtrim(cheque_type) cheque_type,rtrim(cheque_no) cheque_no," +
-            "amount,charge_date,dcount_date,rtrim(dcount_no) dcount_no,rtrim(op_id) op_id,receipt_sn,serial_no,rtrim(responce_type) responce_type,yb_jlh,yb_ywh,dept_no," +
-            "psordnum,agtordnum,hisrefundnum from ${tableName} where psordnum=#{psordnum} and pay_mark = 0 ",
+                    "amount,charge_date,dcount_date,rtrim(dcount_no) dcount_no,rtrim(op_id) op_id,receipt_sn,serial_no,rtrim(responce_type) responce_type,yb_jlh,yb_ywh,dept_no," +
+                    "psordnum,agtordnum,hisrefundnum from ${tableName} where psordnum=#{psordnum} and pay_mark = 0 ",
             "<when test='agtordnum!=null'>",
             " and agtordnum = #{agtordnum}",
             "</when>",
             "</script>"})
-    MzDepositFile selectMzDepositFileByAgtordnum(@Param("psordnum") String psordnum,@Param("agtordnum") String agtordnum,@Param("tableName") String tableName);
+    MzDepositFile selectMzDepositFileByAgtordnum(@Param("psordnum") String psordnum, @Param("agtordnum") String agtordnum, @Param("tableName") String tableName);
 
     /**
      * 根据日期统计当天的收费总额
+     *
      * @param beginDate
      * @param endDate
      * @return
      */
     @Select(" select sum(amount) from mz_deposit_file where charge_date >=#{beginDate,jdbcType=TIMESTAMP} and charge_date<=#{endDate,jdbcType=TIMESTAMP} and pay_mark <> 2 ")
-    BigDecimal selectAmount(@Param("beginDate") Date beginDate,@Param("endDate") Date endDate);
+    BigDecimal selectAmount(@Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
 
     /**
      * 按照日期分组查询收费数与金额
+     *
      * @param beginTime
      * @param endTime
      * @param payMark
@@ -196,18 +201,19 @@ public interface MzDepositFileMapper {
             "</when>",
             " group by CONVERT(varchar(100), charge_date, 23) ",
             "</script>"})
-    List<Map<String, Object>> countAndAmount(@Param("beginTime") Date beginTime,@Param("endTime") Date endTime,@Param("payMark") String payMark);
+    List<Map<String, Object>> countAndAmount(@Param("beginTime") Date beginTime, @Param("endTime") Date endTime, @Param("payMark") String payMark);
 
 
     /**
      * 分页查询缴费记录
+     *
      * @param mzDepositFile
      * @return
      */
     @Select({"<script>",
-            "SELECT top ${pageSize} rtrim(patient_id) patient_id,times,receipt_no,rtrim(pay_mark) pay_mark,rtrim(cheque_type) cheque_type,rtrim(cheque_no) cheque_no," ,
-                    "amount,charge_date,dcount_date,rtrim(dcount_no) dcount_no,rtrim(op_id) op_id,receipt_sn,serial_no,rtrim(responce_type) responce_type,yb_jlh,yb_ywh,dept_no," ,
-                    "psordnum,agtordnum,hisrefundnum FROM (SELECT ROW_NUMBER() OVER (ORDER BY mz_deposit_file_page.${orderByCase} asc) ",
+            "SELECT top ${pageSize} rtrim(patient_id) patient_id,times,receipt_no,rtrim(pay_mark) pay_mark,rtrim(cheque_type) cheque_type,rtrim(cheque_no) cheque_no,",
+            "amount,charge_date,dcount_date,rtrim(dcount_no) dcount_no,rtrim(op_id) op_id,receipt_sn,serial_no,rtrim(responce_type) responce_type,yb_jlh,yb_ywh,dept_no,",
+            "psordnum,agtordnum,hisrefundnum FROM (SELECT ROW_NUMBER() OVER (ORDER BY mz_deposit_file_page.${orderByCase} asc) ",
             "AS RowNumber,* from ${tableName} mz_deposit_file_page where 1=1 ",
             "<when test='patientId!=null'>",
             " and patient_id =#{patientId}",
@@ -220,7 +226,8 @@ public interface MzDepositFileMapper {
     List<MzDepositFile> selectMzDepositFileWithPage(MzDepositFile mzDepositFile);
 
     /**
-     *  查询缴费总数
+     * 查询缴费总数
+     *
      * @param mzDepositFile
      * @return
      */

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

@@ -233,6 +233,33 @@ public interface MzReceiptSerialMapper {
             "</script>"})
     int updateMzReceiptSerial(MzReceiptSerial mzReceiptSerial);
 
+    /**
+     * 修改发票表
+     *
+     * @param mzReceiptSerial
+     * @return
+     */
+    @Update({"<script>",
+            "update mz_receipt_serial ",
+            "<trim prefix='set' prefixOverrides=',' suffix=' where patient_id = #{patientId} and times=#{times} and receipt_no=#{receiptNo}' >",
+            "<when test='receiptBill!=null'>",
+            "receipt_bill =#{receiptBill}",
+            "</when>",
+            "<when test='payMark!=null'>",
+            ",pay_mark =#{payMark}",
+            "</when>",
+            "<when test='obsoleteId!=null'>",
+            ",obsolete_id =#{obsoleteId}",
+            "</when>",
+            "<when test='obsoleteDate!=null'>",
+            ",obsolete_date =#{obsoleteDate}",
+            "</when>",
+            "<when test='tfFlag!=null'>",
+            ",tf_flag =#{tfFlag}",
+            "</when>",
+            "</trim>",
+            "</script>"})
+    int updateMzReceiptSerialByReceiptNo(MzReceiptSerial mzReceiptSerial);
 
     /**
      * 修改发票表备注字段 实际是为了防止已经打了发票继续打发票 根据收费次数
@@ -290,7 +317,7 @@ public interface MzReceiptSerialMapper {
             "</when>",
             "</trim>",
             "</script>"})
-    int updateMzReceiptSerialByReceiptNo(MzReceiptSerial mzReceiptSerial);
+    int updateMzReceiptSerialByReceiptNoAndChueType(MzReceiptSerial mzReceiptSerial);
 
 
     /**

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

@@ -946,7 +946,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         mzReceiptSerial.setReceiptNo(mzDepositFile.getReceiptNo());
         mzReceiptSerial.setChequeType(oldChequeType);
         mzReceiptSerial.setNewChequeType(chequeType);
-        mzReceiptSerialMapper.updateMzReceiptSerialByReceiptNo(mzReceiptSerial);
+        mzReceiptSerialMapper.updateMzReceiptSerialByReceiptNoAndChueType(mzReceiptSerial);
         //新的收款方式是记账，设置成记账方式
         if (Constants.BYJZ.equals(chequeType)) {
             MzChargeDetail mzChargeDetail = new MzChargeDetail(mzDepositFile.getPatientId(), mzDepositFile.getTimes());

src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzReceiptSerialServiceImpl.java

@@ -106,13 +106,13 @@ public class MzReceiptSerialServiceImpl implements MzReceiptSerialService {
 
     @Override
     public List<MzReceiptSerial> queryPrintedSerialForThisTime(String patientId, Integer times, String receiptBill) {
-        String receiptSerialTableName="mz_receipt_serial";
-        List<MzReceiptSerial> mzReceiptSerialList= mzReceiptSerialMapper.selectPrintedSerialForThisTime(patientId, times, receiptBill,receiptSerialTableName);
-        if(mzReceiptSerialList!=null && mzReceiptSerialList.size()>0){
+        String receiptSerialTableName = "mz_receipt_serial";
+        List<MzReceiptSerial> mzReceiptSerialList = mzReceiptSerialMapper.selectPrintedSerialForThisTime(patientId, times, receiptBill, receiptSerialTableName);
+        if (mzReceiptSerialList != null && mzReceiptSerialList.size() > 0) {
             return mzReceiptSerialList;
         }
-        receiptSerialTableName="mz_receipt_serial_b";
-        return mzReceiptSerialMapper.selectPrintedSerialForThisTime(patientId, times, receiptBill,receiptSerialTableName);
+        receiptSerialTableName = "mz_receipt_serial_b";
+        return mzReceiptSerialMapper.selectPrintedSerialForThisTime(patientId, times, receiptBill, receiptSerialTableName);
     }
 
     @Override
@@ -141,19 +141,19 @@ public class MzReceiptSerialServiceImpl implements MzReceiptSerialService {
         }
         //如果是手机缴费，设置缴费方式为自助缴费
         if (Constants.BRZZJF_CODE.equals(mzReceiptSerial.getOperatorId()) && Constants.BYJZ.equals(mzReceiptSerial.getChequeType())) {
-            MzDepositFile mzDepositFile = mzDepositFileMapper.selectMzDepositFileBySerialNo(mzReceiptSerial.getSerialNo(),null).get(0);
+            MzDepositFile mzDepositFile = mzDepositFileMapper.selectMzDepositFileBySerialNo(mzReceiptSerial.getSerialNo(), null).get(0);
             if (Constants.WX.equals(mzDepositFile.getChequeType())) {
                 updateMzReceiptSerial.setNewChequeType(Constants.ZZWX);
             } else if (Constants.ZFB.equals(mzDepositFile.getChequeType())) {
                 updateMzReceiptSerial.setNewChequeType(Constants.ZZZFB);
             }
-            mzDepositFileMapper.updateChequeType(updateMzReceiptSerial.getNewChequeType(), mzDepositFile.getReceiptSn(),null);
+            mzDepositFileMapper.updateChequeType(updateMzReceiptSerial.getNewChequeType(), mzDepositFile.getReceiptSn(), null);
         }
         int num = mzReceiptSerialMapper.updateBzByReceiptNo(updateMzReceiptSerial);
         if (num == 0) {
             throw new MzException("已经打印过发票，请勿重复打印，如果需要重新打印，请点击重新打印或者作废打印");
         }
-        mzReceiptSerialMapper.updateMzReceiptSerialByReceiptNo(updateMzReceiptSerial);
+        mzReceiptSerialMapper.updateMzReceiptSerialByReceiptNoAndChueType(updateMzReceiptSerial);
         if (receipt.getReceiptCurrent() == receipt.getReceiptEnd()) {
             //此时发票号已经用完，当前发票号是最后一个
             receipt.setReceiptCurrent(null);
@@ -180,11 +180,11 @@ public class MzReceiptSerialServiceImpl implements MzReceiptSerialService {
      */
     @Override
     public MzReceiptSerial queryReceiptDetailsByReceiptSn(Integer receiptSn) {
-        MzReceiptSerial mzReceiptSerial= mzReceiptSerialMapper.selectReceiptDetailsByReceiptSn(receiptSn,"mz_receipt_serial");
-        if(mzReceiptSerial!=null){
+        MzReceiptSerial mzReceiptSerial = mzReceiptSerialMapper.selectReceiptDetailsByReceiptSn(receiptSn, "mz_receipt_serial");
+        if (mzReceiptSerial != null) {
             return mzReceiptSerial;
         }
-        return mzReceiptSerialMapper.selectReceiptDetailsByReceiptSn(receiptSn,"mz_receipt_serial_b");
+        return mzReceiptSerialMapper.selectReceiptDetailsByReceiptSn(receiptSn, "mz_receipt_serial_b");
     }
 
     @Override
@@ -198,6 +198,8 @@ public class MzReceiptSerialServiceImpl implements MzReceiptSerialService {
         if (mzVisitTable == null) {
             throw new MzException("当前病人就诊基础资料【MzVisitTable】不存在，请检查");
         }
+        //先查询出所有发票
+        List<MzReceiptSerial> mzReceiptSerialList = mzReceiptSerialMapper.selectReceiptDetails(mzReceiptSerial.getPatientId(), mzReceiptSerial.getTimes(), mzReceiptSerial.getReceiptNo(), "mz_receipt_serial");
         Integer receiptNo = mzVisitTable.getReceiptNo() + 1;
         Integer oriSerialNo = mzReceiptSerial.getSerialNo();
         int serialNo = mzSerialNoService.getSerialNo();
@@ -208,31 +210,38 @@ public class MzReceiptSerialServiceImpl implements MzReceiptSerialService {
         updateMzReceiptSerial.setObsoleteId(user.getUserIdCode());
         updateMzReceiptSerial.setObsoleteDate(now);
         updateMzReceiptSerial.setReceiptNo(mzReceiptSerial.getReceiptNo());
-        updateMzReceiptSerial.setChequeType(mzReceiptSerial.getChequeType());
         mzReceiptSerialMapper.updateMzReceiptSerialByReceiptNo(updateMzReceiptSerial);
-        //创建新发票
-        mzReceiptSerial.setReceiptNo(receiptNo);
-        mzReceiptSerial.setSerialNo(serialNo);
-        mzReceiptSerial.setReceiptSn(serialNo);
-        mzReceiptSerial.setReceiptBill(receipt.getReceiptCurrent());
-        mzReceiptSerial.setDeptNo(YesNoEnum.NO.code.toString());
-        mzReceiptSerial.setOperatorId(user.getUserIdCode());
-        mzReceiptSerial.setDcountDate(null);
-        mzReceiptSerial.setDcountNo(YesNoEnum.NO.code);
-        mzReceiptSerialMapper.insertMzReceiptSerial(mzReceiptSerial);
+        if (mzReceiptSerialList != null && mzReceiptSerialList.size() > 0) {
+            for (MzReceiptSerial mr : mzReceiptSerialList) {
+                if (mzReceiptSerial.getReceiptBill().equals(mr.getReceiptBill())) {
+                    mr.setReceiptBill(receipt.getReceiptCurrent());
+                }
+                //创建新发票
+                mr.setReceiptNo(receiptNo);
+                mr.setSerialNo(serialNo);
+                mr.setReceiptSn(serialNo);
+                mr.setDeptNo(YesNoEnum.NO.code.toString());
+                mr.setOperatorId(user.getUserIdCode());
+                mr.setDcountDate(null);
+                mr.setDcountNo(YesNoEnum.NO.code);
+                mzReceiptSerialMapper.insertMzReceiptSerial(mr);
+            }
+        }
+
         //更新收费明细表发票流水号
         mzChargeDetailMapper.updateBySerialNo(receiptNo, mzReceiptSerial.getSerialNo(), oriSerialNo);
-        List<MzDepositFile> mzDepositFiles = mzDepositFileMapper.selectMzDepositFileBySerialNo(oriSerialNo,null);
+        List<MzDepositFile> mzDepositFiles = mzDepositFileMapper.selectMzDepositFileBySerialNo(oriSerialNo, null);
         //原收费方式记录设置为作废
-        mzDepositFileMapper.updatePayMark(PayMarkEnum.CANCELLATION.code, oriSerialNo,mzReceiptSerial.getChequeType());
+        //mzDepositFileMapper.updatePayMark(PayMarkEnum.CANCELLATION.code, oriSerialNo,mzReceiptSerial.getChequeType());
+        mzDepositFileMapper.updatePayMark(PayMarkEnum.CANCELLATION.code, oriSerialNo);
         for (MzDepositFile mzDepositFile : mzDepositFiles) {
-            if(Constants.BYJZ.equals(mzDepositFile.getChequeType())){
-                continue;
-            }
+//            if(Constants.BYJZ.equals(mzDepositFile.getChequeType())){
+//                continue;
+//            }
             //新增新的收费方式记录
-            mzDepositFile.setReceiptNo(mzReceiptSerial.getReceiptNo());
-            mzDepositFile.setReceiptSn(mzReceiptSerial.getSerialNo());
-            mzDepositFile.setSerialNo(mzReceiptSerial.getSerialNo());
+            mzDepositFile.setReceiptNo(receiptNo);
+            mzDepositFile.setReceiptSn(serialNo);
+            mzDepositFile.setSerialNo(serialNo);
             mzDepositFile.setChargeDate(now);
             //mzDepositFile.setDcountNo(YesNoEnum.NO.code);
             //mzDepositFile.setDcountDate(null);
@@ -257,44 +266,44 @@ public class MzReceiptSerialServiceImpl implements MzReceiptSerialService {
 
     @Override
     public List<Map<String, Object>> queryChargeListByPatient(List<String> patientIds, String serialNo, Date beginDate, Date endDate, String tableName) {
-        List<Map<String, Object>> list=  mzReceiptSerialMapper.selectChargeListByPatient(patientIds,serialNo,beginDate,endDate,tableName);
-        Map<String,String> patientIdMap = new HashMap<>();
+        List<Map<String, Object>> list = mzReceiptSerialMapper.selectChargeListByPatient(patientIds, serialNo, beginDate, endDate, tableName);
+        Map<String, String> patientIdMap = new HashMap<>();
         for (Map<String, Object> map : list) {
             String patientIdTemp = (String) map.get("patient_id");
-            String name =patientIdMap.get(patientIdTemp);
-            if(StringUtils.isBlank(name)){
-                MzPatientMi mzPatientMi= mzPatientMiService.queryByPatientId(patientIdTemp);
-                name=mzPatientMi.getName();
-                patientIdMap.put(patientIdTemp,name);
+            String name = patientIdMap.get(patientIdTemp);
+            if (StringUtils.isBlank(name)) {
+                MzPatientMi mzPatientMi = mzPatientMiService.queryByPatientId(patientIdTemp);
+                name = mzPatientMi.getName();
+                patientIdMap.put(patientIdTemp, name);
             }
-            map.put("name",name);
+            map.put("name", name);
         }
         return list;
     }
 
     @Override
     public BigDecimal querySumByPatientId(String beginDate, String endDate, String patientId) {
-        return mzReceiptSerialMapper.selectSumByPatientId(beginDate,endDate,patientId);
+        return mzReceiptSerialMapper.selectSumByPatientId(beginDate, endDate, patientId);
     }
 
     @Override
     @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.DEFAULT, timeout = 36000, rollbackFor = Exception.class)
     public int repairDataFromBack(String patientId, Integer times, Integer receiptNo) {
-        Date date=mzReceiptSerialMapper.selectChargeDateThisTime(patientId, times, receiptNo);
-        if(date==null){
+        Date date = mzReceiptSerialMapper.selectChargeDateThisTime(patientId, times, receiptNo);
+        if (date == null) {
             return 0;
         }
-        Date beginDate =DateUtil.getFirstSecond(date);
-        Date endDate=DateUtil.getLastSecond(date);
-        List<MzReceiptSerial> mzReceiptSerialList= mzReceiptSerialMapper.selectAllItemByChargeDate(patientId,beginDate,endDate);
-        if (mzReceiptSerialList==null || mzReceiptSerialList.size()==0){
+        Date beginDate = DateUtil.getFirstSecond(date);
+        Date endDate = DateUtil.getLastSecond(date);
+        List<MzReceiptSerial> mzReceiptSerialList = mzReceiptSerialMapper.selectAllItemByChargeDate(patientId, beginDate, endDate);
+        if (mzReceiptSerialList == null || mzReceiptSerialList.size() == 0) {
             return 0;
         }
         MzChargeDetail mzChargeDetail = new MzChargeDetail();
         mzChargeDetail.setPatientId(patientId);
-        int num =0;
-        for (MzReceiptSerial mr:mzReceiptSerialList){
-            if(mr==null){
+        int num = 0;
+        for (MzReceiptSerial mr : mzReceiptSerialList) {
+            if (mr == null) {
                 continue;
             }
             mzReceiptSerialMapper.repairDataFromBack(patientId, mr.getTimes(), mr.getReceiptNo());

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

@@ -863,8 +863,8 @@ function print() {
     LODOP.ADD_PRINT_HTM("0mm", "5mm", "200mm", "280mm",strStyle+ document.getElementById("report_table_1").innerHTML);
     LODOP.NewPageA();
     LODOP.ADD_PRINT_HTM("0mm", "5mm", "200mm", "280mm", document.getElementById("zbr_div").innerHTML);
-    //LODOP.PRINT();
-    LODOP.PREVIEW();
+    LODOP.PRINT();
+    //LODOP.PREVIEW();
 }
 
 

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

@@ -1555,8 +1555,8 @@ function printCommon(url, patientId, times, chargeFeeFlag) {
                     LODOP.ADD_PRINT_TEXT("79mm", "13mm", "10mm", "3mm", res.data[i].month);//月
                     LODOP.ADD_PRINT_TEXT("79mm", "25mm", "10mm", "3mm", res.data[i].day);//日
                     LODOP.ADD_PRINT_TEXT("79mm", "53mm", "50mm", "3mm", temp.operatorId);//收费员
-                    //LODOP.PRINT();
-                    LODOP.PREVIEW();
+                    LODOP.PRINT();
+                    //LODOP.PREVIEW();
                     initFeeTable();
                 }
 

src/main/resources/templates/login.html

@@ -13,8 +13,9 @@
     <link rel="stylesheet" href="/thmz/css/font-awesome/css/font-awesome.min.css">
     <link rel="stylesheet" href="/thmz/css/form-elements.css">
     <link rel="stylesheet" href="/thmz/css/font-awesome/css/style.css">
+    <link rel="shortcut icon" type="image/x-icon" href="/thmz/images/hospital.png" />
     <!-- Favicon and touch icons -->
-    <link rel="shortcut icon" href="@{~/ico/favicon.png">
+<!--    <link rel="shortcut icon" type="image/x-icon" href="@{~/ico/favicon.png">-->
     <link rel="apple-touch-icon-precomposed" sizes="144x144" href="/thmz/ico/apple-touch-icon-144-precomposed.png">
     <link rel="apple-touch-icon-precomposed" sizes="114x114" href="/thmz/ico/apple-touch-icon-114-precomposed.png">
     <link rel="apple-touch-icon-precomposed" sizes="72x72" href="/thmz/ico/apple-touch-icon-72-precomposed.png">

src/main/resources/templates/menu.html

@@ -9,8 +9,8 @@
     <meta http-equiv="pragma" content="no-cache">
     <meta http-equiv="cache-control" content="no-cache">
     <meta http-equiv="expires" content="0">
-    <link rel="icon" href="/thmz/images/favicon.ico" type="image/ico"/>
-    <title>泰和医院门诊系统</title>
+    <title>泰和云HIS</title>
+    <link rel="shortcut icon" type="image/x-icon" href="/thmz/images/hospital.png" />
     <!-- Bootstrap -->
     <link rel="stylesheet" href="/thmz/css/bootstrap/css/bootstrap.min.css">
     <!-- Font Awesome -->
@@ -134,7 +134,7 @@
                 <nav>
                     <div class="nav toggle" style="min-width: 200px;">
                         <a id="menu_toggle"><i class="fa fa-bars"></i></a>
-                        <span style="font-size: 18px;line-height: 30px;">泰和医院门诊系统</span>
+                        <span style="font-size: 18px;line-height: 30px;">泰和云HIS</span>
                     </div>
 
                     <ul class="nav navbar-nav navbar-right">