From e5248157af311961bee52db474c2ee8abb741843 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期三, 22 十一月 2023 17:51:18 +0800
Subject: [PATCH] 会诊
---
ltkj-hosp/src/main/resources/mapper/hosp/TjHzReplyLogMapper.xml | 227 +++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHzReplyLog.java | 135 +++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjHzLogServiceImpl.java | 99 ++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 20
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHzLog.java | 94 +++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjHzReplyLogMapper.java | 65 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjHzReplyLogService.java | 63 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHzReplyLogController.java | 93 +++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjHzLogService.java | 70 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 16
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjHzLogMapper.java | 70 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHzLogController.java | 107 ++++
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java | 76 ++-
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjHzReplyLogServiceImpl.java | 93 +++
ltkj-hosp/src/main/resources/mapper/hosp/TjHzLogMapper.xml | 182 +++++++
15 files changed, 1,382 insertions(+), 28 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index dfac81e..7c9cb83 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -882,4 +882,20 @@
return success(deptService.selectDeptTreeList(dept));
}
+
+ /**
+ * 鑾峰彇瀛愮瀹ら儴闂ㄥ垪琛�
+ */
+ @GetMapping("/getChildList")
+ @ApiOperation(value = "鑾峰彇瀛愮瀹ら儴闂ㄥ垪琛�")
+ public AjaxResult getChildList(String deptName) {
+ LambdaQueryWrapper<SysDept> wq=new LambdaQueryWrapper<>();
+ wq.ne(SysDept::getParentId,0);
+ if (deptName!=null){
+ wq.like(SysDept::getDeptName,deptName);
+ }
+ List<SysDept> depts = deptService.list(wq);
+ return success(depts);
+ }
+
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHzLogController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHzLogController.java
new file mode 100644
index 0000000..ed449ea
--- /dev/null
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHzLogController.java
@@ -0,0 +1,107 @@
+package com.ltkj.web.controller.system;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ltkj.common.annotation.Log;
+import com.ltkj.common.core.controller.BaseController;
+import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.common.enums.BusinessType;
+import com.ltkj.hosp.domain.TjHzLog;
+import com.ltkj.hosp.service.ITjHzLogService;
+import com.ltkj.common.utils.poi.ExcelUtil;
+import com.ltkj.common.core.page.TableDataInfo;
+
+/**
+ * 浼氳瘖鐢宠璁板綍
+ * Controller
+ *
+ * @author ltkj_璧典匠璞�&鏉庢牸
+ * @date 2023-11-22
+ */
+@RestController
+@RequestMapping("/hosp/hzlog")
+public class TjHzLogController extends BaseController {
+ @Autowired
+ private ITjHzLogService tjHzLogService;
+
+ /**
+ * 鏌ヨ浼氳瘖鐢宠璁板綍鍒楄〃
+ */
+ @GetMapping("/list")
+ public TableDataInfo list(TjHzLog tjHzLog) {
+ startPage();
+ LambdaQueryWrapper<TjHzLog> wq=new LambdaQueryWrapper<>();
+ if (tjHzLog.getTjNumber()!=null){
+ wq.eq(TjHzLog::getTjNumber,tjHzLog.getTjNumber());
+ }
+ if (tjHzLog.getUserName()!=null){
+ wq.like(TjHzLog::getUserName,tjHzLog.getUserName());
+ }
+ if (tjHzLog.getHzType()!=null){
+ wq.eq(TjHzLog::getHzType,tjHzLog.getHzType());
+ }
+ List<TjHzLog> list = tjHzLogService.list(wq);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭浼氳瘖鐢宠璁板綍鍒楄〃
+ */
+ @Log(title = "浼氳瘖鐢宠璁板綍", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, TjHzLog tjHzLog) {
+ List<TjHzLog> list = tjHzLogService.selectTjHzLogList(tjHzLog);
+ ExcelUtil<TjHzLog> util = new ExcelUtil<TjHzLog>(TjHzLog.class);
+ util.exportExcel(response, list, "浼氳瘖鐢宠璁板綍鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇浼氳瘖鐢宠璁板綍
+ * 璇︾粏淇℃伅
+ */
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return success(tjHzLogService.selectTjHzLogById(id));
+ }
+
+ /**
+ * 鏂板浼氳瘖鐢宠璁板綍
+ */
+ @Log(title = "浼氳瘖鐢宠璁板綍", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody TjHzLog tjHzLog){
+ return toAjax(tjHzLogService.save(tjHzLog));
+ }
+
+ /**
+ * 淇敼浼氳瘖鐢宠璁板綍
+
+ */
+ @Log(title = "浼氳瘖鐢宠璁板綍 ", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody TjHzLog tjHzLog){
+ return toAjax(tjHzLogService.saveOrUpdate(tjHzLog));
+ }
+
+ /**
+ * 鍒犻櫎浼氳瘖鐢宠璁板綍
+ */
+ @Log(title = "浼氳瘖鐢宠璁板綍 ", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[]ids) {
+ return toAjax(tjHzLogService.removeByIds(Arrays.asList(ids)));
+ }
+}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHzReplyLogController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHzReplyLogController.java
new file mode 100644
index 0000000..7fde2f6
--- /dev/null
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHzReplyLogController.java
@@ -0,0 +1,93 @@
+package com.ltkj.web.controller.system;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ltkj.common.annotation.Log;
+import com.ltkj.common.core.controller.BaseController;
+import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.common.enums.BusinessType;
+import com.ltkj.hosp.domain.TjHzReplyLog;
+import com.ltkj.hosp.service.ITjHzReplyLogService;
+import com.ltkj.common.utils.poi.ExcelUtil;
+import com.ltkj.common.core.page.TableDataInfo;
+
+/**
+ * 浼氳瘖鍥炲璁板綍Controller
+ *
+ * @author ltkj_璧典匠璞�&鏉庢牸
+ * @date 2023-11-22
+ */
+@RestController
+@RequestMapping("/hosp/replylog")
+public class TjHzReplyLogController extends BaseController {
+ @Autowired
+ private ITjHzReplyLogService tjHzReplyLogService;
+
+ /**
+ * 鏌ヨ浼氳瘖鍥炲璁板綍鍒楄〃
+ */
+ @GetMapping("/list")
+ public TableDataInfo list(TjHzReplyLog tjHzReplyLog) {
+ startPage();
+ List<TjHzReplyLog> list = tjHzReplyLogService.selectTjHzReplyLogList(tjHzReplyLog);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭浼氳瘖鍥炲璁板綍鍒楄〃
+ */
+ @Log(title = "浼氳瘖鍥炲璁板綍", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, TjHzReplyLog tjHzReplyLog) {
+ List<TjHzReplyLog> list = tjHzReplyLogService.selectTjHzReplyLogList(tjHzReplyLog);
+ ExcelUtil<TjHzReplyLog> util = new ExcelUtil<TjHzReplyLog>(TjHzReplyLog.class);
+ util.exportExcel(response, list, "浼氳瘖鍥炲璁板綍鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇浼氳瘖鍥炲璁板綍璇︾粏淇℃伅
+ */
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return success(tjHzReplyLogService.selectTjHzReplyLogById(id));
+ }
+
+ /**
+ * 鏂板浼氳瘖鍥炲璁板綍
+ */
+ @Log(title = "浼氳瘖鍥炲璁板綍", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody TjHzReplyLog tjHzReplyLog) {
+ return toAjax(tjHzReplyLogService.save(tjHzReplyLog));
+ }
+
+ /**
+ * 淇敼浼氳瘖鍥炲璁板綍
+ */
+ @Log(title = "浼氳瘖鍥炲璁板綍", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody TjHzReplyLog tjHzReplyLog) {
+ return toAjax(tjHzReplyLogService.saveOrUpdate(tjHzReplyLog));
+ }
+
+ /**
+ * 鍒犻櫎浼氳瘖鍥炲璁板綍
+ */
+ @Log(title = "浼氳瘖鍥炲璁板綍", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return toAjax(tjHzReplyLogService.removeByIds(Arrays.asList(ids)));
+ }
+}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 6265564..3269eef 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -25,6 +25,7 @@
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.framework.config.MatchUtils;
+import com.ltkj.framework.config.UserHoder;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.vodomain.BingZhongVO;
@@ -432,6 +433,7 @@
LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
wq.isNotNull(TjOrder::getReportTime);
wq.eq(TjOrder::getUserId, customer.getCusId());
+ wq.eq(TjOrder::getHeshouStatus, 1); //鏍告敹鐘舵�佷负1鎵嶈兘鎵撳嵃
list.addAll(tjOrderService.list(wq));
}
List<TjOrder> collect = null;
@@ -483,6 +485,7 @@
Page<TjOrder> page1 = new Page<>(pageNum, pageSize);
LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
wq.isNotNull(TjOrder::getReportTime);
+ wq.eq(TjOrder::getHeshouStatus, 1); //鏍告敹鐘舵�佷负1鎵嶈兘鎵撳嵃
if (null != bgbeginTime && null != bgendTime) {
wq.between(TjOrder::getCreateTime, DateUtil.beginOfDay(bgbeginTime), DateUtil.endOfDay(bgendTime));
}
@@ -1615,4 +1618,21 @@
System.out.println("杩欐浠ｇ爜鏃堕棿" + (System.currentTimeMillis() - l));
}
+
+ @PostMapping("/heXiaoByIds/{orderIds}")
+ @ApiOperation(value = "鏍告敹鎶ュ憡鈥斺�斺�斺�斺�斺�旀�绘瀹℃牳閫氳繃鍚庡彲浠ユ牳閿�锛屾牳鏀跺悗鎵嶈兘鎵撳嵃")
+ @Transactional
+ public AjaxResult heXiaoByIds(@PathVariable String[] orderIds) {
+ for (String orderId : orderIds) {
+ final TjOrder byId = tjOrderService.getById(orderId);
+ byId.setHeshouStatus(1);
+ byId.setHeshouDoctor(UserHoder.getLoginUser().getUserId());
+ byId.setHeshouTime(new DateTime());
+ final boolean b = tjOrderService.updateById(byId);
+ if (!b){
+ return AjaxResult.error("鏍告敹澶辫触");
+ }
+ }
+ return AjaxResult.success("鏍告敹鎴愬姛");
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHzLog.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHzLog.java
new file mode 100644
index 0000000..42d19eb
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHzLog.java
@@ -0,0 +1,94 @@
+package com.ltkj.hosp.domain;
+
+import com.ltkj.common.annotation.Excel;
+import com.ltkj.common.core.domain.BaseEntity;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 浼氳瘖鐢宠璁板綍
+ * 瀵硅薄 tj_hz_log
+ *
+ * @author ltkj_璧典匠璞�&鏉庢牸
+ * @date 2023-11-22
+ */
+@Data
+public class TjHzLog extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 浼氳瘖id
+ */
+ private Long id;
+
+ /**
+ * 浼氳瘖璁㈠崟id
+ */
+ @Excel(name = "浼氳瘖璁㈠崟id")
+ private Long orderId;
+
+ /**
+ * 鐢ㄦ埛id
+ */
+ @Excel(name = "鐢ㄦ埛id")
+ private Long userId;
+
+ /**
+ * 浣撴鍙�
+ */
+ @Excel(name = "浣撴鍙�")
+ private String tjNumber;
+
+ /**
+ * 鐢ㄦ埛鍚�
+ */
+ @Excel(name = "鐢ㄦ埛鍚�")
+ private String userName;
+
+ /**
+ * 浼氳瘖绫诲瀷0鍏ㄩ櫌浼氳瘖1绉戝浼氳瘖
+ */
+ @Excel(name = "浼氳瘖绫诲瀷0鍏ㄩ櫌浼氳瘖1绉戝浼氳瘖")
+ private String hzType;
+
+ /**
+ * 浼氳瘖绉戝[]
+ */
+ @Excel(name = "浼氳瘖绉戝[]")
+ private String hzDeptId;
+
+
+ /**
+ * 浼氳瘖鐢宠浜篿d
+ */
+ @Excel(name = "浼氳瘖鐢宠浜篿d")
+ private String hzDoctorId;
+
+ /**
+ * 浼氳瘖鐢宠浜哄悕
+ */
+ @Excel(name = "浼氳瘖鐢宠浜哄悕")
+ private String hzDoctorName;
+
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("orderId", getOrderId())
+ .append("userId", getUserId())
+ .append("tjNumber", getTjNumber())
+ .append("userName", getUserName())
+ .append("hzType", getHzType())
+ .append("hzDeptId", getHzDeptId())
+ .append("createTime", getCreateTime())
+ .append("updateTime", getUpdateTime())
+ .append("createBy", getCreateBy())
+ .append("updateBy", getUpdateBy())
+ .append("deleted", getDeleted())
+ .append("hzDoctorId", getHzDoctorId())
+ .append("hzDoctorName", getHzDoctorName())
+ .toString();
+ }
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHzReplyLog.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHzReplyLog.java
new file mode 100644
index 0000000..0761b3c
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHzReplyLog.java
@@ -0,0 +1,135 @@
+package com.ltkj.hosp.domain;
+
+import com.ltkj.common.annotation.Excel;
+import com.ltkj.common.core.domain.BaseEntity;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 浼氳瘖鍥炲璁板綍瀵硅薄 tj_hz_reply_log
+ *
+ * @author ltkj_璧典匠璞�&鏉庢牸
+ * @date 2023-11-22
+ */
+@Data
+public class TjHzReplyLog extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 浼氳瘖id
+ */
+ private Long id;
+
+ /**
+ * 浼氳瘖璁㈠崟id
+ */
+ @Excel(name = "浼氳瘖璁㈠崟id")
+ private Long orderId;
+
+ /**
+ * 浣撴鍙�
+ */
+ @Excel(name = "浣撴鍙�")
+ private String tjNumber;
+
+ /**
+ * 鐢ㄦ埛id
+ */
+ @Excel(name = "鐢ㄦ埛id")
+ private Long userId;
+
+ /**
+ * 鐢ㄦ埛鍚�
+ */
+ @Excel(name = "鐢ㄦ埛鍚�")
+ private String userName;
+
+ /**
+ * 浼氳瘖绫诲瀷0鍏ㄩ櫌浼氳瘖1绉戝浼氳瘖
+ */
+ @Excel(name = "浼氳瘖绫诲瀷0鍏ㄩ櫌浼氳瘖1绉戝浼氳瘖")
+ private String hzType;
+
+ /**
+ * 鍥炲鍖荤敓
+ */
+ @Excel(name = "鍥炲鍖荤敓")
+ private Long replyDoctorId;
+
+ /**
+ * 鍥炲鍖荤敓鍚�
+ */
+ @Excel(name = "鍥炲鍖荤敓鍚�")
+ private String replyDoctorName;
+
+ /**
+ * 鍥炲閮ㄩ棬
+ */
+ @Excel(name = "鍥炲閮ㄩ棬")
+ private Long replyDeptId;
+
+ /**
+ * 鍥炲閮ㄩ棬鍚�
+ */
+ @Excel(name = "鍥炲閮ㄩ棬鍚�")
+ private String replyDeptName;
+
+ /**
+ * 鍥炲鍐呭
+ */
+ @Excel(name = "鍥炲鍐呭")
+ private String replyContent;
+
+ /**
+ *
+ */
+ @Excel(name = "")
+ private String status;
+
+
+ /**
+ * 浼氳瘖鐢宠id
+ */
+ @Excel(name = "浼氳瘖鐢宠id")
+ private Long hzId;
+
+ /**
+ * 浼氳瘖鐢宠浜�
+ */
+ private String hzDoctorId;
+
+ /**
+ *浼氳瘖鐢宠浜�
+ */
+ private String hzDoctorName;
+
+
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("orderId", getOrderId())
+ .append("tjNumber", getTjNumber())
+ .append("userId", getUserId())
+ .append("userName", getUserName())
+ .append("hzType", getHzType())
+ .append("replyDoctorId", getReplyDoctorId())
+ .append("replyDoctorName", getReplyDoctorName())
+ .append("replyDeptId", getReplyDeptId())
+ .append("replyDeptName", getReplyDeptName())
+ .append("replyContent", getReplyContent())
+ .append("status", getStatus())
+ .append("remark", getRemark())
+ .append("createTime", getCreateTime())
+ .append("updateTime", getUpdateTime())
+ .append("createBy", getCreateBy())
+ .append("updateBy", getUpdateBy())
+ .append("deleted", getDeleted())
+ .append("hzId", getHzId())
+ .append("hzDoctorId", getHzDoctorId())
+ .append("hzDoctorName", getHzDoctorName())
+ .toString();
+ }
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
index 337f0aa..0d0dd11 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
@@ -55,9 +55,9 @@
* 瀹㈡埛瀵硅薄
*/
@Excels({
- @Excel(name = "瀹㈡埛鍚嶇О", targetAttr = "cusName", type = Excel.Type.EXPORT,defaultValue = "鏃�"),
- @Excel(name = "瀹㈡埛鎬у埆", targetAttr = "cusSex", type = Excel.Type.EXPORT,readConverterExp="0=鐢�,1=濂�",defaultValue = "鏃�"),
- @Excel(name = "瀹㈡埛鐢佃瘽", targetAttr = "cusPhone", type = Excel.Type.EXPORT,defaultValue = "鏃�"),
+ @Excel(name = "瀹㈡埛鍚嶇О", targetAttr = "cusName", type = Excel.Type.EXPORT, defaultValue = "鏃�"),
+ @Excel(name = "瀹㈡埛鎬у埆", targetAttr = "cusSex", type = Excel.Type.EXPORT, readConverterExp = "0=鐢�,1=濂�", defaultValue = "鏃�"),
+ @Excel(name = "瀹㈡埛鐢佃瘽", targetAttr = "cusPhone", type = Excel.Type.EXPORT, defaultValue = "鏃�"),
})
@TableField(exist = false)
@ApiModelProperty(value = "瀹㈡埛瀵硅薄")
@@ -66,7 +66,7 @@
/**
* 浣撴绫诲瀷
*/
- @Excel(name = "浣撴绫诲瀷",readConverterExp="2=涓汉,1=鍥㈤槦")
+ @Excel(name = "浣撴绫诲瀷", readConverterExp = "2=涓汉,1=鍥㈤槦")
@ApiModelProperty(value = "浣撴绫诲瀷")
private String tjType;
@@ -80,7 +80,7 @@
/**
* 娴佹按鍙凤紙鏃堕棿鎴崇敓鎴愶級
*/
- @Excel(name = "娴佹按鍙�",defaultValue = "鏃�")
+ @Excel(name = "娴佹按鍙�", defaultValue = "鏃�")
@ApiModelProperty(value = "娴佹按鍙�")
@JsonSerialize(using = ToStringSerializer.class)
private String tjSerialNumber;
@@ -88,7 +88,7 @@
/**
* 鎵�閫夊椁愶紙缁戝畾濂楅琛級
*/
- @Excel(name = "鎵�閫夊椁�",defaultValue = "鏃�")
+ @Excel(name = "鎵�閫夊椁�", defaultValue = "鏃�")
@ApiModelProperty(value = "鎵�閫夊椁�")
@JsonSerialize(using = ToStringSerializer.class)
private String pacId;
@@ -100,16 +100,16 @@
* 浣撴瀹屾垚鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "浣撴瀹屾垚鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss",defaultValue = "鏆傛湭瀹屾垚")
+ @Excel(name = "浣撴瀹屾垚鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", defaultValue = "鏆傛湭瀹屾垚")
@ApiModelProperty(value = "浣撴瀹屾垚鏃堕棿")
- @TableField(fill = FieldFill.INSERT_UPDATE,updateStrategy = FieldStrategy.IGNORED)
+ @TableField(fill = FieldFill.INSERT_UPDATE, updateStrategy = FieldStrategy.IGNORED)
private Date finishTime;
/**
* 鍑烘姤鍛婃椂闂�
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鍑烘姤鍛婃椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss",defaultValue = "鏆傛棤鎶ュ憡")
+ @Excel(name = "鍑烘姤鍛婃椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", defaultValue = "鏆傛棤鎶ュ憡")
@ApiModelProperty(value = "鍑烘姤鍛婃椂闂�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date reportTime;
@@ -118,21 +118,21 @@
* 鍗曚綅ID锛堝閿級
*/
@ApiModelProperty(value = "鍗曚綅ID")
- @Excel(name = "鍗曚綅ID",defaultValue = "鏃�")
+ @Excel(name = "鍗曚綅ID", defaultValue = "鏃�")
@JsonSerialize(using = ToStringSerializer.class)
private String firmId;
/**
* 閮ㄩ棬鍚�
*/
- @Excel(name = "閮ㄩ棬鍚�",defaultValue = "鏃�")
+ @Excel(name = "閮ㄩ棬鍚�", defaultValue = "鏃�")
@ApiModelProperty(value = "閮ㄩ棬鍚�")
private String firmDeptName;
/**
* 鍦ㄥ崟浣嶅伐鍙�
*/
- @Excel(name = "鍦ㄥ崟浣嶅伐鍙�",defaultValue = "鏃�")
+ @Excel(name = "鍦ㄥ崟浣嶅伐鍙�", defaultValue = "鏃�")
@ApiModelProperty(value = "鍦ㄥ崟浣嶅伐鍙�")
@JsonSerialize(using = ToStringSerializer.class)
private String firmWorkId;
@@ -143,7 +143,7 @@
/**
* 鎬绘鍖荤敓鍚嶅瓧
*/
- @Excel(name = "鎬绘鍖荤敓",defaultValue = "鏃�")
+ @Excel(name = "鎬绘鍖荤敓", defaultValue = "鏃�")
@ApiModelProperty(value = "鎬绘鍖荤敓")
private String checkDoctor;
@@ -151,7 +151,7 @@
* 鎬绘鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鎬绘鏃堕棿",defaultValue = "鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鎬绘鏃堕棿", defaultValue = "鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "鎬绘鏃堕棿")
@TableField(fill = FieldFill.UPDATE)
private Date checkTime;
@@ -159,7 +159,7 @@
/**
* 鎬讳綋寤鸿
*/
- @Excel(name = "鎬讳綋寤鸿",defaultValue = "鏃�")
+ @Excel(name = "鎬讳綋寤鸿", defaultValue = "鏃�")
@ApiModelProperty(value = "鎬讳綋寤鸿")
private String checkAdvice;
@@ -167,7 +167,7 @@
* 鍙戝竷鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鍙戝竷鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss",defaultValue = "鏆傛湭鍙戝竷")
+ @Excel(name = "鍙戝竷鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", defaultValue = "鏆傛湭鍙戝竷")
@ApiModelProperty(value = "鍙戝竷鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date releaseTime;
@@ -175,19 +175,19 @@
/**
* 鏄惁鍙戦�侀偖浠�
*/
- @Excel(name = "鏄惁鍙戦�侀偖浠�",readConverterExp="1=宸插彂閫�,0=鏈彂閫�")
+ @Excel(name = "鏄惁鍙戦�侀偖浠�", readConverterExp = "1=宸插彂閫�,0=鏈彂閫�")
@ApiModelProperty(value = "鏄惁鍙戦�侀偖浠�")
private String sendEmail;
/**
* 鏄惁鍙戦�佺煭淇�
*/
- @Excel(name = "鏄惁鍙戦�佺煭淇�",readConverterExp="1=宸插彂閫�,0=鏈彂閫�")
+ @Excel(name = "鏄惁鍙戦�佺煭淇�", readConverterExp = "1=宸插彂閫�,0=鏈彂閫�")
@ApiModelProperty(value = "鏄惁鍙戦�佺煭淇�")
private String sendMessage;
- @Excel(name = "鎬绘瀹℃牳鐘舵��",readConverterExp="1=宸插鏍�,0=鏈鏍�")
+ @Excel(name = "鎬绘瀹℃牳鐘舵��", readConverterExp = "1=宸插鏍�,0=鏈鏍�")
@ApiModelProperty(value = "鎬绘瀹℃牳鐘舵��")
private Integer checkStatus;
@@ -195,7 +195,7 @@
/**
* 鏄惁澶嶆
*/
- @Excel(name = "鏄惁澶嶆",readConverterExp="1=鍚�,0=鏄�")
+ @Excel(name = "鏄惁澶嶆", readConverterExp = "1=鍚�,0=鏄�")
@ApiModelProperty(value = "鏄惁澶嶆")
private Integer isReturn;
@@ -203,7 +203,7 @@
* 鎶ュ憡鏈�鍚庢墦鍗版椂闂�
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = " pc鏈�鍚庢墦鍗版姤鍛婃椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss",defaultValue = "鏃�")
+ @Excel(name = " pc鏈�鍚庢墦鍗版姤鍛婃椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", defaultValue = "鏃�")
@ApiModelProperty(value = "鎶ュ憡鏈�鍚庢墦鍗版椂闂�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date printLastTime;
@@ -212,11 +212,10 @@
* 鎶ュ憡鏈�鍚庝笅杞芥椂闂�
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "web鏈�鍚庝笅杞芥姤鍛婃椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss",defaultValue = "鏃�")
+ @Excel(name = "web鏈�鍚庝笅杞芥姤鍛婃椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", defaultValue = "鏃�")
@ApiModelProperty(value = "鎶ュ憡鏈�鍚庝笅杞芥椂闂�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date downloadLastTime;
-
/**
@@ -352,7 +351,7 @@
@ApiModelProperty("宸叉墦鍗版湭鎵撳嵃")
@TableField(exist = false)
- private Integer type=0;
+ private Integer type = 0;
@ApiModelProperty("涓汉妯℃澘id")
@TableField(exist = false)
@@ -366,15 +365,12 @@
@ApiModelProperty("寰俊鏀粯璁㈠崟涓婚敭id")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String mallOrderId;
-
-
/**
* 浣撴鐘舵��
*/
- @Excel(name = "浣撴鐘舵��",defaultValue = "鏃�")
+ @Excel(name = "浣撴鐘舵��", defaultValue = "鏃�")
@ApiModelProperty(value = "浣撴鐘舵��")
private Integer status;
-
/**
* 鍒濆
*/
@@ -394,6 +390,30 @@
private String firmDeptId;
+ /**
+ * 鏍告敹鐘舵��
+ */
+ @ApiModelProperty(value = "鏍告敹鐘舵��")
+ private Integer heshouStatus;
+ /**
+ * 鏍告敹浜�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鏍告敹鏃堕棿")
+ private Date heshouTime;
+ /**
+ * 鏍告敹浜�
+ */
+ @ApiModelProperty(value = "鏍告敹浜�")
+ private String heshouDoctor;
+
+ /**
+ * 鏈夋棤浼氳瘖
+ */
+ @ApiModelProperty(value = "鏈夋棤浼氳瘖")
+ private Integer isHz;
+
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjHzLogMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjHzLogMapper.java
new file mode 100644
index 0000000..25797b0
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjHzLogMapper.java
@@ -0,0 +1,70 @@
+package com.ltkj.hosp.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ltkj.hosp.domain.TjGroupingPro;
+import com.ltkj.hosp.domain.TjHzLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 浼氳瘖鐢宠璁板綍
+ * Mapper鎺ュ彛
+ *
+ * @author ltkj_璧典匠璞�&鏉庢牸
+ * @date 2023-11-22
+ */
+@Mapper
+public interface TjHzLogMapper extends BaseMapper<TjHzLog> {
+ /**
+ * 鏌ヨ浼氳瘖鐢宠璁板綍
+ *
+ * @param id 浼氳瘖鐢宠璁板綍
+ * 涓婚敭
+ * @return 浼氳瘖鐢宠璁板綍
+ */
+ public TjHzLog selectTjHzLogById(Long id);
+
+ /**
+ * 鏌ヨ浼氳瘖鐢宠璁板綍
+ * 鍒楄〃
+ *
+ * @param tjHzLog 浼氳瘖鐢宠璁板綍
+ * @return 浼氳瘖鐢宠璁板綍
+ * 闆嗗悎
+ */
+ public List<TjHzLog> selectTjHzLogList(TjHzLog tjHzLog);
+
+ /**
+ * 鏂板浼氳瘖鐢宠璁板綍
+ *
+ * @param tjHzLog 浼氳瘖鐢宠璁板綍
+ * @return 缁撴灉
+ */
+ public int insertTjHzLog(TjHzLog tjHzLog);
+
+ /**
+ * 淇敼浼氳瘖鐢宠璁板綍
+ *
+ * @param tjHzLog 浼氳瘖鐢宠璁板綍
+ * @return 缁撴灉
+ */
+ public int updateTjHzLog(TjHzLog tjHzLog);
+
+ /**
+ * 鍒犻櫎浼氳瘖鐢宠璁板綍
+ *
+ * @param id 浼氳瘖鐢宠璁板綍
+ * 涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteTjHzLogById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎浼氳瘖鐢宠璁板綍
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteTjHzLogByIds(Long[] ids);
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjHzReplyLogMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjHzReplyLogMapper.java
new file mode 100644
index 0000000..05b0b86
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjHzReplyLogMapper.java
@@ -0,0 +1,65 @@
+package com.ltkj.hosp.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ltkj.hosp.domain.TjHzReplyLog;
+import com.ltkj.hosp.domain.TjOrderDetail;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 浼氳瘖鍥炲璁板綍Mapper鎺ュ彛
+ *
+ * @author ltkj_璧典匠璞�&鏉庢牸
+ * @date 2023-11-22
+ */
+@Mapper
+public interface TjHzReplyLogMapper extends BaseMapper<TjHzReplyLog> {
+ /**
+ * 鏌ヨ浼氳瘖鍥炲璁板綍
+ *
+ * @param id 浼氳瘖鍥炲璁板綍涓婚敭
+ * @return 浼氳瘖鍥炲璁板綍
+ */
+ public TjHzReplyLog selectTjHzReplyLogById(Long id);
+
+ /**
+ * 鏌ヨ浼氳瘖鍥炲璁板綍鍒楄〃
+ *
+ * @param tjHzReplyLog 浼氳瘖鍥炲璁板綍
+ * @return 浼氳瘖鍥炲璁板綍闆嗗悎
+ */
+ public List<TjHzReplyLog> selectTjHzReplyLogList(TjHzReplyLog tjHzReplyLog);
+
+ /**
+ * 鏂板浼氳瘖鍥炲璁板綍
+ *
+ * @param tjHzReplyLog 浼氳瘖鍥炲璁板綍
+ * @return 缁撴灉
+ */
+ public int insertTjHzReplyLog(TjHzReplyLog tjHzReplyLog);
+
+ /**
+ * 淇敼浼氳瘖鍥炲璁板綍
+ *
+ * @param tjHzReplyLog 浼氳瘖鍥炲璁板綍
+ * @return 缁撴灉
+ */
+ public int updateTjHzReplyLog(TjHzReplyLog tjHzReplyLog);
+
+ /**
+ * 鍒犻櫎浼氳瘖鍥炲璁板綍
+ *
+ * @param id 浼氳瘖鍥炲璁板綍涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteTjHzReplyLogById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎浼氳瘖鍥炲璁板綍
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteTjHzReplyLogByIds(Long[] ids);
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjHzLogService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjHzLogService.java
new file mode 100644
index 0000000..92b8965
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjHzLogService.java
@@ -0,0 +1,70 @@
+package com.ltkj.hosp.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ltkj.hosp.domain.TjGroupingPro;
+import com.ltkj.hosp.domain.TjHzLog;
+
+/**
+ * 浼氳瘖鐢宠璁板綍
+ * Service鎺ュ彛
+ *
+ * @author ltkj_璧典匠璞�&鏉庢牸
+ * @date 2023-11-22
+ */
+public interface ITjHzLogService extends IService<TjHzLog> {
+ /**
+ * 鏌ヨ浼氳瘖鐢宠璁板綍
+ *
+ * @param id 浼氳瘖鐢宠璁板綍
+ * 涓婚敭
+ * @return 浼氳瘖鐢宠璁板綍
+ */
+ public TjHzLog selectTjHzLogById(Long id);
+
+ /**
+ * 鏌ヨ浼氳瘖鐢宠璁板綍
+ * 鍒楄〃
+ *
+ * @param tjHzLog 浼氳瘖鐢宠璁板綍
+ * @return 浼氳瘖鐢宠璁板綍
+ * 闆嗗悎
+ */
+ public List<TjHzLog> selectTjHzLogList(TjHzLog tjHzLog);
+
+ /**
+ * 鏂板浼氳瘖鐢宠璁板綍
+ *
+ * @param tjHzLog 浼氳瘖鐢宠璁板綍
+ * @return 缁撴灉
+ */
+ public int insertTjHzLog(TjHzLog tjHzLog);
+
+ /**
+ * 淇敼浼氳瘖鐢宠璁板綍
+ *
+ * @param tjHzLog 浼氳瘖鐢宠璁板綍
+ * @return 缁撴灉
+ */
+ public int updateTjHzLog(TjHzLog tjHzLog);
+
+ /**
+ * 鎵归噺鍒犻櫎浼氳瘖鐢宠璁板綍
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑浼氳瘖鐢宠璁板綍
+ * 涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteTjHzLogByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎浼氳瘖鐢宠璁板綍
+ * 淇℃伅
+ *
+ * @param id 浼氳瘖鐢宠璁板綍
+ * 涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteTjHzLogById(Long id);
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjHzReplyLogService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjHzReplyLogService.java
new file mode 100644
index 0000000..56b345f
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjHzReplyLogService.java
@@ -0,0 +1,63 @@
+package com.ltkj.hosp.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ltkj.hosp.domain.TjHzLog;
+import com.ltkj.hosp.domain.TjHzReplyLog;
+
+/**
+ * 浼氳瘖鍥炲璁板綍Service鎺ュ彛
+ *
+ * @author ltkj_璧典匠璞�&鏉庢牸
+ * @date 2023-11-22
+ */
+public interface ITjHzReplyLogService extends IService<TjHzReplyLog> {
+ /**
+ * 鏌ヨ浼氳瘖鍥炲璁板綍
+ *
+ * @param id 浼氳瘖鍥炲璁板綍涓婚敭
+ * @return 浼氳瘖鍥炲璁板綍
+ */
+ public TjHzReplyLog selectTjHzReplyLogById(Long id);
+
+ /**
+ * 鏌ヨ浼氳瘖鍥炲璁板綍鍒楄〃
+ *
+ * @param tjHzReplyLog 浼氳瘖鍥炲璁板綍
+ * @return 浼氳瘖鍥炲璁板綍闆嗗悎
+ */
+ public List<TjHzReplyLog> selectTjHzReplyLogList(TjHzReplyLog tjHzReplyLog);
+
+ /**
+ * 鏂板浼氳瘖鍥炲璁板綍
+ *
+ * @param tjHzReplyLog 浼氳瘖鍥炲璁板綍
+ * @return 缁撴灉
+ */
+ public int insertTjHzReplyLog(TjHzReplyLog tjHzReplyLog);
+
+ /**
+ * 淇敼浼氳瘖鍥炲璁板綍
+ *
+ * @param tjHzReplyLog 浼氳瘖鍥炲璁板綍
+ * @return 缁撴灉
+ */
+ public int updateTjHzReplyLog(TjHzReplyLog tjHzReplyLog);
+
+ /**
+ * 鎵归噺鍒犻櫎浼氳瘖鍥炲璁板綍
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑浼氳瘖鍥炲璁板綍涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteTjHzReplyLogByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎浼氳瘖鍥炲璁板綍淇℃伅
+ *
+ * @param id 浼氳瘖鍥炲璁板綍涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteTjHzReplyLogById(Long id);
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjHzLogServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjHzLogServiceImpl.java
new file mode 100644
index 0000000..af8ec5b
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjHzLogServiceImpl.java
@@ -0,0 +1,99 @@
+package com.ltkj.hosp.service.impl;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ltkj.common.utils.DateUtils;
+import com.ltkj.hosp.domain.TjGroupingPro;
+import com.ltkj.hosp.mapper.TjGroupingProMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ltkj.hosp.mapper.TjHzLogMapper;
+import com.ltkj.hosp.domain.TjHzLog;
+import com.ltkj.hosp.service.ITjHzLogService;
+
+/**
+ * 浼氳瘖鐢宠璁板綍
+ * Service涓氬姟灞傚鐞�
+ *
+ * @author ltkj_璧典匠璞�&鏉庢牸
+ * @date 2023-11-22
+ */
+@Service
+public class TjHzLogServiceImpl extends ServiceImpl<TjHzLogMapper, TjHzLog> implements ITjHzLogService {
+ @Autowired
+ private TjHzLogMapper tjHzLogMapper;
+
+ /**
+ * 鏌ヨ浼氳瘖鐢宠璁板綍
+ *
+ * @param id 浼氳瘖鐢宠璁板綍
+ * 涓婚敭
+ * @return 浼氳瘖鐢宠璁板綍
+ */
+ @Override
+ public TjHzLog selectTjHzLogById(Long id) {
+ return tjHzLogMapper.selectTjHzLogById(id);
+ }
+
+ /**
+ * 鏌ヨ浼氳瘖鐢宠璁板綍
+ * 鍒楄〃
+ *
+ * @param tjHzLog 浼氳瘖鐢宠璁板綍
+ * @return 浼氳瘖鐢宠璁板綍
+ */
+ @Override
+ public List<TjHzLog> selectTjHzLogList(TjHzLog tjHzLog) {
+ return tjHzLogMapper.selectTjHzLogList(tjHzLog);
+ }
+
+ /**
+ * 鏂板浼氳瘖鐢宠璁板綍
+ *
+ * @param tjHzLog 浼氳瘖鐢宠璁板綍
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertTjHzLog(TjHzLog tjHzLog) {
+ tjHzLog.setCreateTime(DateUtils.getNowDate());
+ return tjHzLogMapper.insertTjHzLog(tjHzLog);
+ }
+
+ /**
+ * 淇敼浼氳瘖鐢宠璁板綍
+ *
+ * @param tjHzLog 浼氳瘖鐢宠璁板綍
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateTjHzLog(TjHzLog tjHzLog) {
+ tjHzLog.setUpdateTime(DateUtils.getNowDate());
+ return tjHzLogMapper.updateTjHzLog(tjHzLog);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎浼氳瘖鐢宠璁板綍
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑浼氳瘖鐢宠璁板綍
+ * 涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteTjHzLogByIds(Long[] ids) {
+ return tjHzLogMapper.deleteTjHzLogByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎浼氳瘖鐢宠璁板綍
+ * 淇℃伅
+ *
+ * @param id 浼氳瘖鐢宠璁板綍
+ * 涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteTjHzLogById(Long id) {
+ return tjHzLogMapper.deleteTjHzLogById(id);
+ }
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjHzReplyLogServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjHzReplyLogServiceImpl.java
new file mode 100644
index 0000000..f1d937f
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjHzReplyLogServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ltkj.hosp.service.impl;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ltkj.common.utils.DateUtils;
+import com.ltkj.hosp.domain.TjGroupingPro;
+import com.ltkj.hosp.mapper.TjGroupingProMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ltkj.hosp.mapper.TjHzReplyLogMapper;
+import com.ltkj.hosp.domain.TjHzReplyLog;
+import com.ltkj.hosp.service.ITjHzReplyLogService;
+
+/**
+ * 浼氳瘖鍥炲璁板綍Service涓氬姟灞傚鐞�
+ *
+ * @author ltkj_璧典匠璞�&鏉庢牸
+ * @date 2023-11-22
+ */
+@Service
+public class TjHzReplyLogServiceImpl extends ServiceImpl<TjHzReplyLogMapper, TjHzReplyLog> implements ITjHzReplyLogService {
+ @Autowired
+ private TjHzReplyLogMapper tjHzReplyLogMapper;
+
+ /**
+ * 鏌ヨ浼氳瘖鍥炲璁板綍
+ *
+ * @param id 浼氳瘖鍥炲璁板綍涓婚敭
+ * @return 浼氳瘖鍥炲璁板綍
+ */
+ @Override
+ public TjHzReplyLog selectTjHzReplyLogById(Long id) {
+ return tjHzReplyLogMapper.selectTjHzReplyLogById(id);
+ }
+
+ /**
+ * 鏌ヨ浼氳瘖鍥炲璁板綍鍒楄〃
+ *
+ * @param tjHzReplyLog 浼氳瘖鍥炲璁板綍
+ * @return 浼氳瘖鍥炲璁板綍
+ */
+ @Override
+ public List<TjHzReplyLog> selectTjHzReplyLogList(TjHzReplyLog tjHzReplyLog) {
+ return tjHzReplyLogMapper.selectTjHzReplyLogList(tjHzReplyLog);
+ }
+
+ /**
+ * 鏂板浼氳瘖鍥炲璁板綍
+ *
+ * @param tjHzReplyLog 浼氳瘖鍥炲璁板綍
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertTjHzReplyLog(TjHzReplyLog tjHzReplyLog) {
+ tjHzReplyLog.setCreateTime(DateUtils.getNowDate());
+ return tjHzReplyLogMapper.insertTjHzReplyLog(tjHzReplyLog);
+ }
+
+ /**
+ * 淇敼浼氳瘖鍥炲璁板綍
+ *
+ * @param tjHzReplyLog 浼氳瘖鍥炲璁板綍
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateTjHzReplyLog(TjHzReplyLog tjHzReplyLog) {
+ tjHzReplyLog.setUpdateTime(DateUtils.getNowDate());
+ return tjHzReplyLogMapper.updateTjHzReplyLog(tjHzReplyLog);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎浼氳瘖鍥炲璁板綍
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑浼氳瘖鍥炲璁板綍涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteTjHzReplyLogByIds(Long[] ids) {
+ return tjHzReplyLogMapper.deleteTjHzReplyLogByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎浼氳瘖鍥炲璁板綍淇℃伅
+ *
+ * @param id 浼氳瘖鍥炲璁板綍涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteTjHzReplyLogById(Long id) {
+ return tjHzReplyLogMapper.deleteTjHzReplyLogById(id);
+ }
+}
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjHzLogMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjHzLogMapper.xml
new file mode 100644
index 0000000..ea58946
--- /dev/null
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjHzLogMapper.xml
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ltkj.hosp.mapper.TjHzLogMapper">
+
+ <resultMap type="TjHzLog" id="TjHzLogResult">
+ <result property="id" column="id"/>
+ <result property="orderId" column="order_id"/>
+ <result property="userId" column="user_id"/>
+ <result property="tjNumber" column="tj_number"/>
+ <result property="userName" column="user_name"/>
+ <result property="hzType" column="hz_type"/>
+ <result property="hzDeptId" column="hz_dept_id"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="createBy" column="create_by"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="deleted" column="deleted"/>
+ <result property="hzDoctorId" column="hz_doctor_id"/>
+ <result property="hzDoctorName" column="hz_doctor_name"/>
+ </resultMap>
+
+ <sql id="selectTjHzLogVo">
+ select id,
+ order_id,
+ user_id,
+ tj_number,
+ user_name,
+ hz_type,
+ hz_dept_id,
+ create_time,
+ update_time,
+ create_by,
+ update_by,
+ deleted,
+ hz_doctor_id,
+ hz_doctor_name
+ from tj_hz_log
+ </sql>
+
+ <select id="selectTjHzLogList" parameterType="TjHzLog" resultMap="TjHzLogResult">
+ <include refid="selectTjHzLogVo"/>
+ <where>
+ <if test="tjNumber != null and tjNumber != ''">
+ and tj_number = #{tjNumber}
+ </if>
+ <if test="userName != null and userName != ''">
+ and user_name like concat('%', #{userName}, '%')
+ </if>
+ <if test="hzType != null and hzType != ''">
+ and hz_type = #{hzType}
+ </if>
+ </where>
+ </select>
+
+ <select id="selectTjHzLogById" parameterType="Long"
+ resultMap="TjHzLogResult">
+ <include refid="selectTjHzLogVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertTjHzLog" parameterType="TjHzLog" useGeneratedKeys="true"
+ keyProperty="id">
+ insert into tj_hz_log
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="orderId != null">order_id,
+ </if>
+ <if test="userId != null">user_id,
+ </if>
+ <if test="tjNumber != null">tj_number,
+ </if>
+ <if test="userName != null">user_name,
+ </if>
+ <if test="hzType != null">hz_type,
+ </if>
+ <if test="hzDeptId != null">hz_dept_id,
+ </if>
+ <if test="createTime != null">create_time,
+ </if>
+ <if test="updateTime != null">update_time,
+ </if>
+ <if test="createBy != null">create_by,
+ </if>
+ <if test="updateBy != null">update_by,
+ </if>
+ <if test="deleted != null">deleted,
+ </if>
+ <if test="hzDoctorId != null">hz_doctor_id,
+ </if>
+ <if test="hzDoctorName != null">hz_doctor_name,
+ </if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="orderId != null">#{orderId},
+ </if>
+ <if test="userId != null">#{userId},
+ </if>
+ <if test="tjNumber != null">#{tjNumber},
+ </if>
+ <if test="userName != null">#{userName},
+ </if>
+ <if test="hzType != null">#{hzType},
+ </if>
+ <if test="hzDeptId != null">#{hzDeptId},
+ </if>
+ <if test="createTime != null">#{createTime},
+ </if>
+ <if test="updateTime != null">#{updateTime},
+ </if>
+ <if test="createBy != null">#{createBy},
+ </if>
+ <if test="updateBy != null">#{updateBy},
+ </if>
+ <if test="deleted != null">#{deleted},
+ </if>
+ <if test="hzDoctorId != null">#{hzDoctorId},
+ </if>
+ <if test="hzDoctorName != null">#{hzDoctorName},
+ </if>
+ </trim>
+ </insert>
+
+ <update id="updateTjHzLog" parameterType="TjHzLog">
+ update tj_hz_log
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="orderId != null">order_id =
+ #{orderId},
+ </if>
+ <if test="userId != null">user_id =
+ #{userId},
+ </if>
+ <if test="tjNumber != null">tj_number =
+ #{tjNumber},
+ </if>
+ <if test="userName != null">user_name =
+ #{userName},
+ </if>
+ <if test="hzType != null">hz_type =
+ #{hzType},
+ </if>
+ <if test="hzDeptId != null">hz_dept_id =
+ #{hzDeptId},
+ </if>
+ <if test="createTime != null">create_time =
+ #{createTime},
+ </if>
+ <if test="updateTime != null">update_time =
+ #{updateTime},
+ </if>
+ <if test="createBy != null">create_by =
+ #{createBy},
+ </if>
+ <if test="updateBy != null">update_by =
+ #{updateBy},
+ </if>
+ <if test="deleted != null">deleted =
+ #{deleted},
+ </if>
+ <if test="hzDoctorId != null">hz_doctor_id =
+ #{hzDoctorId},
+ </if>
+ <if test="hzDoctorName != null">hz_doctor_name =
+ #{hzDoctorName},
+ </if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteTjHzLogById" parameterType="Long">
+ delete
+ from tj_hz_log
+ where id = #{id}
+ </delete>
+
+ <delete id="deleteTjHzLogByIds" parameterType="String">
+ delete from tj_hz_log where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+</mapper>
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjHzReplyLogMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjHzReplyLogMapper.xml
new file mode 100644
index 0000000..ad42778
--- /dev/null
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjHzReplyLogMapper.xml
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ltkj.hosp.mapper.TjHzReplyLogMapper">
+
+ <resultMap type="TjHzReplyLog" id="TjHzReplyLogResult">
+ <result property="id" column="id"/>
+ <result property="orderId" column="order_id"/>
+ <result property="tjNumber" column="tj_number"/>
+ <result property="userId" column="user_id"/>
+ <result property="userName" column="user_name"/>
+ <result property="hzType" column="hz_type"/>
+ <result property="replyDoctorId" column="reply_doctor_id"/>
+ <result property="replyDoctorName" column="reply_doctor_name"/>
+ <result property="replyDeptId" column="reply_dept_id"/>
+ <result property="replyDeptName" column="reply_dept_name"/>
+ <result property="replyContent" column="reply_content"/>
+ <result property="status" column="status"/>
+ <result property="remark" column="remark"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="createBy" column="create_by"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="deleted" column="deleted"/>
+ <result property="hzId" column="hz_id"/>
+ <result property="hzDoctorId" column="hz_doctor_id"/>
+ <result property="hzDoctorName" column="hz_doctor_name"/>
+ </resultMap>
+
+ <sql id="selectTjHzReplyLogVo">
+ select id, order_id, tj_number, user_id, user_name, hz_type, reply_doctor_id, reply_doctor_name, reply_dept_id, reply_dept_name, reply_content, status, remark, create_time, update_time, create_by, update_by, deleted, hz_id, hz_doctor_id, hz_doctor_name
+ from tj_hz_reply_log
+ </sql>
+
+ <select id="selectTjHzReplyLogList" parameterType="TjHzReplyLog" resultMap="TjHzReplyLogResult">
+ <include refid="selectTjHzReplyLogVo"/>
+ <where>
+ <if test="tjNumber != null and tjNumber != ''">
+ and tj_number = #{tjNumber}
+ </if>
+ <if test="userName != null and userName != ''">
+ and user_name like concat('%', #{userName}, '%')
+ </if>
+ <if test="hzType != null and hzType != ''">
+ and hz_type = #{hzType}
+ </if>
+ <if test="hzDoctorName != null and hzDoctorName != ''">
+ and hz_doctor_name like concat('%', #{hzDoctorName}, '%')
+ </if>
+ </where>
+ </select>
+
+ <select id="selectTjHzReplyLogById" parameterType="Long"
+ resultMap="TjHzReplyLogResult">
+ <include refid="selectTjHzReplyLogVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertTjHzReplyLog" parameterType="TjHzReplyLog" useGeneratedKeys="true"
+ keyProperty="id">
+ insert into tj_hz_reply_log
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="orderId != null">order_id,
+ </if>
+ <if test="tjNumber != null">tj_number,
+ </if>
+ <if test="userId != null">user_id,
+ </if>
+ <if test="userName != null">user_name,
+ </if>
+ <if test="hzType != null">hz_type,
+ </if>
+ <if test="replyDoctorId != null">reply_doctor_id,
+ </if>
+ <if test="replyDoctorName != null">reply_doctor_name,
+ </if>
+ <if test="replyDeptId != null">reply_dept_id,
+ </if>
+ <if test="replyDeptName != null">reply_dept_name,
+ </if>
+ <if test="replyContent != null">reply_content,
+ </if>
+ <if test="status != null">status,
+ </if>
+ <if test="remark != null">remark,
+ </if>
+ <if test="createTime != null">create_time,
+ </if>
+ <if test="updateTime != null">update_time,
+ </if>
+ <if test="createBy != null">create_by,
+ </if>
+ <if test="updateBy != null">update_by,
+ </if>
+ <if test="deleted != null">deleted,
+ </if>
+ <if test="hzId != null">hz_id,
+ </if>
+ <if test="hzDoctorId != null">hz_doctor_id,
+ </if>
+ <if test="hzDoctorName != null">hz_doctor_name,
+ </if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="orderId != null">#{orderId},
+ </if>
+ <if test="tjNumber != null">#{tjNumber},
+ </if>
+ <if test="userId != null">#{userId},
+ </if>
+ <if test="userName != null">#{userName},
+ </if>
+ <if test="hzType != null">#{hzType},
+ </if>
+ <if test="replyDoctorId != null">#{replyDoctorId},
+ </if>
+ <if test="replyDoctorName != null">#{replyDoctorName},
+ </if>
+ <if test="replyDeptId != null">#{replyDeptId},
+ </if>
+ <if test="replyDeptName != null">#{replyDeptName},
+ </if>
+ <if test="replyContent != null">#{replyContent},
+ </if>
+ <if test="status != null">#{status},
+ </if>
+ <if test="remark != null">#{remark},
+ </if>
+ <if test="createTime != null">#{createTime},
+ </if>
+ <if test="updateTime != null">#{updateTime},
+ </if>
+ <if test="createBy != null">#{createBy},
+ </if>
+ <if test="updateBy != null">#{updateBy},
+ </if>
+ <if test="deleted != null">#{deleted},
+ </if>
+ <if test="hzId != null">#{hzId},
+ </if>
+ <if test="hzDoctorId != null">#{hzDoctorId},
+ </if>
+ <if test="hzDoctorName != null">#{hzDoctorName},
+ </if>
+ </trim>
+ </insert>
+
+ <update id="updateTjHzReplyLog" parameterType="TjHzReplyLog">
+ update tj_hz_reply_log
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="orderId != null">order_id =
+ #{orderId},
+ </if>
+ <if test="tjNumber != null">tj_number =
+ #{tjNumber},
+ </if>
+ <if test="userId != null">user_id =
+ #{userId},
+ </if>
+ <if test="userName != null">user_name =
+ #{userName},
+ </if>
+ <if test="hzType != null">hz_type =
+ #{hzType},
+ </if>
+ <if test="replyDoctorId != null">reply_doctor_id =
+ #{replyDoctorId},
+ </if>
+ <if test="replyDoctorName != null">reply_doctor_name =
+ #{replyDoctorName},
+ </if>
+ <if test="replyDeptId != null">reply_dept_id =
+ #{replyDeptId},
+ </if>
+ <if test="replyDeptName != null">reply_dept_name =
+ #{replyDeptName},
+ </if>
+ <if test="replyContent != null">reply_content =
+ #{replyContent},
+ </if>
+ <if test="status != null">status =
+ #{status},
+ </if>
+ <if test="remark != null">remark =
+ #{remark},
+ </if>
+ <if test="createTime != null">create_time =
+ #{createTime},
+ </if>
+ <if test="updateTime != null">update_time =
+ #{updateTime},
+ </if>
+ <if test="createBy != null">create_by =
+ #{createBy},
+ </if>
+ <if test="updateBy != null">update_by =
+ #{updateBy},
+ </if>
+ <if test="deleted != null">deleted =
+ #{deleted},
+ </if>
+ <if test="hzId != null">hz_id =
+ #{hzId},
+ </if>
+ <if test="hzDoctorId != null">hz_doctor_id =
+ #{hzDoctorId},
+ </if>
+ <if test="hzDoctorName != null">hz_doctor_name =
+ #{hzDoctorName},
+ </if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteTjHzReplyLogById" parameterType="Long">
+ delete
+ from tj_hz_reply_log where id = #{id}
+ </delete>
+
+ <delete id="deleteTjHzReplyLogByIds" parameterType="String">
+ delete from tj_hz_reply_log where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0