From 2d2665c4e27393cacde08f2b5980ffcb58dfa284 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 30 七月 2024 19:26:03 +0800
Subject: [PATCH] zjh 2024/07/30-1
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/LtkjJianchajianyanTree.java | 3
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java | 30 +++
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 4
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 10 +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjCfService.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjJianchajianyanTreeMapper.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 359 ++++++++++++++++++++++++++++++++------------
ltkj-admin/src/main/resources/application.yml | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCfServiceImpl.java | 5
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java | 15 +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java | 9 +
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCf.java | 1
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 5
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCfMapper.java | 5
14 files changed, 353 insertions(+), 99 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 9059ca3..5e97d13 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
@@ -20,10 +20,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/* @Authot:zjh
@@ -77,97 +74,86 @@
//瀵规帴his鎬绘帴鍙� 娉ㄥ唽鎸傚彿鎺ヨ瘖鐢宠鍗曟搷浣�
@Logger
public AjaxResult HisApiMethods(TjCustomer customer, Long orderId) {
+ String jzh=null;
+ try {
+ 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();
+ outpinregapplyDto.setPationid(customer.getPationId());
+ outpinregapplyDto.setSqysbm("00029");
+ outpinregapplyDto.setMzksbm("0101");
+ outpinregapplyDto.setCzybm("00029");
+ outpinregapplyDto.setSfjz("0");
+ outpinregapplyDto.setGhzlbm("01");
+ outpinregapplyDto.setYwckbm("0001");
+ outpinregapplyDto.setSflstd("0");
+ outpinregapplyDto.setGhrq(date);
+ //闂ㄨ瘖鎸傚彿
+ AjaxResult ajaxResult = controller.Outpinregapply(outpinregapplyDto);
+ String result2 = getAjaxResult(ajaxResult);
+ JSONObject object1 = getJSONObject(result2);
+ String code1 = object1.getStr("ResultCode");
+ if (code1.equals("0")) {
+ JSONArray resultDatas = object1.getJSONArray("ResultData");
+ if (null != resultDatas && resultDatas.size() > 0) {
+ Map<String, Object> resultDatasss = (Map<String, Object>) resultDatas.get(0);
+ String hisRegistrationId = resultDatasss.get("his_registration_id").toString();
+ jzh=hisRegistrationId;
+ //淇濆瓨鎸傚彿鍏ュ弬鍑哄弬
+ resultDatasss.put("cardId",hisRegistrationId);
+ JSONObject object4 = JSONUtil.parseObj(resultDatasss);
+ LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpinregapply");
+ HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
+ hisApiGetMethodService.save(object4, "Outpinregapply", hisApiConfig, JSONUtil.toJsonStr(BeanUtil.beanToMap(outpinregapplyDto)));
- TjOrder tjOrder = orderService.getById(orderId);
- Date dates = new Date();
- final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
-// AjaxResult result = controller.Outpincreateapply(customer);
-// String result1 = getAjaxResult(result);
-// JSONObject object = getJSONObject(result1);
-// String code = object.getStr("ResultCode");
-// if (code.equals("0")) {
-// JSONArray resultDatass = object.getJSONArray("ResultData");
-// Map<String, Object> resultData = (Map<String, Object>) resultDatass.get(0);
-// if (null != resultData && resultData.size() > 0) {
-// String pationid = resultData.get("PationId").toString();
-// if (null != pationid) {
-// customer.setPationId(pationid);
-// customerService.updateById(customer);
- OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto();
- outpinregapplyDto.setPationid(customer.getPationId());
- outpinregapplyDto.setSqysbm("00029");
- outpinregapplyDto.setMzksbm("0101");
- outpinregapplyDto.setCzybm("00029");
- outpinregapplyDto.setSfjz("0");
- outpinregapplyDto.setGhzlbm("01");
- outpinregapplyDto.setYwckbm("0001");
- outpinregapplyDto.setSflstd("0");
- outpinregapplyDto.setGhrq(date);
- //闂ㄨ瘖鎸傚彿
- AjaxResult ajaxResult = controller.Outpinregapply(outpinregapplyDto);
- String result2 = getAjaxResult(ajaxResult);
- JSONObject object1 = getJSONObject(result2);
- String code1 = object1.getStr("ResultCode");
- if (code1.equals("0")) {
- JSONArray resultDatas = object1.getJSONArray("ResultData");
- if (null != resultDatas && resultDatas.size() > 0) {
- Map<String, Object> resultDatasss = (Map<String, Object>) resultDatas.get(0);
- String hisRegistrationId = resultDatasss.get("his_registration_id").toString();
- //淇濆瓨鎸傚彿鍏ュ弬鍑哄弬
- resultDatasss.put("cardId",hisRegistrationId);
- JSONObject object4 = JSONUtil.parseObj(resultDatasss);
- LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
- lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpinregapply");
- HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
- hisApiGetMethodService.save(object4, "Outpinregapply", hisApiConfig, JSONUtil.toJsonStr(BeanUtil.beanToMap(outpinregapplyDto)));
-
- //闂ㄨ瘖鍖荤敓鎺ヨ瘖
- controller.Outpinconapply(hisRegistrationId, date, "00029");
- if(null != tjOrder.getTjCategory() && !tjOrder.getTjCategory().equals("13")){
- customer.setCardId(hisRegistrationId);
- }else {
- customer.setCardId("0");
+ //闂ㄨ瘖鍖荤敓鎺ヨ瘖
+ controller.Outpinconapply(hisRegistrationId, date, "00029");
+ if(null != tjOrder.getTjCategory() && !tjOrder.getTjCategory().equals("13")){
+ customer.setCardId(hisRegistrationId);
+ }else {
+ customer.setCardId("0");
+ }
+ customerService.updateById(customer);
+ transitionService.updateCardIdByTjNumAndIdCard(customer.getCusIdcard(), hisRegistrationId, tjOrder.getTjNumber());
+ tjOrder.setCardId(hisRegistrationId);
+ orderService.updateById(tjOrder);
}
- customerService.updateById(customer);
- transitionService.updateCardIdByTjNumAndIdCard(customer.getCusIdcard(), hisRegistrationId, tjOrder.getTjNumber());
- tjOrder.setCardId(hisRegistrationId);
- orderService.updateById(tjOrder);
+
+ //娣诲姞浣撴璇婃柇
+ OutpinimpapplyDto dto=new OutpinimpapplyDto();
+ dto.setHisRegistrationId(tjOrder.getCardId());
+ dto.setMzzdid(1);
+ dto.setSqysbm("00029");
+ dto.setMzksbm("0101");
+ dto.setFbrq(date);
+ dto.setZdrq(date);
+ dto.setCzybm("00029");
+ dto.setCzyksbm("0101");
+ dto.setZs("鍋ュ悍鏌ヤ綋");
+ dto.setBs("涓嶈");
+ dto.setClyz("");
+ dto.setJws("");
+ dto.setTgjc("");
+ dto.setGms("");
+ dto.setJbbm("Z00.001");
+ dto.setJbbm1("");
+ dto.setJbbm2("");
+ dto.setFzbz("1");
+ dto.setHzqx("6");
+ dto.setSfqc("0");
+ dto.setQchs("");
+ dto.setSfqj("0");
+ dto.setJzqk(9);
+ controller.Outpinimpapply(dto);
+ return tijianshenqing(customer, date,tjOrder.getCardId());
}
-
- //娣诲姞浣撴璇婃柇
- OutpinimpapplyDto dto=new OutpinimpapplyDto();
- dto.setHisRegistrationId(tjOrder.getCardId());
- dto.setMzzdid(1);
- dto.setSqysbm("00029");
- dto.setMzksbm("0101");
- dto.setFbrq(date);
- dto.setZdrq(date);
- dto.setCzybm("00029");
- dto.setCzyksbm("0101");
- dto.setZs("鍋ュ悍鏌ヤ綋");
- dto.setBs("涓嶈");
- dto.setClyz("");
- dto.setJws("");
- dto.setTgjc("");
- dto.setGms("");
- dto.setJbbm("Z00.001");
- dto.setJbbm1("");
- dto.setJbbm2("");
- dto.setFzbz("1");
- dto.setHzqx("6");
- dto.setSfqc("0");
- dto.setQchs("");
- dto.setSfqj("0");
- dto.setJzqk(9);
- controller.Outpinimpapply(dto);
-
- return tijianshenqing(customer, date,tjOrder.getCardId());
+ return AjaxResult.error();
+ } catch (Exception e) {
+ e.printStackTrace();
+ return AjaxResult.error().put("jzh",jzh);
}
-
-// }
-// }
-// }
- return AjaxResult.error();
}
@@ -288,12 +274,11 @@
LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
tree.setXmfl(ejjfxmzd.getYjkmdm());
}
+ tree.setCreateTime(DateUtil.date());
ltkjJianchajianyanTreeService.save(tree);
}
}
}
-
-
//闂ㄨ瘖妫�鏌ョ敵璇�
OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto();
@@ -408,6 +393,7 @@
LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
tree.setXmfl(ejjfxmzd.getYjkmdm());
}
+ tree.setCreateTime(DateUtil.date());
ltkjJianchajianyanTreeService.save(tree);
}
// Map<String, Object> map = object5.getJSONObject("ResultData");
@@ -532,6 +518,7 @@
LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
tree.setXmfl(ejjfxmzd.getYjkmdm());
}
+ tree.setCreateTime(DateUtil.date());
ltkjJianchajianyanTreeService.save(tree);
}
// Map<String, Object> map = mzylyzsq3.getJSONObject("ResultData");
@@ -661,9 +648,9 @@
result2 = getAjaxResult(ajaxResult);
object1 = getJSONObject(result2);
code1 = object1.getStr("ResultCode");
-// if (!code1.equals("0")) {
-// return false;
-// }
+ if (code1.equals("0")) {
+ orderService.delHuoQuZlsqdh(order.getCardId());
+ }
}
}
@@ -693,6 +680,186 @@
}
+
+ //浣滃簾琛ュ綍椤圭洰
+ public boolean ZfBlXm(List<String> bldhs, TjOrder order) {
+
+ if(null !=bldhs && bldhs.size()>0){
+ try {
+ for (String bldh : bldhs) {
+ List<String> jcsqdh = orderService.getHuoQuBlJcsqdh(order.getCardId(),bldh);
+
+ List<String> jysqdh = orderService.getHuoQuBlJysqdh(order.getCardId(),bldh);
+
+
+ List<String> zlsqdh = orderService.getHuoQuBlZlsqdh(order.getCardId(),bldh);
+
+
+ List<String> cfhs = cfService.getCfBlhs(order.getCardId(),bldh);
+
+ //2.1.6.5 浣滃簾闂ㄨ瘖妫�鏌ョ敵璇�
+ if (null != jcsqdh && jcsqdh.size()>0) {
+ for (String s : jcsqdh) {
+ AjaxResult result = controller.Outpindelexamapply(order.getCardId(), "00029", s);
+ String result1 = getAjaxResult(result);
+ JSONObject object = getJSONObject(result1);
+ String code = object.getStr("ResultCode");
+ if (code.equals("0")) {
+ orderService.delHuoQuBlJcsqdh(order.getCardId(),bldh);
+ }
+ }
+
+ }
+
+
+ //2.1.6.3 浣滃簾闂ㄨ瘖妫�楠岀敵璇�
+
+ AjaxResult ajaxResult = null;
+ String result2 = null;
+ JSONObject object1 = null;
+ String code1 = null;
+
+ if (null != jysqdh && jysqdh.size()>0) {
+ for (String s : jysqdh) {
+ ajaxResult = controller.Outpindeltestapply(order.getCardId(), "00029", s);
+ result2 = getAjaxResult(ajaxResult);
+ object1 = getJSONObject(result2);
+ code1 = object1.getStr("ResultCode");
+ if (code1.equals("0")) {
+ orderService.delHuoQuBlJysqdh(order.getCardId(),bldh);
+ }
+ }
+ }
+
+ //2.1.6.9 浣滃簾闂ㄨ瘖娌荤枟澶勭疆鐢宠
+ if (null != zlsqdh && zlsqdh.size()>0) {
+ for (String s : zlsqdh) {
+ ajaxResult = controller.Outpintdelreatapply(order.getCardId(), "00029", s);
+ result2 = getAjaxResult(ajaxResult);
+ object1 = getJSONObject(result2);
+ code1 = object1.getStr("ResultCode");
+ if (code1.equals("0")) {
+ orderService.delHuoQuZlsqdh(order.getCardId(),bldh);
+ }
+ }
+ }
+
+ //浣滃簾鑽搧鐢宠
+ if(null !=cfhs && cfhs.size()>0){
+ for (String cfh : cfhs) {
+ AjaxResult result = controller.Outpindelmedicapply(order.getCardId(), "00029", cfh);
+ String result1 = getAjaxResult(result);
+ JSONObject object = getJSONObject(result1);
+ String code = object.getStr("ResultCode");
+ if(null !=code && code.equals("200")){
+ cfService.delCfByCardId(cfh);
+ }
+ }
+ }
+
+ return true;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ return false;
+ }
+ }
+ return true;
+ }
+
+ //閫�璐瑰悗鍙栨秷鎺ヨ瘖浣滃簾鐢宠鍗曠瓑鎿嶄綔
+ public boolean ZfHisApiMethod(String jzh) {
+ Date dates = new Date();
+ final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
+
+ List<String> jcsqdh = orderService.getHuoQuJcsqdh(jzh);
+
+ List<String> jysqdh = orderService.getHuoQuJysqdh(jzh);
+
+
+ List<String> zlsqdh = orderService.getHuoQuZlsqdh(jzh);
+
+
+ List<String> cfhs = cfService.getCfhs(jzh);
+
+ //2.1.6.5 浣滃簾闂ㄨ瘖妫�鏌ョ敵璇�
+ if (null != jcsqdh && jcsqdh.size()>0) {
+ for (String s : jcsqdh) {
+ AjaxResult result = controller.Outpindelexamapply(jzh, "00029", s);
+ String result1 = getAjaxResult(result);
+ JSONObject object = getJSONObject(result1);
+ String code = object.getStr("ResultCode");
+ if (code.equals("0")) {
+ orderService.delHuoQuJcsqdh(jzh);
+ }
+// else {
+// return false;
+// }
+ }
+
+ }
+
+
+ //2.1.6.3 浣滃簾闂ㄨ瘖妫�楠岀敵璇�
+
+ AjaxResult ajaxResult = null;
+ String result2 = null;
+ JSONObject object1 = null;
+ String code1 = null;
+
+ if (null != jysqdh && jysqdh.size()>0) {
+ for (String s : jysqdh) {
+ ajaxResult = controller.Outpindeltestapply(jzh, "00029", s);
+ result2 = getAjaxResult(ajaxResult);
+ object1 = getJSONObject(result2);
+ code1 = object1.getStr("ResultCode");
+ if (code1.equals("0")) {
+ orderService.delHuoQuJysqdh(jzh);
+ }
+// else {
+// return false;
+// }
+ }
+ }
+
+ //2.1.6.9 浣滃簾闂ㄨ瘖娌荤枟澶勭疆鐢宠
+ if (null != zlsqdh && zlsqdh.size()>0) {
+ for (String s : zlsqdh) {
+ ajaxResult = controller.Outpintdelreatapply(jzh, "00029", s);
+ result2 = getAjaxResult(ajaxResult);
+ object1 = getJSONObject(result2);
+ code1 = object1.getStr("ResultCode");
+ if (code1.equals("0")) {
+ orderService.delHuoQuZlsqdh(jzh);
+ }
+ }
+ }
+
+ //浣滃簾鑽搧鐢宠
+ if(null !=cfhs && cfhs.size()>0){
+ for (String cfh : cfhs) {
+ AjaxResult result = controller.Outpindelmedicapply(jzh, "00029", cfh);
+ String result1 = getAjaxResult(result);
+ JSONObject object = getJSONObject(result1);
+ String code = object.getStr("ResultCode");
+ if(null !=code && code.equals("200")){
+ cfService.delCfByCardId(cfh);
+ }
+ }
+ }
+
+
+ //2.1.3 闂ㄨ瘖鍖荤敓鍙栨秷鎺ヨ瘖
+ ajaxResult = controller.Outpinunconapply(jzh, date, "00029");
+ result2 = getAjaxResult(ajaxResult);
+ object1 = getJSONObject(result2);
+ code1 = object1.getStr("ResultCode");
+// if (!code1.equals("0")) {
+// return false;
+// }
+ return true;
+ }
+
//鑾峰彇闂ㄨ瘖缁撶畻璁板綍
@Transactional
public void getHisMzJsJl(TjOrder order) {
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 cdbc628..700633c 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
@@ -1037,6 +1037,7 @@
LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
tree.setXmfl(ejjfxmzd.getYjkmdm());
}
+ tree.setCreateTime(dates);
ltkjJianchajianyanTreeService.save(tree);
}
@@ -1098,6 +1099,7 @@
LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
tree.setXmfl(ejjfxmzd.getYjkmdm());
}
+ tree.setCreateTime(dates);
ltkjJianchajianyanTreeService.save(tree);
}
}
@@ -1145,6 +1147,7 @@
cf.setPj(String.valueOf(detilsDto.getPj()));
cf.setJj(String.valueOf(detilsDto.getJj()));
cf.setCreateTime(new Date());
+ cf.setJxbz(jxbz);
cfService.save(cf);
}
}
@@ -1206,6 +1209,7 @@
LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
tree.setXmfl(ejjfxmzd.getYjkmdm());
}
+ tree.setCreateTime(dates);
ltkjJianchajianyanTreeService.save(tree);
}
}
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 ccf8bed..f2e774a 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
@@ -34,6 +34,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.ibatis.jdbc.Null;
import org.springframework.beans.factory.annotation.Autowired;
@@ -64,6 +65,7 @@
@RestController
@RequestMapping("/system/dept")
@Api(tags = "绉戝閮ㄩ棬淇℃伅")
+@Slf4j
public class SysDeptController extends BaseController implements Serializable {
@Resource
private ISysDeptService deptService;
@@ -1441,8 +1443,10 @@
// if (cateFeeAll.compareTo(fyhj) != 0){
// return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
// }
+
int sfsf = ltkjJianchajianyanTreeService.getSfsfByCardId(tjOrder.getCardId());
if (sfsf > 0){
+ log.error("璺嘲绉戞妧--- "+DateUtil.date()+" 瀛樺湪鏈即璐归」鐩殑 灏辫瘖鍙� "+tjOrder.getCardId()+" 浣撴鍙� "+tjOrder.getTjNumber());
return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
}
@@ -1460,6 +1464,7 @@
tjOrderDetailLambdaUpdateWrapper.in(TjOrderDetail::getOrderDetailId,detailIds);
detailService.update(tjOrderDetailLambdaUpdateWrapper);
}else {
+ log.error("璺嘲绉戞妧--- "+DateUtil.date()+" 鏈煡璇㈠埌缂磋垂璁板綍鐨� 灏辫瘖鍙� "+tjOrder.getCardId()+" 浣撴鍙� "+tjOrder.getTjNumber());
return AjaxResult.error("鏈煡璇㈠埌缂磋垂璁板綍");
}
// }
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 d63f658..2a026cf 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
@@ -1076,6 +1076,10 @@
AjaxResult result = hisApiMethod.HisApiMethods(tjCustomer, tjOrder.getOrderId());
if (!result.get("code").toString().equals("200")) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ Object jzh = result.get("jzh");
+ if(null !=jzh && null !=jzh.toString()){
+ hisApiMethod.ZfHisApiMethod(jzh.toString());
+ }
return AjaxResult.error("鎸傚彿澶辫触!" + result.get("msg").toString());
}
} else {
@@ -2834,6 +2838,12 @@
if (advIds.containsAll(dto.getBldhs()) && cateFeeAll.compareTo(BigDecimal.ZERO) != 0) {
return AjaxResult.error("鏀归」鐩凡缂磋垂涓嶅彲鎾ら攢!!!");
}
+
+ }
+ boolean b = hisApiMethod.ZfBlXm(dto.getBldhs(), order);
+ if(!b){
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触");
}
}
for (String bldh : dto.getBldhs()) {
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index 967aa1c..343d3cf 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -5,4 +5,4 @@
#xiaochengxu 娉惧窛鍘块儴缃插皬绋嬪簭鐜浣跨敤
spring:
profiles:
- active: dev
\ No newline at end of file
+ active: prod
\ No newline at end of file
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/LtkjJianchajianyanTree.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/LtkjJianchajianyanTree.java
index f3a07ca..afd4ff4 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/LtkjJianchajianyanTree.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/LtkjJianchajianyanTree.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
+import java.util.Date;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -69,6 +70,8 @@
//鍔犻」鏍囧織
private String jxbz;
+ private Date createTime;
+
@TableField(exist = false)
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCf.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCf.java
index 85b6936..8caaafa 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCf.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCf.java
@@ -31,6 +31,7 @@
private String dcjl;
private String pj;
private String jj;
+ private String jxbz;
private Date createTime;
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjJianchajianyanTreeMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjJianchajianyanTreeMapper.java
index 5b0fd25..11d8397 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjJianchajianyanTreeMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjJianchajianyanTreeMapper.java
@@ -26,7 +26,7 @@
"LEFT JOIN ( SELECT a.adv_id ,SUM(a.catefee) hj FROM ltkj_querypay a WHERE a.ghxh=#{cardId} GROUP BY" +
" CASE WHEN a.adv_id IS NOT NULL AND LOCATE( '_', a.adv_id )> 0 THEN SUBSTRING_INDEX( a.adv_id, '_',- 1 ) ELSE a.adv_id END) cb ON\n" +
"\t\tzb.sqdh=(case when cb.adv_id is not null and LOCATE('_',cb.adv_id)>0 then SUBSTRING_INDEX(cb.adv_id,'_',-1) else cb.adv_id end) \n" +
- "WHERE zb.hj <> cb.hj or cb.adv_id is null;")
+ "WHERE zb.hj <> cb.hj or cb.adv_id is null")
int getSfsfByCardId(String cardId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCfMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCfMapper.java
index dd5895b..792d1d7 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCfMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCfMapper.java
@@ -7,6 +7,7 @@
import com.ltkj.hosp.domain.TjCf;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import javax.annotation.Resource;
@@ -18,7 +19,9 @@
@Delete("DELETE FROM tj_cf WHERE cfh=#{cfh}")
void delCfByCardId(String cfh);
-
@Select("SELECT a.cfh FROM tj_cf a WHERE a.card_id=#{cardId}")
List<String> getCfhs(String cardId);
+
+ @Select("SELECT a.cfh FROM tj_cf a WHERE a.card_id=#{cardId} and a.jxbz=#{bldh}")
+ List<String> getCfBlhs(@Param("cardId") String cardId,@Param("bldh") String bldh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
index 554466c..624d55e 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
@@ -249,4 +249,19 @@
List<Map<String, Object>> getTjTongJiJieKou(Map<String, Object> map);
+
+ @Select("SELECT a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id=#{cardId} and a.jxbz=#{bldh} AND a.type='妫�鏌�' GROUP BY a.sqdh")
+ List<String> getHuoQuBlJcsqdh(@Param("cardId") String cardId,@Param("bldh") String bldh);
+ @Delete("DELETE FROM ltkj_jianchajianyan_tree WHERE card_id=#{cardId} and jxbz=#{bldh} AND type='妫�鏌�'")
+ Boolean delHuoQuBlJcsqdh(@Param("cardId")String cardId, @Param("bldh")String bldh);
+
+ @Select("SELECT a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id=#{cardId} and a.jxbz=#{bldh} AND a.type='妫�楠�' GROUP BY a.sqdh")
+ List<String> getHuoQuBlJysqdh(@Param("cardId")String cardId,@Param("bldh") String bldh);
+ @Delete("DELETE FROM ltkj_jianchajianyan_tree WHERE card_id=#{cardId} and jxbz=#{bldh} AND type='妫�楠�'")
+ Boolean delHuoQuBlJysqdh(@Param("cardId")String cardId,@Param("bldh") String bldh);
+
+ @Select("SELECT a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id=#{cardId} and a.jxbz=#{bldh} AND a.type='澶勭疆' GROUP BY a.sqdh")
+ List<String> getHuoQuBlZlsqdh(@Param("cardId")String cardId,@Param("bldh") String bldh);
+ @Delete("DELETE FROM ltkj_jianchajianyan_tree WHERE card_id=#{cardId} and jxbz=#{bldh} AND type='澶勭疆'")
+ Boolean delHuoQuZlsqdh(@Param("cardId")String cardId,@Param("bldh") String bldh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
index 42677e5..fae975c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
@@ -149,4 +149,13 @@
Boolean delHuoQuZlsqdh(String cardId);
List<Map<String, Object>> getTjTongJiJieKou(Map<String, Object> map);
+
+ List<String> getHuoQuBlJcsqdh(String cardId, String bldh);
+ Boolean delHuoQuBlJcsqdh(String cardId, String bldh);
+
+ List<String> getHuoQuBlJysqdh(String cardId, String bldh);
+ Boolean delHuoQuBlJysqdh(String cardId, String bldh);
+
+ List<String> getHuoQuBlZlsqdh(String cardId, String bldh);
+ Boolean delHuoQuZlsqdh(String cardId, String bldh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjCfService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjCfService.java
index acc098d..5216c94 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjCfService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjCfService.java
@@ -14,4 +14,6 @@
void delCfByCardId(String cfh);
List<String> getCfhs(String cardId);
+
+ List<String> getCfBlhs(String cardId, String bldh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCfServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCfServiceImpl.java
index 3725f93..68ea6a5 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCfServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCfServiceImpl.java
@@ -27,4 +27,9 @@
public List<String> getCfhs(String cardId) {
return mapper.getCfhs(cardId);
}
+
+ @Override
+ public List<String> getCfBlhs(String cardId, String bldh) {
+ return mapper.getCfBlhs(cardId,bldh);
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
index 8ba50be..3cc0a28 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
@@ -318,4 +318,34 @@
public List<Map<String, Object>> getTjTongJiJieKou(Map<String, Object> map) {
return tjOrderMapper.getTjTongJiJieKou(map);
}
+
+ @Override
+ public List<String> getHuoQuBlJcsqdh(String cardId, String bldh) {
+ return tjOrderMapper.getHuoQuBlJcsqdh(cardId,bldh);
+ }
+
+ @Override
+ public Boolean delHuoQuBlJcsqdh(String cardId, String bldh) {
+ return tjOrderMapper.delHuoQuBlJcsqdh(cardId,bldh);
+ }
+
+ @Override
+ public List<String> getHuoQuBlJysqdh(String cardId, String bldh) {
+ return tjOrderMapper.getHuoQuBlJysqdh(cardId,bldh);
+ }
+
+ @Override
+ public Boolean delHuoQuBlJysqdh(String cardId, String bldh) {
+ return tjOrderMapper.delHuoQuBlJysqdh(cardId,bldh);
+ }
+
+ @Override
+ public List<String> getHuoQuBlZlsqdh(String cardId, String bldh) {
+ return tjOrderMapper.getHuoQuBlZlsqdh(cardId,bldh);
+ }
+
+ @Override
+ public Boolean delHuoQuZlsqdh(String cardId, String bldh) {
+ return tjOrderMapper.delHuoQuZlsqdh(cardId,bldh);
+ }
}
--
Gitblit v1.8.0