From af6f1f6ad2f3fffeeed75f1a742a5bb63141db60 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 01 八月 2024 18:44:34 +0800
Subject: [PATCH] zjh 2024/08/01-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 5 +
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 7 +-
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java | 12 ++--
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 72 ++++++++++-------------
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java | 22 ++++---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 28 ++++----
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java | 6 +-
7 files changed, 75 insertions(+), 77 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
index 5e97d13..36cfa27 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -14,6 +14,7 @@
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDeptService;
import jdk.nashorn.internal.runtime.logging.Logger;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -28,6 +29,7 @@
* */
@Component
+@Slf4j
public class HisApiMethod {
@Autowired
private HisApiMethodService controller;
@@ -73,10 +75,10 @@
//瀵规帴his鎬绘帴鍙� 娉ㄥ唽鎸傚彿鎺ヨ瘖鐢宠鍗曟搷浣�
@Logger
- public AjaxResult HisApiMethods(TjCustomer customer, Long orderId) {
+ public AjaxResult HisApiMethods(TjCustomer customer,TjOrder tjOrder) {
String jzh=null;
try {
- TjOrder tjOrder = orderService.getById(orderId);
+// TjOrder tjOrder = orderService.getById(orderId);
Date dates = new Date();
final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto();
@@ -109,7 +111,14 @@
hisApiGetMethodService.save(object4, "Outpinregapply", hisApiConfig, JSONUtil.toJsonStr(BeanUtil.beanToMap(outpinregapplyDto)));
//闂ㄨ瘖鍖荤敓鎺ヨ瘖
- controller.Outpinconapply(hisRegistrationId, date, "00029");
+ AjaxResult result = controller.Outpinconapply(hisRegistrationId, date, "00029");
+ String result3 = getAjaxResult(result);
+ JSONObject object2 = getJSONObject(result3);
+ String code2 = object2.getStr("ResultCode");
+ if (!code2.equals("0")) {
+ return AjaxResult.error(object2.getStr("ResultContent"));
+ }
+ log.info("his鎺ュ彛-----鍖荤敓鎺ヨ瘖鎴愬姛!");
if(null != tjOrder.getTjCategory() && !tjOrder.getTjCategory().equals("13")){
customer.setCardId(hisRegistrationId);
}else {
@@ -147,7 +156,7 @@
dto.setSfqj("0");
dto.setJzqk(9);
controller.Outpinimpapply(dto);
- return tijianshenqing(customer, date,tjOrder.getCardId());
+ return AjaxResult.success();
}
return AjaxResult.error();
} catch (Exception e) {
@@ -158,7 +167,7 @@
//浣撴瀵筯is鐢宠鍗曡皟鐢ㄦ柟娉�
- private AjaxResult tijianshenqing(TjCustomer customer, String date,String cardId) {
+ public AjaxResult tijianshenqing(TjCustomer customer, String date,String cardId) {
//妫�楠岀敵璇�
OutpintestapplyDto dto = new OutpintestapplyDto();
dto.setHisRegistrationId(cardId);
@@ -792,9 +801,6 @@
if (code.equals("0")) {
orderService.delHuoQuJcsqdh(jzh);
}
-// else {
-// return false;
-// }
}
}
@@ -816,9 +822,6 @@
if (code1.equals("0")) {
orderService.delHuoQuJysqdh(jzh);
}
-// else {
-// return false;
-// }
}
}
@@ -854,9 +857,6 @@
result2 = getAjaxResult(ajaxResult);
object1 = getJSONObject(result2);
code1 = object1.getStr("ResultCode");
-// if (!code1.equals("0")) {
-// return false;
-// }
return true;
}
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 700633c..cc9253a 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
@@ -156,7 +156,7 @@
redisCache.deleteObject(tjCustomer.getCusIdcard() + "cusId");
if (null != tbTransitionList && tbTransitionList.size() > 0) {
- tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
+ tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()),tjOrder.getCardId());
//淇敼姣忛」鐨勫師浠风幇浠�
for (TbTransition transition : tbTransitionList) {
@@ -208,7 +208,8 @@
public void ttextracted(TjOrder tjOrder, TjCustomer tjCustomer, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
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()));
+ boolean b = tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(),
+ 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.size() > 0) {
@@ -276,7 +277,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()));
+ 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) {
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 ab97ccf..fed96a7 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
@@ -1431,7 +1431,8 @@
HashMap<String, Object> hisRequestParams = new HashMap<>();
// 涓嶅湪闇�瑕佽韩浠借瘉鍙�
hisRequestParams.put("patientId",tjOrder.getCardId());
- AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
+ log.info("ltkj--- "+DateUtil.date()+"鎿嶄綔浜篿d: "+userId+"鎿嶄綔绉戝: "+sysUser.getDeptId()+"鎿嶄綔鐨勪綋妫�浜�: "+tjNumber);
+ AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
// List<Map<String, String>> data = (List<Map<String, String>>) queryPay.get("data");
// BigDecimal cateFeeAll = BigDecimal.ZERO;
@@ -1549,7 +1550,7 @@
}
@Transactional
- private void extracted(TjOrder tjOrder, TjFlowingWater tjFlowingWater) {
+ public void extracted(TjOrder tjOrder, TjFlowingWater tjFlowingWater) {
tjFlowingWater.setPayStasus(1L);
tjFlowingWater.setPayType(0L);
tjFlowingWater.setTollCollectorId("148");
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 2a026cf..48cd280 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
@@ -1036,44 +1036,13 @@
}
- //鍥綋
- if ("1".equals(tjOrder.getTjType())) {
- asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
- }
- //涓汉
- if ("2".equals(tjOrder.getTjType())) {
- //asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
- newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
- }
-
- //璋冪敤SQL server鎷垮彇鏀惰垂鎯呭喌
- //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
-// final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
-// if ("Y".equals(getInfoFromSqlData)){
-// List<LtkjMiddleHead> one = testMapper.saveMiddleHeadByPatId(tjCustomer.getCusIdcard());
-// if (one!=null){
-// for (LtkjMiddleHead ltkjMiddleHead : one) {
-// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
-// headService.save(ltkjMiddleHead);
-// DynamicDataSourceContextHolder.clearDataSourceType();
-// List<LtkjMiddleDetail> detailList = testMapper.getMiddleDetailByHeadId(ltkjMiddleHead.getFeadId());
-// if (detailList!=null){
-// for (LtkjMiddleDetail ltkjMiddleDetail : detailList) {
-// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
-// middleDetailService.save(ltkjMiddleDetail);
-// DynamicDataSourceContextHolder.clearDataSourceType();
-// }
-// }
-// }
-//
-// }
-// }
-
+ //淇敼姣忛」鐨勫師浠风幇浠� //淇敼涓存椂琛ㄤ綋妫�鍙�
+ transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber());
/*璋冪敤his鎺ュ彛*/
String config = configService.selectConfigByKey("sfkqdyhis");
if (null != config && config.equals("Y")) {
- AjaxResult result = hisApiMethod.HisApiMethods(tjCustomer, tjOrder.getOrderId());
+ AjaxResult result = hisApiMethod.HisApiMethods(tjCustomer,tjOrder);
if (!result.get("code").toString().equals("200")) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
Object jzh = result.get("jzh");
@@ -1082,12 +1051,37 @@
}
return AjaxResult.error("鎸傚彿澶辫触!" + result.get("msg").toString());
}
+
+ log.info("璇ョ櫥璁颁汉鐨刪is灏辫瘖鍙锋槸: "+tjOrder.getCardId());
+ //鍥綋
+ if ("1".equals(tjOrder.getTjType())) {
+ asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
+ }
+ //涓汉
+ if ("2".equals(tjOrder.getTjType())) {
+ //asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+ newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+ }
+ hisApiMethod.tijianshenqing(tjCustomer,DateUtil.format(date1,"yyyy-MM-dd HH:mm:ss"),tjOrder.getCardId());
+
+ return AjaxResult.success(tjNumber);
} else {
tjCustomer.setCardId(tjOrder.getTjNumber());
tjCustomerService.updateById(tjCustomer);
transitionService.updateCardIdByTjNumAndIdCard(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), tjOrder.getTjNumber());
tjOrder.setCardId(tjOrder.getTjNumber());
tjOrderService.updateById(tjOrder);
+ }
+
+
+ //鍥綋
+ if ("1".equals(tjOrder.getTjType())) {
+ asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
+ }
+ //涓汉
+ if ("2".equals(tjOrder.getTjType())) {
+ //asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+ newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
}
return AjaxResult.success(tjNumber);
}
@@ -2367,14 +2361,13 @@
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()));
if (null != tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")) {
- tjOrderDetailService.saveJSYTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
+ tjOrderDetailService.saveJSYTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()),tjOrder.getCardId());
} else {
- tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
+ tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()),tjOrder.getCardId());
}
- tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
- //淇敼姣忛」鐨勫師浠风幇浠� //淇敼涓存椂琛ㄤ綋妫�鍙�
- transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber());
+ tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(),String.valueOf(sysUser.getUserId()),tjOrder.getCardId());
+
//娣诲姞remark琛ㄦ暟鎹�
if (null != tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")) {
remarkService.saveJSYTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
@@ -2399,7 +2392,6 @@
tjFlowingWaterService.updateById(tjFlowingWater);
asyncService.addTjChargingStandard(tjOrder, transitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(), tjOrder.getCardId()), sysUser);
}
-// System.out.println("杩欐浠ｇ爜鏃堕棿" + (System.currentTimeMillis() - l));
}
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 53e306a..160b19c 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
@@ -121,12 +121,14 @@
" create_id,\n" +
" pro_type) \n" +
" \n" +
- " SELECT #{orderId},a.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.pro_id=b.pro_id WHERE a.cus_id=#{cusId} \n" +
+ " SELECT #{orderId},a.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.pro_id=b.pro_id WHERE a.cus_id=#{cusId} AND a.card_id=#{cardId} \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 saveTjOrderDetailsByCusId(@Param("cusId")String cusId,@Param("orderId")String orderId,@Param("userName")String userName,@Param("userId") String userId);
+ "\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} AND a.card_id=#{cardId} GROUP BY a.parent_pro_id")
+ boolean saveTjOrderDetailsByCusId(@Param("cusId")String cusId,@Param("orderId")String orderId,@Param("userName")String userName,@Param("userId") String userId,@Param("cardId") String cardId);
@Insert("\tINSERT INTO tj_order_detail(\n" +
@@ -141,12 +143,14 @@
" 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" +
+ " 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} AND a.card_id=#{cardId} \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);
+ "\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} AND a.card_id=#{cardId} GROUP BY a.parent_pro_id")
+ boolean saveJSYTjOrderDetailsByCusId(@Param("cusId")String cusId,@Param("orderId")String orderId,@Param("userName")String userName,@Param("userId") String userId,@Param("cardId") String cardId);
@@ -160,10 +164,10 @@
"\tcreate_time,\n" +
"\tcreate_id\n" +
")\n" +
- "SELECT #{tjNum},b.cus_id,b.cus_name,'1633660948860522619','绾煶鍚槇'," +
+ "SELECT #{tjNum},b.cus_id,b.cus_name,'1740177341251154247','绾煶鍚槇'," +
"#{userName},SYSDATE(),#{userId} FROM tb_transition a LEFT JOIN tj_customer b " +
- "ON a.cus_id=b.cus_idcard WHERE a.cus_id=#{cusId} AND a.parent_pro_id IN('1633660948860522619') GROUP BY a.cus_id")
- boolean saveTjPureToneTesByCusId(@Param("cusId")String cusId,@Param("tjNum")String tjNum,@Param("userName")String userName,@Param("userId") String userId);
+ "ON a.cus_id=b.cus_idcard WHERE a.cus_id=#{cusId} AND a.card_id=#{cardId} AND a.parent_pro_id IN('1740177341251154247') GROUP BY a.cus_id")
+ boolean saveTjPureToneTesByCusId(@Param("cusId")String cusId,@Param("tjNum")String tjNum,@Param("userName")String userName,@Param("userId") String userId,@Param("cardId") String cardId);
@Update("UPDATE tj_order_detail a SET\n" +
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 06ee3ed..37da57f 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,12 +94,12 @@
List<TjOrderDetail> getTjOrderDetailList(String startDate,String endDate);
- boolean saveTjOrderDetailsByCusId(String cusId,String orderId,String userName, String userId);
+ boolean saveTjOrderDetailsByCusId(String cusId,String orderId,String userName, String userId,String cardId);
- boolean saveJSYTjOrderDetailsByCusId(String cusId,String orderId,String userName, String userId);
+ boolean saveJSYTjOrderDetailsByCusId(String cusId,String orderId,String userName, String userId,String cardId);
- boolean saveTjPureToneTesByCusId(String cusId,String tjNum,String userName, String userId);
+ boolean saveTjPureToneTesByCusId(String cusId,String tjNum,String userName, String userId,String cardId);
boolean updateTjOrderDetailsByOrderId(String orderId,String userName, String userId,String ls);
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 70f0eac..130fbff 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
@@ -141,19 +141,19 @@
}
@Override
- public boolean saveTjOrderDetailsByCusId(String cusId,String orderId, String userName, String userId) {
- return tjOrderDetailMapper.saveTjOrderDetailsByCusId(cusId,orderId,userName,userId);
+ public boolean saveTjOrderDetailsByCusId(String cusId,String orderId, String userName, String userId,String cardId) {
+ return tjOrderDetailMapper.saveTjOrderDetailsByCusId(cusId,orderId,userName,userId,cardId);
}
@Override
- public boolean saveJSYTjOrderDetailsByCusId(String cusId, String orderId, String userName, String userId) {
- return tjOrderDetailMapper.saveJSYTjOrderDetailsByCusId(cusId,orderId,userName,userId);
+ public boolean saveJSYTjOrderDetailsByCusId(String cusId, String orderId, String userName, String userId,String cardId) {
+ return tjOrderDetailMapper.saveJSYTjOrderDetailsByCusId(cusId,orderId,userName,userId,cardId);
}
@Override
- public boolean saveTjPureToneTesByCusId(String cusId, String tjNum, String userName, String userId) {
+ public boolean saveTjPureToneTesByCusId(String cusId, String tjNum, String userName, String userId,String cardId) {
- return tjOrderDetailMapper.saveTjPureToneTesByCusId(cusId,tjNum,userName,userId);
+ return tjOrderDetailMapper.saveTjPureToneTesByCusId(cusId,tjNum,userName,userId,cardId);
}
@Override
--
Gitblit v1.8.0