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

有效期打印优化

See merge request lihong/thmz_system!65

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

@@ -673,7 +673,7 @@ public interface YpInDetlMapper {
             "</script>")
     List<Map<String,Object>> selectDrugClassInMoneyCount(Map map);
 
-    @Select(" select min(eff_date) as effDate from yp_in_detl where charge_code = #{chargeCode} and current_stock > 0 ")
+    @Select(" select min(eff_date) as effDate from yp_in_detl where charge_code = #{chargeCode} and current_stock >= 1 ")
     String selectEffDateByCode(@Param("chargeCode") String chargeCode);
 
     @Select(" select max(eff_date) as effDate from yp_in_detl where charge_code = #{chargeCode} and current_stock = 0 ")

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

@@ -1671,9 +1671,7 @@ function printLabel(datas, isMx) {
                     $(".dose").text(data.dose + data.doseUnit);
                     $(".dosage").text(data.dosage.replace(".0", ""));
                     $(".instruction").text(data.instruction);
-                    if(pageClass == 6){
-                        $(".effDate").text(format(data.effDate, "yyyy/MM/dd"));
-                    }
+                    $(".effDate").text(format(data.effDate, "yyyy/MM/dd"));
                     LODOP.ADD_PRINT_HTM("1mm", "3mm", "RightMargin:1mm", "BottomMargin:3mm", strStyle + document.getElementById("bqdy_table_div").innerHTML);
                     LODOP.NewPageA();
                     break;