From 35a646cf874c5be4dd2b83cee6ce61e0ba14082c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 23 十二月 2024 08:38:02 +0800
Subject: [PATCH] zjh202412023
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 239 ++++++++++++++++++-----------------------------------------
1 files changed, 73 insertions(+), 166 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 358ed9c..f875f80 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
@@ -471,7 +471,7 @@
order.setZt("鍦ㄦ");
orders.add(order);
}
- if (zt==2 && sfwc == 0) {
+ if (zt==2 && sfwc == 0 && order.getCheckStatus()==0 && order.getCheckTime()==null && order.getHeshouStatus()==0 && order.getPrintLastTime()==null) {
//宸插畬鎴�2
order.setZt("宸插畬鎴�");
orders.add(order);
@@ -520,15 +520,29 @@
if(null !=zt){
if(zt==3){
+ //宸插鏍�
wq.isNotNull(TjOrder::getCheckTime);
+ wq.eq(TjOrder::getCheckStatus,1);
+ wq.isNull(TjOrder::getHeshouTime);
+ wq.isNull(TjOrder::getPrintLastTime);
+ wq.eq(TjOrder::getHeshouStatus,0);
}
if(zt==4){
+ //鐢熸垚鎶ュ憡
wq.isNotNull(TjOrder::getReportTime);
+ wq.isNull(TjOrder::getHeshouTime);
+ wq.isNull(TjOrder::getPrintLastTime);
+ wq.eq(TjOrder::getHeshouStatus,0);
}
if(zt==5){
+ //鎶ュ憡鏍告敹
wq.eq(TjOrder::getHeshouStatus,1);
+ wq.isNull(TjOrder::getPrintLastTime);
}
if(zt==6){
+ //宸插嚭鎶ュ憡
+ wq.isNotNull(TjOrder::getPrintLastTime);
+ wq.eq(TjOrder::getHeshouStatus,1);
wq.isNotNull(TjOrder::getPrintLastTime);
}
}
@@ -629,147 +643,19 @@
@ApiOperation(value = "浣撴鎶ュ憡椤甸潰鈥斺�斾綋妫�璁板綍鍒楄〃")
public AjaxResult getOrderListOO(@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer pageNum,
@ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
- @ApiParam(value = "鎵撳嵃鏈墦鍗扮姸鎬� 0鏈墦鍗� 1宸叉墦鍗�") @RequestParam(defaultValue = "0") Integer dyzt,
+ @ApiParam(value = "鎵撳嵃鏈墦鍗扮姸鎬� 0鏈墦鍗� 1宸叉墦鍗�") @RequestParam(required = false) Integer dyzt,
@ApiParam(value = "浣撴鍙�)") @RequestParam(required = false) String tjNum,
@ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
@ApiParam(value = "鍗曚綅") @RequestParam(required = false) String dw,
@ApiParam(value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam(required = false) String djbeginTime,
@ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) String djendTime) {
- Map<String, Object> map = new HashMap<>();
+ /* Map<String, Object> map = new HashMap<>();
List<Long> cusIds = null;
if (StringUtil.isNotBlank(name)) {
LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
wqq.like(TjCustomer::getCusName, name);
cusIds = tjCustomerService.list(wqq).stream().map(TjCustomer::getCusId).collect(Collectors.toList());
-// if (null != customerList && !customerList.isEmpty()) {
-// List<TjOrder> list = new ArrayList<>();
-// for (TjCustomer customer : customerList) {
-// LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
-// wq.eq(TjOrder::getUserId, customer.getCusId());
-// if (dyzt == 0) {
-// wq.isNull(TjOrder::getPrintLastTime);
-// wq.eq(TjOrder::getHeshouStatus, 1);
-// } else {
-// wq.isNotNull(TjOrder::getPrintLastTime);
-// }
-// list.addAll(tjOrderService.list(wq));
-// }
-// List<TjOrder> collect = null;
-// if (!list.isEmpty()) {
-//
-// for (int i = 0; i < list.size(); i++) {
-// TjCustomer tjCustomer = tjCustomerService.getById(list.get(i).getUserId());
-// if (null == tjCustomer) {
-// list.remove(list.get(i));
-// continue;
-// }
-// list.get(i).setTjCustomerSex(tjCustomer.getCusSex());
-// list.get(i).setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
-// list.get(i).setTjCustomerName(tjCustomer.getCusName());
-// list.get(i).setTjCustomerPhone(tjCustomer.getCusPhone());
-// list.get(i).setTjCusIdCard(tjCustomer.getCusIdcard());
-//
-// if (null != tjCustomer.getCompName()) {
-// list.get(i).setDictCompName(tjCustomer.getCompName());
-// } else {
-// String firmId = list.get(i).getFirmId();
-// if (firmId != null && null != iDictCompService.getById(String.valueOf(list.get(i).getFirmId()))) {
-// list.get(i).setDictCompName(iDictCompService.getById(String.valueOf(list.get(i).getFirmId())).getCnName());
-// }
-// }
-//
-// if (null != list.get(i).getPacId()) {
-// if (null != tjPackageService.getById(list.get(i).getPacId())) {
-// list.get(i).setPacName(tjPackageService.getById(list.get(i).getPacId()).getPacName());
-// }
-// if (null != dwDeptService.getById(list.get(i).getPacId())) {
-// list.get(i).setPacName(dwDeptService.getById(list.get(i).getPacId()).getDwDeptName());
-// }
-// }
-// }
-// collect = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-// }
-// if (null != collect) {
-// map.put("total", collect.size());
-// } else {
-// map.put("total", 0);
-// }
-// if (collect == null) collect = new ArrayList<>();
-// map.put("list", collect);
-// return AjaxResult.success(map);
-// }
-
}
-// if (StringUtil.isNotBlank(dw)) {
-// LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
-// wqq.like(TjCustomer::getCompName, dw);
-// List<TjCustomer> customerList = tjCustomerService.list(wqq);
-// List<TjOrder> list = new ArrayList<>();
-// if (null != customerList && !customerList.isEmpty()) {
-// for (TjCustomer customer : customerList) {
-// LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
-// wq.eq(TjOrder::getUserId, customer.getCusId());
-// if (dyzt == 0) {
-// wq.isNull(TjOrder::getPrintLastTime);
-// wq.eq(TjOrder::getHeshouStatus, 1);
-// } else {
-// wq.isNotNull(TjOrder::getPrintLastTime);
-// }
-// list.addAll(tjOrderService.list(wq));
-// }
-// }
-// List<String> dwIds = iDictCompService.getdwIdByDwName(dw);
-//
-// LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
-// wq.in(TjOrder::getFirmId, dwIds);
-// list.addAll(tjOrderService.list(wq));
-// List<TjOrder> collect = null;
-// if (!list.isEmpty()) {
-// List<TjOrder> orders = list.stream().distinct().collect(Collectors.toList());
-// for (int i = 0; i < orders.size(); i++) {
-// TjCustomer tjCustomer = tjCustomerService.getById(list.get(i).getUserId());
-// if (null == tjCustomer) {
-// list.remove(list.get(i));
-// continue;
-// }
-// list.get(i).setTjCustomerSex(tjCustomer.getCusSex());
-// list.get(i).setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
-// list.get(i).setTjCustomerName(tjCustomer.getCusName());
-// list.get(i).setTjCustomerPhone(tjCustomer.getCusPhone());
-// list.get(i).setTjCusIdCard(tjCustomer.getCusIdcard());
-//
-// if (null != tjCustomer.getCompName()) {
-// list.get(i).setDictCompName(tjCustomer.getCompName());
-// } else {
-// String firmId = list.get(i).getFirmId();
-// if (firmId != null && null != iDictCompService.getById(String.valueOf(list.get(i).getFirmId()))) {
-// list.get(i).setDictCompName(iDictCompService.getById(String.valueOf(list.get(i).getFirmId())).getCnName());
-// }
-// }
-//
-// if (null != list.get(i).getPacId()) {
-// if (null != tjPackageService.getById(list.get(i).getPacId())) {
-// list.get(i).setPacName(tjPackageService.getById(list.get(i).getPacId()).getPacName());
-// }
-// if (null != dwDeptService.getById(list.get(i).getPacId())) {
-// list.get(i).setPacName(dwDeptService.getById(list.get(i).getPacId()).getDwDeptName());
-// }
-// }
-// }
-// collect = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-// }
-// if (null != collect) {
-// map.put("total", collect.size());
-// } else {
-// map.put("total", 0);
-// }
-// map.put("list", collect);
-// return AjaxResult.success(map);
-//
-//
-// }
-
-
Page<TjOrder> page1 = new Page<>(pageNum, pageSize);
LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
if (dyzt == 0) {
@@ -837,7 +723,11 @@
}
}
map.put("list", list);
- map.put("total", page2.getTotal());
+ map.put("total", page2.getTotal());*/
+
+ if (djbeginTime == null) djbeginTime = "";
+ if (djendTime == null) djendTime = "";
+ Map<String, Object> map= tjOrderService.getTjBgdyList(pageNum,pageSize,dyzt,tjNum,name,dw,djbeginTime,djendTime);
return AjaxResult.success(map);
}
@@ -2744,16 +2634,18 @@
// }
}
- @PostMapping("/heXiaoByIds/{orderIds}")
+ @PostMapping("/heXiaoByIds")
@ApiOperation(value = "鏍告敹鎶ュ憡鈥斺�斺�斺�斺�斺�旀�绘瀹℃牳閫氳繃鍚庡彲浠ユ牳閿�锛屾牳鏀跺悗鎵嶈兘鎵撳嵃")
@Transactional
@RepeatSubmit
- public AjaxResult heXiaoByIds(@PathVariable String[] orderIds) {
+ public AjaxResult heXiaoByIds(@RequestBody List<String> orderIds) {
+ if(null !=orderIds && !orderIds.isEmpty()){
Date date = new Date();
for (String orderId : orderIds) {
TjOrder byId = tjOrderService.getById(orderId);
if (null != byId) {
- if (byId.getReportTime() == null) {
+
+ /*if (byId.getReportTime() == null) {
LambdaQueryWrapper<TjReportTemplate> tjReportTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>();
tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1);
tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
@@ -2768,25 +2660,10 @@
//淇敼order琛ㄤ腑鐨勬墦鍗版姤鍛婃椂闂翠负褰撳墠鏃堕棿
LambdaUpdateWrapper<TjOrder> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(TjOrder::getTjNumber, byId.getTjNumber());
-// updateWrapper.set(TjOrder::getReportTime, new Date());
-// updateWrapper.set(TjOrder::getPrintLastTime, new Date());
-// updateWrapper.set(TjOrder::getDownloadLastTime, new Date());
updateWrapper.set(TjOrder::getStatus, TjConstants.TJ_END);
tjOrderService.update(updateWrapper);
}
- String hisRegistrationId = byId.getCardId();
- Date createTime = byId.getCreateTime();
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String ksrq = dateFormat.format(createTime);
- String jsrq = dateFormat.format(date);
- HashMap<String, Object> params = new HashMap<>();
- params.put("his_registration_id", hisRegistrationId);
- params.put("ksbm", "");
- params.put("pationid", "");
- params.put("ksrq", ksrq);
- params.put("jsrq", jsrq);
- params.put("pagecount", 100);
- params.put("page", 1);
+
LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjCustomer::getCusId, byId.getUserId());
TjCustomer tjCustomer = tjCustomerService.getOne(wq1);
@@ -2797,9 +2674,6 @@
try {
shengchengbgmoban(byId.getTjNumber(), byId, tjCustomer, reportTemplate, zongJianYiShiQianMing);
byId.setStatus(TjConstants.TJ_END);
-// byId.setReportTime(date);
-// byId.setPrintLastTime(date);
-// byId.setDownloadLastTime(date);
} catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
e.printStackTrace();
@@ -2807,8 +2681,7 @@
logger.error("鐢熸垚鎶ュ憡寮傚父");
return AjaxResult.error("鐢熸垚鎶ュ憡寮傚父,鏍告敹澶辫触");
}
- }
-
+ }*/
byId.setHeshouStatus(1);
byId.setHeshouDoctor(UserHoder.getLoginUser().getUserId());
byId.setHeshouTime(date);
@@ -2818,13 +2691,13 @@
}
}
}
+ }
return AjaxResult.success("鏍告敹鎴愬姛");
}
public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate, TjReportTemplate zongJianYiShiQianMing) throws Exception {
-// AjaxResult ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
-// AjaxResult ajaxResult = hisPDFUtil.hisPDFNew(tjOrder, tjCustomer, reportTemplate);
+
AjaxResult ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate, zongJianYiShiQianMing);
if (!ajaxResult.get("code").toString().equals("200")) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -2840,12 +2713,6 @@
tjReport.setType("浣撴鎶ュ憡");
tjReport.setPrint("pdf");
tjReportService.save(tjReport);
-// Date date = new Date();
-// tjOrder.setStatus(TjConstants.TJ_END);
-// tjOrder.setReportTime(date);
-// tjOrder.setPrintLastTime(date);
-// tjOrder.setDownloadLastTime(date);
-// tjOrderService.updateById(tjOrder);
}
return ajaxResult;
}
@@ -3340,7 +3207,7 @@
wq.eq(TjOrderRemark::getTjNumber, tjNUm);
wq.eq(TjOrderRemark::getProId, proId);
TjOrderRemark remark = remarkService.getOne(wq);
- remark.setType(1);
+ remark.setType(2);
remarkService.updateById(remark);
return AjaxResult.success("鎿嶄綔鎴愬姛!");
}
@@ -3384,7 +3251,7 @@
//鐢熸垚鎶ュ憡
a=4;
}
- if (null != heshouStatus) {
+ if (heshouStatus==1) {
//鎶ュ憡鏍告敹
a=5;
}
@@ -3403,5 +3270,45 @@
}
+
+ @PostMapping("/heshouchexiao")
+ @ApiOperation(value = "鎾ら攢鎶ュ憡鎺ュ彛")
+ @Transactional
+ public AjaxResult heshouchexiao(@RequestBody List<String> tjNUms) {
+
+ if(null !=tjNUms && !tjNUms.isEmpty()){
+
+ // 涓嶅湪浣跨敤閫昏緫鍒犻櫎 閫昏緫鍒犻櫎瀵艰嚧鎵撳嵃鎶ュ憡鐢熸垚 鏌ヨsql缂撴參
+ //閫昏緫鍒犻櫎鏁版嵁搴撻噷鐨勬姤鍛�
+ LambdaQueryWrapper<TjReport> wq1 = new LambdaQueryWrapper<>();
+ wq1.select(TjReport::getReId);
+ wq1.in(TjReport::getTjNumber, tjNUms);
+ wq1.eq(TjReport::getPrint, "pdf");
+ List<Long> list = tjReportService.list(wq1).stream().map(TjReport::getReId).collect(Collectors.toList());
+ for (String tjNUm : tjNUms) {
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNUm);
+ if(null !=order){
+ order.setHeshouStatus(0);
+ order.setHeshouTime(null);
+ order.setHeshouDoctor(null);
+ order.setPrintLastTime(null);
+ order.setReportTime(null);
+ order.setStatus(TjConstants.TJ_WAIT);
+ if (!tjOrderService.updateById(order)) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎿嶄綔澶辫触");
+ }
+ }
+ }
+ int i = tjReportService.deleteTjReportByReIds(list.toArray(new Long[]{}));
+ if (i == 0) {
+ return AjaxResult.error("鎾ゅ洖澶辫触锛�");
+ }
+ return AjaxResult.success("鎿嶄綔鎴愬姛");
+ }
+ return AjaxResult.error();
+ }
+
+
}
--
Gitblit v1.8.0