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

门诊西药房配药单打印等优化

See merge request lihong/thmz_system!85

src/main/java/cn/hnthyy/thmz/controller/mz/MzPharmacyController.java

@@ -900,6 +900,7 @@ public class MzPharmacyController {
                     map.put("specification", ypZdDict.getSpecification());//规格
                     map.put("drugFlag", ypZdDict.getDrugFlag());//毒麻标志
                     map.put("psFlag", ypZdDict.getPsFlag());//是否需要皮试
+                    map.put("packRetprice", ypZdDict.getPackRetprice());//药品零售价
                     YpBaseYf ypBaseYf = ypBaseYfService.queryYpBaseYf(chargeDetail.getChargeItemCode(), chargeDetail.getSerial(), chargeDetail.getGroupNo());
                     map.put("location",ypBaseYf.getLocation()==null?"":ypBaseYf.getLocation());
                     String manufactoryName = ypZdManufactoryService.queryYpZdManufactoryByCode(ypZdDict.getManuCode());

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

@@ -31,6 +31,7 @@ public interface YzActOrderCyMapper {
                     "  quantity_dj," +
                     "  charge_date," +
                     "  input_date," +
+                    "  submit_date," +
                     "  ward_code, " +
                     "  cy_mtjs," +
                     "  cy_jsl," +
@@ -61,10 +62,10 @@ public interface YzActOrderCyMapper {
                     " and a.status_flag in (${statusFlag}) ",
                     "</when>",
                     "<when test='beginDate!=null'>",
-                    " and a.input_date &gt;=#{beginDate,jdbcType=TIMESTAMP}",
+                    " and a.submit_date &gt;=#{beginDate,jdbcType=TIMESTAMP} ",
                     "</when>",
                     "<when test='endDate!=null'>",
-                    " and a.input_date &lt;=#{endDate,jdbcType=TIMESTAMP}",
+                    " and a.submit_date &lt;=#{endDate,jdbcType=TIMESTAMP} ",
                     "</when>" +
                     " order by a.input_date desc "
             , "</script>"})

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

@@ -526,6 +526,17 @@ function initColumns() {
         }
     }, {
         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: 'submitDate',
         title: '提交时间',
         align: "center",
         valign: 'middle',

src/main/resources/static/js/yk/drug_info.js

@@ -41,6 +41,9 @@ $(function () {
             formObject[item.name] = item.value;
         });
         formObject.groupNo = groupYk
+        if((formObject.ybFlagNew === 'a' || formObject.ybFlagNew === 'b') && formObject.selfFlagYb === '1'){
+            return errorMesageSimaple("医保甲类/乙类药品不能勾选医保自费，请检查！");
+        }
         if(validator.checkAll($("#dataForm")) && formValidator(formObject)){
             request({
                 url: '/saveYpZdDict',