From 1356787741a823dde5ed40bb19dece59dd979511 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 30 五月 2025 15:36:51 +0800
Subject: [PATCH] zjh20250530
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjBzPro.java | 48 +++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjBzProMapper.java | 16 +++
ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java | 9 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 86 ++++++++++++-----
ltkj-common/src/main/java/com/ltkj/common/core/domain/model/LoginBody.java | 4
ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml | 4
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 6 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 50 ++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjBzProServiceImpl.java | 18 +++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjBzProService.java | 15 +++
ltkj-hosp/src/main/resources/mapper/DictCompMapper.xml | 11 +
12 files changed, 233 insertions(+), 36 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
index 897422a..5a0ea1f 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
@@ -100,7 +100,7 @@
if (loginBody.getMobile()) {
token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getType(), loginBody.getCode(), loginBody.getUuid(),hospId);
} else {
- token = loginService.Cuslogin(loginBody.getUsername(), loginBody.getPassword(), loginBody.getType(), loginBody.getCode(), loginBody.getUuid());
+ token = loginService.Cuslogin(loginBody.getUsername(),loginBody.getSfzh(),loginBody.getPassword(), loginBody.getType(), loginBody.getCode(), loginBody.getUuid());
LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
wq.eq(TjCustomer::getCusPhone, loginBody.getUsername());
TjCustomer tjCustomer = customerService.getOne(wq);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 4b0e8d7..85b02f9 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -1462,7 +1462,11 @@
} catch (NumberFormatException ignored) {
}
} else {
- tjOrderDetail.setYcbz("");
+ if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�"))
+ tjOrderDetail.setYcbz("");
+
+ if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�"))
+ tjOrderDetail.setYcbz("鈫�");
tjOrderDetail.setProResult(tjOrderDetail.getProResult());
}
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 ccca65b..e8b7984 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
@@ -1040,11 +1040,11 @@
}
tjReservation.setIsExpire(1);
tjReservationService.updateById(tjReservation);
- if (null != tjReservation.getTeamNo() && tjOrder.getTjType().equals("1")) {
- tjOrder.setTjType("1");
- } else if (tjOrder.getTjType().equals("2")) {
- tjOrder.setTjType("2");
- }
+// if (null != tjReservation.getTeamNo() && tjOrder.getTjType().equals("1")) {
+// tjOrder.setTjType("1");
+// } else if (tjOrder.getTjType().equals("2")) {
+// tjOrder.setTjType("2");
+// }
}
if (StringUtil.isBlank(tjOrder.getFirmId())) {
tjOrder.setFirmId("0");
@@ -1506,6 +1506,10 @@
List<TbTransition> list = tbTransitionService.list(wrapper);
BigDecimal zongjia = new BigDecimal("0.0");
+
+ String tjfhisxmbm = configService.selectConfigByKey("tjfhisxmbm");
+ String lycdzjhmxj = configService.selectConfigByKey("lycdzjhmxj");
+
for (TbTransition transition : list) {
LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(TjProject::getProId, transition.getProId());
@@ -1530,7 +1534,24 @@
array.add(obj);
zongjia = zongjia.add(allPrice);
}
- map.put("feiYongInfoList", array);
+
+ if(StringUtil.isNotBlank(lycdzjhmxj) && lycdzjhmxj.equalsIgnoreCase("N")){
+ map.put("feiYongInfoList", array);
+ }else {
+ JSONArray zjarray = JSONUtil.createArray();
+ JSONObject obj = JSONUtil.createObj();
+ int sl = 1;
+ obj.putOpt("danJia", zongjia);
+ obj.putOpt("jieSuanJe", zongjia);
+ obj.putOpt("shuliang", sl);
+ obj.putOpt("zhiXingKs", "100");
+ obj.putOpt("zhiXingKsMc","浣撴涓績");
+ obj.putOpt("shouFeiXmId", tjfhisxmbm);
+ obj.putOpt("shouFeiXmMc", "浣撴璐�");
+ zjarray.add(obj);
+ map.put("feiYongInfoList", zjarray);
+ }
+
log.info("璋冪敤His鎺ュ彛鍓� 鏀惰垂鎬讳环:{}", zongjia.toString());
String post = HttpClientUtils.sendPost(apiUrl + "/api/his/" + hospbm + "/creatCostInfo", map);
@@ -3214,13 +3235,14 @@
TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
if (null != order) {
-// String payByTjNum = tjOrderService.isPayByTjNum(String.valueOf(order.getOrderId()));
-// if (null != payByTjNum) {
-// return AjaxResult.error("璇ョ敤鎴峰凡鏀惰垂涓嶅彲鎾ら攢绛惧埌!");
-// }
+
if (null != order.getFinishTime()) return AjaxResult.error("璇ヤ汉鍛樺凡绛剧,涓嶅彲鎾ら攢!!!");
Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
+ String username = SecurityUtils.getUsername();
+ LambdaQueryWrapper<TjCustomer> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjCustomer::getCusId, order.getUserId());
+ TjCustomer tjCustomer = tjCustomerService.getOne(wrapper);
String s = configService.selectConfigByKey("is_request_common_his_api");
// if (null != s && s.equals("Y") && "2".equals(order.getTjType())) {
@@ -3234,9 +3256,7 @@
wrapper1.eq(TjFlowingWater::getOrderId, order.getOrderId());
wrapper1.orderByDesc(TjFlowingWater::getJxbz);
List<TjFlowingWater> list = tjFlowingWaterService.list(wrapper1);
- LambdaQueryWrapper<TjCustomer> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjCustomer::getCusId, order.getUserId());
- TjCustomer tjCustomer = tjCustomerService.getOne(wrapper);
+
for (TjFlowingWater water : list) {
if (water.getPayStasus() == 0L) {
@@ -3246,11 +3266,18 @@
}
}
+ log.info("宸ュ彿涓�: "+username+" 鐨勭敤鎴峰嵆灏嗘挙閿� 浣撴鍙蜂负:"+tjNum+" 鐨勪綋妫�璁板綍;" );
AjaxResult error = zuofeiWeiZhifu(weizhifu, tjCustomer, apiUrl, hospbm, order, true, tjNum);
- if (error != null && !error.get("code").toString().equals("200")) return error;
-
+ if (error != null && !error.get("code").toString().equals("200")){
+ log.info("宸ュ彿涓�: "+username+" 鐨勭敤鎴锋鍦ㄦ挙閿� 浣撴鍙蜂负:"+tjNum+" 骞朵笖鏈敮浠樼殑浣撴璁板綍;" );
+ return error;
+ }
AjaxResult error1 = zuofeiYiZhifu(yizhifu, tjCustomer, order, apiUrl, hospbm, false, tjNum);
- if (error1 != null && !error.get("code").toString().equals("200")) return error1;
+ if (error1 != null && !error.get("code").toString().equals("200"))
+ {
+ log.info("宸ュ彿涓�: "+username+" 鐨勭敤鎴锋鍦ㄦ挙閿� 浣撴鍙蜂负:"+tjNum+" 骞朵笖宸叉敮浠樼殑浣撴璁板綍;" );
+ return error1;
+ }
} else {
tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
@@ -3258,10 +3285,8 @@
tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
transitionService.deletedTbTransitionByTjNum(tjNum);
ycxmService.delOrderYcXmJyByTjh(tjNum);
-
- TjCustomer customer = tjCustomerService.getById(order.getUserId());
- customer.setCardId("0");
- tjCustomerService.updateById(customer);
+ tjCustomer.setCardId("0");
+ tjCustomerService.updateById(tjCustomer);
xdPictureService.deleteTjXdPictureBytjNum(tjNum);
tjSamplingMapper.deleteByTjNumAndCusId(tjNum, order.getUserId());
}
@@ -3471,11 +3496,9 @@
public AjaxResult revokeTjOrderByTjh(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNum) {
TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
+ String username = SecurityUtils.getUsername();
+ log.info("宸ュ彿涓�: "+username+" 鐨勭敤鎴峰嵆灏嗗己鍒舵挙閿� 浣撴鍙蜂负:"+tjNum+" 鐨勪綋妫�璁板綍;" );
if (null != order) {
-// String payByTjNum = tjOrderService.isPayByTjNum(String.valueOf(order.getOrderId()));
-// if (null != payByTjNum) {
-// return AjaxResult.error("璇ョ敤鎴峰凡鏀惰垂涓嶅彲鎾ら攢绛惧埌!");
-// }
//杩欓噷鍒犻櫎鐨勬槸杩欎釜浜烘墍鏈夐」鐩寘鎷ˉ褰曢」鐩�
tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
@@ -3533,7 +3556,10 @@
}
TjOrder order = tjOrderService.getOrderByTjNum(dto.getTjh());
+ String username = SecurityUtils.getUsername();
if (null != order) {
+
+ log.info("宸ュ彿涓�: "+username+" 鐨勭敤鎴峰嵆灏嗘挙閿� 浣撴鍙蜂负:"+dto.getTjh()+"琛ュ綍鍗曞彿涓�: " + dto.getBldhs()+ " 鐨� 琛ュ綍浣撴璁板綍;" );
String configByKey = configService.selectConfigByKey("sfkqdyhis");
if (null != configByKey && configByKey.equals("Y")) {
log.info("dto鐨勬暟鎹槸" + JSONUtil.toJsonStr(dto));
@@ -3595,10 +3621,18 @@
wrapper.eq(TjCustomer::getCusId, order.getUserId());
TjCustomer tjCustomer = tjCustomerService.getOne(wrapper);
AjaxResult error = zuofeiWeiZhifu(weizhifu, tjCustomer, apiUrl, hospbm, order, true, dto.getTjh());
- if (error != null && !error.get("code").toString().equals("200")) return error;
+ if (error != null && !error.get("code").toString().equals("200"))
+ {
+ log.info("宸ュ彿涓�: "+username+" 鐨勭敤鎴锋鍦ㄦ挙閿� 浣撴鍙蜂负:"+dto.getTjh()+"琛ュ綍鍗曞彿涓�: " + dto.getBldhs()+ " 骞朵笖鏈敮浠樼殑琛ュ綍浣撴璁板綍;" );
+ return error;
+ }
AjaxResult error1 = zuofeiYiZhifu(yizhifu, tjCustomer, order, apiUrl, hospbm, false, dto.getTjh());
- if (error1 != null && !error.get("code").toString().equals("200")) return error1;
+ if (error1 != null && !error.get("code").toString().equals("200"))
+ {
+ log.info("宸ュ彿涓�: "+username+" 鐨勭敤鎴锋鍦ㄦ挙閿� 浣撴鍙蜂负:"+dto.getTjh()+"琛ュ綍鍗曞彿涓�: " + dto.getBldhs()+ " 骞朵笖宸叉敮浠樼殑琛ュ綍浣撴璁板綍;" );
+ return error1;
+ }
return AjaxResult.success();
} else {
try {
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
index 672f962..a8dc766 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
@@ -27,6 +27,7 @@
import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import net.sf.ehcache.constructs.scheduledrefresh.OverseerJob;
+import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.session.SqlSession;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -73,6 +74,8 @@
private RedisCache redisCache;
@Autowired
private TjProjectXgjlService xgjlService;
+ @Autowired
+ private TjBzProService bzProService;
@GetMapping("/getTjHyBgList")
@@ -761,5 +764,52 @@
}
+ @PostMapping("/addOrupdateProByBz")
+ @ApiOperation(value = "鏂板鎴栦慨鏀规墍閫夐」鐩殑瀵瑰簲鐥呯淇℃伅")
+ @Transactional
+ public AjaxResult addOrupdateProByBz(@ApiParam(value = "椤圭洰ID闆嗗悎")@RequestParam(required = false) List<String> proIds,
+ @ApiParam(value = "鐥呯ID")@RequestParam(required = false)String bz) {
+ try {
+ if(null != proIds && !proIds.isEmpty()){
+ bzProService.remove(new LambdaQueryWrapper<>(TjBzPro.class).eq(TjBzPro::getBzId,bz));
+ for (String proId : proIds) {
+ TjBzPro bzPro=new TjBzPro();
+ bzPro.setBzId(Long.valueOf(bz));
+ bzPro.setProId(Long.valueOf(proId));
+ bzProService.save(bzPro);
+ }
+ }
+ return AjaxResult.success();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+
+ @GetMapping("/getProByBz")
+ @ApiOperation(value = "鏌ヨ鐥呯瀵瑰簲椤圭洰")
+ public AjaxResult getProByBz(@ApiParam(value = "鐥呯ID")@RequestParam(required = false)String bz) {
+ try {
+ List<TjBzPro> list = bzProService.list(new LambdaQueryWrapper<>(TjBzPro.class).eq(TjBzPro::getBzId, bz));
+ return AjaxResult.success(list);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+
+ @DeleteMapping("/delProByBz")
+ @ApiOperation(value = "鍒犻櫎鐥呯瀵瑰簲椤圭洰")
+ public AjaxResult delProByBz(@ApiParam(value = "鐥呯ID")@RequestParam(required = false)String bz,
+ @ApiParam(value = "椤圭洰ID")@RequestParam(required = false)String proId) {
+ try {
+ bzProService.remove(new LambdaQueryWrapper<>(TjBzPro.class).eq(TjBzPro::getBzId,bz).eq(TjBzPro::getProId,proId));
+ return AjaxResult.success();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+
}
diff --git a/ltkj-common/src/main/java/com/ltkj/common/core/domain/model/LoginBody.java b/ltkj-common/src/main/java/com/ltkj/common/core/domain/model/LoginBody.java
index 8e56cdd..0cd362c 100644
--- a/ltkj-common/src/main/java/com/ltkj/common/core/domain/model/LoginBody.java
+++ b/ltkj-common/src/main/java/com/ltkj/common/core/domain/model/LoginBody.java
@@ -24,6 +24,10 @@
@ApiModelProperty(value = "瀵嗙爜")
private String password;
+
+ @ApiModelProperty(value = "瀵嗙爜")
+ private String sfzh;
+
/**
* 楠岃瘉鐮�
*/
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java b/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
index efc920c..34d12c4 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
@@ -231,7 +231,7 @@
* @param password 瀵嗙爜
* @return 缁撴灉
*/
- public String Cuslogin(String username, String password, Boolean type,String code,String uuid) {
+ public String Cuslogin(String username,String sfzh, String password, Boolean type,String code,String uuid) {
String aSwitch = configService.selectConfigByKey("captcha_switch");
if(null !=aSwitch && aSwitch.equalsIgnoreCase("Y")){
@@ -251,7 +251,7 @@
}
- LoginUser loginUser = loadCusByCusname(username, password);
+ LoginUser loginUser = loadCusByCusname(username,sfzh, password);
if (loginUser == null) {
return "鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒";
}
@@ -273,11 +273,12 @@
return tokenService.createToken(loginUser);
}
- public LoginUser loadCusByCusname(String username, String password) {
+ public LoginUser loadCusByCusname(String username,String sfzh, String password) {
LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
wq.eq(TjCustomer::getCusPhone, username);
+ wq.eq(TjCustomer::getCusIdcard, sfzh);
List<TjCustomer> customerList = customerService.list(wq);
- if (null == customerList || customerList.size() == 0) {
+ if (null == customerList || customerList.isEmpty()) {
//throw new ServiceException("鐧诲綍鐢ㄦ埛锛�" + username + " 涓嶅瓨鍦�");
throw new ServiceException("璐﹀彿鎴栧瘑鐮侀敊璇紝璇锋鏌ワ紒");
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjBzPro.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjBzPro.java
new file mode 100644
index 0000000..90bd2a2
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjBzPro.java
@@ -0,0 +1,48 @@
+package com.ltkj.hosp.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.ltkj.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.File;
+
+/**
+ * ClassName: TjBzPro <br/>
+ * Description: <br/>
+ * date: 2025/5/27 17:55<br/>
+ *
+ * @author zjh<br />
+ */
+
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "浣撴椤圭洰瀵瑰簲鐥呯瀵硅薄")
+public class TjBzPro extends BaseEntity {
+ /**
+ * 涓婚敭id
+ */
+ @TableId(type = IdType.AUTO)
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+
+
+ @ApiModelProperty(value = "椤圭洰ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long proId;
+
+
+ @ApiModelProperty(value = "鐥呯ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long bzId;
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjBzProMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjBzProMapper.java
new file mode 100644
index 0000000..58e0e11
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjBzProMapper.java
@@ -0,0 +1,16 @@
+package com.ltkj.hosp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ltkj.hosp.domain.TjBzPro;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * ClassName: TjBzProMapper <br/>
+ * Description: <br/>
+ * date: 2025/5/28 16:15<br/>
+ *
+ * @author zjh<br />
+ */
+@Mapper
+public interface TjBzProMapper extends BaseMapper<TjBzPro> {
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjBzProService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjBzProService.java
new file mode 100644
index 0000000..66b7568
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjBzProService.java
@@ -0,0 +1,15 @@
+package com.ltkj.hosp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ltkj.hosp.domain.TjBzPro;
+
+/**
+ * ClassName: TjBzProService <br/>
+ * Description: <br/>
+ * date: 2025/5/28 16:15<br/>
+ *
+ * @author zjh<br />
+ */
+
+public interface TjBzProService extends IService<TjBzPro> {
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjBzProServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjBzProServiceImpl.java
new file mode 100644
index 0000000..7b9a6bb
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjBzProServiceImpl.java
@@ -0,0 +1,18 @@
+package com.ltkj.hosp.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ltkj.hosp.domain.TjBzPro;
+import com.ltkj.hosp.mapper.TjBzProMapper;
+import com.ltkj.hosp.service.TjBzProService;
+import org.springframework.stereotype.Service;
+
+/**
+ * ClassName: TjBzProServiceImpl <br/>
+ * Description: <br/>
+ * date: 2025/5/28 16:16<br/>
+ *
+ * @author zjh<br />
+ */
+@Service
+public class TjBzProServiceImpl extends ServiceImpl<TjBzProMapper, TjBzPro> implements TjBzProService {
+}
diff --git a/ltkj-hosp/src/main/resources/mapper/DictCompMapper.xml b/ltkj-hosp/src/main/resources/mapper/DictCompMapper.xml
index 33d69a4..95de28b 100644
--- a/ltkj-hosp/src/main/resources/mapper/DictCompMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/DictCompMapper.xml
@@ -83,7 +83,14 @@
valid_time,
wbm,
deleted,
- count_num
+ count_num,
+ dwlx,
+ ssdq,
+ lsgx,
+ jjlx,
+ qygm,
+ hyfl,
+ fxpg
from dict_comp
</sql>
@@ -243,4 +250,4 @@
#{drugManufacturerId}
</foreach>
</delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
index 087ad67..b4b4a90 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
@@ -328,8 +328,8 @@
<delete id="deleteTjOrderByOrderId" parameterType="Long">
- delete
- from tj_order
+ update tj_order
+ set deleted = 1
where order_id = #{orderId}
</delete>
--
Gitblit v1.8.0