浏览代码

导引单二维码

zengfanwei 3 周之前
父节点
当前提交
7b17bd7225

+ 5 - 21
src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzChargeDetailMapper.java

@@ -1195,37 +1195,21 @@ public interface MzChargeDetailMapper {
      * @param: times
      * @return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
      **/
-    @Select(" select type='诊疗服务',c.name name,c.office_pos address  " +
-            "from mz_charge_detail a,zd_charge_item b,zd_unit_code c  " +
-            "where patient_id=#{patientId} and times=#{times} and req_no=0  " +
-            "  and a.charge_item_code=b.code  " +
-            "  and a.exec_dept=c.code  " +
-            "  and c.office_pos is not null  " +
-            "  and a.exec_dept!='2060500'  " +
-            "group by c.name,c.office_pos  " +
-            "union all  " +
-            "select type='检查',c.name name,d.office_pos address  " +
+    @Select("select (select name from zd_unit_code where code=a.exec_dept)execDept,b.name name,b.exec_address address  " +
             "from mz_yj_req a,jc_zd_item b,jc_zd_class c,zd_unit_code d  " +
             "where patient_id=#{patientId} and times=#{times}  " +
             "  and a.order_code=b.code  " +
             "  and b.class=c.code  " +
             "  and a.exec_dept=d.code  " +
-            "  and d.office_pos is not null  " +
-            "group by c.name,a.exec_dept,d.office_pos  " +
-            "union all  " +
-            "select type='药品',c.group_name name,c.office_pos address  " +
-            "from mz_charge_detail a,yp_zd_group_name c  " +
-            "where patient_id=#{patientId} and times=#{times}  " +
-            "  and a.group_no=c.group_no  " +
-            "group by c.group_name,c.office_pos  " +
+            "group by b.name,a.exec_dept,b.exec_address  " +
             "union all  " +
-            "select type='检验化验',d.name name,(select office_pos from zd_unit_code where code=a.exec_dept) address  " +
+            "select (select name from zd_unit_code where code=a.exec_dept)execDept,b.name name,b.exec_address address  " +
             "from mz_yj_req a,jy_zd_item b,zd_unit_code d  " +
             "where patient_id=#{patientId} and times=#{times}  " +
             "  and a.order_code=b.code  " +
             "  and a.exec_dept=d.code  " +
-            "group by a.exec_dept,d.name  " +
-            "order by type,address,name ")
+            "group by a.exec_dept,b.name,b.exec_address  " +
+            "order by execDept,address,name")
     List<Map<String, Object>> getChargeDetailForGuideCard(@Param("patientId") String patientId, @Param("times") Integer times);
     /**
      * @description: 查询优惠后 和 未优惠的金额

+ 7 - 4
src/main/resources/static/js/mz/clinic.js

@@ -13043,6 +13043,7 @@ function printPrescription(patientId, times, clnicId, payMark, printType) {
                     // $("#acctPayGuideCard").html(0.00);
                     $("#payQrcodeGuideCard").empty();
                     $("#selfPayDetail").empty();
+                    infoMessage("获取支付信息耗时较长,请耐心等待")
                     $.ajax({
                         type: "GET",
                         url: '/thmz/getChargeDetailForGuideCard?patientId=' + patientId + '&times=' + times,
@@ -13089,13 +13090,15 @@ function printPrescription(patientId, times, clnicId, payMark, printType) {
                                     // LODOP.ADD_PRINT_HTM("0mm", "5mm", "140mm", "200mm", strStyle + document.getElementById("self_pay_table").innerHTML);
                                     index++;
                                 }
+                                let html = `<tr style="font-weight: 700"><td>科室</td> <td>项目</td><td>地点</td></tr>`;
                                 if (res.guideCardData != null && res.guideCardData.length > 0) {
-                                    let html = `<tr style="font-weight: 700"><td>类别</td> <td>名称/科室</td><td>地址</td></tr>`;
-                                    for (var i = 0; i < res.guideCardData.length; i++) {
-                                        html += "<tr><td>" + res.guideCardData[i].type + "</td><td>" + res.guideCardData[i].name + "</td><td>" + res.guideCardData[i].address + "</td></tr>"
+                                    if(res.guideCardData.length > 0){
+                                        for (var i = 0; i < res.guideCardData.length; i++) {
+                                            html += "<tr><td>" + res.guideCardData[i].execDept + "</td><td>" + res.guideCardData[i].name + "</td><td>" + res.guideCardData[i].address + "</td></tr>"
+                                        }
                                     }
-                                    $("#guideCardDetail").html(html);
                                 }
+                                $("#guideCardDetail").html(html);
                                 let totalAmount = res.totalAmount;
                                 let jsonData = {
                                     "subject": '门诊收费',

+ 6 - 4
src/main/resources/templates/mz/clinic.html

@@ -3048,9 +3048,11 @@
     <div style="width:40mm;">
         <div>
             <div style="flex:1;font-weight:bold;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">
-                <span class="hospitalName" style="margin-left: 10px">沭阳铭和医院</span><br>门诊就诊指引单
+                <span class="hospitalName" style="margin-left: 20px">沭阳铭和医院</span><br>
+                <span style="margin-left: 12px">门诊就诊指引单</span>
             </div>
-            <div style="float: left;padding-right: 20px;"><img id="imgcode" style="height: 60px;"/></div>
+            <div style="float: left;"><img id="imgcode" style="width: 100%;height: 60px;
+            transform-origin: top left;"/></div>
             <div style="float: left;width: 170px;">
                 <div style="margin-bottom: 8px">门诊号:<span id="patientIdGuideCard"></span></div>
                 <div style="margin-bottom: 8px">姓名:<span id="patientNameGuideCard"></span></div>
@@ -3059,10 +3061,10 @@
                     <span id="patientDateGuideCard"></span></div>
                 <div>缴费金额:<span id="totalAmountGuideCard"></span></div>
                 <div id="payQrcodeGuideCard" style="float: left;width: 140px;height:140px;text-align: center;padding: 2px;"></div>
-                <div id="wxPayQrCard" style="float: left;width: 140px;height:140px;text-align: center;padding: 2px;"></div>
+                <div id="wxPayQrCard" style="float: left;width: 140px;height:80px;text-align: center;padding: 2px;"></div>
             </div>
         </div>
-        <table class="table table-striped table-bordered" style="border-top: 2px dashed black">
+        <table class="table table-striped table-bordered" style="border-top: 2px dashed black;">
             <tbody >
             <tr>
                 <td colspan="3">