eight
2024-09-01 ed7ebfc37e525b4f52926e499cf0bec98f5e5bed
update
已修改10个文件
42 ■■■■ 文件已修改
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedCloseCallable.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedDoctorNextPatientCallable.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedDoctorOffCallable.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedDoctorOnCallable.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedDoctorPauseCallable.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedDoctorResumeCallable.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedOpenCallable.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedReloadCallable.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedCloseCallable.java
@@ -19,7 +19,10 @@
    }
    public ErrorCode call() throws Exception {
        return queueService.bedClose(roomId, bedNo);
        ErrorCode ec = queueService.bedClose(roomId, bedNo);
        queueService.monitorInfo();
        return ec;
    }
}
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedDoctorNextPatientCallable.java
@@ -25,6 +25,7 @@
            queueService.hurryup();
        }
        queueService.monitorInfo();
        return ec;
    }
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedDoctorOffCallable.java
@@ -23,7 +23,10 @@
    }
    public ErrorCode call() throws Exception {
        return queueService.bedDoctorOff(roomId, bedNo, docId, docName);
        ErrorCode ec = queueService.bedDoctorOff(roomId, bedNo, docId, docName);
        queueService.monitorInfo();
        return ec;
    }
}
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedDoctorOnCallable.java
@@ -23,7 +23,10 @@
    }
    public ErrorCode call() throws Exception {
        return queueService.bedDoctorOn(roomId, bedNo, docId, docName);
        ErrorCode ec = queueService.bedDoctorOn(roomId, bedNo, docId, docName);
        queueService.monitorInfo();
        return ec;
    }
}
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedDoctorPauseCallable.java
@@ -23,7 +23,10 @@
    }
    public ErrorCode call() throws Exception {
        return queueService.bedDoctorPause(roomId, bedNo, docId, docName);
        ErrorCode ec = queueService.bedDoctorPause(roomId, bedNo, docId, docName);
        queueService.monitorInfo();
        return ec;
    }
}
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedDoctorResumeCallable.java
@@ -29,6 +29,7 @@
            queueService.hurryup();
        }
        queueService.monitorInfo();
        return ec;
    }
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedOpenCallable.java
@@ -25,6 +25,7 @@
            queueService.hurryup();
        }
        queueService.monitorInfo();
        return ec;
    }
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedReloadCallable.java
@@ -15,7 +15,10 @@
    }
    public ErrorCode call() throws Exception {
        return queueService.bedReload();
        ErrorCode ec = queueService.bedReload();
        queueService.monitorInfo();
        return ec;
    }
}
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueService.java
@@ -113,4 +113,6 @@
    Integer recallPatient(Long roomId, String bedNo, String patId);
    Integer patientJump(String patId, Byte jumped );
    void monitorInfo();
}
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java
@@ -484,12 +484,6 @@
        if (0 == openingFlag.get())
            return;
        // TODO
        log.info("map " + mapBedVsQueue.size() + " priority " + priorityQueue.size());
        if (mapBedVsQueue.size() != priorityQueue.size()) {
            log.error("map " + mapBedVsQueue.size() + " priority " + priorityQueue.size());
        }
        // 处理 过号-回来 的人
        for (BedQueueBO bedQueueBO : mapBedVsQueue.values()) {
            while (bedQueueBO.queueNum.get() < bedQueueBO.maxQueueNum) {
@@ -693,6 +687,12 @@
        return updateNum;
    }
    @Override
    public void monitorInfo() {
        log.info("map " + mapBedVsQueue.size() + " priority " + priorityQueue.size()
                 + " opening " + openingFlag.get());
    }
    private void startHurryUp() {
        singleThreadExecutor.execute( () -> {
            hurryup();