处方打印优化

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

@@ -331,7 +331,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
             priceTime = firstMzChargeDetail.getPriceTime();
             itemNo = formatSupplyFee(mzChargeDetails, mzChargeDetailList, itemNo, receiptNo, mzPatientMi);
         }
-        maxOrderNo++;
+        //maxOrderNo++;
         Map<String, MzYjReq> mzYjReqMap = new HashMap<>();
         Map<String, MzChargeDetail> tcNoMap = new HashMap<>();
         if (mzYjReqs != null && mzYjReqs.size() > 0) {

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

@@ -1437,9 +1437,9 @@ function editPrescription(jsonData, type) {
             for (var i = 0; i < mzYjReqList.length; i++) {
                 var mzYjReq = mzYjReqList[i];
                 var code = mzYjReq.orderCode;
-                if(mzYjReq.reqType==2){
+                if (mzYjReq.reqType == 2) {
                     $("#jcJyZltype").val(1);
-                }else if(mzYjReq.reqType==3){
+                } else if (mzYjReq.reqType == 3) {
                     $("#jcJyZltype").val(2);
                 }
                 checkJcJyItemInfo(code, null, false);
@@ -4611,9 +4611,12 @@ function initNavTabs(index) {
             '                                        </div>' +
             '                                    </div>';
     }
-    if (index == 2) {
-        html += '<div style="width: 310px;float: left;color: red;padding-top: 8px;">说明:此费用包含药品给药方式和代煎所产生的费用！</div>';
+    if (index == 0) {
+        html += '<div style="width: 310px;float: left;color: red;padding-top: 8px;">说明:此费用包含药品给药方式所产生的费用！</div>';
     }
+    // else if (index == 1) {
+    //     html += '<div style="width: 310px;float: left;color: red;padding-top: 8px;">说明:此费用包含药品代煎所产生的费用！</div>';
+    // }
     html += '</div></div></div>';
     $("#" + tabContentId).html(html);
     if (index == 1) {
@@ -4713,13 +4716,18 @@ function refreshNavTabs(index, groupNo) {
     //清除选中的样式
     $("#" + tabId).find("li.active").removeClass("active");
     $("#" + tabId).append('<li><a href="#' + paneId + '" role="tab" data-toggle="tab">' + cfTitle + '</a></li>');
-    $("#" + tabContentId).append('<div class="tab-pane fade in active" id="' + paneId + '" style="height: 100%;min-height: 285px;position: relative;">' +
+    var html = '<div class="tab-pane fade in active" id="' + paneId + '" style="height: 100%;min-height: 285px;position: relative;">' +
         '<img src="/thmz/images/prescription.png" style="margin-top: 5px;"/>' +
         '<input class="current_groupNo" type="hidden"/>' +
         '                                    <div class="cf_content rb_item" style="height: 230px;padding-top: 5px;overflow-y: auto;"></div>' +
-        '                                    <div style="height: 30px;border-top: 1px solid #ddd;width: 100%;position: absolute;bottom:0;">金额：<span class="cf_amount">0.0</span><span>元</span></div>' +
-        // '                                    <div style="height: 30px;border-top: 1px solid #ddd;width: 100%;position: absolute;bottom:0;"></div>' +
-        '                                </div>');
+        '                                    <div style="height: 30px;border-top: 1px solid #ddd;width: 100%;position: absolute;bottom:0;">' +
+        '<div style="width: 460px;">' +
+        '<div style="width: 130px;float: left;padding-left: 7px;padding-top: 8px;">金额：<span class="cf_amount">0.0</span><span>元</span></div>';
+    if (index == 0) {
+        html += '<div style="width: 310px;float: left;color: red;padding-top: 8px;">说明:此费用包含药品给药方式所产生的费用！</div>';
+    }
+    html += '</div></div>';
+    $("#" + tabContentId).append(html);
     //切换处方
     $("#" + tabId).find("a[href='#" + paneId + "']").off("click").tab('show');
 }
@@ -5611,6 +5619,7 @@ function getMzPrescriptionVoUnPaid(patientId, times, clnicId) {
     var currentPatientId = $("#patientId").val();
     //当前接诊的用户和操作接诊的是同一个人，不做任何操作
     if (currentPatientId == patientId) {
+        warningMesageSimaple("当前病人正在接诊中，请勿 重复操作！");
         return;
     }
     if (currentPatientId == null || currentPatientId == "") {
@@ -6249,7 +6258,7 @@ function printPrescription(patientId, times, clnicId, payMark) {
                                 $("#cfTitle").text("普通");
                             }
                             $("#prescriptionDetail").html(html);
-                            $("#cfAmountPrint").text(pyPrescription[i].amount + "元 ");
+                            $("#cfAmountPrint").text(pyPrescription[i].amount + "元 (不含注射费)");
                             LODOP.ADD_PRINT_HTM("0mm", "5mm", "140mm", "200mm", strStyle + document.getElementById("prescription_table").innerHTML);
                             index++;
 
@@ -6296,7 +6305,7 @@ function printPrescription(patientId, times, clnicId, payMark) {
                             $("#typePrescription").text("麻、精一处方");
                             $("#cfTitle").text("麻、精一");
                             $("#prescriptionDetail").html(html);
-                            $("#cfAmountPrint").text(mjPrescription[i].amount + "元 ");
+                            $("#cfAmountPrint").text(mjPrescription[i].amount + "元 (不含注射费)");
                             LODOP.ADD_PRINT_HTM("0mm", "5mm", "140mm", "200mm", strStyle + document.getElementById("prescription_table").innerHTML);
                             index++;
                         }
@@ -6315,7 +6324,7 @@ function printPrescription(patientId, times, clnicId, payMark) {
                             $("#typePrescription").text("精二处方");
                             $("#cfTitle").text("精二");
                             $("#prescriptionDetail").html(html);
-                            $("#cfAmountPrint").text(jePrescription[i].amount + "元 ");
+                            $("#cfAmountPrint").text(jePrescription[i].amount + "元 (不含注射费)");
                             LODOP.ADD_PRINT_HTM("0mm", "5mm", "140mm", "200mm", strStyle + document.getElementById("prescription_table").innerHTML);
                             index++;
                         }
@@ -6391,7 +6400,7 @@ function printPrescription(patientId, times, clnicId, payMark) {
                                 $("#cfTitle").text("普通");
                             }
                             $("#prescriptionDetail").html(html);
-                            $("#cfAmountPrint").text(prescriptionDetailJson.zyPrescription[0].amount + "元 ");
+                            $("#cfAmountPrint").text(prescriptionDetailJson.zyPrescription[0].amount + "元 (不含代煎费)");
                             LODOP.ADD_PRINT_HTM("0mm", "5mm", "140mm", "200mm", strStyle + document.getElementById("prescription_table").innerHTML);
                             index++;
                         }