'发药记录统计新增筛选大小包装'

src/main/java/cn/hnthyy/thmz/controller/yf/YfSpiritAnestheticPrintController.java

@@ -38,7 +38,7 @@ public class YfSpiritAnestheticPrintController {
     @RequestMapping(value = "/getSpiritAnestheticPrint",method = {RequestMethod.GET,RequestMethod.POST})
     public Map<String,Object> getSpiritAnestheticPrint(@RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate,
                                                        @RequestParam("chargeItemCode") String chargeItemCode, @RequestParam("unitCode") String unitCode,
-                                                       @RequestParam("drugFlags[]") String[] drugFlags, @RequestParam("queryScope") Integer queryScope){
+                                                       @RequestParam("drugFlags[]") String[] drugFlags, @RequestParam("queryScope") Integer queryScope, @RequestParam("serial") String serial){
         Map<String, Object> resultMap = new HashMap<>();
         try {
             if(StringUtils.isBlank(chargeItemCode)){
@@ -47,13 +47,16 @@ public class YfSpiritAnestheticPrintController {
             if(StringUtils.isBlank(unitCode)){
                 unitCode = null;
             }
+            if(StringUtils.isBlank(serial)){
+                serial = null;
+            }
             List<MzSendMedicineVo> sendMedicineVos = new ArrayList<>();
             if(queryScope == 1 || queryScope == 0){
-                List<MzSendMedicineVo> mzSendMedicineVos = yfSpiritAnestheticPrintService.queryMzSpiritAnestheticPrint(beginDate, endDate, chargeItemCode, unitCode, drugFlags);
+                List<MzSendMedicineVo> mzSendMedicineVos = yfSpiritAnestheticPrintService.queryMzSpiritAnestheticPrint(beginDate, endDate, chargeItemCode, unitCode, drugFlags, serial);
                 sendMedicineVos.addAll(mzSendMedicineVos);
             }
             if(queryScope == 2 || queryScope == 0){
-                List<MzSendMedicineVo> zySendMedicineVos = yfSpiritAnestheticPrintService.queryZySpiritAnestheticPrint(beginDate, endDate, chargeItemCode, unitCode, drugFlags);
+                List<MzSendMedicineVo> zySendMedicineVos = yfSpiritAnestheticPrintService.queryZySpiritAnestheticPrint(beginDate, endDate, chargeItemCode, unitCode, drugFlags, serial);
                 sendMedicineVos.addAll(zySendMedicineVos);
             }
             sendMedicineVos.forEach(mzSendMedicineVo -> {

src/main/java/cn/hnthyy/thmz/mapper/his/yf/YfSpiritAnestheticPrintMapper.java

@@ -53,13 +53,16 @@ public interface YfSpiritAnestheticPrintMapper {
             "       <when test='unitCode!=null'>"+
             "       a.warn_dept=#{unitCode} and" +
             "       </when>"+
+            "       <when test='serial!=null'>"+
+            "       a.serial=#{serial} and" +
+            "       </when>"+
             "       a.confirm_time<![CDATA[>=]]>#{beginDate} and" +
             "       a.confirm_time<![CDATA[<=]]>#{endDate}" +
             "       order by charge_item_code asc",
     "</script>"})
     List<MzSendMedicineVo> selectMzSpiritAnestheticPrint(@Param("beginDate") String beginDate,@Param("endDate") String endDate,
                                                          @Param("chargeItemCode") String chargeItemCode,@Param("unitCode") String unitCode,
-                                                         @Param("drugFlags") String[] drugFlags);
+                                                         @Param("drugFlags") String[] drugFlags, @Param("serial") String serial);
 
     /**
      * 统计住院药品
@@ -104,12 +107,15 @@ public interface YfSpiritAnestheticPrintMapper {
             "       <when test='unitCode!=null'>"+
             "       a.dept_code=#{unitCode} and" +
             "       </when>"+
+            "       <when test='serial!=null'>"+
+            "       a.serial=#{serial} and" +
+            "       </when>"+
             "       a.confirm_time <![CDATA[>=]]>#{beginDate} and" +
             "       a.confirm_time <![CDATA[<=]]>#{endDate} " +
             "       order by charge_code asc",
     "</script>"})
     List<MzSendMedicineVo> selectZySpiritAnestheticPrint(@Param("beginDate") String beginDate,@Param("endDate") String endDate,
-                                                        @Param("chargeItemCode") String chargeItemCode,@Param("unitCode") String unitCode,@Param("drugFlags") String[] drugFlags);
+                                                        @Param("chargeItemCode") String chargeItemCode,@Param("unitCode") String unitCode,@Param("drugFlags") String[] drugFlags, @Param("serial") String serial);
 
 
     /**

src/main/java/cn/hnthyy/thmz/service/his/yf/YfSpiritAnestheticPrintService.java

@@ -22,7 +22,7 @@ public interface YfSpiritAnestheticPrintService {
      * @return
      */
     List<MzSendMedicineVo> queryMzSpiritAnestheticPrint(String beginDate, String endDate,
-                                                         String chargeItemCode, String unitCode, String[] drugFlags);
+                                                         String chargeItemCode, String unitCode, String[] drugFlags, String serial);
 
     /**
      * 统计门诊药品
@@ -34,7 +34,7 @@ public interface YfSpiritAnestheticPrintService {
      * @return
      */
     List<MzSendMedicineVo> queryZySpiritAnestheticPrint(String beginDate, String endDate,
-                                                         String chargeItemCode, String unitCode, String[] drugFlags);
+                                                         String chargeItemCode, String unitCode, String[] drugFlags, String serial);
     /**
      * 查询发药记录
      * @param sendDrugRecordVo

src/main/java/cn/hnthyy/thmz/service/impl/his/yf/YfSpiritAnestheticPrintServiceImpl.java

@@ -57,8 +57,8 @@ public class YfSpiritAnestheticPrintServiceImpl implements YfSpiritAnestheticPri
     private MzVisitTableService mzVisitTableService;
 
     @Override
-    public List<MzSendMedicineVo> queryMzSpiritAnestheticPrint(String beginDate, String endDate, String chargeItemCode, String unitCode, String[] drugFlags) {
-        List<MzSendMedicineVo> mzSendMedicineVos = yfSpiritAnestheticPrintMapper.selectMzSpiritAnestheticPrint(beginDate, endDate, chargeItemCode, unitCode, drugFlags);
+    public List<MzSendMedicineVo> queryMzSpiritAnestheticPrint(String beginDate, String endDate, String chargeItemCode, String unitCode, String[] drugFlags, String serial) {
+        List<MzSendMedicineVo> mzSendMedicineVos = yfSpiritAnestheticPrintMapper.selectMzSpiritAnestheticPrint(beginDate, endDate, chargeItemCode, unitCode, drugFlags, serial);
         mzSendMedicineVos.stream().forEach(mzSendMedicineVo -> {
             MzVisitTable mzVisitTable = mzVisitTableService.queryByPatientIdAndTimes(mzSendMedicineVo.getPatientId(), mzSendMedicineVo.getTimes());
             String icdText = StringUtils.isBlank(mzVisitTable.getIcdText())?"":mzVisitTable.getIcdText();
@@ -72,8 +72,8 @@ public class YfSpiritAnestheticPrintServiceImpl implements YfSpiritAnestheticPri
     }
 
     @Override
-    public List<MzSendMedicineVo> queryZySpiritAnestheticPrint(String beginDate, String endDate, String chargeItemCode, String unitCode, String[] drugFlags) {
-        return yfSpiritAnestheticPrintMapper.selectZySpiritAnestheticPrint(beginDate, endDate, chargeItemCode, unitCode, drugFlags);
+    public List<MzSendMedicineVo> queryZySpiritAnestheticPrint(String beginDate, String endDate, String chargeItemCode, String unitCode, String[] drugFlags, String serial) {
+        return yfSpiritAnestheticPrintMapper.selectZySpiritAnestheticPrint(beginDate, endDate, chargeItemCode, unitCode, drugFlags, serial);
     }
 
     @Override

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

@@ -197,7 +197,7 @@ function getSendDrugRecordData() {
             'beginDate': getRePortRangeArr()[0],
             'endDate': getRePortRangeArr()[1],
             'chargeCode': $('#codeSearch').val() == '' ? null : $('#codeSearch').val(),
-            'serial': $('#serialSearch').val() == '' ? null : $('#serialSearch').val(),
+            'serial': $('#serialSearch').val() == '' || $('#serialSearch').val() === '0' ? null : $('#serialSearch').val(),
             'warnDept': $('#unitCodeSearch').val() != null ? $('#unitCodeSearch').val()[0] : null,
             'queryScope': $("#queryScopeSearch").val()
         }),
@@ -328,7 +328,8 @@ function cleanParams() {
     $("#unitCodeSearch").selectpicker('refresh');
     $('#searchTextDrug').empty();
     $('#codeSearch').empty();
-    $('#serialSearch').empty();
+    $('#serialSearch').val(0);
+    $('#serialSearch').selectpicker('refresh');
 }
 
 /**
@@ -376,7 +377,8 @@ function queryParams() {
         chargeItemCode: $('#codeSearch').val(),
         unitCode: $('#unitCodeSearch').val() != null ? $('#unitCodeSearch').val()[0] : '',
         drugFlags: drugFlags,
-        queryScope: $("#queryScopeSearch").val()
+        queryScope: $("#queryScopeSearch").val(),
+        serial: $('#serialSearch').val() == '' || $('#serialSearch').val() === '0' ? null : $('#serialSearch').val()
     };
     return temp;
 }

src/main/resources/templates/yf/spirit_anesthetic_print.html

@@ -25,7 +25,7 @@
             <div class="panel-body">
                 <form id="formSearch" class="form-horizontal" autocomplete="off" onsubmit="return false;">
                     <input type="hidden" id="codeSearch">
-                    <input type="hidden" id="serialSearch">
+<!--                    <input type="hidden" id="serialSearch">-->
                     <div class="form-group col-md-12 col-sm-12 col-xs-12">
                         <div class="col-md-3 col-sm-3 col-xs-12">
                             <label class="control-label col-md-4 col-sm-4 col-xs-12"
@@ -59,6 +59,16 @@
                         </div>
                     </div>
                     <div class="form-group col-md-12 col-sm-12 col-xs-12">
+                        <label class="control-label col-md-1 col-sm-1 col-xs-12" for="serialSearch">药品包装
+                        </label>
+                        <div class="col-md-2 col-sm-2 col-xs-12">
+                            <select class="form-control selectpicker show-tick" required="required" title="请选择"
+                                    id="serialSearch">
+                                <option value="0" selected>全部</option>
+                                <option value="01">小包装</option>
+                                <option value="99">大包装</option>
+                            </select>
+                        </div>
                         <div class="col-md-3 col-sm-3 col-xs-12">
                             <label class="control-label col-md-4 col-sm-4 col-xs-12"
                                    for="drugFlagSearch">药品类型</label>