From a2a840d4969d680b30eeec184a7059fef64d0b84 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 04 七月 2025 21:39:14 +0800
Subject: [PATCH] 代码提交
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java | 28 ++++++++-
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java | 3
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java | 27 ++++++++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentSaveReqVO.java | 6 ++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 36 ++++++------
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/appointment/AppointmentDO.java | 8 +-
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java | 30 ++++++++-
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java | 28 +++++++++
8 files changed, 133 insertions(+), 33 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java
index a91ea71..7393113 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java
@@ -77,7 +77,7 @@
@PostMapping("/updateStatus")
@Operation(summary = "鏇存柊鐢宠鐘舵��")
@PreAuthorize("@ss.hasPermission('ecg:appointment:update')")
- public CommonResult<Boolean> updateAppointmentStatus(@Valid @RequestBody AppointmentSaveReqVO updateReqVO) {
+ public CommonResult<Boolean> updateAppointmentStatus(@RequestBody AppointmentSaveReqVO updateReqVO) {
appointmentService.updateAppointmentStatus(updateReqVO);
return success(true);
}
@@ -132,6 +132,7 @@
@Operation(summary = "鑾峰緱棰勭害鍒嗛〉")
@PreAuthorize("@ss.hasPermission('ecg:appointment:query')")
public CommonResult<PageResult<AppointmentRespVO>> getAppointmentPage(@Valid AppointmentPageReqVO pageReqVO) {
+ pageReqVO.setOrderCreateTime("1");
PageResult<AppointmentDO> pageResult = appointmentService.getAppointmentPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, AppointmentRespVO.class));
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java
index 68d046c..81f2113 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java
@@ -3,11 +3,14 @@
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.*;
+import java.sql.Date;
import java.time.LocalDate;
import java.util.*;
+
import io.swagger.v3.oas.annotations.media.Schema;
import cn.lihu.jh.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
+
import java.time.LocalDateTime;
import static cn.lihu.jh.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -77,7 +80,7 @@
private Integer bookCheckType;
@Schema(description = "棰勭害鏉ユ簮锛歑绯荤粺銆佹姢澹墜鍔ㄩ绾�")
- private String bookSrc;
+ private Integer bookSrc;
@Schema(description = "鐢宠鍗曠姸鎬�")
private String[] status;
@@ -85,10 +88,25 @@
@Schema(description = "宸蹭粯娆�")
private Integer paid;
+ /**
+ * 鐧昏鏃堕棿
+ */
+ private Date registerDate;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private LocalDateTime createTime;
+
+ /**
+ * 鐧昏鏃堕棿锛堟煡璇㈡潯浠讹級
+ */
+ private String registerTime;
+
private String tolerance;
/**
- *浣忛櫌鍙�
+ * 浣忛櫌鍙�
*/
private String hospitalNo;
@@ -102,4 +120,9 @@
*/
private String outpatientNo;
+ /**
+ * 鏍规嵁鍒涘缓鏃堕棿鍊掑簭
+ */
+ private String orderCreateTime;
+
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java
index 340247a..6623fe0 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java
@@ -3,10 +3,14 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
+import java.sql.Date;
import java.time.LocalDate;
import java.util.*;
+
import org.springframework.format.annotation.DateTimeFormat;
+
import java.time.LocalDateTime;
+
import com.alibaba.excel.annotation.*;
import cn.lihu.jh.framework.excel.core.annotations.DictFormat;
import cn.lihu.jh.framework.excel.core.convert.DictConvert;
@@ -96,6 +100,7 @@
private LocalDateTime bookTime;
@Schema(description = "棰勭害妫�鏌ョ被鍨�", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+ @DictFormat("ecg_check_type")
@ExcelProperty(value = "棰勭害妫�鏌ョ被鍨�", converter = DictConvert.class)
private Integer bookCheckType;
@@ -104,15 +109,27 @@
private Integer bookSeqNum;
@Schema(description = "棰勭害鏉ユ簮锛歑绯荤粺銆佹姢澹墜鍔ㄩ绾�", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("棰勭害鏉ユ簮锛歑绯荤粺銆佹姢澹墜鍔ㄩ绾�")
+// @ExcelProperty("棰勭害鏉ユ簮锛歑绯荤粺銆佹姢澹墜鍔ㄩ绾�")
private Integer bookSrc;
- @Schema(description = "宸蹭粯娆�")
- @ExcelProperty("宸蹭粯娆�")
+ @Schema(description = "宸蹭粯娆� 0-鏈氦璐� 1-宸茬即璐�")
+ @DictFormat("ecg_pay_type")
+ @ExcelProperty(value = "浠樻鐘舵��", converter = DictConvert.class)
private Integer paid;
// @TableField(exist = false)
+ @Schema(description = "鐘舵��")
+ @DictFormat("ecg_status_type")
+ @ExcelProperty(value = "鐘舵��", converter = DictConvert.class)
private String status;
+
+
+ /**
+ * 鐧昏鏃堕棿
+ */
+ @Schema(description = "鐧昏鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("鐧昏鏃堕棿")
+ private Date registerDate;
/**
* 鑰愯嵂鎬э細 鏄惁澶氳��1浠ｈ〃鏄紝0浠ｈ〃涓嶆槸
@@ -120,7 +137,7 @@
private String tolerance;
/**
- *浣忛櫌鍙�
+ * 浣忛櫌鍙�
*/
private String hospitalNo;
@@ -133,4 +150,7 @@
* 闂ㄨ瘖鍙�
*/
private String outpatientNo;
+
+ private LocalDateTime createTime;
+
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentSaveReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentSaveReqVO.java
index fffaa04..e9c11d5 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentSaveReqVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentSaveReqVO.java
@@ -7,6 +7,7 @@
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
+import java.sql.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -111,4 +112,9 @@
* 闂ㄨ瘖鍙�
*/
private String outpatientNo;
+
+ /**
+ * 鐧昏鏃堕棿
+ */
+ private Date registerDate;
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/appointment/AppointmentDO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/appointment/AppointmentDO.java
index 6cecf69..2514912 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/appointment/AppointmentDO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/appointment/AppointmentDO.java
@@ -58,8 +58,6 @@
private String patName;
/**
* 鎮ｈ�呮�у埆
- * <p>
- * 鏋氫妇 {@link TODO system_user_sex 瀵瑰簲鐨勭被}
*/
private Byte patGender;
/**
@@ -138,6 +136,10 @@
private Integer bookSeqNum;
private String status;
+ /**
+ * 鐧昏鏃堕棿
+ */
+ private Date registerDate;
/**
* 鑰愯嵂鎬э細 鏄惁澶氳��1浠ｈ〃鏄紝0浠ｈ〃涓嶆槸
@@ -145,7 +147,7 @@
private String tolerance;
/**
- *浣忛櫌鍙�
+ * 浣忛櫌鍙�
*/
private String hospitalNo;
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java
index d34608d..8eb5159 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java
@@ -11,6 +11,7 @@
import org.apache.ibatis.annotations.Update;
import java.time.LocalDate;
+import java.util.Date;
import java.util.List;
/**
@@ -22,9 +23,9 @@
public interface AppointmentMapper extends BaseMapperX<AppointmentDO> {
default PageResult<AppointmentDO> selectPage(AppointmentPageReqVO reqVO) {
- return selectPage(reqVO, new LambdaQueryWrapperX<AppointmentDO>()
+ LambdaQueryWrapperX<AppointmentDO> wrapper = (LambdaQueryWrapperX<AppointmentDO>) new LambdaQueryWrapperX<AppointmentDO>()
.eqIfPresent(AppointmentDO::getPatId, reqVO.getPatId())
- .eqIfPresent(AppointmentDO::getPatName, reqVO.getPatName())
+ .likeIfPresent(AppointmentDO::getPatName, reqVO.getPatName())
.eqIfPresent(AppointmentDO::getPatGender, reqVO.getPatGender())
.eqIfPresent(AppointmentDO::getPatBirthday, reqVO.getPatBirthday())
.eqIfPresent(AppointmentDO::getPatMobile, reqVO.getPatMobile())
@@ -40,8 +41,27 @@
.eqIfPresent(AppointmentDO::getBookCheckType, reqVO.getBookCheckType())
.eqIfPresent(AppointmentDO::getBookSrc, reqVO.getBookSrc())
.eqIfPresent(AppointmentDO::getPaid, reqVO.getPaid())
+ .eqIfPresent(AppointmentDO::getApplyNo, reqVO.getApplyNo())
+ .eqIfPresent(AppointmentDO::getEpisodeId, reqVO.getEpisodeId())
.inIfPresent(AppointmentDO::getStatus, reqVO.getStatus())
- .orderByDesc(AppointmentDO::getId));
+ // 鏃堕棿鑼冨洿鏌ヨ锛屾敞鎰忚繖閲屽己鍒舵寚瀹氱被鍨嬩负 LambdaQueryWrapperX
+ .and(reqVO.getRegisterTime() != null, w -> {
+ LocalDate today = LocalDate.now();
+ if ("涓婂崍".equals(reqVO.getRegisterTime())) {
+ w.between(AppointmentDO::getRegisterDate, today.atTime(5, 0, 0), today.atTime(13, 0, 0));
+ } else if ("涓嬪崍".equals(reqVO.getRegisterTime())) {
+ w.between(AppointmentDO::getRegisterDate, today.atTime(13, 0, 1), today.atTime(22, 0, 0));
+ }
+ });
+
+ // 鍔ㄦ�佹帓搴�
+ if (reqVO.getOrderCreateTime() != null) {
+ wrapper.orderByDesc(AppointmentDO::getCreateTime);
+ } else {
+ wrapper.orderByAsc(AppointmentDO::getRegisterDate)
+ .orderByAsc(AppointmentDO::getPatWardDesc);
+ }
+ return selectPage(reqVO, wrapper);
}
@@ -54,8 +74,8 @@
@Select("select * from lihu.appointment where pat_id = #{patId} and book_check_type = #{checkType} and to_days(book_date) = to_days(Now()) limit 1")
AppointmentDO getByPatAndCheckTypeAndBookDate(@Param("patId") String patId, @Param("checkType") Integer checkType);
- @Update("update lihu.appointment set status = #{status} where apply_no = #{applyNo};")
- Integer updateStatusByApplyNo(@Param("applyNo") String applyNo, @Param("status") String status);
+ @Update("update lihu.appointment set status = #{status} " + "<if test='registerDate != null'>" + ", register_date = #{registerDate} " + "</if>" + "where apply_no = #{applyNo};")
+ Integer updateStatusByApplyNo(@Param("applyNo") String applyNo, @Param("status") String status, @Param("registerDate") Date registerDate);
@Select("select * from lihu.appointment where episode_id = #{episodeId} and apply_no = #{applyNo} limit 1")
AppointmentDO getByEpisodeIdAndApplyNo(@Param("episodeId") String episodeId, @Param("applyNo") String applyNo);
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java
index 4badfac..dc75d22 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java
@@ -20,6 +20,7 @@
import cn.lihu.jh.module.ecg.service.queuesequence.QueueSequenceService;
import cn.lihu.jh.module.ecg.webservice.WebServiceClient;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DuplicateKeyException;
@@ -32,6 +33,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -199,6 +201,29 @@
@Override
public PageResult<AppointmentDO> getAppointmentPage(AppointmentPageReqVO pageReqVO) {
+ //1. 鍏堟牴鎹畃atId鍘绘煡
+ PageResult<AppointmentDO> result = appointmentMapper.selectPage(pageReqVO);
+ log.info("--------------PATID result鐨勫�间负锛歿}", result);
+ if (!result.getList().isEmpty()) {
+ return result;
+ }
+
+ if (StringUtils.isNotEmpty(pageReqVO.getPatId())) {
+ // 2. 鐢� applyNo 鏌ヨ
+ pageReqVO.setApplyNo(pageReqVO.getPatId());
+ pageReqVO.setPatId(null);
+ log.info("------------------ApplyNo pageReqVO鐨勫�间负锛歿}", pageReqVO);
+ result = appointmentMapper.selectPage(pageReqVO);
+ if (!result.getList().isEmpty()) {
+ return result;
+ }
+
+ // 3. 鐢� episodeId 鏌ヨ
+ pageReqVO.setEpisodeId(pageReqVO.getApplyNo());
+ pageReqVO.setPatId(null);
+ pageReqVO.setApplyNo(null);
+ log.info("-----------EpisodeId pageReqVO鐨勫�间负锛歿}", pageReqVO);
+ }
return appointmentMapper.selectPage(pageReqVO);
}
@@ -564,6 +589,9 @@
String status = Optional.ofNullable(dataMap.get("controlActProcess")).map(controlActProcess -> (Map<String, Object>) controlActProcess).map(controlActProcess -> (Map<String, Object>) controlActProcess.get("subject")).map(subject -> (Map<String, Object>) subject.get("placerGroup")).map(placerGroup -> (Map<String, Object>) placerGroup.get("component2")).map(component2 -> (Map<String, Object>) component2.get("observationRequest")).map(observationRequest -> (Map<String, Object>) observationRequest.get("component1")).map(component1 -> (Map<String, Object>) component1.get("processStep")).map(processStep -> (Map<String, Object>) processStep.get("code")).map(code -> (String) code.get("code")).orElseThrow(() -> exception(APPOINTMENT_CREATE_FAIL));
existingAppointment.setStatus(status);
+ if ("3".equals(status)) {
+ existingAppointment.setRegisterDate(new Date());
+ }
// 灏咥ppointmentDO杞崲涓篈ppointmentSaveReqVO骞舵洿鏂�
AppointmentSaveReqVO updateReqVO = BeanUtils.toBean(existingAppointment, AppointmentSaveReqVO.class);
updateAppointment(updateReqVO);
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 0c50338..5d9f40e 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
@@ -36,6 +36,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -172,20 +173,20 @@
log.info("routineFinishWebServiceClient鐨勮繑鍥炲�间负锛歿}", s);
if (s.contains("鏇存柊鎴愬姛")) {
//闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "3");
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "3", new Date());
}
} else {
//妫�鏌ョ被鍨嬫槸搴婅竟鐨勬垨甯歌鐨勶紝闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚7
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7");
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7", null);
}
} else {
if (createReqVO.getCheckType() != 100 && createReqVO.getCheckType() != 1000 && createReqVO.getCheckType() != 1100 && createReqVO.getCheckType() != 1400 && createReqVO.getCheckType() != 1500) {
//闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4");
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4", null);
} else {
//妫�鏌ョ被鍨嬫槸搴婅竟鐨勬垨甯歌鐨勶紝闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚7
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7");
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7", null);
}
}
@@ -223,10 +224,10 @@
log.info("webservice鐨勮繑鍥炲�间负锛歿}", s);
if (s.contains("鏇存柊鎴愬姛")) {
//闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "3");
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "3", new Date());
}
} else {
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "3");
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "3", new Date());
}
List<Integer> jobTypeList = new ArrayList<Integer>();
@@ -497,20 +498,20 @@
log.info("routineFinishWebServiceClient鐨勮繑鍥炲�间负锛歿}", s);
if (s.contains("鏇存柊鎴愬姛")) {
//闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4");
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4", null);
}
} else {
//妫�鏌ョ被鍨嬫槸搴婅竟鐨勬垨甯歌鐨勶紝闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚7
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7");
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7", null);
}
} else {
if (cancelReqVO.getCheckType() != 100 && cancelReqVO.getCheckType() != 1000 && cancelReqVO.getCheckType() != 1100 && cancelReqVO.getCheckType() != 1400 && cancelReqVO.getCheckType() != 1500) {
//闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4");
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4", null);
} else {
//妫�鏌ョ被鍨嬫槸搴婅竟鐨勬垨甯歌鐨勶紝闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚7
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7");
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7", null);
}
}
@@ -588,16 +589,16 @@
log.info("routineFinishWebServiceClient鐨勮繑鍥炲�间负锛歿}", s);
if (s.contains("鏇存柊鎴愬姛")) {
//闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4");
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4", null);
}
} else {
if (cancelReqVO.getCheckType() != 100 && cancelReqVO.getCheckType() != 1000 && cancelReqVO.getCheckType() != 1100 && cancelReqVO.getCheckType() != 1400 && cancelReqVO.getCheckType() != 1500) {
//闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4");
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4", null);
} else {
//妫�鏌ョ被鍨嬫槸搴婅竟鐨勬垨甯歌鐨勶紝闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚7
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7");
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7", null);
}
}
@@ -671,16 +672,15 @@
log.info("routineFinishWebServiceClient鐨勮繑鍥炲�间负锛歿}", s);
if (s.contains("鏇存柊鎴愬姛")) {
//闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4");
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4", null);
}
} else {
+ //杩欓噷鏄祴璇曟湰鍦颁慨鏀�
if (cancelReqVO.getCheckType() != 100 && cancelReqVO.getCheckType() != 1000 && cancelReqVO.getCheckType() != 1100 && cancelReqVO.getCheckType() != 1400 && cancelReqVO.getCheckType() != 1500) {
- //闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4");
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4", null);
} else {
- //妫�鏌ョ被鍨嬫槸搴婅竟鐨勬垨甯歌鐨勶紝闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚7
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7");
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7", null);
}
}
--
Gitblit v1.9.3