From 79f9fbd9f999e26af3f0bca534d825eb687e092c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 25 十二月 2024 08:47:24 +0800
Subject: [PATCH] 20241225
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 234 ++++++++++++++++++++++++----------------------------------
1 files changed, 97 insertions(+), 137 deletions(-)
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 8df6e9a..a0e86ec 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
@@ -31,6 +31,7 @@
import com.ltkj.system.domain.SysUserPost;
import com.ltkj.system.service.*;
import com.ltkj.web.controller.his.HisApiGetMethodService;
+import com.ltkj.web.wxUtils.HttpClientUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -117,6 +118,23 @@
private HisApiGetMethodService hisApiGetMethodService;
@Autowired
private LtkjJianchajianyanTreeService ltkjJianchajianyanTreeService;
+
+
+ @GetMapping("/getdangqiandengluyuanqu")
+ @ApiOperation("鑾峰彇褰撳墠鐧诲綍浜哄搴旂殑闄㈠尯鍚�")
+ public AjaxResult getdangqiandengluyuanqu() {
+ Long deptId = SecurityUtils.getDeptId();
+ if(null !=deptId){
+ SysDept dept = deptService.getById(deptId);
+ if(null !=dept){
+ String hospName = dept.getHospName();
+ return AjaxResult.success(hospName);
+ }
+ }
+
+
+ return AjaxResult.success();
+ }
/**
* 璇ヤ綋妫�绉戝涓嬪鎴峰垪琛ㄦ樉绀烘帴鍙�
@@ -1322,7 +1340,10 @@
List<String> summaryList = orderRemark.getSummaryList();
if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null) ) {
orderRemark.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
+ }else {
+ orderRemark.setSummary(null);
}
+ if(StringUtils.isBlank(orderRemark.getRemark()))orderRemark.setRemark(null);
LambdaQueryWrapper<TjOrder> qw = new LambdaQueryWrapper<>();
qw.eq(TjOrder::getTjNumber, orderRemark.getTjNumber());
TjOrder order = orderService.getOne(qw);
@@ -1335,31 +1356,31 @@
final TjCustomer byId1 = customerService.getById(order.getUserId());
if (null != tjOrderDetailList && !tjOrderDetailList.isEmpty()) {
//----------------------------------start
- for (TjOrderDetail tjOrderDetail : tjOrderDetailList) {
- final TjProject byId = projectService.getById(tjOrderDetail.getProId());
- //缁欑梾绉嶈褰曡〃瀛� 鏂逛究缁熻鐥呯鍜屽鎴蜂俊鎭箣闂寸殑鍏崇郴
- if (tjOrderDetail.getRulesList()!=null){
- for (TjRules tjRules : tjOrderDetail.getRulesList()) {
- TjOrderDetailRules orderDetailRules=new TjOrderDetailRules();
- orderDetailRules.setAid(tjRules.getAid());
- if (byId1!=null){
- orderDetailRules.setCusName(byId1.getCusName());
- orderDetailRules.setCusSex(String.valueOf(byId1.getCusSex()));
- orderDetailRules.setCusAge(String.valueOf(MatchUtils.getAgeByIdCard(byId1.getCusIdcard())));
- orderDetailRules.setCusId(String.valueOf(byId1.getCusId()));
- }
- orderDetailRules.setBingzhong(tjRules.getBingzhong());
- orderDetailRules.setDoctorName(sysUser.getNickName());
- orderDetailRules.setTjNumber(order.getTjNumber());
- if (byId!=null){
- orderDetailRules.setProId(String.valueOf(byId.getProId()));
- orderDetailRules.setProName(byId.getProName());
- }
- orderDetailRules.setDoctorId(String.valueOf(sysUser.getUserId()));
- tjOrderDetailRulesService.save(orderDetailRules);
- }
- }
- }
+// for (TjOrderDetail tjOrderDetail : tjOrderDetailList) {
+// final TjProject byId = projectService.getById(tjOrderDetail.getProId());
+// //缁欑梾绉嶈褰曡〃瀛� 鏂逛究缁熻鐥呯鍜屽鎴蜂俊鎭箣闂寸殑鍏崇郴
+// if (tjOrderDetail.getRulesList()!=null){
+// for (TjRules tjRules : tjOrderDetail.getRulesList()) {
+// TjOrderDetailRules orderDetailRules=new TjOrderDetailRules();
+// orderDetailRules.setAid(tjRules.getAid());
+// if (byId1!=null){
+// orderDetailRules.setCusName(byId1.getCusName());
+// orderDetailRules.setCusSex(String.valueOf(byId1.getCusSex()));
+// orderDetailRules.setCusAge(String.valueOf(MatchUtils.getAgeByIdCard(byId1.getCusIdcard())));
+// orderDetailRules.setCusId(String.valueOf(byId1.getCusId()));
+// }
+// orderDetailRules.setBingzhong(tjRules.getBingzhong());
+// orderDetailRules.setDoctorName(sysUser.getNickName());
+// orderDetailRules.setTjNumber(order.getTjNumber());
+// if (byId!=null){
+// orderDetailRules.setProId(String.valueOf(byId.getProId()));
+// orderDetailRules.setProName(byId.getProName());
+// }
+// orderDetailRules.setDoctorId(String.valueOf(sysUser.getUserId()));
+// tjOrderDetailRulesService.save(orderDetailRules);
+// }
+// }
+// }
asyncService.updateOrdeltile(tjOrderDetailList, sysUser, order);
LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
@@ -1380,8 +1401,9 @@
one.setRemark(orderRemark.getRemark());
if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null)) {
one.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
+ }else {
+ one.setSummary(null);
}
-// one.setDeptId(orderRemark.getDeptId());
one.setDoctorName(orderRemark.getDoctorName());
one.setType(1);
remarkService.updateById(one);
@@ -1390,9 +1412,10 @@
asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(),null, String.valueOf(orderRemark.getProId()));
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
- asyncService.updateCheckType(orderRemark.getTjNumber());
- asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(),null, String.valueOf(orderRemark.getProId()));
+// asyncService.updateCheckType(orderRemark.getTjNumber());
+// asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(),null, String.valueOf(orderRemark.getProId()));
}
+ remarkService.tjYishengjianchajianyi(null,null,null,null);
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
@@ -1417,48 +1440,52 @@
ksId = Math.toIntExact(sysUser.getDeptId());
}
String configByKey = configService.selectConfigByKey("sfkqdyhis");
- if (configByKey.equals("Y")){
- // 鍒ゆ柇鏄惁鏀惰垂 璇锋眰鎺ュ彛
- LambdaQueryWrapper<TjOrder> tjOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
- tjOrderLambdaQueryWrapper.eq(TjOrder::getTjNumber,tjNumber);
- TjOrder tjOrder = orderService.getOne(tjOrderLambdaQueryWrapper);
- LambdaQueryWrapper<TjFlowingWater> tjFlowingWaterLambdaQueryWrapper = new LambdaQueryWrapper<>();
- tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getOrderId,tjOrder.getOrderId());
- tjFlowingWaterLambdaQueryWrapper.ne(TjFlowingWater::getPayStasus,2);
- tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getIsAddition,"N");
- TjFlowingWater tjFlowingWater = tjFlowingWaterService.getOne(tjFlowingWaterLambdaQueryWrapper);
-
- HashMap<String, Object> hisRequestParams = new HashMap<>();
- // 涓嶅湪闇�瑕佽韩浠借瘉鍙�
- hisRequestParams.put("patientId",tjOrder.getCardId());
- 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;
-// for (Map<String, String> datum : data) {
-// BigDecimal cateFee = new BigDecimal(datum.get("CateFee"));
-// cateFeeAll = cateFeeAll.add(cateFee);
-// }
-// BigDecimal fyhj = ltkjJianchajianyanTreeService.getLtkjJianchajianyanTreeFyhjByCardId(tjOrder.getCardId());
-// if (cateFeeAll.compareTo(fyhj) != 0){
-// return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
-// }
-
- int sfsf = ltkjJianchajianyanTreeService.getSfsfByCardId(tjOrder.getCardId());
- if (sfsf > 0){
- log.error("璺嘲绉戞妧--- "+DateUtil.date()+" 瀛樺湪鏈即璐归」鐩殑 灏卞崟鏁� "+sfsf);
- log.error("璺嘲绉戞妧--- "+DateUtil.date()+" 瀛樺湪鏈即璐归」鐩殑 灏辫瘖鍙� "+tjOrder.getCardId()+" 浣撴鍙� "+tjOrder.getTjNumber());
+ // 鍒ゆ柇鏄惁鏀惰垂 璇锋眰鎺ュ彛
+ TjOrder tjOrder = orderService.getOrderByTjNum(tjNumber);
+ if(null ==tjOrder){
+ return AjaxResult.error("鏈壘鍒颁綋妫�璁板綍");
+ }
+ LambdaQueryWrapper<TjFlowingWater> tjFlowingWaterLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getOrderId,tjOrder.getOrderId());
+ tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getIsAddition,"N");
+ TjFlowingWater tjFlowingWater = tjFlowingWaterService.getOne(tjFlowingWaterLambdaQueryWrapper);
+ if(null !=tjFlowingWater){
+ if(tjFlowingWater.getPayStasus()!=1 && tjFlowingWater.getPayStasus()!=3){
+ if (configByKey.equals("Y")){
+ HashMap<String, Object> hisRequestParams = new HashMap<>();
+ // 涓嶅湪闇�瑕佽韩浠借瘉鍙�
+ hisRequestParams.put("patientId",tjOrder.getCardId());
+ log.info("ltkj--- "+DateUtil.date()+"鎿嶄綔浜篿d: "+userId+"鎿嶄綔绉戝: "+sysUser.getDeptId()+"鎿嶄綔鐨勪綋妫�浜�: "+tjNumber);
+ AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
+ if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
+ int sfsf = ltkjJianchajianyanTreeService.getSfsfByCardId(tjOrder.getCardId());
+ if (sfsf > 0){
+ log.error("璺嘲绉戞妧--- "+DateUtil.date()+" 瀛樺湪鏈即璐归」鐩殑 灏卞崟鏁� "+sfsf);
+ log.error("璺嘲绉戞妧--- "+DateUtil.date()+" 瀛樺湪鏈即璐归」鐩殑 灏辫瘖鍙� "+tjOrder.getCardId()+" 浣撴鍙� "+tjOrder.getTjNumber());
+ return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
+ }
+ extracted(tjOrder, tjFlowingWater);
+ }else {
+ log.error("璺嘲绉戞妧--- "+DateUtil.date()+" 鏈煡璇㈠埌缂磋垂璁板綍鐨� 灏辫瘖鍙� "+tjOrder.getCardId()+" 浣撴鍙� "+tjOrder.getTjNumber());
+ return AjaxResult.error("鏈煡璇㈠埌缂磋垂璁板綍");
+ }
+ }
+ String s = configService.selectConfigByKey("is_request_common_his_api");
+ if (null != s && s.equals("Y")) {
+ LambdaQueryWrapper<TjFlowingWater> wrapper1 = new LambdaQueryWrapper<>();
+ wrapper1.eq(TjFlowingWater::getOrderId,tjOrder.getOrderId());
+ wrapper1.eq(TjFlowingWater::getPayStasus,0L);
+ List<TjFlowingWater> list = tjFlowingWaterService.list(wrapper1);
+ if (!list.isEmpty()){
return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
}
-
- extracted(tjOrder, tjFlowingWater);
- }else {
- log.error("璺嘲绉戞妧--- "+DateUtil.date()+" 鏈煡璇㈠埌缂磋垂璁板綍鐨� 灏辫瘖鍙� "+tjOrder.getCardId()+" 浣撴鍙� "+tjOrder.getTjNumber());
- return AjaxResult.error("鏈煡璇㈠埌缂磋垂璁板綍");
}
-// }
+ }
+ }else {
+ log.error("璺嘲绉戞妧--- "+DateUtil.date()+" 鏈鎺is鎺ュ彛 "+" 浣撴鍙� "+tjOrder.getTjNumber());
+ return AjaxResult.error("鏈煡璇㈠埌缂磋垂璁板綍");
}
+
String config = configService.selectConfigByKey("qt_open_xdt");
String byKey = configService.selectConfigByKey("qt_kjksid");
List<Integer> split = new ArrayList<>(); // 瀛樻斁杞崲鍚庣殑integer绫诲瀷缁撴灉
@@ -1511,7 +1538,7 @@
wq2.eq(TjProject::getNeedReport,"Y");
List<TjProject> Deptlist = projectService.list(wq2);
List<Long> proIdList = Deptlist.stream().map(TjProject::getProId).collect(Collectors.toList());
- if (Deptlist.size() == 0 || proIdList.size() == 0) {
+ if (Deptlist.isEmpty() || proIdList.isEmpty()) {
return AjaxResult.error("璇ョ瀹や笅鏃犻」鐩紒");
}
LambdaQueryWrapper<TjOrder> wqqq = new LambdaQueryWrapper<>();
@@ -1579,17 +1606,11 @@
return AjaxResult.error("鑾峰彇鐢ㄦ埛淇℃伅閿欒");
}
-// if(redisCache.hasHKey("getOrderDetailByProParentId"+tjNumber,proParentId)){
-// Map<String, Object> mapValue = redisCache.getCacheMapValue("getOrderDetailByProParentId" + tjNumber, proParentId);
-// return AjaxResult.success(mapValue);
-// }
-
TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, proParentId);
-// List<TjProject> proParentList = projectService.getTjProjectListBySoneId(proParentId);
List<TjProject> proParentList = projectService.getTjProjectListByTbTransition(proParentId,tjNumber);
- if (null == proParentList || proParentList.size()==0) {
+ if (null == proParentList || proParentList.isEmpty()) {
Map<String, Object> map = new HashMap<>();
map.put("xiaoJieIds", null);
map.put("sons", projectService.list(new LambdaQueryWrapper<TjProject>().eq(TjProject::getProId,proParentId)));
@@ -1604,74 +1625,18 @@
}
List<TjOrderDetail> tjOrderDetails = detailService.getTjOrderDetailListInProParentIdList(String.valueOf(one.getOrderId()), proParentIdList);
List<TjOrderDetail> tjOrderDetailList=new ArrayList<>();
- TjCustomer customer = tjCustomerService.getById(one.getUserId());
- if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
+// TjCustomer customer = tjCustomerService.getById(one.getUserId());
+ if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
TjProject project = projectService.getById(tjOrderDetail.getProId());
//鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
if ("N".equals(project.getNeedReport())){
continue;
}
- //鐥呯鍥炴樉
-// LambdaQueryWrapper<TjOrderDetailRules> wq=new LambdaQueryWrapper<>();
-// wq.eq(TjOrderDetailRules::getProId,project.getProId());
-// wq.eq(TjOrderDetailRules::getTjNumber,tjNumber);
-// List<TjOrderDetailRules> list = tjOrderDetailRulesService.list(wq);
-// List<TjRules> res=new ArrayList<>();
-// for (TjOrderDetailRules orderDetailRules : list) {
-// final TjRules byId = tjRulesService.getById(orderDetailRules.getAid());
-// res.add(byId);
-// }
List<TjRules> rulesList = tjRulesService.getTjRulesListByTjNumAndProId(tjNumber, tjOrderDetail.getProId());
tjOrderDetail.setRulesList(rulesList);
-
- //鏌ユ爣鍑嗗拰鍗曚綅----start
-// List<TjStandard> list26 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId()));
-// if (list26.size() == 0) {
-// project.setProMetering("/");
-// project.setProScope("/");
-// } else if (list26.size() == 1) {
-// project.setProMetering(list26.get(0).getCompany() == null ? " " : list26.get(0).getCompany());
-// project.setProScope((list26.get(0).getTjStandardLtValue() == null ? " " : list26.get(0).getTjStandardLtValue()) + "-" + (list26.get(0).getTjStandardGtValue() == null ? " " : list26.get(0).getTjStandardGtValue()));
-// } else {
-// Long cusSex = customer.getCusSex();
-// Date cusBrithday = customer.getCusBrithday();
-// int age = DateUtil.ageOfNow(cusBrithday);
-// for (TjStandard tjStandard : list26) {
-// LambdaQueryWrapper<TjStandard> wq8 = new LambdaQueryWrapper<>();
-// if (tjStandard.getTjSex() != null) {
-// wq8.eq(TjStandard::getTjSex, cusSex);
-// }
-// if (tjStandard.getTjType() != null) {
-// wq8.eq(TjStandard::getTjType, StringUtils.getAgeType(age));
-// }
-// TjStandard standard = tjStandardService.getOne(wq8);
-// project.setProMetering(standard.getCompany());
-// project.setProScope((standard.getTjStandardLtValue() == null ? " " : standard.getTjStandardLtValue()) + "-" + (standard.getTjStandardGtValue() == null ? " " : standard.getTjStandardGtValue()));
-// }
-// }
- //鏌ユ爣鍑嗗拰鍗曚綅-----end
tjOrderDetail.setProject(project);
-// List<TjStandard> list2 = tjStandardService.getTjStandardListByProId(String.valueOf(project.getProId()));
-// if (list2.size() == 0) {
-// tjOrderDetail.setStandard(null);
-// } else if (list2.size() == 1) {
-// tjOrderDetail.setStandard(list2.get(0));
-// } else {
-// for (TjStandard tjStandard : list2) {
-// LambdaQueryWrapper<TjStandard> wq8 = new LambdaQueryWrapper<>();
-// if (tjStandard.getTjSex() != null) {
-// wq8.eq(TjStandard::getTjSex, customer.getCusSex());
-// }
-// if (tjStandard.getTjType() != null) {
-// wq8.eq(TjStandard::getTjType, StringUtils.getAgeType(DateUtil.ageOfNow(customer.getCusBrithday())));
-// }
-// TjStandard standard = tjStandardService.getOne(wq8);
-// tjOrderDetail.setStandard(standard);
-// }
-// }
if (null != remark.getDoctorName()) {
- //lg0412
SysUser byId = userService.getById(remark.getDoctorName());
if (byId != null) {
tjOrderDetail.setDoctorName(userService.getById(remark.getDoctorName()).getNickName());
@@ -1686,11 +1651,6 @@
List<TjAdvice> adviceList = new ArrayList<>();
if (null != remark) {
String[] strings = StringUtils.split(remark.getSummary(), ";");
-// if (null != strings && strings.length > 0) {
-// for (String string : strings) {
-// adviceList.add(tjAdviceService.getById(string));
-// }
-// }
if(null !=strings && strings.length>0){
List<TjAdvice> list = tjAdviceService.getAdviceStringByIds(strings);
adviceList.addAll(list);
--
Gitblit v1.8.0