门诊报表增加门诊统筹和个账明细

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

@@ -545,6 +545,8 @@ public class ChargeFeeVoController {
             Collections.sort(sfzffpmx); // 按发票号排序
             resultMap.put("zffpmx", sfzffpmx);
             resultMap.put("zizhufpmx", chargeFeeVoService.queryZiZhuReceiptVo(tokenUser.getUserIdCode(), null));
+            resultMap.put("ybjzmx", chargeFeeVoService.queryMxByChequeType(tokenUser.getUserIdCode(), null,YesNoEnum.YES.code.toString()));
+            resultMap.put("grzhmx", chargeFeeVoService.queryMxByChequeType(tokenUser.getUserIdCode(), null,YesNoEnum.NO.code.toString()));
             resultMap.put("user", tokenUser);
             resultMap.put("code", 0);
             resultMap.put("message", "查询费用日结报表成功");
@@ -655,6 +657,8 @@ public class ChargeFeeVoController {
             Collections.sort(sfzffpmx); // 按发票号排序
             resultMap.put("zffpmx", sfzffpmx);
             resultMap.put("zizhufpmx", chargeFeeVoService.queryZiZhuReceiptVo(chargeFeeParamsVo.getOpId(), chargeFeeParamsVo.getDcountDate()));
+            resultMap.put("ybjzmx", chargeFeeVoService.queryMxByChequeType(tokenUser.getUserIdCode(), chargeFeeParamsVo.getDcountDate(),YesNoEnum.YES.code.toString()));
+            resultMap.put("grzhmx", chargeFeeVoService.queryMxByChequeType(tokenUser.getUserIdCode(), chargeFeeParamsVo.getDcountDate(),YesNoEnum.NO.code.toString()));
             resultMap.put("code", 0);
             resultMap.put("message", "查询重打费用日结报表成功");
             return resultMap;

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

@@ -1143,4 +1143,36 @@ public interface ChargeFeeVoMapper {
     List<Map<String, Object>> selectDoctorPerformanceStatistics(@Param("beginDate") String beginDate, @Param("endDate") String endDate, @Param("doctorCode") String doctorCode, @Param("warnDept") String warnDept);
 
 
+
+    /**
+     * 查询医保记账或者个账收费明细
+     *
+     * @param userIdCode
+     * @param dcountDate
+     * @param caseType 1 医保记账 0 个账
+     * @return
+     */
+    @Select({"<script>",
+            "select name=a.name, " +
+                    "patient_id=rtrim(b.patient_id), " +
+                    "amount=b.amount " +
+                    "from mz_patient_mi a WITH(NOLOCK) , mz_deposit_file b WITH(NOLOCK) " +
+                    "where b.op_id=#{userIdCode} and b.patient_id=a.patient_id " +
+                    "<when test='dcountDate!=null'>",
+            " and dcount_date=#{dcountDate,jdbcType=TIMESTAMP} ",
+            "</when>",
+            "<when test='dcountDate == null'>",
+            " and dcount_no =0 ",
+            "</when>",
+            "<choose>",
+            "<when test='caseType == 1'>",
+            " and b.cheque_type='2'",
+            "</when>",
+            "<otherwise>",
+            " and b.cheque_type in ('P','T')",
+            "</otherwise>",
+            " </choose>",
+            "</script>"})
+    List<Map<String,Object>> selectMxByChequeType(@Param("userIdCode") String userIdCode, @Param("dcountDate") Date dcountDate,@Param("caseType") String caseType);
+
 }

src/main/java/cn/hnthyy/thmz/service/his/mz/ChargeFeeVoService.java

@@ -340,4 +340,13 @@ public interface ChargeFeeVoService {
      * @return
      */
     List<Map<String, Object>> queryDoctorPerformanceStatistics(String beginDate,String endDate,String doctorCode,String warnDept);
+
+    /**
+     * 查询医保记账或者个账收费明细
+     * @param userIdCode
+     * @param dcountDate
+     * @param caseType 1 医保记账 0 个账
+     * @return
+     */
+    List<Map<String,Object>> queryMxByChequeType(String userIdCode,Date dcountDate,String caseType);
 }

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

@@ -295,4 +295,9 @@ public class ChargeFeeVoServiceImpl implements ChargeFeeVoService {
     public List<Map<String, Object>> queryDoctorPerformanceStatistics(String beginDate, String endDate, String doctorCode, String warnDept) {
         return chargeFeeVoMapper.selectDoctorPerformanceStatistics(beginDate,endDate,doctorCode,warnDept);
     }
+
+    @Override
+    public List<Map<String, Object>> queryMxByChequeType(String userIdCode, Date dcountDate, String caseType) {
+        return chargeFeeVoMapper.selectMxByChequeType(userIdCode,dcountDate,caseType);
+    }
 }

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

@@ -496,6 +496,50 @@ function getRjbb() {
                     $("#zzbdfpmx").html(html);
                 }
 
+                //医保记账明细
+                if (res.zizhufpmx.ybjzmx == 0) {
+                    $("#ybjzmx_table").css("display", "none");
+                    $("#ybjzmx").html(null);
+                } else if (res.ybjzmx.length > 0) {
+                    $("#ybjzmx_table").css("display", "block");
+                    var html = '';
+                    for (var i = 0; i < res.ybjzmx.length; i++) {
+                        var patientId = res.ybjzmx[i].patient_id;
+                        if (i % 2 == 0) {
+                            html += '<tr>';
+                        }
+                        html += '<td>' + patientId + '</td>';
+                        html += '<td>' + res.ybjzmx[i].name + '</td>';
+                        html += '<td>' + res.ybjzmx[i].amount.toFixed(2) + '</td>';
+                        if (i % 2 == 1 || i == res.ybjzmx.length - 1) {
+                            html += '</tr>';
+                        }
+                    }
+                    $("#ybjzmx").html(html);
+                }
+
+
+                //个人账户明细
+                if (res.grzhmx.length == 0) {
+                    $("#mztcgrzhmx_table").css("display", "none");
+                    $("#mztcgrzhmx").html(null);
+                } else if (res.grzhmx.length > 0) {
+                    $("#mztcgrzhmx_table").css("display", "block");
+                    var html = '';
+                    for (var i = 0; i < res.grzhmx.length; i++) {
+                        var patientId = res.ybjzmx[i].patient_id;
+                        if (i % 2 == 0) {
+                            html += '<tr>';
+                        }
+                        html += '<td>' + patientId + '</td>';
+                        html += '<td>' + res.grzhmx[i].name + '</td>';
+                        html += '<td>' + res.grzhmx[i].amount.toFixed(2) + '</td>';
+                        if (i % 2 == 1 || i == res.grzhmx.length - 1) {
+                            html += '</tr>';
+                        }
+                    }
+                    $("#mztcgrzhmx").html(html);
+                }
 
                 $("#username_zbr").html(res.user.userName);
             } else if (res.code == -1) {

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

@@ -664,6 +664,52 @@ function getRjbb() {
                 }
 
 
+                //医保记账明细
+                if (res.zizhufpmx.ybjzmx == 0) {
+                    $("#ybjzmx_table").css("display", "none");
+                    $("#ybjzmx").html(null);
+                } else if (res.ybjzmx.length > 0) {
+                    $("#ybjzmx_table").css("display", "block");
+                    var html = '';
+                    for (var i = 0; i < res.ybjzmx.length; i++) {
+                        var patientId = res.ybjzmx[i].patient_id;
+                        if (i % 2 == 0) {
+                            html += '<tr>';
+                        }
+                        html += '<td>' + patientId + '</td>';
+                        html += '<td>' + res.ybjzmx[i].name + '</td>';
+                        html += '<td>' + res.ybjzmx[i].amount.toFixed(2) + '</td>';
+                        if (i % 2 == 1 || i == res.ybjzmx.length - 1) {
+                            html += '</tr>';
+                        }
+                    }
+                    $("#ybjzmx").html(html);
+                }
+
+
+                //个人账户明细
+                if (res.grzhmx.length == 0) {
+                    $("#mztcgrzhmx_table").css("display", "none");
+                    $("#mztcgrzhmx").html(null);
+                } else if (res.grzhmx.length > 0) {
+                    $("#mztcgrzhmx_table").css("display", "block");
+                    var html = '';
+                    for (var i = 0; i < res.grzhmx.length; i++) {
+                        var patientId = res.ybjzmx[i].patient_id;
+                        if (i % 2 == 0) {
+                            html += '<tr>';
+                        }
+                        html += '<td>' + patientId + '</td>';
+                        html += '<td>' + res.grzhmx[i].name + '</td>';
+                        html += '<td>' + res.grzhmx[i].amount.toFixed(2) + '</td>';
+                        if (i % 2 == 1 || i == res.grzhmx.length - 1) {
+                            html += '</tr>';
+                        }
+                    }
+                    $("#mztcgrzhmx").html(html);
+                }
+
+
             } else if (res.code == -1) {
                 new PNotify({
                     title: '错误提示',

src/main/resources/templates/mz/daily.html

@@ -409,7 +409,7 @@
                             </tbody>
                         </table>
                     </div>
-                    <div class="form-group col-md-12 col-sm-12 col-xs-12" style="margin-bottom: 100px;">
+                    <div class="form-group col-md-12 col-sm-12 col-xs-12">
                         <table style="width: 96%;padding-left: 20px;display: none;border-top:1px solid"
                                id="sfzffpmx_table">
                             <thead>
@@ -432,7 +432,52 @@
                             </tbody>
                         </table>
                     </div>
+                    <div class="form-group col-md-12 col-sm-12 col-xs-12" style="margin-bottom: 10px;">
+                        <table style="width: 96%;padding-left: 20px;display: none;border-top:1px solid"
+                               id="ybjzmx_table">
+                            <thead>
+                            <tr>
+                                <td colspan="9">医保记账明细：</td>
+                            </tr>
+                            <tr>
+                            <tr>
+                                <td width="180px">门诊ID</td>
+                                <td width="120px">姓名</td>
+                                <td width="100px">金额</td>
+                                <td width="180px">门诊ID</td>
+                                <td width="120px">姓名</td>
+                                <td width="100px">金额</td>
+                            </tr>
+                            </tr>
+                            </thead>
+                            <tbody id="ybjzmx">
+
+                            </tbody>
+                        </table>
+                    </div>
+                    <div class="form-group col-md-12 col-sm-12 col-xs-12" style="margin-bottom: 100px;">
+                        <table style="width: 96%;padding-left: 20px;display: none;border-top:1px solid"
+                               id="mztcgrzhmx_table">
+                            <thead>
+                            <tr>
+                                <td colspan="9">门诊统筹个人账户明细：</td>
+                            </tr>
+                            <tr>
+                            <tr>
+                                <td width="180px">门诊ID</td>
+                                <td width="120px">姓名</td>
+                                <td width="100px">金额</td>
+                                <td width="180px">门诊ID</td>
+                                <td width="120px">姓名</td>
+                                <td width="100px">金额</td>
+                            </tr>
+                            </tr>
+                            </thead>
+                            <tbody id="mztcgrzhmx">
 
+                            </tbody>
+                        </table>
+                    </div>
                     <div><span>结账人签字：</span><span style="text-decoration: underline" id="username_zbr"></span><span
                             style="margin-left: 120px;">收款人签字：</span><span style="text-decoration: underline">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span
                             style="margin-left: 120px;">审核人签字：</span><span style="text-decoration: underline">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>

src/main/resources/templates/mz/daily_repeat_print.html

@@ -435,7 +435,7 @@
                             </tbody>
                         </table>
                     </div>
-                    <div class="form-group col-md-12 col-sm-12 col-xs-12" style="margin-bottom: 100px;">
+                    <div class="form-group col-md-12 col-sm-12 col-xs-12">
                         <table style="width: 96%;padding-left: 20px;display: none;border-top:1px solid"
                                id="sfzffpmx_table">
                             <thead>
@@ -459,6 +459,53 @@
                         </table>
                     </div>
 
+
+                    <div class="form-group col-md-12 col-sm-12 col-xs-12" style="margin-bottom: 10px;">
+                        <table style="width: 96%;padding-left: 20px;display: none;border-top:1px solid"
+                               id="ybjzmx_table">
+                            <thead>
+                            <tr>
+                                <td colspan="9">医保记账明细：</td>
+                            </tr>
+                            <tr>
+                            <tr>
+                                <td width="180px">门诊ID</td>
+                                <td width="120px">姓名</td>
+                                <td width="100px">金额</td>
+                                <td width="180px">门诊ID</td>
+                                <td width="120px">姓名</td>
+                                <td width="100px">金额</td>
+                            </tr>
+                            </tr>
+                            </thead>
+                            <tbody id="ybjzmx">
+
+                            </tbody>
+                        </table>
+                    </div>
+                    <div class="form-group col-md-12 col-sm-12 col-xs-12" style="margin-bottom: 100px;">
+                        <table style="width: 96%;padding-left: 20px;display: none;border-top:1px solid"
+                               id="mztcgrzhmx_table">
+                            <thead>
+                            <tr>
+                                <td colspan="9">门诊统筹个人账户明细：</td>
+                            </tr>
+                            <tr>
+                            <tr>
+                                <td width="180px">门诊ID</td>
+                                <td width="120px">姓名</td>
+                                <td width="100px">金额</td>
+                                <td width="180px">门诊ID</td>
+                                <td width="120px">姓名</td>
+                                <td width="100px">金额</td>
+                            </tr>
+                            </tr>
+                            </thead>
+                            <tbody id="mztcgrzhmx">
+
+                            </tbody>
+                        </table>
+                    </div>
                     <div><span>结账人签字：</span><span style="text-decoration: underline" id="username_zbr"></span><span
                             style="margin-left: 120px;">收款人签字：</span><span style="text-decoration: underline">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span
                             style="margin-left: 120px;">审核人签字：</span><span style="text-decoration: underline">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>