From f98a54040341f7a33e0849532007849ee9597aee Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期一, 23 十月 2023 18:05:05 +0800
Subject: [PATCH] canshu
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 114 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 75 insertions(+), 39 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 34c95d8..c6e4de3 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
@@ -500,7 +500,9 @@
order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
- order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
+ if (tjCustomer.getCusIdcard()!=null){
+ order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
+ }
}
String firmId = order.getFirmId();
if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) {
@@ -562,8 +564,8 @@
order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
order.setGrMoBanId(reportService.getGrMoBanIds());
order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
- order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
- order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
+ if(null!=tjCustomer.getCusPhone())order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
+ if(null!=tjCustomer.getCusIdcard())order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
}
String firmId = order.getFirmId();
if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) {
@@ -613,8 +615,8 @@
order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
order.setGrMoBanId(reportService.getGrMoBanIds());
order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
- order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
- order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
+ if(null!=tjCustomer.getCusPhone())order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
+ if(null!=tjCustomer.getCusIdcard())order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
}
String firmId = order.getFirmId();
if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) {
@@ -656,43 +658,21 @@
List<TjOrder> list = Optional.ofNullable(tjOrderService.list(wq)).get();
if (list.size() > 0) {
- List<TjOrder> list1 = new ArrayList<>();
- for (TjOrder order : list) {
- TjCustomer tjCustomer = tjCustomerService.selectTjCustomerByCusId(order.getUserId());
- if (null != tjCustomer) {
- order.setTjCustomerSex(tjCustomer.getCusSex());
- order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
- order.setGrMoBanId(reportService.getGrMoBanIds());
- order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
- order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
- order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
+ asyncService.getPrintOrderList(list);
+ if(redisCache.hasKey("getPrintOrderList")){
+ if(null !=type && type==0){
+ List<TjOrder> list1 = redisCache.getCacheMapValue("getPrintOrderList", "0");
+ collect = list1.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
}
- String firmId = order.getFirmId();
- if (firmId != null && null != iDictCompService.selectDictCompByDrugManufacturerId(String.valueOf(order.getFirmId()))) {
- order.setDictCompName(iDictCompService.selectDictCompByDrugManufacturerId(String.valueOf(order.getFirmId())).getCnName());
+ if(null !=type && type==1){
+ List<TjOrder> list1 = redisCache.getCacheMapValue("getPrintOrderList","1");
+ collect = list1.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
}
- if (null != order.getPacId()) {
- if (null != tjPackageService.getById(order.getPacId())) {
- order.setPacName(tjPackageService.getById(order.getPacId()).getPacName());
- }
- if (null != dwDeptService.getById(order.getPacId())) {
- order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
- }
- }
- //浠庢墦鍗拌褰曟煡鍑烘渶鏂版墦鍗版椂闂�
- TjPrintOrder one = printOrderService.getTjPrintOrderByTjNum(order.getTjNumber());
- if (null != type && type == 1 && one != null) {
- order.setPrintTime(one.getCreateTime());
- order.setPrintName(one.getCreateBy());
- order.setType(1);
- list1.add(order);
- }
- if (null != type && type == 0 && one == null) {
- order.setType(0);
- list1.add(order);
- }
+ }else {
+ List<TjOrder> list1 = new ArrayList<>();
+ extracted(type, list, list1);
+ collect = list1.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
}
- collect = list1.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
}
if (null != collect) {
map.put("total", collect.size());
@@ -701,6 +681,44 @@
}
map.put("list", collect);
return AjaxResult.success(map);
+ }
+
+ private void extracted(Integer type, List<TjOrder> list, List<TjOrder> list1) {
+ for (TjOrder order : list) {
+ TjCustomer tjCustomer = tjCustomerService.selectTjCustomerByCusId(order.getUserId());
+ if (null != tjCustomer) {
+ order.setTjCustomerSex(tjCustomer.getCusSex());
+ order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
+ order.setGrMoBanId(reportService.getGrMoBanIds());
+ order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
+ if(null!=tjCustomer.getCusPhone())order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
+ if(null!=tjCustomer.getCusIdcard())order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
+ }
+ String firmId = order.getFirmId();
+ if (firmId != null && null != iDictCompService.selectDictCompByDrugManufacturerId(String.valueOf(order.getFirmId()))) {
+ order.setDictCompName(iDictCompService.selectDictCompByDrugManufacturerId(String.valueOf(order.getFirmId())).getCnName());
+ }
+ if (null != order.getPacId()) {
+ if (null != tjPackageService.getById(order.getPacId())) {
+ order.setPacName(tjPackageService.getById(order.getPacId()).getPacName());
+ }
+ if (null != dwDeptService.getById(order.getPacId())) {
+ order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
+ }
+ }
+ //浠庢墦鍗拌褰曟煡鍑烘渶鏂版墦鍗版椂闂�
+ TjPrintOrder one = printOrderService.getTjPrintOrderByTjNum(order.getTjNumber());
+ if (null != type && type == 1 && one != null) {
+ order.setPrintTime(one.getCreateTime());
+ order.setPrintName(one.getCreateBy());
+ order.setType(1);
+ list1.add(order);
+ }
+ if (null != type && type == 0 && one == null) {
+ order.setType(0);
+ list1.add(order);
+ }
+ }
}
@@ -728,6 +746,24 @@
return success(tjOrderService.selectTjOrderByOrderId(orderId));
}
+
+
+ @GetMapping("/getIsRequired")
+ @ApiOperation(value = "鏍规嵁鍙傛暟閰嶇疆鑾峰彇鏄惁蹇呭～椤癸紙韬唤璇併�佹�у埆銆佺數璇濄�佺収鐗囥�佹槸鍚︾洿鎺ヤ笅鍗曪級")
+ public AjaxResult getIsRequired() {
+ Map<String,String> res=new HashMap<>();
+ res.put("has_idcard",configService.selectConfigByKey("has_idcard"));
+ res.put("has_sex",configService.selectConfigByKey("has_sex"));
+ res.put("is_phone",configService.selectConfigByKey("is_phone"));
+ res.put("mall_hasPhoto",configService.selectConfigByKey("mall_hasPhoto"));
+ res.put("has_charge",configService.selectConfigByKey("has_charge"));
+ return AjaxResult.success(res);
+ }
+
+
+
+
+
/**
* 浣撴绛惧埌鐧昏鎺ュ彛
*/
--
Gitblit v1.8.0