From 7189009850befd6dbd844ea61dee393c8e60e2ab Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 02 一月 2025 15:26:16 +0800
Subject: [PATCH] 20250102-02
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java | 117 --------------------------------------
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 14 ++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 5 +
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjSamplingMapper.java | 17 +++++
4 files changed, 38 insertions(+), 115 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index 97fdb0a..f55da7b 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -4,6 +4,7 @@
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
@@ -16,6 +17,7 @@
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.hisDto.*;
+import com.ltkj.hosp.mapper.TjSamplingMapper;
import com.ltkj.hosp.pacsDto.SavePacsApply;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.vodomain.AddNewReservationConfirm;
@@ -153,6 +155,8 @@
private SamplingServiceApi samplingServiceApi;
@Autowired
private ISysDictDataService sysDictDataService;
+ @Autowired
+ private TjSamplingMapper tjSamplingMapper;
@Override
@@ -502,6 +506,11 @@
}
}
+ if (StrUtil.isNotBlank(jxbz)){
+ tjSamplingMapper.updateUserIdByTjNumAndJxbz(order.getTjNumber(),sysUser.getNickName(), String.valueOf(sysUser.getUserId()),jxbz);
+ }else {
+ tjSamplingMapper.updateUserIdByTjNum(order.getTjNumber(),sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
+ }
}
@Override
@@ -827,6 +836,11 @@
}
}
+ if (StrUtil.isNotBlank(jxbz)){
+ tjSamplingMapper.updateUserIdByTjNumAndJxbz(order.getTjNumber(),sysUser.getNickName(), String.valueOf(sysUser.getUserId()),jxbz);
+ }else {
+ tjSamplingMapper.updateUserIdByTjNum(order.getTjNumber(),sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
+ }
}
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 5dd673a..bfb5fb4 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
@@ -1476,6 +1476,11 @@
}
}
+ if (StrUtil.isNotBlank(jxbz)){
+ tjSamplingMapper.updateUserIdByTjNumAndJxbz(order.getTjNumber(),sysUser.getNickName(), String.valueOf(sysUser.getUserId()),jxbz);
+ }else {
+ tjSamplingMapper.updateUserIdByTjNum(order.getTjNumber(),sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java
index 7d0b56e..87afaa4 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java
@@ -12,6 +12,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -22,10 +23,9 @@
* @author ltkj_璧典匠璞�&鏉庢牸
* @date 2023-04-11
*/
+@EqualsAndHashCode(callSuper = true)
@Data
@ApiModel(value = "閲囨牱绠＄悊")
-@AllArgsConstructor
-@NoArgsConstructor
public class TjSampling extends BaseEntity {
private static final long serialVersionUID = 1L;
@@ -139,119 +139,6 @@
* 琛ュ綍椤圭洰鏍囧織缂栫爜
*/
private String jxbz;
-
- public String getJxbz() {
- return jxbz;
- }
-
- public void setJxbz(String jxbz) {
- this.jxbz = jxbz;
- }
-
- public String getJyxmdm() {
- return jyxmdm;
- }
-
- public void setJyxmdm(String jyxmdm) {
- this.jyxmdm = jyxmdm;
- }
-
- public Integer getIsMerge() {
- return isMerge;
- }
-
- public void setIsMerge(Integer isMerge) {
- this.isMerge = isMerge;
- }
-
- public String getSpecimenTypeCode() {
- return specimenTypeCode;
- }
-
- public void setSpecimenTypeCode(String specimenTypeCode) {
- this.specimenTypeCode = specimenTypeCode;
- }
-
- public String getParentId() {
- return parentId;
- }
-
- public void setParentId(String parentId) {
- this.parentId = parentId;
- }
-
- public String getJyxh() {
- return jyxh;
- }
-
- public void setJyxh(String jyxh) {
- this.jyxh = jyxh;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getId() {
- return id;
- }
-
- public void setSamplingNumber(String samplingNumber) {
- this.samplingNumber = samplingNumber;
- }
-
- public String getSamplingNumber() {
- return samplingNumber;
- }
-
- public void setCusId(String cusId) {
- this.cusId = cusId;
- }
-
- public String getCusId() {
- return cusId;
- }
-
- public void setApplicationTime(Date applicationTime) {
- this.applicationTime = applicationTime;
- }
-
- public Date getApplicationTime() {
- return applicationTime;
- }
-
-
- public void setTjTime(Date tjTime) {
- this.tjTime = tjTime;
- }
-
- public Date getTjTime() {
- return tjTime;
- }
-
- public void setSpecimenType(String specimenType) {
- this.specimenType = specimenType;
- }
-
- public String getSpecimenType() {
- return specimenType;
- }
-
- public void setProId(String proId) {
- this.proId = proId;
- }
-
- public String getProId() {
- return proId;
- }
-
- public void setProName(String proName) {
- this.proName = proName;
- }
-
- public String getProName() {
- return proName;
- }
@Override
public String toString() {
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjSamplingMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjSamplingMapper.java
index 8204779..e5f61fb 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjSamplingMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjSamplingMapper.java
@@ -178,4 +178,21 @@
"\t\ta.id = #{id} \n" +
"\t) aa WHERE aa.jyfldm NOT IN ( SELECT c.flbm FROM lis_jyflhb c )")
int isMergeItem(@Param("id") String id);
+
+
+ @Update("UPDATE tj_sampling a SET\n" +
+ "a.update_time=SYSDATE(),\n" +
+ "a.update_by= #{userName},\n" +
+ "a.update_id= #{userId}\n" +
+ "a.create_id = #{userId}\n"+
+ "WHERE a.tj_num=#{tjNum}")
+ boolean updateUserIdByTjNum(@Param("tjNum")String tjNum,@Param("userName")String userName,@Param("userId") String userId);
+
+ @Update("UPDATE tj_sampling a SET\n" +
+ "a.update_time=SYSDATE(),\n" +
+ "a.update_by= #{userName},\n" +
+ "a.update_id= #{userId}\n" +
+ "a.create_id = #{userId}\n"+
+ "WHERE a.tj_num=#{tjNum} AND a.jxbz = #{jxbz}")
+ boolean updateUserIdByTjNumAndJxbz(@Param("tjNum")String tjNum,@Param("userName")String userName,@Param("userId") String userId,@Param("jxbz") String jxbz);
}
--
Gitblit v1.8.0