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

中药房住院发药增加提交时间

See merge request lihong/thmz_system!55

src/main/java/cn/hnthyy/thmz/mapper/his/yz/YzActOrderCyMapper.java

@@ -30,6 +30,7 @@ public interface YzActOrderCyMapper {
                     "  order_je_dj," +
                     "  quantity_dj," +
                     "  charge_date," +
+                    "  input_date," +
                     "  ward_code, " +
                     "  cy_mtjs," +
                     "  cy_jsl," +
@@ -65,7 +66,7 @@ public interface YzActOrderCyMapper {
                     "<when test='endDate!=null'>",
                     " and a.input_date &lt;=#{endDate,jdbcType=TIMESTAMP}",
                     "</when>" +
-                    " order by ward_code,page_no"
+                    " order by a.input_date desc "
             , "</script>"})
     List<YzActOrderCy> selectYzActOrderCy(YzActOrderCyVo yzActOrderCyVo);
 

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

@@ -498,6 +498,17 @@ function initColumns() {
             }
             return "";
         }
+    },{
+        field: 'inputDate',
+        title: '提交时间',
+        align: "center",
+        valign: 'middle',
+        formatter: function (value, row, index) {
+            if (value != null && value != "") {
+                return format(value, "yyyy-MM-dd HH:mm:ss");
+            }
+            return "";
+        }
     }, {
         field: 'orderName',
         title: '处方名称',