From bfc3891452195aeadef5eccd5a0b390ba7f89be1 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 26 六月 2024 19:32:50 +0800
Subject: [PATCH] zjh 本地 2024/06/26 --2
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java | 2 +
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 20 ++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java | 5 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 20 +++++++++-
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java | 21 ++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java | 5 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java | 2 +
7 files changed, 73 insertions(+), 2 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 192b101..b38be14 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
@@ -925,6 +925,11 @@
if (null != mallOrder) tjOrder.setMallOrderId(String.valueOf(mallOrder.getId()));
tjOrder.setStatus(TjConstants.TJ_BEGIN);
tjOrder.setCardId(tjCustomer.getCardId());
+ if(null !=tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")){
+ tjOrder.setFinishTime(new Date());
+ tjOrder.setCheckStatus(1);
+ tjOrder.setStatus(TjConstants.TJ_WAIT);
+ }
if (tjOrderService.save(tjOrder)) {
//淇濆瓨鏀惰揣鍦板潃
@@ -2287,12 +2292,23 @@
public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
- tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
+ if(null !=tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")){
+ tjOrderDetailService.saveJSYTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
+ }else {
+ tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
+ }
+
tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
//淇敼姣忛」鐨勫師浠风幇浠� //淇敼涓存椂琛ㄤ綋妫�鍙�
transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber());
//娣诲姞remark琛ㄦ暟鎹�
- remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
+ if(null !=tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")){
+ remarkService.saveJSYTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
+
+ }else {
+ remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
+
+ }
//鍒ゆ柇鏄惁浜ら挶
if ("1".equals(tjOrder.getTjType())) {
if (null != tjReservation && tjReservation.getPayType() == 1) {
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
index 4210147..feacf9f 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
@@ -127,6 +127,27 @@
boolean saveTjOrderDetailsByCusId(@Param("cusId")String cusId,@Param("orderId")String orderId,@Param("userName")String userName,@Param("userId") String userId);
+ @Insert("\tINSERT INTO tj_order_detail(\n" +
+// "\torder_detail_id,\n" +
+ " order_id,\n" +
+ " pro_id,\n" +
+ " pro_result,\n" +
+ " tj_status,\n" +
+ " create_time,\n" +
+ " create_by,\n" +
+ " is_sampling,\n" +
+ " create_id,\n" +
+ " pro_type) \n" +
+ " \n" +
+ " SELECT #{orderId},a.pro_id,IFNULL(b.pro_default,''),'1',SYSDATE(),#{userName},b.is_sampling,#{userId},IFNULL(a.pac_id,0) FROM tb_transition a LEFT JOIN tj_project b ON a.pro_id=b.pro_id WHERE a.cus_id=#{cusId} \n" +
+ "\t\t\n" +
+ "\tUNION\n" +
+ " \n" +
+ "\tSELECT #{orderId},a.parent_pro_id,IFNULL(b.pro_default,''),'0',SYSDATE(),#{userName},b.is_sampling,#{userId},IFNULL(a.pac_id,0) FROM tb_transition a LEFT JOIN tj_project b ON a.parent_pro_id=b.pro_id WHERE a.cus_id=#{cusId} GROUP BY a.parent_pro_id")
+ boolean saveJSYTjOrderDetailsByCusId(@Param("cusId")String cusId,@Param("orderId")String orderId,@Param("userName")String userName,@Param("userId") String userId);
+
+
+
@Insert("INSERT INTO tj_pure_tone_test (\n" +
" tj_num,\n" +
"\tcus_id,\n" +
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
index e05e048..2b9153b 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
@@ -67,6 +67,26 @@
boolean saveTjOrderRemarkByOrderId(@Param("tjNumber")String tjNumber,@Param("userName") String userName,@Param("userId") String userId,@Param("orderId")String orderId);
+ @Insert("INSERT INTO tj_order_remark(\n" +
+ "pro_id,\n" +
+ "dept_id,\n" +
+ "create_time,\n" +
+ "create_by,\n" +
+ "create_id,\n" +
+ "tj_number,\n" +
+ "type,\n" +
+ "update_by,\n" +
+ "update_time,\n" +
+ "update_id\n" +
+ ")\n" +
+ "\n" +
+ "SELECT b.pro_id,b.dept_id,SYSDATE(),#{userName},#{userId},#{tjNumber},1,#{userName},SYSDATE(),#{userId} FROM tj_order_detail a " +
+ "LEFT JOIN tj_project b ON a.pro_id=b.pro_id WHERE a.order_id=#{orderId} AND\n" +
+ "b.pro_parent_id=0")
+ boolean saveJSYTjOrderRemarkByOrderId(@Param("tjNumber")String tjNumber,@Param("userName") String userName,@Param("userId") String userId,@Param("orderId")String orderId);
+
+
+
@Select("SELECT * FROM tj_order_remark a LEFT JOIN tj_project b ON a.pro_id=b.pro_id WHERE a.tj_number=#{tjNumber}" +
" AND a.type =1 AND a.deleted=0 AND b.need_report='Y' AND b.deleted=0 and a.dept_id in (269,270,253,254,255,257,251,271) ")//and a.dept_id in (269,270,253,254,255,257)
List<TjOrderRemark> getRemarkListByTjNumAndType(String tjNumber);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
index ba7723e..7c2f481 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
@@ -94,6 +94,8 @@
boolean saveTjOrderDetailsByCusId(String cusId,String orderId,String userName, String userId);
+ boolean saveJSYTjOrderDetailsByCusId(String cusId,String orderId,String userName, String userId);
+
boolean saveTjPureToneTesByCusId(String cusId,String tjNum,String userName, String userId);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
index a9b18fe..de377fb 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
@@ -32,6 +32,8 @@
boolean saveTjOrderRemarkByOrderId(String tjNumber, String userName, String userId,String orderId);
+ boolean saveJSYTjOrderRemarkByOrderId(String tjNumber, String userName, String userId,String orderId);
+
List<TjOrderRemark> getRemarkListByTjNumAndType(String tjNumber);
List<Long> getTjProIdsByTjNum(String tjNumber);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
index 1279f57..54614ce 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
@@ -144,6 +144,11 @@
}
@Override
+ public boolean saveJSYTjOrderDetailsByCusId(String cusId, String orderId, String userName, String userId) {
+ return tjOrderDetailMapper.saveJSYTjOrderDetailsByCusId(cusId,orderId,userName,userId);
+ }
+
+ @Override
public boolean saveTjPureToneTesByCusId(String cusId, String tjNum, String userName, String userId) {
return tjOrderDetailMapper.saveTjPureToneTesByCusId(cusId,tjNum,userName,userId);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
index d823c62..8610dd3 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
@@ -59,6 +59,11 @@
}
@Override
+ public boolean saveJSYTjOrderRemarkByOrderId(String tjNumber, String userName, String userId, String orderId) {
+ return mapper.saveJSYTjOrderRemarkByOrderId(tjNumber,userName,userId,orderId);
+ }
+
+ @Override
public List<TjOrderRemark> getRemarkListByTjNumAndType(String tjNumber) {
return mapper.getRemarkListByTjNumAndType(tjNumber);
}
--
Gitblit v1.8.0