From 36b6d628eb92b689d8808e4a3e14fef934bed631 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 01 十一月 2024 09:28:58 +0800
Subject: [PATCH] zjh20241101
---
ltkj-system/src/main/java/com/ltkj/system/service/ITjDjdDyjlService.java | 2 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 28 ++++++++++++++++++----------
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java | 4 ++++
ltkj-system/src/main/java/com/ltkj/system/service/impl/TjDjdDyjlServiceImpl.java | 5 +++++
ltkj-system/src/main/java/com/ltkj/system/mapper/TjDjdDyjlMapper.java | 5 +++++
5 files changed, 34 insertions(+), 10 deletions(-)
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 42e9a63..f4e9466 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
@@ -73,9 +73,11 @@
import com.ltkj.mall.mallOrderUtils.TjConstants;
import com.ltkj.mall.service.IMallCheckLogService;
import com.ltkj.mall.service.IMallOrderService;
+import com.ltkj.system.domain.TjDjdDyjl;
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDeptService;
import com.ltkj.system.service.ISysUserService;
+import com.ltkj.system.service.ITjDjdDyjlService;
import com.ltkj.web.controller.his.*;
import com.ltkj.web.controller.lis.LisApiMethod;
import com.ltkj.web.controller.pacs.PacsApiMethodService;
@@ -219,6 +221,8 @@
private TjSamplingMapper tjSamplingMapper;
@Autowired
private ITjGroupingProService groupingProService;
+ @Autowired
+ private ITjDjdDyjlService djdDyjlService;
//灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡
public JSONObject getJSONObject(String builder) {
@@ -454,6 +458,8 @@
order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
}
}
+ TjDjdDyjl dycs = djdDyjlService.getDjdDyCsByTjNum(order.getTjNumber());
+ if(null !=dycs)order.setDycs(Math.toIntExact(dycs.getDycs()));
}
collect = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
}
@@ -512,6 +518,8 @@
order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
}
}
+ TjDjdDyjl dycs = djdDyjlService.getDjdDyCsByTjNum(order.getTjNumber());
+ if(null !=dycs)order.setDycs(Math.toIntExact(dycs.getDycs()));
}
}
map.put("list", list);
@@ -946,7 +954,7 @@
tjReservationService.updateById(tjReservation);
if (null != tjReservation.getTeamNo() && tjOrder.getTjType().equals("1")) {
tjOrder.setTjType("1");
- } else if (tjOrder.getTjType().equals("2")){
+ } else if (tjOrder.getTjType().equals("2")) {
tjOrder.setTjType("2");
}
}
@@ -1111,7 +1119,7 @@
if (!ajaxResult.get("code").toString().equals("200")) return ajaxResult;
tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
- }else {
+ } else {
hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
}
// hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
@@ -2343,7 +2351,7 @@
tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
boolean b = tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(),
- String.valueOf(sysUser.getUserId()),tjOrder.getCardId());
+ String.valueOf(sysUser.getUserId()), tjOrder.getCardId());
if (!b) {
List<TjGroupingPro> proList = groupingProService.list(new LambdaQueryWrapper<TjGroupingPro>().eq(TjGroupingPro::getGroupingId, tjOrder.getGroupId()));
if (null != proList && !proList.isEmpty()) {
@@ -2408,7 +2416,7 @@
transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), BigDecimal.valueOf(Long.parseLong(tjFlowingWater.getDiscount())), tjOrder.getTjNumber());
}
- tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()),tjOrder.getCardId());
+ tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId());
// List<TjOrderDetail> list = tjOrderDetailService.getTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()));
// if (list != null) {
// for (TjOrderDetail tjOrderDetail : list) {
@@ -2681,7 +2689,7 @@
customer.setCardId("0");
tjCustomerService.updateById(customer);
String configByKey = configService.selectConfigByKey("sfkqdyhis");
- tjSamplingMapper.deleteByTjNumAndCusId(tjNum,order.getUserId());
+ tjSamplingMapper.deleteByTjNumAndCusId(tjNum, order.getUserId());
if (configByKey.equals("Y")) {
HashMap<String, Object> hisRequestParams = new HashMap<>();
@@ -2953,7 +2961,7 @@
HashMap<String, Object> hisRequestParams = new HashMap<>();
hisRequestParams.put("patientId", order.getCardId());
AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
- log.info("queryPay ->{}",JSONUtil.toJsonStr(queryPay));
+ log.info("queryPay ->{}", JSONUtil.toJsonStr(queryPay));
if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
List<Map<String, String>> data = (List<Map<String, String>>) queryPay.get("data");
log.info("data鐨勬暟鎹槸" + JSONUtil.toJsonStr(data));
@@ -2987,7 +2995,7 @@
}
}
try {
- extracted(dto,order);
+ extracted(dto, order);
} catch (Exception e) {
log.info("鎾ら攢澶辫触,鍒犻櫎琛ㄥけ璐�");
return AjaxResult.error("鎾ら攢澶辫触,鍒犻櫎琛ㄥけ璐�!");
@@ -2997,8 +3005,8 @@
return AjaxResult.error();
}
-// @Transactional(propagation =Propagation.REQUIRES_NEW)
- public void extracted(TjProBlDto dto,TjOrder order) {
+ // @Transactional(propagation =Propagation.REQUIRES_NEW)
+ public void extracted(TjProBlDto dto, TjOrder order) {
for (String bldh : dto.getBldhs()) {
remarkService.deleteTjOrderDetailByjxbz(bldh);
tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh);
@@ -3006,7 +3014,7 @@
transitionService.deleteTjOrderDetailByjxbz(bldh);
blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, dto.getTjh()).eq(TjProBl::getBldh, bldh));
}
- tjSamplingMapper.deleteByTjNumAndCusIdAndJxbz(dto.getTjh(),order.getUserId(),dto.getBldhs());
+ tjSamplingMapper.deleteByTjNumAndCusIdAndJxbz(dto.getTjh(), order.getUserId(), dto.getBldhs());
}
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 643c856..736ac59 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
@@ -439,6 +439,10 @@
@ApiModelProperty("棰勭害鍙�")
private String reservationId;
+
+ @TableField(exist = false)
+ private Integer dycs;
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
diff --git a/ltkj-system/src/main/java/com/ltkj/system/mapper/TjDjdDyjlMapper.java b/ltkj-system/src/main/java/com/ltkj/system/mapper/TjDjdDyjlMapper.java
index 2b17044..82546e0 100644
--- a/ltkj-system/src/main/java/com/ltkj/system/mapper/TjDjdDyjlMapper.java
+++ b/ltkj-system/src/main/java/com/ltkj/system/mapper/TjDjdDyjlMapper.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.system.domain.TjDjdDyjl;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
/**
* 浣撴瀵兼鍗曟墦鍗拌褰昅apper鎺ュ彛
@@ -61,4 +62,8 @@
* @return 缁撴灉
*/
public int deleteTjDjdDyjlByIds(Long[] ids);
+
+
+ @Select("SELECT * FROM tj_djd_dyjl a WHERE a.deleted=0 AND a.tj_num=#{tjNumber} AND a.dylx=0")
+ TjDjdDyjl getDjdDyCsByTjNum(String tjNumber);
}
diff --git a/ltkj-system/src/main/java/com/ltkj/system/service/ITjDjdDyjlService.java b/ltkj-system/src/main/java/com/ltkj/system/service/ITjDjdDyjlService.java
index c004fc4..3bbe235 100644
--- a/ltkj-system/src/main/java/com/ltkj/system/service/ITjDjdDyjlService.java
+++ b/ltkj-system/src/main/java/com/ltkj/system/service/ITjDjdDyjlService.java
@@ -59,4 +59,6 @@
* @return 缁撴灉
*/
public int deleteTjDjdDyjlById(Long id);
+
+ TjDjdDyjl getDjdDyCsByTjNum(String tjNumber);
}
diff --git a/ltkj-system/src/main/java/com/ltkj/system/service/impl/TjDjdDyjlServiceImpl.java b/ltkj-system/src/main/java/com/ltkj/system/service/impl/TjDjdDyjlServiceImpl.java
index f5262d8..688d23b 100644
--- a/ltkj-system/src/main/java/com/ltkj/system/service/impl/TjDjdDyjlServiceImpl.java
+++ b/ltkj-system/src/main/java/com/ltkj/system/service/impl/TjDjdDyjlServiceImpl.java
@@ -88,4 +88,9 @@
public int deleteTjDjdDyjlById(Long id) {
return tjDjdDyjlMapper.deleteTjDjdDyjlById(id);
}
+
+ @Override
+ public TjDjdDyjl getDjdDyCsByTjNum(String tjNumber) {
+ return tjDjdDyjlMapper.getDjdDyCsByTjNum(tjNumber);
+ }
}
--
Gitblit v1.8.0