药房药品模糊查询显示条数加大，调整时间选择框

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

@@ -122,7 +122,7 @@ public interface YpBaseYfMapper {
      * @param groupNo
      * @return
      */
-    @Select("  SELECT top 10 a.charge_code,   " +
+    @Select("  SELECT top 30 a.charge_code,   " +
             "         a.serial,   " +
             "         a.stock_amount,   " +
             "         a.pack_retprice,   " +

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

@@ -117,7 +117,7 @@ public interface YpInPlanMapper {
      */
     @Select("<script>" +
             "SELECT TOP" +
-            " 10 * " +
+            " 30 * " +
             " FROM" +
             " (" +
             " SELECT DISTINCT" +

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

@@ -50,7 +50,7 @@ public interface YpZdDictMapper {
      * @param searchTextDrug
      * @return
      */
-    @Select("select top 10 * from (SELECT distinct a.code," +
+    @Select("select top 30 * from (SELECT distinct a.code," +
             "                a.serial," +
             "                a.name," +
             "                a.pack_size," +
@@ -67,6 +67,6 @@ public interface YpZdDictMapper {
             "  b.charge_code = #{searchTextDrug} or" +
             "  b.print_name like '${searchTextDrug}%' or a.name like '${searchTextDrug}%') and" +
             "    a.code=b.charge_code and" +
-            "    a.code=c.charge_code)cc")
+            "    a.code=c.charge_code)cc order by del_flag")
     List<YpZdDict> selectYpBySearchText(@Param("searchTextDrug") String searchTextDrug);
 }

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

@@ -1034,6 +1034,8 @@ function cleanParams() {
     $("#patientId_or_cardNo").val(null);
     $("#patientId").val(null);
     $("#realNoSearch").val(null);
+    $("#unitCode").html('');
+    $("#unitCode").selectpicker('refresh');
     var sendRefundGroup = getIndex("send_refund_group");
     sendRefundGroup == 0 ? $("#confirmFlagSearch").selectpicker('val', 0) : $("#confirmFlagSearch").selectpicker('val', 2);
     $("#confirmFlagSearch").selectpicker('refresh');

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

@@ -143,7 +143,10 @@ function showDrugPopover() {
                 field: 'stockAmount',
                 title: '药库库存',
                 align: "center",
-                valign: 'middle'
+                valign: 'middle',
+                formatter: function (value, row, index) {
+                    return keepTwoDecimal(value);
+                }
             }
         ],
         responseHandler: function (res) {

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

@@ -293,6 +293,8 @@ function cleanParams() {
     $('#jmtj_table').hide();
     $('.sjh').remove();
     $('#drugFlagSearch').selectpicker('refresh');
+    $("#unitCodeSearch").html('');
+    $("#unitCodeSearch").selectpicker('refresh');
     $('#searchTextDrug').empty();
     $('#codeSearch').empty();
     $('#serialSearch').empty();
@@ -356,7 +358,7 @@ function init_daterangepickertime() {
         startDate: moment().subtract(1, 'days').format("YYYY-MM-DD 14:00:00"),
         endDate: moment().format("YYYY-MM-DD 13:59:59"),
         minDate: '2012-01-01',
-        maxDate: nowString(),
+        maxDate: nowString()+' 23:59:59',
         dateLimit: {
             days: 1200
         },