优化发票张数计算

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

@@ -359,16 +359,21 @@ public class ChargeFeeVoController {
             //挂号所用票号
             List<String> ghReceiptBills = getStrings(chargeFeeVoService.queryGhReceiptBillVoUnAccount(tokenUser.getUserIdCode()));
             resultMap.put("ghReceiptBills", ghReceiptBills);
+            Integer sffps = chargeFeeVoService.countReceipt(tokenUser.getUserIdCode(), PayMarkEnum.CHARGED.code, null);
+            Integer tpzs=chargeFeeVoService.countReceipt(tokenUser.getUserIdCode(), PayMarkEnum.RETURN_PREMIUM.code, null);
+            Integer zffps=chargeFeeVoService.countReceipt(tokenUser.getUserIdCode(), PayMarkEnum.CANCELLATION.code, null);
             //收费发票张数
-            resultMap.put("sffps", chargeFeeVoService.countReceipt(tokenUser.getUserIdCode(), PayMarkEnum.CHARGED.code, null));
+            resultMap.put("sffps",sffps+tpzs+zffps);
             //退费发票张数
-            resultMap.put("tpzs", chargeFeeVoService.countReceipt(tokenUser.getUserIdCode(), PayMarkEnum.RETURN_PREMIUM.code, null));
+            resultMap.put("tpzs", tpzs);
             //作废收费发票张数
-            resultMap.put("zffps", chargeFeeVoService.countReceipt(tokenUser.getUserIdCode(), PayMarkEnum.CANCELLATION.code, null));
+            resultMap.put("zffps", zffps);
+            Integer ghfps=chargeFeeVoService.countReqrecReceipt(tokenUser.getUserIdCode(), YesNoEnum.NO.code.toString(), null, null, null);
+            Integer ghtpzs=chargeFeeVoService.countReqrecReceipt(tokenUser.getUserIdCode(), YesNoEnum.YES.code.toString(), null, null, null);
             //挂号发票张数
-            resultMap.put("ghfps", chargeFeeVoService.countReqrecReceipt(tokenUser.getUserIdCode(), YesNoEnum.NO.code.toString(), null, null, null));
+            resultMap.put("ghfps",ghfps+ghtpzs);
             //退号发票张数
-            resultMap.put("ghtpzs", chargeFeeVoService.countReqrecReceipt(tokenUser.getUserIdCode(), YesNoEnum.YES.code.toString(), null, null, null));
+            resultMap.put("ghtpzs", ghtpzs);
             //收费作废发票明细
             resultMap.put("sfzffpmx", chargeFeeVoService.queryReceiptVo(tokenUser.getUserIdCode(), null));
             //挂号收入构成表格数据
@@ -430,16 +435,21 @@ public class ChargeFeeVoController {
             //挂号所用票号
             List<String> ghReceiptBills = getStrings(chargeFeeVoService.queryGhReceiptBillVoReprint(chargeFeeParamsVo.getOpId(), chargeFeeParamsVo.getDcountDate()));
             resultMap.put("ghReceiptBills", ghReceiptBills);
+            Integer sffps=chargeFeeVoService.countReceipt(chargeFeeParamsVo.getOpId(), PayMarkEnum.CHARGED.code, chargeFeeParamsVo.getDcountDate());
+            Integer tpzs=chargeFeeVoService.countReceipt(chargeFeeParamsVo.getOpId(), PayMarkEnum.RETURN_PREMIUM.code, chargeFeeParamsVo.getDcountDate());
+            Integer zffps=chargeFeeVoService.countReceipt(chargeFeeParamsVo.getOpId(), PayMarkEnum.CANCELLATION.code, chargeFeeParamsVo.getDcountDate());
             //收费发票张数
-            resultMap.put("sffps", chargeFeeVoService.countReceipt(chargeFeeParamsVo.getOpId(), PayMarkEnum.CHARGED.code, chargeFeeParamsVo.getDcountDate()));
+            resultMap.put("sffps", sffps+tpzs+zffps);
             //退费发票张数
-            resultMap.put("tpzs", chargeFeeVoService.countReceipt(chargeFeeParamsVo.getOpId(), PayMarkEnum.RETURN_PREMIUM.code, chargeFeeParamsVo.getDcountDate()));
+            resultMap.put("tpzs", tpzs);
             //作废收费发票张数
-            resultMap.put("zffps", chargeFeeVoService.countReceipt(chargeFeeParamsVo.getOpId(), PayMarkEnum.CANCELLATION.code, chargeFeeParamsVo.getDcountDate()));
+            resultMap.put("zffps", zffps);
+            Integer ghfps=chargeFeeVoService.countReqrecReceipt(chargeFeeParamsVo.getOpId(), YesNoEnum.NO.code.toString(), chargeFeeParamsVo.getDcountDate(), null, null);
+            Integer ghtpzs=chargeFeeVoService.countReqrecReceipt(chargeFeeParamsVo.getOpId(), YesNoEnum.YES.code.toString(), chargeFeeParamsVo.getDcountDate(), null, null);
             //挂号发票张数
-            resultMap.put("ghfps", chargeFeeVoService.countReqrecReceipt(chargeFeeParamsVo.getOpId(), YesNoEnum.NO.code.toString(), chargeFeeParamsVo.getDcountDate(), null, null));
+            resultMap.put("ghfps", ghfps+ghtpzs);
             //退号发票张数
-            resultMap.put("ghtpzs", chargeFeeVoService.countReqrecReceipt(chargeFeeParamsVo.getOpId(), YesNoEnum.YES.code.toString(), chargeFeeParamsVo.getDcountDate(), null, null));
+            resultMap.put("ghtpzs", ghtpzs);
             //收费作废发票明细
             resultMap.put("sfzffpmx", chargeFeeVoService.queryReceiptVo(chargeFeeParamsVo.getOpId(), chargeFeeParamsVo.getDcountDate()));
             //挂号收入构成表格数据
@@ -492,10 +502,12 @@ public class ChargeFeeVoController {
             ChargeCountVo chargeCountVo = chargeFeeVoService.queryChargeCountVo(chargeFeeParamsVo.getOpId(), null, chargeFeeParamsVo.getBeginDate(), chargeFeeParamsVo.getEndDate()).get(0);
             chargeCountVo.fomartChargeCountVo();
             resultMap.put("chargeCountVo", chargeCountVo);
+            Integer ghfps=chargeFeeVoService.countReqrecReceipt(null, YesNoEnum.NO.code.toString(), null, chargeFeeParamsVo.getBeginDate(), chargeFeeParamsVo.getEndDate());
+            Integer ghtpzs=chargeFeeVoService.countReqrecReceipt(null, YesNoEnum.YES.code.toString(), null, chargeFeeParamsVo.getBeginDate(), chargeFeeParamsVo.getEndDate());
             //挂号发票张数
-            resultMap.put("ghfps", chargeFeeVoService.countReqrecReceipt(null, YesNoEnum.NO.code.toString(), null, chargeFeeParamsVo.getBeginDate(), chargeFeeParamsVo.getEndDate()));
+            resultMap.put("ghfps",ghfps + ghtpzs);
             //退号发票张数
-            resultMap.put("ghtpzs", chargeFeeVoService.countReqrecReceipt(null, YesNoEnum.YES.code.toString(), null, chargeFeeParamsVo.getBeginDate(), chargeFeeParamsVo.getEndDate()));
+            resultMap.put("ghtpzs", ghtpzs);
             //挂号收入构成表格数据
             ReqrecVo reqrecVo = chargeFeeVoService.queryMzReceiptSerialCount(chargeFeeParamsVo.getOpId(), null, chargeFeeParamsVo.getBeginDate(), chargeFeeParamsVo.getEndDate()).get(0);
             reqrecVo.fomartReqrecVo();

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

@@ -476,6 +476,9 @@ public interface ChargeFeeVoMapper {
      */
     @Select({"<script>",
             "select count ( distinct receipt_bill ) from mz_receipt_serial where operator_id =#{userIdCode} and pay_mark =#{payMark} ",
+            "<when test='payMark!=null and payMark == 1'>",
+            " and times  <![CDATA[<]]> 0 ",
+            "</when>",
             "<when test='dcountDate!=null'>",
             " and dcount_date=#{dcountDate,jdbcType=TIMESTAMP} ",
             "</when>",
@@ -533,6 +536,9 @@ public interface ChargeFeeVoMapper {
      */
     @Select({"<script>",
             "select count ( *) from mzy_reqrec where cancel_mark =#{cancelMark} ",
+            "<when test='cancelMark!=null and cancelMark == 1'>",
+            " and times <![CDATA[<]]> 0 ",
+            "</when>",
             "<when test='userIdCode!=null'>",
             " and op_id=#{userIdCode} ",
             "</when>",
@@ -607,7 +613,7 @@ public interface ChargeFeeVoMapper {
                     "         rtrim(mzy_reqrec.name) name," +
                     "         mzy_reqrec.req_fee+mzy_reqrec.oth_fee+mzy_reqrec.clinic_fee  as total_charge " +
                     "FROM mzy_reqrec " +
-                    "where cancel_mark <![CDATA[<>]]> '0'  and times <![CDATA[>]]> 0 " +
+                    "where cancel_mark <![CDATA[<>]]> '0'  and times <![CDATA[<]]> 0 " +
                     "<when test='userIdCode!=null'>",
             " and op_id=#{userIdCode} ",
             "</when>",

src/main/resources/templates/daily_collect.html

@@ -33,9 +33,9 @@
                     </div>
                     <div class="form-group col-md-8 col-sm-8 col-xs-12">
                         <!--<div class="col-md-6 col-sm-6 col-xs-12"></div>-->
-                        <label class="control-label col-md-1 col-sm-1 col-xs-12" for="reportrange"> 日结时间
+                        <label class="control-label col-md-2 col-sm-2 col-xs-12" for="reportrange"> 日结时间
                         </label>
-                        <div class="col-md-3 col-sm-3 col-xs-12">
+                        <div class="col-md-5 col-sm-5 col-xs-12">
                             <div id="reportrange" class="pull-right"
                                  style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc">
                                 <i class="glyphicon glyphicon-calendar fa fa-calendar"></i>
@@ -53,7 +53,7 @@
                             </button>
                         </div>
                         <div class="col-md-1 col-sm-1 col-xs-12" style="text-align:left;">
-                            <button type="button" style="margin-left:3px" id="btn_daily" class="btn btn-primary"
+                            <button type="button" style="margin-left:10px" id="btn_daily" class="btn btn-primary"
                                     title="打印"><i class="fa fa-print"></i>
                             </button>
                         </div>