Ver Fonte

导引单打印

zengfanwei há 2 semanas atrás
pai
commit
852088546c

+ 7 - 9
src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzChargeDetailMapper.java

@@ -1195,21 +1195,19 @@ public interface MzChargeDetailMapper {
      * @param: times
      * @return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
      **/
-    @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  " +
+    @Select("select b.name name,b.exec_address address  " +
+            "from mz_yj_req a,jc_zd_item b,jc_zd_class c  " +
             "where patient_id=#{patientId} and times=#{times}  " +
             "  and a.order_code=b.code  " +
             "  and b.class=c.code  " +
-            "  and a.exec_dept=d.code  " +
-            "group by b.name,a.exec_dept,b.exec_address  " +
+            "group by b.name,b.exec_address  " +
             "union all  " +
-            "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  " +
+            "select b.name name,b.exec_address address  " +
+            "from mz_yj_req a,jy_zd_item b  " +
             "where patient_id=#{patientId} and times=#{times}  " +
             "  and a.order_code=b.code  " +
-            "  and a.exec_dept=d.code  " +
-            "group by a.exec_dept,b.name,b.exec_address  " +
-            "order by execDept,address,name")
+            "group by b.name,b.exec_address  " +
+            "order by address,name")
     List<Map<String, Object>> getChargeDetailForGuideCard(@Param("patientId") String patientId, @Param("times") Integer times);
     /**
      * @description: 查询优惠后 和 未优惠的金额

+ 2 - 2
src/main/resources/static/js/mz/clinic.js

@@ -13090,11 +13090,11 @@ 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>`;
+                                let html = `<tr style="font-weight: 700"><td>项目</td><td>地点</td></tr>`;
                                 if (res.guideCardData != null && res.guideCardData.length > 0) {
                                     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>"
+                                            html += "<tr><td>" + res.guideCardData[i].name + "</td><td>" + res.guideCardData[i].address + "</td></tr>"
                                         }
                                     }
                                 }