소스 검색

执行时间为空处理

WANGJIALIANG 2 년 전
부모
커밋
6ffa1cda35

+ 3 - 0
src/main/java/cn/hnthyy/thmz/controller/yf/YfWardPrescriptionController.java

@@ -302,6 +302,9 @@ public class YfWardPrescriptionController {
                 for (Date date : dates) {
                     int h = Integer.parseInt(DateUtil.pase(date, "yyyy-MM-dd HH:mm").toString().substring(11, 13));
                     Date d = DateUtil.pase(date, "yyyy-MM-dd");
+                    if(null == yfWardVo.getPerformanceTime()){
+                        continue;
+                    }
                     Date performanceDate = DateUtil.pase(yfWardVo.getPerformanceTime(), "yyyy-MM-dd");
                     if (h >= 12) {
                         if (h >= 13) {

+ 12 - 7
src/main/resources/static/js/yf/ward_prescription.js

@@ -1124,13 +1124,6 @@ function cleanParams() {
 function printXyCount(flag) {
     let html = '';
     let totalMoney = 0;
-    let title = (pageClass == "T" || pageClass == "HT") ? '病房退药单' : '病房汇总领药单(' + $("#pageClassSearch").find("option:selected").text() + ')';
-    $(".title").text(flag == 0 ? title + "(重打)" : title);
-    $(".groupName").text(groupNo == 71 ? '门诊西药房' : '住院药房');
-    let w_code = $("#wardCode").find("option:selected").text();
-    $(".wardName").text(w_code.substring(0, w_code.lastIndexOf("(")));
-    $(".pageNo").text($("#pageNoSearch").val() == '' ? pageNos : $("#pageNoSearch").val());
-    $(".printDate").html(format(new Date(), "yyyy-MM-dd HH:mm"));
     $('.sjh').remove();
     let datas = getJQAllData("tb_summarizing_table");
     for (var i = 0; i < datas.length; i++) {
@@ -1167,6 +1160,18 @@ function printXyCount(flag) {
     html += '<td colspan="3" style="text-align: left;font-weight: 700;border: transparent !important;">领药人:</td>';
     html += '</tr>';
     $("#hzdy_table").append(html);
+    let pageClassSearch = $("#pageClassSearch").find("option:selected").text();
+    if(isEmpty(pageClassSearch)){
+        errorMesageSimaple("打印表头参数为空,请联系管理员");
+        return;
+    }
+    let title = (pageClass == "T" || pageClass == "HT") ? '病房退药单' : '病房汇总领药单(' + pageClassSearch + ')';
+    $(".title").text(flag == 0 ? title + "(重打)" : title);
+    $(".groupName").text(groupNo == 71 ? '门诊西药房' : '住院药房');
+    let w_code = $("#wardCode").find("option:selected").text();
+    $(".wardName").text(w_code.substring(0, w_code.lastIndexOf("(")));
+    $(".pageNo").text($("#pageNoSearch").val() == '' ? pageNos : $("#pageNoSearch").val());
+    $(".printDate").html(format(new Date(), "yyyy-MM-dd HH:mm"));
     print("hzdy_table_div");
 }