Merge branch 'dev-1.1.4' into 'dev-1.1.4'

口服药内服袋打印优化

See merge request lihong/thmz_system!16

src/main/resources/static/js/yf/ward_prescription.js

@@ -1618,9 +1618,12 @@ function printLabelLongTime(datas, isMx, LODOP) {
     for (var i = 0; i < datas.length; i++) {
         let data = datas[i];
         for (let j = 0; j < tableDatas.length; j++) {
-            if (tableDatas[j].fybz.indexOf("发药") != -1 && tableDatas[j].chargeCode == data.chargeCode
-                && tableDatas[j].serial == data.serial && (tableDatas[j].occTime == data.occTime || isMx == 0)) {
-                if ((i > 0 && (data.inpatientNo != datas[i - 1].inpatientNo || data.occTime != datas[i - 1].occTime)) || number == 5) {//服药时间或者病人不同另起一页，超过五种药品另起一页
+            if (tableDatas[j].fybz.indexOf("发药") != -1
+                && tableDatas[j].chargeCode == data.chargeCode && tableDatas[j].serial == data.serial
+                && tableDatas[j].inpatientNo == data.inpatientNo
+                && (tableDatas[j].occTime == data.occTime || isMx == 0)) {
+                if ((i > 0 && (data.inpatientNo != datas[i - 1].inpatientNo || data.occTime != datas[i - 1].occTime)) || number == 5) {
+                //服药时间或者病人不同另起一页，超过五种药品另起一页
                     if (html != '') {
                         for (let j = 0; j < 5 - number; j++) {
                             html += '<tr class="sjh">';