From 47aed74050e956919f2eee588fbab15607cf4029 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 31 十月 2023 17:20:31 +0800
Subject: [PATCH] zjh 2023/10/31--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 8 +++-
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java | 16 ++++----
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 6 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 21 +++-------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 8 ++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 16 +++++---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwDeptMapper.java | 4 +
8 files changed, 43 insertions(+), 38 deletions(-)
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 c5e3e31..36e068a 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
@@ -886,7 +886,6 @@
@Override
@Async("async")
public void saveNewReservationConfirm(List<TjReservation> rightList) {
- long l = System.currentTimeMillis();
if(null !=rightList && rightList.size()>0){
//鍒涘缓绾跨▼姹�
ExecutorService threadPool = Executors.newFixedThreadPool(rightList.size());
@@ -908,15 +907,11 @@
});
}
}
- long ll = System.currentTimeMillis();
-
- System.out.println("杩欐浠ｇ爜鎵ц鏃堕棿涓�"+ (ll-l));
}
@Override
@Async("async")
public void updateCheckType(String tjNum) {
-// AjaxResult ajaxResult = getAjaxResult(tjNum);
redisCache.setCacheMapValue("updateCheckType"+tjNum,tjNum,getAjaxResult(tjNum));
}
@@ -1316,14 +1311,12 @@
return customerList;
}
//鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏
- private AjaxResult getAjaxResult(String tjNumber) {
+ private List<Map<String, Object>> getAjaxResult(String tjNumber) {
List<Map<String, Object>> list = new ArrayList<>();
TjOrder one = orderService.getOrderByTjNum(tjNumber);
-
if (one == null) {
- return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒");
+ return list;
}
-
TjCustomer customer = tjCustomerService.getById(one.getUserId());
List<TjOrderRemark> remarkList = orderRemarkService.getRemarkListByTjNumAndType(tjNumber);
@@ -1340,7 +1333,11 @@
if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
final TjProject byId = projectService.selectTjProjectByProId(tjOrderDetail.getProId());
+ if(null==byId){
+ tjOrderDetailService.removeById(tjOrderDetail.getOrderDetailId());
+ }else {
tjOrderDetail.setProject(byId);
+ }
List<TjStandard> list2 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId()));
if (list2.size() == 0) {
tjOrderDetail.setStandard(new TjStandard());
@@ -1366,14 +1363,10 @@
parent.put("doctorName", userService.getById(remark.getDoctorName()).getNickName());
}
list.add(parent);
- } else {
- return AjaxResult.success("璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁");
}
-// }
}
- return AjaxResult.success(list);
}
- return AjaxResult.success("璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁锛�");
+ return list;
}
//宸茬鏀�/鏈鏀�
private List<Map<String, Object>> getYWqsResult(int a) {
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 39a0fb8..2d1d498 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
@@ -540,7 +540,8 @@
return AjaxResult.success("鎿嶄綔澶辫触");
}
for (TjOrderRemark orderRemark : remarklList) {
- if (null != orderRemark.getSummaryList() && orderRemark.getSummaryList().size()>0 ) {
+ List<String> summaryList = orderRemark.getSummaryList();
+ if (null != summaryList && summaryList.size()>0 && !summaryList.contains(null) ) {
orderRemark.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
}
LambdaQueryWrapper<TjOrder> qw = new LambdaQueryWrapper<>();
@@ -581,7 +582,6 @@
}
}
}
- //-----------------------------------end
asyncService.updateOrdeltile(tjOrderDetailList, sysUser, order);
LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
@@ -600,7 +600,7 @@
remarkService.save(remark);
} else {
one.setRemark(orderRemark.getRemark());
- if (orderRemark.getSummaryList() != null) {
+ if (null != summaryList && summaryList.size()>0 && !summaryList.contains(null)) {
one.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
}
one.setDeptId(orderRemark.getDeptId());
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 266f9ab..2af84db 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -413,6 +413,7 @@
LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
transitionService.remove(wqq);
+ asyncService.updateCheckType(tjNumber);
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
return AjaxResult.error("鎿嶄綔澶辫触");
@@ -434,16 +435,17 @@
*/
@GetMapping("/updateCheckType")
@ApiOperation(value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏")
-// @PreAuthorize("@ss.hasPermi('check:check:updateCheckType')")
public AjaxResult updateCheckType(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
if(redisCache.hasKey("updateCheckType"+tjNumber)) {
- return redisCache.getCacheMapValue("updateCheckType" + tjNumber, tjNumber);
+ List<Map<String, Object>> cacheMapValue = redisCache.getCacheMapValue("updateCheckType" + tjNumber, tjNumber);
+ return AjaxResult.success(cacheMapValue);
}
return getAjaxResult(tjNumber);
}
private AjaxResult getAjaxResult(String tjNumber) {
- final long l = System.currentTimeMillis();
+
+ asyncService.updateCheckType(tjNumber);
List<Map<String, Object>> list = new ArrayList<>();
TjOrder one = orderService.getOrderByTjNum(tjNumber);
@@ -467,7 +469,11 @@
if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
final TjProject byId = projectService.selectTjProjectByProId(tjOrderDetail.getProId());
- tjOrderDetail.setProject(byId);
+ if(null==byId){
+ detailService.removeById(tjOrderDetail.getOrderDetailId());
+ }else {
+ tjOrderDetail.setProject(byId);
+ }
List<TjStandard> list2 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId()));
if (list2.size() == 0) {
tjOrderDetail.setStandard(new TjStandard());
@@ -498,8 +504,6 @@
}
// }
}
- final long l1 = System.currentTimeMillis();
- System.out.println("++++++++++++++++++++++++++++++++++++++++++==============="+(l1-l));
return AjaxResult.success(list);
}
return AjaxResult.success("璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁锛�");
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
index bd6ff4f..e769abc 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -498,8 +498,12 @@
tjRefundVo.setTjPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
tjRefundVo.setSex(String.valueOf(customer.getCusSex()));
tjRefundVo.setIdCard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
- if (null != order.getDictCompName())
- tjRefundVo.setTjComp(compService.getById(order.getFirmId()) != null ? compService.getById(order.getFirmId()).getCnName() : null);
+ if (null != order.getFirmId()){
+ DictComp byId = compService.getById(order.getFirmId());
+ if(null != byId){
+ tjRefundVo.setTjComp(byId.getCnName());
+ }
+ }
if (null != order.getTjType()) tjRefundVo.setTjType(order.getTjType());
TjFlowingWater one = tjFlowingWaterService.getOne(new LambdaQueryWrapper<TjFlowingWater>()
.eq(TjFlowingWater::getOrderId, order.getOrderId())
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 a6cf3b9..6265564 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
@@ -807,8 +807,11 @@
if (null != tjReservation.getDepartment()) tjOrder.setFirmDeptName(tjReservation.getDepartment());
if (null != tjReservation.getJobNo()) tjOrder.setFirmWorkId(tjReservation.getJobNo());
if (null != tjReservation.getPacId()) tjOrder.setPacId(tjReservation.getPacId());
- if (null != tjReservation.getGroupingId()) tjOrder.setGroupId(tjReservation.getGroupingId());
- if (null != tjReservation.getDepartmentId()) tjOrder.setFirmDeptId(tjReservation.getDepartmentId());
+ if (null != tjReservation.getGroupingId()){
+ tjOrder.setGroupId(tjReservation.getGroupingId());
+ tjOrder.setFirmDeptId(tjReservation.getPacId());
+ }
+// if (null != tjReservation.getDepartmentId()) tjOrder.setFirmDeptId(tjReservation.getDepartmentId());
tjReservation.setIsExpire(1);
tjReservationService.updateById(tjReservation);
if (null != tjReservation.getTeamNo()) {
@@ -891,7 +894,6 @@
//鍥綋
if ("1".equals(tjOrder.getTjType())) {
- tjOrder.setFirmDeptId(tjOrder.getPacId());
asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java
index 905190a..7bb2f07 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java
@@ -117,22 +117,22 @@
/**
* 濠氬Щ
*/
- @ExcelExport(value = "濠氬Щ",kv = "0-鏈;1-宸插;2-绂诲;3-涓у伓",sort =8)
- @ExcelImport(value = "濠氬Щ鐘跺喌", kv = "0-鏈;1-宸插;2-绂诲;3-涓у伓")
+ @ExcelExport(value = "濠氬Щ鐘跺喌",kv = "1-鏈;2-宸插;4-绂诲;3-涓у伓",sort =8)
+ @ExcelImport(value = "濠氬Щ鐘跺喌", kv = "1-鏈;2-宸插;4-绂诲;3-涓у伓",required = true)
@ApiModelProperty("濠氬Щ")
private Integer marriage;
/**
* 姘戞棌
*/
- @ExcelExport(value = "姘戞棌",kv = "0-姹夋棌;1-钂欏彜鏃�;2-鍥炴棌;3-钘忔棌;4-缁村惥灏旀棌;6-鑻楁棌;7-褰濇棌;8-澹棌;9-甯冧緷鏃�;10-鏈濋矞鏃�;11-婊℃棌;12-渚楁棌;13-鐟舵棌;14-鐧芥棌;15-鍦熷鏃�;16-鍝堝凹鏃�;17-鍝堣惃鍏嬫棌;\" +\n" +
- " \"18-鍌ｆ棌;19-榛庢棌;20-鍌堝倛鏃�;21-浣ゆ棌;22-鐣叉棌;23-楂樺北鏃�;24-鎷夌鏃�;25-姘存棌;26-涓滀埂鏃�;27-绾宠タ鏃�;28-鏅鏃�;29-鏌皵鍏嬪瓬鏃�;30-鍦熸棌;31-杈炬枴灏旀棌;32-浠浆鏃�;33-缇屾棌;34-甯冩湕鏃�;34-鎾掓媺鏃�;35-姣涘崡鏃廫" +\n" +
- " \"37-浠′浆鏃�;38-閿′集鏃�;39-闃挎槍鏃�;40-鏅背鏃�;41-濉斿悏鍏嬫棌;42-鎬掓棌;43-涔屽瓬鍒厠鏃�;44-淇勭綏鏂棌;45-閯傛俯鍏嬫棌;46-寰锋槀鏃�;47-淇濆畨鏃�;48-瑁曞浐鏃�;49-浜棌;50-濉斿灏旀棌;51-鐙緳鏃�;52-閯備鸡鏄ユ棌;53-璧摬鏃�;\" +\n" +
- " \"54-闂ㄥ反鏃�;55-鐝炲反鏃�;56-鍩鸿鏃�;57-鍏朵粬姘戞棌鎴栧鍥藉弸浜�",sort =2)
- @ExcelImport(value = "姘戞棌", kv = "0-姹夋棌;1-钂欏彜鏃�;2-鍥炴棌;3-钘忔棌;4-缁村惥灏旀棌;6-鑻楁棌;7-褰濇棌;8-澹棌;9-甯冧緷鏃�;10-鏈濋矞鏃�;11-婊℃棌;12-渚楁棌;13-鐟舵棌;14-鐧芥棌;15-鍦熷鏃�;16-鍝堝凹鏃�;17-鍝堣惃鍏嬫棌;" +
+ @ExcelExport(value = "姘戞棌",kv = "1-姹夋棌;2-钂欏彜鏃�;3-鍥炴棌;4-钘忔棌;5-缁村惥灏旀棌;6-鑻楁棌;7-褰濇棌;8-澹棌;9-甯冧緷鏃�;10-鏈濋矞鏃�;11-婊℃棌;12-渚楁棌;13-鐟舵棌;14-鐧芥棌;15-鍦熷鏃�;16-鍝堝凹鏃�;17-鍝堣惃鍏嬫棌;" +
"18-鍌ｆ棌;19-榛庢棌;20-鍌堝倛鏃�;21-浣ゆ棌;22-鐣叉棌;23-楂樺北鏃�;24-鎷夌鏃�;25-姘存棌;26-涓滀埂鏃�;27-绾宠タ鏃�;28-鏅鏃�;29-鏌皵鍏嬪瓬鏃�;30-鍦熸棌;31-杈炬枴灏旀棌;32-浠浆鏃�;33-缇屾棌;34-甯冩湕鏃�;34-鎾掓媺鏃�;35-姣涘崡鏃�" +
"37-浠′浆鏃�;38-閿′集鏃�;39-闃挎槍鏃�;40-鏅背鏃�;41-濉斿悏鍏嬫棌;42-鎬掓棌;43-涔屽瓬鍒厠鏃�;44-淇勭綏鏂棌;45-閯傛俯鍏嬫棌;46-寰锋槀鏃�;47-淇濆畨鏃�;48-瑁曞浐鏃�;49-浜棌;50-濉斿灏旀棌;51-鐙緳鏃�;52-閯備鸡鏄ユ棌;53-璧摬鏃�;" +
- "54-闂ㄥ反鏃�;55-鐝炲反鏃�;56-鍩鸿鏃�;57-鍏朵粬姘戞棌鎴栧鍥藉弸浜�")
+ "54-闂ㄥ反鏃�;55-鐝炲反鏃�;56-鍩鸿鏃�;57-鍏朵粬姘戞棌鎴栧鍥藉弸浜�;99-鏈鏄�",sort =2)
+ @ExcelImport(value = "姘戞棌", kv = "1-姹夋棌;2-钂欏彜鏃�;3-鍥炴棌;4-钘忔棌;5-缁村惥灏旀棌;6-鑻楁棌;7-褰濇棌;8-澹棌;9-甯冧緷鏃�;10-鏈濋矞鏃�;11-婊℃棌;12-渚楁棌;13-鐟舵棌;14-鐧芥棌;15-鍦熷鏃�;16-鍝堝凹鏃�;17-鍝堣惃鍏嬫棌;" +
+ "18-鍌ｆ棌;19-榛庢棌;20-鍌堝倛鏃�;21-浣ゆ棌;22-鐣叉棌;23-楂樺北鏃�;24-鎷夌鏃�;25-姘存棌;26-涓滀埂鏃�;27-绾宠タ鏃�;28-鏅鏃�;29-鏌皵鍏嬪瓬鏃�;30-鍦熸棌;31-杈炬枴灏旀棌;32-浠浆鏃�;33-缇屾棌;34-甯冩湕鏃�;34-鎾掓媺鏃�;35-姣涘崡鏃�" +
+ "37-浠′浆鏃�;38-閿′集鏃�;39-闃挎槍鏃�;40-鏅背鏃�;41-濉斿悏鍏嬫棌;42-鎬掓棌;43-涔屽瓬鍒厠鏃�;44-淇勭綏鏂棌;45-閯傛俯鍏嬫棌;46-寰锋槀鏃�;47-淇濆畨鏃�;48-瑁曞浐鏃�;49-浜棌;50-濉斿灏旀棌;51-鐙緳鏃�;52-閯備鸡鏄ユ棌;53-璧摬鏃�;" +
+ "54-闂ㄥ反鏃�;55-鐝炲反鏃�;56-鍩鸿鏃�;57-鍏朵粬姘戞棌鎴栧鍥藉弸浜�;99-鏈鏄�")
@ApiModelProperty("姘戞棌")
private Integer nation;
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
index 4711fcf..1e12f02 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
@@ -179,7 +179,7 @@
"\ttj_grouping_pro a\n" +
"\tLEFT JOIN tj_project b ON a.pro_id = b.pro_id \n" +
"\tLEFT JOIN tj_project c ON c.pro_parent_id=b.pro_id\n" +
- "WHERE 1=1 AND a.grouping_id =#{groupingId} ")
+ "WHERE 1=1 AND a.grouping_id =#{groupingId} and c.deleted=0 ")
boolean saveTemoTransitionByGroupingId(@Param("cusId")String cusId,@Param("groupingId")String groupingId);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwDeptMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwDeptMapper.java
index c79c8a5..9b2310e 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwDeptMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwDeptMapper.java
@@ -78,7 +78,9 @@
@Select("\n" +
"SELECT aa.bg_type, aa.dw_name,aa.batch,aa.dept,sum(aa.people_count) people_count,sum(aa.yj_count) yj_count,(sum(aa.people_count)-sum(aa.yj_count))wj_count FROM (\n" +
"\n" +
- "SELECT '鍥綋' bg_type, a.company dw_name,COUNT(DISTINCT a.team_no) batch,a.department dept,COUNT(*) people_count, 0 yj_count,0 wj_count FROM tj_reservation a WHERE a.deleted=0 AND a.grouping_id IN (\n" +
+ "SELECT '鍥綋' bg_type, r.cn_name dw_name,COUNT(DISTINCT a.team_no) batch,a.department dept,COUNT(*) people_count, 0 yj_count,0 wj_count FROM tj_reservation a " +
+ "LEFT JOIN dict_comp r ON a.company_id=r.drug_manufacturer_id" +
+ " WHERE a.deleted=0 AND a.grouping_id IN (\n" +
"\n" +
" SELECT b.id FROM tj_dw_grouping b WHERE b.deleted=0 AND b.dw_dept_id=#{dwDeptId}\n" +
"\t \n" +
--
Gitblit v1.8.0