From fce96ef468291fb9a0e6a4d34ab371315e9485d4 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期六, 03 十月 2026 00:59:44 +0800
Subject: [PATCH] ai优化
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 793 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 491 insertions(+), 302 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
index c74c791..c987e9d 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
@@ -1,50 +1,48 @@
package cn.lihu.jh.module.ecg.service.devrent;
import cn.lihu.jh.framework.common.pojo.CommonResult;
+import cn.lihu.jh.framework.common.pojo.PageResult;
+import cn.lihu.jh.framework.common.util.object.BeanUtils;
import cn.lihu.jh.framework.security.core.util.SecurityFrameworkUtils;
+import cn.lihu.jh.module.ecg.controller.admin.devrent.vo.*;
import cn.lihu.jh.module.ecg.controller.admin.jobrecord.vo.JobRecordSaveReqVO;
import cn.lihu.jh.module.ecg.dal.dataobject.appointment.AppointmentDO;
import cn.lihu.jh.module.ecg.dal.dataobject.checktype.CheckTypeDO;
import cn.lihu.jh.module.ecg.dal.dataobject.devmanage.DeviceDO;
+import cn.lihu.jh.module.ecg.dal.dataobject.devrent.DevRentDO;
import cn.lihu.jh.module.ecg.dal.dataobject.jobrecord.JobRecordDO;
import cn.lihu.jh.module.ecg.dal.dataobject.patient.PatDetails;
import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
import cn.lihu.jh.module.ecg.dal.mysql.appointment.AppointmentMapper;
+import cn.lihu.jh.module.ecg.dal.mysql.checktype.CheckTypeMapper;
import cn.lihu.jh.module.ecg.dal.mysql.devmanage.DeviceMapper;
+import cn.lihu.jh.module.ecg.dal.mysql.devrent.DevRentMapper;
import cn.lihu.jh.module.ecg.dal.mysql.jobrecord.JobRecordMapper;
import cn.lihu.jh.module.ecg.dal.mysql.queue.QueueMapper;
import cn.lihu.jh.module.ecg.enums.DevRentStateEnum;
import cn.lihu.jh.module.ecg.enums.DevStateEnum;
import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
-import cn.lihu.jh.module.ecg.feign.*;
-import cn.lihu.jh.module.ecg.feign.dto.AppointmentExternal;
+import cn.lihu.jh.module.ecg.feign.FeeConfirmFeignService;
import cn.lihu.jh.module.ecg.service.queue.QueueServiceTxFunctions;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import cn.lihu.jh.module.ecg.webservice.WebServiceClient;
+import cn.lihu.jh.module.infra.dal.dataobject.config.ConfigDO;
+import cn.lihu.jh.module.infra.dal.mysql.config.ConfigMapper;
+import cn.lihu.jh.module.infra.service.config.ConfigService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
-import java.io.Console;
+import javax.annotation.Resource;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
-import java.util.Map;
-
-import cn.lihu.jh.module.ecg.controller.admin.devrent.vo.*;
-import cn.lihu.jh.module.ecg.dal.dataobject.devrent.DevRentDO;
-import cn.lihu.jh.framework.common.pojo.PageResult;
-import cn.lihu.jh.framework.common.util.object.BeanUtils;
-
-import cn.lihu.jh.module.ecg.dal.mysql.devrent.DevRentMapper;
-
-import javax.annotation.Resource;
import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.lihu.jh.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-import static cn.lihu.jh.framework.common.util.date.DateUtils.getCurTimeString;
import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*;
/**
@@ -73,7 +71,20 @@
DeviceMapper deviceMapper;
@Resource
+ AppointmentMapper appointmentMapper;
+
+ @Resource
QueueMapper queueMapper;
+
+ @Resource
+ CheckTypeMapper checkTypeMapper;
+
+ @Resource
+ private ConfigService configService;
+
+ @Autowired
+ private WebServiceClient webServiceClient;
+
@Override
public CommonResult<Long> registerOperation(DevRentSaveReqVO createReqVO) {
@@ -94,21 +105,20 @@
Long rent_id = createReqVO.getId();
List<Integer> jobTypeList = new ArrayList<Integer>();
- jobTypeList.add( DevRentStateEnum.ROUTINE_FINISH.getState());
- jobTypeList.add( DevRentStateEnum.ROUTINE_CANCELLED.getState());
+ jobTypeList.add(DevRentStateEnum.ROUTINE_FINISH.getState());
+ jobTypeList.add(DevRentStateEnum.ROUTINE_CANCELLED.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
if (null == jobRecordDO) {
- List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.FREE.getState());
- if (devRentDOList.size() == 0)
- throw exception(DEV_INSTALL_NOT_APPOINTMENT);
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.FREE.getState());
+ if (devRentDOList.size() == 0) throw exception(DEV_INSTALL_NOT_APPOINTMENT);
else if (devRentDOList.size() != 1) {
- throw exception(DEV_INSTALL_EXCEPTION);
+ throw exception(DEV_INSTALL_EXCEPTION);
}
- rent_id = devRentDOList.getFirst().getId();
- createReqVO.setId( rent_id );
- createReqVO.setState( DevRentStateEnum.ROUTINE_FINISH.getState() );
- updateDevRent( createReqVO );
+ rent_id = devRentDOList.get(0).getId();
+ createReqVO.setId(rent_id);
+ createReqVO.setState(DevRentStateEnum.ROUTINE_FINISH.getState());
+ updateDevRent(createReqVO);
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
jobRecordSaveReqVO.setRentId(rent_id);
@@ -118,21 +128,21 @@
jobRecordSaveReqVO.setPatId(createReqVO.getPatId());
jobRecordSaveReqVO.setPatName(createReqVO.getPatName());
jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
- jobRecordSaveReqVO.setJobType( DevRentStateEnum.ROUTINE_FINISH.getState() );
+ jobRecordSaveReqVO.setJobType(DevRentStateEnum.ROUTINE_FINISH.getState());
jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
jobRecordSaveReqVO.setSummary("");
- jobRecordSaveReqVO.setCheckType( createReqVO.getCheckType() );
+ jobRecordSaveReqVO.setCheckType(createReqVO.getCheckType());
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
} else {
// 鎾ら攢 鏀惧純鎿嶄綔
- createReqVO.setState( DevRentStateEnum.ROUTINE_FINISH.getState() );
+ createReqVO.setState(DevRentStateEnum.ROUTINE_FINISH.getState());
- updateDevRent( createReqVO );
+ updateDevRent(createReqVO);
jobRecordDO.setDevId(createReqVO.getDevId());
- jobRecordDO.setJobType( DevRentStateEnum.ROUTINE_FINISH.getState() );
+ jobRecordDO.setJobType(DevRentStateEnum.ROUTINE_FINISH.getState());
jobRecordDO.setJobTime(createReqVO.getRentTime());
jobRecordDO.setRemark(createReqVO.getRemark());
jobRecordDO.setUpdater(String.valueOf(userId));
@@ -144,16 +154,89 @@
//queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
// QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.FINISH.getStatus());
- QueueDO firstOnStageQueueItem = queueMapper.getFirstItemByBedAndStatus(createReqVO.getRoomId(),
- createReqVO.getBedNo(), QueueStatusEnum.ONSTAGE.getStatus());
- // QueueStatusEnum.ONSTAGE => QueueStatusEnum.FINISH
- firstOnStageQueueItem.setStatus(QueueStatusEnum.FINISH.getStatus()); // 榛樿鐘舵�� 璁剧疆
- queueMapper.updateById( firstOnStageQueueItem );
+ // 銆愮己闄蜂慨澶嶃�戝師瀹炵幇锛�
+ // QueueDO firstOnStageQueueItem = queueMapper.getBedFirstQueueItemByStatus(
+ // roomId, bedNo, ONSTAGE);
+ // firstOnStageQueueItem.setStatus(FINISH); // 鈫� 鍙栦笉鍒版椂涓� null锛岀洿鎺� NPE
+ //
+ // 涓や釜闂锛�
+ // 1) NPE锛氳宸ヤ綅褰撳墠娌℃湁"灏辫瘖涓�(30)"鎮ｈ�呮椂杩斿洖 null锛堜緥濡傚尰鐢熷厛鐐逛簡"鏀惧純妫�鏌�"锛�
+ // cancelRoutineOperation 宸叉妸璇ユ偅鑰呯疆涓� 40锛夛紝绗� 159 琛岀┖鎸囬拡 鈫� 鏁翠釜浜嬪姟鍥炴粴銆�
+ // 2) 璇激锛氬彧鎸�"宸ヤ綅 + 鐘舵�佸彇 seq_num 鏈�灏忕殑涓�鏉�"锛岃嫢鏈熼棿宸插彨浜嗕笅涓�浣嶆偅鑰咃紝
+ // 浼氭妸**涓嬩竴浣嶆偅鑰�**璇疆涓�"宸插氨璇�(40)"銆�
+ //
+ // 淇绛栫暐锛堟寜鍙潬鎬т粠楂樺埌浣庯級锛�
+ // 鈶� 浼樺厛鎸� patId + checkType 绮剧‘鍖归厤锛堝墠绔� submitForm 浼犵殑 formData 鍚繖涓や釜瀛楁锛夛紱
+ // 鈶� 閫�鍖栧埌"宸ヤ綅 + 鐘舵�� + 浠婃棩"鍙� update_time 鏈�鏂扮殑涓�鏉★紙姣� seq_num 鏈�灏忔洿璐村悎褰撳墠鎮ｈ�咃級锛�
+ // 鈶� 浠嶅彇涓嶅埌 鈫� 璁拌鍛婂苟**璺宠繃闃熷垪鏇存柊**锛岃�屼笉鏄姏 NPE 璁╂暣涓�"妫�鏌ュ畬鎴�"澶辫触銆�
+ // 姝ゆ椂璁惧褰掕繕銆佷綔涓氳褰曠瓑浠嶄細姝ｅ父淇濆瓨锛堟暟鎹笉涓級锛屼粎闃熷垪鐘舵�佹湭鍙樸��
+ QueueDO onStageQueueItem = null;
- // 妫�鏌ラ」鐩�.浜插拰鎬� 澶勭悊閫昏緫
- CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem( firstOnStageQueueItem.getBookCheckType() );
- if (checkTypeDO.getAffinityCheckTypes().length > 0) {
- procAffinityWhenRoutineFinish( firstOnStageQueueItem.getPatId(), checkTypeDO.getAffinityCheckTypes() );
+ // 鈶� 绮剧‘瀹氫綅锛堢敤 Spring 鐨� StringUtils锛岄伩鍏嶉澶栦緷璧栵紱
+ // 鏈ā鍧楁湭寮曞叆 commons-lang3锛屽嬁鐢� org.apache.commons.lang3.StringUtils锛�
+ if (org.springframework.util.StringUtils.hasText(createReqVO.getPatId())
+ && null != createReqVO.getCheckType()) {
+ onStageQueueItem = queueMapper.getBedQueueItemByPatAndStatus(
+ createReqVO.getRoomId(), createReqVO.getBedNo(),
+ createReqVO.getPatId(), createReqVO.getCheckType(),
+ QueueStatusEnum.ONSTAGE.getStatus());
+ }
+
+ // 鈶� 閫�鍖栵細鍙栬宸ヤ綅浠婃棩鏈�杩戞洿鏂扮殑涓�鏉�"灏辫瘖涓�"
+ if (null == onStageQueueItem) {
+ onStageQueueItem = queueMapper.getBedLatestQueueItemByStatus(
+ createReqVO.getRoomId(), createReqVO.getBedNo(), QueueStatusEnum.ONSTAGE.getStatus());
+ if (null != onStageQueueItem) {
+ log.warn("[routineFinish] 鏈寜 patId 鍛戒腑锛岄��鍖栦负鎸夊伐浣嶅彇鏈�杩戝氨璇婁腑鎮ｈ��. "
+ + "roomId={} bedNo={} reqPatId={} reqCheckType={} 瀹為檯patId={} checkType={}",
+ createReqVO.getRoomId(), createReqVO.getBedNo(), createReqVO.getPatId(),
+ createReqVO.getCheckType(), onStageQueueItem.getPatId(),
+ onStageQueueItem.getBookCheckType());
+ }
+ }
+
+ // 鈶� 浠嶅彇涓嶅埌锛氳烦杩囬槦鍒楁洿鏂帮紝涓嶆姏寮傚父锛堜繚璇�"妫�鏌ュ畬鎴�"鏈韩鍙敤锛�
+ if (null == onStageQueueItem) {
+ log.warn("[routineFinish] 璇ュ伐浣嶆棤[灏辫瘖涓璢鎮ｈ�咃紝璺宠繃闃熷垪鐘舵�佹洿鏂�. roomId={} bedNo={} patId={} applyNo={}",
+ createReqVO.getRoomId(), createReqVO.getBedNo(),
+ createReqVO.getPatId(), createReqVO.getApplyNo());
+ } else {
+ // QueueStatusEnum.ONSTAGE => QueueStatusEnum.FINISH
+ onStageQueueItem.setStatus(QueueStatusEnum.FINISH.getStatus());
+ queueMapper.updateById(onStageQueueItem);
+
+ // 妫�鏌ラ」鐩�.浜插拰鎬� 澶勭悊閫昏緫
+ CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem(onStageQueueItem.getBookCheckType());
+ if (null != checkTypeDO && null != checkTypeDO.getAffinityCheckTypes()
+ && checkTypeDO.getAffinityCheckTypes().length > 0) {
+ procAffinityWhenRoutineFinish(onStageQueueItem.getPatId(), checkTypeDO.getAffinityCheckTypes());
+ }
+ }
+
+ //妫�鏌ュ畬鎴愬悗锛屾鏃舵鏌ョ櫥璁板啓鎴愪簡锛岄渶瑕佸皢杩欎釜鍥炲啓缁欓泦鎴愬钩鍙�(绾夸笂鐜鎵嶅洖鍐�)
+ ConfigDO configDO = configService.getConfigByKey("ecg.back.data");
+ if (configDO.getValue().equals("1")) {
+ if (createReqVO.getCheckType() != 100 && createReqVO.getCheckType() != 1000 && createReqVO.getCheckType() != 1100 && createReqVO.getCheckType() != 1400 && createReqVO.getCheckType() != 1500) {
+ AppointmentDO appointmentDO = appointmentMapper.getByApplyNo(createReqVO.getApplyNo());
+ ApplicationTemplate app = new ApplicationTemplate();
+ String action = "S0405";
+ String message = app.getXML(createReqVO.getApplyNo(), "3", "妫�鏌ョ櫥璁�", createReqVO.getOperater(), appointmentDO.getPatDeptCode(), appointmentDO.getPatDeptDesc(), appointmentDO.getPatWardCode(), appointmentDO.getPatWardDesc(), appointmentDO.getPatBedNo(), appointmentDO.getEpisodeId(), "" + appointmentDO.getBookSrc(), appointmentDO.getPatId(), appointmentDO.getPatName());
+ String s = webServiceClient.callJHFWTYRK(action, "", message);
+ log.info("routineFinishWebServiceClient鐨勮繑鍥炲�间负锛歿}", s);
+ if (s.contains("鏇存柊鎴愬姛")) {
+ //闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
+ // 銆愯瘖鏂棩蹇椼�戝悓 AppointmentServiceImpl#handleAppointmentStatusUpdate锛�
+ // 鎵撳嵃鏃ユ湡瀵硅薄绫诲瀷涓庡�硷紝渚夸簬瀹氫綅 register_date 琚啓鎴� 00:00:00 鐨勫啓鍏ユ柟銆�
+ java.util.Date regNow = new Date();
+ log.info("[devRentCreate][鐧昏鏃堕棿鍐欏叆] applyNo={} 鏃ユ湡瀵硅薄绫诲瀷={} 鍊�={}",
+ createReqVO.getApplyNo(), regNow.getClass().getName(),
+ new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(regNow));
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "3", regNow);
+ }
+ } else {
+ //妫�鏌ョ被鍨嬫槸搴婅竟鐨勬垨甯歌鐨勶紝闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚7
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7", null);
+ }
}
return CommonResult.success(rent_id);
@@ -161,6 +244,7 @@
/**
* 棰嗙敤瀹屾垚 鎿嶄綔
+ *
* @param createReqVO 鍒涘缓淇℃伅
* @return
*/
@@ -179,22 +263,40 @@
throw exception(DEVICE_NOT_FREE);
}
+ //璁惧棰嗗彇瀹屾垚鍚庯紝姝ゆ椂妫�鏌ョ櫥璁板啓鎴愪簡锛岄渶瑕佸皢杩欎釜鍥炲啓缁欓泦鎴愬钩鍙�(绾夸笂鐜鎵嶅洖鍐�)
+ ConfigDO configDO = configService.getConfigByKey("ecg.back.data");
+ if (configDO.getValue().equals("1")) {
+ AppointmentDO appointmentDO = appointmentMapper.getByApplyNo(createReqVO.getApplyNo());
+ ApplicationTemplate app = new ApplicationTemplate();
+ String action = "S0405";
+ String message = app.getXML(createReqVO.getApplyNo(), "3", "妫�鏌ョ櫥璁�", createReqVO.getOperater(), appointmentDO.getPatDeptCode(), appointmentDO.getPatDeptDesc(), appointmentDO.getPatWardCode(), appointmentDO.getPatWardDesc(), appointmentDO.getPatBedNo(), appointmentDO.getEpisodeId(), "" + appointmentDO.getBookSrc(), appointmentDO.getPatId(), appointmentDO.getPatName());
+ String s = webServiceClient.callJHFWTYRK(action, "", message);
+ log.info("webservice鐨勮繑鍥炲�间负锛歿}", s);
+ if (s.contains("鏇存柊鎴愬姛")) {
+ //闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
+ // 銆愯瘖鏂棩蹇椼�戝悓涓婏細鎵撳嵃鏃ユ湡瀵硅薄绫诲瀷涓庡��
+ java.util.Date regNow2 = new Date();
+ log.info("[devRentOther][鐧昏鏃堕棿鍐欏叆] applyNo={} 鏃ユ湡瀵硅薄绫诲瀷={} 鍊�={}",
+ createReqVO.getApplyNo(), regNow2.getClass().getName(),
+ new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(regNow2));
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "3", regNow2);
+ }
+ }
List<Integer> jobTypeList = new ArrayList<Integer>();
- jobTypeList.add( DevRentStateEnum.READY.getState());
- jobTypeList.add( DevRentStateEnum.READY_CANCELLED.getState());
+ jobTypeList.add(DevRentStateEnum.RECEIVED.getState());
+ jobTypeList.add(DevRentStateEnum.RECEIVED_CANCELLED.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
if (null == jobRecordDO) {
- List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.FREE.getState());
- if (devRentDOList.size() == 0)
- throw exception(DEV_INSTALL_NOT_APPOINTMENT);
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.FREE.getState());
+ if (devRentDOList.size() == 0) throw exception(DEV_INSTALL_NOT_APPOINTMENT);
else if (devRentDOList.size() != 1) {
throw exception(DEV_INSTALL_EXCEPTION);
}
- rent_id = devRentDOList.getFirst().getId();
- createReqVO.setId( rent_id );
- createReqVO.setState( DevRentStateEnum.READY.getState() );
- updateDevRent( createReqVO );
+ rent_id = devRentDOList.get(0).getId();
+ createReqVO.setId(rent_id);
+ createReqVO.setState(DevRentStateEnum.RECEIVED.getState());
+ updateDevRent(createReqVO);
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
jobRecordSaveReqVO.setRentId(rent_id);
@@ -204,21 +306,21 @@
jobRecordSaveReqVO.setPatId(createReqVO.getPatId());
jobRecordSaveReqVO.setPatName(createReqVO.getPatName());
jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
- jobRecordSaveReqVO.setJobType( DevRentStateEnum.READY.getState() );
+ jobRecordSaveReqVO.setJobType(DevRentStateEnum.RECEIVED.getState());
jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
jobRecordSaveReqVO.setSummary("");
- jobRecordSaveReqVO.setCheckType( createReqVO.getCheckType() );
+ jobRecordSaveReqVO.setCheckType(createReqVO.getCheckType());
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
} else {
// 鎾ら攢 鏀惧純鎿嶄綔
- createReqVO.setState( DevRentStateEnum.READY.getState() );
+ createReqVO.setState(DevRentStateEnum.RECEIVED.getState());
- updateDevRent( createReqVO );
+ updateDevRent(createReqVO);
jobRecordDO.setDevId(createReqVO.getDevId());
- jobRecordDO.setJobType( DevRentStateEnum.READY.getState() );
+ jobRecordDO.setJobType(DevRentStateEnum.RECEIVED.getState());
jobRecordDO.setJobTime(createReqVO.getRentTime());
jobRecordDO.setRemark(createReqVO.getRemark());
jobRecordDO.setUpdater(String.valueOf(userId));
@@ -231,17 +333,17 @@
// QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.RECEIVED.getStatus());
// QueueStatusEnum.ONSTAGE => QueueStatusEnum.RECEIVED
- QueueDO bedOnStageQueueItem = queueMapper.getFirstItemByBedAndStatus(
- createReqVO.getRoomId(), createReqVO.getBedNo(), QueueStatusEnum.ONSTAGE.getStatus() );
- CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem( bedOnStageQueueItem.getBookCheckType() );
+ QueueDO bedOnStageQueueItem = queueMapper.getBedFirstQueueItemByStatus(createReqVO.getRoomId(), createReqVO.getBedNo(), QueueStatusEnum.ONSTAGE.getStatus());
+ CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem(bedOnStageQueueItem.getBookCheckType());
bedOnStageQueueItem.setStatus(QueueStatusEnum.RECEIVED.getStatus()); // [宸查鐢╙ 鐘舵��
+ bedOnStageQueueItem.setAffinityItem(0); // 浜插拰鏍囪 娓呴櫎锛屽湪瀹夎闃舵閲嶆柊浜插拰
// 妫�鏌ラ」鐩�.浜插拰鎬� 澶勭悊閫昏緫 , 鏇存柊 bedOnStageQueueItem
if (checkTypeDO.getAffinityCheckTypes().length > 0) {
procAffinityWhenReadyFinish(/*IN, OUT*/bedOnStageQueueItem, checkTypeDO.getAffinityCheckTypes());
}
- queueMapper.updateById( bedOnStageQueueItem );
+ queueMapper.updateById(bedOnStageQueueItem);
return CommonResult.success(rent_id);
}
@@ -255,7 +357,7 @@
DevRentDO devRentDO = getDevRent(rent_id);
// 瀵逛簬宸叉湁棰嗙敤锛屼絾鏄鏈烘椂浣跨敤鐨勪笉鏄凡棰嗙敤璁惧锛屾姤閿�
- if ( null != devRentDO.getDevId() && !createReqVO.getDevId().equals(devRentDO.getDevId()) ) {
+ if (null != devRentDO.getDevId() && !createReqVO.getDevId().equals(devRentDO.getDevId())) {
throw exception(DEVICE_NOT_PAT_RECEIVED);
}
@@ -267,23 +369,22 @@
// 妫�鏌� job_record 鐢ㄤ簬纭鏄惁鏄涓�娆″畨瑁呮搷浣�
List<Integer> jobTypeList = new ArrayList<Integer>();
- jobTypeList.add( DevRentStateEnum.INSTALLED.getState());
- jobTypeList.add( DevRentStateEnum.INSTALL_CANCELLED.getState());
+ jobTypeList.add(DevRentStateEnum.INSTALLED.getState());
+ jobTypeList.add(DevRentStateEnum.INSTALL_CANCELLED.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
// 绗竴娆� 瀹夎鎿嶄綔
if (null == jobRecordDO) {
- List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.READY.getState());
- if (devRentDOList.size() == 0)
- throw exception(DEV_INSTALL_NOT_RECEIVED);
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.RECEIVED.getState());
+ if (devRentDOList.size() == 0) throw exception(DEV_INSTALL_NOT_RECEIVED);
else if (devRentDOList.size() != 1) {
throw exception(DEV_INSTALL_EXCEPTION);
}
- rent_id = devRentDOList.getFirst().getId();
- createReqVO.setId( rent_id );
- createReqVO.setState( DevRentStateEnum.INSTALLED.getState() );
- updateDevRent( createReqVO );
+ rent_id = devRentDOList.get(0).getId();
+ createReqVO.setId(rent_id);
+ createReqVO.setState(DevRentStateEnum.INSTALLED.getState());
+ updateDevRent(createReqVO);
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
jobRecordSaveReqVO.setRentId(rent_id);
@@ -293,20 +394,20 @@
jobRecordSaveReqVO.setPatId(createReqVO.getPatId());
jobRecordSaveReqVO.setPatName(createReqVO.getPatName());
jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
- jobRecordSaveReqVO.setJobType( DevRentStateEnum.INSTALLED.getState() );
+ jobRecordSaveReqVO.setJobType(DevRentStateEnum.INSTALLED.getState());
jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
jobRecordSaveReqVO.setSummary("");
- jobRecordSaveReqVO.setCheckType( createReqVO.getCheckType() );
+ jobRecordSaveReqVO.setCheckType(createReqVO.getCheckType());
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
} else {
// 鎾ら攢 鏀惧純鎿嶄綔
- createReqVO.setState( DevRentStateEnum.INSTALLED.getState() );
- updateDevRent( createReqVO );
+ createReqVO.setState(DevRentStateEnum.INSTALLED.getState());
+ updateDevRent(createReqVO);
jobRecordDO.setDevId(createReqVO.getDevId());
- jobRecordDO.setJobType( DevRentStateEnum.INSTALLED.getState() );
+ jobRecordDO.setJobType(DevRentStateEnum.INSTALLED.getState());
jobRecordDO.setJobTime(createReqVO.getRentTime());
jobRecordDO.setRemark(createReqVO.getRemark());
jobRecordDO.setUpdater(String.valueOf(userId));
@@ -319,13 +420,12 @@
// QueueStatusEnum.INSTALLING.getStatus(), QueueStatusEnum.FINISH.getStatus());
// QueueStatusEnum.INSTALLING => QueueStatusEnum.FINISH
- QueueDO bedInstallingQueueItem = queueMapper.getFirstItemByBedAndStatus(
- createReqVO.getRoomId(), createReqVO.getBedNo(), QueueStatusEnum.INSTALLING.getStatus());
+ QueueDO bedInstallingQueueItem = queueMapper.getBedFirstQueueItemByStatus(createReqVO.getRoomId(), createReqVO.getBedNo(), QueueStatusEnum.INSTALLING.getStatus());
bedInstallingQueueItem.setStatus(QueueStatusEnum.FINISH.getStatus()); // 榛樿鐘舵�� 璁剧疆
- queueMapper.updateById( bedInstallingQueueItem );
+ queueMapper.updateById(bedInstallingQueueItem);
// 妫�鏌ラ」鐩�.浜插拰鎬� 澶勭悊閫昏緫
- CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem( bedInstallingQueueItem.getBookCheckType() );
+ CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem(bedInstallingQueueItem.getBookCheckType());
if (checkTypeDO.getAffinityCheckTypes().length > 0) {
procAffinityWhenInstallFinish(bedInstallingQueueItem, checkTypeDO.getAffinityCheckTypes());
}
@@ -336,41 +436,41 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Long dismantleOperation(DevRentSaveReqVO updateReqVO) {
- updateReqVO.setState( DevRentStateEnum.DISMANTLED.getState() );
- updateDevRent( updateReqVO );
+ updateReqVO.setState(DevRentStateEnum.DISMANTLED.getState());
+ updateDevRent(updateReqVO);
Long rentId = updateReqVO.getId();
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
// 璁惧鎭㈠鍒扮┖闂�
- markDevFree( updateReqVO.getDevId(), rentId );
+ markDevFree(updateReqVO.getDevId(), rentId);
List<Integer> jobTypeList = new ArrayList<Integer>();
- jobTypeList.add( DevRentStateEnum.DISMANTLED.getState());
+ jobTypeList.add(DevRentStateEnum.DISMANTLED.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(updateReqVO.getId(), userId, jobTypeList);
if (null == jobRecordDO) {
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
- jobRecordSaveReqVO.setRentId( updateReqVO.getId() );
- jobRecordSaveReqVO.setDevId( updateReqVO.getDevId() );
- jobRecordSaveReqVO.setDocId( userId );
- jobRecordSaveReqVO.setDocName( userNickname );
- jobRecordSaveReqVO.setPatId( updateReqVO.getPatId() );
- jobRecordSaveReqVO.setPatName( updateReqVO.getPatName() );
- jobRecordSaveReqVO.setJobTime( updateReqVO.getReturnTime() );
- jobRecordSaveReqVO.setJobType( DevRentStateEnum.DISMANTLED.getState() );
- jobRecordSaveReqVO.setRemark( updateReqVO.getRemark() );
- jobRecordSaveReqVO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
- jobRecordSaveReqVO.setCheckType( updateReqVO.getCheckType() );
+ jobRecordSaveReqVO.setRentId(updateReqVO.getId());
+ jobRecordSaveReqVO.setDevId(updateReqVO.getDevId());
+ jobRecordSaveReqVO.setDocId(userId);
+ jobRecordSaveReqVO.setDocName(userNickname);
+ jobRecordSaveReqVO.setPatId(updateReqVO.getPatId());
+ jobRecordSaveReqVO.setPatName(updateReqVO.getPatName());
+ jobRecordSaveReqVO.setJobTime(updateReqVO.getReturnTime());
+ jobRecordSaveReqVO.setJobType(DevRentStateEnum.DISMANTLED.getState());
+ jobRecordSaveReqVO.setRemark(updateReqVO.getRemark());
+ jobRecordSaveReqVO.setSummary(updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment());
+ jobRecordSaveReqVO.setCheckType(updateReqVO.getCheckType());
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
} else {
- jobRecordDO.setJobType( DevRentStateEnum.DISMANTLED.getState() );
- jobRecordDO.setJobTime( updateReqVO.getReturnTime() );
- jobRecordDO.setRemark( updateReqVO.getRemark() );
- jobRecordDO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
- jobRecordDO.setUpdater( String.valueOf(userId) );
- jobRecordDO.setUpdateTime( LocalDateTime.now() );
+ jobRecordDO.setJobType(DevRentStateEnum.DISMANTLED.getState());
+ jobRecordDO.setJobTime(updateReqVO.getReturnTime());
+ jobRecordDO.setRemark(updateReqVO.getRemark());
+ jobRecordDO.setSummary(updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment());
+ jobRecordDO.setUpdater(String.valueOf(userId));
+ jobRecordDO.setUpdateTime(LocalDateTime.now());
jobRecordMapper.updateById(jobRecordDO);
}
return updateReqVO.getId();
@@ -379,36 +479,36 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Long dataEntryOperation(DevRentSaveReqVO updateReqVO) {
- updateReqVO.setState( DevRentStateEnum.DATAENTERED.getState() );
- updateDevRent( updateReqVO );
+ updateReqVO.setState(DevRentStateEnum.DATAENTERED.getState());
+ updateDevRent(updateReqVO);
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
List<Integer> jobTypeList = new ArrayList<Integer>();
- jobTypeList.add( DevRentStateEnum.DATAENTERED.getState());
+ jobTypeList.add(DevRentStateEnum.DATAENTERED.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(updateReqVO.getId(), userId, jobTypeList);
if (null == jobRecordDO) {
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
- jobRecordSaveReqVO.setRentId( updateReqVO.getId() );
- jobRecordSaveReqVO.setDevId( updateReqVO.getDevId() );
- jobRecordSaveReqVO.setDocId( userId );
- jobRecordSaveReqVO.setDocName( userNickname );
- jobRecordSaveReqVO.setPatId( updateReqVO.getPatId() );
- jobRecordSaveReqVO.setPatName( updateReqVO.getPatName() );
- jobRecordSaveReqVO.setJobTime( updateReqVO.getEntryTime() );
- jobRecordSaveReqVO.setJobType( DevRentStateEnum.DATAENTERED.getState() );
- jobRecordSaveReqVO.setRemark( updateReqVO.getRemark() );
- jobRecordSaveReqVO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
- jobRecordSaveReqVO.setCheckType( updateReqVO.getCheckType() );
+ jobRecordSaveReqVO.setRentId(updateReqVO.getId());
+ jobRecordSaveReqVO.setDevId(updateReqVO.getDevId());
+ jobRecordSaveReqVO.setDocId(userId);
+ jobRecordSaveReqVO.setDocName(userNickname);
+ jobRecordSaveReqVO.setPatId(updateReqVO.getPatId());
+ jobRecordSaveReqVO.setPatName(updateReqVO.getPatName());
+ jobRecordSaveReqVO.setJobTime(updateReqVO.getEntryTime());
+ jobRecordSaveReqVO.setJobType(DevRentStateEnum.DATAENTERED.getState());
+ jobRecordSaveReqVO.setRemark(updateReqVO.getRemark());
+ jobRecordSaveReqVO.setSummary(updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment());
+ jobRecordSaveReqVO.setCheckType(updateReqVO.getCheckType());
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
} else {
- jobRecordDO.setJobType( DevRentStateEnum.DATAENTERED.getState() );
- jobRecordDO.setJobTime( updateReqVO.getEntryTime() );
- jobRecordDO.setRemark( updateReqVO.getRemark() );
- jobRecordDO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
- jobRecordDO.setUpdater( String.valueOf(userId) );
+ jobRecordDO.setJobType(DevRentStateEnum.DATAENTERED.getState());
+ jobRecordDO.setJobTime(updateReqVO.getEntryTime());
+ jobRecordDO.setRemark(updateReqVO.getRemark());
+ jobRecordDO.setSummary(updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment());
+ jobRecordDO.setUpdater(String.valueOf(userId));
jobRecordMapper.updateById(jobRecordDO);
}
return updateReqVO.getId();
@@ -423,23 +523,41 @@
DevRentSaveReqVO createReqVO = BeanUtils.toBean(cancelReqVO, DevRentSaveReqVO.class);
createReqVO.setDevId(null);
- createReqVO.setState( DevRentStateEnum.ROUTINE_CANCELLED.getState());
+ createReqVO.setState(DevRentStateEnum.ROUTINE_CANCELLED.getState());
Long rent_id = createReqVO.getId();
List<Integer> jobTypeList = new ArrayList<Integer>();
- jobTypeList.add( DevRentStateEnum.ROUTINE_FINISH.getState());
- jobTypeList.add( DevRentStateEnum.ROUTINE_CANCELLED.getState());
+ jobTypeList.add(DevRentStateEnum.ROUTINE_FINISH.getState());
+ jobTypeList.add(DevRentStateEnum.ROUTINE_CANCELLED.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
if (null == jobRecordDO) {
- List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.FREE.getState());
- if (devRentDOList.size() != 1)
- throw exception(ROUTINE_CHECK_EXIST);
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.FREE.getState());
+ if (devRentDOList.size() != 1) throw exception(ROUTINE_CHECK_EXIST);
- rent_id = devRentDOList.getFirst().getId();
- createReqVO.setId( rent_id );
- createReqVO.setState( DevRentStateEnum.ROUTINE_CANCELLED.getState() );
- updateDevRent( createReqVO );
+ rent_id = devRentDOList.get(0).getId();
+ createReqVO.setId(rent_id);
+ createReqVO.setState(DevRentStateEnum.ROUTINE_CANCELLED.getState());
+ updateDevRent(createReqVO);
+
+ ConfigDO configDO = configService.getConfigByKey("ecg.back.data");
+ if (configDO.getValue().equals("1")) {
+ if (cancelReqVO.getCheckType() != 100 && cancelReqVO.getCheckType() != 1000 && cancelReqVO.getCheckType() != 1100 && cancelReqVO.getCheckType() != 1400 && cancelReqVO.getCheckType() != 1500) {
+ AppointmentDO appointmentDO = appointmentMapper.getByApplyNo(createReqVO.getApplyNo());
+ ApplicationTemplate app = new ApplicationTemplate();
+ String action = "S0405";
+ String message = app.getXML(createReqVO.getApplyNo(), "4", "鍙栨秷妫�鏌�", createReqVO.getOperater(), appointmentDO.getPatDeptCode(), appointmentDO.getPatDeptDesc(), appointmentDO.getPatWardCode(), appointmentDO.getPatWardDesc(), appointmentDO.getPatBedNo(), appointmentDO.getEpisodeId(), "" + appointmentDO.getBookSrc(), appointmentDO.getPatId(), appointmentDO.getPatName());
+ String s = webServiceClient.callJHFWTYRK(action, "", message);
+ log.info("routineFinishWebServiceClient鐨勮繑鍥炲�间负锛歿}", s);
+ if (s.contains("鏇存柊鎴愬姛")) {
+ //闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4", null);
+ }
+ } else {
+ //妫�鏌ョ被鍨嬫槸搴婅竟鐨勬垨甯歌鐨勶紝闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚7
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7", null);
+ }
+ }
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
jobRecordSaveReqVO.setRentId(rent_id);
@@ -448,16 +566,16 @@
jobRecordSaveReqVO.setDocName(userNickname);
jobRecordSaveReqVO.setPatId(createReqVO.getPatId());
jobRecordSaveReqVO.setPatName(createReqVO.getPatName());
- jobRecordSaveReqVO.setJobType( DevRentStateEnum.ROUTINE_CANCELLED.getState() );
+ jobRecordSaveReqVO.setJobType(DevRentStateEnum.ROUTINE_CANCELLED.getState());
jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
jobRecordSaveReqVO.setSummary("");
- jobRecordSaveReqVO.setCheckType( createReqVO.getCheckType() );
+ jobRecordSaveReqVO.setCheckType(createReqVO.getCheckType());
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
} else {
- updateDevRent( createReqVO );
+ updateDevRent(createReqVO);
jobRecordDO.setDevId(null);
jobRecordDO.setJobType(DevRentStateEnum.ROUTINE_CANCELLED.getState());
@@ -467,6 +585,11 @@
jobRecordDO.setUpdateTime(LocalDateTime.now());
jobRecordMapper.updateById(jobRecordDO);
}
+ QueueDO firstOnStageQueueItem = queueMapper.getBedFirstQueueItemByApplyNo(createReqVO.getApplyNo(), QueueStatusEnum.ONSTAGE.getStatus());
+ // QueueStatusEnum.ONSTAGE => QueueStatusEnum.FINISH
+ firstOnStageQueueItem.setStatus(QueueStatusEnum.FINISH.getStatus()); // 榛樿鐘舵�� 璁剧疆
+ firstOnStageQueueItem.setUpdateTime(LocalDateTime.now());
+ queueMapper.updateById(firstOnStageQueueItem);
return CommonResult.success(rent_id);
}
@@ -479,28 +602,42 @@
// 鑻ヤ粠 瑁呮満 鏀逛负 鍙栨秷瑁呮満锛屾仮澶嶈澶囩姸鎬�
if (null != cancelReqVO.getDevId()) {
- markDevFree( cancelReqVO.getDevId(), rentId );
+ markDevFree(cancelReqVO.getDevId(), rentId);
}
DevRentSaveReqVO createReqVO = BeanUtils.toBean(cancelReqVO, DevRentSaveReqVO.class);
createReqVO.setDevId(null);
- createReqVO.setState( DevRentStateEnum.READY_CANCELLED.getState());
+ createReqVO.setState(DevRentStateEnum.RECEIVED_CANCELLED.getState());
Long rent_id = createReqVO.getId();
List<Integer> jobTypeList = new ArrayList<Integer>();
- jobTypeList.add( DevRentStateEnum.READY.getState());
- jobTypeList.add( DevRentStateEnum.READY_CANCELLED.getState());
+ jobTypeList.add(DevRentStateEnum.RECEIVED.getState());
+ jobTypeList.add(DevRentStateEnum.RECEIVED_CANCELLED.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
if (null == jobRecordDO) {
- List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.FREE.getState());
- if (devRentDOList.size() != 1)
- throw exception(DEV_INSTALL_EXIST);
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.FREE.getState());
+ if (devRentDOList.size() != 1) throw exception(DEV_INSTALL_EXIST);
- rent_id = devRentDOList.getFirst().getId();
- createReqVO.setId( rent_id );
- createReqVO.setState( DevRentStateEnum.READY_CANCELLED.getState() );
- updateDevRent( createReqVO );
+ rent_id = devRentDOList.get(0).getId();
+ createReqVO.setId(rent_id);
+ createReqVO.setState(DevRentStateEnum.RECEIVED_CANCELLED.getState());
+ updateDevRent(createReqVO);
+
+ ConfigDO configDO = configService.getConfigByKey("ecg.back.data");
+ if (configDO.getValue().equals("1")) {
+ AppointmentDO appointmentDO = appointmentMapper.getByApplyNo(createReqVO.getApplyNo());
+ ApplicationTemplate app = new ApplicationTemplate();
+ String action = "S0405";
+ String message = app.getXML(createReqVO.getApplyNo(), "4", "鍙栨秷妫�鏌�", createReqVO.getOperater(), appointmentDO.getPatDeptCode(), appointmentDO.getPatDeptDesc(), appointmentDO.getPatWardCode(), appointmentDO.getPatWardDesc(), appointmentDO.getPatBedNo(), appointmentDO.getEpisodeId(), "" + appointmentDO.getBookSrc(), appointmentDO.getPatId(), appointmentDO.getPatName());
+ String s = webServiceClient.callJHFWTYRK(action, "", message);
+ log.info("routineFinishWebServiceClient鐨勮繑鍥炲�间负锛歿}", s);
+ if (s.contains("鏇存柊鎴愬姛")) {
+ //闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4", null);
+ }
+ }
+
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
jobRecordSaveReqVO.setRentId(rent_id);
@@ -509,19 +646,19 @@
jobRecordSaveReqVO.setDocName(userNickname);
jobRecordSaveReqVO.setPatId(createReqVO.getPatId());
jobRecordSaveReqVO.setPatName(createReqVO.getPatName());
- jobRecordSaveReqVO.setJobType( DevRentStateEnum.READY_CANCELLED.getState() );
+ jobRecordSaveReqVO.setJobType(DevRentStateEnum.RECEIVED_CANCELLED.getState());
jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
jobRecordSaveReqVO.setSummary("");
- jobRecordSaveReqVO.setCheckType( createReqVO.getCheckType() );
+ jobRecordSaveReqVO.setCheckType(createReqVO.getCheckType());
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
} else {
- updateDevRent( createReqVO );
+ updateDevRent(createReqVO);
jobRecordDO.setDevId(null);
- jobRecordDO.setJobType(DevRentStateEnum.READY_CANCELLED.getState());
+ jobRecordDO.setJobType(DevRentStateEnum.RECEIVED_CANCELLED.getState());
jobRecordDO.setJobTime(createReqVO.getRentTime());
jobRecordDO.setRemark(createReqVO.getRemark());
jobRecordDO.setUpdater(String.valueOf(userId));
@@ -540,28 +677,41 @@
// 鑻ヤ粠 瑁呮満 鏀逛负 鍙栨秷瑁呮満锛屾仮澶嶈澶囩姸鎬�
if (null != cancelReqVO.getDevId()) {
- markDevFree( cancelReqVO.getDevId(), rentId );
+ markDevFree(cancelReqVO.getDevId(), rentId);
}
DevRentSaveReqVO createReqVO = BeanUtils.toBean(cancelReqVO, DevRentSaveReqVO.class);
createReqVO.setDevId(null);
- createReqVO.setState( DevRentStateEnum.INSTALL_CANCELLED.getState() );
+ createReqVO.setState(DevRentStateEnum.INSTALL_CANCELLED.getState());
Long rent_id = createReqVO.getId();
List<Integer> jobTypeList = new ArrayList<Integer>();
- jobTypeList.add( DevRentStateEnum.INSTALLED.getState());
- jobTypeList.add( DevRentStateEnum.INSTALL_CANCELLED.getState());
+ jobTypeList.add(DevRentStateEnum.INSTALLED.getState());
+ jobTypeList.add(DevRentStateEnum.INSTALL_CANCELLED.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
if (null == jobRecordDO) {
- List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.READY.getState());
- if (devRentDOList.size() != 1)
- throw exception(DEV_INSTALL_EXIST);
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.RECEIVED.getState());
+ if (devRentDOList.size() != 1) throw exception(DEV_INSTALL_EXIST);
- rent_id = devRentDOList.getFirst().getId();
- createReqVO.setId( rent_id );
- createReqVO.setState( DevRentStateEnum.INSTALL_CANCELLED.getState() );
- updateDevRent( createReqVO );
+ rent_id = devRentDOList.get(0).getId();
+ createReqVO.setId(rent_id);
+ createReqVO.setState(DevRentStateEnum.INSTALL_CANCELLED.getState());
+ updateDevRent(createReqVO);
+
+ ConfigDO configDO = configService.getConfigByKey("ecg.back.data");
+ if (configDO.getValue().equals("1")) {
+ AppointmentDO appointmentDO = appointmentMapper.getByApplyNo(createReqVO.getApplyNo());
+ ApplicationTemplate app = new ApplicationTemplate();
+ String action = "S0405";
+ String message = app.getXML(createReqVO.getApplyNo(), "4", "鍙栨秷妫�鏌�", createReqVO.getOperater(), appointmentDO.getPatDeptCode(), appointmentDO.getPatDeptDesc(), appointmentDO.getPatWardCode(), appointmentDO.getPatWardDesc(), appointmentDO.getPatBedNo(), appointmentDO.getEpisodeId(), "" + appointmentDO.getBookSrc(), appointmentDO.getPatId(), appointmentDO.getPatName());
+ String s = webServiceClient.callJHFWTYRK(action, "", message);
+ log.info("routineFinishWebServiceClient鐨勮繑鍥炲�间负锛歿}", s);
+ if (s.contains("鏇存柊鎴愬姛")) {
+ //闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4", null);
+ }
+ }
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
jobRecordSaveReqVO.setRentId(rent_id);
@@ -570,19 +720,19 @@
jobRecordSaveReqVO.setDocName(userNickname);
jobRecordSaveReqVO.setPatId(createReqVO.getPatId());
jobRecordSaveReqVO.setPatName(createReqVO.getPatName());
- jobRecordSaveReqVO.setJobType( DevRentStateEnum.INSTALL_CANCELLED.getState() );
+ jobRecordSaveReqVO.setJobType(DevRentStateEnum.INSTALL_CANCELLED.getState());
jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
jobRecordSaveReqVO.setSummary("");
- jobRecordSaveReqVO.setCheckType( createReqVO.getCheckType() );
+ jobRecordSaveReqVO.setCheckType(createReqVO.getCheckType());
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
} else {
- updateDevRent( createReqVO );
+ updateDevRent(createReqVO);
jobRecordDO.setDevId(null);
- jobRecordDO.setJobType( DevRentStateEnum.INSTALL_CANCELLED.getState() );
+ jobRecordDO.setJobType(DevRentStateEnum.INSTALL_CANCELLED.getState());
jobRecordDO.setJobTime(createReqVO.getRentTime());
jobRecordDO.setRemark(createReqVO.getRemark());
jobRecordDO.setUpdater(String.valueOf(userId));
@@ -600,49 +750,46 @@
if (updateReqVO.getState() == DevStateEnum.DAMAGED.getState()) {
devStateEnum = DevStateEnum.DAMAGED;
devRentStateEnum = DevRentStateEnum.DAMAGED;
- }
- else if (updateReqVO.getState() == DevStateEnum.LOST.getState()) {
+ } else if (updateReqVO.getState() == DevStateEnum.LOST.getState()) {
devStateEnum = DevStateEnum.LOST;
devRentStateEnum = DevRentStateEnum.LOST;
- }
- else
- throw exception(DEV_DISMANTLE_EXCEPTION);
+ } else throw exception(DEV_DISMANTLE_EXCEPTION);
// 璁惧閬楀け鏃�, 鏍囨敞閬楀け
- markDevDismantleException( updateReqVO.getDevId(), updateReqVO.getId(), updateReqVO.getReturnTime().toLocalDate(), devStateEnum );
+ markDevDismantleException(updateReqVO.getDevId(), updateReqVO.getId(), updateReqVO.getReturnTime().toLocalDate(), devStateEnum);
- updateReqVO.setState( devRentStateEnum.getState() );
- updateDevRent( updateReqVO );
+ updateReqVO.setState(devRentStateEnum.getState());
+ updateDevRent(updateReqVO);
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
List<Integer> jobTypeList = new ArrayList<Integer>();
- jobTypeList.add( DevRentStateEnum.DAMAGED.getState());
- jobTypeList.add( DevRentStateEnum.LOST.getState());
+ jobTypeList.add(DevRentStateEnum.DAMAGED.getState());
+ jobTypeList.add(DevRentStateEnum.LOST.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(updateReqVO.getId(), userId, jobTypeList);
if (null == jobRecordDO) {
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
- jobRecordSaveReqVO.setRentId( updateReqVO.getId() );
- jobRecordSaveReqVO.setDevId( updateReqVO.getDevId() );
- jobRecordSaveReqVO.setDocId( userId );
- jobRecordSaveReqVO.setDocName( userNickname );
- jobRecordSaveReqVO.setPatId( updateReqVO.getPatId() );
- jobRecordSaveReqVO.setPatName( updateReqVO.getPatName() );
- jobRecordSaveReqVO.setJobTime( updateReqVO.getReturnTime() );
- jobRecordSaveReqVO.setJobType( devRentStateEnum.getState() );
- jobRecordSaveReqVO.setRemark( updateReqVO.getRemark() );
- jobRecordSaveReqVO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
- jobRecordSaveReqVO.setCheckType( updateReqVO.getCheckType() );
+ jobRecordSaveReqVO.setRentId(updateReqVO.getId());
+ jobRecordSaveReqVO.setDevId(updateReqVO.getDevId());
+ jobRecordSaveReqVO.setDocId(userId);
+ jobRecordSaveReqVO.setDocName(userNickname);
+ jobRecordSaveReqVO.setPatId(updateReqVO.getPatId());
+ jobRecordSaveReqVO.setPatName(updateReqVO.getPatName());
+ jobRecordSaveReqVO.setJobTime(updateReqVO.getReturnTime());
+ jobRecordSaveReqVO.setJobType(devRentStateEnum.getState());
+ jobRecordSaveReqVO.setRemark(updateReqVO.getRemark());
+ jobRecordSaveReqVO.setSummary(updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment());
+ jobRecordSaveReqVO.setCheckType(updateReqVO.getCheckType());
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
} else {
- jobRecordDO.setJobType( devRentStateEnum.getState() );
- jobRecordDO.setJobTime( updateReqVO.getReturnTime() );
- jobRecordDO.setRemark( updateReqVO.getRemark() );
- jobRecordDO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
- jobRecordDO.setUpdater( String.valueOf(userId) );
- jobRecordDO.setUpdateTime( LocalDateTime.now() );
+ jobRecordDO.setJobType(devRentStateEnum.getState());
+ jobRecordDO.setJobTime(updateReqVO.getReturnTime());
+ jobRecordDO.setRemark(updateReqVO.getRemark());
+ jobRecordDO.setSummary(updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment());
+ jobRecordDO.setUpdater(String.valueOf(userId));
+ jobRecordDO.setUpdateTime(LocalDateTime.now());
jobRecordMapper.updateById(jobRecordDO);
}
@@ -683,82 +830,143 @@
@Override
public DevRentDO getDevRent(Long id) {
- return devRentMapper.selectById(id);
+ DevRentDO devRentDO = devRentMapper.selectById(id);
+ fillPatientInfo(devRentDO);
+ return devRentDO;
}
@Override
public PageResult<DevRentDO> getDevRentPage(DevRentPageReqVO pageReqVO) {
- return devRentMapper.selectPage(pageReqVO);
+ pageReqVO.setState(0);
+ PageResult<DevRentDO> pageResult = devRentMapper.selectPage(pageReqVO);
+ fillPatientInfo(pageResult.getList());
+ return pageResult;
}
@Override
- public DevRentDO getInstalledOrCancelledRent(DevRentSearchReqVO searchReqVO) {
+ public DevRentDO getExistingRent(DevRentSearchReqVO searchReqVO) {
List<Integer> stateList = new ArrayList<>();
- stateList.add( DevRentStateEnum.INSTALLED.getState() );
- stateList.add( DevRentStateEnum.INSTALL_CANCELLED.getState());
- searchReqVO.setStateList( stateList );
- return devRentMapper.getRentByState(searchReqVO);
+ stateList.add(DevRentStateEnum.INSTALLED.getState());
+ stateList.add(DevRentStateEnum.RECEIVED.getState());
+ searchReqVO.setStateList(stateList);
+ DevRentDO devRentDO = devRentMapper.getRentByState(searchReqVO);
+ fillPatientInfo(devRentDO);
+ return devRentDO;
}
@Override
public DevRentDO getFreeRent(DevRentSearchReqVO searchReqVO) {
List<Integer> stateList = new ArrayList<>();
- stateList.add( DevRentStateEnum.FREE.getState() );
- searchReqVO.setStateList( stateList );
- return devRentMapper.getRentByState(searchReqVO);
+ stateList.add(DevRentStateEnum.FREE.getState());
+ searchReqVO.setStateList(stateList);
+ DevRentDO devRentDO = devRentMapper.getRentByState(searchReqVO);
+ fillPatientInfo(devRentDO);
+ return devRentDO;
}
@Override
public DevRentDO getReadyOrCancelledRent(DevRentSearchReqVO searchReqVO) {
List<Integer> stateList = new ArrayList<>();
- stateList.add( DevRentStateEnum.READY.getState() );
- stateList.add( DevRentStateEnum.READY_CANCELLED.getState());
- searchReqVO.setStateList( stateList );
- return devRentMapper.getRentByState(searchReqVO);
+ stateList.add(DevRentStateEnum.RECEIVED.getState());
+ stateList.add(DevRentStateEnum.RECEIVED_CANCELLED.getState());
+ searchReqVO.setStateList(stateList);
+ DevRentDO devRentDO = devRentMapper.getRentByState(searchReqVO);
+ fillPatientInfo(devRentDO);
+ return devRentDO;
}
@Override
public DevRentDO getDismantledRent(DevRentSearchReqVO searchReqVO) {
List<Integer> stateList = new ArrayList<>();
- stateList.add( DevRentStateEnum.DISMANTLED.getState() );
- searchReqVO.setStateList( stateList );
- return devRentMapper.getRentByState(searchReqVO);
+ stateList.add(DevRentStateEnum.DISMANTLED.getState());
+ searchReqVO.setStateList(stateList);
+ DevRentDO devRentDO = devRentMapper.getRentByState(searchReqVO);
+ fillPatientInfo(devRentDO);
+ return devRentDO;
+ }
+
+ // ==================== 闇�姹�1锛氬洖濉偅鑰呬俊鎭� 18 椤� ====================
+ // dev_rent 琛ㄥ彧瀛樹簡 applyNo / patName / patDetails锛�
+ // 鍏朵綑鎮ｈ�呬俊鎭紙鎬у埆銆佸嚭鐢熸棩鏈熴�佺梾鍖恒�佸簥鍙枫�佺數璇濄�佹潵婧愩�佸氨璇婂崱鍙枫��
+ // 鐧昏鏃堕棿銆佸紑鍗曞尰甯堛�佸紑鍗曟棩鏈熴�佸鑰愯嵂锛夐兘鍦� appointment 琛ㄣ��
+ //
+ // 鍙傜収 QueueServiceImpl#fillAppointmentInfo 鐨勫仛娉曪細鏌ヨ鍚庢寜 applyNo 鍥炴煡棰勭害鍗曡ˉ榻愩��
+ // 杩欐牱棰嗙敤/瑁呮満/鎷嗘満/鏁版嵁褰曞叆/妫�鏌ヨ褰� 5 涓晫闈㈡墠鑳藉睍绀哄畬鏁存偅鑰呬俊鎭��
+
+ /**
+ * 鍥炲～鍗曚釜瀵硅薄鐨勬偅鑰呬俊鎭紙瀵硅薄涓� null 鎴� applyNo 涓虹┖鏃跺畨鍏ㄨ烦杩囷級銆�
+ */
+ private void fillPatientInfo(DevRentDO devRentDO) {
+ if (null == devRentDO || !org.springframework.util.StringUtils.hasText(devRentDO.getApplyNo())) {
+ return;
+ }
+ AppointmentDO appointment = appointmentMapper.getByApplyNo(devRentDO.getApplyNo());
+ if (null == appointment) {
+ return;
+ }
+ applyAppointmentToDevRent(devRentDO, appointment);
+ }
+
+ /**
+ * 鎵归噺鍥炲～锛堥伩鍏� N+1 涔嬪鐨勯澶栧紑閿�鐢辫皟鐢ㄦ柟鎺у埗锛涙澶勯�愭潯鍥炴煡锛�
+ * 涓� QueueServiceImpl#fillAppointmentInfo 淇濇寔涓�鑷寸殑鍋氭硶锛夈��
+ */
+ private void fillPatientInfo(List<DevRentDO> devRentDOList) {
+ if (null == devRentDOList || devRentDOList.isEmpty()) {
+ return;
+ }
+ devRentDOList.forEach(this::fillPatientInfo);
+ }
+
+ /**
+ * 鎶婇绾﹀崟涓殑鎮ｈ�呬俊鎭鍒跺埌 dev_rent 瀵硅薄銆�
+ * <p>
+ * 娉ㄦ剰锛氬彧瑕嗙洊**涓虹┖鐨�**骞抽摵瀛楁锛熲�斺�斾笉锛岃繖閲岀洿鎺ヨ鐩栵細
+ * 杩欎簺瀛楁鍧囨爣璁颁负 {@code @TableField(exist=false)}锛屼笉鍙備笌鍐欏簱锛�
+ * 鏈鏌ヨ杩斿洖鐨勫氨鏄渶鏂版暟鎹紝涓嶅瓨鍦�"瑕嗙洊鎺夌敤鎴峰垰褰曞叆鐨勫��"鐨勯闄┿��
+ */
+ private void applyAppointmentToDevRent(DevRentDO target, AppointmentDO source) {
+ target.setPatGender(source.getPatGender());
+ target.setPatBirthday(source.getPatBirthday());
+ target.setRegisterDate(source.getRegisterDate());
+ target.setDoctor(source.getDoctor());
+ target.setDoctorTime(source.getDoctorTime());
+ target.setPatSrc(source.getPatSrc());
+ target.setPatMobile(source.getPatMobile());
+ target.setPatPhone(source.getPatPhone());
+ target.setPatWardDesc(source.getPatWardDesc());
+ target.setPatBedNo(source.getPatBedNo());
+ target.setMedicalCard(source.getMedicalCard());
+ if (target.getDoctorAdviceNo() == null) target.setDoctorAdviceNo(source.getDoctorAdviceNo());
+ target.setOutpatientNo(source.getOutpatientNo());
+ target.setPatIdentityId(source.getPatIdentityId());
+ target.setTolerance(source.getTolerance());
}
// 纭垂澶勭悊
+ // 杩斿洖鍊�: 0 鎴愬姛 1 澶辫触 2 涓嶇敤纭垂
@Override
public Integer feeConfirm(Long rentId, String hisId, String userNickname, Boolean isFeeConfirmOrCancel) {
DevRentDO devRentDO = devRentMapper.selectById(rentId);
- PatDetails patDetails = devRentDO.getPatDetails();
- HisFeeConfirmReqBody hisFeeConfirmReqBody = new HisFeeConfirmReqBody();
- MsgHeader msgHeader = new MsgHeader();
- msgHeader.setMsgType("ODS_2212");
- msgHeader.setMsgVersion("3.0");
- msgHeader.setSender("ECG");
- hisFeeConfirmReqBody.setMsgHeader(msgHeader);
- Item item = new Item();
- item.setItemCode( getHisCheckCode(devRentDO.getCheckType()) ); //
- item.setItemStatus( isFeeConfirmOrCancel? "5" : "6" ); // 5 纭垂 6 鍙栨秷纭垂
- item.setExeOrganization("47162057-2");
- item.setExeDeptName("蹇冪數绉�");
- item.setExeDept("蹇冪數绉�");
- item.setExeDoctor( hisId ); //
- item.setExeDoctorName( userNickname ); //
- item.setExeDateTime( getCurTimeString() ); //
- ExmRequest exmRequest = new ExmRequest();
- exmRequest.setAuthorOrganization("47162057-2");
- exmRequest.setRequestId( patDetails.getApplyNo() ); //
- exmRequest.setPatientType( getPatientType(patDetails.getSource()) ); //
- exmRequest.setItem(item);
- hisFeeConfirmReqBody.setExmRequest(exmRequest);
- HisFeeConfirmRespResult result = feeConfirmFeignService.httpFeeApi("UpdateExmRequestStatus", "ECG", "ECG", hisFeeConfirmReqBody);
- log.info( result.getMsgHeader().getStatus() );
- Integer returnValue = result.getMsgHeader().getStatus().equals("true") ? 0 : 1;
+ // 鏌ヨ妫�鏌ョ被鍨嬶紝纭畾鏄惁闇�瑕佺‘璐�
+ CheckTypeDO checkTypeDO = checkTypeMapper.getCheckTypeByValue(devRentDO.getCheckType());
+ if (0 == checkTypeDO.getExpenseRecognition()) {
+ return 2;
+ }
+
+ Integer returnValue = 1;
+ try {
+ AppointmentDO appointmentDO = appointmentMapper.getByApplyNo(devRentDO.getApplyNo());
+ returnValue = appointmentDO.getPaid() == 1 ? 0 : 1;
+ } catch (RuntimeException ex) {
+ returnValue = 1;
+ }
+
if (0 == returnValue) {
devRentMapper.setPaid(rentId, isFeeConfirmOrCancel ? 1 : 0);
}
- return returnValue;
+ return returnValue; // 0 鎴愬姛 1 澶辫触 2 涓嶇敤纭垂
}
// 鏍囪 璁惧宸茶棰嗗彇
@@ -766,10 +974,10 @@
// 璁惧鏍囨敞 宸查鍙�
DeviceDO deviceDO = deviceMapper.getDeviceByDevId(devId);
if (null != deviceDO && DevStateEnum.FREE.isEqual(deviceDO.getState())) {
- deviceDO.setState( DevStateEnum.RECEIVED.getState() );
- deviceDO.setRentId( rentId );
- deviceDO.setStateDate( LocalDate.now() );
- deviceDO.setPatDetails( patDetails );
+ deviceDO.setState(DevStateEnum.RECEIVED.getState());
+ deviceDO.setRentId(rentId);
+ deviceDO.setStateDate(LocalDate.now());
+ deviceDO.setPatDetails(patDetails);
return deviceMapper.updateById(deviceDO);
}
@@ -779,19 +987,18 @@
// 鏍囪 璁惧宸茶浣跨敤
private Integer markDevInUse(String devId, Long rentId) {
DeviceDO deviceDO = deviceMapper.getDeviceByDevId(devId);
- if (null == deviceDO)
- return 0;
+ if (null == deviceDO) return 0;
if (DevStateEnum.RECEIVED.isEqual(deviceDO.getState()) && rentId.equals(deviceDO.getRentId())) {
- deviceDO.setState( DevStateEnum.INUSE.getState() );
- deviceDO.setStateDate( LocalDate.now() );
+ deviceDO.setState(DevStateEnum.INUSE.getState());
+ deviceDO.setStateDate(LocalDate.now());
return deviceMapper.updateById(deviceDO);
}
if (DevStateEnum.FREE.isEqual(deviceDO.getState())) {
- deviceDO.setState( DevStateEnum.INUSE.getState() );
- deviceDO.setStateDate( LocalDate.now() );
- deviceDO.setRentId( rentId );
+ deviceDO.setState(DevStateEnum.INUSE.getState());
+ deviceDO.setStateDate(LocalDate.now());
+ deviceDO.setRentId(rentId);
return deviceMapper.updateById(deviceDO);
}
@@ -802,8 +1009,8 @@
// 璁惧鏍囨敞閬楀け
DeviceDO deviceDO = deviceMapper.getDeviceByDevId(devId);
if (null != deviceDO && DevStateEnum.INUSE.isEqual(deviceDO.getState()) && rentId.equals(deviceDO.getRentId())) {
- deviceDO.setState( devStateEnum.getState() );
- deviceDO.setStateDate( localDate );
+ deviceDO.setState(devStateEnum.getState());
+ deviceDO.setStateDate(localDate);
return deviceMapper.updateById(deviceDO);
}
@@ -812,22 +1019,21 @@
private Integer markDevFree(String devId, Long rentId) {
// 璁惧鏍囨敞閬楀け 鎭㈠涓虹┖闂�
- DeviceDO deviceDO = deviceMapper.getDeviceByDevId( devId );
+ DeviceDO deviceDO = deviceMapper.getDeviceByDevId(devId);
if (null != deviceDO && rentId.equals(deviceDO.getRentId())) {
- deviceDO.setState( DevStateEnum.FREE.getState() );
- deviceDO.setStateDate( LocalDate.now() );
+ deviceDO.setState(DevStateEnum.FREE.getState());
+ deviceDO.setStateDate(LocalDate.now());
deviceDO.setRentId(null);
deviceDO.setPatDetails(null);
return deviceMapper.updateById(deviceDO);
}
-
+
return 0;
}
private void procAffinityWhenRoutineFinish(String patId, Integer[] affinityCheckTypes) {
// 濡傛灉瀛樺湪 [浜插拰-鎺掗槦] 浜插拰椤癸紝鍒欓�夋嫨 鍏朵腑涓�涓翰鍜岄」 鎺ユ浛鍏� 澶勪簬 [灏辫瘖涓璢
- List<QueueDO> affinityAffinityWaitingItems = queueMapper.getCurPatGivenCheckTypesAndStatus(
- patId, affinityCheckTypes, QueueStatusEnum.AFFINITY_WAITING.getStatus());
+ List<QueueDO> affinityAffinityWaitingItems = queueMapper.getCurPatGivenCheckTypesAndStatus(patId, affinityCheckTypes, QueueStatusEnum.AFFINITY.getStatus());
if (!affinityAffinityWaitingItems.isEmpty()) {
QueueDO tmpQueueDO = affinityAffinityWaitingItems.get(0);
tmpQueueDO.setStatus(QueueStatusEnum.ONSTAGE.getStatus());
@@ -835,84 +1041,67 @@
}
}
+ /**
+ * 棰嗙敤瀹屾垚锛屼富鍔ㄥ姹備緷闄�
+ */
private void procAffinityWhenReadyFinish(/*IN,OUT*/QueueDO bedOnStageQueueItem, Integer[] affinityCheckTypes) {
- // 濡傛灉瀛樺湪 [瀹夎涓璢 浜插拰椤癸紝鍒欒窡闅忓叾涓竴涓翰鍜岄」
- List<QueueDO> affinityInstallingItems = queueMapper.getCurPatGivenCheckTypesAndStatus(
- bedOnStageQueueItem.getPatId(), affinityCheckTypes, QueueStatusEnum.INSTALLING.getStatus());
+ // 濡傛灉瀛樺湪 [瀹夎涓璢 [瀹夎杩囧彿] [瀹夎鍙洖] 鑳借渚濋檮鐨勬鏌ラ」锛屽垯渚濋檮鍒板叾涓竴涓鏌ラ」
+ List<QueueDO> affinityInstallingItems = queueMapper.getCurPatGivenCheckTypesAndStatusList(bedOnStageQueueItem.getPatId(), affinityCheckTypes, List.of(QueueStatusEnum.INSTALLING.getStatus(), QueueStatusEnum.PASSED_INSTALL.getStatus(), QueueStatusEnum.RECALLED_INSTALL.getStatus()));
if (!affinityInstallingItems.isEmpty()) {
QueueDO affinityInstallingItem = affinityInstallingItems.get(0);
- bedOnStageQueueItem.setStatus(QueueStatusEnum.AFFINITY_RECEIVED.getStatus()); // 浜插拰-棰嗙敤
- bedOnStageQueueItem.setRoomId( affinityInstallingItem.getRoomId() );
- bedOnStageQueueItem.setBedNo( affinityInstallingItem.getBedNo() ); // 棰嗙敤 鍒� 瀹夎 鍙兘浼氬湪涓嶅悓宸ヤ綅
+ bedOnStageQueueItem.setStatus(QueueStatusEnum.AFFINITY_INSTALL.getStatus()); // 浜插拰-棰嗙敤
+ bedOnStageQueueItem.setAffinityItem(1);
+ bedOnStageQueueItem.setRoomId(affinityInstallingItem.getRoomId());
+ bedOnStageQueueItem.setBedNo(affinityInstallingItem.getBedNo()); // 棰嗙敤 鍒� 瀹夎 鍙兘浼氬湪涓嶅悓宸ヤ綅
}
// 濡傛灉瀛樺湪 [浜插拰-鎺掗槦] 浜插拰椤癸紝鍒欓�夋嫨 鍏朵腑涓�涓翰鍜岄」 鎺ユ浛鍏� 澶勪簬 [灏辫瘖涓璢
- List<QueueDO> affinityAffinityWaitingItems = queueMapper.getCurPatGivenCheckTypesAndStatus(
- bedOnStageQueueItem.getPatId(), affinityCheckTypes, QueueStatusEnum.AFFINITY_WAITING.getStatus());
+ List<QueueDO> affinityAffinityWaitingItems = queueMapper.getCurPatGivenCheckTypesAndStatus(bedOnStageQueueItem.getPatId(), affinityCheckTypes, QueueStatusEnum.AFFINITY.getStatus());
if (!affinityAffinityWaitingItems.isEmpty()) {
QueueDO tmpQueueDO = affinityAffinityWaitingItems.get(0);
tmpQueueDO.setStatus(QueueStatusEnum.ONSTAGE.getStatus());
- queueMapper.updateById( tmpQueueDO );
+ queueMapper.updateById(tmpQueueDO);
}
}
+ // 濡傛灉瀛樺湪 [浜插拰-棰嗙敤] 浜插拰椤癸紝鍒欓�夋嫨 鍏朵腑涓�涓翰鍜岄」 鎺ユ浛鍏� 澶勪簬 [瀹夎涓璢
private void procAffinityWhenInstallFinish(QueueDO bedInstallingQueueItem, Integer[] affinityCheckTypes) {
- List<QueueDO> affinityAffinityReceivedItems = queueMapper.getCurPatGivenCheckTypesAndStatus(
- bedInstallingQueueItem.getPatId(), affinityCheckTypes, QueueStatusEnum.AFFINITY_RECEIVED.getStatus());
+ List<QueueDO> affinityAffinityReceivedItems = queueMapper.getCurPatGivenCheckTypesAndStatus(bedInstallingQueueItem.getPatId(), affinityCheckTypes, QueueStatusEnum.AFFINITY_INSTALL.getStatus());
if (!affinityAffinityReceivedItems.isEmpty()) {
QueueDO tmpQueueDO = affinityAffinityReceivedItems.get(0);
tmpQueueDO.setStatus(QueueStatusEnum.INSTALLING.getStatus());
- tmpQueueDO.setRoomId( bedInstallingQueueItem.getRoomId() );
- tmpQueueDO.setBedNo( bedInstallingQueueItem.getBedNo() ); // 浠� [棰嗙敤] 鍒� [瀹夎]锛� 鍙灔鍦ㄤ笉鍚屽伐浣嶄笂鎿嶄綔
+ tmpQueueDO.setRoomId(bedInstallingQueueItem.getRoomId());
+ tmpQueueDO.setBedNo(bedInstallingQueueItem.getBedNo()); // 浠� [棰嗙敤] 鍒� [瀹夎]锛� 鍙灔鍦ㄤ笉鍚屽伐浣嶄笂鎿嶄綔
queueMapper.updateById(tmpQueueDO);
}
}
private String getHisCheckCode(Integer checkType) {
- if (100 == checkType)
- return "691133607";
- else if (200 == checkType)
- return "201605";
- else if (300 == checkType)
- return "200327";
- else if (400 == checkType)
- return "201652";
- else if (500 == checkType)
- return "502490914";
- else if (600 == checkType)
- return "419562119";
- else if (700 == checkType)
- return "201604";
- else if (800 == checkType)
- return "1202042";
- else if (900 == checkType)
- return "1202058";
- else if (1000 == checkType)
- return "1202065";
- else if (1100 == checkType)
- return "559542128";
- else if (1200 == checkType)
- return "590244511";
- else if (1300 == checkType)
- return "666454217";
- else if (1400 == checkType)
- return "720791490";
- else if (1500 == checkType)
- return "720792077";
+ if (100 == checkType) return "691133607";
+ else if (200 == checkType) return "201605";
+ else if (300 == checkType) return "200327";
+ else if (400 == checkType) return "201652";
+ else if (500 == checkType) return "502490914";
+ else if (600 == checkType) return "419562119";
+ else if (700 == checkType) return "201604";
+ else if (800 == checkType) return "1202042";
+ else if (900 == checkType) return "1202058";
+ else if (1000 == checkType) return "1202065";
+ else if (1100 == checkType) return "559542128";
+ else if (1200 == checkType) return "590244511";
+ else if (1300 == checkType) return "666454217";
+ else if (1400 == checkType) return "720791490";
+ else if (1500 == checkType) return "720792077";
return "691133607";
}
- String getPatientType( Integer patientSource ) {
- if (1 == patientSource || 2 == patientSource)
- return "01";
- else if (3 == patientSource)
- return "03";
- else if (4 == patientSource)
- return "04";
+ String getPatientType(Integer patientSource) {
+ if (1 == patientSource || 2 == patientSource) return "01";
+ else if (3 == patientSource) return "03";
+ else if (4 == patientSource) return "04";
return "01";
}
-
}
--
Gitblit v1.9.3