Merge branch 'dev-1.1.4' of https://172.16.32.165/hurugang/thmz_system into dev-1.1.4

src/main/java/cn/hnthyy/thmz/mapper/his/yp/YpConfigMapper.java

@@ -10,7 +10,7 @@ public interface YpConfigMapper {
      * @return
      */
     @Select("select item_no,yf_plan_no,yf_out_no,yk_plan_no,yk_out_no, rtrim(rejust_type) rejust_type,rtrim(yp_in_type) yp_in_type,rtrim(mzyp_mini) mzyp_mini," +
-            "cf_rows,yf_fy_no,yk_in_no,reajust_no,yf_in_no,yf_sx_amount,rtrim(update_pack_size_flag) update_pack_size_flag,rtrim(open_stock_virtual2) open_stock_virtual2  from yp_config WITH(NOLOCK) ")
+            "cf_rows,yf_fy_no,yk_in_no,reajust_no,yf_in_no,yf_sx_amount,rtrim(update_pack_size_flag) update_pack_size_flag,rtrim(open_stock_virtual2) open_stock_virtual2  from yp_config WITH (TABLOCKX) ")
     YpConfig selectYpConfig();
 
 

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

@@ -1657,8 +1657,8 @@ function printLabelKf(datas,LODOP) {
         $("#ypbq_specification").attr("value",(data['specification']));
         $("#ypbq_quantity").attr("value",(data['amount']));
         $("#ypbq_printName").attr("value",(data['supplyName']));
-        $("#ypbq_comm").attr("value",(data['comm']));
-        $("#ypbq_instructionText").attr("value",(data['instruction']));
+        $("#ypbq_dose").attr("value",data['dose']+data['doseUnit']);
+        $("#ypbq_instructionText").html(data['instruction']);
         $("#dataTime").attr("value",(formatDate(new Date())));
         LODOP.ADD_PRINT_HTM("5mm", "2mm", "80mm", "60mm", $("div[id='print_view_bq']").html());
         LODOP.NewPageA();

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

@@ -213,7 +213,10 @@ function initTbAdd() {
         colNames: ['货位号','编码','药品名称','规格','单价', '账存数量', '实盘数量', '盈亏数量', '盈亏金额','盘点单号','盘点时间', '生产厂商','序号','药房编码','拼音编码'],
         colModel: [
             {name: 'location', index: 'location',align:'center',width:100,classes:'exclHide', searchoptions:{sopt:['cn','eq','ne','lt','le','gt','ge','nc']}},
-            {name: 'chargeCode', index: 'chargeCode',align:'center',width:100, searchoptions:{sopt:['cn','eq','nc']}},
+            {name: 'chargeCode', index: 'chargeCode',align:'center',width:100, searchoptions:{sopt:['cn','eq','nc']},
+                formatter:function(cellvalue, options, rowObject){
+                    return ' '+cellvalue;
+                }},
             {name: 'name', index: 'name',align:'left',width:180, searchoptions:{sopt:['cn','eq','nc']}},
             {name: 'specification', index: 'specification',width:140, searchoptions:{sopt:['cn','eq','nc']}},
             {name: 'packRetprice', index: 'packRetprice',align:'center',width:100, searchoptions:{sopt:['eq','ne','lt','le','gt','ge']},classes:'exclHide'},
@@ -401,7 +404,7 @@ function getTbAddRecordPrintData(drawNo) {
                     }
                     html += '<tr class="sjh">';
                     html += '<td class="xtd" style="text-align: center;">' + data.location + '</td>';
-                    html += '<td class="xtd" style="text-align: center;">' + data.chargeCode + '</td>';
+                    html += '<td class="xtd" style="text-align: center;">&nbsp;' + data.chargeCode + '</td>';
                     html += '<td style="text-align: left;">' + data.name + '</td>';
                     html += '<td style="text-align: left;">' + data.specification + '</td>';
                     html += '<td class="xtd" style="text-align: center;">' + data.packRetprice + '</td>';

src/main/resources/templates/yf/ward_prescription.html

@@ -397,19 +397,21 @@
                         <input style="margin-bottom:3px;border: 0px;width: 20px;background-color: white;color: black;text-align: right"
                                disabled value="" id="ypbq_quantity"/>
                         <br/>
-                        <span style="margin-bottom:3px;">用法用量:</span>
+                        <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"/>
-                        <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;"
-                               disabled value="" id="ypbq_instructionText"/>
+                        <span style="margin-bottom:3px;margin-left: 5px;">单次剂量:</span>
+                        <input style="margin-bottom:3px;border: 0px;width: 50px;background-color: white;color: black;text-align: right"
+                               disabled value="" id="ypbq_dose"/>
                         <br/>
+                        <label style="margin-bottom:3px;vertical-align:top;">嘱&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;托:</label>
+                        <textarea cols="25" rows="3"
+                                  style="overflow:hidden;margin-bottom:3px;border: 0px;background-color: white;color: black;vertical-align:top;"
+                                  disabled id="ypbq_instructionText"></textarea>
+                        <!--<br/>
                         <input style="margin-bottom:3px;border: 0px;width: 130px;background-color: white;color: black;"
                                disabled value="" id="dataTime"/>
-                        <br/>
+                        <br/>-->
                     </form>
                 </div>
                 <!--药品标签打印结束-->