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

中草药，颗粒剂处方增加药品特殊备注显示

See merge request lihong/thmz_system!110

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

@@ -987,14 +987,14 @@ function getZyPrintHtml(list) {
     let tr = '';
     for (let i = 0; i < list.length;) {
         tr += '<tr class="sjh">' +
-            '<td style="width: 160px; font-size: 14px;">' + list[i].drugName +
+            '<td style="width: 160px; font-size: 14px;">' + list[i].drugName + (list[i].instructionText == null || list[i].instructionText === '' ? '' : '【' + list[i].instructionText + '】') +
             '</td>' +
             '<td style="width: 40px;text-align: right; font-size: 14px;">' + list[i].specification +
             '</td>' +
             '<td style="width: 25px;text-align: right;border-right: 1px solid black; font-size: 14px;">' + list[i].quantity + list[i].ypUnitName +
             '</td>';
         if (i + 1 < list.length) {
-            tr += '<td style="width: 160px; font-size: 14px;">' + list[i + 1].drugName +
+            tr += '<td style="width: 160px; font-size: 14px;">' + list[i + 1].drugName + (list[i].instructionText == null || list[i].instructionText === '' ? '' : '【' + list[i].instructionText + '】') +
                 '</td>' +
                 '<td style="width: 40px;text-align: right; font-size: 14px;">' + list[i + 1].specification +
                 '</td>' +

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

@@ -2447,14 +2447,14 @@ function getZyPrintHtml(list) {
     let tr = '';
     for (let i = 0; i < list.length;) {
         tr += '<tr class="sjh">' +
-            '<td style="width: 160px; font-size: 14px;">' + list[i].drugName +
+            '<td style="width: 160px; font-size: 14px;">' + list[i].drugName + (list[i].instructionText == null || list[i].instructionText === '' ? '' : '【' + list[i].instructionText + '】') +
             '</td>' +
             '<td style="width: 40px;text-align: right; font-size: 14px;">' + list[i].specification +
             '</td>' +
             '<td style="width: 25px;text-align: right;border-right: 1px solid black; font-size: 14px;">' + list[i].quantity + list[i].ypUnitName +
             '</td>';
         if (i + 1 < list.length) {
-            tr += '<td style="width: 160px; font-size: 14px;">' + list[i + 1].drugName +
+            tr += '<td style="width: 160px; font-size: 14px;">' + list[i + 1].drugName + (list[i].instructionText == null || list[i].instructionText === '' ? '' : '【' + list[i].instructionText + '】') +
                 '</td>' +
                 '<td style="width: 40px;text-align: right; font-size: 14px;">' + list[i + 1].specification +
                 '</td>' +