拼贴改分类

src/main/java/thyyxxk/webserver/dao/his/inpatient/nursemodule/PrintInfusionCardDao.java

@@ -119,7 +119,7 @@ public interface PrintInfusionCardDao {
             "where b.ward_code=#{wardCode} ${alwaysFlag} " +
             "and b.occ_time>=#{startTime} and b.occ_time<=#{endTime} ${printComment} " +
             "and isnull(b.status_flag,'')!='d' and d.dept=#{wardCode} and d.ward=#{wardCode} " +
-            "and a.status_flag>'1' and a.supply_code=e.supply_code and e.class='2' " +
+            "and a.status_flag>'1' and a.supply_code=e.supply_code and e.class=#{bottleCardType} " +
             "and e.pring_flag='1' and isnull(a.parent_no,0)=0 and a.inpatient_no=d.inpatient_no " +
             "and a.admiss_times=d.admiss_times and a.frequ_code=c.code and a.act_order_no=b.act_order_no " +
             "and b.bed_no in (${bedNos})")

src/main/java/thyyxxk/webserver/entity/inpatient/nursemodule/request/InfusionInsert.java

@@ -10,5 +10,5 @@ public class InfusionInsert {
     private String bedNos;
     private String startTime;
     private String endTime;
-    private String classCode;
+    private String bottleCardType;
 }

src/main/java/thyyxxk/webserver/entity/inpatient/nursemodule/request/QueryInfusionCard.java

@@ -12,4 +12,5 @@ public class QueryInfusionCard {
     private Frequency frequency;
     private PrintRange printRange;
     private CardType cardType;
+    private String bottleCardType;
 }

src/main/java/thyyxxk/webserver/entity/orderZdMaintain/enums/SupplyClass.java

@@ -18,8 +18,9 @@ public enum SupplyClass {
     领药非临时(6, "领药(非临时)", "mz"),
     注射(7, "注射", "all"),
     药物治疗(8, "药物治疗", "all"),
-//    雾化(10, "雾化", "all"),
-    其他(9, "其他", "all");
+    其他(9, "其他", "all"),
+    雾化(10, "雾化", "all");
+
 
     private Integer code;
     private String name;

src/main/java/thyyxxk/webserver/service/inpatient/nursemodule/PrintInfusionCardService.java

@@ -182,6 +182,7 @@ public class PrintInfusionCardService {
                 params.getPrintRange().getInfusionLabel() :
                 params.getPrintRange().getBottleLabel();
         insert.setPrintComment(printComment);
+        insert.setBottleCardType(params.getBottleCardType());
         return insert;
     }