'发药药房初始化'

src/main/java/cn/hnthyy/thmz/service/impl/his/yp/YpZdGroupNameServiceImpl.java

@@ -66,21 +66,21 @@ public class YpZdGroupNameServiceImpl implements YpZdGroupNameService {
 
     @Override
     public List<YpZdGroupNameVo> selectYfAllByTime() {
-        List<YpZdGroupNameVo> resultList = new ArrayList<>();
+//        List<YpZdGroupNameVo> resultList = new ArrayList<>();
         List<YpZdGroupNameVo> list = ypZdGroupNameMapper.selectYfAllByTime();
-        for (YpZdGroupNameVo vo : list) {
-            String startTime = vo.getStartTime();
-            String endTime = vo.getEndTime();
-            if (StrUtil.isBlank(startTime)) {
-                resultList.add(vo);
-                continue;
-            }
-            if (DateUtil.isTimeInRange(
-                    LocalTime.now(), LocalTime.parse(startTime), LocalTime.parse(endTime))) {
-                resultList.add(vo);
-            }
-        }
-        return resultList;
+//        for (YpZdGroupNameVo vo : list) {
+//            String startTime = vo.getStartTime();
+//            String endTime = vo.getEndTime();
+//            if (StrUtil.isBlank(startTime)) {
+//                resultList.add(vo);
+//                continue;
+//            }
+//            if (DateUtil.isTimeInRange(
+//                    LocalTime.now(), LocalTime.parse(startTime), LocalTime.parse(endTime))) {
+//                resultList.add(vo);
+//            }
+//        }
+        return list;
     }
 
     /**

src/main/resources/static/js/common/pharmacy-com.js

@@ -49,7 +49,7 @@ function saveCellData($table, index, field, value) {
 /**
  * 初始化下拉列表
  */
-function initDynamicSelect(url, id, codeColumn, nameColumn) {
+function initDynamicSelect(url, id, codeColumn, nameColumn,callback) {
     codeColumn = codeColumn==null?'code':codeColumn;
     nameColumn = nameColumn==null?'name':nameColumn;
     $.ajax({
@@ -70,6 +70,9 @@ function initDynamicSelect(url, id, codeColumn, nameColumn) {
             $('#' + id).empty();
             $('#' + id).html(html);
             $('#' + id).selectpicker('refresh');
+            if (callback && typeof callback === 'function') {
+                callback();
+            }
         }
     });
 }

src/main/resources/static/js/fy_config.js

@@ -8,7 +8,11 @@ $(function (){
     });
 
     // 查询药房信息
-    initDynamicSelect("selectYfAllByTime", "groupNo", "groupNo", "groupName");
+    initDynamicSelect("selectYfAllByTime", "groupNo", "groupNo", "groupName", function (){
+        $('#groupNo').selectpicker('val', getLocalStorage("groupNo"));
+        $('#groupNo').selectpicker('refresh');
+    });
+
     // 查询药库信息
     initDynamicSelect("selectYkAll", "groupYk", "groupNo", "groupName");
 
@@ -16,6 +20,20 @@ $(function (){
     // 根据药房查询药房发药窗口
     initDynamicSelectByParam("selectWinNoByGroupNo", "winNo", no, "winNo", "winName");
 
+    $(document).ready(function() {
+        // 值改变时触发
+        $('#groupNo').on('change', function() {
+            if ($(this).val() !== getLocalStorage("groupNo")) {
+                handleGroupNoChange($(this).val());
+            }
+        });
+    });
+
+    function handleGroupNoChange(value) {
+        // 根据药房查询药房发药窗口
+        initDynamicSelectByParam("selectWinNoByGroupNo", "winNo", value, "winNo", "winName");
+    }
+
     //延迟触发列表加载，因为一开始打印程序还没有加载成功
     setTimeout('createPrinterList()',500);
     delay(getLastDispensingWindowsByCurrentUser);