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

门诊西药房口服药单标签打印格式变化

See merge request lihong/thmz_system!76

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

@@ -1018,20 +1018,22 @@ function xyfdy(res) {
             $("#ypbq_sex").attr("value", getSex(drugs[0].sex));
             $("#ypbq_age").attr("value", age);
             $("#NO").attr("value", j + 1 + "/" + drugs.length);
+            //用法
+            let yf = drugs[j].printName + ',';
             if (drugs[j].drugUnitName == '粒' || drugs[j].drugUnitName == '片' || drugs[j].drugUnitName == '支' || drugs[j].drugUnitName == '袋' || drugs[j].drugUnitName == '包') {
-                $("#ypbq_comm").attr("value", drugs[j].comm + ',每次' + (drugs[j].drugQuan == 0.5 ? '半' : drugs[j].drugQuan) + drugs[j].drugUnitName);
+                $("#ypbq_comm").text("value", yf + drugs[j].comm + ',每次' + (drugs[j].drugQuan == 0.5 ? '半' : drugs[j].drugQuan) + drugs[j].drugUnitName);
             } else if ((drugs[j].weight == null && drugs[j].volum == null) || (drugs[j].weight != null && drugs[j].volum != null)) {
-                $("#ypbq_comm").attr("value", drugs[j].comm + ',每次' + drugs[j].drugQuan + drugs[j].drugUnitName);
+                $("#ypbq_comm").attr("value", yf + drugs[j].comm + ',每次' + drugs[j].drugQuan + drugs[j].drugUnitName);
             } else {
                 let weight = (drugs[j].weight == '' || drugs[j].weight == null) ? drugs[j].volum : drugs[j].weight;
                 var drugQuan = (drugs[j].drugQuan / weight).toFixed(2);
                 if (drugQuan == 0.5) {
-                    $("#ypbq_comm").attr("value", drugs[j].comm + ',每次半' + drugs[j].miniUnitName);
+                    $("#ypbq_comm").attr("value", yf + drugs[j].comm + ',每次半' + drugs[j].miniUnitName);
                 } else if (drugQuan < 1) {
-                    $("#ypbq_comm").attr("value", drugs[j].comm + ',每次' + drugs[j].drugQuan + drugs[j].drugUnitName);
+                    $("#ypbq_comm").attr("value", yf + drugs[j].comm + ',每次' + drugs[j].drugQuan + drugs[j].drugUnitName);
                 } else {
                     drugQuan = Math.round(drugQuan * 100) / 100;
-                    $("#ypbq_comm").attr("value", drugs[j].comm + ',每次' + drugQuan + drugs[j].miniUnitName);
+                    $("#ypbq_comm").attr("value", yf + drugs[j].comm + ',每次' + drugQuan + drugs[j].miniUnitName);
                 }
             }
             LODOP.ADD_PRINT_HTM("5mm", "2mm", "80mm", "60mm", $("div[id='print_view_bq']").html());

src/main/resources/templates/mz/west_pharmacy_send.html

@@ -217,18 +217,18 @@
                     <!--注射单打印结束-->
                     <!--药品标签打印开始-->
                     <div id="print_view_bq">
-                        <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                            <span style="font-size:18px;font-weight: 700;">门诊</span>
-                            患者药品标签&nbsp;&nbsp;
-                            <input style="margin-bottom:3px;border: 0px;width: 30px;background-color: white;color: black;" disabled
-                                   value="" id="NO"/>
-                        </span>
+<!--                        <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-->
+<!--                            <span style="font-size:18px;font-weight: 700;">门诊</span>-->
+<!--                            患者药品标签&nbsp;&nbsp;-->
+<!--                            <input style="margin-bottom:3px;border: 0px;width: 30px;background-color: white;color: black;" disabled-->
+<!--                                   value="" id="NO"/>-->
+<!--                        </span>-->
                         <form style="font-size: 15px;">
                             <span style="margin-bottom:3px;">患者姓名:</span>
                             <input style="margin-bottom:3px;border: 0px;width: 60px;background-color: white;color: black;" disabled
                                    value="" id="ypbq_name"/>
                             <span style="margin-left: 5px;">ID号:</span>
-                            <input style="margin-bottom:3px;border: 0px;width: 70px;background-color: white;color: black;" disabled
+                            <input style="margin-bottom:3px;border: 0px;width: 80px;background-color: white;color: black;" disabled
                                    value="" id="ypbq_patientId"/>
                             <br/>
                             <span style="margin-bottom:3px;">性&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;别:</span>
@@ -251,10 +251,8 @@
                                    disabled value="" id="ypbq_ypUnitName"/>
                             <br/>
                             <span style="margin-bottom:3px;">用法用量:</span>
-                            <input style="margin-bottom:3px;border: 0px;width: 60px;background-color: white;color: black;"
-                                   disabled value="" id="ypbq_printName"/>
-                            <input style="margin-bottom:3px;border: 0px;width: 150px;background-color: white;color: black;"
-                                   disabled value="" id="ypbq_comm"/>
+                            <input style="margin-bottom: 3px;width: 210px;background-color: white;color: black;border: 1px solid black;font-weight: bold !important; font-size: 16px !important;"
+                                   disabled id="ypbq_comm"/>
                             <br/>
                             <span style="margin-bottom:3px;">嘱&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;托:</span>
                             <input style="margin-bottom:3px;border: 0px;width: 180px;background-color: white;color: black;"