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/yf/YfSpiritAnestheticPrintMapper.java

@@ -227,7 +227,7 @@ public interface YfSpiritAnestheticPrintMapper {
             "       icd_text=isnull(nullif(i.icd_text_new,''), rtrim(i.icd_text))," +
             "       drug_name=d.name," +
             "       abbr_name=e.name," +
-            "       quantity = case when a.serial=d.serial then case when a.receipt_no <![CDATA[<]]> '0' then -abs(a.quantity*cy_fy) else a.quantity*a.cy_fy end else case when a.receipt_no <![CDATA[<]]> '0' then -abs(a.quantity*a.cy_fy/d.pack_size) else a.quantity*a.cy_fy/d.pack_size end end," +
+            "       quantity = case when a.serial=d.serial then case when a.receipt_no <![CDATA[<]]> '0' then -abs(a.quantity*isnull(a.cy_fy,1)) else a.quantity*isnull(a.cy_fy,1) end else case when a.receipt_no <![CDATA[<]]> '0' then -abs(a.quantity*isnull(a.cy_fy,1)/d.pack_size) else a.quantity*isnull(a.cy_fy,1)/d.pack_size end end," +
             "       d.specification," +
             "       charge_date=a.confirm_time," +
             "       employee_name=c.name," +

src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzPharmacyServiceImpl.java

@@ -301,7 +301,8 @@ public class MzPharmacyServiceImpl implements MzPharmacyService {
             Calendar cal = Calendar.getInstance();
             cal.setTime(date);
             cal.add(Calendar.DAY_OF_MONTH, -15);
-            String addTime = DateUtil.fomart(cal.getTime(), "yyyy-MM-dd") + " 00:00:00";
+//            String addTime = DateUtil.fomart(cal.getTime(), "yyyy-MM-dd") + " 00:00:00";
+            String addTime = "2023-04-12 00:00:00";
             List<Map<String, Object>> listAdd = mzPharmacyMapper.selectRadSendStatAdd(addTime, DateUtil.fomart(DateUtil.getPrevDayLastSecond(date), "yyyy-MM-dd HH:mm:ss"));
             if(listAdd.size() > 0){
                 for(Map<String, Object> m1 : listAdd){
@@ -348,7 +349,8 @@ public class MzPharmacyServiceImpl implements MzPharmacyService {
         Calendar cal = Calendar.getInstance();
         cal.setTime(date);
         cal.add(Calendar.DAY_OF_MONTH, -15);
-        String addTime = DateUtil.fomart(cal.getTime(), "yyyy-MM-dd") + " 00:00:00";
+//        String addTime = DateUtil.fomart(cal.getTime(), "yyyy-MM-dd") + " 00:00:00";
+        String addTime = "2023-04-12 00:00:00";
         List<MzChargeDetail> mzChargeDetailsAdd = mzPharmacyMapper.selectRadSendPrescriptionAdd(addTime, DateUtil.fomart(DateUtil.getPrevDayLastSecond(date), "yyyy-MM-dd HH:mm:ss"));
         if(mzChargeDetailsAdd.size() > 0){
             mzChargeDetails.addAll(mzChargeDetailsAdd);

src/main/resources/templates/mz/pharmacy-cell-number.html

@@ -54,6 +54,9 @@
                         <h1 style="line-height: 69px;" id="timeNow"></h1>
                     </div>
                 </div>
+                <div class="col-md-9 col-sm-9 col-xs-12" style="height: 40px; border: 1px solid #fff;">
+                    <span style="color: #DD6D22;line-height: 40px;font-size: 30px; text-line: center;font-weight: 700;">胸痛、卒中、创伤、65岁以上老年人、残障、军人优先</span>
+                </div>
                 <div style="margin-top: 110px;">
                     <table class="table table-striped table-bordered" id="tableList">
                         <tbody>